diff --git a/Mage.Client/src/main/java/mage/client/cards/Card.java b/Mage.Client/src/main/java/mage/client/cards/Card.java index 8e1d1eb0800..a41978df09a 100644 --- a/Mage.Client/src/main/java/mage/client/cards/Card.java +++ b/Mage.Client/src/main/java/mage/client/cards/Card.java @@ -34,7 +34,7 @@ package mage.client.cards; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.cards.CardDimensions; import mage.cards.MagePermanent; import mage.cards.TextPopup; @@ -264,7 +264,7 @@ public class Card extends MagePermanent implements MouseMotionListener, MouseLis sbType.append(superType).append(" "); } - for (mage.Constants.CardType cardType: card.getCardTypes()) { + for (CardType cardType: card.getCardTypes()) { sbType.append(cardType.toString()).append(" "); } diff --git a/Mage.Client/src/main/java/mage/client/cards/CardsList.java b/Mage.Client/src/main/java/mage/client/cards/CardsList.java index 40bb38b4b11..26524c9ba58 100644 --- a/Mage.Client/src/main/java/mage/client/cards/CardsList.java +++ b/Mage.Client/src/main/java/mage/client/cards/CardsList.java @@ -47,7 +47,7 @@ import java.util.List; import java.util.UUID; import javax.swing.*; import javax.swing.table.DefaultTableCellRenderer; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.cards.MageCard; import mage.client.constants.Constants.SortBy; import mage.client.deckeditor.table.TableModel; diff --git a/Mage.Client/src/main/java/mage/client/cards/Permanent.java b/Mage.Client/src/main/java/mage/client/cards/Permanent.java index 921d5d1ab63..8d3af3d42f9 100644 --- a/Mage.Client/src/main/java/mage/client/cards/Permanent.java +++ b/Mage.Client/src/main/java/mage/client/cards/Permanent.java @@ -51,7 +51,7 @@ import java.util.UUID; import javax.swing.PopupFactory; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.cards.CardDimensions; import mage.cards.MagePermanent; import mage.client.util.Config; diff --git a/Mage.Client/src/main/java/mage/client/deck/generator/DeckGenerator.java b/Mage.Client/src/main/java/mage/client/deck/generator/DeckGenerator.java index dc2230bcfe7..0884395912a 100644 --- a/Mage.Client/src/main/java/mage/client/deck/generator/DeckGenerator.java +++ b/Mage.Client/src/main/java/mage/client/deck/generator/DeckGenerator.java @@ -1,7 +1,7 @@ package mage.client.deck.generator; -import mage.Constants.CardType; -import mage.Constants.ColoredManaSymbol; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; import mage.Mana; import mage.cards.Card; import mage.cards.decks.Deck; @@ -11,6 +11,7 @@ import mage.cards.repository.CardRepository; import mage.client.MageFrame; import mage.client.util.gui.ColorsChooser; import mage.client.util.sets.ConstructedFormats; +import mage.constants.Rarity; import mage.interfaces.rate.RateCallback; import mage.cards.Sets; import mage.utils.DeckBuilder; @@ -26,7 +27,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Random; import java.util.UUID; -import mage.Constants; + import mage.cards.ExpansionSet; /** @@ -369,7 +370,7 @@ public class DeckGenerator { if (!landSets.isEmpty()) { criteria.setCodes(landSets.toArray(new String[landSets.size()])); } - criteria.rarities(Constants.Rarity.LAND).name(cardName); + criteria.rarities(Rarity.LAND).name(cardName); List cards = CardRepository.instance.findCards(criteria); if (cards.isEmpty() && !setsToUse.isEmpty()) { diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java index f199c15d7fe..247b3f957f9 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java @@ -34,7 +34,7 @@ package mage.client.deckeditor; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.MageObject; import mage.ObjectColor; import mage.cards.Card; diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java index 7cf978025bb..d6842910364 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java @@ -45,6 +45,7 @@ import mage.client.util.Config; import mage.client.util.ImageHelper; import mage.client.util.sets.ConstructedFormats; import mage.components.ImagePanel; +import mage.constants.Rarity; import mage.view.CardView; import org.apache.log4j.Logger; import org.mage.card.arcane.GlowText; @@ -254,7 +255,7 @@ public class MageBook extends JComponent { cardImg.update(card); cardImg.setCardBounds(rectangle.x, rectangle.y, cardDimensions.frameWidth, cardDimensions.frameHeight); - boolean implemented = !card.getRarity().equals(mage.Constants.Rarity.NA); + boolean implemented = !card.getRarity().equals(Rarity.NA); GlowText label = new GlowText(); label.setGlow(implemented ? Color.green : NOT_IMPLEMENTED, 12, 0.0f); diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/table/CardHelper.java b/Mage.Client/src/main/java/mage/client/deckeditor/table/CardHelper.java index 07b5ec2044b..2bc13dc466d 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/table/CardHelper.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/table/CardHelper.java @@ -28,7 +28,7 @@ package mage.client.deckeditor.table; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.cards.MageCard; import mage.view.CardView; diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/table/TableModel.java b/Mage.Client/src/main/java/mage/client/deckeditor/table/TableModel.java index a7093bf3ecd..4cc78f49aa4 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/table/TableModel.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/table/TableModel.java @@ -28,7 +28,6 @@ package mage.client.deckeditor.table; -import mage.Constants; import mage.client.MageFrame; import mage.client.cards.BigCard; import mage.client.cards.CardEventSource; @@ -40,6 +39,7 @@ import mage.client.util.Event; import mage.client.util.ImageHelper; import mage.client.util.Listener; import mage.client.util.gui.GuiDisplayUtil; +import mage.constants.CardType; import mage.view.CardView; import mage.view.CardsView; import org.apache.log4j.Logger; @@ -93,9 +93,9 @@ public class TableModel extends AbstractTableModel implements ICardGrid { addCard(card, bigCard, gameId); } if (updateCountsCallback != null) { - if (card.getCardTypes().contains(Constants.CardType.LAND)) + if (card.getCardTypes().contains(CardType.LAND)) landCount++; - if (card.getCardTypes().contains(Constants.CardType.CREATURE)) + if (card.getCardTypes().contains(CardType.CREATURE)) creatureCount++; } } diff --git a/Mage.Client/src/main/java/mage/client/dialog/AddLandDialog.java b/Mage.Client/src/main/java/mage/client/dialog/AddLandDialog.java index fe4cca2940d..31da43b2a44 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/AddLandDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/AddLandDialog.java @@ -25,21 +25,12 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ - -/* - * AddLandDialog.java - * - * Created on Jan 11, 2011, 1:20:45 PM - */ - package mage.client.dialog; -import java.util.Iterator; import java.util.List; import java.util.Random; import java.util.Set; import javax.swing.JLayeredPane; -import mage.Constants; import mage.Mana; import mage.cards.Card; import mage.cards.Sets; @@ -48,6 +39,7 @@ import mage.cards.repository.CardCriteria; import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; import mage.client.MageFrame; +import mage.constants.Rarity; /** * @@ -80,7 +72,7 @@ public class AddLandDialog extends MageDialog { if (!setCodesland.isEmpty()) { criteria.setCodes(setCodesland.toArray(new String[setCodesland.size()])); } - criteria.rarities(Constants.Rarity.LAND).name(landName); + criteria.rarities(Rarity.LAND).name(landName); List cards = CardRepository.instance.findCards(criteria); if (cards.isEmpty()) { return; diff --git a/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java b/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java index c67d33e6476..655f289493e 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java @@ -34,8 +34,8 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; import javax.swing.*; -import mage.Constants.MultiplayerAttackOption; -import mage.Constants.RangeOfInfluence; +import mage.constants.MultiplayerAttackOption; +import mage.constants.RangeOfInfluence; import mage.cards.decks.importer.DeckImporterUtil; import mage.client.MageFrame; import mage.client.components.MageComponents; diff --git a/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java b/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java index 09dc92fd4e6..497513246e2 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java @@ -41,8 +41,8 @@ import javax.swing.DefaultComboBoxModel; import javax.swing.JComboBox; import javax.swing.JOptionPane; import javax.swing.SpinnerNumberModel; -import mage.Constants.MultiplayerAttackOption; -import mage.Constants.RangeOfInfluence; +import mage.constants.MultiplayerAttackOption; +import mage.constants.RangeOfInfluence; import mage.cards.ExpansionSet; import mage.cards.Sets; import mage.client.MageFrame; diff --git a/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java b/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java index 222dd57f6d7..6c2e826f70b 100644 --- a/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java +++ b/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java @@ -34,13 +34,13 @@ package mage.client.game; -import mage.Constants; import mage.cards.MagePermanent; import mage.client.cards.BigCard; import mage.client.cards.Permanent; import mage.client.plugins.impl.Plugins; import mage.client.util.AudioManager; import mage.client.util.Config; +import mage.constants.CardType; import mage.view.PermanentView; import javax.swing.*; @@ -209,9 +209,9 @@ public class BattlefieldPanel extends javax.swing.JLayeredPane { }*/ } - if (permanent.getCardTypes().contains(Constants.CardType.ARTIFACT)) { + if (permanent.getCardTypes().contains(CardType.ARTIFACT)) { addedArtifact = true; - } else if (permanent.getCardTypes().contains(Constants.CardType.CREATURE)) { + } else if (permanent.getCardTypes().contains(CardType.CREATURE)) { addedCreature = true; } else { addedPermanent = true; @@ -274,7 +274,7 @@ public class BattlefieldPanel extends javax.swing.JLayeredPane { }); t.start(); } - if (((MagePermanent)comp).getOriginal().getCardTypes().contains(Constants.CardType.CREATURE)) { + if (((MagePermanent)comp).getOriginal().getCardTypes().contains(CardType.CREATURE)) { removedCreature = true; } } diff --git a/Mage.Client/src/main/java/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java index ada9254559b..d5e08a492e4 100644 --- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java +++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java @@ -27,7 +27,6 @@ */ package mage.client.game; -import mage.Constants; import mage.cards.action.ActionCallback; import mage.client.MageFrame; import mage.client.cards.BigCard; @@ -45,6 +44,7 @@ import mage.client.util.Config; import mage.client.util.GameManager; import mage.client.util.PhaseManager; import mage.client.util.gui.ArrowBuilder; +import mage.constants.PhaseStep; import mage.remote.Session; import mage.view.*; import org.apache.log4j.Logger; @@ -504,7 +504,7 @@ public final class GamePanel extends javax.swing.JPanel { /** * Update phase buttons\labels. */ - private void updatePhases(Constants.PhaseStep step) { + private void updatePhases(PhaseStep step) { if (step == null) { logger.warn("step is null"); return; diff --git a/Mage.Client/src/main/java/mage/client/game/HandPanel.java b/Mage.Client/src/main/java/mage/client/game/HandPanel.java index 83908298b07..f1c520113df 100644 --- a/Mage.Client/src/main/java/mage/client/game/HandPanel.java +++ b/Mage.Client/src/main/java/mage/client/game/HandPanel.java @@ -1,10 +1,10 @@ package mage.client.game; -import mage.Constants; import mage.client.MageFrame; import mage.client.cards.BigCard; import mage.client.dialog.PreferencesDialog; import mage.client.util.Config; +import mage.constants.Zone; import mage.view.SimpleCardsView; import javax.swing.*; @@ -55,7 +55,7 @@ public class HandPanel extends JPanel { hand.setBackgroundColor(new Color(0, 0, 0, 100)); hand.setVisibleIfEmpty(false); hand.setBorder(emptyBorder); - hand.setZone(Constants.Zone.HAND.toString()); + hand.setZone(Zone.HAND.toString()); } public void loadCards(SimpleCardsView cards, BigCard bigCard, UUID gameId) { diff --git a/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java b/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java index dffbd2d36c4..4c2bc8b8e4e 100644 --- a/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java +++ b/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java @@ -1,6 +1,5 @@ package mage.client.plugins.adapters; -import mage.Constants; import mage.cards.MageCard; import mage.cards.MagePermanent; import mage.cards.action.ActionCallback; @@ -17,6 +16,7 @@ import mage.client.util.ImageHelper; import mage.client.util.gui.ArrowBuilder; import mage.client.util.gui.GuiDisplayUtil; import mage.components.CardInfoPane; +import mage.constants.Rarity; import mage.remote.Session; import mage.utils.ThreadUtils; import mage.view.CardView; @@ -195,7 +195,7 @@ public class MageActionCallback implements ActionCallback { private void showPopup(final TransferData data, final Component parentComponent, final Point parentPoint) { // skip popup for not implemented cards (they have Rarity.NA) - if (data.card.getRarity().equals(Constants.Rarity.NA)) { + if (data.card.getRarity().equals(Rarity.NA)) { return; } diff --git a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java index f9b9ab7d436..2e100e73fb5 100644 --- a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java +++ b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java @@ -46,8 +46,8 @@ import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; import javax.swing.*; import javax.swing.table.AbstractTableModel; -import mage.Constants.MultiplayerAttackOption; -import mage.Constants.RangeOfInfluence; +import mage.constants.MultiplayerAttackOption; +import mage.constants.RangeOfInfluence; import mage.cards.decks.importer.DeckImporterUtil; import mage.client.MageFrame; import mage.client.chat.ChatPanel; diff --git a/Mage.Client/src/main/java/mage/client/util/gui/GuiDisplayUtil.java b/Mage.Client/src/main/java/mage/client/util/gui/GuiDisplayUtil.java index da1b52bf08d..996df1d2d39 100644 --- a/Mage.Client/src/main/java/mage/client/util/gui/GuiDisplayUtil.java +++ b/Mage.Client/src/main/java/mage/client/util/gui/GuiDisplayUtil.java @@ -6,7 +6,7 @@ import javax.swing.JButton; import javax.swing.JLabel; import javax.swing.SwingConstants; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.utils.CardUtil; import mage.view.CardView; diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java index c13e57383eb..8067b9d56e4 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java @@ -1,6 +1,6 @@ package org.mage.card.arcane; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.cards.MagePermanent; import mage.cards.TextPopup; import mage.cards.action.ActionCallback; @@ -751,7 +751,7 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti sbType.append(superType).append(" "); } - for (mage.Constants.CardType cardType : card.getCardTypes()) { + for (CardType cardType : card.getCardTypes()) { sbType.append(cardType.toString()).append(" "); } diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java b/Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java index 1b993691e0a..9c762f58cdb 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java @@ -2,6 +2,7 @@ package org.mage.plugins.card; import mage.cards.MagePermanent; import mage.cards.action.ActionCallback; +import mage.constants.Rarity; import mage.interfaces.plugin.CardPlugin; import mage.utils.CardUtil; import mage.view.CardView; @@ -80,7 +81,7 @@ public class CardPluginImpl implements CardPlugin { boolean foil = canBeFoil && (new Random()).nextInt(5) == 0; CardPanel cardPanel = new CardPanel(permanent, gameId, loadImage, callback, foil); cardPanel.setCardBounds(0, 0, dimension.width, dimension.height); - boolean implemented = !permanent.getRarity().equals(mage.Constants.Rarity.NA); + boolean implemented = !permanent.getRarity().equals(Rarity.NA); cardPanel.setShowCastingCost(implemented); return cardPanel; } @@ -90,7 +91,7 @@ public class CardPluginImpl implements CardPlugin { boolean foil = canBeFoil && (new Random()).nextInt(5) == 0; CardPanel cardPanel = new CardPanel(permanent, gameId, loadImage, callback, foil); cardPanel.setCardBounds(0, 0, dimension.width, dimension.height); - boolean implemented = !permanent.getRarity().equals(mage.Constants.Rarity.NA); + boolean implemented = !permanent.getRarity().equals(Rarity.NA); cardPanel.setShowCastingCost(implemented); return cardPanel; } diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java b/Mage.Client/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java index bf444bf8b1f..bc47999e41c 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java @@ -1,7 +1,7 @@ package org.mage.plugins.card.info; -import mage.Constants; import mage.components.CardInfoPane; +import mage.constants.CardType; import mage.utils.CardUtil; import mage.utils.ThreadUtils; import mage.view.CardView; @@ -14,7 +14,6 @@ import javax.swing.*; import java.awt.*; import java.util.ArrayList; import java.util.List; -import mage.abilities.SpellAbility; /** * Card info pane for displaying card rules. @@ -263,7 +262,7 @@ public class CardInfoPaneImpl extends JEditorPane implements CardInfoPane { for (String superType : card.getSuperTypes()) { types += superType + " "; } - for (Constants.CardType cardType : card.getCardTypes()) { + for (CardType cardType : card.getCardTypes()) { types += cardType.toString() + " "; } if (card.getSubTypes().size() > 0) { diff --git a/Mage.Common/src/mage/interfaces/rate/RateCallback.java b/Mage.Common/src/mage/interfaces/rate/RateCallback.java index 61f3b4fc07c..69a58963820 100644 --- a/Mage.Common/src/mage/interfaces/rate/RateCallback.java +++ b/Mage.Common/src/mage/interfaces/rate/RateCallback.java @@ -1,8 +1,9 @@ package mage.interfaces.rate; import java.util.List; -import mage.Constants; + import mage.cards.Card; +import mage.constants.ColoredManaSymbol; /** * Interface for the class responsible for rating cards. @@ -11,5 +12,5 @@ import mage.cards.Card; */ public interface RateCallback { int rateCard(Card card); - Card getBestBasicLand(Constants.ColoredManaSymbol color, List setsToUse); + Card getBestBasicLand(ColoredManaSymbol color, List setsToUse); } \ No newline at end of file diff --git a/Mage.Common/src/mage/utils/CardUtil.java b/Mage.Common/src/mage/utils/CardUtil.java index 190e05688bb..28a075b1d80 100644 --- a/Mage.Common/src/mage/utils/CardUtil.java +++ b/Mage.Common/src/mage/utils/CardUtil.java @@ -1,6 +1,6 @@ package mage.utils; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.cards.Card; import mage.cards.MagePermanent; import mage.view.CardView; diff --git a/Mage.Common/src/mage/utils/DeckBuilder.java b/Mage.Common/src/mage/utils/DeckBuilder.java index 7a3a1d8b6a3..a37d270993a 100644 --- a/Mage.Common/src/mage/utils/DeckBuilder.java +++ b/Mage.Common/src/mage/utils/DeckBuilder.java @@ -1,7 +1,7 @@ package mage.utils; -import mage.Constants; -import mage.Constants.ColoredManaSymbol; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; import mage.Mana; import mage.cards.Card; import mage.cards.decks.Deck; @@ -210,13 +210,13 @@ public class DeckBuilder { this.card = card; int type = 0; - if (card.getCardType().contains(Constants.CardType.CREATURE)) { + if (card.getCardType().contains(CardType.CREATURE)) { type = 10; } else if (card.getSubtype().contains("Equipment")) { type = 8; } else if (card.getSubtype().contains("Aura")) { type = 5; - } else if (card.getCardType().contains(Constants.CardType.INSTANT)) { + } else if (card.getCardType().contains(CardType.INSTANT)) { type = 7; } else { type = 6; diff --git a/Mage.Common/src/mage/view/AbilityView.java b/Mage.Common/src/mage/view/AbilityView.java index 738f8e75996..bfc6e6fe858 100644 --- a/Mage.Common/src/mage/view/AbilityView.java +++ b/Mage.Common/src/mage/view/AbilityView.java @@ -29,7 +29,7 @@ package mage.view; import java.util.ArrayList; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Common/src/mage/view/CardView.java b/Mage.Common/src/mage/view/CardView.java index 8eaa9922091..1c27582361f 100644 --- a/Mage.Common/src/mage/view/CardView.java +++ b/Mage.Common/src/mage/view/CardView.java @@ -28,12 +28,13 @@ package mage.view; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageObject; import mage.ObjectColor; import mage.cards.Card; +import mage.constants.SpellAbilityType; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.permanent.Permanent; import mage.game.permanent.PermanentToken; @@ -112,7 +113,7 @@ public class CardView extends SimpleCardView { if (card.isSplitCard()) { splitCard = (SplitCard) card; } else { - if (card instanceof Spell && ((Spell) card).getSpellAbility().getSpellAbilityType().equals(Constants.SpellAbilityType.SPLIT_FUSED)) { + if (card instanceof Spell && ((Spell) card).getSpellAbility().getSpellAbilityType().equals(SpellAbilityType.SPLIT_FUSED)) { splitCard = (SplitCard) ((Spell) card).getCard(); } } @@ -217,7 +218,7 @@ public class CardView extends SimpleCardView { this.rarity = Rarity.NA; this.rules = new ArrayList(); this.rules.add(stackAbility.getRule()); - if (stackAbility.getZone().equals(Constants.Zone.COMMAND)) { + if (stackAbility.getZone().equals(Zone.COMMAND)) { this.expansionSetCode = stackAbility.getExpansionSetCode(); } } diff --git a/Mage.Common/src/mage/view/CardsView.java b/Mage.Common/src/mage/view/CardsView.java index 7ad9d823fba..73dedc96534 100644 --- a/Mage.Common/src/mage/view/CardsView.java +++ b/Mage.Common/src/mage/view/CardsView.java @@ -28,7 +28,7 @@ package mage.view; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.Effect; @@ -39,7 +39,6 @@ import mage.game.permanent.Permanent; import mage.target.targetpointer.TargetPointer; import java.util.*; -import static mage.Constants.Zone.STACK; /** * diff --git a/Mage.Common/src/mage/view/GameView.java b/Mage.Common/src/mage/view/GameView.java index dd396ed263f..09d2734ea6b 100644 --- a/Mage.Common/src/mage/view/GameView.java +++ b/Mage.Common/src/mage/view/GameView.java @@ -28,12 +28,12 @@ package mage.view; -import mage.Constants; -import mage.Constants.PhaseStep; -import mage.Constants.TurnPhase; +import mage.constants.PhaseStep; +import mage.constants.TurnPhase; import mage.MageObject; import mage.abilities.costs.Cost; import mage.cards.Card; +import mage.constants.Zone; import mage.game.ExileZone; import mage.game.Game; import mage.game.GameState; @@ -176,7 +176,7 @@ public class GameView implements Serializable { } Permanent permanent = game.getPermanent(card.getId()); if (permanent == null) { - permanent = (Permanent)game.getLastKnownInformation(card.getId(), Constants.Zone.BATTLEFIELD); + permanent = (Permanent)game.getLastKnownInformation(card.getId(), Zone.BATTLEFIELD); } if (permanent != null) { if (permanent.isTransformed()) { diff --git a/Mage.Common/src/mage/view/TableView.java b/Mage.Common/src/mage/view/TableView.java index 4d184c301b9..778005e43d1 100644 --- a/Mage.Common/src/mage/view/TableView.java +++ b/Mage.Common/src/mage/view/TableView.java @@ -33,7 +33,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.UUID; -import mage.Constants.TableState; +import mage.constants.TableState; import mage.game.Game; import mage.game.Seat; import mage.game.Table; diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Commander.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Commander.java index d6d10656f78..baa3052a57f 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Commander.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Commander.java @@ -33,10 +33,11 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import mage.Constants; + import mage.cards.Card; import mage.cards.decks.Deck; import mage.cards.decks.DeckValidatorImpl; +import mage.constants.CardType; import mage.filter.FilterMana; /** @@ -133,7 +134,7 @@ public class Commander extends DeckValidatorImpl { if(deck.getSideboard().size() == 1){ Card commander = (Card)deck.getSideboard().toArray()[0]; - if(commander != null && commander.getCardType().contains(Constants.CardType.CREATURE) && commander.getSupertype().contains("Legendary")){ + if(commander != null && commander.getCardType().contains(CardType.CREATURE) && commander.getSupertype().contains("Legendary")){ FilterMana color = getColorIdentity(commander); for(Card card : deck.getCards()){ if(!cardHasValideColor(color, card)){ diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Extended.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Extended.java index d082d6844d1..144ffd7e77d 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Extended.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Extended.java @@ -30,7 +30,7 @@ package mage.deck; import java.util.Calendar; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.cards.decks.Constructed; import mage.cards.Sets; diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Modern.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Modern.java index a89d5dde68b..28002caa01c 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Modern.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Modern.java @@ -28,7 +28,7 @@ package mage.deck; import java.util.Date; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.cards.Sets; import mage.cards.decks.Constructed; diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Standard.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Standard.java index ea322f39e75..8232a053fe3 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Standard.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Standard.java @@ -30,7 +30,7 @@ package mage.deck; import java.util.Calendar; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.cards.decks.Constructed; import mage.cards.Sets; diff --git a/Mage.Server.Plugins/Mage.Game.CommanderDuel/src/mage/game/CommanderDuel.java b/Mage.Server.Plugins/Mage.Game.CommanderDuel/src/mage/game/CommanderDuel.java index fba3eedfa04..e7bf9f418c3 100644 --- a/Mage.Server.Plugins/Mage.Game.CommanderDuel/src/mage/game/CommanderDuel.java +++ b/Mage.Server.Plugins/Mage.Game.CommanderDuel/src/mage/game/CommanderDuel.java @@ -31,9 +31,9 @@ package mage.game; import java.util.HashSet; import java.util.Set; import java.util.UUID; -import mage.Constants.MultiplayerAttackOption; -import mage.Constants.PhaseStep; -import mage.Constants.RangeOfInfluence; +import mage.constants.MultiplayerAttackOption; +import mage.constants.PhaseStep; +import mage.constants.RangeOfInfluence; import mage.game.match.MatchType; import mage.game.turn.TurnMod; diff --git a/Mage.Server.Plugins/Mage.Game.FreeForAll/src/mage/game/FreeForAll.java b/Mage.Server.Plugins/Mage.Game.FreeForAll/src/mage/game/FreeForAll.java index 3c271cf8896..e51fe9422e1 100644 --- a/Mage.Server.Plugins/Mage.Game.FreeForAll/src/mage/game/FreeForAll.java +++ b/Mage.Server.Plugins/Mage.Game.FreeForAll/src/mage/game/FreeForAll.java @@ -31,8 +31,8 @@ package mage.game; import java.util.HashSet; import java.util.Set; import java.util.UUID; -import mage.Constants.MultiplayerAttackOption; -import mage.Constants.RangeOfInfluence; +import mage.constants.MultiplayerAttackOption; +import mage.constants.RangeOfInfluence; import mage.game.match.MatchType; /** diff --git a/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuel.java b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuel.java index 9ffb138a7b4..b544dce73ce 100644 --- a/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuel.java +++ b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuel.java @@ -31,9 +31,9 @@ package mage.game; import java.util.HashSet; import java.util.Set; import java.util.UUID; -import mage.Constants.MultiplayerAttackOption; -import mage.Constants.PhaseStep; -import mage.Constants.RangeOfInfluence; +import mage.constants.MultiplayerAttackOption; +import mage.constants.PhaseStep; +import mage.constants.RangeOfInfluence; import mage.game.match.MatchType; import mage.game.turn.TurnMod; diff --git a/Mage.Server.Plugins/Mage.Player.AI.DraftBot/src/mage/player/ai/ComputerDraftPlayer.java b/Mage.Server.Plugins/Mage.Player.AI.DraftBot/src/mage/player/ai/ComputerDraftPlayer.java index 31e514b2387..28f802006a1 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.DraftBot/src/mage/player/ai/ComputerDraftPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.AI.DraftBot/src/mage/player/ai/ComputerDraftPlayer.java @@ -28,7 +28,7 @@ package mage.player.ai; -import mage.Constants.RangeOfInfluence; +import mage.constants.RangeOfInfluence; import mage.game.Game; import mage.players.Player; diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java index 0259508d910..6a055369af1 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java @@ -27,9 +27,9 @@ */ package mage.player.ai; -import mage.Constants.Outcome; -import mage.Constants.PhaseStep; -import mage.Constants.RangeOfInfluence; +import mage.constants.Outcome; +import mage.constants.PhaseStep; +import mage.constants.RangeOfInfluence; import mage.abilities.Ability; import mage.abilities.ActivatedAbility; import mage.abilities.SpellAbility; diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer7.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer7.java index aaf726cdc0d..14a6cdde2c3 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer7.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer7.java @@ -28,8 +28,8 @@ package mage.player.ai; -import mage.Constants; -import mage.Constants.RangeOfInfluence; +import mage.constants.PhaseStep; +import mage.constants.RangeOfInfluence; import mage.abilities.Ability; import mage.game.Game; import mage.game.combat.Combat; @@ -306,7 +306,7 @@ public class ComputerPlayer7 extends ComputerPlayer6 implements Player { logger.debug("interrupted"); return GameStateEvaluator2.evaluate(playerId, game); } - if (game.getTurn().getStepType() != Constants.PhaseStep.DECLARE_BLOCKERS) { + if (game.getTurn().getStepType() != PhaseStep.DECLARE_BLOCKERS) { game.getTurn().setPhase(new CombatPhase()); if (game.getPhase().beginPhase(game, game.getActivePlayerId())) { simulateStep(game, new BeginCombatStep()); diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ma/ArtificialScoringSystem.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ma/ArtificialScoringSystem.java index a1bce6b15ab..5e5f1542bc5 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ma/ArtificialScoringSystem.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ma/ArtificialScoringSystem.java @@ -1,15 +1,15 @@ package mage.player.ai.ma; -import mage.Constants; import mage.abilities.Ability; import mage.abilities.keyword.HasteAbility; import mage.cards.Card; +import mage.constants.CardType; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; import java.util.UUID; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.effects.Effect; /** @@ -28,7 +28,7 @@ public class ArtificialScoringSystem { public static int getCardDefinitionScore(final Game game, final Card card) { int value = 3; //TODO: add new rating system card value - if (card.getCardType().contains(Constants.CardType.LAND)) { + if (card.getCardType().contains(CardType.LAND)) { int score = (int) ((value / 2.0f) * 50); //TODO: check this for "any color" lands //TODO: check this for dual and filter lands @@ -40,7 +40,7 @@ public class ArtificialScoringSystem { } final int score = value * 100 - card.getManaCost().convertedManaCost() * 20; - if (card.getCardType().contains(Constants.CardType.CREATURE)) { + if (card.getCardType().contains(CardType.CREATURE)) { return score + (card.getPower().getValue() + card.getToughness().getValue()) * 10; } else { return score + (/*card.getRemoval()*50*/ +card.getRarity().getRating() * 30); @@ -50,7 +50,7 @@ public class ArtificialScoringSystem { public static int getFixedPermanentScore(final Game game, final Permanent permanent) { //TODO: cache it inside Card int score = getCardDefinitionScore(game, permanent); - if (permanent.getCardType().contains(Constants.CardType.CREATURE)) { + if (permanent.getCardType().contains(CardType.CREATURE)) { // TODO: implement in the mage core //score + =cardDefinition.getActivations().size()*50; //score += cardDefinition.getManaActivations().size()*80; @@ -71,7 +71,7 @@ public class ArtificialScoringSystem { if (!canTap(permanent)) { score += getTappedScore(permanent); } - if (permanent.getCardType().contains(Constants.CardType.CREATURE)) { + if (permanent.getCardType().contains(CardType.CREATURE)) { final int power = permanent.getPower().getValue(); final int toughness = permanent.getToughness().getValue(); int abilityScore = 0; @@ -86,7 +86,7 @@ public class ArtificialScoringSystem { for (UUID uuid : permanent.getAttachments()) { Card card = game.getCard(uuid); if (card != null) { - if (card.getCardType().contains(Constants.CardType.ENCHANTMENT)) { + if (card.getCardType().contains(CardType.ENCHANTMENT)) { Effect effect = card.getSpellAbility().getEffects().get(0); if (effect != null) { Outcome outcome = effect.getOutcome(); @@ -117,7 +117,7 @@ public class ArtificialScoringSystem { private static boolean canTap(Permanent permanent) { return !permanent.isTapped() &&(!permanent.hasSummoningSickness() - ||!permanent.getCardType().contains(Constants.CardType.CREATURE) + ||!permanent.getCardType().contains(CardType.CREATURE) ||permanent.getAbilities().contains(HasteAbility.getInstance())); } @@ -126,9 +126,9 @@ public class ArtificialScoringSystem { } public static int getTappedScore(final Permanent permanent) { - if (permanent.getCardType().contains(Constants.CardType.CREATURE)) { + if (permanent.getCardType().contains(CardType.CREATURE)) { return -100; - } else if (permanent.getCardType().contains(Constants.CardType.LAND)) { + } else if (permanent.getCardType().contains(CardType.LAND)) { return -1; } else { return -2; diff --git a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java index 9651f5ceacb..ba03a462982 100644 --- a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java @@ -28,7 +28,6 @@ package mage.player.ai; -import mage.Constants.*; import mage.MageObject; import mage.Mana; import mage.abilities.*; @@ -50,6 +49,7 @@ import mage.cards.repository.CardCriteria; import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; import mage.choices.Choice; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.*; import mage.game.Game; @@ -80,10 +80,6 @@ import java.io.IOException; import java.io.Serializable; import java.util.*; import java.util.Map.Entry; -import static mage.Constants.SpellAbilityType.SPLIT; -import static mage.Constants.SpellAbilityType.SPLIT_FUSED; - - /** diff --git a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/PermanentEvaluator.java b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/PermanentEvaluator.java index 1635ee53255..016c1868f22 100644 --- a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/PermanentEvaluator.java +++ b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/PermanentEvaluator.java @@ -31,8 +31,8 @@ package mage.player.ai; import java.util.HashMap; import java.util.Map; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/utils/RateCard.java b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/utils/RateCard.java index b70c3817537..e031ca23e21 100644 --- a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/utils/RateCard.java +++ b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/utils/RateCard.java @@ -1,10 +1,12 @@ package mage.player.ai.utils; -import mage.Constants; import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.Card; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Outcome; import mage.target.Target; import mage.target.common.TargetCreatureOrPlayer; import mage.target.common.TargetCreaturePermanent; @@ -47,20 +49,20 @@ public class RateCard { * @param card * @return */ - public static int rateCard(Card card, List allowedColors) { + public static int rateCard(Card card, List allowedColors) { if (allowedColors == null && rated.containsKey(card.getName())) { return rated.get(card.getName()); } int type = 0; - if (card.getCardType().contains(Constants.CardType.PLANESWALKER)) { + if (card.getCardType().contains(CardType.PLANESWALKER)) { type = 15; - } if (card.getCardType().contains(Constants.CardType.CREATURE)) { + } if (card.getCardType().contains(CardType.CREATURE)) { type = 10; } else if (card.getSubtype().contains("Equipment")) { type = 8; } else if (card.getSubtype().contains("Aura")) { type = 5; - } else if (card.getCardType().contains(Constants.CardType.INSTANT)) { + } else if (card.getCardType().contains(CardType.INSTANT)) { type = 7; } else { type = 6; @@ -73,16 +75,16 @@ public class RateCard { } private static int isRemoval(Card card) { - if (card.getSubtype().contains("Aura") || card.getCardType().contains(Constants.CardType.INSTANT) - || card.getCardType().contains(Constants.CardType.SORCERY)) { + if (card.getSubtype().contains("Aura") || card.getCardType().contains(CardType.INSTANT) + || card.getCardType().contains(CardType.SORCERY)) { for (Ability ability : card.getAbilities()) { for (Effect effect : ability.getEffects()) { - if (effect.getOutcome().equals(Constants.Outcome.Removal)) { + if (effect.getOutcome().equals(Outcome.Removal)) { log.debug("Found removal: " + card.getName()); return 1; } - if (effect.getOutcome().equals(Constants.Outcome.Damage)) { + if (effect.getOutcome().equals(Outcome.Damage)) { if (effect instanceof DamageTargetEffect) { DamageTargetEffect damageEffect = (DamageTargetEffect) effect; if (damageEffect.getAmount() > 1) { @@ -95,7 +97,7 @@ public class RateCard { } } } - if (effect.getOutcome().equals(Constants.Outcome.DestroyPermanent)) { + if (effect.getOutcome().equals(Outcome.DestroyPermanent)) { for (Target target : ability.getTargets()) { if (target instanceof TargetCreaturePermanent) { log.info("Found destroyer: " + card.getName()); @@ -175,7 +177,7 @@ public class RateCard { * @param allowedColors Can be null. * @return */ - private static int getManaCostScore(Card card, List allowedColors) { + private static int getManaCostScore(Card card, List allowedColors) { int converted = card.getManaCost().convertedManaCost(); if (allowedColors == null) { int colorPenalty = 0; @@ -192,7 +194,7 @@ public class RateCard { int count = 0; symbol = symbol.replace("{", "").replace("}", ""); if (isColoredMana(symbol)) { - for (Constants.ColoredManaSymbol allowed : allowedColors) { + for (ColoredManaSymbol allowed : allowedColors) { if (allowed.toString().equals(symbol)) { count++; } diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/ComputerPlayerMCTS.java b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/ComputerPlayerMCTS.java index 4af5926dbff..f0922964fa8 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/ComputerPlayerMCTS.java +++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/ComputerPlayerMCTS.java @@ -27,9 +27,9 @@ */ package mage.player.ai; -import mage.Constants.PhaseStep; -import mage.Constants.RangeOfInfluence; -import mage.Constants.Zone; +import mage.constants.PhaseStep; +import mage.constants.RangeOfInfluence; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.ActivatedAbility; import mage.abilities.common.PassAbility; diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSNode.java b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSNode.java index 561229311db..34e3ab323ab 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSNode.java +++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSNode.java @@ -31,8 +31,8 @@ import java.util.ArrayDeque; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import mage.Constants.PhaseStep; -import mage.Constants.Zone; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.ActivatedAbility; import mage.abilities.PlayLandAbility; diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/SimulatedPlayerMCTS.java b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/SimulatedPlayerMCTS.java index ae1c92bde5c..ab85da55bce 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/SimulatedPlayerMCTS.java +++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/SimulatedPlayerMCTS.java @@ -27,7 +27,7 @@ */ package mage.player.ai; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.*; import mage.abilities.common.PassAbility; import mage.abilities.costs.mana.GenericManaCost; diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer2.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer2.java index e79cae270e2..fb3c1ce7005 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer2.java +++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer2.java @@ -28,9 +28,9 @@ package mage.player.ai; -import mage.Constants.Outcome; -import mage.Constants.PhaseStep; -import mage.Constants.RangeOfInfluence; +import mage.constants.Outcome; +import mage.constants.PhaseStep; +import mage.constants.RangeOfInfluence; import mage.abilities.Ability; import mage.abilities.ActivatedAbility; import mage.abilities.common.PassAbility; diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer3.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer3.java index 1aa4d27b6fe..b70b33bce50 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer3.java +++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer3.java @@ -28,8 +28,8 @@ package mage.player.ai; -import mage.Constants.PhaseStep; -import mage.Constants.RangeOfInfluence; +import mage.constants.PhaseStep; +import mage.constants.RangeOfInfluence; import mage.abilities.Ability; import mage.game.Game; import mage.game.combat.Combat; diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/GameStateEvaluator.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/GameStateEvaluator.java index 5b0ec65e48e..88c590ba20e 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/GameStateEvaluator.java +++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/GameStateEvaluator.java @@ -29,8 +29,8 @@ package mage.player.ai; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Zone; import mage.abilities.ActivatedAbility; import mage.abilities.keyword.DoubleStrikeAbility; import mage.abilities.keyword.FirstStrikeAbility; 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 dceba348ca0..79165bf6b9a 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 @@ -30,11 +30,9 @@ package mage.player.human; import java.io.Serializable; import java.util.*; -import mage.Constants.Outcome; -import mage.Constants.RangeOfInfluence; -import static mage.Constants.SpellAbilityType.SPLIT; -import static mage.Constants.SpellAbilityType.SPLIT_FUSED; -import mage.Constants.Zone; +import mage.constants.Outcome; +import mage.constants.RangeOfInfluence; +import mage.constants.Zone; import mage.MageObject; import mage.abilities.*; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Server/src/main/java/mage/server/TableController.java b/Mage.Server/src/main/java/mage/server/TableController.java index 3e4d6895ae1..44f1fd3c43b 100644 --- a/Mage.Server/src/main/java/mage/server/TableController.java +++ b/Mage.Server/src/main/java/mage/server/TableController.java @@ -34,8 +34,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import mage.Constants.RangeOfInfluence; -import mage.Constants.TableState; +import mage.constants.RangeOfInfluence; +import mage.constants.TableState; import mage.MageException; import mage.cards.decks.Deck; import mage.cards.decks.DeckCardLists; diff --git a/Mage.Server/src/main/java/mage/server/TableManager.java b/Mage.Server/src/main/java/mage/server/TableManager.java index 2cde70aed9c..1b565fe3a69 100644 --- a/Mage.Server/src/main/java/mage/server/TableManager.java +++ b/Mage.Server/src/main/java/mage/server/TableManager.java @@ -33,10 +33,11 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import mage.Constants; + import mage.MageException; import mage.cards.decks.Deck; import mage.cards.decks.DeckCardLists; +import mage.constants.TableState; import mage.game.GameException; import mage.game.Table; import mage.game.draft.Draft; @@ -303,7 +304,7 @@ public class TableManager { Date now = new Date(); List toRemove = new ArrayList(); for (Table table : tables.values()) { - if (!table.getState().equals(Constants.TableState.FINISHED)) { + if (!table.getState().equals(TableState.FINISHED)) { // remove all tables created more than expire_time ago long diff = (now.getTime() - table.getCreateTime().getTime()) / EXPIRE_TIME_UNIT_VALUE; if (diff >= EXPIRE_TIME) { diff --git a/Mage.Server/src/main/java/mage/server/challenge/ChallengeManager.java b/Mage.Server/src/main/java/mage/server/challenge/ChallengeManager.java index cdc0ad1c695..d04e7f9d987 100644 --- a/Mage.Server/src/main/java/mage/server/challenge/ChallengeManager.java +++ b/Mage.Server/src/main/java/mage/server/challenge/ChallengeManager.java @@ -3,7 +3,8 @@ package mage.server.challenge; import java.util.HashMap; import java.util.Map; import java.util.UUID; -import mage.Constants; + +import mage.constants.Zone; import mage.game.match.Match; /** @@ -19,8 +20,8 @@ public class ChallengeManager { } public void prepareChallenge(UUID playerId, Match match) { - Map commands = new HashMap(); - commands.put(Constants.Zone.OUTSIDE, "life:3"); + Map commands = new HashMap(); + commands.put(Zone.OUTSIDE, "life:3"); match.getGame().cheat(playerId, commands); } } diff --git a/Mage.Server/src/main/java/mage/server/game/GameController.java b/Mage.Server/src/main/java/mage/server/game/GameController.java index 5f7f93654fb..bd8c491074b 100644 --- a/Mage.Server/src/main/java/mage/server/game/GameController.java +++ b/Mage.Server/src/main/java/mage/server/game/GameController.java @@ -28,7 +28,7 @@ package mage.server.game; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.MageException; import mage.abilities.Ability; import mage.cards.Card; diff --git a/Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java b/Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java index 8a3152596a7..d020e940c80 100644 --- a/Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java +++ b/Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java @@ -38,7 +38,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import mage.Constants.TableState; +import mage.constants.TableState; import mage.MageException; import mage.cards.decks.DeckCardLists; import mage.game.GameException; diff --git a/Mage.Server/src/main/java/mage/server/game/PlayerFactory.java b/Mage.Server/src/main/java/mage/server/game/PlayerFactory.java index 1b96015796a..7751f22a395 100644 --- a/Mage.Server/src/main/java/mage/server/game/PlayerFactory.java +++ b/Mage.Server/src/main/java/mage/server/game/PlayerFactory.java @@ -32,7 +32,7 @@ import java.lang.reflect.Constructor; import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; -import mage.Constants.RangeOfInfluence; +import mage.constants.RangeOfInfluence; import mage.players.Player; import org.apache.log4j.Logger; diff --git a/Mage.Server/src/main/java/mage/server/util/SystemUtil.java b/Mage.Server/src/main/java/mage/server/util/SystemUtil.java index b7677acdcd7..661453db0cf 100644 --- a/Mage.Server/src/main/java/mage/server/util/SystemUtil.java +++ b/Mage.Server/src/main/java/mage/server/util/SystemUtil.java @@ -1,9 +1,9 @@ package mage.server.util; -import mage.Constants; import mage.cards.Card; import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; @@ -70,15 +70,15 @@ public class SystemUtil { continue; } - Constants.Zone gameZone; + Zone gameZone; if ("hand".equalsIgnoreCase(zone)) { - gameZone = Constants.Zone.HAND; + gameZone = Zone.HAND; } else if ("battlefield".equalsIgnoreCase(zone)) { - gameZone = Constants.Zone.BATTLEFIELD; + gameZone = Zone.BATTLEFIELD; } else if ("graveyard".equalsIgnoreCase(zone)) { - gameZone = Constants.Zone.GRAVEYARD; + gameZone = Zone.GRAVEYARD; } else if ("library".equalsIgnoreCase(zone)) { - gameZone = Constants.Zone.LIBRARY; + gameZone = Zone.LIBRARY; } else { continue; // go parse next line } @@ -121,11 +121,11 @@ public class SystemUtil { * @param game * @param card Card to put to player's hand */ - private static void swapWithAnyCard(Game game, Player player, Card card, Constants.Zone zone) { - if (zone.equals(Constants.Zone.BATTLEFIELD)) { - card.putOntoBattlefield(game, Constants.Zone.OUTSIDE, null, player.getId()); - } else if (zone.equals(Constants.Zone.LIBRARY)) { - game.setZone(card.getId(), Constants.Zone.LIBRARY); + private static void swapWithAnyCard(Game game, Player player, Card card, Zone zone) { + if (zone.equals(Zone.BATTLEFIELD)) { + card.putOntoBattlefield(game, Zone.OUTSIDE, null, player.getId()); + } else if (zone.equals(Zone.LIBRARY)) { + game.setZone(card.getId(), Zone.LIBRARY); player.getLibrary().putOnTop(card, game); } else { card.moveToZone(zone, null, game, false); diff --git a/Mage.Sets/src/mage/sets/AlaraReborn.java b/Mage.Sets/src/mage/sets/AlaraReborn.java index 5e6e5503bd9..77696b94e03 100644 --- a/Mage.Sets/src/mage/sets/AlaraReborn.java +++ b/Mage.Sets/src/mage/sets/AlaraReborn.java @@ -29,7 +29,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -45,7 +45,7 @@ public class AlaraReborn extends ExpansionSet { } private AlaraReborn() { - super("Alara Reborn", "ARB", "seticon_mtgarb", "mage.sets.alarareborn", new GregorianCalendar(2009, 3, 25).getTime(), SetType.EXPANSION); + super("Alara Reborn", "ARB", "mage.sets.alarareborn", new GregorianCalendar(2009, 3, 25).getTime(), SetType.EXPANSION); this.blockName = "Shards of Alara"; this.parentSet = ShardsOfAlara.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/Alliances.java b/Mage.Sets/src/mage/sets/Alliances.java index 8343a639dad..6ee8f233ae8 100644 --- a/Mage.Sets/src/mage/sets/Alliances.java +++ b/Mage.Sets/src/mage/sets/Alliances.java @@ -1,7 +1,7 @@ package mage.sets; -import mage.Constants; import mage.cards.ExpansionSet; +import mage.constants.SetType; import java.util.GregorianCalendar; @@ -13,7 +13,7 @@ public class Alliances extends ExpansionSet { } private Alliances() { - super("Alliances", "ALL", "", "mage.sets.alliances", new GregorianCalendar(1996, 6, 10).getTime(), Constants.SetType.EXPANSION); + super("Alliances", "ALL", "mage.sets.alliances", new GregorianCalendar(1996, 6, 10).getTime(), SetType.EXPANSION); this.blockName = "Ice Age"; this.parentSet = IceAge.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/Antiquities.java b/Mage.Sets/src/mage/sets/Antiquities.java index 32b997992eb..00ebb3ea458 100644 --- a/Mage.Sets/src/mage/sets/Antiquities.java +++ b/Mage.Sets/src/mage/sets/Antiquities.java @@ -28,8 +28,9 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants; + import mage.cards.ExpansionSet; +import mage.constants.SetType; /** * @@ -44,7 +45,7 @@ public class Antiquities extends ExpansionSet { } private Antiquities() { - super("Antiquities", "ATQ", "", "mage.sets.antiquities", new GregorianCalendar(1994, 2, 1).getTime(), Constants.SetType.EXPANSION); + super("Antiquities", "ATQ", "mage.sets.antiquities", new GregorianCalendar(1994, 2, 1).getTime(), SetType.EXPANSION); this.hasBasicLands = false; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/Apocalypse.java b/Mage.Sets/src/mage/sets/Apocalypse.java index a342bdfaedc..a03208af462 100644 --- a/Mage.Sets/src/mage/sets/Apocalypse.java +++ b/Mage.Sets/src/mage/sets/Apocalypse.java @@ -1,8 +1,9 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants; + import mage.cards.ExpansionSet; +import mage.constants.SetType; public class Apocalypse extends ExpansionSet { @@ -13,7 +14,7 @@ public class Apocalypse extends ExpansionSet { } private Apocalypse() { - super("Apocalypse", "APC", "", "mage.sets.apocalypse", new GregorianCalendar(2001, 5, 1).getTime(), Constants.SetType.EXPANSION); + super("Apocalypse", "APC", "mage.sets.apocalypse", new GregorianCalendar(2001, 5, 1).getTime(), SetType.EXPANSION); this.blockName = "Invasion"; this.parentSet = Invasion.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/ArabianNights.java b/Mage.Sets/src/mage/sets/ArabianNights.java index 3f7d5825558..bbcd990407e 100644 --- a/Mage.Sets/src/mage/sets/ArabianNights.java +++ b/Mage.Sets/src/mage/sets/ArabianNights.java @@ -28,8 +28,9 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants; + import mage.cards.ExpansionSet; +import mage.constants.SetType; /** * @@ -44,7 +45,7 @@ public class ArabianNights extends ExpansionSet { } private ArabianNights() { - super("Arabian Nights", "ARN", "", "mage.sets.arabiannights", new GregorianCalendar(1993, 11, 1).getTime(), Constants.SetType.EXPANSION); + super("Arabian Nights", "ARN", "mage.sets.arabiannights", new GregorianCalendar(1993, 11, 1).getTime(), SetType.EXPANSION); this.hasBasicLands = false; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/AvacynRestored.java b/Mage.Sets/src/mage/sets/AvacynRestored.java index 8977ba80143..64d641ad963 100644 --- a/Mage.Sets/src/mage/sets/AvacynRestored.java +++ b/Mage.Sets/src/mage/sets/AvacynRestored.java @@ -28,7 +28,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -44,7 +44,7 @@ public class AvacynRestored extends ExpansionSet { } private AvacynRestored() { - super("Avacyn Restored", "AVR", "seticon_mtgavr", "mage.sets.avacynrestored", new GregorianCalendar(2012, 4, 4).getTime(), SetType.EXPANSION); + super("Avacyn Restored", "AVR", "mage.sets.avacynrestored", new GregorianCalendar(2012, 4, 4).getTime(), SetType.EXPANSION); this.blockName = "Innistrad"; this.parentSet = Innistrad.getInstance(); this.hasBoosters = true; diff --git a/Mage.Sets/src/mage/sets/BetrayersOfKamigawa.java b/Mage.Sets/src/mage/sets/BetrayersOfKamigawa.java index 1c3a00757f1..23ce1454e13 100644 --- a/Mage.Sets/src/mage/sets/BetrayersOfKamigawa.java +++ b/Mage.Sets/src/mage/sets/BetrayersOfKamigawa.java @@ -28,7 +28,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -44,7 +44,7 @@ public class BetrayersOfKamigawa extends ExpansionSet { } private BetrayersOfKamigawa() { - super("Betrayers of Kamigawa", "BOK", "", "mage.sets.betrayersofkamigawa", new GregorianCalendar(2005, 1, 4).getTime(), SetType.EXPANSION); + super("Betrayers of Kamigawa", "BOK", "mage.sets.betrayersofkamigawa", new GregorianCalendar(2005, 1, 4).getTime(), SetType.EXPANSION); this.blockName = "Kamigawa"; this.parentSet = ChampionsOfKamigawa.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java b/Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java index e049b5be447..9764263fa5a 100644 --- a/Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java +++ b/Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java @@ -1,7 +1,7 @@ package mage.sets; -import mage.Constants; import mage.cards.ExpansionSet; +import mage.constants.SetType; import java.util.GregorianCalendar; @@ -13,7 +13,7 @@ public class ChampionsOfKamigawa extends ExpansionSet { } private ChampionsOfKamigawa() { - super("Champions of Kamigawa", "CHK", "", "mage.sets.championsofkamigawa", new GregorianCalendar(2004, 9, 1).getTime(), Constants.SetType.EXPANSION); + super("Champions of Kamigawa", "CHK", "mage.sets.championsofkamigawa", new GregorianCalendar(2004, 9, 1).getTime(), SetType.EXPANSION); this.blockName = "Kamigawa"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/Coldsnap.java b/Mage.Sets/src/mage/sets/Coldsnap.java index 702a9f34773..0810b0b4b3d 100644 --- a/Mage.Sets/src/mage/sets/Coldsnap.java +++ b/Mage.Sets/src/mage/sets/Coldsnap.java @@ -28,8 +28,9 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants; + import mage.cards.ExpansionSet; +import mage.constants.SetType; /** * @@ -44,7 +45,7 @@ public class Coldsnap extends ExpansionSet { } private Coldsnap() { - super("Coldsnap", "CSP", "", "mage.sets.coldsnap", new GregorianCalendar(2006, 6, 21).getTime(), Constants.SetType.EXPANSION); + super("Coldsnap", "CSP", "mage.sets.coldsnap", new GregorianCalendar(2006, 6, 21).getTime(), SetType.EXPANSION); this.blockName = "Ice Age"; this.hasBoosters = true; this.numBoosterLands = 0; diff --git a/Mage.Sets/src/mage/sets/Commander.java b/Mage.Sets/src/mage/sets/Commander.java index f6437949259..94e0bc9fbc7 100644 --- a/Mage.Sets/src/mage/sets/Commander.java +++ b/Mage.Sets/src/mage/sets/Commander.java @@ -29,7 +29,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -47,7 +47,7 @@ public class Commander extends ExpansionSet { } private Commander() { - super("Magic: The Gathering-Commander", "CMD", "", "mage.sets.commander", new GregorianCalendar(2011, 6, 17).getTime(), SetType.REPRINT); + super("Magic: The Gathering-Commander", "CMD", "mage.sets.commander", new GregorianCalendar(2011, 6, 17).getTime(), SetType.REPRINT); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/Conflux.java b/Mage.Sets/src/mage/sets/Conflux.java index c3a2e94848d..03568e8eea0 100644 --- a/Mage.Sets/src/mage/sets/Conflux.java +++ b/Mage.Sets/src/mage/sets/Conflux.java @@ -29,7 +29,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -45,7 +45,7 @@ public class Conflux extends ExpansionSet { } private Conflux() { - super("Conflux", "CON", "seticon_conflux", "mage.sets.conflux", new GregorianCalendar(2009, 0, 31).getTime(), SetType.EXPANSION); + super("Conflux", "CON", "mage.sets.conflux", new GregorianCalendar(2009, 0, 31).getTime(), SetType.EXPANSION); this.blockName = "Shards of Alara"; this.parentSet = ShardsOfAlara.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/DarkAscension.java b/Mage.Sets/src/mage/sets/DarkAscension.java index 8addd54499a..9f4b9a09a50 100644 --- a/Mage.Sets/src/mage/sets/DarkAscension.java +++ b/Mage.Sets/src/mage/sets/DarkAscension.java @@ -28,7 +28,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -44,7 +44,7 @@ public class DarkAscension extends ExpansionSet { } private DarkAscension() { - super("Dark Ascension", "DKA", "seticon_mtgdka", "mage.sets.darkascension", new GregorianCalendar(2012, 1, 3).getTime(), SetType.EXPANSION); + super("Dark Ascension", "DKA", "mage.sets.darkascension", new GregorianCalendar(2012, 1, 3).getTime(), SetType.EXPANSION); this.blockName = "Innistrad"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/Darksteel.java b/Mage.Sets/src/mage/sets/Darksteel.java index 4cb8f530bbe..7fe4f0f2220 100644 --- a/Mage.Sets/src/mage/sets/Darksteel.java +++ b/Mage.Sets/src/mage/sets/Darksteel.java @@ -1,7 +1,7 @@ package mage.sets; -import mage.Constants; import mage.cards.ExpansionSet; +import mage.constants.SetType; import java.util.GregorianCalendar; @@ -14,7 +14,7 @@ public class Darksteel extends ExpansionSet { } public Darksteel() { - super("Darksteel", "DST", "", "mage.sets.darksteel", new GregorianCalendar(2004, 1, 6).getTime(), Constants.SetType.EXPANSION); + super("Darksteel", "DST", "mage.sets.darksteel", new GregorianCalendar(2004, 1, 6).getTime(), SetType.EXPANSION); this.blockName = "Mirrodin"; this.parentSet = Mirrodin.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/Dissension.java b/Mage.Sets/src/mage/sets/Dissension.java index 22f0044128e..e95f2ae4702 100644 --- a/Mage.Sets/src/mage/sets/Dissension.java +++ b/Mage.Sets/src/mage/sets/Dissension.java @@ -27,8 +27,8 @@ */ package mage.sets; -import mage.Constants; import mage.cards.ExpansionSet; +import mage.constants.SetType; import java.util.GregorianCalendar; @@ -47,7 +47,7 @@ public class Dissension extends ExpansionSet { } private Dissension() { - super("Dissension", "DIS", "", "mage.sets.dissension", new GregorianCalendar(2006, 4, 5).getTime(), Constants.SetType.EXPANSION); + super("Dissension", "DIS", "mage.sets.dissension", new GregorianCalendar(2006, 4, 5).getTime(), SetType.EXPANSION); this.blockName = "Ravnika"; this.parentSet = RavnicaCityOfGuilds.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/DragonsMaze.java b/Mage.Sets/src/mage/sets/DragonsMaze.java index 0935f7a50a9..9103c0c59b2 100644 --- a/Mage.Sets/src/mage/sets/DragonsMaze.java +++ b/Mage.Sets/src/mage/sets/DragonsMaze.java @@ -31,13 +31,14 @@ package mage.sets; import java.util.ArrayList; import java.util.GregorianCalendar; import java.util.List; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.cards.ExpansionSet; import mage.cards.repository.CardCriteria; import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; +import mage.constants.SetType; /** * @@ -54,7 +55,7 @@ public class DragonsMaze extends ExpansionSet { } private DragonsMaze() { - super("Dragon's Maze", "DGM", "seticon_mtggtc", "mage.sets.dragonsmaze", new GregorianCalendar(2013, 5, 03).getTime(), Constants.SetType.EXPANSION); + super("Dragon's Maze", "DGM", "mage.sets.dragonsmaze", new GregorianCalendar(2013, 5, 03).getTime(), SetType.EXPANSION); this.blockName = "Return to Ravnica"; this.hasBoosters = true; this.numBoosterSpecial = 1; @@ -121,7 +122,7 @@ public class DragonsMaze extends ExpansionSet { @Override public List getSpecialMythic() { CardCriteria criteria = new CardCriteria(); - criteria.rarities(Rarity.MYTHIC).setCodes(this.code).types(Constants.CardType.LAND); + criteria.rarities(Rarity.MYTHIC).setCodes(this.code).types(CardType.LAND); return CardRepository.instance.findCards(criteria); } diff --git a/Mage.Sets/src/mage/sets/EighthEdition.java b/Mage.Sets/src/mage/sets/EighthEdition.java index df2c53e69df..f6bd4da845e 100644 --- a/Mage.Sets/src/mage/sets/EighthEdition.java +++ b/Mage.Sets/src/mage/sets/EighthEdition.java @@ -1,7 +1,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; public class EighthEdition extends ExpansionSet { @@ -13,7 +13,7 @@ public class EighthEdition extends ExpansionSet { } private EighthEdition() { - super("Eighth Edition", "8ED", "", "mage.sets.eighthedition", new GregorianCalendar(2003, 7, 28).getTime(), SetType.CORE); + super("Eighth Edition", "8ED", "mage.sets.eighthedition", new GregorianCalendar(2003, 7, 28).getTime(), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 1; this.numBoosterCommon = 10; diff --git a/Mage.Sets/src/mage/sets/ElspethvsTezzeret.java b/Mage.Sets/src/mage/sets/ElspethvsTezzeret.java index c246cf1bc6b..593f89d6bf7 100644 --- a/Mage.Sets/src/mage/sets/ElspethvsTezzeret.java +++ b/Mage.Sets/src/mage/sets/ElspethvsTezzeret.java @@ -1,7 +1,7 @@ package mage.sets; -import mage.Constants; import mage.cards.ExpansionSet; +import mage.constants.SetType; import java.util.GregorianCalendar; @@ -13,6 +13,6 @@ public class ElspethvsTezzeret extends ExpansionSet { } private ElspethvsTezzeret() { - super("Duel Decks: Elspeth vs. Tezzeret", "DDF", "", "mage.sets.elspethvstezzeret", new GregorianCalendar(2010, 8, 3).getTime(), Constants.SetType.REPRINT); + super("Duel Decks: Elspeth vs. Tezzeret", "DDF", "mage.sets.elspethvstezzeret", new GregorianCalendar(2010, 8, 3).getTime(), SetType.REPRINT); } } diff --git a/Mage.Sets/src/mage/sets/Eventide.java b/Mage.Sets/src/mage/sets/Eventide.java index bd6ce65834f..f409e619855 100644 --- a/Mage.Sets/src/mage/sets/Eventide.java +++ b/Mage.Sets/src/mage/sets/Eventide.java @@ -1,7 +1,7 @@ package mage.sets; -import mage.Constants; import mage.cards.ExpansionSet; +import mage.constants.SetType; import java.util.GregorianCalendar; @@ -13,7 +13,7 @@ public class Eventide extends ExpansionSet { } private Eventide() { - super("Eventide", "EVE", "", "mage.sets.eventide", new GregorianCalendar(2008, 6, 25).getTime(), Constants.SetType.EXPANSION); + super("Eventide", "EVE", "mage.sets.eventide", new GregorianCalendar(2008, 6, 25).getTime(), SetType.EXPANSION); this.blockName = "Shadowmoor"; this.parentSet = Shadowmoor.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/Exodus.java b/Mage.Sets/src/mage/sets/Exodus.java index 58b39e22633..9fd9feec573 100644 --- a/Mage.Sets/src/mage/sets/Exodus.java +++ b/Mage.Sets/src/mage/sets/Exodus.java @@ -28,8 +28,9 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants; + import mage.cards.ExpansionSet; +import mage.constants.SetType; /** * @@ -44,7 +45,7 @@ public class Exodus extends ExpansionSet { } private Exodus() { - super("Exodus", "EXO", "", "mage.sets.exodus", new GregorianCalendar(1998, 5, 6).getTime(), Constants.SetType.EXPANSION); + super("Exodus", "EXO", "mage.sets.exodus", new GregorianCalendar(1998, 5, 6).getTime(), SetType.EXPANSION); this.blockName = "Tempest"; this.parentSet = Tempest.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/FallenEmpires.java b/Mage.Sets/src/mage/sets/FallenEmpires.java index 305a19dcc72..34295a5b5c8 100644 --- a/Mage.Sets/src/mage/sets/FallenEmpires.java +++ b/Mage.Sets/src/mage/sets/FallenEmpires.java @@ -28,8 +28,9 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants; + import mage.cards.ExpansionSet; +import mage.constants.SetType; /** * @@ -44,7 +45,7 @@ public class FallenEmpires extends ExpansionSet { } private FallenEmpires() { - super("Fallen Empires", "FEM", "", "mage.sets.fallenempires", new GregorianCalendar(1994, 10, 1).getTime(), Constants.SetType.EXPANSION); + super("Fallen Empires", "FEM", "mage.sets.fallenempires", new GregorianCalendar(1994, 10, 1).getTime(), SetType.EXPANSION); this.hasBasicLands = false; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/FifthDawn.java b/Mage.Sets/src/mage/sets/FifthDawn.java index ef38ba6bd7d..3acbba1f2c0 100644 --- a/Mage.Sets/src/mage/sets/FifthDawn.java +++ b/Mage.Sets/src/mage/sets/FifthDawn.java @@ -28,7 +28,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -44,7 +44,7 @@ public class FifthDawn extends ExpansionSet { } private FifthDawn() { - super("Fifth Dawn", "5DN", "", "mage.sets.fifthdawn", new GregorianCalendar(2004, 5, 4).getTime(), SetType.EXPANSION); + super("Fifth Dawn", "5DN", "mage.sets.fifthdawn", new GregorianCalendar(2004, 5, 4).getTime(), SetType.EXPANSION); this.blockName = "Mirrodin"; this.parentSet = Mirrodin.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/FifthEdition.java b/Mage.Sets/src/mage/sets/FifthEdition.java index 3a1a801dc0b..56b9d933fc4 100644 --- a/Mage.Sets/src/mage/sets/FifthEdition.java +++ b/Mage.Sets/src/mage/sets/FifthEdition.java @@ -1,7 +1,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; public class FifthEdition extends ExpansionSet { @@ -13,7 +13,7 @@ public class FifthEdition extends ExpansionSet { } private FifthEdition() { - super("Fifth Edition", "5ED", "", "mage.sets.fifthedition", new GregorianCalendar(1997, 3, 1).getTime(), SetType.CORE); + super("Fifth Edition", "5ED", "mage.sets.fifthedition", new GregorianCalendar(1997, 3, 1).getTime(), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 1; this.numBoosterCommon = 10; diff --git a/Mage.Sets/src/mage/sets/FourthEdition.java b/Mage.Sets/src/mage/sets/FourthEdition.java index e636c722a4b..46b0f5a8906 100644 --- a/Mage.Sets/src/mage/sets/FourthEdition.java +++ b/Mage.Sets/src/mage/sets/FourthEdition.java @@ -28,8 +28,9 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants; + import mage.cards.ExpansionSet; +import mage.constants.SetType; /** * @@ -44,7 +45,7 @@ public class FourthEdition extends ExpansionSet { } private FourthEdition() { - super("Fourth Edition", "4ED", "", "mage.sets.fourthedition", new GregorianCalendar(1995, 3, 1).getTime(), Constants.SetType.CORE); + super("Fourth Edition", "4ED", "mage.sets.fourthedition", new GregorianCalendar(1995, 3, 1).getTime(), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 1; this.numBoosterCommon = 10; diff --git a/Mage.Sets/src/mage/sets/FutureSight.java b/Mage.Sets/src/mage/sets/FutureSight.java index 296abdd034c..ca70d3b350d 100644 --- a/Mage.Sets/src/mage/sets/FutureSight.java +++ b/Mage.Sets/src/mage/sets/FutureSight.java @@ -28,7 +28,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -44,7 +44,7 @@ public class FutureSight extends ExpansionSet { } private FutureSight() { - super("Future Sight", "FUT", "", "mage.sets.futuresight", new GregorianCalendar(2007, 4, 4).getTime(), SetType.EXPANSION); + super("Future Sight", "FUT", "mage.sets.futuresight", new GregorianCalendar(2007, 4, 4).getTime(), SetType.EXPANSION); this.blockName = "Time Spiral"; this.parentSet = TimeSpiral.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/Gatecrash.java b/Mage.Sets/src/mage/sets/Gatecrash.java index 2e518c7b695..46679ecbbfc 100644 --- a/Mage.Sets/src/mage/sets/Gatecrash.java +++ b/Mage.Sets/src/mage/sets/Gatecrash.java @@ -28,7 +28,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -44,7 +44,7 @@ public class Gatecrash extends ExpansionSet { } private Gatecrash() { - super("Gatecrash", "GTC", "seticon_mtggtc", "mage.sets.gatecrash", new GregorianCalendar(2013, 2, 01).getTime(), SetType.EXPANSION); + super("Gatecrash", "GTC", "mage.sets.gatecrash", new GregorianCalendar(2013, 2, 01).getTime(), SetType.EXPANSION); this.blockName = "Return to Ravnica"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/Guildpact.java b/Mage.Sets/src/mage/sets/Guildpact.java index 67bec1bb491..a23b7723c0d 100644 --- a/Mage.Sets/src/mage/sets/Guildpact.java +++ b/Mage.Sets/src/mage/sets/Guildpact.java @@ -28,8 +28,8 @@ package mage.sets; -import mage.Constants; import mage.cards.ExpansionSet; +import mage.constants.SetType; import java.util.GregorianCalendar; @@ -47,7 +47,7 @@ public class Guildpact extends ExpansionSet { } private Guildpact() { - super("Guildpact", "GPT", "", "mage.sets.guildpact", new GregorianCalendar(2006, 1, 3).getTime(), Constants.SetType.EXPANSION); + super("Guildpact", "GPT", "mage.sets.guildpact", new GregorianCalendar(2006, 1, 3).getTime(), SetType.EXPANSION); this.blockName = "Ravnika"; this.parentSet = RavnicaCityOfGuilds.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/Guru.java b/Mage.Sets/src/mage/sets/Guru.java index 16e3a000bb0..54d9b1f09b2 100644 --- a/Mage.Sets/src/mage/sets/Guru.java +++ b/Mage.Sets/src/mage/sets/Guru.java @@ -1,7 +1,7 @@ package mage.sets; -import mage.Constants; import mage.cards.ExpansionSet; +import mage.constants.SetType; import java.util.GregorianCalendar; @@ -14,6 +14,6 @@ public class Guru extends ExpansionSet { private Guru() { //TODO find correct release date, wiki don't known anything about this expansion - super("Guru", "GUR", "", "mage.sets.guru", new GregorianCalendar(1990, 1, 2).getTime(), Constants.SetType.REPRINT); + super("Guru", "GUR", "mage.sets.guru", new GregorianCalendar(1990, 1, 2).getTime(), SetType.REPRINT); } } diff --git a/Mage.Sets/src/mage/sets/Homelands.java b/Mage.Sets/src/mage/sets/Homelands.java index a1e58a64802..9ee84ebabc9 100644 --- a/Mage.Sets/src/mage/sets/Homelands.java +++ b/Mage.Sets/src/mage/sets/Homelands.java @@ -28,8 +28,9 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants; + import mage.cards.ExpansionSet; +import mage.constants.SetType; /** * @@ -44,7 +45,7 @@ public class Homelands extends ExpansionSet { } private Homelands() { - super("Homelands", "HML", "", "mage.sets.homelands", new GregorianCalendar(1995, 9, 1).getTime(), Constants.SetType.EXPANSION); + super("Homelands", "HML", "mage.sets.homelands", new GregorianCalendar(1995, 9, 1).getTime(), SetType.EXPANSION); this.hasBasicLands = false; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/IceAge.java b/Mage.Sets/src/mage/sets/IceAge.java index f0847ab6d24..0612030775c 100644 --- a/Mage.Sets/src/mage/sets/IceAge.java +++ b/Mage.Sets/src/mage/sets/IceAge.java @@ -28,8 +28,9 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants; + import mage.cards.ExpansionSet; +import mage.constants.SetType; /** * @@ -44,7 +45,7 @@ public class IceAge extends ExpansionSet { } private IceAge() { - super("Ice Age", "ICE", "", "mage.sets.iceage", new GregorianCalendar(1995, 5, 1).getTime(), Constants.SetType.EXPANSION); + super("Ice Age", "ICE", "mage.sets.iceage", new GregorianCalendar(1995, 5, 1).getTime(), SetType.EXPANSION); this.blockName = "Ice Age"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/Innistrad.java b/Mage.Sets/src/mage/sets/Innistrad.java index e1e15d9510c..ac4fa94f546 100644 --- a/Mage.Sets/src/mage/sets/Innistrad.java +++ b/Mage.Sets/src/mage/sets/Innistrad.java @@ -28,7 +28,7 @@ package mage.sets; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; import java.util.GregorianCalendar; @@ -45,7 +45,7 @@ public class Innistrad extends ExpansionSet { } private Innistrad() { - super("Innistrad", "ISD", "seticon_mtgisd", "mage.sets.innistrad", new GregorianCalendar(2011, 9, 30).getTime(), SetType.EXPANSION); + super("Innistrad", "ISD", "mage.sets.innistrad", new GregorianCalendar(2011, 9, 30).getTime(), SetType.EXPANSION); this.blockName = "Innistrad"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/Invasion.java b/Mage.Sets/src/mage/sets/Invasion.java index 58e82db6cbe..6cce6b5c7a5 100644 --- a/Mage.Sets/src/mage/sets/Invasion.java +++ b/Mage.Sets/src/mage/sets/Invasion.java @@ -28,7 +28,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -43,7 +43,7 @@ public class Invasion extends ExpansionSet { } private Invasion() { - super("Invasion", "INV", "", "mage.sets.invasion", new GregorianCalendar(2000, 9, 2).getTime(), SetType.EXPANSION); + super("Invasion", "INV", "mage.sets.invasion", new GregorianCalendar(2000, 9, 2).getTime(), SetType.EXPANSION); this.blockName = "Invasion"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/Judgment.java b/Mage.Sets/src/mage/sets/Judgment.java index 888681603a7..4b25afcd4e6 100644 --- a/Mage.Sets/src/mage/sets/Judgment.java +++ b/Mage.Sets/src/mage/sets/Judgment.java @@ -28,7 +28,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -44,7 +44,7 @@ public class Judgment extends ExpansionSet { } private Judgment() { - super("Judgment", "JUD", "exp_symbol_mtgjud", "mage.sets.judgment", new GregorianCalendar(2002, 5, 27).getTime(), SetType.EXPANSION); + super("Judgment", "JUD", "mage.sets.judgment", new GregorianCalendar(2002, 5, 27).getTime(), SetType.EXPANSION); this.blockName = "Odyssey"; this.parentSet = Odyssey.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/Legends.java b/Mage.Sets/src/mage/sets/Legends.java index 03a5324fee0..cdc9935d03a 100644 --- a/Mage.Sets/src/mage/sets/Legends.java +++ b/Mage.Sets/src/mage/sets/Legends.java @@ -28,8 +28,9 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants; + import mage.cards.ExpansionSet; +import mage.constants.SetType; /** * @@ -44,7 +45,7 @@ public class Legends extends ExpansionSet { } private Legends() { - super("Legends", "LEG", "", "mage.sets.legends", new GregorianCalendar(1994, 5, 1).getTime(), Constants.SetType.EXPANSION); + super("Legends", "LEG", "mage.sets.legends", new GregorianCalendar(1994, 5, 1).getTime(), SetType.EXPANSION); this.hasBasicLands = false; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/Legions.java b/Mage.Sets/src/mage/sets/Legions.java index 9bc97b08691..aaf0a697081 100644 --- a/Mage.Sets/src/mage/sets/Legions.java +++ b/Mage.Sets/src/mage/sets/Legions.java @@ -28,8 +28,9 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants; + import mage.cards.ExpansionSet; +import mage.constants.SetType; /** * @@ -44,7 +45,7 @@ public class Legions extends ExpansionSet { } private Legions() { - super("Legions", "LGN", "", "mage.sets.legions", new GregorianCalendar(2003, 0, 25).getTime(), Constants.SetType.EXPANSION); + super("Legions", "LGN", "mage.sets.legions", new GregorianCalendar(2003, 0, 25).getTime(), SetType.EXPANSION); this.blockName = "Onslaught"; this.parentSet = Onslaught.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/LimitedEditionAlpha.java b/Mage.Sets/src/mage/sets/LimitedEditionAlpha.java index c9655b3246e..fb93b406110 100644 --- a/Mage.Sets/src/mage/sets/LimitedEditionAlpha.java +++ b/Mage.Sets/src/mage/sets/LimitedEditionAlpha.java @@ -1,8 +1,9 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants; + import mage.cards.ExpansionSet; +import mage.constants.SetType; /** * @@ -17,7 +18,7 @@ public class LimitedEditionAlpha extends ExpansionSet { } private LimitedEditionAlpha() { - super("Limited Edition Alpha", "LEA", "", "mage.sets.limitedalpha", new GregorianCalendar(1993, 7, 1).getTime(), Constants.SetType.CORE); + super("Limited Edition Alpha", "LEA", "mage.sets.limitedalpha", new GregorianCalendar(1993, 7, 1).getTime(), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 1; this.numBoosterCommon = 10; diff --git a/Mage.Sets/src/mage/sets/LimitedEditionBeta.java b/Mage.Sets/src/mage/sets/LimitedEditionBeta.java index b0bff49d1cb..599ae25cf32 100644 --- a/Mage.Sets/src/mage/sets/LimitedEditionBeta.java +++ b/Mage.Sets/src/mage/sets/LimitedEditionBeta.java @@ -1,8 +1,9 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants; + import mage.cards.ExpansionSet; +import mage.constants.SetType; /** * @@ -17,7 +18,7 @@ public class LimitedEditionBeta extends ExpansionSet { } private LimitedEditionBeta() { - super("Limited Edition Beta", "LEB", "", "mage.sets.limitedbeta", new GregorianCalendar(1993, 9, 1).getTime(), Constants.SetType.CORE); + super("Limited Edition Beta", "LEB", "mage.sets.limitedbeta", new GregorianCalendar(1993, 9, 1).getTime(), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 1; this.numBoosterCommon = 10; diff --git a/Mage.Sets/src/mage/sets/Lorwyn.java b/Mage.Sets/src/mage/sets/Lorwyn.java index a849952cd48..cac08597c78 100644 --- a/Mage.Sets/src/mage/sets/Lorwyn.java +++ b/Mage.Sets/src/mage/sets/Lorwyn.java @@ -28,7 +28,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -44,7 +44,7 @@ public class Lorwyn extends ExpansionSet { } private Lorwyn() { - super("Lorwyn", "LRW", "", "mage.sets.lorwyn", new GregorianCalendar(2007, 9, 12).getTime(), SetType.EXPANSION); + super("Lorwyn", "LRW", "mage.sets.lorwyn", new GregorianCalendar(2007, 9, 12).getTime(), SetType.EXPANSION); this.blockName = "Lorwyn"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/Magic2010.java b/Mage.Sets/src/mage/sets/Magic2010.java index 26c9de26d1a..6c7a9b31383 100644 --- a/Mage.Sets/src/mage/sets/Magic2010.java +++ b/Mage.Sets/src/mage/sets/Magic2010.java @@ -29,7 +29,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -45,7 +45,7 @@ public class Magic2010 extends ExpansionSet { } private Magic2010() { - super("Magic 2010", "M10", "seticon_M10", "mage.sets.magic2010", new GregorianCalendar(2009, 6, 17).getTime(), SetType.CORE); + super("Magic 2010", "M10", "mage.sets.magic2010", new GregorianCalendar(2009, 6, 17).getTime(), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 1; this.numBoosterCommon = 10; diff --git a/Mage.Sets/src/mage/sets/Magic2011.java b/Mage.Sets/src/mage/sets/Magic2011.java index 4379b9bb861..58c48a7548b 100644 --- a/Mage.Sets/src/mage/sets/Magic2011.java +++ b/Mage.Sets/src/mage/sets/Magic2011.java @@ -29,7 +29,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -45,7 +45,7 @@ public class Magic2011 extends ExpansionSet { } private Magic2011() { - super("Magic 2011", "M11", "seticon_M11", "mage.sets.magic2011", new GregorianCalendar(2010, 6, 16).getTime(), SetType.CORE); + super("Magic 2011", "M11", "mage.sets.magic2011", new GregorianCalendar(2010, 6, 16).getTime(), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 1; this.numBoosterCommon = 10; diff --git a/Mage.Sets/src/mage/sets/Magic2012.java b/Mage.Sets/src/mage/sets/Magic2012.java index 545b9a0346e..ff239e3f925 100644 --- a/Mage.Sets/src/mage/sets/Magic2012.java +++ b/Mage.Sets/src/mage/sets/Magic2012.java @@ -28,7 +28,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -44,7 +44,7 @@ public class Magic2012 extends ExpansionSet { } private Magic2012() { - super("Magic 2012", "M12", "seticon_M12", "mage.sets.magic2012", new GregorianCalendar(2011, 6, 9).getTime(), SetType.CORE); + super("Magic 2012", "M12", "mage.sets.magic2012", new GregorianCalendar(2011, 6, 9).getTime(), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 1; this.numBoosterCommon = 10; diff --git a/Mage.Sets/src/mage/sets/Magic2013.java b/Mage.Sets/src/mage/sets/Magic2013.java index f8bd79d21eb..195aab2cc0d 100644 --- a/Mage.Sets/src/mage/sets/Magic2013.java +++ b/Mage.Sets/src/mage/sets/Magic2013.java @@ -28,7 +28,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -44,7 +44,7 @@ public class Magic2013 extends ExpansionSet { } private Magic2013() { - super("Magic 2013", "M13", "seticon_M13", "mage.sets.magic2013", new GregorianCalendar(2012, 6, 7).getTime(), SetType.CORE); + super("Magic 2013", "M13", "mage.sets.magic2013", new GregorianCalendar(2012, 6, 7).getTime(), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 1; this.numBoosterCommon = 10; diff --git a/Mage.Sets/src/mage/sets/MagicPlayerRewards.java b/Mage.Sets/src/mage/sets/MagicPlayerRewards.java index bf68e6d2b8a..a4c0996ef40 100644 --- a/Mage.Sets/src/mage/sets/MagicPlayerRewards.java +++ b/Mage.Sets/src/mage/sets/MagicPlayerRewards.java @@ -1,7 +1,7 @@ package mage.sets; -import mage.Constants; import mage.cards.ExpansionSet; +import mage.constants.SetType; import java.util.GregorianCalendar; @@ -13,7 +13,7 @@ public class MagicPlayerRewards extends ExpansionSet { } private MagicPlayerRewards() { - super("Magic Player Rewards", "MPR", "", "mage.sets.playerrewards", new GregorianCalendar(1990, 1, 1).getTime(), Constants.SetType.EXPANSION); + super("Magic Player Rewards", "MPR", "mage.sets.playerrewards", new GregorianCalendar(1990, 1, 1).getTime(), SetType.EXPANSION); this.hasBoosters = false; } } diff --git a/Mage.Sets/src/mage/sets/MercadianMasques.java b/Mage.Sets/src/mage/sets/MercadianMasques.java index 51a299bdb8c..7182d87bc46 100644 --- a/Mage.Sets/src/mage/sets/MercadianMasques.java +++ b/Mage.Sets/src/mage/sets/MercadianMasques.java @@ -28,8 +28,9 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants; + import mage.cards.ExpansionSet; +import mage.constants.SetType; /** * @@ -44,7 +45,7 @@ public class MercadianMasques extends ExpansionSet { } private MercadianMasques() { - super("Mercadian Masques", "MMQ", "", "mage.sets.mercadianmasques", new GregorianCalendar(1999, 8, 25).getTime(), Constants.SetType.EXPANSION); + super("Mercadian Masques", "MMQ", "mage.sets.mercadianmasques", new GregorianCalendar(1999, 8, 25).getTime(), SetType.EXPANSION); this.blockName = "Masques"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/Mirage.java b/Mage.Sets/src/mage/sets/Mirage.java index 0dec91929eb..7bdbf7c12dc 100644 --- a/Mage.Sets/src/mage/sets/Mirage.java +++ b/Mage.Sets/src/mage/sets/Mirage.java @@ -28,8 +28,9 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants; + import mage.cards.ExpansionSet; +import mage.constants.SetType; /** * @@ -43,7 +44,7 @@ public class Mirage extends ExpansionSet { } private Mirage() { - super("Mirage", "MIR", "", "mage.sets.mirage", new GregorianCalendar(1996, 8, 21).getTime(), Constants.SetType.EXPANSION); + super("Mirage", "MIR", "mage.sets.mirage", new GregorianCalendar(1996, 8, 21).getTime(), SetType.EXPANSION); this.blockName = "Mirage"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/Mirrodin.java b/Mage.Sets/src/mage/sets/Mirrodin.java index 2bca8c62286..92f3cdb2c9c 100644 --- a/Mage.Sets/src/mage/sets/Mirrodin.java +++ b/Mage.Sets/src/mage/sets/Mirrodin.java @@ -1,7 +1,7 @@ package mage.sets; -import mage.Constants; import mage.cards.ExpansionSet; +import mage.constants.SetType; import java.util.GregorianCalendar; @@ -13,7 +13,7 @@ public class Mirrodin extends ExpansionSet { } private Mirrodin() { - super("Mirrodin", "MRD", "", "mage.sets.mirrodin", new GregorianCalendar(2003, 9, 2).getTime(), Constants.SetType.EXPANSION); + super("Mirrodin", "MRD", "mage.sets.mirrodin", new GregorianCalendar(2003, 9, 2).getTime(), SetType.EXPANSION); this.blockName = "Mirrodin"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/MirrodinBesieged.java b/Mage.Sets/src/mage/sets/MirrodinBesieged.java index 2199817504c..ddafe332b2a 100644 --- a/Mage.Sets/src/mage/sets/MirrodinBesieged.java +++ b/Mage.Sets/src/mage/sets/MirrodinBesieged.java @@ -29,7 +29,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; @@ -47,7 +47,7 @@ public class MirrodinBesieged extends ExpansionSet { } private MirrodinBesieged() { - super("Mirrodin Besieged", "MBS", "seticon_mtgmbs", "mage.sets.mirrodinbesieged", new GregorianCalendar(2011, 1, 4).getTime(), SetType.EXPANSION); + super("Mirrodin Besieged", "MBS", "mage.sets.mirrodinbesieged", new GregorianCalendar(2011, 1, 4).getTime(), SetType.EXPANSION); this.blockName = "Scars of Mirrodin"; this.parentSet = ScarsOfMirrodin.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/ModernMasters.java b/Mage.Sets/src/mage/sets/ModernMasters.java index 72fe20786a6..cad2dc139a2 100644 --- a/Mage.Sets/src/mage/sets/ModernMasters.java +++ b/Mage.Sets/src/mage/sets/ModernMasters.java @@ -29,7 +29,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -45,7 +45,7 @@ public class ModernMasters extends ExpansionSet { } private ModernMasters() { - super("Modern Masters", "MMA", "", "mage.sets.modernmasters", new GregorianCalendar(2016, 6, 7).getTime(), SetType.REPRINT); + super("Modern Masters", "MMA", "mage.sets.modernmasters", new GregorianCalendar(2016, 6, 7).getTime(), SetType.REPRINT); this.hasBasicLands = false; this.hasBoosters = true; this.numBoosterLands = 0; diff --git a/Mage.Sets/src/mage/sets/Morningtide.java b/Mage.Sets/src/mage/sets/Morningtide.java index 58f9a734fc1..4ef41a90b3e 100644 --- a/Mage.Sets/src/mage/sets/Morningtide.java +++ b/Mage.Sets/src/mage/sets/Morningtide.java @@ -28,7 +28,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -44,7 +44,7 @@ public class Morningtide extends ExpansionSet { } private Morningtide() { - super("Morningtide", "MOR", "", "mage.sets.morningtide", new GregorianCalendar(2008, 1, 1).getTime(), SetType.EXPANSION); + super("Morningtide", "MOR", "mage.sets.morningtide", new GregorianCalendar(2008, 1, 1).getTime(), SetType.EXPANSION); this.blockName = "Lorwyn"; this.parentSet = Morningtide.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/Nemesis.java b/Mage.Sets/src/mage/sets/Nemesis.java index 58915e92fbd..05b46e0f1e6 100644 --- a/Mage.Sets/src/mage/sets/Nemesis.java +++ b/Mage.Sets/src/mage/sets/Nemesis.java @@ -28,8 +28,9 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants; + import mage.cards.ExpansionSet; +import mage.constants.SetType; /** * @@ -44,7 +45,7 @@ public class Nemesis extends ExpansionSet { } private Nemesis() { - super("Nemesis", "NMS", "", "mage.sets.nemesis", new GregorianCalendar(2000, 1, 5).getTime(), Constants.SetType.EXPANSION); + super("Nemesis", "NMS", "mage.sets.nemesis", new GregorianCalendar(2000, 1, 5).getTime(), SetType.EXPANSION); this.blockName = "Masques"; this.parentSet = MercadianMasques.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/NewPhyrexia.java b/Mage.Sets/src/mage/sets/NewPhyrexia.java index 1c00acb22c9..ef39ee3e243 100644 --- a/Mage.Sets/src/mage/sets/NewPhyrexia.java +++ b/Mage.Sets/src/mage/sets/NewPhyrexia.java @@ -1,8 +1,9 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants; + import mage.cards.ExpansionSet; +import mage.constants.SetType; public class NewPhyrexia extends ExpansionSet { @@ -13,7 +14,7 @@ public class NewPhyrexia extends ExpansionSet { } private NewPhyrexia() { - super("New Phyrexia", "NPH", "", "mage.sets.newphyrexia", new GregorianCalendar(2011, 4, 4).getTime(), Constants.SetType.EXPANSION); + super("New Phyrexia", "NPH", "mage.sets.newphyrexia", new GregorianCalendar(2011, 4, 4).getTime(), SetType.EXPANSION); this.blockName = "Scars of Mirrodin"; this.parentSet = ScarsOfMirrodin.getInstance(); this.hasBoosters = true; diff --git a/Mage.Sets/src/mage/sets/NinthEdition.java b/Mage.Sets/src/mage/sets/NinthEdition.java index a4726314e6f..1dec219dcab 100644 --- a/Mage.Sets/src/mage/sets/NinthEdition.java +++ b/Mage.Sets/src/mage/sets/NinthEdition.java @@ -1,7 +1,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; public class NinthEdition extends ExpansionSet { @@ -13,7 +13,7 @@ public class NinthEdition extends ExpansionSet { } private NinthEdition() { - super("Ninth Edition", "9ED", "", "mage.sets.ninthedition", new GregorianCalendar(2005, 7, 29).getTime(), SetType.CORE); + super("Ninth Edition", "9ED", "mage.sets.ninthedition", new GregorianCalendar(2005, 7, 29).getTime(), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 1; this.numBoosterCommon = 10; diff --git a/Mage.Sets/src/mage/sets/Odyssey.java b/Mage.Sets/src/mage/sets/Odyssey.java index a544dced2f4..6eea1098284 100644 --- a/Mage.Sets/src/mage/sets/Odyssey.java +++ b/Mage.Sets/src/mage/sets/Odyssey.java @@ -28,8 +28,9 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants; + import mage.cards.ExpansionSet; +import mage.constants.SetType; /** * @@ -43,7 +44,7 @@ public class Odyssey extends ExpansionSet { } private Odyssey() { - super("Odyssey", "ODY", "", "mage.sets.odyssey", new GregorianCalendar(2001, 9, 22).getTime(), Constants.SetType.EXPANSION); + super("Odyssey", "ODY", "mage.sets.odyssey", new GregorianCalendar(2001, 9, 22).getTime(), SetType.EXPANSION); this.blockName = "Odyssey"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/Onslaught.java b/Mage.Sets/src/mage/sets/Onslaught.java index 3cff944bfcb..c3ca10d05d0 100644 --- a/Mage.Sets/src/mage/sets/Onslaught.java +++ b/Mage.Sets/src/mage/sets/Onslaught.java @@ -1,7 +1,7 @@ package mage.sets; -import mage.Constants; import mage.cards.ExpansionSet; +import mage.constants.SetType; import java.util.GregorianCalendar; @@ -13,7 +13,7 @@ public class Onslaught extends ExpansionSet { } private Onslaught() { - super("Onslaught", "ONS", "", "mage.sets.onslaught", new GregorianCalendar(2002, 10, 7).getTime(), Constants.SetType.EXPANSION); + super("Onslaught", "ONS", "mage.sets.onslaught", new GregorianCalendar(2002, 10, 7).getTime(), SetType.EXPANSION); this.blockName = "Onslaught"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/PlanarChaos.java b/Mage.Sets/src/mage/sets/PlanarChaos.java index 9c00033a00f..82156348883 100644 --- a/Mage.Sets/src/mage/sets/PlanarChaos.java +++ b/Mage.Sets/src/mage/sets/PlanarChaos.java @@ -28,7 +28,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -44,7 +44,7 @@ public class PlanarChaos extends ExpansionSet { } private PlanarChaos() { - super("Planar Chaos", "PLC", "", "mage.sets.planarchaos", new GregorianCalendar(2007, 1, 2).getTime(), SetType.EXPANSION); + super("Planar Chaos", "PLC", "mage.sets.planarchaos", new GregorianCalendar(2007, 1, 2).getTime(), SetType.EXPANSION); this.blockName = "Time Spiral"; this.parentSet = TimeSpiral.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/Planechase.java b/Mage.Sets/src/mage/sets/Planechase.java index 0330e7bacc8..39056b4966c 100644 --- a/Mage.Sets/src/mage/sets/Planechase.java +++ b/Mage.Sets/src/mage/sets/Planechase.java @@ -29,7 +29,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -45,7 +45,7 @@ public class Planechase extends ExpansionSet { } private Planechase() { - super("Planechase", "HOP", "", "mage.sets.planechase", new GregorianCalendar(2009, 8, 4).getTime(), SetType.REPRINT); + super("Planechase", "HOP", "mage.sets.planechase", new GregorianCalendar(2009, 8, 4).getTime(), SetType.REPRINT); } } diff --git a/Mage.Sets/src/mage/sets/Planechase2012.java b/Mage.Sets/src/mage/sets/Planechase2012.java index a505169ceca..97efc27091c 100644 --- a/Mage.Sets/src/mage/sets/Planechase2012.java +++ b/Mage.Sets/src/mage/sets/Planechase2012.java @@ -29,7 +29,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -45,7 +45,7 @@ public class Planechase2012 extends ExpansionSet { } private Planechase2012() { - super("Planechase (2012 Edition)", "PC2", "", "mage.sets.planechase2012", new GregorianCalendar(2012, 6, 1).getTime(), SetType.REPRINT); + super("Planechase (2012 Edition)", "PC2", "mage.sets.planechase2012", new GregorianCalendar(2012, 6, 1).getTime(), SetType.REPRINT); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/Planeshift.java b/Mage.Sets/src/mage/sets/Planeshift.java index 0d0704227ba..128dc4e43f9 100644 --- a/Mage.Sets/src/mage/sets/Planeshift.java +++ b/Mage.Sets/src/mage/sets/Planeshift.java @@ -28,7 +28,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -44,7 +44,7 @@ public class Planeshift extends ExpansionSet { } private Planeshift() { - super("Planeshift", "PLS", "", "mage.sets.planeshift", new GregorianCalendar(2001, 1, 5).getTime(), SetType.EXPANSION); + super("Planeshift", "PLS", "mage.sets.planeshift", new GregorianCalendar(2001, 1, 5).getTime(), SetType.EXPANSION); this.blockName = "Invasion"; this.parentSet = Invasion.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/Prophecy.java b/Mage.Sets/src/mage/sets/Prophecy.java index 902f6a84c2f..0361a0d1446 100644 --- a/Mage.Sets/src/mage/sets/Prophecy.java +++ b/Mage.Sets/src/mage/sets/Prophecy.java @@ -28,8 +28,9 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants; + import mage.cards.ExpansionSet; +import mage.constants.SetType; /** * @@ -44,7 +45,7 @@ public class Prophecy extends ExpansionSet { } private Prophecy() { - super("Prophecy", "PCY", "", "mage.sets.prophecy", new GregorianCalendar(2000, 4, 27).getTime(), Constants.SetType.EXPANSION); + super("Prophecy", "PCY", "mage.sets.prophecy", new GregorianCalendar(2000, 4, 27).getTime(), SetType.EXPANSION); this.blockName = "Masques"; this.parentSet = MercadianMasques.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/RavnicaCityOfGuilds.java b/Mage.Sets/src/mage/sets/RavnicaCityOfGuilds.java index 6e5b0ef4e73..28bc8e01cc0 100644 --- a/Mage.Sets/src/mage/sets/RavnicaCityOfGuilds.java +++ b/Mage.Sets/src/mage/sets/RavnicaCityOfGuilds.java @@ -28,7 +28,7 @@ package mage.sets; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; import java.util.GregorianCalendar; @@ -45,7 +45,7 @@ public class RavnicaCityOfGuilds extends ExpansionSet { } private RavnicaCityOfGuilds() { - super("Ravnica: City of Guilds", "RAV", "seticon_RAV", "mage.sets.ravnika", new GregorianCalendar(2005, 9, 24).getTime(), SetType.EXPANSION); + super("Ravnica: City of Guilds", "RAV", "mage.sets.ravnika", new GregorianCalendar(2005, 9, 24).getTime(), SetType.EXPANSION); this.blockName = "Ravnika"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/ReturnToRavnica.java b/Mage.Sets/src/mage/sets/ReturnToRavnica.java index d89b5d065b6..bebe187a363 100644 --- a/Mage.Sets/src/mage/sets/ReturnToRavnica.java +++ b/Mage.Sets/src/mage/sets/ReturnToRavnica.java @@ -27,7 +27,7 @@ */ package mage.sets; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; import java.util.GregorianCalendar; @@ -45,7 +45,7 @@ public class ReturnToRavnica extends ExpansionSet { } private ReturnToRavnica() { - super("Return to Ravnica", "RTR", "seticon_mtgrtr", "mage.sets.returntoravnica", new GregorianCalendar(2012, 9, 29).getTime(), SetType.EXPANSION); + super("Return to Ravnica", "RTR", "mage.sets.returntoravnica", new GregorianCalendar(2012, 9, 29).getTime(), SetType.EXPANSION); this.blockName = "Return to Ravnica"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/RevisedEdition.java b/Mage.Sets/src/mage/sets/RevisedEdition.java index 2c5405805a9..585abbfc50a 100644 --- a/Mage.Sets/src/mage/sets/RevisedEdition.java +++ b/Mage.Sets/src/mage/sets/RevisedEdition.java @@ -1,8 +1,9 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants; + import mage.cards.ExpansionSet; +import mage.constants.SetType; /** * @@ -17,7 +18,7 @@ public class RevisedEdition extends ExpansionSet { } private RevisedEdition() { - super("Revised Edition", "3ED", "", "mage.sets.revisededition", new GregorianCalendar(1994, 3, 1).getTime(), Constants.SetType.CORE); + super("Revised Edition", "3ED", "mage.sets.revisededition", new GregorianCalendar(1994, 3, 1).getTime(), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 1; this.numBoosterCommon = 10; diff --git a/Mage.Sets/src/mage/sets/RiseOfTheEldrazi.java b/Mage.Sets/src/mage/sets/RiseOfTheEldrazi.java index 8075b47faaa..c9cd77502d4 100644 --- a/Mage.Sets/src/mage/sets/RiseOfTheEldrazi.java +++ b/Mage.Sets/src/mage/sets/RiseOfTheEldrazi.java @@ -29,7 +29,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -45,7 +45,7 @@ public class RiseOfTheEldrazi extends ExpansionSet { } private RiseOfTheEldrazi() { - super("Rise of the Eldrazi", "ROE", "seticon_ROE", "mage.sets.riseoftheeldrazi", new GregorianCalendar(2010, 3, 17).getTime(), SetType.EXPANSION); + super("Rise of the Eldrazi", "ROE", "mage.sets.riseoftheeldrazi", new GregorianCalendar(2010, 3, 17).getTime(), SetType.EXPANSION); this.blockName = "Zendikar"; this.parentSet = Zendikar.getInstance(); this.hasBoosters = true; diff --git a/Mage.Sets/src/mage/sets/SaviorsOfKamigawa.java b/Mage.Sets/src/mage/sets/SaviorsOfKamigawa.java index 5d0eff9ee02..bfef754c6a8 100644 --- a/Mage.Sets/src/mage/sets/SaviorsOfKamigawa.java +++ b/Mage.Sets/src/mage/sets/SaviorsOfKamigawa.java @@ -28,7 +28,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -44,7 +44,7 @@ public class SaviorsOfKamigawa extends ExpansionSet { } private SaviorsOfKamigawa() { - super("Saviors of Kamigawa", "SOK", "", "mage.sets.saviorsofkamigawa", new GregorianCalendar(2005, 5, 3).getTime(), SetType.EXPANSION); + super("Saviors of Kamigawa", "SOK", "mage.sets.saviorsofkamigawa", new GregorianCalendar(2005, 5, 3).getTime(), SetType.EXPANSION); this.blockName = "Kamigawa"; this.parentSet = ChampionsOfKamigawa.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/ScarsOfMirrodin.java b/Mage.Sets/src/mage/sets/ScarsOfMirrodin.java index 7c734077a41..ab9d9276b31 100644 --- a/Mage.Sets/src/mage/sets/ScarsOfMirrodin.java +++ b/Mage.Sets/src/mage/sets/ScarsOfMirrodin.java @@ -28,7 +28,7 @@ package mage.sets; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; import java.util.GregorianCalendar; @@ -46,7 +46,7 @@ public class ScarsOfMirrodin extends ExpansionSet { } private ScarsOfMirrodin() { - super("Scars of Mirrodin", "SOM", "seticon_mtgsom", "mage.sets.scarsofmirrodin", new GregorianCalendar(2010, 10, 1).getTime(), SetType.EXPANSION); + super("Scars of Mirrodin", "SOM", "mage.sets.scarsofmirrodin", new GregorianCalendar(2010, 10, 1).getTime(), SetType.EXPANSION); this.blockName = "Scars of Mirrodin"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/Scourge.java b/Mage.Sets/src/mage/sets/Scourge.java index 6d1d45c83a3..16852e9f56f 100644 --- a/Mage.Sets/src/mage/sets/Scourge.java +++ b/Mage.Sets/src/mage/sets/Scourge.java @@ -28,8 +28,9 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants; + import mage.cards.ExpansionSet; +import mage.constants.SetType; /** * @@ -44,7 +45,7 @@ public class Scourge extends ExpansionSet { } private Scourge() { - super("Scourge", "SCG", "", "mage.sets.scourge", new GregorianCalendar(2003, 5, 17).getTime(), Constants.SetType.EXPANSION); + super("Scourge", "SCG", "mage.sets.scourge", new GregorianCalendar(2003, 5, 17).getTime(), SetType.EXPANSION); this.blockName = "Onslaught"; this.parentSet = Onslaught.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/SeventhEdition.java b/Mage.Sets/src/mage/sets/SeventhEdition.java index 20dae0edcd2..229f461bc4f 100644 --- a/Mage.Sets/src/mage/sets/SeventhEdition.java +++ b/Mage.Sets/src/mage/sets/SeventhEdition.java @@ -28,8 +28,9 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants; + import mage.cards.ExpansionSet; +import mage.constants.SetType; /** * @@ -44,7 +45,7 @@ public class SeventhEdition extends ExpansionSet { } private SeventhEdition() { - super("Seventh Edition", "7ED", "", "mage.sets.seventhedition", new GregorianCalendar(2001, 3, 11).getTime(), Constants.SetType.CORE); + super("Seventh Edition", "7ED", "mage.sets.seventhedition", new GregorianCalendar(2001, 3, 11).getTime(), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 1; this.numBoosterCommon = 10; diff --git a/Mage.Sets/src/mage/sets/Shadowmoor.java b/Mage.Sets/src/mage/sets/Shadowmoor.java index ead0b1a41c8..f6c6627905d 100644 --- a/Mage.Sets/src/mage/sets/Shadowmoor.java +++ b/Mage.Sets/src/mage/sets/Shadowmoor.java @@ -28,7 +28,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -44,7 +44,7 @@ public class Shadowmoor extends ExpansionSet { } private Shadowmoor() { - super("Shadowmoor", "SHM", "", "mage.sets.shadowmoor", new GregorianCalendar(2008, 4, 2).getTime(), SetType.EXPANSION); + super("Shadowmoor", "SHM", "mage.sets.shadowmoor", new GregorianCalendar(2008, 4, 2).getTime(), SetType.EXPANSION); this.blockName = "Shadowmoor"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/ShardsOfAlara.java b/Mage.Sets/src/mage/sets/ShardsOfAlara.java index 8b20f5745ed..af3247ad2b6 100644 --- a/Mage.Sets/src/mage/sets/ShardsOfAlara.java +++ b/Mage.Sets/src/mage/sets/ShardsOfAlara.java @@ -29,7 +29,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -45,7 +45,7 @@ public class ShardsOfAlara extends ExpansionSet { } private ShardsOfAlara() { - super("Shards of Alara", "ALA", "seticon_mtgala", "mage.sets.shardsofalara", new GregorianCalendar(2008, 8, 27).getTime(), SetType.EXPANSION); + super("Shards of Alara", "ALA", "mage.sets.shardsofalara", new GregorianCalendar(2008, 8, 27).getTime(), SetType.EXPANSION); this.blockName = "Shards of Alara"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/SixthEdition.java b/Mage.Sets/src/mage/sets/SixthEdition.java index 4b21bd207e6..bafe94c2d24 100644 --- a/Mage.Sets/src/mage/sets/SixthEdition.java +++ b/Mage.Sets/src/mage/sets/SixthEdition.java @@ -28,8 +28,9 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants; + import mage.cards.ExpansionSet; +import mage.constants.SetType; /** * @@ -44,7 +45,7 @@ public class SixthEdition extends ExpansionSet { } private SixthEdition() { - super("Sixth Edition", "6ED", "", "mage.sets.sixthedition", new GregorianCalendar(1999, 3, 28).getTime(), Constants.SetType.CORE); + super("Sixth Edition", "6ED", "mage.sets.sixthedition", new GregorianCalendar(1999, 3, 28).getTime(), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 1; this.numBoosterCommon = 10; diff --git a/Mage.Sets/src/mage/sets/Stronghold.java b/Mage.Sets/src/mage/sets/Stronghold.java index 9edc7c59e4e..e31bd26a7d2 100644 --- a/Mage.Sets/src/mage/sets/Stronghold.java +++ b/Mage.Sets/src/mage/sets/Stronghold.java @@ -28,8 +28,9 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants; + import mage.cards.ExpansionSet; +import mage.constants.SetType; /** * @@ -44,7 +45,7 @@ public class Stronghold extends ExpansionSet { } private Stronghold() { - super("Stronghold", "STH", "", "mage.sets.stronghold", new GregorianCalendar(1998, 1, 21).getTime(), Constants.SetType.EXPANSION); + super("Stronghold", "STH", "mage.sets.stronghold", new GregorianCalendar(1998, 1, 21).getTime(), SetType.EXPANSION); this.blockName = "Tempest"; this.parentSet = Tempest.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/Tempest.java b/Mage.Sets/src/mage/sets/Tempest.java index aabbf466f51..28249cb07db 100644 --- a/Mage.Sets/src/mage/sets/Tempest.java +++ b/Mage.Sets/src/mage/sets/Tempest.java @@ -1,7 +1,7 @@ package mage.sets; -import mage.Constants; import mage.cards.ExpansionSet; +import mage.constants.SetType; import java.util.GregorianCalendar; @@ -13,7 +13,7 @@ public class Tempest extends ExpansionSet { } private Tempest() { - super("Tempest", "TMP", "", "mage.sets.tempest", new GregorianCalendar(1997, 9, 1).getTime(), Constants.SetType.EXPANSION); + super("Tempest", "TMP", "mage.sets.tempest", new GregorianCalendar(1997, 9, 1).getTime(), SetType.EXPANSION); this.blockName = "Tempest"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/Tenth.java b/Mage.Sets/src/mage/sets/Tenth.java index 2f301ad3aec..d1a351c2142 100644 --- a/Mage.Sets/src/mage/sets/Tenth.java +++ b/Mage.Sets/src/mage/sets/Tenth.java @@ -29,7 +29,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -45,7 +45,7 @@ public class Tenth extends ExpansionSet { } private Tenth() { - super("Tenth Edition", "10E", "exp_symbol_mtg10e", "mage.sets.tenth", new GregorianCalendar(2007, 6, 14).getTime(), SetType.CORE); + super("Tenth Edition", "10E", "mage.sets.tenth", new GregorianCalendar(2007, 6, 14).getTime(), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 1; this.numBoosterCommon = 10; diff --git a/Mage.Sets/src/mage/sets/TheDark.java b/Mage.Sets/src/mage/sets/TheDark.java index 0f5dd4197f1..b597acd0dbb 100644 --- a/Mage.Sets/src/mage/sets/TheDark.java +++ b/Mage.Sets/src/mage/sets/TheDark.java @@ -28,8 +28,9 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants; + import mage.cards.ExpansionSet; +import mage.constants.SetType; /** * @@ -44,7 +45,7 @@ public class TheDark extends ExpansionSet { } private TheDark() { - super("The Dark", "DRK", "", "mage.sets.thedark", new GregorianCalendar(1994, 7, 1).getTime(), Constants.SetType.EXPANSION); + super("The Dark", "DRK", "mage.sets.thedark", new GregorianCalendar(1994, 7, 1).getTime(), SetType.EXPANSION); this.hasBasicLands = false; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/TimeSpiral.java b/Mage.Sets/src/mage/sets/TimeSpiral.java index 5ee7eb4c9e1..98aa18145ab 100644 --- a/Mage.Sets/src/mage/sets/TimeSpiral.java +++ b/Mage.Sets/src/mage/sets/TimeSpiral.java @@ -1,7 +1,7 @@ package mage.sets; -import mage.Constants; import mage.cards.ExpansionSet; +import mage.constants.SetType; import java.util.GregorianCalendar; @@ -14,7 +14,7 @@ public class TimeSpiral extends ExpansionSet { } private TimeSpiral() { - super("Time Spiral", "TSP", "", "mage.sets.timespiral", new GregorianCalendar(2006, 9, 9).getTime(), Constants.SetType.EXPANSION); + super("Time Spiral", "TSP", "mage.sets.timespiral", new GregorianCalendar(2006, 9, 9).getTime(), SetType.EXPANSION); this.blockName = "Time Spiral"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/TimeSpiralTimeshifted.java b/Mage.Sets/src/mage/sets/TimeSpiralTimeshifted.java index e5cff83aa14..669912a86b4 100644 --- a/Mage.Sets/src/mage/sets/TimeSpiralTimeshifted.java +++ b/Mage.Sets/src/mage/sets/TimeSpiralTimeshifted.java @@ -28,7 +28,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -44,7 +44,7 @@ public class TimeSpiralTimeshifted extends ExpansionSet { } private TimeSpiralTimeshifted() { - super("Time Spiral \"Timeshifted\"", "TSB", "", "mage.sets.timeshifted", new GregorianCalendar(2006, 9, 9).getTime(), SetType.EXPANSION); + super("Time Spiral \"Timeshifted\"", "TSB", "mage.sets.timeshifted", new GregorianCalendar(2006, 9, 9).getTime(), SetType.EXPANSION); this.blockName = "Time Spiral"; this.parentSet = TimeSpiral.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/Torment.java b/Mage.Sets/src/mage/sets/Torment.java index 105c5355e86..4e2a9bb8b90 100644 --- a/Mage.Sets/src/mage/sets/Torment.java +++ b/Mage.Sets/src/mage/sets/Torment.java @@ -28,8 +28,9 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants; + import mage.cards.ExpansionSet; +import mage.constants.SetType; /** * @@ -44,7 +45,7 @@ public class Torment extends ExpansionSet { } private Torment() { - super("Torment", "TOR", "", "mage.sets.torment", new GregorianCalendar(2002, 0, 26).getTime(), Constants.SetType.EXPANSION); + super("Torment", "TOR", "mage.sets.torment", new GregorianCalendar(2002, 0, 26).getTime(), SetType.EXPANSION); this.blockName = "Odyssey"; this.parentSet = Odyssey.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/UnlimitedEdition.java b/Mage.Sets/src/mage/sets/UnlimitedEdition.java index 1fd5e11fc24..2b3eaee6192 100644 --- a/Mage.Sets/src/mage/sets/UnlimitedEdition.java +++ b/Mage.Sets/src/mage/sets/UnlimitedEdition.java @@ -1,8 +1,9 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants; + import mage.cards.ExpansionSet; +import mage.constants.SetType; /** * @@ -17,7 +18,7 @@ public class UnlimitedEdition extends ExpansionSet { } private UnlimitedEdition() { - super("Unlimited Edition", "2ED", "", "mage.sets.unlimitededition", new GregorianCalendar(1993, 11, 1).getTime(), Constants.SetType.CORE); + super("Unlimited Edition", "2ED", "mage.sets.unlimitededition", new GregorianCalendar(1993, 11, 1).getTime(), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 1; this.numBoosterCommon = 10; diff --git a/Mage.Sets/src/mage/sets/UrzasDestiny.java b/Mage.Sets/src/mage/sets/UrzasDestiny.java index cefd1707834..e0fcdbdebef 100644 --- a/Mage.Sets/src/mage/sets/UrzasDestiny.java +++ b/Mage.Sets/src/mage/sets/UrzasDestiny.java @@ -28,7 +28,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -44,7 +44,7 @@ public class UrzasDestiny extends ExpansionSet { } private UrzasDestiny() { - super("Urza's Destiny", "UDS", "exp_symbol_mtguds", "mage.sets.urzasdestiny", new GregorianCalendar(1999, 6, 23).getTime(), SetType.EXPANSION); + super("Urza's Destiny", "UDS", "mage.sets.urzasdestiny", new GregorianCalendar(1999, 6, 23).getTime(), SetType.EXPANSION); this.blockName = "Urza"; this.parentSet = UrzasSaga.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/UrzasLegacy.java b/Mage.Sets/src/mage/sets/UrzasLegacy.java index bee37d9c8f0..3d4fef267ad 100644 --- a/Mage.Sets/src/mage/sets/UrzasLegacy.java +++ b/Mage.Sets/src/mage/sets/UrzasLegacy.java @@ -28,7 +28,7 @@ package mage.sets; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; import java.util.GregorianCalendar; @@ -46,7 +46,7 @@ public class UrzasLegacy extends ExpansionSet { } private UrzasLegacy() { - super("Urza's Legacy", "ULG", "exp_symbol_mtgulg", "mage.sets.urzaslegacy", new GregorianCalendar(1999, 2, 6).getTime(), SetType.EXPANSION); + super("Urza's Legacy", "ULG", "mage.sets.urzaslegacy", new GregorianCalendar(1999, 2, 6).getTime(), SetType.EXPANSION); this.blockName = "Urza"; this.parentSet = UrzasSaga.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/UrzasSaga.java b/Mage.Sets/src/mage/sets/UrzasSaga.java index 5d5a33e3360..9187caf4678 100644 --- a/Mage.Sets/src/mage/sets/UrzasSaga.java +++ b/Mage.Sets/src/mage/sets/UrzasSaga.java @@ -29,7 +29,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -45,7 +45,7 @@ public class UrzasSaga extends ExpansionSet { } private UrzasSaga() { - super("Urza's Saga", "USG", "exp_symbol_mtgusg", "mage.sets.urzassaga", new GregorianCalendar(1998, 10, 1).getTime(), SetType.EXPANSION); + super("Urza's Saga", "USG", "mage.sets.urzassaga", new GregorianCalendar(1998, 10, 1).getTime(), SetType.EXPANSION); this.blockName = "Urza"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/Visions.java b/Mage.Sets/src/mage/sets/Visions.java index 43dc5b31644..69be6927991 100644 --- a/Mage.Sets/src/mage/sets/Visions.java +++ b/Mage.Sets/src/mage/sets/Visions.java @@ -28,8 +28,9 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants; + import mage.cards.ExpansionSet; +import mage.constants.SetType; /** * @@ -44,7 +45,7 @@ public class Visions extends ExpansionSet { } private Visions() { - super("Visions", "VIS", "", "mage.sets.visions", new GregorianCalendar(1997, 0, 11).getTime(), Constants.SetType.EXPANSION); + super("Visions", "VIS", "mage.sets.visions", new GregorianCalendar(1997, 0, 11).getTime(), SetType.EXPANSION); this.blockName = "Mirage"; this.parentSet = Mirage.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/Weatherlight.java b/Mage.Sets/src/mage/sets/Weatherlight.java index 667f978527c..6020c0bf36c 100644 --- a/Mage.Sets/src/mage/sets/Weatherlight.java +++ b/Mage.Sets/src/mage/sets/Weatherlight.java @@ -28,7 +28,7 @@ package mage.sets; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; import java.util.GregorianCalendar; @@ -46,7 +46,7 @@ public class Weatherlight extends ExpansionSet { } private Weatherlight() { - super("Weatherlight", "WTH", "exp_symbol_mtgwth", "mage.sets.weatherlight", new GregorianCalendar(1997, 5, 31).getTime(), SetType.EXPANSION); + super("Weatherlight", "WTH", "mage.sets.weatherlight", new GregorianCalendar(1997, 5, 31).getTime(), SetType.EXPANSION); this.blockName = "Mirage"; this.parentSet = Mirage.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/Worldwake.java b/Mage.Sets/src/mage/sets/Worldwake.java index 4f08bdcfecd..62c43600b13 100644 --- a/Mage.Sets/src/mage/sets/Worldwake.java +++ b/Mage.Sets/src/mage/sets/Worldwake.java @@ -29,7 +29,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -45,7 +45,7 @@ public class Worldwake extends ExpansionSet { } private Worldwake() { - super("Worldwake", "WWK", "seticon_WWK", "mage.sets.worldwake", new GregorianCalendar(2010, 0, 30).getTime(), SetType.EXPANSION); + super("Worldwake", "WWK", "mage.sets.worldwake", new GregorianCalendar(2010, 0, 30).getTime(), SetType.EXPANSION); this.blockName = "Zendikar"; this.parentSet = Zendikar.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/Zendikar.java b/Mage.Sets/src/mage/sets/Zendikar.java index 50c802e3887..3259a0db783 100644 --- a/Mage.Sets/src/mage/sets/Zendikar.java +++ b/Mage.Sets/src/mage/sets/Zendikar.java @@ -29,7 +29,7 @@ package mage.sets; import java.util.GregorianCalendar; -import mage.Constants.SetType; +import mage.constants.SetType; import mage.cards.ExpansionSet; /** @@ -45,7 +45,7 @@ public class Zendikar extends ExpansionSet { } private Zendikar() { - super("Zendikar", "ZEN", "seticon_ZEN", "mage.sets.zendikar", new GregorianCalendar(2009, 8, 26).getTime(), SetType.EXPANSION); + super("Zendikar", "ZEN", "mage.sets.zendikar", new GregorianCalendar(2009, 8, 26).getTime(), SetType.EXPANSION); this.blockName = "Zendikar"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/alarareborn/Anathemancer.java b/Mage.Sets/src/mage/sets/alarareborn/Anathemancer.java index 0da15e087e4..e274a5af8d0 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/Anathemancer.java +++ b/Mage.Sets/src/mage/sets/alarareborn/Anathemancer.java @@ -28,8 +28,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/alarareborn/ArchitectsOfWill.java b/Mage.Sets/src/mage/sets/alarareborn/ArchitectsOfWill.java index b2cc6ad888c..97f472cb65e 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/ArchitectsOfWill.java +++ b/Mage.Sets/src/mage/sets/alarareborn/ArchitectsOfWill.java @@ -28,10 +28,10 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/alarareborn/ArdentPlea.java b/Mage.Sets/src/mage/sets/alarareborn/ArdentPlea.java index 75a42f9de2c..bcdf2763704 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/ArdentPlea.java +++ b/Mage.Sets/src/mage/sets/alarareborn/ArdentPlea.java @@ -29,8 +29,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.keyword.CascadeAbility; import mage.abilities.keyword.ExaltedAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/alarareborn/AvenMimeomancer.java b/Mage.Sets/src/mage/sets/alarareborn/AvenMimeomancer.java index 16eef0a1fab..8ff493694f0 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/AvenMimeomancer.java +++ b/Mage.Sets/src/mage/sets/alarareborn/AvenMimeomancer.java @@ -28,9 +28,9 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -39,6 +39,7 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.*; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -65,7 +66,7 @@ public class AvenMimeomancer extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // At the beginning of your upkeep, you may put a feather counter on target creature. If you do, that creature is 3/1 and has flying for as long as it has a feather counter on it. - Ability ability = new BeginningOfUpkeepTriggeredAbility(Constants.Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.FEATHER.createInstance()), Constants.TargetController.YOU, true); + Ability ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.FEATHER.createInstance()), TargetController.YOU, true); ability.addTarget(new TargetCreaturePermanent()); ability.addEffect(new AvenEffect()); ability.addEffect(new AvenEffect2()); @@ -85,7 +86,7 @@ public class AvenMimeomancer extends CardImpl { class AvenEffect extends ContinuousEffectImpl { public AvenEffect() { - super(Constants.Duration.Custom, Constants.Layer.PTChangingEffects_7, Constants.SubLayer.SetPT_7b, Constants.Outcome.BoostCreature); + super(Duration.Custom, Layer.PTChangingEffects_7, SubLayer.SetPT_7b, Outcome.BoostCreature); } public AvenEffect(final AvenEffect effect) { @@ -128,7 +129,7 @@ class AvenEffect extends ContinuousEffectImpl { class AvenEffect2 extends ContinuousEffectImpl { public AvenEffect2() { - super(Constants.Duration.Custom, Constants.Layer.AbilityAddingRemovingEffects_6, Constants.SubLayer.NA, Constants.Outcome.BoostCreature); + super(Duration.Custom, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.BoostCreature); } public AvenEffect2(final AvenEffect2 effect) { diff --git a/Mage.Sets/src/mage/sets/alarareborn/BehemothSledge.java b/Mage.Sets/src/mage/sets/alarareborn/BehemothSledge.java index 0f98e921f5d..e4a8f9496cf 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/BehemothSledge.java +++ b/Mage.Sets/src/mage/sets/alarareborn/BehemothSledge.java @@ -30,11 +30,10 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; @@ -43,6 +42,7 @@ import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.LifelinkAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.AttachmentType; /** @@ -58,8 +58,8 @@ public class BehemothSledge extends CardImpl { this.color.setGreen(true); this.color.setWhite(true); this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); } diff --git a/Mage.Sets/src/mage/sets/alarareborn/BituminousBlast.java b/Mage.Sets/src/mage/sets/alarareborn/BituminousBlast.java index 8e85f9c3624..8bbe738e7aa 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/BituminousBlast.java +++ b/Mage.Sets/src/mage/sets/alarareborn/BituminousBlast.java @@ -29,8 +29,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.CascadeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/alarareborn/BlitzHellion.java b/Mage.Sets/src/mage/sets/alarareborn/BlitzHellion.java index f23295c164e..69bbc5e68b1 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/BlitzHellion.java +++ b/Mage.Sets/src/mage/sets/alarareborn/BlitzHellion.java @@ -28,10 +28,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; @@ -66,7 +64,7 @@ public class BlitzHellion extends CardImpl { this.addAbility(HasteAbility.getInstance()); // At the beginning of the end step, Blitz Hellion's owner shuffles it into his or her library. - this.addAbility(new BeginningOfEndStepTriggeredAbility(Constants.Zone.BATTLEFIELD, new ShuffleSourceEffect(), TargetController.ANY, null, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new ShuffleSourceEffect(), TargetController.ANY, null, false)); } public BlitzHellion(final BlitzHellion card) { @@ -82,7 +80,7 @@ public class BlitzHellion extends CardImpl { class ShuffleSourceEffect extends OneShotEffect { ShuffleSourceEffect() { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); staticText = "{this}'s owner shuffles it into his or her library"; } @@ -98,7 +96,7 @@ class ShuffleSourceEffect extends OneShotEffect { } Permanent permanent = game.getPermanent(source.getSourceId()); if (permanent != null) { - permanent.moveToZone(Constants.Zone.LIBRARY, id, game, false); + permanent.moveToZone(Zone.LIBRARY, id, game, false); player.shuffleLibrary(game); return true; } diff --git a/Mage.Sets/src/mage/sets/alarareborn/BloodbraidElf.java b/Mage.Sets/src/mage/sets/alarareborn/BloodbraidElf.java index 3be581e8d90..ea1daac7c22 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/BloodbraidElf.java +++ b/Mage.Sets/src/mage/sets/alarareborn/BloodbraidElf.java @@ -29,8 +29,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.CascadeAbility; import mage.abilities.keyword.HasteAbility; diff --git a/Mage.Sets/src/mage/sets/alarareborn/Brainbite.java b/Mage.Sets/src/mage/sets/alarareborn/Brainbite.java index 53ff26404e9..045b9d5b524 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/Brainbite.java +++ b/Mage.Sets/src/mage/sets/alarareborn/Brainbite.java @@ -29,14 +29,15 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.game.Game; import mage.players.Player; @@ -76,7 +77,7 @@ public class Brainbite extends CardImpl { class BrainbiteEffect extends OneShotEffect { public BrainbiteEffect() { - super(Constants.Outcome.Discard); + super(Outcome.Discard); staticText = "Target opponent reveals his or her hand. You choose a card from it. That player discards that card"; } @@ -91,9 +92,9 @@ class BrainbiteEffect extends OneShotEffect { player.revealCards("Brainbite", player.getHand(), game); Player you = game.getPlayer(source.getControllerId()); if (you != null) { - TargetCard target = new TargetCard(Constants.Zone.PICK, new FilterCard()); + TargetCard target = new TargetCard(Zone.PICK, new FilterCard()); target.setRequired(true); - if (you.choose(Constants.Outcome.Benefit, player.getHand(), target, game)) { + if (you.choose(Outcome.Benefit, player.getHand(), target, game)) { Card card = player.getHand().get(target.getFirstTarget(), game); if (card != null) { return player.discard(card, source, game); diff --git a/Mage.Sets/src/mage/sets/alarareborn/CapturedSunlight.java b/Mage.Sets/src/mage/sets/alarareborn/CapturedSunlight.java index 0000b37a6f9..783cda48601 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/CapturedSunlight.java +++ b/Mage.Sets/src/mage/sets/alarareborn/CapturedSunlight.java @@ -29,8 +29,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.keyword.CascadeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/alarareborn/CerodonYearling.java b/Mage.Sets/src/mage/sets/alarareborn/CerodonYearling.java index 2e38dbee565..4eec170f92b 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/CerodonYearling.java +++ b/Mage.Sets/src/mage/sets/alarareborn/CerodonYearling.java @@ -28,8 +28,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.VigilanceAbility; diff --git a/Mage.Sets/src/mage/sets/alarareborn/ColossalMight.java b/Mage.Sets/src/mage/sets/alarareborn/ColossalMight.java index dc0b73aecf8..c5bbdbbf982 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/ColossalMight.java +++ b/Mage.Sets/src/mage/sets/alarareborn/ColossalMight.java @@ -29,9 +29,9 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.TrampleAbility; diff --git a/Mage.Sets/src/mage/sets/alarareborn/DauntlessEscort.java b/Mage.Sets/src/mage/sets/alarareborn/DauntlessEscort.java index c589c5a56ed..16f1aaef476 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/DauntlessEscort.java +++ b/Mage.Sets/src/mage/sets/alarareborn/DauntlessEscort.java @@ -28,10 +28,10 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/alarareborn/DeadshotMinotaur.java b/Mage.Sets/src/mage/sets/alarareborn/DeadshotMinotaur.java index 1437e0647ed..129bea9c2d7 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/DeadshotMinotaur.java +++ b/Mage.Sets/src/mage/sets/alarareborn/DeadshotMinotaur.java @@ -28,8 +28,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/alarareborn/DefilerOfSouls.java b/Mage.Sets/src/mage/sets/alarareborn/DefilerOfSouls.java index 4bfa8c60968..3da80376ec1 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/DefilerOfSouls.java +++ b/Mage.Sets/src/mage/sets/alarareborn/DefilerOfSouls.java @@ -28,10 +28,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -67,7 +65,7 @@ public class DefilerOfSouls extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // At the beginning of each player's upkeep, that player sacrifices a monocolored creature. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(Constants.Zone.BATTLEFIELD, new DefilerOfSoulsEffect(), TargetController.ANY, false, true)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new DefilerOfSoulsEffect(), TargetController.ANY, false, true)); } public DefilerOfSouls(final DefilerOfSouls card) { @@ -83,7 +81,7 @@ public class DefilerOfSouls extends CardImpl { class DefilerOfSoulsEffect extends OneShotEffect { DefilerOfSoulsEffect() { - super(Constants.Outcome.Sacrifice); + super(Outcome.Sacrifice); staticText = "that player sacrifices a monocolored creature"; } @@ -98,7 +96,7 @@ class DefilerOfSoulsEffect extends OneShotEffect { if (player == null) { return false; } - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(new MonocoloredPredicate()); int amount; @@ -114,7 +112,7 @@ class DefilerOfSoulsEffect extends OneShotEffect { if (amount > 0 && target.canChoose(source.getSourceId(), player.getId(), game)) { boolean abilityApplied = false; while (!target.isChosen() && target.canChoose(player.getId(), game)) { - player.choose(Constants.Outcome.Sacrifice, target, source.getSourceId(), game); + player.choose(Outcome.Sacrifice, target, source.getSourceId(), game); } for ( int idx = 0; idx < target.getTargets().size(); idx++) { diff --git a/Mage.Sets/src/mage/sets/alarareborn/DemonicDread.java b/Mage.Sets/src/mage/sets/alarareborn/DemonicDread.java index 1cace873058..03174885b7b 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/DemonicDread.java +++ b/Mage.Sets/src/mage/sets/alarareborn/DemonicDread.java @@ -28,12 +28,13 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CantBlockTargetEffect; import mage.abilities.keyword.CascadeAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -55,7 +56,7 @@ public class DemonicDread extends CardImpl { // Target creature can't block this turn. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - this.getSpellAbility().addEffect(new CantBlockTargetEffect(Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new CantBlockTargetEffect(Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/alarareborn/DemonspineWhip.java b/Mage.Sets/src/mage/sets/alarareborn/DemonspineWhip.java index c936483d32c..46185819291 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/DemonspineWhip.java +++ b/Mage.Sets/src/mage/sets/alarareborn/DemonspineWhip.java @@ -28,9 +28,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -57,10 +56,10 @@ public class DemonspineWhip extends CardImpl { this.color.setBlack(true); // {X}: Equipped creature gets +X/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(new XPaid(), new StaticValue(0), Constants.Duration.EndOfTurn), new ManaCostsImpl("{X}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(new XPaid(), new StaticValue(0), Duration.EndOfTurn), new ManaCostsImpl("{X}"))); // Equip {1} - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(1))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1))); } public DemonspineWhip(final DemonspineWhip card) { diff --git a/Mage.Sets/src/mage/sets/alarareborn/DenyReality.java b/Mage.Sets/src/mage/sets/alarareborn/DenyReality.java index 223f335d368..a3f987f2f62 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/DenyReality.java +++ b/Mage.Sets/src/mage/sets/alarareborn/DenyReality.java @@ -29,8 +29,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.CascadeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/alarareborn/DragonBroodmother.java b/Mage.Sets/src/mage/sets/alarareborn/DragonBroodmother.java index 3141c9f5d89..10c4d432658 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/DragonBroodmother.java +++ b/Mage.Sets/src/mage/sets/alarareborn/DragonBroodmother.java @@ -28,9 +28,9 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -38,6 +38,7 @@ import mage.abilities.effects.common.DevourEffect; import mage.abilities.keyword.DevourAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.game.permanent.token.Token; /** @@ -59,7 +60,7 @@ public class DragonBroodmother extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // At the beginning of each upkeep, put a 1/1 red and green Dragon creature token with flying and devour 2 onto the battlefield. (As the token enters the battlefield, you may sacrifice any number of creatures. It enters the battlefield with twice that many +1/+1 counters on it.) - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new DragonToken()), Constants.TargetController.ANY, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new DragonToken()), TargetController.ANY, false)); } public DragonBroodmother(final DragonBroodmother card) { diff --git a/Mage.Sets/src/mage/sets/alarareborn/EnigmaSphinx.java b/Mage.Sets/src/mage/sets/alarareborn/EnigmaSphinx.java index 027b15d0591..da908aed646 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/EnigmaSphinx.java +++ b/Mage.Sets/src/mage/sets/alarareborn/EnigmaSphinx.java @@ -28,10 +28,10 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/alarareborn/EnlistedWurm.java b/Mage.Sets/src/mage/sets/alarareborn/EnlistedWurm.java index 4240c610430..9b91c4ad4b7 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/EnlistedWurm.java +++ b/Mage.Sets/src/mage/sets/alarareborn/EnlistedWurm.java @@ -28,8 +28,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.CascadeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/alarareborn/EthercasteKnight.java b/Mage.Sets/src/mage/sets/alarareborn/EthercasteKnight.java index 56c72c3583a..ef149de20fc 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/EthercasteKnight.java +++ b/Mage.Sets/src/mage/sets/alarareborn/EthercasteKnight.java @@ -29,8 +29,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ExaltedAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/alarareborn/EtheriumAbomination.java b/Mage.Sets/src/mage/sets/alarareborn/EtheriumAbomination.java index fbc5ed1beed..31e99d9e96c 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/EtheriumAbomination.java +++ b/Mage.Sets/src/mage/sets/alarareborn/EtheriumAbomination.java @@ -30,8 +30,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.UnearthAbility; diff --git a/Mage.Sets/src/mage/sets/alarareborn/EtherswornShieldmage.java b/Mage.Sets/src/mage/sets/alarareborn/EtherswornShieldmage.java index f2641d2f7bf..5b70ae19c21 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/EtherswornShieldmage.java +++ b/Mage.Sets/src/mage/sets/alarareborn/EtherswornShieldmage.java @@ -28,9 +28,9 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/alarareborn/FieldmistBorderpost.java b/Mage.Sets/src/mage/sets/alarareborn/FieldmistBorderpost.java index 02b5c27989f..2e73f87efc1 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/FieldmistBorderpost.java +++ b/Mage.Sets/src/mage/sets/alarareborn/FieldmistBorderpost.java @@ -29,8 +29,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.CompositeCost; diff --git a/Mage.Sets/src/mage/sets/alarareborn/FiligreeAngel.java b/Mage.Sets/src/mage/sets/alarareborn/FiligreeAngel.java index 6d960251ed1..2339cb21686 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/FiligreeAngel.java +++ b/Mage.Sets/src/mage/sets/alarareborn/FiligreeAngel.java @@ -30,15 +30,15 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; @@ -80,7 +80,7 @@ class FiligreeAngelEffect extends OneShotEffect { } public FiligreeAngelEffect() { - super(Constants.Outcome.GainLife); + super(Outcome.GainLife); staticText = "you gain 3 life for each artifact you control"; } diff --git a/Mage.Sets/src/mage/sets/alarareborn/FinestHour.java b/Mage.Sets/src/mage/sets/alarareborn/FinestHour.java index 4234d7f4c4c..f8d509e4255 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/FinestHour.java +++ b/Mage.Sets/src/mage/sets/alarareborn/FinestHour.java @@ -29,11 +29,11 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TurnPhase; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TurnPhase; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/alarareborn/FirewildBorderpost.java b/Mage.Sets/src/mage/sets/alarareborn/FirewildBorderpost.java index 5d71276e093..74972d7e635 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/FirewildBorderpost.java +++ b/Mage.Sets/src/mage/sets/alarareborn/FirewildBorderpost.java @@ -29,8 +29,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.CompositeCost; diff --git a/Mage.Sets/src/mage/sets/alarareborn/FlurryOfWings.java b/Mage.Sets/src/mage/sets/alarareborn/FlurryOfWings.java index 88420b6225f..992bf475c78 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/FlurryOfWings.java +++ b/Mage.Sets/src/mage/sets/alarareborn/FlurryOfWings.java @@ -28,8 +28,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/alarareborn/GlassdustHulk.java b/Mage.Sets/src/mage/sets/alarareborn/GlassdustHulk.java index 58e6d99e6a0..014136de5e3 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/GlassdustHulk.java +++ b/Mage.Sets/src/mage/sets/alarareborn/GlassdustHulk.java @@ -28,10 +28,10 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/alarareborn/GloryOfWarfare.java b/Mage.Sets/src/mage/sets/alarareborn/GloryOfWarfare.java index 2dc43db7e47..2b6606f3999 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/GloryOfWarfare.java +++ b/Mage.Sets/src/mage/sets/alarareborn/GloryOfWarfare.java @@ -30,10 +30,10 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MyTurnCondition; import mage.abilities.condition.common.NotMyTurnCondition; diff --git a/Mage.Sets/src/mage/sets/alarareborn/GloryscaleViashino.java b/Mage.Sets/src/mage/sets/alarareborn/GloryscaleViashino.java index 3807e621cf6..7293e3ebfa7 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/GloryscaleViashino.java +++ b/Mage.Sets/src/mage/sets/alarareborn/GloryscaleViashino.java @@ -29,10 +29,10 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; diff --git a/Mage.Sets/src/mage/sets/alarareborn/GorgerWurm.java b/Mage.Sets/src/mage/sets/alarareborn/GorgerWurm.java index 8e4c6cbdc1e..c469ff3911a 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/GorgerWurm.java +++ b/Mage.Sets/src/mage/sets/alarareborn/GorgerWurm.java @@ -28,8 +28,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.DevourEffect; import mage.abilities.keyword.DevourAbility; diff --git a/Mage.Sets/src/mage/sets/alarareborn/GrizzledLeotau.java b/Mage.Sets/src/mage/sets/alarareborn/GrizzledLeotau.java index e43332b2132..abec109bb9c 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/GrizzledLeotau.java +++ b/Mage.Sets/src/mage/sets/alarareborn/GrizzledLeotau.java @@ -28,8 +28,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/alarareborn/IdentityCrisis.java b/Mage.Sets/src/mage/sets/alarareborn/IdentityCrisis.java index 002f43d53e9..9539495707b 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/IdentityCrisis.java +++ b/Mage.Sets/src/mage/sets/alarareborn/IdentityCrisis.java @@ -30,13 +30,13 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; @@ -69,7 +69,7 @@ public class IdentityCrisis extends CardImpl { class IdentityCrisisEffect extends OneShotEffect { IdentityCrisisEffect() { - super(Constants.Outcome.Exile); + super(Outcome.Exile); staticText = "Exile all cards from target player's hand and graveyard"; } diff --git a/Mage.Sets/src/mage/sets/alarareborn/IgneousPouncer.java b/Mage.Sets/src/mage/sets/alarareborn/IgneousPouncer.java index 028257d08d8..35904821d41 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/IgneousPouncer.java +++ b/Mage.Sets/src/mage/sets/alarareborn/IgneousPouncer.java @@ -28,8 +28,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.HasteAbility; diff --git a/Mage.Sets/src/mage/sets/alarareborn/IllusoryDemon.java b/Mage.Sets/src/mage/sets/alarareborn/IllusoryDemon.java index 6b42165f314..ffa09b9942b 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/IllusoryDemon.java +++ b/Mage.Sets/src/mage/sets/alarareborn/IllusoryDemon.java @@ -28,8 +28,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; diff --git a/Mage.Sets/src/mage/sets/alarareborn/JenaraAsuraOfWar.java b/Mage.Sets/src/mage/sets/alarareborn/JenaraAsuraOfWar.java index d890ec30a6b..d1ff221e88a 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/JenaraAsuraOfWar.java +++ b/Mage.Sets/src/mage/sets/alarareborn/JenaraAsuraOfWar.java @@ -29,9 +29,9 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/alarareborn/JhessianZombies.java b/Mage.Sets/src/mage/sets/alarareborn/JhessianZombies.java index d66f665e241..eee0893d122 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/JhessianZombies.java +++ b/Mage.Sets/src/mage/sets/alarareborn/JhessianZombies.java @@ -28,8 +28,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.FearAbility; diff --git a/Mage.Sets/src/mage/sets/alarareborn/KathariRemnant.java b/Mage.Sets/src/mage/sets/alarareborn/KathariRemnant.java index d20744e6bf6..5ffa8c183f1 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/KathariRemnant.java +++ b/Mage.Sets/src/mage/sets/alarareborn/KathariRemnant.java @@ -29,9 +29,9 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/alarareborn/KnotvinePaladin.java b/Mage.Sets/src/mage/sets/alarareborn/KnotvinePaladin.java index 61d0cc8cec2..78fa5e39e78 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/KnotvinePaladin.java +++ b/Mage.Sets/src/mage/sets/alarareborn/KnotvinePaladin.java @@ -29,14 +29,14 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; @@ -64,7 +64,7 @@ public class KnotvinePaladin extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), new PermanentsOnBattlefieldCount(filter), Constants.Duration.EndOfTurn), false)); + this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), new PermanentsOnBattlefieldCount(filter), Duration.EndOfTurn), false)); } public KnotvinePaladin(final KnotvinePaladin card) { diff --git a/Mage.Sets/src/mage/sets/alarareborn/LichLordOfUnx.java b/Mage.Sets/src/mage/sets/alarareborn/LichLordOfUnx.java index 3144599e37c..68bf0a350c3 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/LichLordOfUnx.java +++ b/Mage.Sets/src/mage/sets/alarareborn/LichLordOfUnx.java @@ -30,9 +30,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,7 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.Token; @@ -70,10 +70,10 @@ public class LichLordOfUnx extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new ZombieWizardToken()), new ManaCostsImpl("{U}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ZombieWizardToken()), new ManaCostsImpl("{U}{B}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); - ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new LoseLifeTargetEffect(new PermanentsOnBattlefieldCount(filter)), new ManaCostsImpl("{U}{U}{B}{B}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(new PermanentsOnBattlefieldCount(filter)), new ManaCostsImpl("{U}{U}{B}{B}")); ability.addEffect(new PutLibraryIntoGraveTargetEffect(new PermanentsOnBattlefieldCount(filter, 1))); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/alarareborn/LightningReaver.java b/Mage.Sets/src/mage/sets/alarareborn/LightningReaver.java index 6fbb1a1c213..0ce87cb7c47 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/LightningReaver.java +++ b/Mage.Sets/src/mage/sets/alarareborn/LightningReaver.java @@ -28,10 +28,10 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/alarareborn/LordOfExtinction.java b/Mage.Sets/src/mage/sets/alarareborn/LordOfExtinction.java index bfe4bca078c..18a8313d45f 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/LordOfExtinction.java +++ b/Mage.Sets/src/mage/sets/alarareborn/LordOfExtinction.java @@ -28,10 +28,10 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/alarareborn/LorescaleCoatl.java b/Mage.Sets/src/mage/sets/alarareborn/LorescaleCoatl.java index c04a11555f9..f30bc13b607 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/LorescaleCoatl.java +++ b/Mage.Sets/src/mage/sets/alarareborn/LorescaleCoatl.java @@ -29,8 +29,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DrawCardTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/alarareborn/MadrushCyclops.java b/Mage.Sets/src/mage/sets/alarareborn/MadrushCyclops.java index 2205556ee75..4b450b29a81 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/MadrushCyclops.java +++ b/Mage.Sets/src/mage/sets/alarareborn/MadrushCyclops.java @@ -29,10 +29,10 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; diff --git a/Mage.Sets/src/mage/sets/alarareborn/MaelstromPulse.java b/Mage.Sets/src/mage/sets/alarareborn/MaelstromPulse.java index d67e741956f..4050c6a517b 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/MaelstromPulse.java +++ b/Mage.Sets/src/mage/sets/alarareborn/MaelstromPulse.java @@ -29,8 +29,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyAllNamedPermanentsEffect; import mage.cards.CardImpl; import mage.target.common.TargetNonlandPermanent; diff --git a/Mage.Sets/src/mage/sets/alarareborn/MagefireWings.java b/Mage.Sets/src/mage/sets/alarareborn/MagefireWings.java index 1ff82eb4e54..5d14c3de030 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/MagefireWings.java +++ b/Mage.Sets/src/mage/sets/alarareborn/MagefireWings.java @@ -30,11 +30,10 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -43,6 +42,8 @@ import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.AttachmentType; +import mage.constants.Outcome; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -61,12 +62,12 @@ public class MagefireWings extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 0, Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); } public MagefireWings (final MagefireWings card) { diff --git a/Mage.Sets/src/mage/sets/alarareborn/MarisisTwinclaws.java b/Mage.Sets/src/mage/sets/alarareborn/MarisisTwinclaws.java index 82d4a7013dc..f5d9b5d04d3 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/MarisisTwinclaws.java +++ b/Mage.Sets/src/mage/sets/alarareborn/MarisisTwinclaws.java @@ -29,8 +29,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DoubleStrikeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/alarareborn/MarrowChomper.java b/Mage.Sets/src/mage/sets/alarareborn/MarrowChomper.java index 8a6d723552f..d63e94f5783 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/MarrowChomper.java +++ b/Mage.Sets/src/mage/sets/alarareborn/MarrowChomper.java @@ -28,8 +28,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.DevouredCreaturesCount; diff --git a/Mage.Sets/src/mage/sets/alarareborn/MaskOfRiddles.java b/Mage.Sets/src/mage/sets/alarareborn/MaskOfRiddles.java index ad5571cdd08..c7d5518dbe3 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/MaskOfRiddles.java +++ b/Mage.Sets/src/mage/sets/alarareborn/MaskOfRiddles.java @@ -29,9 +29,7 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.common.DealsCombatDamageToAPlayerAttachedTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -56,11 +54,11 @@ public class MaskOfRiddles extends CardImpl { this.color.setBlack(true); // Equipped creature has fear. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FearAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FearAbility.getInstance(), AttachmentType.EQUIPMENT))); // Whenever equipped creature deals combat damage to a player, you may draw a card. this.addAbility(new DealsCombatDamageToAPlayerAttachedTriggeredAbility(new DrawCardControllerEffect(1), "equipped", true)); // Equip {2} - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(2))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); } public MaskOfRiddles(final MaskOfRiddles card) { diff --git a/Mage.Sets/src/mage/sets/alarareborn/MeddlingMage.java b/Mage.Sets/src/mage/sets/alarareborn/MeddlingMage.java index a777f07e844..0c827e22260 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/MeddlingMage.java +++ b/Mage.Sets/src/mage/sets/alarareborn/MeddlingMage.java @@ -28,11 +28,11 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/alarareborn/MindFuneral.java b/Mage.Sets/src/mage/sets/alarareborn/MindFuneral.java index 7336008e264..f291cdfb355 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/MindFuneral.java +++ b/Mage.Sets/src/mage/sets/alarareborn/MindFuneral.java @@ -28,10 +28,10 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/alarareborn/MistveinBorderpost.java b/Mage.Sets/src/mage/sets/alarareborn/MistveinBorderpost.java index 2d23913e63a..2514abe9aab 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/MistveinBorderpost.java +++ b/Mage.Sets/src/mage/sets/alarareborn/MistveinBorderpost.java @@ -29,8 +29,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.CompositeCost; diff --git a/Mage.Sets/src/mage/sets/alarareborn/MonstrousCarabid.java b/Mage.Sets/src/mage/sets/alarareborn/MonstrousCarabid.java index b158a5bf59d..4182ea5e7aa 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/MonstrousCarabid.java +++ b/Mage.Sets/src/mage/sets/alarareborn/MonstrousCarabid.java @@ -28,8 +28,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/alarareborn/MycoidShepherd.java b/Mage.Sets/src/mage/sets/alarareborn/MycoidShepherd.java index b093db9c376..b514d73a21d 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/MycoidShepherd.java +++ b/Mage.Sets/src/mage/sets/alarareborn/MycoidShepherd.java @@ -28,10 +28,10 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.MageObject; import mage.abilities.TriggeredAbilityImpl; @@ -76,7 +76,7 @@ public class MycoidShepherd extends CardImpl { class MycoidShepherdTriggeredAbility extends TriggeredAbilityImpl { public MycoidShepherdTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new GainLifeEffect(5), true); + super(Zone.BATTLEFIELD, new GainLifeEffect(5), true); } public MycoidShepherdTriggeredAbility(final MycoidShepherdTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/alarareborn/NecromancersCovenant.java b/Mage.Sets/src/mage/sets/alarareborn/NecromancersCovenant.java index 1a872db8161..ce081db4853 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/NecromancersCovenant.java +++ b/Mage.Sets/src/mage/sets/alarareborn/NecromancersCovenant.java @@ -28,11 +28,11 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/alarareborn/NemesisOfReason.java b/Mage.Sets/src/mage/sets/alarareborn/NemesisOfReason.java index ab2212a1aeb..d4b79cee591 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/NemesisOfReason.java +++ b/Mage.Sets/src/mage/sets/alarareborn/NemesisOfReason.java @@ -30,14 +30,14 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.targetpointer.FixedTarget; @@ -72,7 +72,7 @@ public class NemesisOfReason extends CardImpl { class NemesisOfReasonTriggeredAbility extends TriggeredAbilityImpl { NemesisOfReasonTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(10)); + super(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(10)); } NemesisOfReasonTriggeredAbility(final NemesisOfReasonTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/alarareborn/NulltreadGargantuan.java b/Mage.Sets/src/mage/sets/alarareborn/NulltreadGargantuan.java index d785da567fd..7ffa98ad742 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/NulltreadGargantuan.java +++ b/Mage.Sets/src/mage/sets/alarareborn/NulltreadGargantuan.java @@ -29,8 +29,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/alarareborn/OfferingToAsha.java b/Mage.Sets/src/mage/sets/alarareborn/OfferingToAsha.java index 382e8a728ae..50c7025b007 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/OfferingToAsha.java +++ b/Mage.Sets/src/mage/sets/alarareborn/OfferingToAsha.java @@ -28,8 +28,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/alarareborn/PaleRecluse.java b/Mage.Sets/src/mage/sets/alarareborn/PaleRecluse.java index 3e63a1615be..e71738e43a1 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/PaleRecluse.java +++ b/Mage.Sets/src/mage/sets/alarareborn/PaleRecluse.java @@ -28,8 +28,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/alarareborn/PredatoryAdvantage.java b/Mage.Sets/src/mage/sets/alarareborn/PredatoryAdvantage.java index 7bbb00d0717..ad34335a316 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/PredatoryAdvantage.java +++ b/Mage.Sets/src/mage/sets/alarareborn/PredatoryAdvantage.java @@ -28,11 +28,11 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.WatcherScope; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.WatcherScope; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/alarareborn/PutridLeech.java b/Mage.Sets/src/mage/sets/alarareborn/PutridLeech.java index 0151a09c08f..5d1159107be 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/PutridLeech.java +++ b/Mage.Sets/src/mage/sets/alarareborn/PutridLeech.java @@ -29,10 +29,10 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.ActivateOncePerTurnActivatedAbility; import mage.abilities.costs.common.PayLifeCost; diff --git a/Mage.Sets/src/mage/sets/alarareborn/QasaliPridemage.java b/Mage.Sets/src/mage/sets/alarareborn/QasaliPridemage.java index 3df7cbc6436..edd5e1241fd 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/QasaliPridemage.java +++ b/Mage.Sets/src/mage/sets/alarareborn/QasaliPridemage.java @@ -28,9 +28,9 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/alarareborn/RetaliatorGriffin.java b/Mage.Sets/src/mage/sets/alarareborn/RetaliatorGriffin.java index c3d4cccecea..0d6f76f5f62 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/RetaliatorGriffin.java +++ b/Mage.Sets/src/mage/sets/alarareborn/RetaliatorGriffin.java @@ -28,10 +28,10 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage.Sets/src/mage/sets/alarareborn/RhoxBrute.java b/Mage.Sets/src/mage/sets/alarareborn/RhoxBrute.java index e91def1df9e..4137eac4541 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/RhoxBrute.java +++ b/Mage.Sets/src/mage/sets/alarareborn/RhoxBrute.java @@ -29,8 +29,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/alarareborn/SanctumPlowbeast.java b/Mage.Sets/src/mage/sets/alarareborn/SanctumPlowbeast.java index dd5dcfe9a80..cd6678be552 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/SanctumPlowbeast.java +++ b/Mage.Sets/src/mage/sets/alarareborn/SanctumPlowbeast.java @@ -28,8 +28,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.DefenderAbility; diff --git a/Mage.Sets/src/mage/sets/alarareborn/SewnEyeDrake.java b/Mage.Sets/src/mage/sets/alarareborn/SewnEyeDrake.java index 5c0853042ab..1235a0d7b1d 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/SewnEyeDrake.java +++ b/Mage.Sets/src/mage/sets/alarareborn/SewnEyeDrake.java @@ -29,8 +29,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; diff --git a/Mage.Sets/src/mage/sets/alarareborn/SigilOfTheNayanGods.java b/Mage.Sets/src/mage/sets/alarareborn/SigilOfTheNayanGods.java index ff40ff6a242..78d274e33c1 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/SigilOfTheNayanGods.java +++ b/Mage.Sets/src/mage/sets/alarareborn/SigilOfTheNayanGods.java @@ -28,11 +28,11 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; diff --git a/Mage.Sets/src/mage/sets/alarareborn/SigiledBehemoth.java b/Mage.Sets/src/mage/sets/alarareborn/SigiledBehemoth.java index 2ae62ab49cd..a024d59ec09 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/SigiledBehemoth.java +++ b/Mage.Sets/src/mage/sets/alarareborn/SigiledBehemoth.java @@ -29,8 +29,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ExaltedAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/alarareborn/Soulquake.java b/Mage.Sets/src/mage/sets/alarareborn/Soulquake.java index fbbd23c7890..36672635aee 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/Soulquake.java +++ b/Mage.Sets/src/mage/sets/alarareborn/Soulquake.java @@ -28,14 +28,15 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -92,13 +93,13 @@ class SoulquakeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { for (Permanent permanent : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { - permanent.moveToZone(Constants.Zone.HAND, source.getSourceId(), game, true); + permanent.moveToZone(Zone.HAND, source.getSourceId(), game, true); } for (UUID playerId : game.getPlayer(source.getControllerId()).getInRange()) { Player player = game.getPlayer(playerId); if (player != null) { for (Card card : player.getGraveyard().getCards(filter2, game)) { - card.moveToZone(Constants.Zone.HAND, source.getSourceId(), game, true); + card.moveToZone(Zone.HAND, source.getSourceId(), game, true); } } } diff --git a/Mage.Sets/src/mage/sets/alarareborn/SovereignsOfLostAlara.java b/Mage.Sets/src/mage/sets/alarareborn/SovereignsOfLostAlara.java index 0a1dc949096..e93bf33fb9b 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/SovereignsOfLostAlara.java +++ b/Mage.Sets/src/mage/sets/alarareborn/SovereignsOfLostAlara.java @@ -28,10 +28,10 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -39,6 +39,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.ExaltedAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.other.AuraCardCanAttachToPermanentId; @@ -120,7 +121,7 @@ class CreatureControlledAttacksAloneTriggeredAbility extends TriggeredAbilityImp class SovereignsOfLostAlaraEffect extends OneShotEffect { public SovereignsOfLostAlaraEffect() { - super(Constants.Outcome.BoostCreature); + super(Outcome.BoostCreature); staticText = "you may search your library for an Aura card that could enchant that creature, put it onto the battlefield attached to that creature, then shuffle your library"; } @@ -136,14 +137,14 @@ class SovereignsOfLostAlaraEffect extends OneShotEffect { this.color.setWhite(true); // Sacrifice Stormcaller's Boon: Creatures you control gain flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityControlledEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn, new FilterControlledCreaturePermanent("Creatures")), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent("Creatures")), new SacrificeSourceCost())); this.addAbility(new CascadeAbility()); } diff --git a/Mage.Sets/src/mage/sets/alarareborn/StunSniper.java b/Mage.Sets/src/mage/sets/alarareborn/StunSniper.java index 62e200c806e..f1f3bf33e8c 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/StunSniper.java +++ b/Mage.Sets/src/mage/sets/alarareborn/StunSniper.java @@ -29,9 +29,9 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/alarareborn/TalonTrooper.java b/Mage.Sets/src/mage/sets/alarareborn/TalonTrooper.java index b75a8a3ffa3..c132d584b8b 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/TalonTrooper.java +++ b/Mage.Sets/src/mage/sets/alarareborn/TalonTrooper.java @@ -29,8 +29,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/alarareborn/Terminate.java b/Mage.Sets/src/mage/sets/alarareborn/Terminate.java index f11d38266bd..8c14008e6a2 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/Terminate.java +++ b/Mage.Sets/src/mage/sets/alarareborn/Terminate.java @@ -29,8 +29,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/alarareborn/TimeSieve.java b/Mage.Sets/src/mage/sets/alarareborn/TimeSieve.java index cf6d2f3220a..c708b6834d3 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/TimeSieve.java +++ b/Mage.Sets/src/mage/sets/alarareborn/TimeSieve.java @@ -28,10 +28,10 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; diff --git a/Mage.Sets/src/mage/sets/alarareborn/UnbenderTine.java b/Mage.Sets/src/mage/sets/alarareborn/UnbenderTine.java index 6b737f70f37..07d66f04b60 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/UnbenderTine.java +++ b/Mage.Sets/src/mage/sets/alarareborn/UnbenderTine.java @@ -28,14 +28,16 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; @@ -62,7 +64,7 @@ public class UnbenderTine extends CardImpl { this.color.setWhite(true); // {tap}: Untap another target permanent. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new UnbenderTineEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UnbenderTineEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } @@ -80,7 +82,7 @@ public class UnbenderTine extends CardImpl { class UnbenderTineEffect extends OneShotEffect { public UnbenderTineEffect() { - super(Constants.Outcome.Untap); + super(Outcome.Untap); this.staticText = "Untap another target permanent"; } diff --git a/Mage.Sets/src/mage/sets/alarareborn/ValleyRannet.java b/Mage.Sets/src/mage/sets/alarareborn/ValleyRannet.java index 896f37dceea..8904fd1cd5a 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/ValleyRannet.java +++ b/Mage.Sets/src/mage/sets/alarareborn/ValleyRannet.java @@ -28,8 +28,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.MountaincyclingAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/alarareborn/VeinfireBorderpost.java b/Mage.Sets/src/mage/sets/alarareborn/VeinfireBorderpost.java index 0e1e2d1f9a9..b16b21cb52c 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/VeinfireBorderpost.java +++ b/Mage.Sets/src/mage/sets/alarareborn/VeinfireBorderpost.java @@ -29,8 +29,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.CompositeCost; diff --git a/Mage.Sets/src/mage/sets/alarareborn/VengefulRebirth.java b/Mage.Sets/src/mage/sets/alarareborn/VengefulRebirth.java index 634d6f4e78e..4e759a43afc 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/VengefulRebirth.java +++ b/Mage.Sets/src/mage/sets/alarareborn/VengefulRebirth.java @@ -29,10 +29,10 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileSpellEffect; diff --git a/Mage.Sets/src/mage/sets/alarareborn/ViolentOutburst.java b/Mage.Sets/src/mage/sets/alarareborn/ViolentOutburst.java index 0426519a7f1..f698fd0df2e 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/ViolentOutburst.java +++ b/Mage.Sets/src/mage/sets/alarareborn/ViolentOutburst.java @@ -28,9 +28,9 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.keyword.CascadeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/alarareborn/VithianRenegades.java b/Mage.Sets/src/mage/sets/alarareborn/VithianRenegades.java index c0e411b109c..91395c5e9f3 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/VithianRenegades.java +++ b/Mage.Sets/src/mage/sets/alarareborn/VithianRenegades.java @@ -29,8 +29,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/alarareborn/WallOfDenial.java b/Mage.Sets/src/mage/sets/alarareborn/WallOfDenial.java index 6f0d02b2246..bf1633cc42c 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/WallOfDenial.java +++ b/Mage.Sets/src/mage/sets/alarareborn/WallOfDenial.java @@ -29,8 +29,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/alarareborn/Wargate.java b/Mage.Sets/src/mage/sets/alarareborn/Wargate.java index 40977ea75ef..a02fdcf2460 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/Wargate.java +++ b/Mage.Sets/src/mage/sets/alarareborn/Wargate.java @@ -28,13 +28,15 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.Filter; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; @@ -73,7 +75,7 @@ public class Wargate extends CardImpl { class WargateEffect extends OneShotEffect { WargateEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); staticText = "Search your library for a permanent card with converted mana cost X or less, put it onto the battlefield, then shuffle your library"; } @@ -95,7 +97,7 @@ class WargateEffect extends OneShotEffect { if (target.getTargets().size() > 0) { Card card = player.getLibrary().getCard(target.getFirstTarget(), game); if (card != null) { - card.putOntoBattlefield(game, Constants.Zone.LIBRARY, source.getId(), source.getControllerId()); + card.putOntoBattlefield(game, Zone.LIBRARY, source.getId(), source.getControllerId()); } } player.shuffleLibrary(game); diff --git a/Mage.Sets/src/mage/sets/alarareborn/WildfieldBorderpost.java b/Mage.Sets/src/mage/sets/alarareborn/WildfieldBorderpost.java index 2877d254d46..77b7aa44c9f 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/WildfieldBorderpost.java +++ b/Mage.Sets/src/mage/sets/alarareborn/WildfieldBorderpost.java @@ -29,8 +29,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.CompositeCost; diff --git a/Mage.Sets/src/mage/sets/alarareborn/WingedCoatl.java b/Mage.Sets/src/mage/sets/alarareborn/WingedCoatl.java index 244a2cffd8a..a892ecf6c79 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/WingedCoatl.java +++ b/Mage.Sets/src/mage/sets/alarareborn/WingedCoatl.java @@ -29,8 +29,8 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.FlashAbility; diff --git a/Mage.Sets/src/mage/sets/alarareborn/ZealousPersecution.java b/Mage.Sets/src/mage/sets/alarareborn/ZealousPersecution.java index b74bc2c45d0..01d942d9f25 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/ZealousPersecution.java +++ b/Mage.Sets/src/mage/sets/alarareborn/ZealousPersecution.java @@ -28,9 +28,9 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.effects.common.continious.BoostOpponentsEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/alliances/ElvishRanger1.java b/Mage.Sets/src/mage/sets/alliances/ElvishRanger1.java index 652d6ac6dd3..6d02e2d12bd 100644 --- a/Mage.Sets/src/mage/sets/alliances/ElvishRanger1.java +++ b/Mage.Sets/src/mage/sets/alliances/ElvishRanger1.java @@ -28,8 +28,8 @@ package mage.sets.alliances; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/alliances/ElvishSpiritGuide.java b/Mage.Sets/src/mage/sets/alliances/ElvishSpiritGuide.java index dc8a26d5dbf..707996b6a79 100644 --- a/Mage.Sets/src/mage/sets/alliances/ElvishSpiritGuide.java +++ b/Mage.Sets/src/mage/sets/alliances/ElvishSpiritGuide.java @@ -28,9 +28,9 @@ package mage.sets.alliances; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -39,6 +39,7 @@ import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.mana.SimpleManaAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; @@ -59,7 +60,7 @@ public class ElvishSpiritGuide extends CardImpl { this.toughness = new MageInt(2); // Exile Elvish Spirit Guide from your hand: Add {G} to your mana pool. - this.addAbility(new SimpleManaAbility(Constants.Zone.HAND, new BasicManaEffect(Mana.GreenMana), new ExileSourceFromHandCost())); + this.addAbility(new SimpleManaAbility(Zone.HAND, new BasicManaEffect(Mana.GreenMana), new ExileSourceFromHandCost())); } public ElvishSpiritGuide(final ElvishSpiritGuide card) { diff --git a/Mage.Sets/src/mage/sets/alliances/ForceOfWill.java b/Mage.Sets/src/mage/sets/alliances/ForceOfWill.java index 940cb3aba35..eca26f308ce 100644 --- a/Mage.Sets/src/mage/sets/alliances/ForceOfWill.java +++ b/Mage.Sets/src/mage/sets/alliances/ForceOfWill.java @@ -28,8 +28,8 @@ package mage.sets.alliances; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.Cost; diff --git a/Mage.Sets/src/mage/sets/alliances/HelmOfObedience.java b/Mage.Sets/src/mage/sets/alliances/HelmOfObedience.java index c2fec535ccf..59c5f20dacc 100644 --- a/Mage.Sets/src/mage/sets/alliances/HelmOfObedience.java +++ b/Mage.Sets/src/mage/sets/alliances/HelmOfObedience.java @@ -28,9 +28,9 @@ package mage.sets.alliances; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +40,8 @@ import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetOpponent; @@ -55,7 +57,7 @@ public class HelmOfObedience extends CardImpl { this.expansionSetCode = "ALL"; // {X}, {tap}: Target opponent puts cards from the top of his or her library into his or her graveyard until a creature card or X cards are put into that graveyard this way, whichever comes first. If a creature card is put into that graveyard this way, sacrifice Helm of Obedience and put that card onto the battlefield under your control. X can't be 0. - SimpleActivatedAbility abilitiy = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new HelmOfObedienceEffect(), new TapSourceCost()); + SimpleActivatedAbility abilitiy = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HelmOfObedienceEffect(), new TapSourceCost()); abilitiy.addCost(new VariableManaCost()); abilitiy.addTarget(new TargetOpponent()); this.addAbility(abilitiy); @@ -78,7 +80,7 @@ class HelmOfObedienceEffect extends OneShotEffect { private static final ManacostVariableValue amount = new ManacostVariableValue(); public HelmOfObedienceEffect() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); } public HelmOfObedienceEffect(final HelmOfObedienceEffect effect) { @@ -102,7 +104,7 @@ class HelmOfObedienceEffect extends OneShotEffect { while(player.getLibrary().size() > 0) { Card card = player.getLibrary().removeFromTop(game); if (card != null){ - if(card.moveToZone(Constants.Zone.GRAVEYARD, source.getId(), game, false)){ + if(card.moveToZone(Zone.GRAVEYARD, source.getId(), game, false)){ if(card.getCardType().contains(CardType.CREATURE)){ break; } diff --git a/Mage.Sets/src/mage/sets/alliances/Pyrokinesis.java b/Mage.Sets/src/mage/sets/alliances/Pyrokinesis.java index d36852fe146..90c54a2d2b2 100644 --- a/Mage.Sets/src/mage/sets/alliances/Pyrokinesis.java +++ b/Mage.Sets/src/mage/sets/alliances/Pyrokinesis.java @@ -28,8 +28,8 @@ package mage.sets.alliances; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.Cost; @@ -42,7 +42,6 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardIdPredicate; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCardInHand; -import mage.target.common.TargetCreatureOrPlayerAmount; import mage.target.common.TargetCreaturePermanentAmount; /** diff --git a/Mage.Sets/src/mage/sets/alliances/SoldierOfFortune.java b/Mage.Sets/src/mage/sets/alliances/SoldierOfFortune.java index 60a469b966c..5dce15d0b18 100644 --- a/Mage.Sets/src/mage/sets/alliances/SoldierOfFortune.java +++ b/Mage.Sets/src/mage/sets/alliances/SoldierOfFortune.java @@ -28,10 +28,10 @@ package mage.sets.alliances; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/antiquities/Atog.java b/Mage.Sets/src/mage/sets/antiquities/Atog.java index e939064c2c8..d4c2ce017b3 100644 --- a/Mage.Sets/src/mage/sets/antiquities/Atog.java +++ b/Mage.Sets/src/mage/sets/antiquities/Atog.java @@ -28,7 +28,7 @@ package mage.sets.antiquities; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/antiquities/CandelabraOfTawnos.java b/Mage.Sets/src/mage/sets/antiquities/CandelabraOfTawnos.java index 422f51685c0..46355953da5 100644 --- a/Mage.Sets/src/mage/sets/antiquities/CandelabraOfTawnos.java +++ b/Mage.Sets/src/mage/sets/antiquities/CandelabraOfTawnos.java @@ -28,9 +28,9 @@ package mage.sets.antiquities; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.AdjustingSourceCosts; @@ -38,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.UntapTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.game.Game; import mage.target.common.TargetLandPermanent; @@ -71,7 +72,7 @@ public class CandelabraOfTawnos extends CardImpl { class CandelabraOfTawnosAbility extends ActivatedAbilityImpl implements AdjustingSourceCosts{ public CandelabraOfTawnosAbility(){ - super(Constants.Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); + super(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); addTarget(new TargetLandPermanent(0, Integer.MAX_VALUE, new FilterLandPermanent(), false)); } diff --git a/Mage.Sets/src/mage/sets/antiquities/Millstone.java b/Mage.Sets/src/mage/sets/antiquities/Millstone.java index 9f72c423c52..a791d4527e5 100644 --- a/Mage.Sets/src/mage/sets/antiquities/Millstone.java +++ b/Mage.Sets/src/mage/sets/antiquities/Millstone.java @@ -28,7 +28,7 @@ package mage.sets.antiquities; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/antiquities/Ornithopter.java b/Mage.Sets/src/mage/sets/antiquities/Ornithopter.java index addf86c5b2d..df91117b867 100644 --- a/Mage.Sets/src/mage/sets/antiquities/Ornithopter.java +++ b/Mage.Sets/src/mage/sets/antiquities/Ornithopter.java @@ -28,7 +28,7 @@ package mage.sets.antiquities; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/antiquities/PrimalClay.java b/Mage.Sets/src/mage/sets/antiquities/PrimalClay.java index c8b040ae068..7c284722ed7 100644 --- a/Mage.Sets/src/mage/sets/antiquities/PrimalClay.java +++ b/Mage.Sets/src/mage/sets/antiquities/PrimalClay.java @@ -28,7 +28,7 @@ package mage.sets.antiquities; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/antiquities/SageOfLatNam.java b/Mage.Sets/src/mage/sets/antiquities/SageOfLatNam.java index c5d085f7073..df011eebac6 100644 --- a/Mage.Sets/src/mage/sets/antiquities/SageOfLatNam.java +++ b/Mage.Sets/src/mage/sets/antiquities/SageOfLatNam.java @@ -28,9 +28,9 @@ package mage.sets.antiquities; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +38,7 @@ import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledPermanent; @@ -66,7 +67,7 @@ public class SageOfLatNam extends CardImpl { this.toughness = new MageInt(2); // {T}, Sacrifice an artifact: Draw a card. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/antiquities/Shatterstorm.java b/Mage.Sets/src/mage/sets/antiquities/Shatterstorm.java index 7be108f146c..0121b12ffdf 100644 --- a/Mage.Sets/src/mage/sets/antiquities/Shatterstorm.java +++ b/Mage.Sets/src/mage/sets/antiquities/Shatterstorm.java @@ -28,7 +28,7 @@ package mage.sets.antiquities; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/antiquities/UrzasMine.java b/Mage.Sets/src/mage/sets/antiquities/UrzasMine.java index 45ca1e15b11..559743cbbb2 100644 --- a/Mage.Sets/src/mage/sets/antiquities/UrzasMine.java +++ b/Mage.Sets/src/mage/sets/antiquities/UrzasMine.java @@ -28,7 +28,7 @@ package mage.sets.antiquities; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/antiquities/UrzasPowerPlant.java b/Mage.Sets/src/mage/sets/antiquities/UrzasPowerPlant.java index bfdd8e61dfd..2dbae8f015b 100644 --- a/Mage.Sets/src/mage/sets/antiquities/UrzasPowerPlant.java +++ b/Mage.Sets/src/mage/sets/antiquities/UrzasPowerPlant.java @@ -28,7 +28,7 @@ package mage.sets.antiquities; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/antiquities/UrzasTower.java b/Mage.Sets/src/mage/sets/antiquities/UrzasTower.java index fcecf2f2e65..dbca4117bf7 100644 --- a/Mage.Sets/src/mage/sets/antiquities/UrzasTower.java +++ b/Mage.Sets/src/mage/sets/antiquities/UrzasTower.java @@ -28,7 +28,7 @@ package mage.sets.antiquities; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/antiquities/WallOfSpears.java b/Mage.Sets/src/mage/sets/antiquities/WallOfSpears.java index b8d85a59f81..3afd3abe287 100644 --- a/Mage.Sets/src/mage/sets/antiquities/WallOfSpears.java +++ b/Mage.Sets/src/mage/sets/antiquities/WallOfSpears.java @@ -28,7 +28,7 @@ package mage.sets.antiquities; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/apocalypse/AEtherMutation.java b/Mage.Sets/src/mage/sets/apocalypse/AEtherMutation.java index 6da18100335..f7e525533be 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/AEtherMutation.java +++ b/Mage.Sets/src/mage/sets/apocalypse/AEtherMutation.java @@ -28,8 +28,8 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.TargetConvertedManaCost; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; diff --git a/Mage.Sets/src/mage/sets/apocalypse/AnaDisciple.java b/Mage.Sets/src/mage/sets/apocalypse/AnaDisciple.java index 4c0b00c5811..35fef9f94f0 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/AnaDisciple.java +++ b/Mage.Sets/src/mage/sets/apocalypse/AnaDisciple.java @@ -30,9 +30,7 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -57,11 +55,11 @@ public class AnaDisciple extends CardImpl { this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability firstAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.U)); + Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U)); firstAbility.addCost(new TapSourceCost()); firstAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(firstAbility); - Ability secondAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.B)); + Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); secondAbility.addCost(new TapSourceCost()); secondAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(secondAbility); diff --git a/Mage.Sets/src/mage/sets/apocalypse/Anavolver.java b/Mage.Sets/src/mage/sets/apocalypse/Anavolver.java index 1ce5cc0788c..3eee3d64384 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/Anavolver.java +++ b/Mage.Sets/src/mage/sets/apocalypse/Anavolver.java @@ -29,10 +29,10 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/apocalypse/AngelfireCrusader.java b/Mage.Sets/src/mage/sets/apocalypse/AngelfireCrusader.java index da75ea16afc..5b41eaed5cf 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/AngelfireCrusader.java +++ b/Mage.Sets/src/mage/sets/apocalypse/AngelfireCrusader.java @@ -30,9 +30,7 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -53,7 +51,7 @@ public class AngelfireCrusader extends CardImpl { this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); } public AngelfireCrusader(final AngelfireCrusader card) { diff --git a/Mage.Sets/src/mage/sets/apocalypse/BattlefieldForge.java b/Mage.Sets/src/mage/sets/apocalypse/BattlefieldForge.java index cd516cfbbae..6093b5e72cb 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/BattlefieldForge.java +++ b/Mage.Sets/src/mage/sets/apocalypse/BattlefieldForge.java @@ -28,8 +28,8 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.mana.ColorlessManaAbility; diff --git a/Mage.Sets/src/mage/sets/apocalypse/BloodfireColossus.java b/Mage.Sets/src/mage/sets/apocalypse/BloodfireColossus.java index d46e1ac9ac2..0a83d8b7566 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/BloodfireColossus.java +++ b/Mage.Sets/src/mage/sets/apocalypse/BloodfireColossus.java @@ -30,9 +30,8 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.DamageEverythingEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; /** * @author Loki @@ -53,7 +54,7 @@ public class BloodfireColossus extends CardImpl { this.color.setRed(true); this.power = new MageInt(6); this.toughness = new MageInt(6); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageEverythingEffect(6), new ColoredManaCost(Constants.ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(6), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/BloodfireDwarf.java b/Mage.Sets/src/mage/sets/apocalypse/BloodfireDwarf.java index 398aefbb56f..9232f3f7ece 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/BloodfireDwarf.java +++ b/Mage.Sets/src/mage/sets/apocalypse/BloodfireDwarf.java @@ -30,9 +30,8 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; @@ -63,7 +64,7 @@ public class BloodfireDwarf extends CardImpl { this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageAllEffect(1, filter), new ColoredManaCost(Constants.ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(1, filter), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/BloodfireKavu.java b/Mage.Sets/src/mage/sets/apocalypse/BloodfireKavu.java index 21683290fb4..a1100649814 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/BloodfireKavu.java +++ b/Mage.Sets/src/mage/sets/apocalypse/BloodfireKavu.java @@ -30,9 +30,8 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.DamageAllEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; /** @@ -54,7 +55,7 @@ public class BloodfireKavu extends CardImpl { this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageAllEffect(2, new FilterCreaturePermanent()), new ColoredManaCost(Constants.ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(2, new FilterCreaturePermanent()), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/BogGnarr.java b/Mage.Sets/src/mage/sets/apocalypse/BogGnarr.java index 5aef251731c..d1083a4868e 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/BogGnarr.java +++ b/Mage.Sets/src/mage/sets/apocalypse/BogGnarr.java @@ -30,14 +30,15 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; @@ -79,7 +80,7 @@ class BogGnarrTriggeredAbility extends TriggeredAbilityImpl { this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability firstAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.R)); + Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); firstAbility.addCost(new TapSourceCost()); firstAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(firstAbility); - Ability secondAbility = new AnyColorManaAbility(new ColoredManaCost(Constants.ColoredManaSymbol.G)); + Ability secondAbility = new AnyColorManaAbility(new ColoredManaCost(ColoredManaSymbol.G)); secondAbility.addCost(new TapSourceCost()); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/Cetavolver.java b/Mage.Sets/src/mage/sets/apocalypse/Cetavolver.java index c44e667116f..2874d385bb0 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/Cetavolver.java +++ b/Mage.Sets/src/mage/sets/apocalypse/Cetavolver.java @@ -28,9 +28,9 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.common.KickedCostCondition; diff --git a/Mage.Sets/src/mage/sets/apocalypse/CoastalDrake.java b/Mage.Sets/src/mage/sets/apocalypse/CoastalDrake.java index 8d71acc976e..877a7ef15de 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/CoastalDrake.java +++ b/Mage.Sets/src/mage/sets/apocalypse/CoastalDrake.java @@ -29,9 +29,8 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -55,7 +55,7 @@ public class CoastalDrake extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ManaCostsImpl("{1}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ManaCostsImpl("{1}{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/DeathGrasp.java b/Mage.Sets/src/mage/sets/apocalypse/DeathGrasp.java index aef53d1e1ee..417c988f317 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/DeathGrasp.java +++ b/Mage.Sets/src/mage/sets/apocalypse/DeathGrasp.java @@ -29,8 +29,8 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/apocalypse/DeathMutation.java b/Mage.Sets/src/mage/sets/apocalypse/DeathMutation.java index 39ca683ae9c..fe9827077fd 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/DeathMutation.java +++ b/Mage.Sets/src/mage/sets/apocalypse/DeathMutation.java @@ -28,8 +28,8 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.dynamicvalue.common.TargetConvertedManaCost; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/apocalypse/DegaDisciple.java b/Mage.Sets/src/mage/sets/apocalypse/DegaDisciple.java index 2d6bbdab915..494c00e0376 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/DegaDisciple.java +++ b/Mage.Sets/src/mage/sets/apocalypse/DegaDisciple.java @@ -29,9 +29,7 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -55,11 +53,11 @@ public class DegaDisciple extends CardImpl { this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability firstAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.B)); + Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); firstAbility.addCost(new TapSourceCost()); firstAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(firstAbility); - Ability secondAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.R)); + Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); secondAbility.addCost(new TapSourceCost()); secondAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(secondAbility); diff --git a/Mage.Sets/src/mage/sets/apocalypse/Degavolver.java b/Mage.Sets/src/mage/sets/apocalypse/Degavolver.java index 0616be0b440..361ce607f7e 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/Degavolver.java +++ b/Mage.Sets/src/mage/sets/apocalypse/Degavolver.java @@ -28,11 +28,11 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -71,7 +71,7 @@ public class Degavolver extends CardImpl { new AddCountersSourceEffect(CounterType.P1P1.createInstance(2),false), new KickedCostCondition("{1}{B}"), true, "If Degavolver was kicked with its {1}{B} kicker, it enters the battlefield with two +1/+1 counters on it and with \"Pay 3 life: Regenerate Degavolver.\"", "{this} enters the battlefield with two +1/+1 counters on it and with \"Pay 3 life: Regenerate Degavolver.\""); - ((EntersBattlefieldEffect)ability1.getEffects().get(0)).addEffect(new GainAbilitySourceEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new PayLifeCost(3)), Constants.Duration.WhileOnBattlefield)); + ((EntersBattlefieldEffect)ability1.getEffects().get(0)).addEffect(new GainAbilitySourceEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new PayLifeCost(3)), Duration.WhileOnBattlefield)); this.addAbility(ability1); // If Degavolver was kicked with its {R} kicker, it enters the battlefield with a +1/+1 counter on it and with first strike. diff --git a/Mage.Sets/src/mage/sets/apocalypse/DesolationAngel.java b/Mage.Sets/src/mage/sets/apocalypse/DesolationAngel.java index 3718caf6b15..88416c3f768 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/DesolationAngel.java +++ b/Mage.Sets/src/mage/sets/apocalypse/DesolationAngel.java @@ -29,9 +29,9 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/apocalypse/DiversionaryTactics.java b/Mage.Sets/src/mage/sets/apocalypse/DiversionaryTactics.java index 378a3131ece..ff5846f3f5c 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/DiversionaryTactics.java +++ b/Mage.Sets/src/mage/sets/apocalypse/DiversionaryTactics.java @@ -29,14 +29,14 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; @@ -58,7 +58,7 @@ public class DiversionaryTactics extends CardImpl { super(ownerId, 7, "Diversionary Tactics", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); this.expansionSetCode = "APC"; this.color.setWhite(true); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new TapTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, false))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, false))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/apocalypse/EbonyTreefolk.java b/Mage.Sets/src/mage/sets/apocalypse/EbonyTreefolk.java index db58e813832..bc83b890583 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/EbonyTreefolk.java +++ b/Mage.Sets/src/mage/sets/apocalypse/EbonyTreefolk.java @@ -29,14 +29,15 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -52,7 +53,7 @@ public class EbonyTreefolk extends CardImpl { this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Constants.Duration.EndOfTurn), new ManaCostsImpl("{B}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{B}{G}"))); } public EbonyTreefolk(final EbonyTreefolk card) { diff --git a/Mage.Sets/src/mage/sets/apocalypse/FlowstoneCharger.java b/Mage.Sets/src/mage/sets/apocalypse/FlowstoneCharger.java index aaefce4c54d..b8903173ee2 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/FlowstoneCharger.java +++ b/Mage.Sets/src/mage/sets/apocalypse/FlowstoneCharger.java @@ -29,13 +29,13 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -51,7 +51,7 @@ public class FlowstoneCharger extends CardImpl { this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(5); - this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(3, -3, Constants.Duration.EndOfTurn), false)); + this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(3, -3, Duration.EndOfTurn), false)); } public FlowstoneCharger(final FlowstoneCharger card) { diff --git a/Mage.Sets/src/mage/sets/apocalypse/GaeasSkyfolk.java b/Mage.Sets/src/mage/sets/apocalypse/GaeasSkyfolk.java index d36a8817b4b..5a087938146 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/GaeasSkyfolk.java +++ b/Mage.Sets/src/mage/sets/apocalypse/GaeasSkyfolk.java @@ -28,8 +28,8 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/apocalypse/GladeGnarr.java b/Mage.Sets/src/mage/sets/apocalypse/GladeGnarr.java index 1536564d800..03078ed42d9 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/GladeGnarr.java +++ b/Mage.Sets/src/mage/sets/apocalypse/GladeGnarr.java @@ -27,14 +27,15 @@ */ package mage.sets.apocalypse; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; @@ -78,7 +79,7 @@ class GladeGnarrTriggeredAbility extends TriggeredAbilityImpl { this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability firstAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(2), new ColoredManaCost(Constants.ColoredManaSymbol.R)); + Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ColoredManaCost(ColoredManaSymbol.R)); firstAbility.addCost(new SacrificeSourceCost()); firstAbility.addTarget(new TargetCreatureOrPlayer()); this.addAbility(firstAbility); - Ability secondAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PreventDamageTargetEffect(Constants.Duration.EndOfTurn, 2), new ColoredManaCost(Constants.ColoredManaSymbol.W)); + Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageTargetEffect(Duration.EndOfTurn, 2), new ColoredManaCost(ColoredManaSymbol.W)); secondAbility.addCost(new SacrificeSourceCost()); secondAbility.addTarget(new TargetCreatureOrPlayer()); this.addAbility(secondAbility); diff --git a/Mage.Sets/src/mage/sets/apocalypse/GoblinRingleader.java b/Mage.Sets/src/mage/sets/apocalypse/GoblinRingleader.java index 1c50b4e7b2c..862d1a3ca3e 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/GoblinRingleader.java +++ b/Mage.Sets/src/mage/sets/apocalypse/GoblinRingleader.java @@ -28,9 +28,9 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -40,6 +40,8 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -85,7 +87,7 @@ class GoblinRingleaderEffect extends OneShotEffect { } public GoblinRingleaderEffect() { - super(Constants.Outcome.DrawCard); + super(Outcome.DrawCard); this.staticText = "reveal the top four cards of your library. Put all Goblin cards revealed this way into your hand and the rest on the bottom of your library in any order"; } @@ -102,16 +104,16 @@ class GoblinRingleaderEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); if (player != null) { - Cards cards = new CardsImpl(Constants.Zone.PICK); - Cards cards2 = new CardsImpl(Constants.Zone.PICK); + Cards cards = new CardsImpl(Zone.PICK); + Cards cards2 = new CardsImpl(Zone.PICK); int count = Math.min(player.getLibrary().size(), 4); for (int i = 0; i < count; i++) { Card card = player.getLibrary().removeFromTop(game); if (card != null) { cards.add(card); - game.setZone(card.getId(), Constants.Zone.PICK); + game.setZone(card.getId(), Zone.PICK); if (filter.match(card, game)) { - card.moveToZone(Constants.Zone.HAND, source.getId(), game, true); + card.moveToZone(Zone.HAND, source.getId(), game, true); } else { cards2.add(card); } @@ -122,13 +124,13 @@ class GoblinRingleaderEffect extends OneShotEffect { if (!cards.isEmpty() && sourceCard != null) { player.revealCards(sourceCard.getName(), cards, game); } - TargetCard target = new TargetCard(Constants.Zone.PICK, new FilterCard("card to put on the bottom of your library")); + TargetCard target = new TargetCard(Zone.PICK, new FilterCard("card to put on the bottom of your library")); target.setRequired(true); - while (cards2.size() > 0 && player.choose(Constants.Outcome.Detriment, cards2, target, game)) { + while (cards2.size() > 0 && player.choose(Outcome.Detriment, cards2, target, game)) { Card card = cards.get(target.getFirstTarget(), game); if (card != null) { cards2.remove(card); - card.moveToZone(Constants.Zone.LIBRARY, source.getId(), game, false); + card.moveToZone(Zone.LIBRARY, source.getId(), game, false); } target.clearChosen(); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/GoblinTrenches.java b/Mage.Sets/src/mage/sets/apocalypse/GoblinTrenches.java index a79746df270..ff02c68201e 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/GoblinTrenches.java +++ b/Mage.Sets/src/mage/sets/apocalypse/GoblinTrenches.java @@ -28,9 +28,9 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/apocalypse/Helionaut.java b/Mage.Sets/src/mage/sets/apocalypse/Helionaut.java index d10e3f7cf1d..0905dd4d634 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/Helionaut.java +++ b/Mage.Sets/src/mage/sets/apocalypse/Helionaut.java @@ -28,8 +28,8 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/apocalypse/Index.java b/Mage.Sets/src/mage/sets/apocalypse/Index.java index 10b250e2bd1..adda3c119f2 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/Index.java +++ b/Mage.Sets/src/mage/sets/apocalypse/Index.java @@ -28,8 +28,8 @@ package mage.sets.apocalypse; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/apocalypse/JungleBarrier.java b/Mage.Sets/src/mage/sets/apocalypse/JungleBarrier.java index 5c72562c035..bf3debc92c6 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/JungleBarrier.java +++ b/Mage.Sets/src/mage/sets/apocalypse/JungleBarrier.java @@ -28,8 +28,8 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/apocalypse/KavuGlider.java b/Mage.Sets/src/mage/sets/apocalypse/KavuGlider.java index bb32381cb8c..eb995af6d74 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/KavuGlider.java +++ b/Mage.Sets/src/mage/sets/apocalypse/KavuGlider.java @@ -29,9 +29,7 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -53,8 +51,8 @@ public class KavuGlider extends CardImpl { this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.W))); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.U))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U))); } public KavuGlider(final KavuGlider card) { diff --git a/Mage.Sets/src/mage/sets/apocalypse/LastCaress.java b/Mage.Sets/src/mage/sets/apocalypse/LastCaress.java index 58859534680..402723b5838 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/LastCaress.java +++ b/Mage.Sets/src/mage/sets/apocalypse/LastCaress.java @@ -28,8 +28,8 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; diff --git a/Mage.Sets/src/mage/sets/apocalypse/LayOfTheLand.java b/Mage.Sets/src/mage/sets/apocalypse/LayOfTheLand.java index 611e541e75c..c7a5c5d5edf 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/LayOfTheLand.java +++ b/Mage.Sets/src/mage/sets/apocalypse/LayOfTheLand.java @@ -29,8 +29,8 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.filter.common.FilterBasicLandCard; diff --git a/Mage.Sets/src/mage/sets/apocalypse/LegacyWeapon.java b/Mage.Sets/src/mage/sets/apocalypse/LegacyWeapon.java index 7cea4362eba..5442624c960 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/LegacyWeapon.java +++ b/Mage.Sets/src/mage/sets/apocalypse/LegacyWeapon.java @@ -28,10 +28,10 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.PutIntoGraveFromAnywhereTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/apocalypse/LightningAngel.java b/Mage.Sets/src/mage/sets/apocalypse/LightningAngel.java index aaa8aa75ee1..d2afe9ff214 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/LightningAngel.java +++ b/Mage.Sets/src/mage/sets/apocalypse/LightningAngel.java @@ -28,8 +28,8 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; diff --git a/Mage.Sets/src/mage/sets/apocalypse/LivingAirship.java b/Mage.Sets/src/mage/sets/apocalypse/LivingAirship.java index e846d13a9e5..a249417271d 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/LivingAirship.java +++ b/Mage.Sets/src/mage/sets/apocalypse/LivingAirship.java @@ -29,15 +29,15 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @author Loki @@ -52,7 +52,7 @@ public class LivingAirship extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{2}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{2}{G}"))); } public LivingAirship(final LivingAirship card) { diff --git a/Mage.Sets/src/mage/sets/apocalypse/LlanowarDead.java b/Mage.Sets/src/mage/sets/apocalypse/LlanowarDead.java index ca93340da28..56375d430e0 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/LlanowarDead.java +++ b/Mage.Sets/src/mage/sets/apocalypse/LlanowarDead.java @@ -28,8 +28,8 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.mana.BlackManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/apocalypse/LlanowarWastes.java b/Mage.Sets/src/mage/sets/apocalypse/LlanowarWastes.java index 5ad2530ebed..7f99fefa8ee 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/LlanowarWastes.java +++ b/Mage.Sets/src/mage/sets/apocalypse/LlanowarWastes.java @@ -28,8 +28,8 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.mana.BlackManaAbility; diff --git a/Mage.Sets/src/mage/sets/apocalypse/ManaclesOfDecay.java b/Mage.Sets/src/mage/sets/apocalypse/ManaclesOfDecay.java index 47b12357ee4..0ce7f7998a9 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/ManaclesOfDecay.java +++ b/Mage.Sets/src/mage/sets/apocalypse/ManaclesOfDecay.java @@ -29,9 +29,7 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -58,12 +56,12 @@ public class ManaclesOfDecay extends CardImpl { this.color.setWhite(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ManaclesOfDecayFirstEffect())); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(-1, -1, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.B))); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ManaclesOfDecaySecondEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.R))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ManaclesOfDecayFirstEffect())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-1, -1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ManaclesOfDecaySecondEffect(), new ColoredManaCost(ColoredManaSymbol.R))); } @@ -80,7 +78,7 @@ public class ManaclesOfDecay extends CardImpl { class ManaclesOfDecayFirstEffect extends RestrictionEffect { public ManaclesOfDecayFirstEffect() { - super(Constants.Duration.WhileOnBattlefield); + super(Duration.WhileOnBattlefield); staticText = "Enchanted creature can't attack"; } @@ -111,7 +109,7 @@ class ManaclesOfDecayFirstEffect extends RestrictionEffect { public ManaclesOfDecaySecondEffect() { - super(Constants.Duration.EndOfTurn); + super(Duration.EndOfTurn); staticText = "Enchanted creature can't block until end of turn"; } diff --git a/Mage.Sets/src/mage/sets/apocalypse/MartyrsTomb.java b/Mage.Sets/src/mage/sets/apocalypse/MartyrsTomb.java index 08eb6e2229b..f84d3102759 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/MartyrsTomb.java +++ b/Mage.Sets/src/mage/sets/apocalypse/MartyrsTomb.java @@ -29,14 +29,15 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.effects.common.PreventDamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -50,7 +51,7 @@ public class MartyrsTomb extends CardImpl { this.expansionSetCode = "APC"; this.color.setBlack(true); this.color.setWhite(true); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PreventDamageTargetEffect(Constants.Duration.EndOfTurn, 1), new PayLifeCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageTargetEffect(Duration.EndOfTurn, 1), new PayLifeCost(2)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/MournfulZombie.java b/Mage.Sets/src/mage/sets/apocalypse/MournfulZombie.java index 4de9273e0f0..17a4dd61330 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/MournfulZombie.java +++ b/Mage.Sets/src/mage/sets/apocalypse/MournfulZombie.java @@ -29,9 +29,8 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.GainLifeTargetEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.target.TargetPlayer; /** @@ -54,7 +55,7 @@ public class MournfulZombie extends CardImpl { this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainLifeTargetEffect(1), new ColoredManaCost(Constants.ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer(1)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/apocalypse/MysticSnake.java b/Mage.Sets/src/mage/sets/apocalypse/MysticSnake.java index 2ebc4c55f16..747f851dfeb 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/MysticSnake.java +++ b/Mage.Sets/src/mage/sets/apocalypse/MysticSnake.java @@ -29,8 +29,8 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/apocalypse/NecraDisciple.java b/Mage.Sets/src/mage/sets/apocalypse/NecraDisciple.java index 142f4240c99..7a26930252d 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/NecraDisciple.java +++ b/Mage.Sets/src/mage/sets/apocalypse/NecraDisciple.java @@ -29,9 +29,7 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -56,10 +54,10 @@ public class NecraDisciple extends CardImpl { this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability firstAbility = new AnyColorManaAbility(new ColoredManaCost(Constants.ColoredManaSymbol.G)); + Ability firstAbility = new AnyColorManaAbility(new ColoredManaCost(ColoredManaSymbol.G)); firstAbility.addCost(new TapSourceCost()); this.addAbility(firstAbility); - Ability secondAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PreventDamageTargetEffect(Constants.Duration.EndOfTurn, 1), new ColoredManaCost(Constants.ColoredManaSymbol.W)); + Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageTargetEffect(Duration.EndOfTurn, 1), new ColoredManaCost(ColoredManaSymbol.W)); secondAbility.addCost(new TapSourceCost()); secondAbility.addTarget(new TargetCreatureOrPlayer()); this.addAbility(secondAbility); diff --git a/Mage.Sets/src/mage/sets/apocalypse/OrimsThunder.java b/Mage.Sets/src/mage/sets/apocalypse/OrimsThunder.java index d5c94c4dbf3..e7f6bceab21 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/OrimsThunder.java +++ b/Mage.Sets/src/mage/sets/apocalypse/OrimsThunder.java @@ -28,10 +28,10 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -40,6 +40,7 @@ import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.KickerAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -113,7 +114,7 @@ class OrimsThunderEffect2 extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { int damage = 0; - MageObject firstTarget = game.getLastKnownInformation(source.getFirstTarget(), Constants.Zone.BATTLEFIELD); + MageObject firstTarget = game.getLastKnownInformation(source.getFirstTarget(), Zone.BATTLEFIELD); Permanent secondTarget = game.getPermanent(source.getTargets().get(1).getFirstTarget()); if (firstTarget != null) { damage = firstTarget.getManaCost().convertedManaCost(); diff --git a/Mage.Sets/src/mage/sets/apocalypse/OvergrownEstate.java b/Mage.Sets/src/mage/sets/apocalypse/OvergrownEstate.java index 94a5b8ff621..ec7acd8cfbf 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/OvergrownEstate.java +++ b/Mage.Sets/src/mage/sets/apocalypse/OvergrownEstate.java @@ -28,9 +28,9 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/apocalypse/PenumbraBobcat.java b/Mage.Sets/src/mage/sets/apocalypse/PenumbraBobcat.java index 3c022976382..9853df87312 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/PenumbraBobcat.java +++ b/Mage.Sets/src/mage/sets/apocalypse/PenumbraBobcat.java @@ -28,8 +28,8 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/apocalypse/PenumbraKavu.java b/Mage.Sets/src/mage/sets/apocalypse/PenumbraKavu.java index e36a2c855c3..954c18d0bea 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/PenumbraKavu.java +++ b/Mage.Sets/src/mage/sets/apocalypse/PenumbraKavu.java @@ -28,8 +28,8 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/apocalypse/PenumbraWurm.java b/Mage.Sets/src/mage/sets/apocalypse/PenumbraWurm.java index 0d5db453690..c82b3a47127 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/PenumbraWurm.java +++ b/Mage.Sets/src/mage/sets/apocalypse/PenumbraWurm.java @@ -28,8 +28,8 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/apocalypse/PerniciousDeed.java b/Mage.Sets/src/mage/sets/apocalypse/PerniciousDeed.java index 71816714059..6a5b5f83d44 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/PerniciousDeed.java +++ b/Mage.Sets/src/mage/sets/apocalypse/PerniciousDeed.java @@ -28,15 +28,17 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.VariableManaCost; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.Filter; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; @@ -61,7 +63,7 @@ public class PerniciousDeed extends CardImpl { this.color.setBlack(true); // {X}, Sacrifice Pernicious Deed: Destroy each artifact, creature, and enchantment with converted mana cost X or less. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PerniciousDeedEffect(), new VariableManaCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PerniciousDeedEffect(), new VariableManaCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } @@ -81,7 +83,7 @@ class PerniciousDeedEffect extends OneShotEffect { public PerniciousDeedEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); staticText = "Destroy each artifact, creature, and enchantment with converted mana cost X or less"; } diff --git a/Mage.Sets/src/mage/sets/apocalypse/PhyrexianArena.java b/Mage.Sets/src/mage/sets/apocalypse/PhyrexianArena.java index 6ee8cebb7e0..2048bbccedd 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/PhyrexianArena.java +++ b/Mage.Sets/src/mage/sets/apocalypse/PhyrexianArena.java @@ -29,14 +29,14 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.LoseLifeSourceEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; /** * @@ -48,7 +48,7 @@ public class PhyrexianArena extends CardImpl { super(ownerId, 47, "Phyrexian Arena", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}{B}"); this.expansionSetCode = "APC"; this.color.setBlack(true); - Ability ability = new BeginningOfUpkeepTriggeredAbility(new DrawCardControllerEffect(1), Constants.TargetController.YOU, false); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new DrawCardControllerEffect(1), TargetController.YOU, false); ability.addEffect(new LoseLifeSourceEffect(1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/PhyrexianGargantua.java b/Mage.Sets/src/mage/sets/apocalypse/PhyrexianGargantua.java index c1ec008bec7..c69c0e66d8a 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/PhyrexianGargantua.java +++ b/Mage.Sets/src/mage/sets/apocalypse/PhyrexianGargantua.java @@ -29,8 +29,8 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/apocalypse/QuagmireDruid.java b/Mage.Sets/src/mage/sets/apocalypse/QuagmireDruid.java index 5c064ae1616..725caa27557 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/QuagmireDruid.java +++ b/Mage.Sets/src/mage/sets/apocalypse/QuagmireDruid.java @@ -29,9 +29,8 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; @@ -67,7 +68,7 @@ public class QuagmireDruid extends CardImpl { this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(false), new ColoredManaCost(Constants.ColoredManaSymbol.G)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(false), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); ability.addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/apocalypse/RakaDisciple.java b/Mage.Sets/src/mage/sets/apocalypse/RakaDisciple.java index 57cd83cc916..e3df62ee2bc 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/RakaDisciple.java +++ b/Mage.Sets/src/mage/sets/apocalypse/RakaDisciple.java @@ -29,9 +29,7 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -57,11 +55,11 @@ public class RakaDisciple extends CardImpl { this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability firstAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PreventDamageTargetEffect(Constants.Duration.EndOfTurn, 1), new ColoredManaCost(Constants.ColoredManaSymbol.W)); + Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageTargetEffect(Duration.EndOfTurn, 1), new ColoredManaCost(ColoredManaSymbol.W)); firstAbility.addCost(new TapSourceCost()); firstAbility.addTarget(new TargetCreatureOrPlayer()); this.addAbility(firstAbility); - Ability secondAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.U)); + Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U)); secondAbility.addCost(new TapSourceCost()); secondAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(secondAbility); diff --git a/Mage.Sets/src/mage/sets/apocalypse/RazorfinHunter.java b/Mage.Sets/src/mage/sets/apocalypse/RazorfinHunter.java index 26ab45de439..273e6f0c34c 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/RazorfinHunter.java +++ b/Mage.Sets/src/mage/sets/apocalypse/RazorfinHunter.java @@ -29,15 +29,15 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; /** @@ -55,7 +55,7 @@ public class RazorfinHunter extends CardImpl { this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/SavageGorilla.java b/Mage.Sets/src/mage/sets/apocalypse/SavageGorilla.java index 0741fdd29b5..f621b787511 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/SavageGorilla.java +++ b/Mage.Sets/src/mage/sets/apocalypse/SavageGorilla.java @@ -29,9 +29,8 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -56,7 +57,7 @@ public class SavageGorilla extends CardImpl { this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(-3, -3, Constants.Duration.EndOfTurn), new ManaCostsImpl("{U}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-3, -3, Duration.EndOfTurn), new ManaCostsImpl("{U}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addEffect(new DrawCardControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/apocalypse/ShivanReef.java b/Mage.Sets/src/mage/sets/apocalypse/ShivanReef.java index 9b7284bd2be..a3a3c081c58 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/ShivanReef.java +++ b/Mage.Sets/src/mage/sets/apocalypse/ShivanReef.java @@ -28,8 +28,8 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.mana.BlueManaAbility; diff --git a/Mage.Sets/src/mage/sets/apocalypse/Smash.java b/Mage.Sets/src/mage/sets/apocalypse/Smash.java index 6081a6694b8..320a68cb55e 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/Smash.java +++ b/Mage.Sets/src/mage/sets/apocalypse/Smash.java @@ -29,8 +29,8 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/apocalypse/TemporalSpring.java b/Mage.Sets/src/mage/sets/apocalypse/TemporalSpring.java index d11e7a9939c..158bfaabf79 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/TemporalSpring.java +++ b/Mage.Sets/src/mage/sets/apocalypse/TemporalSpring.java @@ -29,8 +29,8 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPermanent; diff --git a/Mage.Sets/src/mage/sets/apocalypse/TranquilPath.java b/Mage.Sets/src/mage/sets/apocalypse/TranquilPath.java index d8598f4c41c..0e4247cdf91 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/TranquilPath.java +++ b/Mage.Sets/src/mage/sets/apocalypse/TranquilPath.java @@ -28,9 +28,9 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/apocalypse/Vindicate.java b/Mage.Sets/src/mage/sets/apocalypse/Vindicate.java index a6d86253379..5d9c50de9c6 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/Vindicate.java +++ b/Mage.Sets/src/mage/sets/apocalypse/Vindicate.java @@ -29,8 +29,8 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPermanent; diff --git a/Mage.Sets/src/mage/sets/apocalypse/YavimayaCoast.java b/Mage.Sets/src/mage/sets/apocalypse/YavimayaCoast.java index 0d9509d6dac..8b0b78a9bec 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/YavimayaCoast.java +++ b/Mage.Sets/src/mage/sets/apocalypse/YavimayaCoast.java @@ -28,8 +28,8 @@ package mage.sets.apocalypse; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.mana.BlueManaAbility; diff --git a/Mage.Sets/src/mage/sets/arabiannights/CityOfBrass.java b/Mage.Sets/src/mage/sets/arabiannights/CityOfBrass.java index a106a9cf517..3832ed71b72 100644 --- a/Mage.Sets/src/mage/sets/arabiannights/CityOfBrass.java +++ b/Mage.Sets/src/mage/sets/arabiannights/CityOfBrass.java @@ -28,7 +28,7 @@ package mage.sets.arabiannights; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/arabiannights/DancingScimitar.java b/Mage.Sets/src/mage/sets/arabiannights/DancingScimitar.java index 29bc3080f44..2dbdd4a317e 100644 --- a/Mage.Sets/src/mage/sets/arabiannights/DancingScimitar.java +++ b/Mage.Sets/src/mage/sets/arabiannights/DancingScimitar.java @@ -28,7 +28,7 @@ package mage.sets.arabiannights; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/arabiannights/FlyingCarpet.java b/Mage.Sets/src/mage/sets/arabiannights/FlyingCarpet.java index c59b51faa0b..2ac69bc9a2a 100644 --- a/Mage.Sets/src/mage/sets/arabiannights/FlyingCarpet.java +++ b/Mage.Sets/src/mage/sets/arabiannights/FlyingCarpet.java @@ -28,7 +28,7 @@ package mage.sets.arabiannights; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/arabiannights/FlyingMen.java b/Mage.Sets/src/mage/sets/arabiannights/FlyingMen.java index 04a72af4f9b..e8525d0e7e7 100644 --- a/Mage.Sets/src/mage/sets/arabiannights/FlyingMen.java +++ b/Mage.Sets/src/mage/sets/arabiannights/FlyingMen.java @@ -28,7 +28,7 @@ package mage.sets.arabiannights; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/arabiannights/JuzamDjinn.java b/Mage.Sets/src/mage/sets/arabiannights/JuzamDjinn.java index fc7dcf1af55..a5e79d4dcee 100644 --- a/Mage.Sets/src/mage/sets/arabiannights/JuzamDjinn.java +++ b/Mage.Sets/src/mage/sets/arabiannights/JuzamDjinn.java @@ -29,13 +29,13 @@ package mage.sets.arabiannights; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.DamageControllerEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; /** * @@ -53,7 +53,7 @@ public class JuzamDjinn extends CardImpl { this.toughness = new MageInt(5); // At the beginning of your upkeep, Juzam Djinn deals 1 damage to you. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DamageControllerEffect(1), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DamageControllerEffect(1), TargetController.YOU, false)); } public JuzamDjinn(final JuzamDjinn card) { diff --git a/Mage.Sets/src/mage/sets/arabiannights/KirdApe.java b/Mage.Sets/src/mage/sets/arabiannights/KirdApe.java index 5e128f1d4ee..4def3d67697 100644 --- a/Mage.Sets/src/mage/sets/arabiannights/KirdApe.java +++ b/Mage.Sets/src/mage/sets/arabiannights/KirdApe.java @@ -28,7 +28,7 @@ package mage.sets.arabiannights; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/arabiannights/MoorishCavalry.java b/Mage.Sets/src/mage/sets/arabiannights/MoorishCavalry.java index 44670b1f162..b23fcaf7717 100644 --- a/Mage.Sets/src/mage/sets/arabiannights/MoorishCavalry.java +++ b/Mage.Sets/src/mage/sets/arabiannights/MoorishCavalry.java @@ -28,7 +28,7 @@ package mage.sets.arabiannights; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/arabiannights/StoneThrowingDevils.java b/Mage.Sets/src/mage/sets/arabiannights/StoneThrowingDevils.java index 9585ef0288c..10607eeead1 100644 --- a/Mage.Sets/src/mage/sets/arabiannights/StoneThrowingDevils.java +++ b/Mage.Sets/src/mage/sets/arabiannights/StoneThrowingDevils.java @@ -28,8 +28,8 @@ package mage.sets.arabiannights; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/AbundantGrowth.java b/Mage.Sets/src/mage/sets/avacynrestored/AbundantGrowth.java index 2b157c382da..5ab03384a0f 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/AbundantGrowth.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/AbundantGrowth.java @@ -27,9 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -60,7 +58,7 @@ public class AbundantGrowth extends CardImpl { // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Detriment)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); @@ -69,7 +67,7 @@ public class AbundantGrowth extends CardImpl { // Enchanted land has "{tap}: Add one mana of any color to your mana pool." Ability gainedAbility = new AnyColorManaAbility(new TapSourceCost()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); } public AbundantGrowth(final AbundantGrowth card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Aggravate.java b/Mage.Sets/src/mage/sets/avacynrestored/Aggravate.java index 1afc888b675..b861f9885da 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Aggravate.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Aggravate.java @@ -29,10 +29,10 @@ package mage.sets.avacynrestored; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.RequirementEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/AlchemistsApprentice.java b/Mage.Sets/src/mage/sets/avacynrestored/AlchemistsApprentice.java index e1d4dd1af16..eb3f096a383 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/AlchemistsApprentice.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/AlchemistsApprentice.java @@ -27,14 +27,14 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import java.util.UUID; @@ -55,7 +55,7 @@ public class AlchemistsApprentice extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Alchemist's Apprentice: Draw a card. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new SacrificeSourceCost())); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/AlchemistsRefuge.java b/Mage.Sets/src/mage/sets/avacynrestored/AlchemistsRefuge.java index cb227dfc2e8..3271bbbb649 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/AlchemistsRefuge.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/AlchemistsRefuge.java @@ -27,9 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.CompositeCost; @@ -59,7 +57,7 @@ public class AlchemistsRefuge extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {G}{U}, {tap}: You may cast nonland cards this turn as though they had flash. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddContinuousEffectToGame(new AlchemistsRefugeEffect()), new CompositeCost(new ManaCostsImpl("{G}{U}"), new TapSourceCost(), "{G}{U}, {T}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddContinuousEffectToGame(new AlchemistsRefugeEffect()), new CompositeCost(new ManaCostsImpl("{G}{U}"), new TapSourceCost(), "{G}{U}, {T}"))); } public AlchemistsRefuge(final AlchemistsRefuge card) { @@ -75,7 +73,7 @@ public class AlchemistsRefuge extends CardImpl { class AlchemistsRefugeEffect extends AsThoughEffectImpl { public AlchemistsRefugeEffect() { - super(Constants.AsThoughEffectType.CAST, Constants.Duration.EndOfTurn, Constants.Outcome.Benefit); + super(AsThoughEffectType.CAST, Duration.EndOfTurn, Outcome.Benefit); staticText = "You may cast nonland cards this turn as though they had flash"; } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/AmassTheComponents.java b/Mage.Sets/src/mage/sets/avacynrestored/AmassTheComponents.java index eab57b5f3e8..149bd148b64 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/AmassTheComponents.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/AmassTheComponents.java @@ -28,10 +28,10 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/AngelOfGlorysRise.java b/Mage.Sets/src/mage/sets/avacynrestored/AngelOfGlorysRise.java index 514ec5f1cd4..97916f25a56 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/AngelOfGlorysRise.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/AngelOfGlorysRise.java @@ -28,9 +28,9 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,6 +38,8 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -88,7 +90,7 @@ class AngelOfGlorysRiseEffect extends OneShotEffect { } public AngelOfGlorysRiseEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); staticText = "Exile all Zombies, then return all Human creature cards from your graveyard to the battlefield"; } @@ -109,7 +111,7 @@ class AngelOfGlorysRiseEffect extends OneShotEffect { zombie.moveToExile(source.getId(), zombie.getName(), source.getSourceId(), game); } for (Card human : player.getGraveyard().getCards(filterHuman, game)) { - human.putOntoBattlefield(game, Constants.Zone.GRAVEYARD, source.getId(), source.getControllerId()); + human.putOntoBattlefield(game, Zone.GRAVEYARD, source.getId(), source.getControllerId()); } } return true; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/AngelOfJubilation.java b/Mage.Sets/src/mage/sets/avacynrestored/AngelOfJubilation.java index 8c70691310b..7fff4775f51 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/AngelOfJubilation.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/AngelOfJubilation.java @@ -27,9 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -69,10 +67,10 @@ public class AngelOfJubilation extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Other nonblack creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Constants.Duration.WhileOnBattlefield, filterNonBlack, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterNonBlack, true))); // Players can't pay life or sacrifice creatures to cast spells or activate abilities. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new AngelOfJubilationEffect(Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AngelOfJubilationEffect(Duration.WhileOnBattlefield))); } public AngelOfJubilation(final AngelOfJubilation card) { @@ -87,8 +85,8 @@ public class AngelOfJubilation extends CardImpl { class AngelOfJubilationEffect extends ContinuousEffectImpl { - public AngelOfJubilationEffect(Constants.Duration duration) { - super(duration, Constants.Layer.PlayerEffects, Constants.SubLayer.NA, Constants.Outcome.Detriment); + public AngelOfJubilationEffect(Duration duration) { + super(duration, Layer.PlayerEffects, SubLayer.NA, Outcome.Detriment); staticText = "Players can't pay life or sacrifice creatures to cast spells or activate abilities"; } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/AngelicArmaments.java b/Mage.Sets/src/mage/sets/avacynrestored/AngelicArmaments.java index 7c383ff54c3..cddd450b66c 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/AngelicArmaments.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/AngelicArmaments.java @@ -27,9 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -54,13 +52,13 @@ public class AngelicArmaments extends CardImpl { this.subtype.add("Equipment"); // Equipped creature gets +2/+2, has flying, and is a white Angel in addition to its other colors and types. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new AddCardColorAttachedEffect(ObjectColor.WHITE, Constants.Duration.WhileOnBattlefield, Constants.AttachmentType.EQUIPMENT))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new AddCardSubtypeAttachedEffect("Angel", Constants.Duration.WhileOnBattlefield, Constants.AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AddCardColorAttachedEffect(ObjectColor.WHITE, Duration.WhileOnBattlefield, AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AddCardSubtypeAttachedEffect("Angel", Duration.WhileOnBattlefield, AttachmentType.EQUIPMENT))); // Equip {4} - this.addAbility(new EquipAbility(Constants.Outcome.BoostCreature, new GenericManaCost(4))); + this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(4))); } public AngelicArmaments(final AngelicArmaments card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/AngelsTomb.java b/Mage.Sets/src/mage/sets/avacynrestored/AngelsTomb.java index 960ee9dd13f..aca938ca9e8 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/AngelsTomb.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/AngelsTomb.java @@ -29,15 +29,15 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.CreatureEntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continious.BecomesCreatureSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.game.permanent.token.Token; /** @@ -51,7 +51,7 @@ public class AngelsTomb extends CardImpl { this.expansionSetCode = "AVR"; // Whenever a creature enters the battlefield under your control, you may have Angel's Tomb become a 3/3 white Angel artifact creature with flying until end of turn. - this.addAbility(new CreatureEntersBattlefieldTriggeredAbility(new BecomesCreatureSourceEffect(new AngelTombToken(), "", Constants.Duration.EndOfTurn), true)); + this.addAbility(new CreatureEntersBattlefieldTriggeredAbility(new BecomesCreatureSourceEffect(new AngelTombToken(), "", Duration.EndOfTurn), true)); } public AngelsTomb(final AngelsTomb card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/AppetiteForBrains.java b/Mage.Sets/src/mage/sets/avacynrestored/AppetiteForBrains.java index a91ed280238..475ea27abdf 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/AppetiteForBrains.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/AppetiteForBrains.java @@ -28,10 +28,10 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/ArcaneMelee.java b/Mage.Sets/src/mage/sets/avacynrestored/ArcaneMelee.java index 00627c61f43..4f359eaa231 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/ArcaneMelee.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/ArcaneMelee.java @@ -27,9 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.common.SimpleStaticAbility; @@ -56,7 +54,7 @@ public class ArcaneMelee extends CardImpl { this.color.setBlue(true); // Instant and sorcery spells cost {2} less to cast. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ArcaneMeleeCostReductionEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ArcaneMeleeCostReductionEffect())); } public ArcaneMelee(final ArcaneMelee card) { @@ -72,7 +70,7 @@ public class ArcaneMelee extends CardImpl { class ArcaneMeleeCostReductionEffect extends CostModificationEffectImpl { ArcaneMeleeCostReductionEffect ( ) { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "Instant and sorcery spells cost {2} less to cast"; } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Archangel.java b/Mage.Sets/src/mage/sets/avacynrestored/Archangel.java index 1a38f22277f..2bc83039cad 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Archangel.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Archangel.java @@ -28,8 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/ArchwingDragon.java b/Mage.Sets/src/mage/sets/avacynrestored/ArchwingDragon.java index 9fbfc54fb0d..b720f98d572 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/ArchwingDragon.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/ArchwingDragon.java @@ -28,8 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.effects.common.ReturnToHandSourceEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/AvacynAngelOfHope.java b/Mage.Sets/src/mage/sets/avacynrestored/AvacynAngelOfHope.java index 53eff4e179d..5ff9b906f53 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/AvacynAngelOfHope.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/AvacynAngelOfHope.java @@ -28,10 +28,10 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -63,7 +63,7 @@ public class AvacynAngelOfHope extends CardImpl { // Avacyn, Angel of Hope and other permanents you control are indestructible. FilterControlledPermanent filter = new FilterControlledPermanent("Avacyn, Angel of Hope and other permanents you control"); - Effect effect = new GainAbilityAllEffect(IndestructibleAbility.getInstance(), Constants.Duration.WhileOnBattlefield, filter, false); + Effect effect = new GainAbilityAllEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield, filter, false); effect.setText("{this} and other permanents you control are indestructible"); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/BanishingStroke.java b/Mage.Sets/src/mage/sets/avacynrestored/BanishingStroke.java index c1bc2b39f51..198d983f20c 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/BanishingStroke.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/BanishingStroke.java @@ -27,8 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.abilities.keyword.MiracleAbility; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/BannersRaised.java b/Mage.Sets/src/mage/sets/avacynrestored/BannersRaised.java index 61bf62b43cb..572ab03a486 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/BannersRaised.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/BannersRaised.java @@ -29,11 +29,11 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -48,7 +48,7 @@ public class BannersRaised extends CardImpl { this.color.setRed(true); // Creatures you control get +1/+0 until end of turn. - this.getSpellAbility().addEffect(new BoostControlledEffect(1, 0, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostControlledEffect(1, 0, Duration.EndOfTurn)); } public BannersRaised(final BannersRaised card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/BarterInBlood.java b/Mage.Sets/src/mage/sets/avacynrestored/BarterInBlood.java index 1eeb442d782..01f469967e8 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/BarterInBlood.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/BarterInBlood.java @@ -28,8 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.SacrificeAllEffect; import mage.cards.CardImpl; import mage.filter.common.FilterControlledPermanent; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/BattleHymn.java b/Mage.Sets/src/mage/sets/avacynrestored/BattleHymn.java index bdc130f9b81..735a69b4884 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/BattleHymn.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/BattleHymn.java @@ -28,8 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DynamicManaEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/BladedBracers.java b/Mage.Sets/src/mage/sets/avacynrestored/BladedBracers.java index 406fa3daf6d..0883e2e173e 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/BladedBracers.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/BladedBracers.java @@ -27,9 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EquippedHasSubtypeCondition; import mage.abilities.costs.mana.GenericManaCost; @@ -55,16 +53,16 @@ public class BladedBracers extends CardImpl { this.subtype.add("Equipment"); // Equipped creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); // As long as equipped creature is a Human or an Angel, it has vigilance. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( - new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), Constants.AttachmentType.EQUIPMENT), + new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.EQUIPMENT), new EquippedHasSubtypeCondition("Human", "Angel"), ruleText))); // Equip {2} - this.addAbility(new EquipAbility(Constants.Outcome.BoostCreature, new GenericManaCost(2))); + this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2))); } public BladedBracers(final BladedBracers card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/BlessingsOfNature.java b/Mage.Sets/src/mage/sets/avacynrestored/BlessingsOfNature.java index 4891221ba5f..c8cf6febab9 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/BlessingsOfNature.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/BlessingsOfNature.java @@ -28,9 +28,9 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/BloodArtist.java b/Mage.Sets/src/mage/sets/avacynrestored/BloodArtist.java index 4252e153763..bc30ac1e884 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/BloodArtist.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/BloodArtist.java @@ -27,8 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesThisOrAnotherCreatureTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/BloodflowConnoisseur.java b/Mage.Sets/src/mage/sets/avacynrestored/BloodflowConnoisseur.java index 42e3f9150e9..082b21c3574 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/BloodflowConnoisseur.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/BloodflowConnoisseur.java @@ -27,9 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,6 +36,7 @@ import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetControlledCreaturePermanent; @@ -58,7 +58,7 @@ public class BloodflowConnoisseur extends CardImpl { this.toughness = new MageInt(1); // Sacrifice a creature: Put a +1/+1 counter on Bloodflow Connoisseur. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/BonfireOfTheDamned.java b/Mage.Sets/src/mage/sets/avacynrestored/BonfireOfTheDamned.java index b6203c85cf2..d78eeba6ae6 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/BonfireOfTheDamned.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/BonfireOfTheDamned.java @@ -27,14 +27,14 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.MiracleAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -79,7 +79,7 @@ class BonfireOfTheDamnedEffect extends OneShotEffect { private static FilterPermanent filter = new FilterCreaturePermanent(); public BonfireOfTheDamnedEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "Bonfire of the Damned deals X damage to target player and each creature he or she controls"; } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/BowerPassage.java b/Mage.Sets/src/mage/sets/avacynrestored/BowerPassage.java index e771d38962e..8a5165562ea 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/BowerPassage.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/BowerPassage.java @@ -27,14 +27,15 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.RestrictionEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; @@ -52,7 +53,7 @@ public class BowerPassage extends CardImpl { this.color.setGreen(true); // Creatures with flying can't block creatures you control. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BowerPassageEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BowerPassageEffect())); } public BowerPassage(final BowerPassage card) { @@ -68,7 +69,7 @@ public class BowerPassage extends CardImpl { class BowerPassageEffect extends RestrictionEffect { BowerPassageEffect() { - super(Constants.Duration.WhileOnBattlefield); + super(Duration.WhileOnBattlefield); staticText = "Creatures with flying can't block creatures you control"; } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/BrunaLightOfAlabaster.java b/Mage.Sets/src/mage/sets/avacynrestored/BrunaLightOfAlabaster.java index 41dae74ff72..f126915a80f 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/BrunaLightOfAlabaster.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/BrunaLightOfAlabaster.java @@ -27,9 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksOrBlocksTriggeredAbility; @@ -38,6 +37,8 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -87,7 +88,7 @@ public class BrunaLightOfAlabaster extends CardImpl { class BrunaLightOfAlabasterEffect extends OneShotEffect { public BrunaLightOfAlabasterEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); this.staticText = "attach to it any number of Auras on the battlefield and you may put onto the battlefield attached to it any number of Aura cards that could enchant it from your graveyard and/or hand"; } @@ -123,9 +124,9 @@ class BrunaLightOfAlabasterEffect extends OneShotEffect 0 && player.chooseUse(Constants.Outcome.Benefit, "Attach an Aura from your hand?", game)) { - TargetCard targetAura = new TargetCard(Constants.Zone.PICK, filterAuraCard); - if (player.choose(Constants.Outcome.Benefit, player.getHand(), targetAura, game)) { + while (count > 0 && player.chooseUse(Outcome.Benefit, "Attach an Aura from your hand?", game)) { + TargetCard targetAura = new TargetCard(Zone.PICK, filterAuraCard); + if (player.choose(Outcome.Benefit, player.getHand(), targetAura, game)) { Card aura = game.getCard(targetAura.getFirstTarget()); if (aura != null) { game.getState().setValue("attachTo:" + aura.getId(), permanent); - aura.putOntoBattlefield(game, Constants.Zone.HAND, source.getId(), player.getId()); + aura.putOntoBattlefield(game, Zone.HAND, source.getId(), player.getId()); permanent.addAttachment(aura.getId(), game); } } @@ -152,13 +153,13 @@ class BrunaLightOfAlabasterEffect extends OneShotEffect 0 && player.chooseUse(Constants.Outcome.Benefit, "Attach an Aura from your graveyard?", game)) { - TargetCard targetAura = new TargetCard(Constants.Zone.PICK, filterAuraCard); - if (player.choose(Constants.Outcome.Benefit, player.getGraveyard(), targetAura, game)) { + while (count > 0 && player.chooseUse(Outcome.Benefit, "Attach an Aura from your graveyard?", game)) { + TargetCard targetAura = new TargetCard(Zone.PICK, filterAuraCard); + if (player.choose(Outcome.Benefit, player.getGraveyard(), targetAura, game)) { Card aura = game.getCard(targetAura.getFirstTarget()); if (aura != null) { game.getState().setValue("attachTo:" + aura.getId(), permanent); - aura.putOntoBattlefield(game, Constants.Zone.GRAVEYARD, source.getId(), player.getId()); + aura.putOntoBattlefield(game, Zone.GRAVEYARD, source.getId(), player.getId()); permanent.addAttachment(aura.getId(), game); } } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/BuildersBlessing.java b/Mage.Sets/src/mage/sets/avacynrestored/BuildersBlessing.java index c2147c5de0a..0f25c69b614 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/BuildersBlessing.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/BuildersBlessing.java @@ -27,12 +27,13 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterUntappedCreature; import java.util.UUID; @@ -49,7 +50,7 @@ public class BuildersBlessing extends CardImpl { this.color.setWhite(true); // Untapped creatures you control get +0/+2. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(0, 2, Constants.Duration.WhileOnBattlefield, new FilterUntappedCreature()))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 2, Duration.WhileOnBattlefield, new FilterUntappedCreature()))); } public BuildersBlessing(final BuildersBlessing card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/BurnAtTheStake.java b/Mage.Sets/src/mage/sets/avacynrestored/BurnAtTheStake.java index 89c2908d830..836e151121d 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/BurnAtTheStake.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/BurnAtTheStake.java @@ -28,9 +28,9 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.CostImpl; import mage.abilities.costs.VariableCost; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/ButcherGhoul.java b/Mage.Sets/src/mage/sets/avacynrestored/ButcherGhoul.java index d0d3f788486..9dfa9586737 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/ButcherGhoul.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/ButcherGhoul.java @@ -28,8 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.UndyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/CallToServe.java b/Mage.Sets/src/mage/sets/avacynrestored/CallToServe.java index 8a09669bff3..23b3cb9af20 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/CallToServe.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/CallToServe.java @@ -29,9 +29,7 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -69,13 +67,13 @@ public class CallToServe extends CardImpl { // Enchant nonblack creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); // Enchanted creature gets +1/+2, has flying, and is an Angel in addition to its other types. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2, Constants.Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), Constants.AttachmentType.AURA))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new AddCardSubtypeAttachedEffect("Angel", Constants.Duration.WhileOnBattlefield, Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AddCardSubtypeAttachedEffect("Angel", Duration.WhileOnBattlefield, AttachmentType.AURA))); } public CallToServe(final CallToServe card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/CaptainOfTheMists.java b/Mage.Sets/src/mage/sets/avacynrestored/CaptainOfTheMists.java index 3a015cb662d..43fa2e5052f 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/CaptainOfTheMists.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/CaptainOfTheMists.java @@ -28,9 +28,9 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/CatharsCrusade.java b/Mage.Sets/src/mage/sets/avacynrestored/CatharsCrusade.java index 7d5f08f5223..86168fe4ec2 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/CatharsCrusade.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/CatharsCrusade.java @@ -28,8 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.CreatureEntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersAllEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/CathedralSanctifier.java b/Mage.Sets/src/mage/sets/avacynrestored/CathedralSanctifier.java index dfd0b994410..c98d3cc23ab 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/CathedralSanctifier.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/CathedralSanctifier.java @@ -28,8 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/CavernOfSouls.java b/Mage.Sets/src/mage/sets/avacynrestored/CavernOfSouls.java index b41dc00f71d..f512efc4d37 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/CavernOfSouls.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/CavernOfSouls.java @@ -28,9 +28,7 @@ package mage.sets.avacynrestored; import mage.ConditionalMana; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageObject; import mage.Mana; import mage.abilities.Ability; @@ -78,7 +76,7 @@ public class CavernOfSouls extends CardImpl { // {tap}: Add one mana of any color to your mana pool. Spend this mana only to cast a creature spell of the chosen type, and that spell can't be countered. this.addAbility(new ConditionalAnyColorManaAbility(1, new CavernOfSoulsManaBuilder())); this.addWatcher(new CavernOfSoulsWatcher()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new CavernOfSoulsCantCounterEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CavernOfSoulsCantCounterEffect())); } public CavernOfSouls(final CavernOfSouls card) { @@ -94,7 +92,7 @@ public class CavernOfSouls extends CardImpl { class CavernOfSoulsEffect extends OneShotEffect { public CavernOfSoulsEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "As {this} enters the battlefield, choose a creature type"; } @@ -110,7 +108,7 @@ class CavernOfSoulsEffect extends OneShotEffect { Choice typeChoice = new ChoiceImpl(true); typeChoice.setMessage("Choose creature type"); typeChoice.setChoices(CardRepository.instance.getCreatureTypes()); - while (!player.choose(Constants.Outcome.Benefit, typeChoice, game)) { + while (!player.choose(Outcome.Benefit, typeChoice, game)) { game.debugMessage("player canceled choosing type. retrying."); } game.informPlayers(permanent.getName() + ": " + player.getName() + " has chosen " + typeChoice.getChoice()); @@ -172,7 +170,7 @@ class CavernOfSoulsWatcher extends WatcherImpl { public List spells = new ArrayList(); public CavernOfSoulsWatcher() { - super("ManaPaidFromCavernOfSoulsWatcher", Constants.WatcherScope.GAME); + super("ManaPaidFromCavernOfSoulsWatcher", WatcherScope.GAME); } public CavernOfSoulsWatcher(final CavernOfSoulsWatcher watcher) { @@ -204,7 +202,7 @@ class CavernOfSoulsWatcher extends WatcherImpl { class CavernOfSoulsCantCounterEffect extends ReplacementEffectImpl { public CavernOfSoulsCantCounterEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); staticText = null; } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/ChampionOfLambholt.java b/Mage.Sets/src/mage/sets/avacynrestored/ChampionOfLambholt.java index 41ba06ad293..63384f4283c 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/ChampionOfLambholt.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/ChampionOfLambholt.java @@ -27,9 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersAnotherCreatureYourControlTriggeredAbility; @@ -37,6 +36,8 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.RestrictionEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -59,7 +60,7 @@ public class ChampionOfLambholt extends CardImpl { this.toughness = new MageInt(1); // Creatures with power less than Champion of Lambholt's power can't block creatures you control. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ChampionOfLambholtEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ChampionOfLambholtEffect())); // Whenever another creature enters the battlefield under your control, put a +1/+1 counter on Champion of Lambholt. this.addAbility(new EntersAnotherCreatureYourControlTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()))); @@ -78,7 +79,7 @@ public class ChampionOfLambholt extends CardImpl { class ChampionOfLambholtEffect extends RestrictionEffect { ChampionOfLambholtEffect() { - super(Constants.Duration.WhileOnBattlefield); + super(Duration.WhileOnBattlefield); staticText = "Creatures with power less than {this}'s power can't block creatures you control"; } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Cloudshift.java b/Mage.Sets/src/mage/sets/avacynrestored/Cloudshift.java index 9fe97efd68a..e68c23dc8ee 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Cloudshift.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Cloudshift.java @@ -27,8 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ExileTargetForSourceEffect; import mage.abilities.effects.common.ReturnToBattlefieldUnderYourControlTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/CommandersAuthority.java b/Mage.Sets/src/mage/sets/avacynrestored/CommandersAuthority.java index 9e9de3abbff..71e20d09824 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/CommandersAuthority.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/CommandersAuthority.java @@ -29,9 +29,7 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -59,12 +57,12 @@ public class CommandersAuthority extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature has "At the beginning of your upkeep, put a 1/1 white Human creature token onto the battlefield." - ability = new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new HumanToken()), Constants.TargetController.YOU, false); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, Constants.AttachmentType.AURA))); + ability = new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new HumanToken()), TargetController.YOU, false); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.AURA))); } public CommandersAuthority(final CommandersAuthority card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/ConjurersCloset.java b/Mage.Sets/src/mage/sets/avacynrestored/ConjurersCloset.java index bcb6d6b52d2..20bd9675dcb 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/ConjurersCloset.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/ConjurersCloset.java @@ -27,8 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; import mage.abilities.effects.common.ExileTargetForSourceEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/CorpseTraders.java b/Mage.Sets/src/mage/sets/avacynrestored/CorpseTraders.java index 3f059496007..a3409a314bf 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/CorpseTraders.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/CorpseTraders.java @@ -27,9 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; @@ -37,6 +36,7 @@ import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.discard.DiscardCardYouChooseTargetOpponentEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetOpponent; @@ -58,7 +58,7 @@ public class CorpseTraders extends CardImpl { this.toughness = new MageInt(3); // {2}{B}, Sacrifice a creature: Target opponent reveals his or her hand. You choose a card from it. That player discards that card. Activate this ability only any time you could cast a sorcery. - Ability ability = new ActivateAsSorceryActivatedAbility(Constants.Zone.BATTLEFIELD, new DiscardCardYouChooseTargetOpponentEffect(), new ManaCostsImpl("{2}{B}")); + Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardCardYouChooseTargetOpponentEffect(), new ManaCostsImpl("{2}{B}")); ability.addTarget(new TargetOpponent(true)); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/CraterhoofBehemoth.java b/Mage.Sets/src/mage/sets/avacynrestored/CraterhoofBehemoth.java index d18eb668a83..69c84db8813 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/CraterhoofBehemoth.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/CraterhoofBehemoth.java @@ -27,10 +27,9 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -40,6 +39,7 @@ import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; @@ -55,7 +55,7 @@ public class CraterhoofBehemoth extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public CraterhoofBehemoth(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/CripplingChill.java b/Mage.Sets/src/mage/sets/avacynrestored/CripplingChill.java index 76b82bfce78..cec1ad8f4e1 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/CripplingChill.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/CripplingChill.java @@ -27,8 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.SkipNextUntapTargetEffect; import mage.abilities.effects.common.TapTargetEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/CryptCreeper.java b/Mage.Sets/src/mage/sets/avacynrestored/CryptCreeper.java index 00f245fb520..c380cc8dfda 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/CryptCreeper.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/CryptCreeper.java @@ -27,15 +27,15 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCardInGraveyard; import java.util.UUID; @@ -55,7 +55,7 @@ public class CryptCreeper extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Crypt Creeper: Exile target card from a graveyard. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ExileTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetCardInGraveyard()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Cursebreak.java b/Mage.Sets/src/mage/sets/avacynrestored/Cursebreak.java index e1f66bb4d22..70e44bf2fec 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Cursebreak.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Cursebreak.java @@ -27,8 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DangerousWager.java b/Mage.Sets/src/mage/sets/avacynrestored/DangerousWager.java index 9c75158c6cf..be5fae71e4c 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/DangerousWager.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/DangerousWager.java @@ -28,9 +28,9 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DarkImpostor.java b/Mage.Sets/src/mage/sets/avacynrestored/DarkImpostor.java index 61d44fd433e..7de8d3cbdaf 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/DarkImpostor.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/DarkImpostor.java @@ -27,9 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.ActivatedAbility; @@ -67,14 +65,14 @@ public class DarkImpostor extends CardImpl { this.toughness = new MageInt(2); // {4}{B}{B}: Exile target creature and put a +1/+1 counter on Dark Impostor.\ - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ImprintTargetEffect(), new ManaCostsImpl("{4}{B}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ImprintTargetEffect(), new ManaCostsImpl("{4}{B}{B}")); ability.addEffect(new ExileTargetEffect(null, "Dark Impostor")); ability.addEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Dark Impostor has all activated abilities of all creature cards exiled with it. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new DarkImpostorContinuousEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DarkImpostorContinuousEffect())); } public DarkImpostor(final DarkImpostor card) { @@ -90,7 +88,7 @@ public class DarkImpostor extends CardImpl { class DarkImpostorContinuousEffect extends ContinuousEffectImpl { public DarkImpostorContinuousEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Layer.AbilityAddingRemovingEffects_6, Constants.SubLayer.NA, Constants.Outcome.AddAbility); + super(Duration.WhileOnBattlefield, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility); staticText = "{this} has all activated abilities of all creature cards exiled with it"; } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DeadeyeNavigator.java b/Mage.Sets/src/mage/sets/avacynrestored/DeadeyeNavigator.java index 4e84f6750cc..56667befd9c 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/DeadeyeNavigator.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/DeadeyeNavigator.java @@ -27,9 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,7 @@ import mage.abilities.effects.common.ReturnToBattlefieldUnderYourControlSourceEf import mage.abilities.effects.common.continious.GainAbilityPairedEffect; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import java.util.UUID; @@ -63,9 +63,9 @@ public class DeadeyeNavigator extends CardImpl { this.addAbility(SoulbondAbility.getInstance()); // As long as Deadeye Navigator is paired with another creature, each of those creatures has "{1}{U}: Exile this creature, then return it to the battlefield under your control." - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ExileSourceEffect(), new ManaCostsImpl("{1}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileSourceEffect(), new ManaCostsImpl("{1}{U}")); ability.addEffect(new ReturnToBattlefieldUnderYourControlSourceEffect()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityPairedEffect(ability, ruleText))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(ability, ruleText))); } public DeadeyeNavigator(final DeadeyeNavigator card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DeathWind.java b/Mage.Sets/src/mage/sets/avacynrestored/DeathWind.java index 96e379d0c4a..b9fb1ad0363 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/DeathWind.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/DeathWind.java @@ -27,14 +27,14 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.dynamicvalue.common.SignInversionDynamicValue; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -52,7 +52,7 @@ public class DeathWind extends CardImpl { // Target creature gets -X/-X until end of turn. DynamicValue x = new SignInversionDynamicValue(new ManacostVariableValue()); - this.getSpellAbility().addEffect(new BoostTargetEffect(x, x, Constants.Duration.EndOfTurn, true)); + this.getSpellAbility().addEffect(new BoostTargetEffect(x, x, Duration.EndOfTurn, true)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Defang.java b/Mage.Sets/src/mage/sets/avacynrestored/Defang.java index 27b2994525c..7f4a7519d1a 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Defang.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Defang.java @@ -27,9 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.PreventionEffectImpl; @@ -60,12 +58,12 @@ public class Defang extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Prevent all damage that would be dealt by enchanted creature. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new DefangEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DefangEffect())); } public Defang(final Defang card) { @@ -81,7 +79,7 @@ public class Defang extends CardImpl { class DefangEffect extends PreventionEffectImpl { public DefangEffect() { - super(Constants.Duration.WhileOnBattlefield); + super(Duration.WhileOnBattlefield); staticText = "Prevent all damage that would be dealt by enchanted creature"; } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DefyDeath.java b/Mage.Sets/src/mage/sets/avacynrestored/DefyDeath.java index db7833051e1..f94114d157d 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/DefyDeath.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/DefyDeath.java @@ -28,9 +28,9 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DemonicRising.java b/Mage.Sets/src/mage/sets/avacynrestored/DemonicRising.java index f08ae0551e8..b5b4d595aec 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/DemonicRising.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/DemonicRising.java @@ -27,9 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.TriggeredAbility; @@ -74,7 +73,7 @@ public class DemonicRising extends CardImpl { class DemonToken extends Token { public DemonToken() { super("Demon", "a 5/5 black Demon creature token with flying"); - cardType.add(Constants.CardType.CREATURE); + cardType.add(CardType.CREATURE); color = ObjectColor.BLACK; subtype.add("Demon"); power = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DemonicTaskmaster.java b/Mage.Sets/src/mage/sets/avacynrestored/DemonicTaskmaster.java index 24b34cd05bc..83f44532c28 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/DemonicTaskmaster.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/DemonicTaskmaster.java @@ -27,15 +27,15 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.SacrificeEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; @@ -65,7 +65,7 @@ public class DemonicTaskmaster extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // At the beginning of your upkeep, sacrifice a creature other than Demonic Taskmaster. - Ability ability = new BeginningOfUpkeepTriggeredAbility(new SacrificeEffect(filter, 1, ""), Constants.TargetController.YOU, false); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new SacrificeEffect(filter, 1, ""), TargetController.YOU, false); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DemonlordOfAshmouth.java b/Mage.Sets/src/mage/sets/avacynrestored/DemonlordOfAshmouth.java index 2bb7a1bcd4a..48b6b0b21a8 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/DemonlordOfAshmouth.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/DemonlordOfAshmouth.java @@ -27,8 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.common.SacrificeTargetCost; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DescendantsPath.java b/Mage.Sets/src/mage/sets/avacynrestored/DescendantsPath.java index 5e23208b0a2..d0440492905 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/DescendantsPath.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/DescendantsPath.java @@ -29,9 +29,9 @@ package mage.sets.avacynrestored; import java.util.ArrayList; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -39,6 +39,8 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; @@ -60,7 +62,7 @@ public class DescendantsPath extends CardImpl { this.color.setGreen(true); // At the beginning of your upkeep, reveal the top card of your library. If it's a creature card that shares a creature type with a creature you control, you may cast that card without paying its mana cost. Otherwise, put that card on the bottom of your library. - Ability ability = new BeginningOfUpkeepTriggeredAbility(new DescendantsPathEffect(), Constants.TargetController.YOU, false); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new DescendantsPathEffect(), TargetController.YOU, false); this.addAbility(ability); } @@ -77,7 +79,7 @@ public class DescendantsPath extends CardImpl { class DescendantsPathEffect extends OneShotEffect { public DescendantsPathEffect() { - super(Constants.Outcome.Discard); + super(Outcome.Discard); this.staticText = "reveal the top card of your library. If it's a creature card that shares a creature type with a creature you control, you may cast that card without paying its mana cost. Otherwise, put that card on the bottom of your library"; } @@ -109,7 +111,7 @@ class DescendantsPathEffect extends OneShotEffect { int count = game.getBattlefield().getAllActivePermanents(filter, player.getId(), game).size(); if (count > 0) { game.informPlayers("DescendantsPath: Found a creature that shares a creature type with the revealed card."); - if (player.chooseUse(Constants.Outcome.Benefit, "Cast the card?", game)) { + if (player.chooseUse(Outcome.Benefit, "Cast the card?", game)) { player.cast(card.getSpellAbility(), game, true); } else { game.informPlayers("DescendantsPath: " + player.getName() + " canceled casting the card."); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DescentIntoMadness.java b/Mage.Sets/src/mage/sets/avacynrestored/DescentIntoMadness.java index c9fc9f5a0ea..84acd4006c3 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/DescentIntoMadness.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/DescentIntoMadness.java @@ -27,9 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -60,7 +58,7 @@ public class DescentIntoMadness extends CardImpl { this.color.setBlack(true); // At the beginning of your upkeep, put a despair counter on Descent into Madness, then each player exiles X permanents he or she controls and/or cards from his or her hand, where X is the number of despair counters on Descent into Madness. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DescentIntoMadnessEffect(), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DescentIntoMadnessEffect(), TargetController.YOU, false)); } public DescentIntoMadness(final DescentIntoMadness card) { @@ -79,7 +77,7 @@ class DescentIntoMadnessEffect extends OneShotEffect { private static final FilterControlledPermanent filter = new FilterControlledPermanent(); public DescentIntoMadnessEffect() { - super(Constants.Outcome.Sacrifice); + super(Outcome.Sacrifice); this.staticText = "put a despair counter on {this}, then each player exiles X permanents he or she controls and/or cards from his or her hand, where X is the number of despair counters on {this}"; } @@ -120,7 +118,7 @@ class DescentIntoMadnessEffect extends OneShotEffect { while (amount > 0) { Target target = new TargetControlledPermanent(0, 1, filter, true); if (target.canChoose(player.getId(), game) - && player.choose(Constants.Outcome.Exile, target, source.getSourceId(), game)) { + && player.choose(Outcome.Exile, target, source.getSourceId(), game)) { for (UUID targetId : target.getTargets()) { Permanent chosen = game.getPermanent(targetId); @@ -132,9 +130,9 @@ class DescentIntoMadnessEffect extends OneShotEffect { } if (amount > 0) { - TargetCard targetInHand = new TargetCard(Constants.Zone.HAND, filterInHand); + TargetCard targetInHand = new TargetCard(Zone.HAND, filterInHand); if (targetInHand.canChoose(player.getId(), game) && - player.choose(Constants.Outcome.Exile, player.getHand(), targetInHand, game)) { + player.choose(Outcome.Exile, player.getHand(), targetInHand, game)) { Card card = player.getHand().get(targetInHand.getFirstTarget(), game); if (card != null) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DesolateLighthouse.java b/Mage.Sets/src/mage/sets/avacynrestored/DesolateLighthouse.java index 3e3484661f5..5651856f43f 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/DesolateLighthouse.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/DesolateLighthouse.java @@ -28,9 +28,9 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DevastationTide.java b/Mage.Sets/src/mage/sets/avacynrestored/DevastationTide.java index 8d3dd6878f2..77d473c7778 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/DevastationTide.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/DevastationTide.java @@ -28,10 +28,10 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DevoutChaplain.java b/Mage.Sets/src/mage/sets/avacynrestored/DevoutChaplain.java index 5e1b9d46d57..bcdadc43e87 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/DevoutChaplain.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/DevoutChaplain.java @@ -28,9 +28,9 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DiregrafEscort.java b/Mage.Sets/src/mage/sets/avacynrestored/DiregrafEscort.java index 6b2a8de3d36..c2b431275a4 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/DiregrafEscort.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/DiregrafEscort.java @@ -27,15 +27,15 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityPairedEffect; import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -69,7 +69,7 @@ public class DiregrafEscort extends CardImpl { this.addAbility(SoulbondAbility.getInstance()); // As long as Diregraf Escort is paired with another creature, both creatures have protection from Zombies. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityPairedEffect(new ProtectionAbility(filter), ruleText))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(new ProtectionAbility(filter), ruleText))); } public DiregrafEscort(final DiregrafEscort card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DivineDeflection.java b/Mage.Sets/src/mage/sets/avacynrestored/DivineDeflection.java index 53e46546049..26075d386a3 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/DivineDeflection.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/DivineDeflection.java @@ -27,13 +27,13 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.PreventionEffectImpl; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -55,7 +55,7 @@ public class DivineDeflection extends CardImpl { this.color.setWhite(true); // Prevent the next X damage that would be dealt to you and/or permanents you control this turn. If damage is prevented this way, Divine Deflection deals that much damage to target creature or player. - this.getSpellAbility().addEffect(new DivineDeflectionPreventDamageTargetEffect(Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new DivineDeflectionPreventDamageTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetSource()); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); } @@ -74,7 +74,7 @@ class DivineDeflectionPreventDamageTargetEffect extends PreventionEffectImpl
{ private static final FilterLandPermanent filter = new FilterLandPermanent("lands you control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public Dreadwaters(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DriverOfTheDead.java b/Mage.Sets/src/mage/sets/avacynrestored/DriverOfTheDead.java index 271b2d07eb9..aaf82598df1 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/DriverOfTheDead.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/DriverOfTheDead.java @@ -27,8 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DruidsFamiliar.java b/Mage.Sets/src/mage/sets/avacynrestored/DruidsFamiliar.java index 97ed18e1aa1..1e8605c1dc2 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/DruidsFamiliar.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/DruidsFamiliar.java @@ -27,14 +27,14 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostPairedEffect; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import java.util.UUID; @@ -60,7 +60,7 @@ public class DruidsFamiliar extends CardImpl { this.addAbility(SoulbondAbility.getInstance()); // As long as Druid's Familiar is paired with another creature, each of those creatures gets +2/+2. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostPairedEffect(2, 2, ruleText))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostPairedEffect(2, 2, ruleText))); } public DruidsFamiliar(final DruidsFamiliar card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DruidsRepository.java b/Mage.Sets/src/mage/sets/avacynrestored/DruidsRepository.java index 48aa27b3b68..3d014c02912 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/DruidsRepository.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/DruidsRepository.java @@ -27,8 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.AttacksCreatureYourControlTriggeredAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DualCasting.java b/Mage.Sets/src/mage/sets/avacynrestored/DualCasting.java index f67c70b4619..edd7c4ace72 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/DualCasting.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/DualCasting.java @@ -29,9 +29,7 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -72,14 +70,14 @@ public class DualCasting extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature has "{R}, {tap}: Copy target instant or sorcery spell you control. You may choose new targets for the copy." - ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CopyTargetSpellEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.R)); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CopyTargetSpellEffect(), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetSpell(filter)); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.AURA))); } public DualCasting(final DualCasting card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/EatenBySpiders.java b/Mage.Sets/src/mage/sets/avacynrestored/EatenBySpiders.java index e3080f6dbb9..9fa316becd5 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/EatenBySpiders.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/EatenBySpiders.java @@ -29,9 +29,9 @@ package mage.sets.avacynrestored; import java.util.LinkedList; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/ElgaudShieldmate.java b/Mage.Sets/src/mage/sets/avacynrestored/ElgaudShieldmate.java index a0f76884dba..9351d9078ee 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/ElgaudShieldmate.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/ElgaudShieldmate.java @@ -27,15 +27,15 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityPairedEffect; import mage.abilities.keyword.HexproofAbility; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import java.util.UUID; @@ -60,7 +60,7 @@ public class ElgaudShieldmate extends CardImpl { this.addAbility(SoulbondAbility.getInstance()); // As long as Elgaud Shieldmate is paired with another creature, both creatures have hexproof. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityPairedEffect(HexproofAbility.getInstance(), ruleText))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(HexproofAbility.getInstance(), ruleText))); } public ElgaudShieldmate(final ElgaudShieldmate card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/EmancipationAngel.java b/Mage.Sets/src/mage/sets/avacynrestored/EmancipationAngel.java index 2cd7505c3bf..e5fe355431b 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/EmancipationAngel.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/EmancipationAngel.java @@ -28,8 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/EntreatTheAngels.java b/Mage.Sets/src/mage/sets/avacynrestored/EntreatTheAngels.java index cef22db0d45..4fa3f5ec4d3 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/EntreatTheAngels.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/EntreatTheAngels.java @@ -27,8 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/EssenceHarvest.java b/Mage.Sets/src/mage/sets/avacynrestored/EssenceHarvest.java index a248c04b6de..a72c601b8c1 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/EssenceHarvest.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/EssenceHarvest.java @@ -29,9 +29,9 @@ package mage.sets.avacynrestored; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/EvernightShade.java b/Mage.Sets/src/mage/sets/avacynrestored/EvernightShade.java index 78d61d54634..3679c6ca7bb 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/EvernightShade.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/EvernightShade.java @@ -27,15 +27,16 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.UndyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import java.util.UUID; @@ -54,7 +55,7 @@ public class EvernightShade extends CardImpl { this.toughness = new MageInt(1); // {B}: Evernight Shade gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Constants.Duration.EndOfTurn), new ManaCostsImpl("{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{B}"))); this.addAbility(new UndyingAbility()); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/ExquisiteBlood.java b/Mage.Sets/src/mage/sets/avacynrestored/ExquisiteBlood.java index 176e7e88c61..b9d437c2a24 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/ExquisiteBlood.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/ExquisiteBlood.java @@ -27,12 +27,12 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -67,7 +67,7 @@ public class ExquisiteBlood extends CardImpl { class ExquisiteBloodTriggeredAbility extends TriggeredAbilityImpl { public ExquisiteBloodTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, null); + super(Zone.BATTLEFIELD, null); } public ExquisiteBloodTriggeredAbility(final ExquisiteBloodTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/FalkenrathExterminator.java b/Mage.Sets/src/mage/sets/avacynrestored/FalkenrathExterminator.java index 1f44b478ea9..43bb5c4befb 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/FalkenrathExterminator.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/FalkenrathExterminator.java @@ -29,9 +29,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -41,6 +40,7 @@ import mage.abilities.dynamicvalue.common.CountersCount; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; @@ -63,7 +63,7 @@ public class FalkenrathExterminator extends CardImpl { // Whenever Falkenrath Exterminator deals combat damage to a player, put a +1/+1 counter on it. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false)); // {2}{R}: Falkenrath Exterminator deals damage to target creature equal to the number of +1/+1 counters on Falkenrath Exterminator. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(new CountersCount(CounterType.P1P1)), new ManaCostsImpl("{2}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new CountersCount(CounterType.P1P1)), new ManaCostsImpl("{2}{R}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/FarbogExplorer.java b/Mage.Sets/src/mage/sets/avacynrestored/FarbogExplorer.java index 26c55e117f8..6006a101baa 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/FarbogExplorer.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/FarbogExplorer.java @@ -28,8 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/FavorableWinds.java b/Mage.Sets/src/mage/sets/avacynrestored/FavorableWinds.java index 01d7dd3c034..5e5df151d00 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/FavorableWinds.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/FavorableWinds.java @@ -27,13 +27,14 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; @@ -58,7 +59,7 @@ public class FavorableWinds extends CardImpl { this.color.setBlue(true); // Creatures you control with flying get +1/+1. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Constants.Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); } public FavorableWinds(final FavorableWinds card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/FerventCathar.java b/Mage.Sets/src/mage/sets/avacynrestored/FerventCathar.java index 4378af41e23..4261127ff6f 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/FerventCathar.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/FerventCathar.java @@ -27,9 +27,9 @@ */ package mage.sets.avacynrestored; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Fettergeist.java b/Mage.Sets/src/mage/sets/avacynrestored/Fettergeist.java index 8d857618406..cacfca0c2a9 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Fettergeist.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Fettergeist.java @@ -27,9 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -38,6 +37,8 @@ import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; @@ -64,7 +65,7 @@ public class Fettergeist extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // At the beginning of your upkeep, sacrifice Fettergeist unless you pay {1} for each other creature you control. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new FettergeistUnlessPaysEffect(), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new FettergeistUnlessPaysEffect(), TargetController.YOU, false)); } @@ -87,7 +88,7 @@ class FettergeistUnlessPaysEffect extends OneShotEffect { this.toughness = new MageInt(5); // Flowering Lumberknot can't attack or block unless it's paired with a creature with soulbond. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new FloweringLumberknotEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FloweringLumberknotEffect())); } public FloweringLumberknot(final FloweringLumberknot card) { @@ -72,7 +73,7 @@ public class FloweringLumberknot extends CardImpl { class FloweringLumberknotEffect extends RestrictionEffect { public FloweringLumberknotEffect() { - super(Constants.Duration.WhileOnBattlefield); + super(Duration.WhileOnBattlefield); staticText = "{this} can't attack or block unless it's paired with a creature with soulbond"; } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/GallowsAtWillowHill.java b/Mage.Sets/src/mage/sets/avacynrestored/GallowsAtWillowHill.java index 3728d05ad16..4da8a0607f5 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/GallowsAtWillowHill.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/GallowsAtWillowHill.java @@ -27,9 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -37,6 +36,8 @@ import mage.abilities.costs.common.TapTargetCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -68,7 +69,7 @@ public class GallowsAtWillowHill extends CardImpl { this.expansionSetCode = "AVR"; // {3}, {tap}, Tap three untapped Humans you control: Destroy target creature. Its controller puts a 1/1 white Spirit creature token with flying onto the battlefield. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GallowsAtWillowHillEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GallowsAtWillowHillEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledPermanent(3, 3, humanFilter, false))); ability.addTarget(new TargetCreaturePermanent()); @@ -88,7 +89,7 @@ public class GallowsAtWillowHill extends CardImpl { class GallowsAtWillowHillEffect extends OneShotEffect { public GallowsAtWillowHillEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); staticText = "Destroy target creature. Its controller puts a 1/1 white Spirit creature token with flying onto the battlefield"; } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/GalvanicAlchemist.java b/Mage.Sets/src/mage/sets/avacynrestored/GalvanicAlchemist.java index 91e9519c0ec..3fa7ca55ae7 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/GalvanicAlchemist.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/GalvanicAlchemist.java @@ -27,9 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.effects.common.UntapSourceEffect; import mage.abilities.effects.common.continious.GainAbilityPairedEffect; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import java.util.UUID; @@ -63,8 +63,8 @@ public class GalvanicAlchemist extends CardImpl { this.addAbility(SoulbondAbility.getInstance()); // As long as Galvanic Alchemist is paired with another creature, each of those creatures has "{2}{U}: Untap this creature." - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl("{2}{U}")); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityPairedEffect(ability, ruleText))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl("{2}{U}")); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(ability, ruleText))); } public GalvanicAlchemist(final GalvanicAlchemist card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/GangOfDevils.java b/Mage.Sets/src/mage/sets/avacynrestored/GangOfDevils.java index 354660f666e..a81758c64bd 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/GangOfDevils.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/GangOfDevils.java @@ -27,8 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/GeistSnatch.java b/Mage.Sets/src/mage/sets/avacynrestored/GeistSnatch.java index a6a020ab20b..18632697600 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/GeistSnatch.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/GeistSnatch.java @@ -27,14 +27,14 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; @@ -79,7 +79,7 @@ public class GeistSnatch extends CardImpl { class GeistSnatchCounterTargetEffect extends OneShotEffect { public GeistSnatchCounterTargetEffect() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); staticText = "Counter target creature spell. Put a 1/1 blue Spirit creature token with flying onto the battlefield"; } @@ -105,7 +105,7 @@ class SpiritBlueToken extends Token { public SpiritBlueToken() { super("Spirit", "1/1 blue Spirit creature token with flying"); - cardType.add(Constants.CardType.CREATURE); + cardType.add(CardType.CREATURE); subtype.add("Spirit"); color.setBlue(true); power = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/GeistTrappers.java b/Mage.Sets/src/mage/sets/avacynrestored/GeistTrappers.java index b580d0bd8af..0a4f0423580 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/GeistTrappers.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/GeistTrappers.java @@ -27,15 +27,15 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityPairedEffect; import mage.abilities.keyword.ReachAbility; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import java.util.UUID; @@ -60,7 +60,7 @@ public class GeistTrappers extends CardImpl { this.addAbility(SoulbondAbility.getInstance()); // As long as Geist Trappers is paired with another creature, both creatures have reach. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityPairedEffect(ReachAbility.getInstance(), ruleText))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(ReachAbility.getInstance(), ruleText))); } public GeistTrappers(final GeistTrappers card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Ghostform.java b/Mage.Sets/src/mage/sets/avacynrestored/Ghostform.java index fc1a99ae490..0582a681ed8 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Ghostform.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Ghostform.java @@ -28,8 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.UnblockableTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/GhostlyFlicker.java b/Mage.Sets/src/mage/sets/avacynrestored/GhostlyFlicker.java index d5ed11d0855..8c9fdf5271f 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/GhostlyFlicker.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/GhostlyFlicker.java @@ -27,13 +27,14 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -81,7 +82,7 @@ public class GhostlyFlicker extends CardImpl { class GhostlyFlickerEffect extends OneShotEffect { public GhostlyFlickerEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "Exile two target artifacts, creatures, and/or lands you control, then return those cards to the battlefield under your control"; } @@ -103,7 +104,7 @@ class GhostlyFlickerEffect extends OneShotEffect { target.moveToExile(exileId, "Ghostly Flicker", source.getId(), game); Card card = game.getCard(target.getId()); if (card != null) { - Constants.Zone currentZone = game.getState().getZone(card.getId()); + Zone currentZone = game.getState().getZone(card.getId()); card.putOntoBattlefield(game, currentZone, source.getId(), source.getControllerId()); } } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/GhostlyTouch.java b/Mage.Sets/src/mage/sets/avacynrestored/GhostlyTouch.java index 427ce08ab69..71d6358f003 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/GhostlyTouch.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/GhostlyTouch.java @@ -27,9 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -60,14 +58,14 @@ public class GhostlyTouch extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature has "Whenever this creature attacks, you may tap or untap target permanent." Ability gainedAbility = new AttacksTriggeredAbility(new MayTapOrUntapTargetEffect(), true); gainedAbility.addTarget(new TargetPermanent()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); } public GhostlyTouch(final GhostlyTouch card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Ghoulflesh.java b/Mage.Sets/src/mage/sets/avacynrestored/Ghoulflesh.java index 460c43d43e0..66377333e2e 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Ghoulflesh.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Ghoulflesh.java @@ -27,9 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -58,13 +56,13 @@ public class Ghoulflesh extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.UnboostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); // Enchanted creature gets -1/-1 and is a black Zombie in addition to its other colors and types. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(-1, -1, Constants.Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new AddCardSubtypeAttachedEffect("Zombie", Constants.Duration.WhileOnBattlefield, Constants.AttachmentType.AURA))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new AddCardColorAttachedEffect(ObjectColor.BLACK, Constants.Duration.WhileOnBattlefield, Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-1, -1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AddCardSubtypeAttachedEffect("Zombie", Duration.WhileOnBattlefield, AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AddCardColorAttachedEffect(ObjectColor.BLACK, Duration.WhileOnBattlefield, AttachmentType.AURA))); } public Ghoulflesh(final Ghoulflesh card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/GiselaBladeOfGoldnight.java b/Mage.Sets/src/mage/sets/avacynrestored/GiselaBladeOfGoldnight.java index fb2b2318256..2094a47e4d3 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/GiselaBladeOfGoldnight.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/GiselaBladeOfGoldnight.java @@ -27,9 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -65,7 +63,7 @@ public class GiselaBladeOfGoldnight extends CardImpl { // If a source would deal damage to an opponent or a permanent an opponent controls, that source deals double that damage to that player or permanent instead. // If a source would deal damage to you or a permanent you control, prevent half that damage, rounded up. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GiselaBladeOfGoldnightDoubleDamageEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GiselaBladeOfGoldnightDoubleDamageEffect())); } public GiselaBladeOfGoldnight(final GiselaBladeOfGoldnight card) { @@ -81,7 +79,7 @@ public class GiselaBladeOfGoldnight extends CardImpl { class GiselaBladeOfGoldnightDoubleDamageEffect extends ReplacementEffectImpl { public GiselaBladeOfGoldnightDoubleDamageEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Damage); + super(Duration.WhileOnBattlefield, Outcome.Damage); staticText = "If a source would deal damage to an opponent or a permanent an opponent controls, that source deals double that damage to that player or permanent instead." + "If a source would deal damage to you or a permanent you control, prevent half that damage, rounded up"; } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/GloomSurgeon.java b/Mage.Sets/src/mage/sets/avacynrestored/GloomSurgeon.java index 27a83908da5..3e27379d9b4 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/GloomSurgeon.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/GloomSurgeon.java @@ -27,9 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -58,7 +56,7 @@ public class GloomSurgeon extends CardImpl { this.toughness = new MageInt(1); // If combat damage would be dealt to Gloom Surgeon, prevent that damage and exile that many cards from the top of your library. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GloomSurgeonEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GloomSurgeonEffect())); } public GloomSurgeon(final GloomSurgeon card) { @@ -74,7 +72,7 @@ public class GloomSurgeon extends CardImpl { class GloomSurgeonEffect extends ReplacementEffectImpl { GloomSurgeonEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Exile); + super(Duration.WhileOnBattlefield, Outcome.Exile); staticText = "If combat damage would be dealt to {this}, prevent that damage and exile that many cards from the top of your library"; } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Gloomwidow.java b/Mage.Sets/src/mage/sets/avacynrestored/Gloomwidow.java index b99fde2250e..797c28eccb7 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Gloomwidow.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Gloomwidow.java @@ -28,9 +28,9 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.CanBlockOnlyFlyingEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/GoldnightCommander.java b/Mage.Sets/src/mage/sets/avacynrestored/GoldnightCommander.java index 5fb447ef0c1..1a06df7055c 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/GoldnightCommander.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/GoldnightCommander.java @@ -27,13 +27,13 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersAnotherCreatureYourControlTriggeredAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import java.util.UUID; @@ -54,7 +54,7 @@ public class GoldnightCommander extends CardImpl { this.toughness = new MageInt(2); // Whenever another creature enters the battlefield under your control, creatures you control get +1/+1 until end of turn. - this.addAbility(new EntersAnotherCreatureYourControlTriggeredAbility(new BoostControlledEffect(1, 1, Constants.Duration.EndOfTurn))); + this.addAbility(new EntersAnotherCreatureYourControlTriggeredAbility(new BoostControlledEffect(1, 1, Duration.EndOfTurn))); } public GoldnightCommander(final GoldnightCommander card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/GoldnightRedeemer.java b/Mage.Sets/src/mage/sets/avacynrestored/GoldnightRedeemer.java index fbdd2b83924..a3a056b4a55 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/GoldnightRedeemer.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/GoldnightRedeemer.java @@ -27,8 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/GraveExchange.java b/Mage.Sets/src/mage/sets/avacynrestored/GraveExchange.java index 73372f5db35..ed4d89264e2 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/GraveExchange.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/GraveExchange.java @@ -28,9 +28,9 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Griselbrand.java b/Mage.Sets/src/mage/sets/avacynrestored/Griselbrand.java index 56393be3382..2fb6537d89b 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Griselbrand.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Griselbrand.java @@ -29,9 +29,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.PayLifeCost; @@ -39,6 +38,7 @@ import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -59,7 +59,7 @@ public class Griselbrand extends CardImpl { this.addAbility(FlyingAbility.getInstance()); this.addAbility(LifelinkAbility.getInstance()); // Pay 7 life: Draw seven cards. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(7), new PayLifeCost(7))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(7), new PayLifeCost(7))); } public Griselbrand(final Griselbrand card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Grounded.java b/Mage.Sets/src/mage/sets/avacynrestored/Grounded.java index 5c522a00a15..b415c44dbff 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Grounded.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Grounded.java @@ -27,9 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -57,12 +55,12 @@ public class Grounded extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.LoseAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.LoseAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature loses flying. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new LoseAbilityAttachedEffect(FlyingAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LoseAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); } public Grounded(final Grounded card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/GryffVanguard.java b/Mage.Sets/src/mage/sets/avacynrestored/GryffVanguard.java index a5e1a0cc24a..73bb89016ce 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/GryffVanguard.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/GryffVanguard.java @@ -27,8 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/GuiseOfFire.java b/Mage.Sets/src/mage/sets/avacynrestored/GuiseOfFire.java index f6ad6608cd0..7950e1507a2 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/GuiseOfFire.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/GuiseOfFire.java @@ -27,9 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.common.SimpleStaticAbility; @@ -58,13 +56,13 @@ public class GuiseOfFire extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature gets +1/-1 and attacks each turn if able. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(1, -1, Constants.Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new AttacksEachTurnStaticAbility(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, -1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new AttacksEachTurnStaticAbility(), AttachmentType.AURA))); } public GuiseOfFire(final GuiseOfFire card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/HanweirLancer.java b/Mage.Sets/src/mage/sets/avacynrestored/HanweirLancer.java index d47c957daea..5d7ebb465d6 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/HanweirLancer.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/HanweirLancer.java @@ -27,15 +27,15 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityPairedEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import java.util.UUID; @@ -60,7 +60,7 @@ public class HanweirLancer extends CardImpl { this.addAbility(SoulbondAbility.getInstance()); // As long as Hanweir Lancer is paired with another creature, both creatures have first strike. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityPairedEffect(FirstStrikeAbility.getInstance(), ruleText))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(FirstStrikeAbility.getInstance(), ruleText))); } public HanweirLancer(final HanweirLancer card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/HarvesterOfSouls.java b/Mage.Sets/src/mage/sets/avacynrestored/HarvesterOfSouls.java index 73783d4240f..555ca3e7c28 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/HarvesterOfSouls.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/HarvesterOfSouls.java @@ -27,8 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/HauntedGuardian.java b/Mage.Sets/src/mage/sets/avacynrestored/HauntedGuardian.java index 28ab6e0d9d8..47c353f7bdf 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/HauntedGuardian.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/HauntedGuardian.java @@ -28,8 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/HavengulSkaab.java b/Mage.Sets/src/mage/sets/avacynrestored/HavengulSkaab.java index a2a500657b8..561d491b6b3 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/HavengulSkaab.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/HavengulSkaab.java @@ -27,14 +27,14 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; @@ -82,7 +82,7 @@ class HavengulSkaabAbility extends TriggeredAbilityImpl { } public HavengulSkaabAbility() { - super(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect()); + super(Zone.BATTLEFIELD, new DestroyTargetEffect()); this.addEffect(new ReturnToHandTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/HavengulVampire.java b/Mage.Sets/src/mage/sets/avacynrestored/HavengulVampire.java index d13d1d4c02c..a77f11a8c3f 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/HavengulVampire.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/HavengulVampire.java @@ -28,8 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.common.DiesCreatureTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/HeirsOfStromkirk.java b/Mage.Sets/src/mage/sets/avacynrestored/HeirsOfStromkirk.java index e892c818c7b..3243c0b7624 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/HeirsOfStromkirk.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/HeirsOfStromkirk.java @@ -27,8 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/HeraldOfWar.java b/Mage.Sets/src/mage/sets/avacynrestored/HeraldOfWar.java index 56ed87b5b63..ddf9a7a0b4f 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/HeraldOfWar.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/HeraldOfWar.java @@ -27,9 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -69,7 +67,7 @@ public class HeraldOfWar extends CardImpl { this.addAbility(new AttacksTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false)); // Angel spells and Human spells you cast cost {1} less to cast for each +1/+1 counter on Herald of War. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new HeraldOfWarCostReductionEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new HeraldOfWarCostReductionEffect())); } public HeraldOfWar(final HeraldOfWar card) { @@ -85,7 +83,7 @@ public class HeraldOfWar extends CardImpl { class HeraldOfWarCostReductionEffect extends CostModificationEffectImpl { HeraldOfWarCostReductionEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "Angel spells and Human spells you cast cost {1} less to cast for each +1/+1 counter on Herald of War"; } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/HolyJusticiar.java b/Mage.Sets/src/mage/sets/avacynrestored/HolyJusticiar.java index 88692b20b37..12d87905276 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/HolyJusticiar.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/HolyJusticiar.java @@ -28,8 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.cards.CardImpl; @@ -37,9 +37,9 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.Ability; import mage.target.common.TargetCreaturePermanent; import mage.abilities.common.SimpleActivatedAbility; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.effects.OneShotEffect; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.game.permanent.Permanent; import mage.game.Game; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/HomicidalSeclusion.java b/Mage.Sets/src/mage/sets/avacynrestored/HomicidalSeclusion.java index ba9cf7c7d61..ab14e9df812 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/HomicidalSeclusion.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/HomicidalSeclusion.java @@ -27,9 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.OneControlledCreatureCondition; import mage.abilities.decorator.ConditionalContinousEffect; @@ -39,6 +38,8 @@ import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import java.util.UUID; @@ -56,13 +57,13 @@ public class HomicidalSeclusion extends CardImpl { this.color.setBlack(true); // As long as you control exactly one creature, that creature gets +3/+1 and has lifelink. - ContinuousEffect boostEffect = new BoostControlledEffect(3, 1, Constants.Duration.WhileOnBattlefield); + ContinuousEffect boostEffect = new BoostControlledEffect(3, 1, Duration.WhileOnBattlefield); Effect effect = new ConditionalContinousEffect(boostEffect, new OneControlledCreatureCondition(), rule); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); - ContinuousEffect lifelinkEffect = new GainAbilityControlledEffect(LifelinkAbility.getInstance(), Constants.Duration.WhileOnBattlefield); + ContinuousEffect lifelinkEffect = new GainAbilityControlledEffect(LifelinkAbility.getInstance(), Duration.WhileOnBattlefield); effect = new ConditionalContinousEffect(lifelinkEffect, new OneControlledCreatureCondition(), null); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } public HomicidalSeclusion(final HomicidalSeclusion card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/HoundOfGriselbrand.java b/Mage.Sets/src/mage/sets/avacynrestored/HoundOfGriselbrand.java index 29cb7b3c628..2baaac36ece 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/HoundOfGriselbrand.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/HoundOfGriselbrand.java @@ -28,8 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DoubleStrikeAbility; import mage.abilities.keyword.UndyingAbility; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Howlgeist.java b/Mage.Sets/src/mage/sets/avacynrestored/Howlgeist.java index 9d9da0a5585..15b1862fb9f 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Howlgeist.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Howlgeist.java @@ -28,9 +28,9 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.CantBeBlockedByCreaturesWithLessPowerEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/HumanFrailty.java b/Mage.Sets/src/mage/sets/avacynrestored/HumanFrailty.java index 4191073f000..9cf238e94f7 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/HumanFrailty.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/HumanFrailty.java @@ -27,8 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/HuntedGhoul.java b/Mage.Sets/src/mage/sets/avacynrestored/HuntedGhoul.java index 234ebec9f1a..0c5ec669d1e 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/HuntedGhoul.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/HuntedGhoul.java @@ -27,14 +27,14 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.EvasionAbility; import mage.abilities.effects.RestrictionEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.game.Game; import mage.game.permanent.Permanent; @@ -97,7 +97,7 @@ class HuntedGhoulAbility extends EvasionAbility { class HuntedGhoulEffect extends RestrictionEffect { public HuntedGhoulEffect() { - super(Constants.Duration.WhileOnBattlefield); + super(Duration.WhileOnBattlefield); } public HuntedGhoulEffect(final HuntedGhoulEffect effect) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/InfiniteReflection.java b/Mage.Sets/src/mage/sets/avacynrestored/InfiniteReflection.java index f5945a13bb5..3f98cbbd411 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/InfiniteReflection.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/InfiniteReflection.java @@ -27,9 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -67,7 +65,7 @@ public class InfiniteReflection extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Copy)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Copy)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); @@ -75,7 +73,7 @@ public class InfiniteReflection extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new InfiniteReflectionTriggeredEffect())); // Nontoken creatures you control enter the battlefield as a copy of enchanted creature. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new InfiniteReflectionEntersBattlefieldEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new InfiniteReflectionEntersBattlefieldEffect())); } public InfiniteReflection(final InfiniteReflection card) { @@ -93,7 +91,7 @@ class InfiniteReflectionTriggeredEffect extends OneShotEffect { public InfiniteReflectionEntersBattlefieldEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); } public InfiniteReflectionEntersBattlefieldEffect(InfiniteReflectionEntersBattlefieldEffect effect) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/IntoTheVoid.java b/Mage.Sets/src/mage/sets/avacynrestored/IntoTheVoid.java index fea3546c3c4..baa2ed35bf6 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/IntoTheVoid.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/IntoTheVoid.java @@ -27,8 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/JointAssault.java b/Mage.Sets/src/mage/sets/avacynrestored/JointAssault.java index e37bf175b18..e5bf558883a 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/JointAssault.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/JointAssault.java @@ -27,12 +27,15 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; @@ -51,7 +54,7 @@ public class JointAssault extends CardImpl { this.color.setGreen(true); // Target creature gets +2/+2 until end of turn. If it's paired with a creature, that creature also gets +2/+2 until end of turn. - this.getSpellAbility().addEffect(new JointAssaultBoostTargetEffect(2, 2, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new JointAssaultBoostTargetEffect(2, 2, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } @@ -71,8 +74,8 @@ class JointAssaultBoostTargetEffect extends ContinuousEffectImpl { this.color.setWhite(true); // Target creature gains flying until end of turn. Prevent all damage that would be dealt to that creature this turn. - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new PreventDamageTargetEffect(Constants.Duration.EndOfTurn, Integer.MAX_VALUE)); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new PreventDamageTargetEffect(Duration.EndOfTurn, Integer.MAX_VALUE)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/LightningMauler.java b/Mage.Sets/src/mage/sets/avacynrestored/LightningMauler.java index c865f4a04de..0cc78479322 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/LightningMauler.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/LightningMauler.java @@ -27,15 +27,15 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityPairedEffect; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import java.util.UUID; @@ -62,7 +62,7 @@ public class LightningMauler extends CardImpl { this.addAbility(SoulbondAbility.getInstance()); // As long as Lightning Mauler is paired with another creature, both creatures have haste. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityPairedEffect(HasteAbility.getInstance(), ruleText))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(HasteAbility.getInstance(), ruleText))); } public LightningMauler(final LightningMauler card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/LightningProwess.java b/Mage.Sets/src/mage/sets/avacynrestored/LightningProwess.java index 333f4f21659..43a72a8ce45 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/LightningProwess.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/LightningProwess.java @@ -29,9 +29,7 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -62,14 +60,14 @@ public class LightningProwess extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature has haste and "{tap}: This creature deals 1 damage to target creature or player." - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HasteAbility.getInstance(), Constants.AttachmentType.AURA))); - ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA))); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.AURA))); } public LightningProwess(final LightningProwess card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/LoneRevenant.java b/Mage.Sets/src/mage/sets/avacynrestored/LoneRevenant.java index efee10c4d51..a71d8cb0a03 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/LoneRevenant.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/LoneRevenant.java @@ -28,10 +28,10 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.keyword.HexproofAbility; @@ -40,6 +40,7 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; import mage.filter.FilterCard; import mage.game.Game; import mage.game.permanent.Permanent; @@ -121,7 +122,7 @@ class LoneRevenantTriggeredAbility extends TriggeredAbilityImpl { public LoneRevenantEffect() { - super(Constants.Outcome.DrawCard); + super(Outcome.DrawCard); this.staticText = "Whenever Lone Revenant deals combat damage to a player, if you control no other creatures, look at the top four cards of your library. Put one of them into your hand and the rest on the bottom of your library in any order"; } @@ -137,40 +138,40 @@ class LoneRevenantEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); - Cards cards = new CardsImpl(Constants.Zone.PICK); + Cards cards = new CardsImpl(Zone.PICK); int count = Math.min(player.getLibrary().size(), 4); for (int i = 0; i < count; i++) { Card card = player.getLibrary().removeFromTop(game); if (card != null) { cards.add(card); - game.setZone(card.getId(), Constants.Zone.PICK); + game.setZone(card.getId(), Zone.PICK); } } player.lookAtCards("Lone Revenant", cards, game); - TargetCard target = new TargetCard(Constants.Zone.PICK, new FilterCard("card to put into your hand")); - if (player.choose(Constants.Outcome.DrawCard, cards, target, game)) { + TargetCard target = new TargetCard(Zone.PICK, new FilterCard("card to put into your hand")); + if (player.choose(Outcome.DrawCard, cards, target, game)) { Card card = cards.get(target.getFirstTarget(), game); if (card != null) { cards.remove(card); - card.moveToZone(Constants.Zone.HAND, source.getId(), game, false); + card.moveToZone(Zone.HAND, source.getId(), game, false); } } - target = new TargetCard(Constants.Zone.PICK, new FilterCard("card to put on the bottom of your library")); + target = new TargetCard(Zone.PICK, new FilterCard("card to put on the bottom of your library")); target.setRequired(true); while (cards.size() > 1) { - player.choose(Constants.Outcome.Neutral, cards, target, game); + player.choose(Outcome.Neutral, cards, target, game); Card card = cards.get(target.getFirstTarget(), game); if (card != null) { cards.remove(card); - card.moveToZone(Constants.Zone.LIBRARY, source.getId(), game, false); + card.moveToZone(Zone.LIBRARY, source.getId(), game, false); } target.clearChosen(); } if (cards.size() == 1) { Card card = cards.get(cards.iterator().next(), game); - card.moveToZone(Constants.Zone.LIBRARY, source.getId(), game, false); + card.moveToZone(Zone.LIBRARY, source.getId(), game, false); } return true; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/LunarMystic.java b/Mage.Sets/src/mage/sets/avacynrestored/LunarMystic.java index b4524f74363..42631253d67 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/LunarMystic.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/LunarMystic.java @@ -27,8 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/MaalfeldTwins.java b/Mage.Sets/src/mage/sets/avacynrestored/MaalfeldTwins.java index 4466be50b45..cc54b4545bb 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/MaalfeldTwins.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/MaalfeldTwins.java @@ -28,8 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/MadProphet.java b/Mage.Sets/src/mage/sets/avacynrestored/MadProphet.java index 54df155fd9e..37182216ebd 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/MadProphet.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/MadProphet.java @@ -29,9 +29,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCardInHand; /** @@ -60,7 +60,7 @@ public class MadProphet extends CardImpl { this.addAbility(HasteAbility.getInstance()); // {tap}, Discard a card: Draw a card. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new TapSourceCost()); ability.addCost(new DiscardTargetCost(new TargetCardInHand())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/MaliciousIntent.java b/Mage.Sets/src/mage/sets/avacynrestored/MaliciousIntent.java index 01d8a5165c1..cd68aef45a7 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/MaliciousIntent.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/MaliciousIntent.java @@ -27,9 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -61,14 +59,14 @@ public class MaliciousIntent extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature has "{tap}: Target creature can't block this turn." - Ability gainedAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CantBlockTargetEffect(Constants.Duration.EndOfTurn), new TapSourceCost()); + Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBlockTargetEffect(Duration.EndOfTurn), new TapSourceCost()); gainedAbility.addTarget(new TargetCreaturePermanent()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); } public MaliciousIntent(final MaliciousIntent card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Malignus.java b/Mage.Sets/src/mage/sets/avacynrestored/Malignus.java index 86a77bd7b4f..58c5870d6fa 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Malignus.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Malignus.java @@ -27,9 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -60,10 +58,10 @@ public class Malignus extends CardImpl { this.toughness = new MageInt(0); // Malignus's power and toughness are each equal to half the highest life total among your opponents, rounded up. - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new HighestLifeTotalAmongOpponentsCount(), Constants.Duration.EndOfGame))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new HighestLifeTotalAmongOpponentsCount(), Duration.EndOfGame))); // Damage that would be dealt by Malignus can't be prevented. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new MalignusEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MalignusEffect())); } public Malignus(final Malignus card) { @@ -116,7 +114,7 @@ class HighestLifeTotalAmongOpponentsCount implements DynamicValue { class MalignusEffect extends ReplacementEffectImpl { public MalignusEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "Damage that would be dealt by {this} can't be prevented"; } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/MarrowBats.java b/Mage.Sets/src/mage/sets/avacynrestored/MarrowBats.java index 890eaaefa7e..752d25b826d 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/MarrowBats.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/MarrowBats.java @@ -29,15 +29,15 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -57,7 +57,7 @@ public class MarrowBats extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Pay 4 life: Regenerate Marrow Bats. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new PayLifeCost(4))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new PayLifeCost(4))); } public MarrowBats(final MarrowBats card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/MassAppeal.java b/Mage.Sets/src/mage/sets/avacynrestored/MassAppeal.java index e3a5721c387..aa48be75030 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/MassAppeal.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/MassAppeal.java @@ -27,8 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/MentalAgony.java b/Mage.Sets/src/mage/sets/avacynrestored/MentalAgony.java index 07028d1244a..6f076ca6896 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/MentalAgony.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/MentalAgony.java @@ -28,8 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DiscardTargetEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/MidnightDuelist.java b/Mage.Sets/src/mage/sets/avacynrestored/MidnightDuelist.java index d4abdaf93c0..90c8b464a3c 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/MidnightDuelist.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/MidnightDuelist.java @@ -27,8 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/MidvastProtector.java b/Mage.Sets/src/mage/sets/avacynrestored/MidvastProtector.java index ce2ef5e229e..ca49e819ddb 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/MidvastProtector.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/MidvastProtector.java @@ -28,14 +28,15 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continious.GainProtectionFromColorTargetEffect; import mage.cards.CardImpl; import mage.choices.ChoiceColor; +import mage.constants.Duration; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -55,7 +56,7 @@ public class MidvastProtector extends CardImpl { this.toughness = new MageInt(3); // When Midvast Protector enters the battlefield, target creature you control gains protection from the color of your choice until end of turn. - EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new GainProtectionFromColorTargetEffect(Constants.Duration.EndOfTurn), false); + EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new GainProtectionFromColorTargetEffect(Duration.EndOfTurn), false); ability.addTarget(new TargetControlledCreaturePermanent()); ability.addChoice(new ChoiceColor()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/MistRaven.java b/Mage.Sets/src/mage/sets/avacynrestored/MistRaven.java index 31fcb46154e..cbfd2fcbfb6 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/MistRaven.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/MistRaven.java @@ -27,8 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/MisthollowGriffin.java b/Mage.Sets/src/mage/sets/avacynrestored/MisthollowGriffin.java index 12ce1396c2d..6a587b00609 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/MisthollowGriffin.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/MisthollowGriffin.java @@ -28,9 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -58,7 +57,7 @@ public class MisthollowGriffin extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // You may cast Misthollow Griffin from exile. - this.addAbility(new SimpleStaticAbility(Constants.Zone.EXILED, new MisthollowGriffinPlayEffect())); + this.addAbility(new SimpleStaticAbility(Zone.EXILED, new MisthollowGriffinPlayEffect())); } public MisthollowGriffin(final MisthollowGriffin card) { @@ -74,7 +73,7 @@ public class MisthollowGriffin extends CardImpl { class MisthollowGriffinPlayEffect extends AsThoughEffectImpl { public MisthollowGriffinPlayEffect() { - super(Constants.AsThoughEffectType.CAST, Constants.Duration.EndOfGame, Constants.Outcome.Benefit); + super(AsThoughEffectType.CAST, Duration.EndOfGame, Outcome.Benefit); staticText = "You may cast Misthollow Griffin from exile"; } @@ -96,7 +95,7 @@ class MisthollowGriffinPlayEffect extends AsThoughEffectImpl { this.subtype.add("Equipment"); // Equipped creature has first strike. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); // Whenever equipped creature attacks, put a 4/4 white Angel creature token with flying onto the battlefield. this.addAbility(new AttacksEquippedTriggeredAbility(new CreateTokenEffect(new AngelToken()))); // Equip {4} - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(4))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(4))); } public MoonsilverSpear(final MoonsilverSpear card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/MoorlandInquisitor.java b/Mage.Sets/src/mage/sets/avacynrestored/MoorlandInquisitor.java index 46353a076a3..6fa9ddde172 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/MoorlandInquisitor.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/MoorlandInquisitor.java @@ -29,15 +29,16 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -56,7 +57,7 @@ public class MoorlandInquisitor extends CardImpl { this.toughness = new MageInt(2); // {2}{W}: Moorland Inquisitor gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Constants.Duration.EndOfTurn), + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{2}{W}"))); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/NarstadScrapper.java b/Mage.Sets/src/mage/sets/avacynrestored/NarstadScrapper.java index ffc9fdd7218..b4234cc5cbf 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/NarstadScrapper.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/NarstadScrapper.java @@ -27,14 +27,15 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import java.util.UUID; @@ -53,7 +54,7 @@ public class NarstadScrapper extends CardImpl { this.toughness = new MageInt(3); // {2}: Narstad Scrapper gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Constants.Duration.EndOfTurn), new GenericManaCost(2))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(2))); } public NarstadScrapper(final NarstadScrapper card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/NaturalEnd.java b/Mage.Sets/src/mage/sets/avacynrestored/NaturalEnd.java index 102d25f5912..b962e79a575 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/NaturalEnd.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/NaturalEnd.java @@ -28,8 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/NearheathPilgrim.java b/Mage.Sets/src/mage/sets/avacynrestored/NearheathPilgrim.java index acd2a2d78f2..b850eecb860 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/NearheathPilgrim.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/NearheathPilgrim.java @@ -27,15 +27,15 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityPairedEffect; import mage.abilities.keyword.LifelinkAbility; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import java.util.UUID; @@ -60,7 +60,7 @@ public class NearheathPilgrim extends CardImpl { this.addAbility(SoulbondAbility.getInstance()); // As long as Nearheath Pilgrim is paired with another creature, both creatures have lifelink. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityPairedEffect(LifelinkAbility.getInstance(), ruleText))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(LifelinkAbility.getInstance(), ruleText))); } public NearheathPilgrim(final NearheathPilgrim card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Necrobite.java b/Mage.Sets/src/mage/sets/avacynrestored/Necrobite.java index 401ee51ee11..1f98706523c 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Necrobite.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Necrobite.java @@ -27,13 +27,13 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.RegenerateTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -52,7 +52,7 @@ public class Necrobite extends CardImpl { this.color.setBlack(true); // Target creature gains deathtouch until end of turn. Regenerate it. - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addEffect(new RegenerateTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/NephaliaSmuggler.java b/Mage.Sets/src/mage/sets/avacynrestored/NephaliaSmuggler.java index 7af7ef180f6..504545a0a29 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/NephaliaSmuggler.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/NephaliaSmuggler.java @@ -27,9 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +37,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ExileTargetForSourceEffect; import mage.abilities.effects.common.ReturnToBattlefieldUnderYourControlTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; import java.util.UUID; @@ -58,7 +58,7 @@ public class NephaliaSmuggler extends CardImpl { this.toughness = new MageInt(1); // {3}{U}, {tap}: Exile another target creature you control, then return that card to the battlefield under your control. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ExileTargetForSourceEffect("Exile Nephalia Smuggler"), new ManaCostsImpl("{3}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect("Exile Nephalia Smuggler"), new ManaCostsImpl("{3}{U}")); ability.addCost(new TapSourceCost()); ability.addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect()); ability.addTarget(new TargetControlledCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/NettleSwine.java b/Mage.Sets/src/mage/sets/avacynrestored/NettleSwine.java index 0dfa0bcc8c9..e5eb2411ae4 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/NettleSwine.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/NettleSwine.java @@ -28,8 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/NightshadePeddler.java b/Mage.Sets/src/mage/sets/avacynrestored/NightshadePeddler.java index 8bf2e9dcfd6..e7c5f2242ac 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/NightshadePeddler.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/NightshadePeddler.java @@ -27,15 +27,15 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityPairedEffect; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import java.util.UUID; @@ -60,7 +60,7 @@ public class NightshadePeddler extends CardImpl { this.addAbility(SoulbondAbility.getInstance()); // As long as Nightshade Peddler is paired with another creature, both creatures have deathtouch. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityPairedEffect(DeathtouchAbility.getInstance(), ruleText))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(DeathtouchAbility.getInstance(), ruleText))); } public NightshadePeddler(final NightshadePeddler card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/OtherworldAtlas.java b/Mage.Sets/src/mage/sets/avacynrestored/OtherworldAtlas.java index 2993e6ef707..0ac0c4afed8 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/OtherworldAtlas.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/OtherworldAtlas.java @@ -27,15 +27,16 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -53,10 +54,10 @@ public class OtherworldAtlas extends CardImpl { this.expansionSetCode = "AVR"; // {tap}: Put a charge counter on Otherworld Atlas. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost())); // {tap}: Each player draws a card for each charge counter on Otherworld Atlas. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new OtherworldAtlasDrawEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new OtherworldAtlasDrawEffect(), new TapSourceCost())); } public OtherworldAtlas(final OtherworldAtlas card) { @@ -72,7 +73,7 @@ public class OtherworldAtlas extends CardImpl { class OtherworldAtlasDrawEffect extends OneShotEffect { public OtherworldAtlasDrawEffect() { - super(Constants.Outcome.DrawCard); + super(Outcome.DrawCard); staticText = "Each player draws a card for each charge counter on {this}"; } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Outwit.java b/Mage.Sets/src/mage/sets/avacynrestored/Outwit.java index d5b830ffa7c..293fb13cebb 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Outwit.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Outwit.java @@ -30,11 +30,12 @@ package mage.sets.avacynrestored; import java.util.HashSet; import java.util.Set; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.stack.StackObject; import mage.abilities.effects.common.CounterTargetEffect; @@ -94,7 +95,7 @@ public class Outwit extends CardImpl { public CustomTargetSpell(int minNumTargets, int maxNumTargets, FilterSpell filter) { this.minNumberOfTargets = minNumTargets; this.maxNumberOfTargets = maxNumTargets; - this.zone = Constants.Zone.STACK; + this.zone = Zone.STACK; this.filter = filter; this.targetName = filter.getMessage(); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/PathbreakerWurm.java b/Mage.Sets/src/mage/sets/avacynrestored/PathbreakerWurm.java index 7f4aae6a2ee..0c440183c6d 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/PathbreakerWurm.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/PathbreakerWurm.java @@ -27,15 +27,15 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityPairedEffect; import mage.abilities.keyword.SoulbondAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import java.util.UUID; @@ -59,7 +59,7 @@ public class PathbreakerWurm extends CardImpl { this.addAbility(SoulbondAbility.getInstance()); // As long as Pathbreaker Wurm is paired with another creature, both creatures have trample. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityPairedEffect(TrampleAbility.getInstance(), ruleText))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(TrampleAbility.getInstance(), ruleText))); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/PeelFromReality.java b/Mage.Sets/src/mage/sets/avacynrestored/PeelFromReality.java index 24ae4c1fb04..e943664c699 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/PeelFromReality.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/PeelFromReality.java @@ -28,11 +28,11 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/PillarOfFlame.java b/Mage.Sets/src/mage/sets/avacynrestored/PillarOfFlame.java index 59ef9314625..d0a9b5d7942 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/PillarOfFlame.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/PillarOfFlame.java @@ -28,10 +28,10 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.DamageTargetEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/PollutedDead.java b/Mage.Sets/src/mage/sets/avacynrestored/PollutedDead.java index 03466decd49..12f00a35f9f 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/PollutedDead.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/PollutedDead.java @@ -27,8 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/PredatorsGambit.java b/Mage.Sets/src/mage/sets/avacynrestored/PredatorsGambit.java index ff8d75ca3ba..654b4d79b29 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/PredatorsGambit.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/PredatorsGambit.java @@ -27,9 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.OneControlledCreatureCondition; @@ -63,18 +61,18 @@ public class PredatorsGambit extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature gets +2/+1. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 1, Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 1, Duration.WhileOnBattlefield))); // Enchanted creature has intimidate as long as its controller controls no other creatures. - ContinuousEffect effect = new GainAbilityAttachedEffect(IntimidateAbility.getInstance(), Constants.AttachmentType.AURA); + ContinuousEffect effect = new GainAbilityAttachedEffect(IntimidateAbility.getInstance(), AttachmentType.AURA); ConditionalContinousEffect intimidate = new ConditionalContinousEffect(effect, new OneControlledCreatureCondition(), rule); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, intimidate)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, intimidate)); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/PrimalSurge.java b/Mage.Sets/src/mage/sets/avacynrestored/PrimalSurge.java index c58d9cca885..8c751e00bd3 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/PrimalSurge.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/PrimalSurge.java @@ -29,10 +29,10 @@ package mage.sets.avacynrestored; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/RagingPoltergeist.java b/Mage.Sets/src/mage/sets/avacynrestored/RagingPoltergeist.java index 3fc301c1c84..4c87411cbc2 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/RagingPoltergeist.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/RagingPoltergeist.java @@ -28,8 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/RainOfThorns.java b/Mage.Sets/src/mage/sets/avacynrestored/RainOfThorns.java index 53a17463dc1..8e8a0c69f37 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/RainOfThorns.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/RainOfThorns.java @@ -27,8 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Mode; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/ReforgeTheSoul.java b/Mage.Sets/src/mage/sets/avacynrestored/ReforgeTheSoul.java index b8d7086e512..ccae10e3097 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/ReforgeTheSoul.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/ReforgeTheSoul.java @@ -28,9 +28,9 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/RenegadeDemon.java b/Mage.Sets/src/mage/sets/avacynrestored/RenegadeDemon.java index 37d6babec18..2b202f5ba13 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/RenegadeDemon.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/RenegadeDemon.java @@ -28,8 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/RestorationAngel.java b/Mage.Sets/src/mage/sets/avacynrestored/RestorationAngel.java index 6636f7c24a0..a67d6b01011 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/RestorationAngel.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/RestorationAngel.java @@ -28,10 +28,10 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -40,6 +40,7 @@ import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -91,7 +92,7 @@ public class RestorationAngel extends CardImpl { class RestorationAngelEffect extends OneShotEffect { public RestorationAngelEffect() { - super(Constants.Outcome.Exile); + super(Outcome.Exile); staticText = "you may exile target non-Angel creature you control, then return that card to the battlefield under your control"; } @@ -116,7 +117,7 @@ class RestorationAngelEffect extends OneShotEffect { permanent.moveToExile(source.getSourceId(), sourcePermanent.getName(), source.getSourceId(), game); Card card = game.getCard(targetPointer.getFirst(game, source)); if (card != null) { - Constants.Zone currentZone = game.getState().getZone(card.getId()); + Zone currentZone = game.getState().getZone(card.getId()); return card.putOntoBattlefield(game, currentZone, source.getSourceId(), source.getControllerId()); } } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/RevengeOfTheHunted.java b/Mage.Sets/src/mage/sets/avacynrestored/RevengeOfTheHunted.java index 11b7d736b85..d3a25e4b53f 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/RevengeOfTheHunted.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/RevengeOfTheHunted.java @@ -28,9 +28,9 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.RequirementEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/RidersOfGavony.java b/Mage.Sets/src/mage/sets/avacynrestored/RidersOfGavony.java index 9f3b452a7bc..02c00d7e67e 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/RidersOfGavony.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/RidersOfGavony.java @@ -27,9 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; @@ -72,7 +70,7 @@ public class RidersOfGavony extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new RidersOfGavonyEffect())); // Human creatures you control have protection from creatures of the chosen type. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new RidersOfGavonyGainAbilityControlledEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new RidersOfGavonyGainAbilityControlledEffect())); } public RidersOfGavony(final RidersOfGavony card) { @@ -88,7 +86,7 @@ public class RidersOfGavony extends CardImpl { class RidersOfGavonyEffect extends OneShotEffect { public RidersOfGavonyEffect() { - super(Constants.Outcome.BoostCreature); + super(Outcome.BoostCreature); staticText = "choose a creature type"; } @@ -104,7 +102,7 @@ class RidersOfGavonyEffect extends OneShotEffect { Choice typeChoice = new ChoiceImpl(true); typeChoice.setMessage("Choose creature type"); typeChoice.setChoices(CardRepository.instance.getCreatureTypes()); - while (!player.choose(Constants.Outcome.BoostCreature, typeChoice, game)) { + while (!player.choose(Outcome.BoostCreature, typeChoice, game)) { game.debugMessage("player canceled choosing type. retrying."); } game.informPlayers(permanent.getName() + ": " + player.getName() + " has chosen " + typeChoice.getChoice()); @@ -131,7 +129,7 @@ class RidersOfGavonyGainAbilityControlledEffect extends ContinuousEffectImpl { this.toughness = new MageInt(1); // {2}{R}: Scalding Devil deals 1 damage to target player. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{2}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{2}{R}")); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/ScrapskinDrake.java b/Mage.Sets/src/mage/sets/avacynrestored/ScrapskinDrake.java index 5af31267adb..3cd50d0ef95 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/ScrapskinDrake.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/ScrapskinDrake.java @@ -27,14 +27,14 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.CanBlockOnlyFlyingEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import java.util.UUID; @@ -58,7 +58,7 @@ public class ScrapskinDrake extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Scrapskin Drake can block only creatures with flying. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new CanBlockOnlyFlyingEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockOnlyFlyingEffect())); } public ScrapskinDrake(final ScrapskinDrake card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/ScrollOfAvacyn.java b/Mage.Sets/src/mage/sets/avacynrestored/ScrollOfAvacyn.java index a34aa00f905..762618ab145 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/ScrollOfAvacyn.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/ScrollOfAvacyn.java @@ -29,9 +29,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.ControlsPermanentCondition; @@ -41,6 +40,7 @@ import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -60,7 +60,7 @@ public class ScrollOfAvacyn extends CardImpl { this.expansionSetCode = "AVR"; // {1}, Sacrifice Scroll of Avacyn: Draw a card. If you control an Angel, you gain 5 life. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); ability.addEffect(new ConditionalOneShotEffect(new GainLifeEffect(5), new ControlsPermanentCondition(filter), "If you control an Angel, you gain 5 life")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/ScrollOfGriselbrand.java b/Mage.Sets/src/mage/sets/avacynrestored/ScrollOfGriselbrand.java index a1833aaad84..bffcdba4f22 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/ScrollOfGriselbrand.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/ScrollOfGriselbrand.java @@ -29,9 +29,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.ControlsPermanentCondition; @@ -41,6 +40,7 @@ import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DiscardTargetEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetOpponent; @@ -61,7 +61,7 @@ public class ScrollOfGriselbrand extends CardImpl { this.expansionSetCode = "AVR"; // {1}, Sacrifice Scroll of Griselbrand: Target opponent discards a card. If you control a Demon, that player loses 3 life. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DiscardTargetEffect(1), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); ability.addEffect(new ConditionalOneShotEffect(new LoseLifeTargetEffect(3), new ControlsPermanentCondition(filter), "If you control a Demon, that player loses 3 life")); ability.addTarget(new TargetOpponent()); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/SearchlightGeist.java b/Mage.Sets/src/mage/sets/avacynrestored/SearchlightGeist.java index cdc41534be0..cff045e6a92 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/SearchlightGeist.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/SearchlightGeist.java @@ -27,9 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,6 +36,7 @@ import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import java.util.UUID; @@ -57,7 +57,7 @@ public class SearchlightGeist extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {3}{B}: Searchlight Geist gains deathtouch until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(DeathtouchAbility.getInstance()), new ManaCostsImpl("{3}{B}"))); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/SecondGuess.java b/Mage.Sets/src/mage/sets/avacynrestored/SecondGuess.java index 9b96b458e31..91ea5ebcc87 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/SecondGuess.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/SecondGuess.java @@ -27,8 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/SeraphOfDawn.java b/Mage.Sets/src/mage/sets/avacynrestored/SeraphOfDawn.java index 33adaefc25b..2946e6d6aa5 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/SeraphOfDawn.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/SeraphOfDawn.java @@ -28,8 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.LifelinkAbility; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/SeraphSanctuary.java b/Mage.Sets/src/mage/sets/avacynrestored/SeraphSanctuary.java index 0d3d6acb48e..309470c346e 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/SeraphSanctuary.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/SeraphSanctuary.java @@ -28,8 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/ShelteringWord.java b/Mage.Sets/src/mage/sets/avacynrestored/ShelteringWord.java index 5fa090d5ce0..bea47f3d130 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/ShelteringWord.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/ShelteringWord.java @@ -28,10 +28,10 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/SigardaHostOfHerons.java b/Mage.Sets/src/mage/sets/avacynrestored/SigardaHostOfHerons.java index edae96f8b43..0cca02461ed 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/SigardaHostOfHerons.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/SigardaHostOfHerons.java @@ -28,9 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -65,7 +64,7 @@ public class SigardaHostOfHerons extends CardImpl { this.addAbility(HexproofAbility.getInstance()); // Spells and abilities your opponents control can't cause you to sacrifice permanents. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new SigardaHostOfHeronsEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SigardaHostOfHeronsEffect())); } public SigardaHostOfHerons(final SigardaHostOfHerons card) { @@ -81,7 +80,7 @@ public class SigardaHostOfHerons extends CardImpl { class SigardaHostOfHeronsEffect extends ReplacementEffectImpl { public SigardaHostOfHeronsEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "Spells and abilities your opponents control can't cause you to sacrifice permanents"; } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/SilverbladePaladin.java b/Mage.Sets/src/mage/sets/avacynrestored/SilverbladePaladin.java index 43ca67e2ffa..82b62bc5ab0 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/SilverbladePaladin.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/SilverbladePaladin.java @@ -27,15 +27,15 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityPairedEffect; import mage.abilities.keyword.DoubleStrikeAbility; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import java.util.UUID; @@ -60,7 +60,7 @@ public class SilverbladePaladin extends CardImpl { this.addAbility(SoulbondAbility.getInstance()); // As long as Silverblade Paladin is paired with another creature, both creatures have double strike. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityPairedEffect(DoubleStrikeAbility.getInstance(), ruleText))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(DoubleStrikeAbility.getInstance(), ruleText))); } public SilverbladePaladin(final SilverbladePaladin card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/SlayersStronghold.java b/Mage.Sets/src/mage/sets/avacynrestored/SlayersStronghold.java index 927327fdd08..3196bb2bd0c 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/SlayersStronghold.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/SlayersStronghold.java @@ -29,9 +29,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -42,6 +41,8 @@ import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.VigilanceAbility; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -57,9 +58,9 @@ public class SlayersStronghold extends CardImpl { // {tap}: Add {1} to your mana pool. this.addAbility(new ColorlessManaAbility()); // {R}{W}, {tap}: Target creature gets +2/+0 and gains vigilance and haste until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Constants.Duration.EndOfTurn), new ManaCostsImpl("{R}{W}")); - ability.addEffect(new GainAbilityTargetEffect(VigilanceAbility.getInstance(), Constants.Duration.EndOfTurn)); - ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Constants.Duration.EndOfTurn)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}{W}")); + ability.addEffect(new GainAbilityTargetEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn)); + ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/SnareTheSkies.java b/Mage.Sets/src/mage/sets/avacynrestored/SnareTheSkies.java index b9cb1dae810..803d292d949 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/SnareTheSkies.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/SnareTheSkies.java @@ -29,13 +29,13 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -51,8 +51,8 @@ public class SnareTheSkies extends CardImpl { this.color.setGreen(true); // Target creature gets +1/+1 and gains reach until end of turn. - this.getSpellAbility().addEffect(new BoostTargetEffect(1, 1, Constants.Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(ReachAbility.getInstance(), Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(1, 1, Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(ReachAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/SomberwaldSage.java b/Mage.Sets/src/mage/sets/avacynrestored/SomberwaldSage.java index 3481b8dd8fc..f8fe58a6386 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/SomberwaldSage.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/SomberwaldSage.java @@ -29,8 +29,8 @@ package mage.sets.avacynrestored; import java.util.UUID; import mage.ConditionalMana; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.mana.ConditionalAnyColorManaAbility; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/SomberwaldVigilante.java b/Mage.Sets/src/mage/sets/avacynrestored/SomberwaldVigilante.java index 0edc5385837..7dda1b211bb 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/SomberwaldVigilante.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/SomberwaldVigilante.java @@ -28,8 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BecomesBlockedByCreatureTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/SoulOfTheHarvest.java b/Mage.Sets/src/mage/sets/avacynrestored/SoulOfTheHarvest.java index 62e30b378c0..3611bba859c 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/SoulOfTheHarvest.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/SoulOfTheHarvest.java @@ -28,9 +28,9 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/SoulcageFiend.java b/Mage.Sets/src/mage/sets/avacynrestored/SoulcageFiend.java index f165ebfa015..08ee67898e8 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/SoulcageFiend.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/SoulcageFiend.java @@ -27,8 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.LoseLifePlayersEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/SpectralGateguards.java b/Mage.Sets/src/mage/sets/avacynrestored/SpectralGateguards.java index 0823963f9e1..ed8b3f2c749 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/SpectralGateguards.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/SpectralGateguards.java @@ -27,15 +27,15 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityPairedEffect; import mage.abilities.keyword.SoulbondAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import java.util.UUID; @@ -60,7 +60,7 @@ public class SpectralGateguards extends CardImpl { this.addAbility(SoulbondAbility.getInstance()); // As long as Spectral Gateguards is paired with another creature, both creatures have vigilance. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityPairedEffect(VigilanceAbility.getInstance(), ruleText))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(VigilanceAbility.getInstance(), ruleText))); } public SpectralGateguards(final SpectralGateguards card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/SpectralPrison.java b/Mage.Sets/src/mage/sets/avacynrestored/SpectralPrison.java index 9e126850fd1..b7cffdd3dc7 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/SpectralPrison.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/SpectralPrison.java @@ -27,9 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; @@ -38,6 +37,8 @@ import mage.abilities.effects.common.DestroySourceEffect; import mage.abilities.effects.common.SkipEnchantedUntapEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -62,12 +63,12 @@ public class SpectralPrison extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Detriment)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); // Enchanted creature doesn't untap during its controller's untap step. Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new SkipEnchantedUntapEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipEnchantedUntapEffect())); // When enchanted creature becomes the target of a spell, sacrifice Spectral Prison. this.addAbility(new SpectralPrisonAbility()); @@ -86,7 +87,7 @@ public class SpectralPrison extends CardImpl { class SpectralPrisonAbility extends TriggeredAbilityImpl { public SpectralPrisonAbility() { - super(Constants.Zone.BATTLEFIELD, new DestroySourceEffect()); + super(Zone.BATTLEFIELD, new DestroySourceEffect()); } public SpectralPrisonAbility(final SpectralPrisonAbility ability) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/SpiritAway.java b/Mage.Sets/src/mage/sets/avacynrestored/SpiritAway.java index 09f2a69d73d..2fdde31f44e 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/SpiritAway.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/SpiritAway.java @@ -27,9 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -61,16 +59,16 @@ public class SpiritAway extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Detriment)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); // You control enchanted creature. Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); // Enchanted creature gets +2/+2 and has flying. - SimpleStaticAbility ability2 = new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Constants.Duration.WhileOnBattlefield)); - ability2.addEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), Constants.AttachmentType.AURA)); + SimpleStaticAbility ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + ability2.addEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA)); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/SternMentor.java b/Mage.Sets/src/mage/sets/avacynrestored/SternMentor.java index 5fcc6644176..7d73be241cb 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/SternMentor.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/SternMentor.java @@ -27,9 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.abilities.effects.common.continious.GainAbilityPairedEffect; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetPlayer; import java.util.UUID; @@ -64,9 +64,9 @@ public class SternMentor extends CardImpl { this.addAbility(SoulbondAbility.getInstance()); // As long as Stern Mentor is paired with another creature, each of those creatures has "{tap}: Target player puts the top two cards of his or her library into his or her graveyard." - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(2), new TapSourceCost()); ability.addTarget(new TargetPlayer()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityPairedEffect(ability, ruleText))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(ability, ruleText))); } public SternMentor(final SternMentor card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/StolenGoods.java b/Mage.Sets/src/mage/sets/avacynrestored/StolenGoods.java index 203466892ec..533d8d9f21f 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/StolenGoods.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/StolenGoods.java @@ -27,9 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.effects.AsThoughEffectImpl; import mage.abilities.effects.OneShotEffect; @@ -73,7 +71,7 @@ public class StolenGoods extends CardImpl { class StolenGoodsEffect extends OneShotEffect { public StolenGoodsEffect() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); this.staticText = "Target opponent exiles cards from the top of his or her library until he or she exiles a nonland card. Until end of turn, you may cast that card without paying its mana cost"; } @@ -114,7 +112,7 @@ class StolenGoodsCastFromExileEffect extends AsThoughEffectImpl { this.addAbility(SoulbondAbility.getInstance()); // As long as Stonewright is paired with another creature, each of those creatures has "{R}: This creature gets +1/+0 until end of turn." - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Constants.Duration.EndOfTurn), new ManaCostsImpl("{R}")); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityPairedEffect(ability, ruleText))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}")); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(ability, ruleText))); } public Stonewright(final Stonewright card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/TamiyoTheMoonSage.java b/Mage.Sets/src/mage/sets/avacynrestored/TamiyoTheMoonSage.java index 9ccc1cfa6d9..6a4ac015c3c 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/TamiyoTheMoonSage.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/TamiyoTheMoonSage.java @@ -28,11 +28,11 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/TandemLookout.java b/Mage.Sets/src/mage/sets/avacynrestored/TandemLookout.java index 111a4d1fc87..68454aceb45 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/TandemLookout.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/TandemLookout.java @@ -27,9 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -38,6 +37,7 @@ import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.continious.GainAbilityPairedEffect; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import java.util.UUID; @@ -63,7 +63,7 @@ public class TandemLookout extends CardImpl { // As long as Tandem Lookout is paired with another creature, each of those creatures has "Whenever this creature deals damage to an opponent, draw a card." Ability ability = new DealsDamageToOpponentTriggeredAbility(new DrawCardControllerEffect(1)); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityPairedEffect(ability, ruleText))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(ability, ruleText))); } public TandemLookout(final TandemLookout card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/TemporalMastery.java b/Mage.Sets/src/mage/sets/avacynrestored/TemporalMastery.java index dec1cba3a20..27a50a474dd 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/TemporalMastery.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/TemporalMastery.java @@ -27,8 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ExileSpellEffect; import mage.abilities.effects.common.turn.AddExtraTurnControllerEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Terminus.java b/Mage.Sets/src/mage/sets/avacynrestored/Terminus.java index 5a241cdd307..2646e0fd4bb 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Terminus.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Terminus.java @@ -29,10 +29,10 @@ package mage.sets.avacynrestored; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/TerrifyingPresence.java b/Mage.Sets/src/mage/sets/avacynrestored/TerrifyingPresence.java index af1b8ad3243..3da1428bdf5 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/TerrifyingPresence.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/TerrifyingPresence.java @@ -28,9 +28,9 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.PreventionEffectImpl; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/ThatcherRevolt.java b/Mage.Sets/src/mage/sets/avacynrestored/ThatcherRevolt.java index 55b190b1cb2..198be5bbe5c 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/ThatcherRevolt.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/ThatcherRevolt.java @@ -28,9 +28,9 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/ThrabenValiant.java b/Mage.Sets/src/mage/sets/avacynrestored/ThrabenValiant.java index f0fe2e31db7..1623cbab21a 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/ThrabenValiant.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/ThrabenValiant.java @@ -28,8 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Thunderbolt.java b/Mage.Sets/src/mage/sets/avacynrestored/Thunderbolt.java index 01f6e219e3a..1e2f0e230e1 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Thunderbolt.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Thunderbolt.java @@ -28,8 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Mode; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/ThunderousWrath.java b/Mage.Sets/src/mage/sets/avacynrestored/ThunderousWrath.java index 8677de1207f..3fe46f178af 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/ThunderousWrath.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/ThunderousWrath.java @@ -28,8 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.MiracleAbility; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/TibaltTheFiendBlooded.java b/Mage.Sets/src/mage/sets/avacynrestored/TibaltTheFiendBlooded.java index 72f510a546a..f238fd14098 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/TibaltTheFiendBlooded.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/TibaltTheFiendBlooded.java @@ -29,12 +29,12 @@ package mage.sets.avacynrestored; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.EntersBattlefieldAbility; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/TimberlandGuide.java b/Mage.Sets/src/mage/sets/avacynrestored/TimberlandGuide.java index cbc4614d815..81eaa94e70c 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/TimberlandGuide.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/TimberlandGuide.java @@ -28,8 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/TormentorsTrident.java b/Mage.Sets/src/mage/sets/avacynrestored/TormentorsTrident.java index 2e0e252dd63..f52ac8bc3a9 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/TormentorsTrident.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/TormentorsTrident.java @@ -27,9 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -53,11 +51,11 @@ public class TormentorsTrident extends CardImpl { this.subtype.add("Equipment"); // Equipped creature gets +3/+0 and attacks each turn if able. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(3, 0))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new AttacksEachTurnStaticAbility(), Constants.AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 0))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new AttacksEachTurnStaticAbility(), AttachmentType.EQUIPMENT))); // Equip {3} - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(3))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3))); } public TormentorsTrident(final TormentorsTrident card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/TreacherousPitDweller.java b/Mage.Sets/src/mage/sets/avacynrestored/TreacherousPitDweller.java index e6bd123a267..c2a33cfa16d 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/TreacherousPitDweller.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/TreacherousPitDweller.java @@ -27,9 +27,7 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ZoneChangeTriggeredAbility; @@ -78,8 +76,8 @@ class TreacherousPitDwellerTriggeredAbility extends ZoneChangeTriggeredAbility { public TreacherousPitDwellerEffect() { - super(Constants.Duration.Custom, Constants.Layer.ControlChangingEffects_2, Constants.SubLayer.NA, Constants.Outcome.GainControl); + super(Duration.Custom, Layer.ControlChangingEffects_2, SubLayer.NA, Outcome.GainControl); staticText = "Target opponent gains control of {this}"; } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/TriumphOfCruelty.java b/Mage.Sets/src/mage/sets/avacynrestored/TriumphOfCruelty.java index 9e8d798db55..45ba5f46164 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/TriumphOfCruelty.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/TriumphOfCruelty.java @@ -27,15 +27,15 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.condition.common.ControlsBiggestOrTiedCreatureCondition; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.DiscardTargetEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.target.Target; import mage.target.common.TargetOpponent; @@ -56,7 +56,7 @@ public class TriumphOfCruelty extends CardImpl { this.color.setBlack(true); // At the beginning of your upkeep, target opponent discards a card if you control the creature with the greatest power or tied for the greatest power. - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new DiscardTargetEffect(1), Constants.TargetController.YOU, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new DiscardTargetEffect(1), TargetController.YOU, false); Target target = new TargetOpponent(); target.setRequired(true); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/TriumphOfFerocity.java b/Mage.Sets/src/mage/sets/avacynrestored/TriumphOfFerocity.java index 8b463449edd..e4b3dee001f 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/TriumphOfFerocity.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/TriumphOfFerocity.java @@ -27,15 +27,15 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.condition.common.ControlsBiggestOrTiedCreatureCondition; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import java.util.UUID; @@ -53,7 +53,7 @@ public class TriumphOfFerocity extends CardImpl { this.color.setGreen(true); // At the beginning of your upkeep, draw a card if you control the creature with the greatest power or tied for the greatest power. - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new DrawCardControllerEffect(1), Constants.TargetController.YOU, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new DrawCardControllerEffect(1), TargetController.YOU, false); this.addAbility(new ConditionalTriggeredAbility(ability, ControlsBiggestOrTiedCreatureCondition.getInstance(), ruleText)); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/TrustedForcemage.java b/Mage.Sets/src/mage/sets/avacynrestored/TrustedForcemage.java index 2686698b7b8..12aaba24747 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/TrustedForcemage.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/TrustedForcemage.java @@ -27,14 +27,14 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostPairedEffect; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import java.util.UUID; @@ -59,7 +59,7 @@ public class TrustedForcemage extends CardImpl { this.addAbility(SoulbondAbility.getInstance()); // As long as Trusted Forcemage is paired with another creature, each of those creatures gets +1/+1. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostPairedEffect(1, 1, ruleText))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostPairedEffect(1, 1, ruleText))); } public TrustedForcemage(final TrustedForcemage card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/TyrantOfDiscord.java b/Mage.Sets/src/mage/sets/avacynrestored/TyrantOfDiscord.java index f16e820f23d..f695d099339 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/TyrantOfDiscord.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/TyrantOfDiscord.java @@ -27,14 +27,14 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -76,7 +76,7 @@ public class TyrantOfDiscord extends CardImpl { class TyrantOfDiscordEffect extends OneShotEffect { public TyrantOfDiscordEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); this.staticText = "target opponent chooses a permanent he or she controls at random and sacrifices it. If a nonland permanent is sacrificed this way, repeat this process"; } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/UlvenwaldTracker.java b/Mage.Sets/src/mage/sets/avacynrestored/UlvenwaldTracker.java index 7e04a9c95ea..b39dd6eb2ad 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/UlvenwaldTracker.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/UlvenwaldTracker.java @@ -28,9 +28,9 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/UncannySpeed.java b/Mage.Sets/src/mage/sets/avacynrestored/UncannySpeed.java index 8d80891893c..16f1d4f0cf6 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/UncannySpeed.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/UncannySpeed.java @@ -28,9 +28,9 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.HasteAbility; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/UndeadExecutioner.java b/Mage.Sets/src/mage/sets/avacynrestored/UndeadExecutioner.java index ec402ed77df..a9e938372d6 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/UndeadExecutioner.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/UndeadExecutioner.java @@ -27,14 +27,14 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -56,7 +56,7 @@ public class UndeadExecutioner extends CardImpl { this.toughness = new MageInt(2); // When Undead Executioner dies, you may have target creature get -2/-2 until end of turn. - Ability ability = new DiesTriggeredAbility(new BoostTargetEffect(-2, -2, Constants.Duration.EndOfTurn), true); + Ability ability = new DiesTriggeredAbility(new BoostTargetEffect(-2, -2, Duration.EndOfTurn), true); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/UnhallowedPact.java b/Mage.Sets/src/mage/sets/avacynrestored/UnhallowedPact.java index bef99954e28..67391319b72 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/UnhallowedPact.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/UnhallowedPact.java @@ -27,15 +27,15 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.ReturnToBattlefieldUnderYourControlAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -56,7 +56,7 @@ public class UnhallowedPact extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Detriment)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/VanguardsShield.java b/Mage.Sets/src/mage/sets/avacynrestored/VanguardsShield.java index d45c4594b41..3e3f0e67354 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/VanguardsShield.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/VanguardsShield.java @@ -28,14 +28,14 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -61,7 +61,7 @@ public class VanguardsShield extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(0, 3))); // Equipped creature can block an additional creature. (static abilit of equipment, no ability that will be gained to equiped creature!) - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new VanguardsShieldEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new VanguardsShieldEffect())); // Equip {3} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3))); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Vanishment.java b/Mage.Sets/src/mage/sets/avacynrestored/Vanishment.java index af3661282de..119d76ab97b 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Vanishment.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Vanishment.java @@ -27,8 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.abilities.keyword.MiracleAbility; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/VesselOfEndlessRest.java b/Mage.Sets/src/mage/sets/avacynrestored/VesselOfEndlessRest.java index 9fef1925640..0b5349aca21 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/VesselOfEndlessRest.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/VesselOfEndlessRest.java @@ -27,8 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.PutOnLibraryTargetEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/VexingDevil.java b/Mage.Sets/src/mage/sets/avacynrestored/VexingDevil.java index 6e687d8976b..229d92b06ee 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/VexingDevil.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/VexingDevil.java @@ -27,14 +27,14 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -75,7 +75,7 @@ public class VexingDevil extends CardImpl { class VexingDevilEffect extends OneShotEffect { public VexingDevilEffect() { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); staticText = "any opponent may have it deal 4 damage to him or her. If a player does, sacrifice Vexing Devil"; } @@ -94,7 +94,7 @@ class VexingDevilEffect extends OneShotEffect { Set opponents = game.getOpponents(source.getControllerId()); for (UUID opponentUuid : opponents) { Player opponent = game.getPlayer(opponentUuid); - if (opponent != null && opponent.chooseUse(Constants.Outcome.LoseLife, sb.toString(), game)) { + if (opponent != null && opponent.chooseUse(Outcome.LoseLife, sb.toString(), game)) { game.informPlayers(opponent.getName() + " has chosen to receive 4 damage from " + permanent.getName()); int dealt = opponent.damage(4, permanent.getId(), game, false, true); if (dealt == 4) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/VigilanteJustice.java b/Mage.Sets/src/mage/sets/avacynrestored/VigilanteJustice.java index 8b3e8f46ceb..9dea0850baa 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/VigilanteJustice.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/VigilanteJustice.java @@ -28,9 +28,9 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.CreatureEntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/VoiceOfTheProvinces.java b/Mage.Sets/src/mage/sets/avacynrestored/VoiceOfTheProvinces.java index 586eb4807c6..0a87b086899 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/VoiceOfTheProvinces.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/VoiceOfTheProvinces.java @@ -29,9 +29,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -73,7 +72,7 @@ public class VoiceOfTheProvinces extends CardImpl { class HumanToken extends Token { public HumanToken() { super("Human", "a 1/1 white Human creature token"); - cardType.add(Constants.CardType.CREATURE); + cardType.add(CardType.CREATURE); color = ObjectColor.WHITE; subtype.add("Human"); power = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Vorstclaw.java b/Mage.Sets/src/mage/sets/avacynrestored/Vorstclaw.java index 41a30763665..44a3c4a3f19 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Vorstclaw.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Vorstclaw.java @@ -28,8 +28,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/WanderingWolf.java b/Mage.Sets/src/mage/sets/avacynrestored/WanderingWolf.java index cb08e8f5998..7d30babc9fa 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/WanderingWolf.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/WanderingWolf.java @@ -28,9 +28,9 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.CantBeBlockedByCreaturesWithLessPowerEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/WildDefiance.java b/Mage.Sets/src/mage/sets/avacynrestored/WildDefiance.java index 3ed64be1e6b..feb1949ce72 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/WildDefiance.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/WildDefiance.java @@ -27,15 +27,16 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageObject; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -56,7 +57,7 @@ public class WildDefiance extends CardImpl { this.color.setGreen(true); // Whenever a creature you control becomes the target of an instant or sorcery spell, that creature gets +3/+3 until end of turn. - this.addAbility(new CreaturesYouControlBecomesTargetTriggeredAbility(new BoostTargetEffect(3, 3, Constants.Duration.EndOfTurn))); + this.addAbility(new CreaturesYouControlBecomesTargetTriggeredAbility(new BoostTargetEffect(3, 3, Duration.EndOfTurn))); } public WildDefiance(final WildDefiance card) { @@ -72,7 +73,7 @@ public class WildDefiance extends CardImpl { class CreaturesYouControlBecomesTargetTriggeredAbility extends TriggeredAbilityImpl { public CreaturesYouControlBecomesTargetTriggeredAbility(Effect effect) { - super(Constants.Zone.BATTLEFIELD, effect); + super(Zone.BATTLEFIELD, effect); } public CreaturesYouControlBecomesTargetTriggeredAbility(final CreaturesYouControlBecomesTargetTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/WildwoodGeist.java b/Mage.Sets/src/mage/sets/avacynrestored/WildwoodGeist.java index 6c7748ebc02..bc55001b45a 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/WildwoodGeist.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/WildwoodGeist.java @@ -28,10 +28,10 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MyTurnCondition; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Wingcrafter.java b/Mage.Sets/src/mage/sets/avacynrestored/Wingcrafter.java index 3ee5c68fcc4..28dea8dcc4b 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Wingcrafter.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Wingcrafter.java @@ -27,15 +27,15 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityPairedEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import java.util.UUID; @@ -62,7 +62,7 @@ public class Wingcrafter extends CardImpl { this.addAbility(SoulbondAbility.getInstance()); // As long as Wingcrafter is paired with another creature, both creatures have flying. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityPairedEffect(FlyingAbility.getInstance(), ruleText))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(FlyingAbility.getInstance(), ruleText))); } public Wingcrafter(final Wingcrafter card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/WolfirAvenger.java b/Mage.Sets/src/mage/sets/avacynrestored/WolfirAvenger.java index 239cdb651e5..b2324e7070e 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/WolfirAvenger.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/WolfirAvenger.java @@ -29,15 +29,15 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -57,7 +57,7 @@ public class WolfirAvenger extends CardImpl { this.addAbility(FlashAbility.getInstance()); // {1}{G}: Regenerate Wolfir Avenger. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{G}"))); } public WolfirAvenger(final WolfirAvenger card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/WolfirSilverheart.java b/Mage.Sets/src/mage/sets/avacynrestored/WolfirSilverheart.java index 612811ef1c8..9fc3b8036e4 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/WolfirSilverheart.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/WolfirSilverheart.java @@ -27,14 +27,14 @@ */ package mage.sets.avacynrestored; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostPairedEffect; import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import java.util.UUID; @@ -59,7 +59,7 @@ public class WolfirSilverheart extends CardImpl { this.addAbility(SoulbondAbility.getInstance()); // As long as Wolfir Silverheart is paired with another creature, each of those creatures gets +4/+4. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostPairedEffect(4, 4, ruleText))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostPairedEffect(4, 4, ruleText))); } public WolfirSilverheart(final WolfirSilverheart card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/YewSpirit.java b/Mage.Sets/src/mage/sets/avacynrestored/YewSpirit.java index 45e58818f9d..90ead923a30 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/YewSpirit.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/YewSpirit.java @@ -28,10 +28,10 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/ZealousConscripts.java b/Mage.Sets/src/mage/sets/avacynrestored/ZealousConscripts.java index 59290136f4b..3d8b0b585ba 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/ZealousConscripts.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/ZealousConscripts.java @@ -29,9 +29,8 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -40,6 +39,7 @@ import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.effects.common.continious.GainControlTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.TargetPermanent; /** @@ -60,10 +60,10 @@ public class ZealousConscripts extends CardImpl { this.addAbility(HasteAbility.getInstance()); // When Zealous Conscripts enters the battlefield, gain control of target permanent until end of turn. Untap that permanent. It gains haste until end of turn. - Ability ability = new EntersBattlefieldTriggeredAbility(new GainControlTargetEffect(Constants.Duration.EndOfTurn)); + Ability ability = new EntersBattlefieldTriggeredAbility(new GainControlTargetEffect(Duration.EndOfTurn)); ability.addTarget(new TargetPermanent()); ability.addEffect(new UntapTargetEffect()); - ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Constants.Duration.EndOfTurn, "It gains haste until end of turn")); + ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn, "It gains haste until end of turn")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/ZealousStrike.java b/Mage.Sets/src/mage/sets/avacynrestored/ZealousStrike.java index 39a441c35e7..7693deb5d28 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/ZealousStrike.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/ZealousStrike.java @@ -29,13 +29,13 @@ package mage.sets.avacynrestored; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -51,8 +51,8 @@ public class ZealousStrike extends CardImpl { this.color.setWhite(true); // Target creature gets +2/+2 and gains first strike until end of turn. - this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Constants.Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/AkkiBlizzardHerder.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/AkkiBlizzardHerder.java index 3a6a351ad4a..e4f4995c7d5 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/AkkiBlizzardHerder.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/AkkiBlizzardHerder.java @@ -28,8 +28,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.SacrificeAllEffect; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/AkkiRaider.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/AkkiRaider.java index 648e98024aa..22c14077acc 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/AkkiRaider.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/AkkiRaider.java @@ -28,11 +28,11 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -74,7 +74,7 @@ public class AkkiRaider extends CardImpl { private class AkkiRaiderTriggeredAbility extends TriggeredAbilityImpl { public AkkiRaiderTriggeredAbility(Effect effect) { - super(Constants.Zone.BATTLEFIELD, effect, false); + super(Zone.BATTLEFIELD, effect, false); } public AkkiRaiderTriggeredAbility(final AkkiRaiderTriggeredAbility ability) { @@ -84,8 +84,8 @@ private class AkkiRaiderTriggeredAbility extends TriggeredAbilityImpl { private class AuraBarbsEffect extends OneShotEffect { public AuraBarbsEffect() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); staticText = "Each enchantment deals 2 damage to its controller, then each Aura attached to a creature deals 2 damage to the creature it's attached to"; } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BakuAltar.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BakuAltar.java index f73e5405683..c16cedf9a45 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BakuAltar.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BakuAltar.java @@ -29,9 +29,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SpellCastTriggeredAbility; @@ -41,6 +40,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterSpiritOrArcaneCard; import mage.game.permanent.token.SpiritToken; @@ -59,7 +59,7 @@ public class BakuAltar extends CardImpl { // Whenever you cast a Spirit or Arcane spell, you may put a ki counter on Baku Altar. this.addAbility(new SpellCastTriggeredAbility(new AddCountersSourceEffect(CounterType.KI.createInstance(1)), filter, true)); // {2}, {tap}, Remove a ki counter from Baku Altar: Put a 1/1 colorless Spirit creature token onto the battlefield. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new SpiritToken(), 1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SpiritToken(), 1), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.KI.createInstance(1))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BileUrchin.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BileUrchin.java index 7ff4189ffd8..85a0fe10b8f 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BileUrchin.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BileUrchin.java @@ -29,15 +29,15 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetPlayer; /** @@ -54,7 +54,7 @@ public class BileUrchin extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); // Sacrifice Bile Urchin: Target player loses 1 life. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new SacrificeSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlademaneBaku.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlademaneBaku.java index 1de50701b0f..e03ddc2d72b 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlademaneBaku.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlademaneBaku.java @@ -29,10 +29,10 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +44,8 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.filter.common.FilterSpiritOrArcaneCard; import mage.game.Game; @@ -84,7 +86,7 @@ public class BlademaneBaku extends CardImpl { class BlademaneBakuBoostEffect extends OneShotEffect { public BlademaneBakuBoostEffect() { - super(Constants.Outcome.UnboostCreature); + super(Outcome.UnboostCreature); staticText = "For each counter removed, {this} gets +2/+0 until end of turn"; } @@ -101,7 +103,7 @@ public class BlademaneBaku extends CardImpl { } } if (numberToBoost >= 0) { - game.addEffect(new BoostSourceEffect(numberToBoost, 0, Constants.Duration.EndOfTurn), source); + game.addEffect(new BoostSourceEffect(numberToBoost, 0, Duration.EndOfTurn), source); return true; } return false; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlazingShoal.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlazingShoal.java index b180968c1f7..914f12f7039 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlazingShoal.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlazingShoal.java @@ -28,9 +28,9 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.common.ExileFromHandCost; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlessingOfLeeches.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlessingOfLeeches.java index 5fc9c4e5c66..2b2c92bbc0e 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlessingOfLeeches.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlessingOfLeeches.java @@ -29,10 +29,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -67,10 +65,10 @@ public class BlessingOfLeeches extends CardImpl { this.addAbility(ability); // At the beginning of your upkeep, you lose 1 life. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new LoseLifeSourceEffect(1), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new LoseLifeSourceEffect(1), TargetController.YOU, false)); // {0}: Regenerate enchanted creature. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateAttachedEffect(Constants.AttachmentType.AURA),new GenericManaCost(0))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA),new GenericManaCost(0))); } public BlessingOfLeeches(final BlessingOfLeeches card) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BodyOfJukai.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BodyOfJukai.java index 0170f625be8..e9cfc34fa97 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BodyOfJukai.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BodyOfJukai.java @@ -28,8 +28,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.abilities.keyword.SoulshiftAbility; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ChildOfThorns.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ChildOfThorns.java index 270ef293f15..ced6740be8c 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ChildOfThorns.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ChildOfThorns.java @@ -29,15 +29,16 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -54,7 +55,7 @@ public class ChildOfThorns extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); // Sacrifice Child of Thorns: Target creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Constants.Duration.EndOfTurn), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ChiseiHeartOfOceans.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ChiseiHeartOfOceans.java index 8117c81cf5b..06c814e8d5e 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ChiseiHeartOfOceans.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ChiseiHeartOfOceans.java @@ -28,10 +28,10 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.costs.common.RemoveCounterCost; @@ -53,7 +53,7 @@ public class ChiseiHeartOfOceans extends CardImpl { private static final FilterPermanent filter = new FilterControlledPermanent("remove a counter from a permanent you control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(new CounterAnyPredicate()); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ClashOfRealities.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ClashOfRealities.java index a80a7e565d3..958b59789bc 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ClashOfRealities.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ClashOfRealities.java @@ -28,9 +28,9 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.ZoneChangeTriggeredAbility; @@ -38,6 +38,8 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -65,12 +67,12 @@ public class ClashOfRealities extends CardImpl { // All Spirits have "When this permanent enters the battlefield, you may have it deal 3 damage to target non-Spirit creature." Ability ability1 = new ClashOfRealitiesTriggeredAbility(new DamageTargetEffect(3), "When this permanent enters the battlefield, "); ability1.addTarget(new TargetCreaturePermanent(filterNotSpirit)); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAllEffect(ability1, Constants.Duration.WhileOnBattlefield, filterSpirit, "All Spirits have \"When this permanent enters the battlefield, you may have it deal 3 damage to target non-Spirit creature.\""))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ability1, Duration.WhileOnBattlefield, filterSpirit, "All Spirits have \"When this permanent enters the battlefield, you may have it deal 3 damage to target non-Spirit creature.\""))); // Non-Spirit creatures have "When this creature enters the battlefield, you may have it deal 3 damage to target Spirit creature." Ability ability2 = new ClashOfRealitiesTriggeredAbility(new DamageTargetEffect(3), "When this creature enters the battlefield, "); ability2.addTarget(new TargetCreaturePermanent(filterSpirit)); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAllEffect(ability2, Constants.Duration.WhileOnBattlefield, filterNotSpirit, "Non-Spirit creatures have \"When this creature enters the battlefield, you may have it deal 3 damage to target Spirit creature.\""))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ability2, Duration.WhileOnBattlefield, filterNotSpirit, "Non-Spirit creatures have \"When this creature enters the battlefield, you may have it deal 3 damage to target Spirit creature.\""))); } public ClashOfRealities(final ClashOfRealities card) { @@ -85,7 +87,7 @@ public class ClashOfRealities extends CardImpl { private class ClashOfRealitiesTriggeredAbility extends ZoneChangeTriggeredAbility { public ClashOfRealitiesTriggeredAbility(Effect effect, String rule) { - super(Constants.Zone.BATTLEFIELD, effect, rule, true); + super(Zone.BATTLEFIELD, effect, rule, true); } public ClashOfRealitiesTriggeredAbility(ClashOfRealitiesTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/CrackTheEarth.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/CrackTheEarth.java index b7b57b5deb4..a4a344304ec 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/CrackTheEarth.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/CrackTheEarth.java @@ -28,8 +28,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.SacrificeAllEffect; import mage.cards.CardImpl; import mage.filter.common.FilterControlledPermanent; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/CrawlingFilth.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/CrawlingFilth.java index 4216f3ef0e1..05eb606f42b 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/CrawlingFilth.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/CrawlingFilth.java @@ -28,8 +28,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FearAbility; import mage.abilities.keyword.SoulshiftAbility; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/DayOfDestiny.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/DayOfDestiny.java index 1fa52d78e98..69e5ba23357 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/DayOfDestiny.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/DayOfDestiny.java @@ -29,12 +29,13 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SupertypePredicate; @@ -56,7 +57,7 @@ public class DayOfDestiny extends CardImpl { this.supertype.add("Legendary"); this.color.setWhite(true); // Legendary creatures you control get +2/+2. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Constants.Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, false))); } public DayOfDestiny(final DayOfDestiny card) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/DisruptingShoal.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/DisruptingShoal.java index 7b761a3623d..c00fb50b482 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/DisruptingShoal.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/DisruptingShoal.java @@ -28,9 +28,9 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.Mode; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/EmptyShrineKannushi.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/EmptyShrineKannushi.java index 0f88bf0a5ca..4c3a408b285 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/EmptyShrineKannushi.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/EmptyShrineKannushi.java @@ -29,8 +29,8 @@ package mage.sets.betrayersofkamigawa; import java.util.ArrayList; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.MageObject; import mage.ObjectColor; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Eradicate.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Eradicate.java index a6eec843ef2..81a99ef55ba 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Eradicate.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Eradicate.java @@ -28,8 +28,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.ExileTargetAndSearchGraveyardHandLibraryEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/FaithfulSquire.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/FaithfulSquire.java index 7de9ebe5c84..95a5c6cebb2 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/FaithfulSquire.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/FaithfulSquire.java @@ -30,11 +30,10 @@ package mage.sets.betrayersofkamigawa; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.*; @@ -87,7 +86,7 @@ public class FaithfulSquire extends CardImpl { new HasCounterCondition(CounterType.KI, 2, Integer.MAX_VALUE), "At the beginning of the end step, if there are two or more ki counters on Faithful Squire, you may flip it.", true)); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ConditionalContinousEffect(new CopyTokenEffect(new KaisoMemoryOfLoyalty()), FlippedCondition.getInstance(), ""))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new CopyTokenEffect(new KaisoMemoryOfLoyalty()), FlippedCondition.getInstance(), ""))); } public FaithfulSquire(final FaithfulSquire card) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/FinalJudgment.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/FinalJudgment.java index 22a8f4024c7..52ce7ebee78 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/FinalJudgment.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/FinalJudgment.java @@ -27,12 +27,12 @@ */ package mage.sets.betrayersofkamigawa; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; @@ -74,7 +74,7 @@ class FinalJudgmentEffect extends OneShotEffect { } public FinalJudgmentEffect() { - super(Constants.Outcome.Exile); + super(Outcome.Exile); staticText = "Exile all creatures"; } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/FirstVolley.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/FirstVolley.java index 9fe4a15d0a4..465b5736372 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/FirstVolley.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/FirstVolley.java @@ -28,9 +28,9 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Floodbringer.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Floodbringer.java index 551763f5799..f90b17ed000 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Floodbringer.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Floodbringer.java @@ -28,9 +28,9 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ForkedBranchGarami.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ForkedBranchGarami.java index 295ad90a0c1..9b638e166ff 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ForkedBranchGarami.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ForkedBranchGarami.java @@ -28,8 +28,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.SoulshiftAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/FrostOgre.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/FrostOgre.java index 38103793674..9546e521156 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/FrostOgre.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/FrostOgre.java @@ -28,8 +28,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Frostling.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Frostling.java index e22280f17ea..599c2eeb167 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Frostling.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Frostling.java @@ -29,15 +29,15 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -54,7 +54,7 @@ public class Frostling extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); // Sacrifice Frostling: Frostling deals 1 damage to target creature. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheCedars.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheCedars.java index 1e464015625..fcec7f0ea9e 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheCedars.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheCedars.java @@ -28,11 +28,11 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; @@ -43,6 +43,7 @@ import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.effects.common.continious.BecomesCreatureAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.Token; @@ -75,7 +76,7 @@ public class GenjuOfTheCedars extends CardImpl { this.addAbility(ability); // {2}: Enchanted Forest becomes a 4/4 green Spirit creature until end of turn. It's still a land. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new SpiritToken(), "Enchanted Forest becomes a 4/4 green Spirit creature until end of turn. It's still a land", Constants.Duration.EndOfTurn),new GenericManaCost(2)); + Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new SpiritToken(), "Enchanted Forest becomes a 4/4 green Spirit creature until end of turn. It's still a land", Duration.EndOfTurn),new GenericManaCost(2)); this.addAbility(ability2); // When enchanted Forest is put into a graveyard, you may return Genju of the Cedars from your graveyard to your hand. diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFalls.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFalls.java index 3c7b404d25a..9e6b09df674 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFalls.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFalls.java @@ -28,11 +28,11 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; @@ -44,6 +44,7 @@ import mage.abilities.effects.common.continious.BecomesCreatureAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.Token; @@ -76,7 +77,7 @@ public class GenjuOfTheFalls extends CardImpl { this.addAbility(ability); // {2}: Enchanted Island becomes a 3/2 blue Spirit creature with flying until end of turn. It's still a land. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new SpiritToken(), "Enchanted Island becomes a 3/2 blue Spirit creature with flying until end of turn. It's still a land", Constants.Duration.EndOfTurn),new GenericManaCost(2)); + Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new SpiritToken(), "Enchanted Island becomes a 3/2 blue Spirit creature with flying until end of turn. It's still a land", Duration.EndOfTurn),new GenericManaCost(2)); this.addAbility(ability2); // When enchanted Island is put into a graveyard, you may return Genju of the Falls from your graveyard to your hand. TargetPermanent auraTarget = new TargetLandPermanent(filter); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFens.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFens.java index 638ccbcac75..be262d5e52e 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFens.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFens.java @@ -28,12 +28,12 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; @@ -80,7 +80,7 @@ public class GenjuOfTheFens extends CardImpl { this.addAbility(ability); // {2}: Until end of turn, enchanted Swamp becomes a 2/2 black Spirit creature with "{B}: This creature gets +1/+1 until end of turn." It's still a land. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new SpiritToken(), "Until end of turn, enchanted Swamp becomes a 2/2 black Spirit creature with \"{B}: This creature gets +1/+1 until end of turn.\" It's still a land", Constants.Duration.EndOfTurn),new GenericManaCost(2)); + Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new SpiritToken(), "Until end of turn, enchanted Swamp becomes a 2/2 black Spirit creature with \"{B}: This creature gets +1/+1 until end of turn.\" It's still a land", Duration.EndOfTurn),new GenericManaCost(2)); this.addAbility(ability2); // When enchanted Swamp is put into a graveyard, you may return Genju of the Fens from your graveyard to your hand. diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFields.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFields.java index 884dec6997e..195aa4b03ea 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFields.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFields.java @@ -28,11 +28,11 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; @@ -44,6 +44,7 @@ import mage.abilities.effects.common.continious.BecomesCreatureAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.Token; @@ -78,7 +79,7 @@ public class GenjuOfTheFields extends CardImpl { this.addAbility(ability); // {2}: Until end of turn, enchanted Plains becomes a 2/5 white Spirit creature with "Whenever this creature deals damage, its controller gains that much life." It's still a land. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new SpiritToken(), "Until end of turn, enchanted Plains becomes a 2/5 white Spirit creature with \"Whenever this creature deals damage, its controller gains that much life.\". It's still a land", Constants.Duration.EndOfTurn),new GenericManaCost(2)); + Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new SpiritToken(), "Until end of turn, enchanted Plains becomes a 2/5 white Spirit creature with \"Whenever this creature deals damage, its controller gains that much life.\". It's still a land", Duration.EndOfTurn),new GenericManaCost(2)); this.addAbility(ability2); // When enchanted Plains is put into a graveyard, you may return Genju of the Fields from your graveyard to your hand. diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheRealm.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheRealm.java index 5ad1e495953..26f352104a2 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheRealm.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheRealm.java @@ -28,11 +28,11 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; @@ -44,6 +44,7 @@ import mage.abilities.effects.common.continious.BecomesCreatureAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterLandPermanent; import mage.game.permanent.token.Token; import mage.target.TargetPermanent; @@ -76,7 +77,7 @@ public class GenjuOfTheRealm extends CardImpl { this.addAbility(ability); // {2}: Enchanted land becomes a legendary 8/12 Spirit creature with trample until end of turn. It's still a land. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new SpiritToken(), "Enchanted land becomes a legendary 8/12 Spirit creature with trample until end of turn. It's still a land", Constants.Duration.EndOfTurn),new GenericManaCost(2)); + Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new SpiritToken(), "Enchanted land becomes a legendary 8/12 Spirit creature with trample until end of turn. It's still a land", Duration.EndOfTurn),new GenericManaCost(2)); this.addAbility(ability2); // When enchanted land is put into a graveyard, you may return Genju of the Realm from your graveyard to your hand. diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheSpires.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheSpires.java index ee3df666939..18f3b49b1d0 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheSpires.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheSpires.java @@ -28,11 +28,11 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; @@ -43,6 +43,7 @@ import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.effects.common.continious.BecomesCreatureAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.Token; @@ -75,7 +76,7 @@ public class GenjuOfTheSpires extends CardImpl { this.addAbility(ability); // {2}: Enchanted Mountain becomes a 6/1 red Spirit creature until end of turn. It's still a land. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new SpiritToken(), "Enchanted Mountain becomes a 6/1 red Spirit creature until end of turn. It's still a land", Constants.Duration.EndOfTurn),new GenericManaCost(2)); + Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new SpiritToken(), "Enchanted Mountain becomes a 6/1 red Spirit creature until end of turn. It's still a land", Duration.EndOfTurn),new GenericManaCost(2)); this.addAbility(ability2); // When enchanted Mountain is put into a graveyard, you may return Genju of the Spires from your graveyard to your hand. diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GnarledMass.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GnarledMass.java index 3e38074bfa2..cdf7b672828 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GnarledMass.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GnarledMass.java @@ -28,8 +28,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GodsEyeGateToTheReikai.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GodsEyeGateToTheReikai.java index b7643cadb41..4f1a7aac39e 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GodsEyeGateToTheReikai.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GodsEyeGateToTheReikai.java @@ -28,8 +28,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.mana.ColorlessManaAbility; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HeartOfLight.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HeartOfLight.java index d753fa91b59..a4f11af0a61 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HeartOfLight.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HeartOfLight.java @@ -28,11 +28,11 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.PreventionEffectImpl; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HeedTheMists.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HeedTheMists.java index 016031afaf3..114cb558970 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HeedTheMists.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HeedTheMists.java @@ -28,13 +28,15 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; @@ -67,7 +69,7 @@ public class HeedTheMists extends CardImpl { private class HeedTheMistsEffect extends OneShotEffect { public HeedTheMistsEffect() { - super(Constants.Outcome.DrawCard); + super(Outcome.DrawCard); staticText = "Put the top card of your library into your graveyard, then draw cards equal to that card's converted mana cost"; } @@ -83,7 +85,7 @@ public class HeedTheMists extends CardImpl { Card card = player.getLibrary().removeFromTop(game); if (card != null) { int cmc = card.getManaCost().convertedManaCost(); - result = card.moveToZone(Constants.Zone.GRAVEYARD, source.getId(), game, true); + result = card.moveToZone(Zone.GRAVEYARD, source.getId(), game, true); player.drawCards(cmc, game); } } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HerosDemise.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HerosDemise.java index 1355659eafc..3840c3efdc3 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HerosDemise.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HerosDemise.java @@ -28,8 +28,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HigureTheStillWind.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HigureTheStillWind.java index 3fdde35b1e0..f0e16f077fe 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HigureTheStillWind.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HigureTheStillWind.java @@ -28,9 +28,9 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -41,6 +41,7 @@ import mage.abilities.effects.common.UnblockableTargetEffect; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.abilities.keyword.NinjutsuAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -77,7 +78,7 @@ public class HigureTheStillWind extends CardImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter)), true)); // {2}: Target Ninja creature is unblockable this turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new UnblockableTargetEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UnblockableTargetEffect(), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent(filterCreature)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HokoriDustDrinker.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HokoriDustDrinker.java index 4d45fedbfe2..d83ecf7cd47 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HokoriDustDrinker.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HokoriDustDrinker.java @@ -28,11 +28,11 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -40,6 +40,9 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.PhaseStep; +import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; @@ -67,7 +70,7 @@ public class HokoriDustDrinker extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new HokoriDustDrinkerReplacementEffect())); // At the beginning of each player's upkeep, that player untaps a land he or she controls. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new HokoriDustDrinkerUntapEffect(), Constants.TargetController.ANY, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new HokoriDustDrinkerUntapEffect(), TargetController.ANY, false)); } @@ -85,7 +88,7 @@ public class HokoriDustDrinker extends CardImpl { class HokoriDustDrinkerReplacementEffect extends ReplacementEffectImpl { public HokoriDustDrinkerReplacementEffect() { - super(Constants.Duration.OneUse, Constants.Outcome.Detriment); + super(Duration.OneUse, Outcome.Detriment); } public HokoriDustDrinkerReplacementEffect(final HokoriDustDrinkerReplacementEffect effect) { @@ -110,7 +113,7 @@ class HokoriDustDrinkerReplacementEffect extends ReplacementEffectImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new InkEyesServantOfOniEffect(), true, true)); // {1}{B}: Regenerate Ink-Eyes. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}"))); } public InkEyesServantOfOni(final InkEyesServantOfOni card) { @@ -87,7 +89,7 @@ public class InkEyesServantOfOni extends CardImpl { class InkEyesServantOfOniEffect extends OneShotEffect { public InkEyesServantOfOniEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); this.staticText = "you may put target creature card from that player's graveyard onto the battlefield under your control"; } @@ -109,10 +111,10 @@ class InkEyesServantOfOniEffect extends OneShotEffect filter.add(new OwnerIdPredicate(damagedPlayer.getId())); TargetCardInGraveyard target = new TargetCardInGraveyard(filter); if (target.canChoose(source.getSourceId(), you.getId(), game)) { - if (you.chooseTarget(Constants.Outcome.PutCreatureInPlay, target, source, game)) { + if (you.chooseTarget(Outcome.PutCreatureInPlay, target, source, game)) { Card card = game.getCard(target.getFirstTarget()); if (card != null) { - card.putOntoBattlefield(game, Constants.Zone.GRAVEYARD, id, you.getId()); + card.putOntoBattlefield(game, Zone.GRAVEYARD, id, you.getId()); return true; } } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/IreOfKaminari.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/IreOfKaminari.java index 5348683dba7..83aaa58e23e 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/IreOfKaminari.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/IreOfKaminari.java @@ -28,8 +28,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/IsaoEnlightenedBushi.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/IsaoEnlightenedBushi.java index 8df5ac68b50..50a302f35fa 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/IsaoEnlightenedBushi.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/IsaoEnlightenedBushi.java @@ -29,9 +29,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.CantCounterAbility; @@ -40,6 +39,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.RegenerateTargetEffect; import mage.abilities.keyword.BushidoAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; @@ -70,7 +70,7 @@ public class IsaoEnlightenedBushi extends CardImpl { this.addAbility(new CantCounterAbility()); this.addAbility(new BushidoAbility(2)); // {2}: Regenerate target Samurai. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateTargetEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new GenericManaCost(2)); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/JettingGlasskite.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/JettingGlasskite.java index 7eb0e4ed8a3..c5cd26624f2 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/JettingGlasskite.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/JettingGlasskite.java @@ -28,9 +28,9 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.CounterTargetEffect; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KaijinOfTheVanishingTouch.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KaijinOfTheVanishingTouch.java index 6142c4c6790..9f06930ba5b 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KaijinOfTheVanishingTouch.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KaijinOfTheVanishingTouch.java @@ -28,9 +28,9 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BlocksTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfFalseHope.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfFalseHope.java index 6865ccc81d6..445d0d11c03 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfFalseHope.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfFalseHope.java @@ -28,16 +28,17 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.PreventAllDamageEffect; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -55,7 +56,7 @@ public class KamiOfFalseHope extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Kami of False Hope: Prevent all combat damage that would be dealt this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventAllDamageEffect(Constants.Duration.EndOfTurn, true), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventAllDamageEffect(Duration.EndOfTurn, true), new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfTatteredShoji.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfTatteredShoji.java index 66ea1c50ae2..577ab33ff3d 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfTatteredShoji.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfTatteredShoji.java @@ -29,14 +29,14 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterSpiritOrArcaneCard; /** @@ -55,7 +55,7 @@ public class KamiOfTatteredShoji extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(5); // Whenever you cast a Spirit or Arcane spell, Kami of Tattered Shoji gains flying until end of turn. - this.addAbility(new SpellCastTriggeredAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn), filter, false)); + this.addAbility(new SpellCastTriggeredAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), filter, false)); } public KamiOfTatteredShoji(final KamiOfTatteredShoji card) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfTheHonoredDead.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfTheHonoredDead.java index 4a9acd51529..225edf099bf 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfTheHonoredDead.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfTheHonoredDead.java @@ -29,10 +29,9 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -40,6 +39,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.SoulshiftAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; @@ -80,7 +80,7 @@ public class KamiOfTheHonoredDead extends CardImpl { class KamiOfTheHonoredDeadTriggeredAbility extends TriggeredAbilityImpl { public KamiOfTheHonoredDeadTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new KamiOfTheHonoredDeadGainLifeEffect()); + super(Zone.BATTLEFIELD, new KamiOfTheHonoredDeadGainLifeEffect()); } public KamiOfTheHonoredDeadTriggeredAbility(final KamiOfTheHonoredDeadTriggeredAbility effect) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KentaroTheSmilingCat.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KentaroTheSmilingCat.java index 00867624fc1..94e1660d20f 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KentaroTheSmilingCat.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KentaroTheSmilingCat.java @@ -27,9 +27,7 @@ */ package mage.sets.betrayersofkamigawa; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -64,7 +62,7 @@ public class KentaroTheSmilingCat extends CardImpl { this.addAbility(new BushidoAbility(1)); // You may pay {X} rather than pay the mana cost for Samurai spells you cast, where X is that spell's converted mana cost. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new KentaroTheSmilingCatCostReductionEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KentaroTheSmilingCatCostReductionEffect())); } @@ -84,7 +82,7 @@ public class KentaroTheSmilingCat extends CardImpl { private static final String effectText = "You may pay {X} rather than pay the mana cost for Samurai spells you cast, where X is that spell's converted mana cost"; KentaroTheSmilingCatCostReductionEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); staticText = effectText; } @@ -106,7 +104,7 @@ public class KentaroTheSmilingCat extends CardImpl { if (sourceCard != null && sourceCard.hasSubtype("Samurai")) { String manaCostsString = "{" + sourceCard.getManaCost().convertedManaCost() + "}"; Player player = game.getPlayer(spell.getControllerId()); - if (player != null && player.chooseUse(Constants.Outcome.Benefit, "Pay converted mana cost rather than pay the mana cost for Samurai creature?", game)) { + if (player != null && player.chooseUse(Outcome.Benefit, "Pay converted mana cost rather than pay the mana cost for Samurai creature?", game)) { spell.getManaCostsToPay().clear(); spell.getManaCostsToPay().load(manaCostsString); return true; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KiraGreatGlassSpinner.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KiraGreatGlassSpinner.java index 04dd3c93000..cc5231505b3 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KiraGreatGlassSpinner.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KiraGreatGlassSpinner.java @@ -30,10 +30,10 @@ package mage.sets.betrayersofkamigawa; import java.util.HashMap; import java.util.Map; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KitsunePalliator.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KitsunePalliator.java index e4c79af3dbf..7f411937ab9 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KitsunePalliator.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KitsunePalliator.java @@ -29,11 +29,8 @@ package mage.sets.betrayersofkamigawa; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -72,7 +69,7 @@ public class KitsunePalliator extends CardImpl { this.toughness = new MageInt(2); // {T}: Prevent the next 1 damage that would be dealt to each creature and each player this turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new KitsunePalliatorEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new KitsunePalliatorEffect(), new TapSourceCost())); } public KitsunePalliator(final KitsunePalliator card) { @@ -103,7 +100,7 @@ class KitsunePalliatorEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - PreventDamageTargetEffect effect = new PreventDamageTargetEffect(Constants.Duration.EndOfTurn, 1); + PreventDamageTargetEffect effect = new PreventDamageTargetEffect(Duration.EndOfTurn, 1); List permanents = game.getBattlefield().getActivePermanents(new FilterCreaturePermanent(), source.getControllerId(), game); for (Permanent permanent: permanents) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MarkOfTheOni.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MarkOfTheOni.java index 10e2a1a58f3..58e0cae0fb0 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MarkOfTheOni.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MarkOfTheOni.java @@ -29,11 +29,11 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +43,7 @@ import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.effects.common.continious.ControlEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; @@ -77,7 +78,7 @@ public class MarkOfTheOni extends CardImpl { // At the beginning of the end step, if you control no Demons, sacrifice Mark of the Oni. this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceEffect(), - Constants.TargetController.ANY, + TargetController.ANY, new ControlsPermanentCondition(filter, ControlsPermanentCondition.CountType.FEWER_THAN, 1), false)); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MendingHands.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MendingHands.java index b7137f657f1..10b5ebe6e1a 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MendingHands.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MendingHands.java @@ -29,11 +29,11 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.PreventDamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreatureOrPlayer; /** @@ -47,7 +47,7 @@ public class MendingHands extends CardImpl { this.expansionSetCode = "BOK"; this.color.setWhite(true); // Prevent the next 4 damage that would be dealt to target creature or player this turn. - this.getSpellAbility().addEffect(new PreventDamageTargetEffect(Constants.Duration.EndOfTurn, 4)); + this.getSpellAbility().addEffect(new PreventDamageTargetEffect(Duration.EndOfTurn, 4)); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MinamoSightbender.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MinamoSightbender.java index 802694c95df..1a83722c310 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MinamoSightbender.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MinamoSightbender.java @@ -28,15 +28,17 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.UnblockableTargetEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.Filter; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; @@ -80,7 +82,7 @@ public class MinamoSightbender extends CardImpl { class MinamoSightbenderAbility extends ActivatedAbilityImpl { public MinamoSightbenderAbility() { - super(Constants.Zone.BATTLEFIELD,new UnblockableTargetEffect(), new ManaCostsImpl("{X}")); + super(Zone.BATTLEFIELD,new UnblockableTargetEffect(), new ManaCostsImpl("{X}")); this.addCost(new TapSourceCost()); } @@ -101,7 +103,7 @@ class MinamoSightbenderAbility extends ActivatedAbilityImpl { this.toughness = new MageInt(4); // Sacrifice Moonlit Strider: Target creature you control gains protection from the color of your choice until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainProtectionFromColorTargetEffect(Constants.Duration.EndOfTurn), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainProtectionFromColorTargetEffect(Duration.EndOfTurn), new SacrificeSourceCost()); ability.addChoice(new ChoiceColor()); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/NezumiShadowWatcher.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/NezumiShadowWatcher.java index 1e18f6de82b..4b8a12eab13 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/NezumiShadowWatcher.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/NezumiShadowWatcher.java @@ -29,15 +29,15 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; @@ -63,7 +63,7 @@ public class NezumiShadowWatcher extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); // Sacrifice Nezumi Shadow-Watcher: Destroy target Ninja. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/NinjaOfTheDeepHours.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/NinjaOfTheDeepHours.java index f961f24e3ad..cc56b1d597c 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/NinjaOfTheDeepHours.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/NinjaOfTheDeepHours.java @@ -28,8 +28,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/NourishingShoal.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/NourishingShoal.java index fb808901724..fd496ef43dd 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/NourishingShoal.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/NourishingShoal.java @@ -28,8 +28,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.common.ExileFromHandCost; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/OkibaGangShinobi.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/OkibaGangShinobi.java index 9d412bb688a..0bbac5c07c5 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/OkibaGangShinobi.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/OkibaGangShinobi.java @@ -28,8 +28,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/OpalEyeKondasYojimbo.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/OpalEyeKondasYojimbo.java index 67626cec088..14a1e133abe 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/OpalEyeKondasYojimbo.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/OpalEyeKondasYojimbo.java @@ -28,11 +28,11 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -44,6 +44,7 @@ import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.keyword.BushidoAbility; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.game.Game; import mage.game.events.DamageEvent; import mage.game.events.GameEvent; @@ -95,7 +96,7 @@ public class OpalEyeKondasYojimbo extends CardImpl { class OpalEyeKondasYojimboRedirectionEffect extends ReplacementEffectImpl { OpalEyeKondasYojimboRedirectionEffect() { - super(Constants.Duration.EndOfTurn, Outcome.RedirectDamage); + super(Duration.EndOfTurn, Outcome.RedirectDamage); staticText = "The next time a source of your choice would deal damage this turn, that damage is dealt to {this} instead"; } @@ -168,7 +169,7 @@ class OpalEyeKondasYojimboRedirectionEffect extends ReplacementEffectImpl { public OpalEyeKondasYojimboPreventEffect() { - super(Constants.Duration.EndOfTurn); + super(Duration.EndOfTurn); staticText = "Prevent the next 1 damage that would be dealt to {this} this turn"; } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/OrbOfDreams.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/OrbOfDreams.java index c19102a2ac1..95ee2697e1d 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/OrbOfDreams.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/OrbOfDreams.java @@ -28,10 +28,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; @@ -51,7 +49,7 @@ public class OrbOfDreams extends CardImpl { this.expansionSetCode = "BOK"; // Permanents enter the battlefield tapped. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new OrbOfDreamsEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OrbOfDreamsEffect())); } public OrbOfDreams(final OrbOfDreams card) { @@ -66,7 +64,7 @@ public class OrbOfDreams extends CardImpl { private class OrbOfDreamsEffect extends ReplacementEffectImpl { OrbOfDreamsEffect() { - super(Duration.WhileOnBattlefield, Constants.Outcome.Tap, false); + super(Duration.WhileOnBattlefield, Outcome.Tap, false); staticText = "Permanents enter the battlefield tapped"; } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/OrnateKanzashi.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/OrnateKanzashi.java index 39f04746b05..8eb103c0be1 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/OrnateKanzashi.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/OrnateKanzashi.java @@ -29,9 +29,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -59,7 +58,7 @@ public class OrnateKanzashi extends CardImpl { this.expansionSetCode = "BOK"; // {2}, {T}: Target opponent exiles the top card of his or her library. You may play that card this turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new OrnateKanzashiEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OrnateKanzashiEffect(), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetOpponent()); this.addAbility(ability); @@ -78,7 +77,7 @@ public class OrnateKanzashi extends CardImpl { class OrnateKanzashiEffect extends OneShotEffect { public OrnateKanzashiEffect() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); this.staticText = "Target opponent exiles the top card of his or her library. You may play that card this turn"; } @@ -114,7 +113,7 @@ class OrnateKanzashiCastFromExileEffect extends AsThoughEffectImpl { class AnotherSpiritToken extends Token { AnotherSpiritToken() { super("Spirit", "3/3 white Spirit creature token with flying"); - cardType.add(Constants.CardType.CREATURE); + cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add("Spirit"); power = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheAkki.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheAkki.java index f367d787ab3..4fe0ee27c04 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheAkki.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheAkki.java @@ -28,14 +28,15 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.keyword.OfferingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; @@ -57,7 +58,7 @@ public class PatronOfTheAkki extends CardImpl { this.addAbility(new OfferingAbility("Goblin")); // Whenever Patron of the Akki attacks, creatures you control get +2/+0 until end of turn. - this.addAbility(new AttacksTriggeredAbility(new BoostControlledEffect(2, 0, Constants.Duration.EndOfTurn, new FilterCreaturePermanent(), false), false)); + this.addAbility(new AttacksTriggeredAbility(new BoostControlledEffect(2, 0, Duration.EndOfTurn, new FilterCreaturePermanent(), false), false)); } public PatronOfTheAkki(final PatronOfTheAkki card) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheKitsune.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheKitsune.java index 0014b6d7572..ce698669b1d 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheKitsune.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheKitsune.java @@ -28,14 +28,15 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.keyword.OfferingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -74,7 +75,7 @@ public class PatronOfTheKitsune extends CardImpl { class PatronOfTheKitsuneTriggeredAbility extends TriggeredAbilityImpl { public PatronOfTheKitsuneTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new GainLifeEffect(1), true); + super(Zone.BATTLEFIELD, new GainLifeEffect(1), true); } public PatronOfTheKitsuneTriggeredAbility(PatronOfTheKitsuneTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheMoon.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheMoon.java index 67179c36b25..fdbbf9de289 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheMoon.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheMoon.java @@ -28,9 +28,9 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +40,8 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.OfferingAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterLandCard; import mage.game.Game; import mage.game.permanent.Permanent; @@ -67,7 +69,7 @@ public class PatronOfTheMoon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {1}: Put up to two land cards from your hand onto the battlefield tapped. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PatronOfTheMoonEffect(), new ManaCostsImpl("{1}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PatronOfTheMoonEffect(), new ManaCostsImpl("{1}")); ability.addTarget(new TargetCardInHand(0,2, new FilterLandCard())); this.addAbility(ability); @@ -85,7 +87,7 @@ public class PatronOfTheMoon extends CardImpl { class PatronOfTheMoonEffect extends OneShotEffect { PatronOfTheMoonEffect() { - super(Constants.Outcome.PutLandInPlay); + super(Outcome.PutLandInPlay); staticText = "Put up to two land cards from your hand onto the battlefield tapped"; } @@ -98,7 +100,7 @@ class PatronOfTheMoonEffect extends OneShotEffect { for (UUID cardId : targetPointer.getTargets(game, source)) { Card c = game.getCard(cardId); if (c != null) { - c.moveToZone(Constants.Zone.BATTLEFIELD, source.getSourceId(), game, false); + c.moveToZone(Zone.BATTLEFIELD, source.getSourceId(), game, false); Permanent land = game.getPermanent(cardId); if (land != null) { land.setTapped(true); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheNezumi.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheNezumi.java index 71400ef8130..7ce5caa6fa6 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheNezumi.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheNezumi.java @@ -28,9 +28,9 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheOrochi.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheOrochi.java index 6b2548bd7bb..7a7b5474f1f 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheOrochi.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheOrochi.java @@ -28,9 +28,9 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateOncePerTurnActivatedAbility; @@ -39,6 +39,8 @@ import mage.ObjectColor; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.keyword.OfferingAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -67,7 +69,7 @@ public class PatronOfTheOrochi extends CardImpl { this.addAbility(new OfferingAbility("Snake")); // {T}: Untap all Forests and all green creatures. Activate this ability only once each turn. - this.addAbility(new ActivateOncePerTurnActivatedAbility(Constants.Zone.BATTLEFIELD, new PatronOfTheOrochiEffect(), new TapSourceCost())); + this.addAbility(new ActivateOncePerTurnActivatedAbility(Zone.BATTLEFIELD, new PatronOfTheOrochiEffect(), new TapSourceCost())); } @@ -92,7 +94,7 @@ class PatronOfTheOrochiEffect extends OneShotEffect { } public PatronOfTheOrochiEffect() { - super(Constants.Outcome.Untap); + super(Outcome.Untap); staticText = "Untap all Forests and all green creatures"; } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PetalmaneBaku.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PetalmaneBaku.java index 7eefeaeac74..8c1811fc009 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PetalmaneBaku.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PetalmaneBaku.java @@ -29,8 +29,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PhantomWings.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PhantomWings.java index 786d8fa3fc5..596fe45da06 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PhantomWings.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PhantomWings.java @@ -28,10 +28,10 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -42,6 +42,8 @@ import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.AttachmentType; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -63,11 +65,11 @@ public class PhantomWings extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature has flying. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); // Sacrifice Phantom Wings: Return enchanted creature to its owner's hand. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PhantomWingsReturnEffect(), new SacrificeSourceCost())); @@ -85,7 +87,7 @@ public class PhantomWings extends CardImpl { private class PhantomWingsReturnEffect extends OneShotEffect { public PhantomWingsReturnEffect() { - super(Constants.Outcome.ReturnToHand); + super(Outcome.ReturnToHand); staticText = "Return enchanted creature to its owner's hand"; } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PsychicSpear.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PsychicSpear.java index 253a006feab..32c62a6fc80 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PsychicSpear.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PsychicSpear.java @@ -28,13 +28,15 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -79,7 +81,7 @@ class PsychicSpearEffect extends OneShotEffect { } public PsychicSpearEffect() { - super(Constants.Outcome.Discard); + super(Outcome.Discard); staticText = "Target player reveals his or her hand. You choose a Spirit or Arcane card from it. That player discards that card"; } @@ -94,9 +96,9 @@ class PsychicSpearEffect extends OneShotEffect { player.revealCards("Psychic Spear", player.getHand(), game); Player you = game.getPlayer(source.getControllerId()); if (you != null) { - TargetCard target = new TargetCard(Constants.Zone.PICK, filter); + TargetCard target = new TargetCard(Zone.PICK, filter); target.setRequired(true); - if (you.choose(Constants.Outcome.Benefit, player.getHand(), target, game)) { + if (you.choose(Outcome.Benefit, player.getHand(), target, game)) { Card card = player.getHand().get(target.getFirstTarget(), game); if (card != null) { return player.discard(card, source, game); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PusKami.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PusKami.java index 0f1635bd821..cb897ef0347 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PusKami.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PusKami.java @@ -29,9 +29,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -41,6 +40,8 @@ import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.SoulshiftAbility; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; @@ -66,7 +67,7 @@ public class PusKami extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); // {B}, Sacrifice Pus Kami: Destroy target nonblack creature. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Quash.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Quash.java index 87afe0b8c01..961fa7c49dc 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Quash.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Quash.java @@ -28,8 +28,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetAndSearchGraveyardHandLibraryEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/QuillmaneBaku.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/QuillmaneBaku.java index 6790478790a..fe46c5c4f0b 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/QuillmaneBaku.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/QuillmaneBaku.java @@ -29,10 +29,10 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +44,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; @@ -92,7 +93,7 @@ public class QuillmaneBaku extends CardImpl { class QuillmaneBakuReturnEffect extends OneShotEffect { public QuillmaneBakuReturnEffect() { - super(Constants.Outcome.ReturnToHand); + super(Outcome.ReturnToHand); this.staticText = "Return target creature with converted mana cost X or less to its owner's hand"; } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ReduceToDreams.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ReduceToDreams.java index e88855b43de..ea7d1dfc743 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ReduceToDreams.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ReduceToDreams.java @@ -28,12 +28,14 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -77,7 +79,7 @@ class ReduceToDreamsEffect extends OneShotEffect { } public ReduceToDreamsEffect() { - super(Constants.Outcome.ReturnToHand); + super(Outcome.ReturnToHand); staticText = "Return all artifacts and enchantments to their owners' hands"; } @@ -88,7 +90,7 @@ class ReduceToDreamsEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { for (Permanent creature : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { - creature.moveToZone(Constants.Zone.HAND, source.getSourceId(), game, true); + creature.moveToZone(Zone.HAND, source.getSourceId(), game, true); } return true; } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/RibbonsOfTheReikai.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/RibbonsOfTheReikai.java index 876718209c1..9bf379407a5 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/RibbonsOfTheReikai.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/RibbonsOfTheReikai.java @@ -28,8 +28,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/RoninWarclub.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/RoninWarclub.java index c3fc1893fc9..4a0049e1198 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/RoninWarclub.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/RoninWarclub.java @@ -28,10 +28,10 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ScaledHulk.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ScaledHulk.java index 0e64b6d4ac3..27a91656f3a 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ScaledHulk.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ScaledHulk.java @@ -29,13 +29,13 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterSpiritOrArcaneCard; /** @@ -54,7 +54,7 @@ public class ScaledHulk extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); // Whenever you cast a Spirit or Arcane spell, Scaled Hulk gets +2/+2 until end of turn. - this.addAbility(new SpellCastTriggeredAbility(new BoostSourceEffect(2, 2, Constants.Duration.EndOfTurn), filter, false)); + this.addAbility(new SpellCastTriggeredAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), filter, false)); } public ScaledHulk(final ScaledHulk card) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Scour.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Scour.java index faf6cf3e3d9..b6a580840e2 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Scour.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Scour.java @@ -28,8 +28,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ExileTargetAndSearchGraveyardHandLibraryEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ShimmeringGlasskite.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ShimmeringGlasskite.java index d88ddd5d694..c657a25caa7 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ShimmeringGlasskite.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ShimmeringGlasskite.java @@ -28,9 +28,9 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.CounterTargetEffect; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ShiningShoal.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ShiningShoal.java index 32d9554cf6d..e5f4f317d83 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ShiningShoal.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ShiningShoal.java @@ -28,9 +28,9 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageObject; import mage.ObjectColor; import mage.abilities.Ability; @@ -40,6 +40,7 @@ import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.ExileFromHandCostCardConvertedMana; import mage.abilities.effects.PreventionEffectImpl; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterOwnedCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardIdPredicate; @@ -73,7 +74,7 @@ public class ShiningShoal extends CardImpl { this.getSpellAbility().addAlternativeCost(new AlternativeCostImpl(ALTERNATIVE_COST_DESCRIPTION, new ExileFromHandCost(new TargetCardInHand(filter)))); // The next X damage that a source of your choice would deal to you and/or creatures you control this turn is dealt to target creature or player instead. - this.getSpellAbility().addEffect(new ShiningShoalPreventDamageTargetEffect(Constants.Duration.EndOfTurn, new ExileFromHandCostCardConvertedMana())); + this.getSpellAbility().addEffect(new ShiningShoalPreventDamageTargetEffect(Duration.EndOfTurn, new ExileFromHandCostCardConvertedMana())); this.getSpellAbility().addTarget(new TargetSource()); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); } @@ -94,7 +95,7 @@ class ShiningShoalPreventDamageTargetEffect extends PreventionEffectImpl { this.expansionSetCode = "BOK"; this.subtype.add("Equipment"); // Equipped creature gets +1/+0. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0))); // Equip {0} - this.addAbility(new EquipAbility(Constants.Outcome.BoostCreature, new GenericManaCost(0))); + this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(0))); } public Shuko(final Shuko card) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SickeningShoal.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SickeningShoal.java index bfe7a23d9a4..97b43bdcbf8 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SickeningShoal.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SickeningShoal.java @@ -28,9 +28,9 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.common.ExileFromHandCost; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SilverstormSamurai.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SilverstormSamurai.java index 426afccaaed..0fa64805b19 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SilverstormSamurai.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SilverstormSamurai.java @@ -28,8 +28,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.BushidoAbility; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SkullmaneBaku.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SkullmaneBaku.java index 9f7a3757b0d..4af1380ec3f 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SkullmaneBaku.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SkullmaneBaku.java @@ -29,10 +29,10 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -46,6 +46,8 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.filter.common.FilterSpiritOrArcaneCard; import mage.game.Game; @@ -90,7 +92,7 @@ public class SkullmaneBaku extends CardImpl { class SkullmaneBakuUnboostEffect extends OneShotEffect { public SkullmaneBakuUnboostEffect() { - super(Constants.Outcome.UnboostCreature); + super(Outcome.UnboostCreature); staticText = "Target creature gets -X/-X until end of turn"; } @@ -108,7 +110,7 @@ public class SkullmaneBaku extends CardImpl { } Permanent creature = game.getPermanent(targetPointer.getFirst(game, source)); if (creature != null && numberToUnboost != 0) { - creature.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(numberToUnboost, numberToUnboost, Constants.Duration.EndOfTurn)), game); + creature.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(numberToUnboost, numberToUnboost, Duration.EndOfTurn)), game); } return true; } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Skullsnatcher.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Skullsnatcher.java index f3f869a06c5..c99f6bd86d1 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Skullsnatcher.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Skullsnatcher.java @@ -28,15 +28,16 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.keyword.NinjutsuAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.other.OwnerIdPredicate; @@ -87,7 +88,7 @@ public class Skullsnatcher extends CardImpl { class SkullsnatcherTriggeredAbility extends TriggeredAbilityImpl { SkullsnatcherTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new ExileTargetEffect(), false); + super(Zone.BATTLEFIELD, new ExileTargetEffect(), false); } SkullsnatcherTriggeredAbility(final SkullsnatcherTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SlumberingTora.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SlumberingTora.java index 949f34d35cf..4fc50e0c4e2 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SlumberingTora.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SlumberingTora.java @@ -28,9 +28,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.Cost; @@ -62,7 +61,7 @@ public class SlumberingTora extends CardImpl { this.expansionSetCode = "BOK"; // {2}, Discard a Spirit or Arcane card: Slumbering Tora becomes an X/X Cat artifact creature until end of turn, // where X is the discarded card's converted mana cost. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new SlumberingToraEffect(), new ManaCostsImpl("{2}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SlumberingToraEffect(), new ManaCostsImpl("{2}")); ability.addCost(new DiscardTargetCost(new TargetCardInHand(filter))); this.addAbility(ability); } @@ -79,7 +78,7 @@ public class SlumberingTora extends CardImpl { private class SlumberingToraEffect extends ContinuousEffectImpl { public SlumberingToraEffect() { - super(Constants.Duration.EndOfTurn, Constants.Outcome.BecomeCreature); + super(Duration.EndOfTurn, Outcome.BecomeCreature); setText(); } @@ -93,18 +92,18 @@ public class SlumberingTora extends CardImpl { } @Override - public boolean apply(Constants.Layer layer, Constants.SubLayer sublayer, Ability source, Game game) { + public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) { Permanent permanent = game.getPermanent(source.getSourceId()); if (permanent != null) { switch (layer) { case TypeChangingEffects_4: - if (sublayer == Constants.SubLayer.NA) { + if (sublayer == SubLayer.NA) { permanent.getCardType().add(CardType.CREATURE); permanent.getSubtype().add("Cat"); } break; case PTChangingEffects_7: - if (sublayer == Constants.SubLayer.SetPT_7b) { + if (sublayer == SubLayer.SetPT_7b) { int convManaCosts = 0; for (Cost cost: source.getCosts()) { if (cost instanceof DiscardTargetCost && ((DiscardTargetCost)cost).getCards().size() > 0) { @@ -131,8 +130,8 @@ public class SlumberingTora extends CardImpl { } @Override - public boolean hasLayer(Constants.Layer layer) { - return layer == Constants.Layer.PTChangingEffects_7 || layer == Constants.Layer.TypeChangingEffects_4; + public boolean hasLayer(Layer layer) { + return layer == Layer.PTChangingEffects_7 || layer == Layer.TypeChangingEffects_4; } } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SoratamiMindsweeper.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SoratamiMindsweeper.java index ec4738abc70..e1304a60af9 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SoratamiMindsweeper.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SoratamiMindsweeper.java @@ -28,9 +28,9 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +39,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.target.TargetPlayer; @@ -64,7 +65,7 @@ public class SoratamiMindsweeper extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {2}, Return a land you control to its owner's hand: Target player puts the top two cards of his or her library into his or her graveyard. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD,new PutLibraryIntoGraveTargetEffect(2), new ManaCostsImpl("{2}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,new PutLibraryIntoGraveTargetEffect(2), new ManaCostsImpl("{2}")); ability.addTarget(new TargetPlayer()); ability.addCost(new ReturnToHandTargetCost(new TargetControlledPermanent(filter))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SosukesSummons.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SosukesSummons.java index f122ce67c39..5c11f0e5404 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SosukesSummons.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SosukesSummons.java @@ -28,9 +28,9 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.CreatureEntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.ReturnSourceFromGraveyardToHandEffect; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SowingSalt.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SowingSalt.java index 498c83e20aa..ad09fa710fc 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SowingSalt.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SowingSalt.java @@ -28,8 +28,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ExileTargetAndSearchGraveyardHandLibraryEffect; import mage.cards.CardImpl; import mage.filter.common.FilterLandPermanent; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Splinter.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Splinter.java index ba41843d4d0..b8e04390b0f 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Splinter.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Splinter.java @@ -28,8 +28,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ExileTargetAndSearchGraveyardHandLibraryEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SplitTailMiko.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SplitTailMiko.java index 92308e514bb..996e058e14e 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SplitTailMiko.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SplitTailMiko.java @@ -29,9 +29,7 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -56,7 +54,7 @@ public class SplitTailMiko extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); // {W}, {tap}: Prevent the next 2 damage that would be dealt to target creature or player this turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PreventDamageTargetEffect(Constants.Duration.EndOfTurn, 2), new ColoredManaCost(Constants.ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageTargetEffect(Duration.EndOfTurn, 2), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/StreamOfConsciousness.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/StreamOfConsciousness.java index 46544d98507..2c43beec4c7 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/StreamOfConsciousness.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/StreamOfConsciousness.java @@ -29,10 +29,10 @@ package mage.sets.betrayersofkamigawa; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SwayOfTheStars.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SwayOfTheStars.java index 8d9da06b889..ff985ec71a2 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SwayOfTheStars.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SwayOfTheStars.java @@ -28,10 +28,10 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TakenosCavalry.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TakenosCavalry.java index 91010fc73a2..df0c766fa9a 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TakenosCavalry.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TakenosCavalry.java @@ -29,9 +29,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.BushidoAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterAttackingOrBlockingCreature; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetAttackingOrBlockingCreature; @@ -66,7 +66,7 @@ public class TakenosCavalry extends CardImpl { this.toughness = new MageInt(1); this.addAbility(new BushidoAbility(1)); // {tap}: Takeno's Cavalry deals 1 damage to target attacking or blocking Spirit. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature(1, 1, filter, false)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Tallowisp.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Tallowisp.java index f2fc295c5b0..cba1fe95a06 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Tallowisp.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Tallowisp.java @@ -28,8 +28,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.MageObject; import mage.abilities.Abilities; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TeardropKami.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TeardropKami.java index 1b5e78e95bc..31359e4232f 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TeardropKami.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TeardropKami.java @@ -28,15 +28,16 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.MayTapOrUntapTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -54,7 +55,7 @@ public class TeardropKami extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Teardrop Kami: You may tap or untap target creature. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD,new MayTapOrUntapTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,new MayTapOrUntapTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TendoIceBridge.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TendoIceBridge.java index 6c10c779d26..3c20f97de24 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TendoIceBridge.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TendoIceBridge.java @@ -28,8 +28,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisGrasp.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisGrasp.java index d30220e9acf..a4f19520dda 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisGrasp.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisGrasp.java @@ -29,14 +29,16 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -83,7 +85,7 @@ public class TerashisGrasp extends CardImpl { private class TerashisGraspEffect extends OneShotEffect { public TerashisGraspEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); staticText = "You gain life equal to its converted mana cost"; } @@ -93,7 +95,7 @@ public class TerashisGrasp extends CardImpl { @Override public boolean apply(Game game, Ability source) { - MageObject card = game.getLastKnownInformation(source.getFirstTarget(), Constants.Zone.BATTLEFIELD); + MageObject card = game.getLastKnownInformation(source.getFirstTarget(), Zone.BATTLEFIELD); if (card != null) { int cost = card.getManaCost().get(0).convertedManaCost(); Player player = game.getPlayer(source.getControllerId()); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisVerdict.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisVerdict.java index 11a2eec15ae..0d0d597c696 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisVerdict.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisVerdict.java @@ -28,8 +28,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.Filter; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThatWhichWasTaken.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThatWhichWasTaken.java index a32d5a9a328..f8c936cf4a5 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThatWhichWasTaken.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThatWhichWasTaken.java @@ -28,9 +28,9 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,6 +41,7 @@ import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.predicate.permanent.AnotherPredicate; @@ -69,15 +70,15 @@ public class ThatWhichWasTaken extends CardImpl { this.supertype.add("Legendary"); // {4}, {T}: Put a divinity counter on target permanent other than That Which Was Taken. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.DIVINITY.createInstance()), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.DIVINITY.createInstance()), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); // Each permanent with a divinity counter on it is indestructible. - Effect effect = new GainAbilityAllEffect(IndestructibleAbility.getInstance(), Constants.Duration.WhileOnBattlefield, filterIndestructible, false); + Effect effect = new GainAbilityAllEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield, filterIndestructible, false); effect.setText("Each permanent with a divinity counter on it is indestructible"); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreadsOfDisloyalty.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreadsOfDisloyalty.java index 457a718c1a3..c3de4a0ac4b 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreadsOfDisloyalty.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreadsOfDisloyalty.java @@ -29,10 +29,10 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreeTragedies.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreeTragedies.java index da9bcec94be..eb7a3fdc9af 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreeTragedies.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreeTragedies.java @@ -28,8 +28,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DiscardTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThroatSlitter.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThroatSlitter.java index 78dbb8f5f9f..4ded6b583d4 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThroatSlitter.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThroatSlitter.java @@ -28,9 +28,9 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ToilsOfNightAndDay.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ToilsOfNightAndDay.java index ad1512d86a4..84115f54806 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ToilsOfNightAndDay.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ToilsOfNightAndDay.java @@ -28,10 +28,10 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -90,9 +90,9 @@ public class ToilsOfNightAndDay extends CardImpl { for (UUID targetId : source.getTargets().get(0).getTargets()) { Permanent permanent = game.getPermanent(targetId); if (permanent != null) { - if (player.chooseUse(Constants.Outcome.Tap, new StringBuilder("Tap ").append(permanent.getName()).append("?").toString(), game)) { + if (player.chooseUse(Outcome.Tap, new StringBuilder("Tap ").append(permanent.getName()).append("?").toString(), game)) { permanent.tap(game); - } else if (player.chooseUse(Constants.Outcome.Untap, new StringBuilder("Untap ").append(permanent.getName()).append("?").toString(), game)) { + } else if (player.chooseUse(Outcome.Untap, new StringBuilder("Untap ").append(permanent.getName()).append("?").toString(), game)) { permanent.untap(game); } } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ToshiroUmezawa.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ToshiroUmezawa.java index 590febaa245..0f801d37010 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ToshiroUmezawa.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ToshiroUmezawa.java @@ -28,12 +28,12 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesCreatureTriggeredAbility; @@ -42,6 +42,7 @@ import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.keyword.BushidoAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -64,7 +65,7 @@ public class ToshiroUmezawa extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature an opponent controls"); private static final FilterCard filterInstant = new FilterCard("instant card from your graveyard"); static { - filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT)); + filter.add(new ControllerPredicate(TargetController.OPPONENT)); filterInstant.add(new CardTypePredicate(CardType.INSTANT)); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TraprootKami.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TraprootKami.java index 548646e97c9..17aecdbe485 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TraprootKami.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TraprootKami.java @@ -29,9 +29,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -40,6 +39,8 @@ import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -66,7 +67,7 @@ public class TraprootKami extends CardImpl { this.addAbility(DefenderAbility.getInstance()); this.addAbility(ReachAbility.getInstance()); // Traproot Kami's toughness is equal to the number of Forests on the battlefield. - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new BoostSourceEffect(new StaticValue(0), new PermanentsOnBattlefieldCount(filter), Constants.Duration.EndOfGame))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new BoostSourceEffect(new StaticValue(0), new PermanentsOnBattlefieldCount(filter), Duration.EndOfGame))); } public TraprootKami(final TraprootKami card) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/UmezawasJitte.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/UmezawasJitte.java index 72af1d83204..edb2a732511 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/UmezawasJitte.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/UmezawasJitte.java @@ -27,9 +27,7 @@ */ package mage.sets.betrayersofkamigawa; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.TriggeredAbilityImpl; @@ -66,9 +64,9 @@ public class UmezawasJitte extends CardImpl { this.addAbility(new UmezawasJitteAbility()); // Remove a charge counter from Umezawa's Jitte: Choose one Equipped creature gets +2/+2 until end of turn; or target creature gets -1/-1 until end of turn; or you gain 2 life. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2, Constants.Duration.EndOfTurn), new RemoveCountersSourceCost(CounterType.CHARGE.createInstance())); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2, Duration.EndOfTurn), new RemoveCountersSourceCost(CounterType.CHARGE.createInstance())); Mode mode = new Mode(); - mode.getEffects().add(new BoostTargetEffect(-1, -1, Constants.Duration.EndOfTurn)); + mode.getEffects().add(new BoostTargetEffect(-1, -1, Duration.EndOfTurn)); mode.getTargets().add(new TargetCreaturePermanent()); ability.addMode(mode); mode = new Mode(); @@ -77,7 +75,7 @@ public class UmezawasJitte extends CardImpl { this.addAbility(ability); // Equip {2} - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(2))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); } public UmezawasJitte(final UmezawasJitte card) { @@ -93,7 +91,7 @@ public class UmezawasJitte extends CardImpl { class UmezawasJitteAbility extends TriggeredAbilityImpl { public UmezawasJitteAbility() { - super(Constants.Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2))); + super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2))); } public UmezawasJitteAbility(final UmezawasJitteAbility ability) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/UncheckedGrowth.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/UncheckedGrowth.java index 87c04970119..1421b9a75cd 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/UncheckedGrowth.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/UncheckedGrowth.java @@ -28,14 +28,18 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; @@ -53,7 +57,7 @@ public class UncheckedGrowth extends CardImpl { this.color.setGreen(true); // Target creature gets +4/+4 until end of turn. - this.getSpellAbility().addEffect(new BoostTargetEffect(4, 4, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(4, 4, Duration.EndOfTurn)); // If it's a Spirit, it gains trample until end of turn. this.getSpellAbility().addEffect(new UncheckedGrowthTrampleEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); @@ -71,7 +75,7 @@ public class UncheckedGrowth extends CardImpl { private class UncheckedGrowthTrampleEffect extends ContinuousEffectImpl { public UncheckedGrowthTrampleEffect() { - super(Constants.Duration.EndOfTurn, Constants.Layer.AbilityAddingRemovingEffects_6, Constants.SubLayer.NA, Constants.Outcome.AddAbility); + super(Duration.EndOfTurn, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility); staticText = "If it's a Spirit, it gains trample until end of turn"; } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Uproot.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Uproot.java index cbd33af5cdc..99a27740b18 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Uproot.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Uproot.java @@ -28,8 +28,8 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetLandPermanent; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/WalkerOfSecretWays.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/WalkerOfSecretWays.java index 200f558d005..c79a12b621d 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/WalkerOfSecretWays.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/WalkerOfSecretWays.java @@ -28,9 +28,9 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -41,6 +41,8 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.NinjutsuAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -74,7 +76,7 @@ public class WalkerOfSecretWays extends CardImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new WalkerOfSecretWaysEffect(), true, true)); // {1}{U}: Return target Ninja you control to its owner's hand. Activate this ability only during your turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{1}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{1}{U}")); ability.addTarget(new TargetControlledCreaturePermanent(1,1, filterCreature, false)); ability.addCost(new OnlyDuringYourTurnCost()); this.addAbility(ability); @@ -94,7 +96,7 @@ public class WalkerOfSecretWays extends CardImpl { class WalkerOfSecretWaysEffect extends OneShotEffect { WalkerOfSecretWaysEffect() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); staticText = "look at that player's hand"; } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/WaxmaneBaku.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/WaxmaneBaku.java index 1b92dcdc147..6dd2cd504a1 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/WaxmaneBaku.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/WaxmaneBaku.java @@ -30,10 +30,10 @@ package mage.sets.betrayersofkamigawa; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +44,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; @@ -91,7 +92,7 @@ class WaxmaneBakuTapEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterCreaturePermanent(); public WaxmaneBakuTapEffect() { - super(Constants.Outcome.Tap); + super(Outcome.Tap); staticText = "Tap X target creatures"; } @@ -108,7 +109,7 @@ class WaxmaneBakuTapEffect extends OneShotEffect { } } TargetPermanent target = new TargetPermanent(numberToTap, filter); - if (target.canChoose(source.getControllerId(), game) && target.choose(Constants.Outcome.Tap, source.getControllerId(), source.getId(), game)) { + if (target.canChoose(source.getControllerId(), game) && target.choose(Outcome.Tap, source.getControllerId(), source.getId(), game)) { if (!target.getTargets().isEmpty()) { List targets = target.getTargets(); for (UUID targetId : targets) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiAvalanchers.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiAvalanchers.java index 7cbab4b4b25..641e9171583 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiAvalanchers.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiAvalanchers.java @@ -29,10 +29,10 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.ActivateOncePerTurnActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiCoalflinger.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiCoalflinger.java index 0627346c87a..260401aa8c5 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiCoalflinger.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiCoalflinger.java @@ -30,9 +30,7 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -59,7 +57,7 @@ public class AkkiCoalflinger extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FirstStrikeAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAllEffect(FirstStrikeAbility.getInstance(), Constants.Duration.EndOfTurn, new FilterAttackingCreature()), new ColoredManaCost(Constants.ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn, new FilterAttackingCreature()), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiLavarunner.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiLavarunner.java index d895544d491..10ad69aee69 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiLavarunner.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiLavarunner.java @@ -1,6 +1,5 @@ package mage.sets.championsofkamigawa; -import mage.Constants; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -15,6 +14,7 @@ import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.ProtectionAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; @@ -30,7 +30,7 @@ import java.util.UUID; public class AkkiLavarunner extends CardImpl { public AkkiLavarunner(UUID ownerId) { - super(ownerId, 153, "Akki Lavarunner", Constants.Rarity.RARE, new Constants.CardType[]{Constants.CardType.CREATURE}, "{3}{R}"); + super(ownerId, 153, "Akki Lavarunner", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{R}"); this.expansionSetCode = "CHK"; this.subtype.add("Goblin"); this.subtype.add("Warrior"); @@ -41,7 +41,7 @@ public class AkkiLavarunner extends CardImpl { this.flipCardName = "Tok-Tok, Volcano Born"; this.addAbility(HasteAbility.getInstance()); this.addAbility(new AkkiLavarunnerAbility()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ConditionalContinousEffect(new CopyTokenEffect(new TokTokVolcanoBorn()), FlippedCondition.getInstance(), ""))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new CopyTokenEffect(new TokTokVolcanoBorn()), FlippedCondition.getInstance(), ""))); } public AkkiLavarunner(final AkkiLavarunner card) { @@ -57,7 +57,7 @@ public class AkkiLavarunner extends CardImpl { class AkkiLavarunnerAbility extends TriggeredAbilityImpl { public AkkiLavarunnerAbility() { - super(Constants.Zone.BATTLEFIELD, new FlipSourceEffect()); + super(Zone.BATTLEFIELD, new FlipSourceEffect()); } public AkkiLavarunnerAbility(final AkkiLavarunnerAbility ability) { @@ -97,21 +97,21 @@ class TokTokVolcanoBorn extends Token { TokTokVolcanoBorn() { super("Tok-Tok, Volcano Born", ""); supertype.add("Legendary"); - cardType.add(Constants.CardType.CREATURE); + cardType.add(CardType.CREATURE); color.setRed(true); subtype.add("Goblin"); subtype.add("Shaman"); power = new MageInt(2); toughness = new MageInt(2); this.addAbility(new ProtectionAbility(filter)); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new TokTokVolcanoBornEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TokTokVolcanoBornEffect())); } } class TokTokVolcanoBornEffect extends ReplacementEffectImpl { TokTokVolcanoBornEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "If a red source would deal damage to a player, it deals that much damage plus 1 to that player instead"; } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiRockspeaker.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiRockspeaker.java index 78cee07856b..db5ef4102d9 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiRockspeaker.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiRockspeaker.java @@ -29,14 +29,14 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.BasicManaEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; /** * @author Loki, North @@ -53,7 +53,7 @@ public class AkkiRockspeaker extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new EntersBattlefieldTriggeredAbility(new BasicManaEffect(new Mana(Constants.ColoredManaSymbol.R)))); + this.addAbility(new EntersBattlefieldTriggeredAbility(new BasicManaEffect(new Mana(ColoredManaSymbol.R)))); } public AkkiRockspeaker(final AkkiRockspeaker card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiUnderminer.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiUnderminer.java index e17603147d8..272c4ae647b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiUnderminer.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiUnderminer.java @@ -30,14 +30,14 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.SacrificeEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; @@ -76,7 +76,7 @@ public class AkkiUnderminer extends CardImpl { class AkkiUnderminerAbility extends TriggeredAbilityImpl { public AkkiUnderminerAbility() { - super(Constants.Zone.BATTLEFIELD, new SacrificeEffect(new FilterPermanent(), 1, "")); + super(Zone.BATTLEFIELD, new SacrificeEffect(new FilterPermanent(), 1, "")); } public AkkiUnderminerAbility(final AkkiUnderminerAbility ability) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java index 4c48df98af2..59f6d791575 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java @@ -30,8 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AuraOfDominion.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AuraOfDominion.java index 67d347785c9..dcece15c491 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AuraOfDominion.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AuraOfDominion.java @@ -30,9 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; @@ -41,6 +40,8 @@ import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.UntapEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; @@ -67,9 +68,9 @@ public class AuraOfDominion extends CardImpl { this.color.setBlue(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Untap)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Untap)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new UntapEnchantedEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapEnchantedEffect(), new GenericManaCost(1)); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AzamiLadyOfScrolls.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AzamiLadyOfScrolls.java index c76988820ba..6a08351fddf 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AzamiLadyOfScrolls.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AzamiLadyOfScrolls.java @@ -30,14 +30,14 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -65,7 +65,7 @@ public class AzamiLadyOfScrolls extends CardImpl { this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new TapTargetCost(new TargetControlledPermanent(1, 1, filter, false)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new TapTargetCost(new TargetControlledPermanent(1, 1, filter, false)))); } public AzamiLadyOfScrolls(final AzamiLadyOfScrolls card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AzusaLostButSeeking.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AzusaLostButSeeking.java index d772a27d10b..2290f55a5f8 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AzusaLostButSeeking.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AzusaLostButSeeking.java @@ -30,13 +30,14 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.PlayAdditionalLandsControllerEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -53,7 +54,7 @@ public class AzusaLostButSeeking extends CardImpl { this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new PlayAdditionalLandsControllerEffect(2, Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayAdditionalLandsControllerEffect(2, Duration.WhileOnBattlefield))); } public AzusaLostButSeeking (final AzusaLostButSeeking card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BattleMadRonin.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BattleMadRonin.java index 47599b28e5c..1be710357a0 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/BattleMadRonin.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BattleMadRonin.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.keyword.BushidoAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Befoul.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Befoul.java index 66d0486b4bf..850475e7561 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Befoul.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Befoul.java @@ -31,8 +31,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BenBenAkkiHermit.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BenBenAkkiHermit.java index a7752e20ec2..a2aebad1a99 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/BenBenAkkiHermit.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BenBenAkkiHermit.java @@ -30,9 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -68,7 +68,7 @@ public class BenBenAkkiHermit extends CardImpl { this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter), true), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter), true), new TapSourceCost()); ability.addTarget(new TargetAttackingCreature()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BlindWithAnger.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BlindWithAnger.java index 88b6cd2ad6d..85ce1d7288b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/BlindWithAnger.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BlindWithAnger.java @@ -30,14 +30,14 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.effects.common.continious.GainControlTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SupertypePredicate; @@ -61,8 +61,8 @@ public class BlindWithAnger extends CardImpl { this.subtype.add("Arcane"); this.color.setRed(true); this.getSpellAbility().addEffect(new UntapTargetEffect()); - this.getSpellAbility().addEffect(new GainControlTargetEffect(Constants.Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); Target target = new TargetCreaturePermanent(filter); this.getSpellAbility().addTarget(target); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BloodRites.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BloodRites.java index 400d5e25795..89e20a5bf30 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/BloodRites.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BloodRites.java @@ -30,15 +30,15 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreatureOrPlayer; @@ -50,7 +50,7 @@ public class BloodRites extends CardImpl { super(ownerId, 159, "Blood Rites", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}{R}"); this.expansionSetCode = "CHK"; this.color.setRed(true); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{1}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{1}{R}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BloodSpeaker.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BloodSpeaker.java index 84d34a6bb15..3b5a77f2047 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/BloodSpeaker.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BloodSpeaker.java @@ -29,10 +29,10 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -41,6 +41,7 @@ import mage.abilities.effects.common.ReturnSourceFromGraveyardToHandEffect; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -69,7 +70,7 @@ public class BloodSpeaker extends CardImpl { this.toughness = new MageInt(2); // At the beginning of your upkeep, you may sacrifice Blood Speaker. If you do, search your library for a Demon card, reveal that card, and put it into your hand. Then shuffle your library. - Ability ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceEffect(), Constants.TargetController.YOU, true); + Ability ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceEffect(), TargetController.YOU, true); ability.addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filterCard), true, true, "If you do, search your library for ")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BloodthirstyOgre.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BloodthirstyOgre.java index f3add9680c4..341ba0caf42 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/BloodthirstyOgre.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BloodthirstyOgre.java @@ -28,10 +28,10 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BrutalDeceiver.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BrutalDeceiver.java index 815b2c459eb..544f97d2d47 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/BrutalDeceiver.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BrutalDeceiver.java @@ -29,10 +29,10 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateOncePerTurnActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BudokaGardener.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BudokaGardener.java index a431708ac9c..12bbe556179 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/BudokaGardener.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BudokaGardener.java @@ -28,11 +28,11 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BurrGrafter.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BurrGrafter.java index a1c33bfad4c..cb028ac2f68 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/BurrGrafter.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BurrGrafter.java @@ -29,9 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.SoulshiftAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -57,7 +58,7 @@ public class BurrGrafter extends CardImpl { this.toughness = new MageInt(2); // Sacrifice Burr Grafter: Target creature gets +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Constants.Duration.EndOfTurn), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); this.addAbility(new SoulshiftAbility(3)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BushiTenderfoot.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BushiTenderfoot.java index ef0f49a3d39..9feb3676387 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/BushiTenderfoot.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BushiTenderfoot.java @@ -31,9 +31,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.DiesAndDealtDamageThisTurnTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CageOfHands.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CageOfHands.java index 1f501a0ad77..aeac0053949 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/CageOfHands.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/CageOfHands.java @@ -30,9 +30,7 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -60,11 +58,11 @@ public class CageOfHands extends CardImpl { this.color.setWhite(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Neutral)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Neutral)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new CageOfHandsEffect())); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ManaCostsImpl("{1}{W}"))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CageOfHandsEffect())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ManaCostsImpl("{1}{W}"))); } public CageOfHands (final CageOfHands card) { @@ -80,7 +78,7 @@ public class CageOfHands extends CardImpl { class CageOfHandsEffect extends RestrictionEffect { public CageOfHandsEffect() { - super(Constants.Duration.WhileOnBattlefield); + super(Duration.WhileOnBattlefield); staticText = "Enchanted creature can't attack or block"; } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CallToGlory.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CallToGlory.java index dcb82d7a94b..53d6997a825 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/CallToGlory.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/CallToGlory.java @@ -30,13 +30,14 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Outcome; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -60,7 +61,7 @@ private static final FilterCreaturePermanent filter = new FilterCreaturePermanen this.expansionSetCode = "CHK"; this.color.setWhite(true); this.getSpellAbility().addEffect(new CalltoGloryFirstEffect()); - this.getSpellAbility().addEffect(new BoostControlledEffect(1, 1, Constants.Duration.EndOfTurn, filter, false)); + this.getSpellAbility().addEffect(new BoostControlledEffect(1, 1, Duration.EndOfTurn, filter, false)); } public CallToGlory(final CallToGlory card) { @@ -78,7 +79,7 @@ private static final FilterCreaturePermanent filter = new FilterCreaturePermanen class CalltoGloryFirstEffect extends OneShotEffect { public CalltoGloryFirstEffect() { - super(Constants.Outcome.Untap); + super(Outcome.Untap); staticText = "Untap all creatures you control"; } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CallousDeceiver.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CallousDeceiver.java index b0dc4ba8162..379b6f0af20 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/CallousDeceiver.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/CallousDeceiver.java @@ -29,10 +29,10 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateOncePerTurnActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Cleanfall.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Cleanfall.java index ea40a7c31e4..33b0b50f5bb 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Cleanfall.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Cleanfall.java @@ -30,8 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CloudcrestLake.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CloudcrestLake.java index 0ec3ca51abf..927edfc3581 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/CloudcrestLake.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/CloudcrestLake.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.SkipNextUntapSourceEffect; import mage.abilities.mana.BlueManaAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CommuneWithNature.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CommuneWithNature.java index 3958715c9b4..0d70ed1696c 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/CommuneWithNature.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/CommuneWithNature.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CounselOfTheSoratami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CounselOfTheSoratami.java index 81929c1e898..c8bdcdd951d 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/CounselOfTheSoratami.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/CounselOfTheSoratami.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CranialExtraction.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CranialExtraction.java index cf9c3b2c37e..89d226e5044 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/CranialExtraction.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/CranialExtraction.java @@ -28,10 +28,10 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CruelDeceiver.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CruelDeceiver.java index 419ca5ab8e4..f011a24435e 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/CruelDeceiver.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/CruelDeceiver.java @@ -28,11 +28,11 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateOncePerTurnActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CrushingPain.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CrushingPain.java index 230dcfa8170..f1ca106e8a9 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/CrushingPain.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/CrushingPain.java @@ -31,8 +31,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CursedRonin.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CursedRonin.java index 7ca1a63a3e7..60957704741 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/CursedRonin.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/CursedRonin.java @@ -30,9 +30,7 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -55,7 +53,7 @@ public class CursedRonin extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new BushidoAbility(1)); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.B))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B))); } public CursedRonin (final CursedRonin card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CutTheTethers.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CutTheTethers.java index 155f60c72ac..0eb6e5db2ad 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/CutTheTethers.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/CutTheTethers.java @@ -28,15 +28,16 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -102,7 +103,7 @@ class CutTheTethersEffect extends OneShotEffect { paid = true; } if (!paid) { - creature.moveToZone(Constants.Zone.HAND, source.getSourceId(), game, true); + creature.moveToZone(Zone.HAND, source.getSourceId(), game, true); } } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/DanceOfShadows.java b/Mage.Sets/src/mage/sets/championsofkamigawa/DanceOfShadows.java index 0b78964bc14..b0312a67971 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/DanceOfShadows.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/DanceOfShadows.java @@ -30,13 +30,13 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -49,8 +49,8 @@ public class DanceOfShadows extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); this.color.setBlack(true); - this.getSpellAbility().addEffect(new BoostControlledEffect(1, 0, Constants.Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new GainAbilityControlledEffect(FearAbility.getInstance(), Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostControlledEffect(1, 0, Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainAbilityControlledEffect(FearAbility.getInstance(), Duration.EndOfTurn)); } public DanceOfShadows (final DanceOfShadows card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/DeathcurseOgre.java b/Mage.Sets/src/mage/sets/championsofkamigawa/DeathcurseOgre.java index 7a1ca438b87..2256dcccc31 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/DeathcurseOgre.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/DeathcurseOgre.java @@ -30,8 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.LoseLifePlayersEffect; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/DevotedRetainer.java b/Mage.Sets/src/mage/sets/championsofkamigawa/DevotedRetainer.java index b77a9fdbc65..0516e1c596a 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/DevotedRetainer.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/DevotedRetainer.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.BushidoAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/DevouringGreed.java b/Mage.Sets/src/mage/sets/championsofkamigawa/DevouringGreed.java index 2c42c7ba6ef..d89570310c2 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/DevouringGreed.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/DevouringGreed.java @@ -28,9 +28,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.common.SacrificeTargetCost; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/DevouringRage.java b/Mage.Sets/src/mage/sets/championsofkamigawa/DevouringRage.java index 9fb472ccd8c..da294abecf4 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/DevouringRage.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/DevouringRage.java @@ -28,10 +28,10 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.common.SacrificeTargetCost; @@ -39,6 +39,7 @@ import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -111,7 +112,7 @@ class DevouringRageEffect extends OneShotEffect { int amount = 3 + (numberSpirits * 3); Permanent targetCreature = game.getPermanent(getTargetPointer().getFirst(game, source)); if (targetCreature != null) { - ContinuousEffect effect = new BoostTargetEffect(amount, 0, Constants.Duration.EndOfTurn); + ContinuousEffect effect = new BoostTargetEffect(amount, 0, Duration.EndOfTurn); effect.setTargetPointer(new FixedTarget(targetCreature.getId())); game.addEffect(effect, source); return true; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/DosanTheFallingLeaf.java b/Mage.Sets/src/mage/sets/championsofkamigawa/DosanTheFallingLeaf.java index 80e48e88575..ed1a389786d 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/DosanTheFallingLeaf.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/DosanTheFallingLeaf.java @@ -29,9 +29,7 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -58,7 +56,7 @@ public class DosanTheFallingLeaf extends CardImpl { this.toughness = new MageInt(2); // Players can cast spells only during their own turns. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new DosanTheFallingLeafEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DosanTheFallingLeafEffect())); } public DosanTheFallingLeaf(final DosanTheFallingLeaf card) { @@ -73,7 +71,7 @@ public class DosanTheFallingLeaf extends CardImpl { class DosanTheFallingLeafEffect extends ReplacementEffectImpl { DosanTheFallingLeafEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Detriment); + super(Duration.WhileOnBattlefield, Outcome.Detriment); staticText = "Players can cast spells only during their own turns"; } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/DrippingTongueZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/DrippingTongueZubera.java index 02e82591769..a09f87b644e 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/DrippingTongueZubera.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/DrippingTongueZubera.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Earthshaker.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Earthshaker.java index 9a77644f60f..e7920ce8105 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Earthshaker.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Earthshaker.java @@ -30,8 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.dynamicvalue.common.StaticValue; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/EerieProcession.java b/Mage.Sets/src/mage/sets/championsofkamigawa/EerieProcession.java index a01df29a88d..a38f10cb277 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/EerieProcession.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/EerieProcession.java @@ -30,8 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.filter.FilterCard; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/EiganjoCastle.java b/Mage.Sets/src/mage/sets/championsofkamigawa/EiganjoCastle.java index 18043c034ba..b7e4d27dd86 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/EiganjoCastle.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/EiganjoCastle.java @@ -30,9 +30,7 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -60,7 +58,7 @@ public class EiganjoCastle extends CardImpl { this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); this.addAbility(new WhiteManaAbility()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PreventDamageTargetEffect(Constants.Duration.EndOfTurn, 2), new ColoredManaCost(Constants.ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageTargetEffect(Duration.EndOfTurn, 2), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/EightAndAHalfTale.java b/Mage.Sets/src/mage/sets/championsofkamigawa/EightAndAHalfTale.java index 255ea77d25f..eb61c027d71 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/EightAndAHalfTale.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/EightAndAHalfTale.java @@ -29,10 +29,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -42,6 +41,7 @@ import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.effects.common.continious.SetCardColorTargetEffect; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetControlledPermanent; @@ -70,12 +70,12 @@ public class EightAndAHalfTale extends CardImpl { this.toughness = new MageInt(2); // {1}{W}: Target permanent you control gains protection from white until end of turn. Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect( - new ProtectionAbility(filter), Constants.Duration.EndOfTurn), new ManaCostsImpl("{1}{W}")); + new ProtectionAbility(filter), Duration.EndOfTurn), new ManaCostsImpl("{1}{W}")); ability1.addTarget(new TargetControlledPermanent()); this.addAbility(ability1); // {1}: Target spell or permanent becomes white until end of turn. - Ability ability2 = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new SetCardColorTargetEffect( - ObjectColor.WHITE, Constants.Duration.EndOfTurn),new ManaCostsImpl("{1}")); + Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SetCardColorTargetEffect( + ObjectColor.WHITE, Duration.EndOfTurn),new ManaCostsImpl("{1}")); ability2.addTarget(new TargetSpellOrPermanent()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/EmberFistZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/EmberFistZubera.java index d5564dce91d..73b1f3df97a 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/EmberFistZubera.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/EmberFistZubera.java @@ -30,8 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/EtherealHaze.java b/Mage.Sets/src/mage/sets/championsofkamigawa/EtherealHaze.java index 962b24defea..a68105dcafc 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/EtherealHaze.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/EtherealHaze.java @@ -29,9 +29,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.PreventAllDamageEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/EyeOfNowhere.java b/Mage.Sets/src/mage/sets/championsofkamigawa/EyeOfNowhere.java index a71fb4cc96e..1d824b59d5e 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/EyeOfNowhere.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/EyeOfNowhere.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPermanent; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/FeastOfWorms.java b/Mage.Sets/src/mage/sets/championsofkamigawa/FeastOfWorms.java index 0c3b6bc7c14..3486026f17e 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/FeastOfWorms.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/FeastOfWorms.java @@ -29,10 +29,10 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/FeralDeceiver.java b/Mage.Sets/src/mage/sets/championsofkamigawa/FeralDeceiver.java index aa81a9545c6..83a51ce5496 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/FeralDeceiver.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/FeralDeceiver.java @@ -28,10 +28,10 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateOncePerTurnActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/FieldOfReality.java b/Mage.Sets/src/mage/sets/championsofkamigawa/FieldOfReality.java index 396c4095804..1e9a754b9c8 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/FieldOfReality.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/FieldOfReality.java @@ -30,12 +30,11 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.EvasionAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -47,6 +46,7 @@ import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -66,11 +66,11 @@ public class FieldOfReality extends CardImpl { // Enchanted creature can't be blocked by Spirits. TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new FieldOfRealityEvasionAbility(), AttachmentType.AURA ))); // {1}{U}: Return Field of Reality to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ManaCostsImpl("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ManaCostsImpl("{1}{U}"))); } public FieldOfReality(final FieldOfReality card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/FloatingDreamZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/FloatingDreamZubera.java index da55db6b467..4174d88de1f 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/FloatingDreamZubera.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/FloatingDreamZubera.java @@ -30,10 +30,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.WatcherScope; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.WatcherScope; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -41,6 +40,7 @@ import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -96,7 +96,7 @@ class ZuberasDiedWatcher extends WatcherImpl { @Override public void watch(GameEvent event, Game game) { if (event.getType() == GameEvent.EventType.ZONE_CHANGE && ((ZoneChangeEvent) event).isDiesEvent()) { - MageObject card = game.getLastKnownInformation(event.getTargetId(), Constants.Zone.BATTLEFIELD); + MageObject card = game.getLastKnownInformation(event.getTargetId(), Zone.BATTLEFIELD); if (card != null && card.hasSubtype("Zubera")) { zuberasDiedThisTurn++; } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ForbiddenOrchard.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ForbiddenOrchard.java index 1a69e36d20c..5f69c430d3b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ForbiddenOrchard.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ForbiddenOrchard.java @@ -30,9 +30,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.CreateTokenTargetEffect; import mage.abilities.mana.AnyColorManaAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Frostwielder.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Frostwielder.java index e7dbf2a5dea..bfe7c5d3ff0 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Frostwielder.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Frostwielder.java @@ -29,11 +29,11 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/GaleForce.java b/Mage.Sets/src/mage/sets/championsofkamigawa/GaleForce.java index 43c740491fa..c8faf504076 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/GaleForce.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/GaleForce.java @@ -30,8 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/GeneralsKabuto.java b/Mage.Sets/src/mage/sets/championsofkamigawa/GeneralsKabuto.java index a1423548fc1..8ecdaf05bfb 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/GeneralsKabuto.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/GeneralsKabuto.java @@ -34,11 +34,7 @@ package mage.sets.championsofkamigawa; */ import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -64,10 +60,10 @@ public class GeneralsKabuto extends CardImpl { this.subtype.add("Equipment"); // Equipped creature has shroud. (It can't be the target of spells or abilities.) - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShroudAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.EQUIPMENT))); // Prevent all combat damage that would be dealt to equipped creature - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GeneralsKabutoEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GeneralsKabutoEffect())); // Equip {2} this.addAbility(new EquipAbility(Outcome.PreventDamage, new GenericManaCost(2))); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/GhostlyPrison.java b/Mage.Sets/src/mage/sets/championsofkamigawa/GhostlyPrison.java index be8ceee596f..1f6585780e6 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/GhostlyPrison.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/GhostlyPrison.java @@ -30,9 +30,7 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -52,7 +50,7 @@ public class GhostlyPrison extends CardImpl { super(ownerId, 10, "Ghostly Prison", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); this.expansionSetCode = "CHK"; this.color.setWhite(true); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GhostlyPrisonReplacementEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GhostlyPrisonReplacementEffect())); } public GhostlyPrison (final GhostlyPrison card) { @@ -71,7 +69,7 @@ class GhostlyPrisonReplacementEffect extends ReplacementEffectImpl { this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(2); - Ability ability = new SpellCastTriggeredAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn), filter, false); + Ability ability = new SpellCastTriggeredAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), filter, false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/GutwrencherOni.java b/Mage.Sets/src/mage/sets/championsofkamigawa/GutwrencherOni.java index 23cd49bffe4..4f2cdddb775 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/GutwrencherOni.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/GutwrencherOni.java @@ -28,9 +28,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.condition.common.ControlsPermanentCondition; @@ -38,6 +38,7 @@ import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DiscardControllerEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -71,7 +72,7 @@ public class GutwrencherOni extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new ConditionalOneShotEffect( new DiscardControllerEffect(1), new ControlsPermanentCondition(filter, ControlsPermanentCondition.CountType.EQUAL_TO, 0), - "discard a card if you don't control an Ogre"), Constants.TargetController.YOU, false)); + "discard a card if you don't control an Ogre"), TargetController.YOU, false)); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HairStrungKoto.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HairStrungKoto.java index 73a2bf008c9..ddd495eb6fc 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HairStrungKoto.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HairStrungKoto.java @@ -31,9 +31,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HanaKami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HanaKami.java index c89adf7d7d4..bcfbed77fd9 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HanaKami.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HanaKami.java @@ -30,9 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,7 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInYourGraveyard; @@ -62,7 +62,7 @@ public class HanaKami extends CardImpl { this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{1}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{1}{G}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HanabiBlast.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HanabiBlast.java index 4ab02c39f92..00198cad9ef 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HanabiBlast.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HanabiBlast.java @@ -30,8 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.DiscardControllerEffect; import mage.abilities.effects.common.ReturnToHandSpellEffect; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Hankyu.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Hankyu.java index 044dafc7843..2f42eae8e24 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Hankyu.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Hankyu.java @@ -28,11 +28,11 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HarshDeceiver.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HarshDeceiver.java index 60e73a2b440..089e774eec3 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HarshDeceiver.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HarshDeceiver.java @@ -29,10 +29,10 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateOncePerTurnActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HeWhoHungers.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HeWhoHungers.java index 9fc0660112c..5bc1a65a4bd 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HeWhoHungers.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HeWhoHungers.java @@ -33,9 +33,9 @@ package mage.sets.championsofkamigawa; */ -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HeartbeatOfSpring.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HeartbeatOfSpring.java index d457078f60c..e38b13cd963 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HeartbeatOfSpring.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HeartbeatOfSpring.java @@ -29,9 +29,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.Mana; import mage.abilities.Abilities; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HearthKami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HearthKami.java index 1436ac864b4..fbae06789b0 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HearthKami.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HearthKami.java @@ -29,9 +29,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HikariTwilightGuardian.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HikariTwilightGuardian.java index c78ea03bad1..76b29a1f6a2 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HikariTwilightGuardian.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HikariTwilightGuardian.java @@ -29,9 +29,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastTriggeredAbility; @@ -40,6 +40,8 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ReturnFromExileEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterSpiritOrArcaneCard; import mage.game.Game; import mage.game.permanent.Permanent; @@ -80,7 +82,7 @@ class HikariTwilightGuardianEffect extends OneShotEffect { this.toughness = new MageInt(3); // {2}{U}, Discard a card: Counter target spell if it has the same converted mana cost as the discarded card. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new HisokaMinamoSenseiCounterEffect(), new ManaCostsImpl("{2}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HisokaMinamoSenseiCounterEffect(), new ManaCostsImpl("{2}{U}")); ability.addTarget(new TargetSpell()); TargetCardInHand targetCard = new TargetCardInHand(new FilterCard("a card")); ability.addCost(new HisokaMinamoSenseiDiscardTargetCost(targetCard)); @@ -131,7 +131,7 @@ class HisokaMinamoSenseiDiscardTargetCost extends CostImpl { HisokaMinamoSenseiCounterEffect() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); staticText = "Counter target spell if it has the same converted mana cost as the discarded card"; } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HisokasDefiance.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HisokasDefiance.java index 1c4921ac878..b4a023e16c5 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HisokasDefiance.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HisokasDefiance.java @@ -30,8 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HisokasGuard.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HisokasGuard.java index bee933e1e6c..46734f36351 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HisokasGuard.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HisokasGuard.java @@ -28,13 +28,13 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HoldTheLine.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HoldTheLine.java index e81a9eb9080..7a38fca81a1 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HoldTheLine.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HoldTheLine.java @@ -28,9 +28,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.cards.CardImpl; import mage.filter.common.FilterBlockingCreature; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfCleansingFire.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfCleansingFire.java index 50cc6d05895..eff3b24574e 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfCleansingFire.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfCleansingFire.java @@ -30,13 +30,13 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -59,7 +59,7 @@ public class HondenOfCleansingFire extends CardImpl { this.color.setWhite(true); // At the beginning of your upkeep, you gain 2 life for each Shrine you control. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new GainLifeEffect(new PermanentsOnBattlefieldCount(filter, 2)), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new GainLifeEffect(new PermanentsOnBattlefieldCount(filter, 2)), TargetController.YOU, false)); } public HondenOfCleansingFire(final HondenOfCleansingFire card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfInfiniteRage.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfInfiniteRage.java index e39e85aa3ba..a74124630c5 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfInfiniteRage.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfInfiniteRage.java @@ -29,14 +29,15 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreatureOrPlayer; @@ -61,7 +62,7 @@ public class HondenOfInfiniteRage extends CardImpl { this.color.setRed(true); // At the beginning of your upkeep, Honden of Infinite Rage deals damage to target creature or player equal to the number of Shrines you control. - Ability ability = new BeginningOfUpkeepTriggeredAbility(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)), Constants.TargetController.YOU, false); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)), TargetController.YOU, false); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfLifesWeb.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfLifesWeb.java index f58957d5411..cc155e23bc5 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfLifesWeb.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfLifesWeb.java @@ -30,13 +30,13 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.SpiritToken; @@ -58,7 +58,7 @@ public class HondenOfLifesWeb extends CardImpl { this.supertype.add("Legendary"); this.subtype.add("Shrine"); this.color.setGreen(true); - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new SpiritToken(), new PermanentsOnBattlefieldCount(filter)), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new SpiritToken(), new PermanentsOnBattlefieldCount(filter)), TargetController.YOU, false)); } public HondenOfLifesWeb(final HondenOfLifesWeb card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfNightsReach.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfNightsReach.java index 1a49a50de99..fb511e46707 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfNightsReach.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfNightsReach.java @@ -29,14 +29,15 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DiscardTargetEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetOpponent; @@ -60,7 +61,7 @@ public class HondenOfNightsReach extends CardImpl { this.color.setBlack(true); // At the beginning of your upkeep, target opponent discards a card for each Shrine you control. - Ability ability = new BeginningOfUpkeepTriggeredAbility(new DiscardTargetEffect(new PermanentsOnBattlefieldCount(filter)), Constants.TargetController.YOU, false); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new DiscardTargetEffect(new PermanentsOnBattlefieldCount(filter)), TargetController.YOU, false); ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfSeeingWinds.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfSeeingWinds.java index efdc9f1c2c6..73577960b2b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfSeeingWinds.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfSeeingWinds.java @@ -30,13 +30,13 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -59,7 +59,7 @@ public class HondenOfSeeingWinds extends CardImpl { this.color.setBlue(true); // At the beginning of your upkeep, draw a card for each Shrine you control. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DrawCardControllerEffect(new PermanentsOnBattlefieldCount(filter)), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DrawCardControllerEffect(new PermanentsOnBattlefieldCount(filter)), TargetController.YOU, false)); } public HondenOfSeeingWinds(final HondenOfSeeingWinds card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HonorWornShaku.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HonorWornShaku.java index ff8c52525ec..7150ff797a9 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HonorWornShaku.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HonorWornShaku.java @@ -30,15 +30,15 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.UntapSourceEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SupertypePredicate; @@ -62,7 +62,7 @@ public class HonorWornShaku extends CardImpl { this.expansionSetCode = "CHK"; this.addAbility(new ColorlessManaAbility()); Ability ability = new SimpleActivatedAbility( - Constants.Zone.BATTLEFIELD, + Zone.BATTLEFIELD, new UntapSourceEffect(), new TapTargetCost(new TargetControlledPermanent(filter))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HorizonSeed.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HorizonSeed.java index 6a2c672927e..5d2b797311b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HorizonSeed.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HorizonSeed.java @@ -30,8 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HorobiDeathsWail.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HorobiDeathsWail.java index 431444e3509..2a27ec70f7e 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HorobiDeathsWail.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HorobiDeathsWail.java @@ -28,9 +28,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HumbleBudoka.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HumbleBudoka.java index 05d9db777ed..ac839998933 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HumbleBudoka.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HumbleBudoka.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HundredTalonKami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HundredTalonKami.java index c42b6f5138d..59c11249505 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HundredTalonKami.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HundredTalonKami.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.SoulshiftAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/InameDeathAspect.java b/Mage.Sets/src/mage/sets/championsofkamigawa/InameDeathAspect.java index a9a1e610932..77235e81740 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/InameDeathAspect.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/InameDeathAspect.java @@ -29,15 +29,16 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.SearchEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -80,7 +81,7 @@ class InameDeathAspectEffect extends SearchEffect { } public InameDeathAspectEffect() { - super(new TargetCardInLibrary(0, Integer.MAX_VALUE, filter), Constants.Outcome.Neutral); + super(new TargetCardInLibrary(0, Integer.MAX_VALUE, filter), Outcome.Neutral); staticText = "search your library for any number of Spirit cards and put them into your graveyard. If you do, shuffle your library"; } @@ -101,7 +102,7 @@ class InameDeathAspectEffect extends SearchEffect { for (UUID cardId: target.getTargets()) { Card card = player.getLibrary().remove(cardId, game); if (card != null){ - card.moveToZone(Constants.Zone.GRAVEYARD, source.getId(), game, false); + card.moveToZone(Zone.GRAVEYARD, source.getId(), game, false); } } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/InameLifeAspect.java b/Mage.Sets/src/mage/sets/championsofkamigawa/InameLifeAspect.java index 12d55c44181..cece4c5318e 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/InameLifeAspect.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/InameLifeAspect.java @@ -28,8 +28,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/IndomitableWill.java b/Mage.Sets/src/mage/sets/championsofkamigawa/IndomitableWill.java index a616bf55515..4ab4bd82d6e 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/IndomitableWill.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/IndomitableWill.java @@ -30,9 +30,7 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -58,10 +56,10 @@ public class IndomitableWill extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2, Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield))); } public IndomitableWill (final IndomitableWill card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/InitiateOfBlood.java b/Mage.Sets/src/mage/sets/championsofkamigawa/InitiateOfBlood.java index 88dfcaf77c4..5a434728e56 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/InitiateOfBlood.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/InitiateOfBlood.java @@ -29,8 +29,7 @@ */ package mage.sets.championsofkamigawa; -import mage.Constants; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesAndDealtDamageThisTurnTriggeredAbility; @@ -43,6 +42,8 @@ import mage.abilities.effects.common.CopyTokenEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.FlipSourceEffect; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.WasDealtDamageThisTurnPredicate; import mage.game.permanent.token.Token; @@ -62,7 +63,7 @@ public class InitiateOfBlood extends CardImpl { } public InitiateOfBlood(UUID ownerId) { - super(ownerId, 173, "Initiate of Blood", Constants.Rarity.UNCOMMON, new Constants.CardType[]{Constants.CardType.CREATURE}, "{3}{R}"); + super(ownerId, 173, "Initiate of Blood", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{R}"); this.expansionSetCode = "CHK"; this.subtype.add("Ogre"); this.subtype.add("Shaman"); @@ -79,7 +80,7 @@ public class InitiateOfBlood extends CardImpl { // When that creature is put into a graveyard this turn, flip Initiate of Blood. this.addAbility(new DiesAndDealtDamageThisTurnTriggeredAbility(new FlipSourceEffect())); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ConditionalContinousEffect(new CopyTokenEffect(new GokaTheUnjust()), FlippedCondition.getInstance(), ""))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new CopyTokenEffect(new GokaTheUnjust()), FlippedCondition.getInstance(), ""))); } @@ -105,7 +106,7 @@ class GokaTheUnjust extends Token { GokaTheUnjust() { super("Goka the Unjust", ""); supertype.add("Legendary"); - cardType.add(Constants.CardType.CREATURE); + cardType.add(CardType.CREATURE); color.setRed(true); subtype.add("Ogre"); subtype.add("Shaman"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/InnocenceKami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/InnocenceKami.java index a1d3b54b1ee..56b7dc6f89a 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/InnocenceKami.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/InnocenceKami.java @@ -30,9 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.TapTargetEffect; import mage.abilities.effects.common.UntapSourceEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.filter.common.FilterSpiritOrArcaneCard; import mage.target.common.TargetCreaturePermanent; @@ -59,7 +60,7 @@ public class InnocenceKami extends CardImpl { this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/IsamaruHoundofKonda.java b/Mage.Sets/src/mage/sets/championsofkamigawa/IsamaruHoundofKonda.java index 4588d7d0a5b..9db14e729c5 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/IsamaruHoundofKonda.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/IsamaruHoundofKonda.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/JadeIdol.java b/Mage.Sets/src/mage/sets/championsofkamigawa/JadeIdol.java index a4182817b38..23981841e25 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/JadeIdol.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/JadeIdol.java @@ -30,9 +30,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.common.continious.BecomesCreatureSourceEffect; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/JourneyersKite.java b/Mage.Sets/src/mage/sets/championsofkamigawa/JourneyersKite.java index 013270320e2..acb71ac520b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/JourneyersKite.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/JourneyersKite.java @@ -30,9 +30,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/JoyousRespite.java b/Mage.Sets/src/mage/sets/championsofkamigawa/JoyousRespite.java index 7d19b606969..1d0a611cda0 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/JoyousRespite.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/JoyousRespite.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/JuganTheRisingStar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/JuganTheRisingStar.java index bed48c95ae4..486dea7eb0b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/JuganTheRisingStar.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/JuganTheRisingStar.java @@ -29,9 +29,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/JukaiMessenger.java b/Mage.Sets/src/mage/sets/championsofkamigawa/JukaiMessenger.java index 177af4d805a..595aee650a0 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/JukaiMessenger.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/JukaiMessenger.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ForestwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/JunkyoBell.java b/Mage.Sets/src/mage/sets/championsofkamigawa/JunkyoBell.java index 21793c1cc45..c08a209b1f0 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/JunkyoBell.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/JunkyoBell.java @@ -29,9 +29,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -41,6 +41,9 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.SacrificeTargetEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -59,7 +62,7 @@ public class JunkyoBell extends CardImpl { // At the beginning of your upkeep, you may have target creature you control get +X/+X until end of turn, // where X is the number of creatures you control. If you do, sacrifice that creature at the beginning of the next end step. PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()); - Ability ability = new BeginningOfUpkeepTriggeredAbility(new BoostTargetEffect(amount, amount, Constants.Duration.EndOfTurn), Constants.TargetController.YOU, true); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new BoostTargetEffect(amount, amount, Duration.EndOfTurn), TargetController.YOU, true); ability.addTarget(new TargetControlledCreaturePermanent()); ability.addEffect(new JunkyoBellSacrificeEffect()); this.addAbility(ability); @@ -78,7 +81,7 @@ public class JunkyoBell extends CardImpl { private class JunkyoBellSacrificeEffect extends OneShotEffect { public JunkyoBellSacrificeEffect() { - super(Constants.Outcome.Sacrifice); + super(Outcome.Sacrifice); this.staticText = "If you do, sacrifice that creature at the beginning of the next end step"; } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/JushiApprentice.java b/Mage.Sets/src/mage/sets/championsofkamigawa/JushiApprentice.java index b4ba0334ea8..d5bc1f7e6fe 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/JushiApprentice.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/JushiApprentice.java @@ -28,9 +28,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KabutoMoth.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KabutoMoth.java index d050979003f..ba635b56c34 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KabutoMoth.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KabutoMoth.java @@ -30,9 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -55,7 +56,7 @@ public class KabutoMoth extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(1, 2, Constants.Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 2, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfAncientLaw.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfAncientLaw.java index 1e0c4614894..c1e0a9a8258 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfAncientLaw.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfAncientLaw.java @@ -30,15 +30,15 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; @@ -61,7 +61,7 @@ public class KamiOfAncientLaw extends CardImpl { this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar.java index 51508c255ec..411571c75df 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar.java @@ -30,9 +30,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfLunacy.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfLunacy.java index 46106b23ec1..bd9350d8f89 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfLunacy.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfLunacy.java @@ -30,8 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.SoulshiftAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfOldStone.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfOldStone.java index 596b79300d0..fb068f56f10 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfOldStone.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfOldStone.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheHunt.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheHunt.java index b1b32e6c36e..5102bc789a0 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheHunt.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheHunt.java @@ -30,13 +30,13 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterSpiritOrArcaneCard; /** @@ -53,7 +53,7 @@ public class KamiOfTheHunt extends CardImpl { this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SpellCastTriggeredAbility(new BoostSourceEffect(1, 1, Constants.Duration.EndOfTurn), filter, false)); + this.addAbility(new SpellCastTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), filter, false)); } public KamiOfTheHunt(final KamiOfTheHunt card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfThePalaceFields.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfThePalaceFields.java index 0c6fe27f432..e1e0f89de36 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfThePalaceFields.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfThePalaceFields.java @@ -30,8 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon.java index 8baf4263e09..121b4c41104 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon.java @@ -30,9 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastTriggeredAbility; @@ -40,6 +39,7 @@ import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FearAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterSpiritOrArcaneCard; import mage.target.common.TargetCreaturePermanent; @@ -58,7 +58,7 @@ public class KamiOfTheWaningMoon extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SpellCastTriggeredAbility(new GainAbilityTargetEffect(FearAbility.getInstance(), Constants.Duration.EndOfTurn), filter, false); + Ability ability = new SpellCastTriggeredAbility(new GainAbilityTargetEffect(FearAbility.getInstance(), Duration.EndOfTurn), filter, false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTwistedReflection.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTwistedReflection.java index b745216bb1a..9e93b3c388f 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTwistedReflection.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTwistedReflection.java @@ -30,15 +30,15 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -53,7 +53,7 @@ public class KamiOfTwistedReflection extends CardImpl { this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KashiTribeReaver.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KashiTribeReaver.java index d44dffb56ce..122bc7bda74 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KashiTribeReaver.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KashiTribeReaver.java @@ -28,9 +28,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToACreatureTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KashiTribeWarriors.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KashiTribeWarriors.java index cfe32a1f6d6..dbd47ac7aab 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KashiTribeWarriors.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KashiTribeWarriors.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToACreatureTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KeigaTheTideStar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KeigaTheTideStar.java index 687fa57c873..6876eac51ca 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KeigaTheTideStar.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KeigaTheTideStar.java @@ -30,15 +30,15 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.continious.GainControlTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -56,7 +56,7 @@ public class KeigaTheTideStar extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new DiesTriggeredAbility(new GainControlTargetEffect(Constants.Duration.Custom)); + Ability ability = new DiesTriggeredAbility(new GainControlTargetEffect(Duration.Custom)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KikiJikiMirrorBreaker.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KikiJikiMirrorBreaker.java index ca6add8ced5..73e5559619a 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KikiJikiMirrorBreaker.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KikiJikiMirrorBreaker.java @@ -28,10 +28,10 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -42,6 +42,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -78,7 +79,7 @@ public class KikiJikiMirrorBreaker extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // {tap}: Put a token that's a copy of target nonlegendary creature you control onto the battlefield. That token has haste. Sacrifice it at the beginning of the next end step. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new KikiJikiMirrorBreakerEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new KikiJikiMirrorBreakerEffect(), new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent(1, 1, filter, false)); this.addAbility(ability); @@ -97,7 +98,7 @@ public class KikiJikiMirrorBreaker extends CardImpl { class KikiJikiMirrorBreakerEffect extends OneShotEffect { public KikiJikiMirrorBreakerEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); this.staticText = "Put a token that's a copy of target nonlegendary creature you control onto the battlefield. That token has haste. Sacrifice it at the beginning of the next end step"; } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KikuNightsFlower.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KikuNightsFlower.java index 821501ca7fa..7aafad2b276 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KikuNightsFlower.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KikuNightsFlower.java @@ -29,10 +29,10 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +40,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; @@ -85,7 +86,7 @@ public class KikuNightsFlower extends CardImpl { class KikuNightsFlowerEffect extends OneShotEffect { public KikuNightsFlowerEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); this.staticText = "Target creature deals damage to itself equal to its power"; } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneBlademaster.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneBlademaster.java index 998cd52c6ca..6f619f65210 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneBlademaster.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneBlademaster.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.BushidoAbility; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneDiviner.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneDiviner.java index bd16cbc8f67..81ed05c4088 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneDiviner.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneDiviner.java @@ -30,15 +30,15 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; @@ -63,7 +63,7 @@ public class KitsuneDiviner extends CardImpl { this.color.setWhite(true); this.power = new MageInt(0); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneHealer.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneHealer.java index 41832d30150..fa8b93caee5 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneHealer.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneHealer.java @@ -30,9 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.PreventionEffectImpl; import mage.abilities.effects.common.PreventDamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.game.Game; @@ -66,10 +67,10 @@ public class KitsuneHealer extends CardImpl { this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability firstAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PreventDamageTargetEffect(Constants.Duration.EndOfTurn, 1), new TapSourceCost()); + Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); firstAbility.addTarget(new TargetCreatureOrPlayer()); this.addAbility(firstAbility); - Ability secondAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new KitsuneHealerEffect(), new TapSourceCost()); + Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new KitsuneHealerEffect(), new TapSourceCost()); secondAbility.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(secondAbility); } @@ -88,7 +89,7 @@ public class KitsuneHealer extends CardImpl { class KitsuneHealerEffect extends PreventionEffectImpl { public KitsuneHealerEffect() { - super(Constants.Duration.EndOfTurn); + super(Duration.EndOfTurn); staticText = "Prevent all damage that would be dealt to target legendary creature this turn"; } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneMystic.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneMystic.java index 0ae49b83558..039ec0cb3a9 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneMystic.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneMystic.java @@ -28,10 +28,10 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneRiftwalker.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneRiftwalker.java index 3460099147a..9169dd5a38f 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneRiftwalker.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneRiftwalker.java @@ -28,8 +28,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheNorthTree.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheNorthTree.java index 0a495a89fdb..0491b4aa74e 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheNorthTree.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheNorthTree.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ShroudAbility; import mage.abilities.keyword.TrampleAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheSouthTree.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheSouthTree.java index 18f794a75fe..ed6e84e3573 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheSouthTree.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheSouthTree.java @@ -30,9 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastTriggeredAbility; @@ -40,6 +39,7 @@ import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterSpiritOrArcaneCard; @@ -58,8 +58,8 @@ public class KodamaOfTheSouthTree extends CardImpl { this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(4); - Ability ability = new SpellCastTriggeredAbility(new BoostControlledEffect(1, 1, Constants.Duration.EndOfTurn, new FilterCreaturePermanent(), true), filter, false); - ability.addEffect(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Constants.Duration.EndOfTurn, new FilterCreaturePermanent(), true)); + Ability ability = new SpellCastTriggeredAbility(new BoostControlledEffect(1, 1, Duration.EndOfTurn, new FilterCreaturePermanent(), true), filter, false); + ability.addEffect(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.EndOfTurn, new FilterCreaturePermanent(), true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KokushoTheEveningStar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KokushoTheEveningStar.java index 409cd205a76..3cc3238aa6a 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KokushoTheEveningStar.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KokushoTheEveningStar.java @@ -30,15 +30,15 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; /** @@ -72,7 +72,7 @@ public class KokushoTheEveningStar extends CardImpl { class KokushoTheEveningStarEffect extends OneShotEffect { public KokushoTheEveningStarEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "each opponent loses 5 life. You gain life equal to the life lost this way"; } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KondaLordOfEiganjo.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KondaLordOfEiganjo.java index 74177166a7d..5b3012f54c0 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KondaLordOfEiganjo.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KondaLordOfEiganjo.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.BushidoAbility; import mage.abilities.keyword.IndestructibleAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KondasBanner.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KondasBanner.java index 5fcebf0c12d..c9341083ecb 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KondasBanner.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KondasBanner.java @@ -30,9 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -68,15 +67,15 @@ public class KondasBanner extends CardImpl { this.subtype.add("Equipment"); // Creatures that share a color with equipped creature get +1/+1. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new KondasBannerColorBoostEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KondasBannerColorBoostEffect())); // Creatures that share a creature type with equipped creature get +1/+1. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new KondasBannerTypeBoostEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KondasBannerTypeBoostEffect())); // Konda's Banner can be attached only to a legendary creature. // Equip {2} this.addAbility(new EquipAbility( - Constants.Outcome.AddAbility, + Outcome.AddAbility, new GenericManaCost(2), new TargetControlledCreaturePermanent(1,1, legendaryFilter, false))); @@ -97,7 +96,7 @@ class KondasBannerTypeBoostEffect extends BoostAllEffect { private static final String effectText = "Creatures that share a creature type with equipped creature get +1/+1"; KondasBannerTypeBoostEffect() { - super(1,1, Constants.Duration.WhileOnBattlefield, new FilterCreaturePermanent(), false); + super(1,1, Duration.WhileOnBattlefield, new FilterCreaturePermanent(), false); staticText = effectText; } @@ -141,7 +140,7 @@ class KondasBannerColorBoostEffect extends BoostAllEffect { private static final String effectText = "Creatures that share a color with equipped creature get +1/+1."; KondasBannerColorBoostEffect() { - super(1,1, Constants.Duration.WhileOnBattlefield, new FilterCreaturePermanent(), false); + super(1,1, Duration.WhileOnBattlefield, new FilterCreaturePermanent(), false); staticText = effectText; } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KondasHatamoto.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KondasHatamoto.java index 03d549eb6f7..9bf2ae2d662 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KondasHatamoto.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KondasHatamoto.java @@ -28,10 +28,10 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.ControlsPermanentCondition; @@ -41,6 +41,7 @@ import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.BushidoAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; @@ -72,9 +73,9 @@ public class KondasHatamoto extends CardImpl{ this.addAbility(new BushidoAbility(1)); ConditionalContinousEffect effect1 = new ConditionalContinousEffect(new BoostSourceEffect(1, 2, Duration.WhileOnBattlefield), new ControlsPermanentCondition(filter), rule1); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect1)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect1)); ConditionalContinousEffect effect2 = new ConditionalContinousEffect(new GainAbilitySourceEffect(VigilanceAbility.getInstance()), new ControlsPermanentCondition(filter), rule2); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect2)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect2)); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KumanoMasterYamabushi.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KumanoMasterYamabushi.java index fcbf006fa80..f2af7cb46c9 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KumanoMasterYamabushi.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KumanoMasterYamabushi.java @@ -31,11 +31,11 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KumanosPupils.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KumanosPupils.java index 8dd8430cf81..e90dc06618f 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KumanosPupils.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KumanosPupils.java @@ -29,11 +29,11 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KuroPitlord.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KuroPitlord.java index 4bd97f137d2..74b6411831c 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KuroPitlord.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KuroPitlord.java @@ -29,9 +29,7 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -58,8 +56,8 @@ public class KuroPitlord extends CardImpl { this.color.setBlack(true); this.power = new MageInt(9); this.toughness = new MageInt(9); - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{B}{B}{B}{B}")), Constants.TargetController.YOU, false)); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Constants.Duration.EndOfTurn), new PayLifeCost(1)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{B}{B}{B}{B}")), TargetController.YOU, false)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new PayLifeCost(1)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/LanternKami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/LanternKami.java index 5de6c72844a..9a1dd13a06b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/LanternKami.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/LanternKami.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/LanternLitGraveyard.java b/Mage.Sets/src/mage/sets/championsofkamigawa/LanternLitGraveyard.java index cf3a4bdf2b1..28d11898da3 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/LanternLitGraveyard.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/LanternLitGraveyard.java @@ -28,8 +28,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.SkipNextUntapSourceEffect; import mage.abilities.mana.BlackManaAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/LavaSpike.java b/Mage.Sets/src/mage/sets/championsofkamigawa/LavaSpike.java index 418f44d88c2..6c3c11a7bc0 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/LavaSpike.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/LavaSpike.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/LongForgottenGohei.java b/Mage.Sets/src/mage/sets/championsofkamigawa/LongForgottenGohei.java index 04cda145149..5f570e39908 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/LongForgottenGohei.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/LongForgottenGohei.java @@ -31,10 +31,10 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.effects.common.cost.SpellsCostReductionEffect; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Lure.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Lure.java index fd6bbcde4be..827fcc0fcf0 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Lure.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Lure.java @@ -29,11 +29,11 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ManaSeism.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ManaSeism.java index 23d79651d2f..1ce5340a2a5 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ManaSeism.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ManaSeism.java @@ -28,9 +28,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MarrowGnawer.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MarrowGnawer.java index ed223858ac0..96c162a69f8 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MarrowGnawer.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MarrowGnawer.java @@ -29,10 +29,10 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -45,6 +45,7 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -78,7 +79,7 @@ public class MarrowGnawer extends CardImpl { this.toughness = new MageInt(3); // Rat creatures have fear. (They can't be blocked except by artifact creatures and/or black creatures.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(FearAbility.getInstance(), Constants.Duration.WhileOnBattlefield, filterFear))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(FearAbility.getInstance(), Duration.WhileOnBattlefield, filterFear))); // {T}, Sacrifice a Rat: Put X 1/1 black Rat creature tokens onto the battlefield, where X is the number of Rats you control. Ability ability; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MatsuTribeDecoy.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MatsuTribeDecoy.java index 14f06298373..9f53c16d798 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MatsuTribeDecoy.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MatsuTribeDecoy.java @@ -28,9 +28,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToACreatureTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror.java index a848da2e674..2d267a9780c 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror.java @@ -29,9 +29,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MidnightCovenant.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MidnightCovenant.java index 77ec8586d9d..2de390abeb7 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MidnightCovenant.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MidnightCovenant.java @@ -29,9 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -58,10 +57,10 @@ public class MidnightCovenant extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); // Enchanted creature has "{B}: This creature gets +1/+1 until end of turn." - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.B)), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)), AttachmentType.AURA))); } public MidnightCovenant(final MidnightCovenant card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MinamoSchoolAtWatersEdge.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MinamoSchoolAtWatersEdge.java index 3585ee6bf03..1eae76a67bd 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MinamoSchoolAtWatersEdge.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MinamoSchoolAtWatersEdge.java @@ -30,9 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -40,6 +39,8 @@ import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.TargetPermanent; @@ -62,7 +63,7 @@ public class MinamoSchoolAtWatersEdge extends CardImpl this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); this.addAbility(new BlueManaAbility()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new UntapTargetEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.U)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Mindblaze.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Mindblaze.java index f7aac6bba63..2e0c6783f49 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Mindblaze.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Mindblaze.java @@ -31,9 +31,8 @@ package mage.sets.championsofkamigawa; import java.util.HashSet; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -42,6 +41,7 @@ import mage.cards.CardsImpl; import mage.cards.repository.CardRepository; import mage.choices.Choice; import mage.choices.ChoiceImpl; +import mage.constants.Outcome; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.NamePredicate; import mage.game.Game; @@ -81,7 +81,7 @@ public class Mindblaze extends CardImpl { class MindblazeEffect extends OneShotEffect { MindblazeEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "Name a nonland card and choose a number greater than 0. Target player reveals his or her library. If that library contains exactly the chosen number of the named card, {this} deals 8 damage to that player. Then that player shuffles his or her library"; } @@ -105,11 +105,11 @@ class MindblazeEffect extends OneShotEffect { } numberChoice.setChoices(numbers); - while (!playerControls.choose(Constants.Outcome.Neutral, cardChoice, game)) { + while (!playerControls.choose(Outcome.Neutral, cardChoice, game)) { game.debugMessage("player canceled choosing name. retrying."); } - while (!playerControls.choose(Constants.Outcome.Neutral, numberChoice, game)) { + while (!playerControls.choose(Outcome.Neutral, numberChoice, game)) { game.debugMessage("player canceled choosing number. retrying."); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MossKami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MossKami.java index 6194b3aea03..36831ed55ea 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MossKami.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MossKami.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MothriderSamurai.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MothriderSamurai.java index d73cd54c137..c33348b3e66 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MothriderSamurai.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MothriderSamurai.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.BushidoAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfCleansingFire.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfCleansingFire.java index 1da03afed93..9a45c3068df 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfCleansingFire.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfCleansingFire.java @@ -28,9 +28,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -45,6 +45,8 @@ import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; @@ -75,10 +77,10 @@ public class MyojinOfCleansingFire extends CardImpl { // Myojin of Cleansing Fire enters the battlefield with a divinity counter on it if you cast it from your hand. this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.DIVINITY.createInstance()), new CastFromHandCondition(), ""), "{this} enters the battlefield with a divinity counter on it if you cast it from your hand")); // Myojin of Cleansing Fire is indestructible as long as it has a divinity counter on it. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ConditionalContinousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Constants.Duration.WhileOnBattlefield), + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), new HasCounterCondition(CounterType.DIVINITY), "{this} is indestructible as long as it has a divinity counter on it"))); // Remove a divinity counter from Myojin of Cleansing Fire: Destroy all other creatures. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyAllEffect(filter), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance()))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyAllEffect(filter), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance()))); } public MyojinOfCleansingFire(final MyojinOfCleansingFire card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfInfiniteRage.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfInfiniteRage.java index f8b558459b1..0e4616f11dc 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfInfiniteRage.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfInfiniteRage.java @@ -1,88 +1,90 @@ -/* - * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation are those of the - * authors and should not be interpreted as representing official policies, either expressed - * or implied, of BetaSteward_at_googlemail.com. - */ -package mage.sets.championsofkamigawa; - -import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.MageInt; -import mage.abilities.common.EntersBattlefieldAbility; -import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CastFromHandCondition; -import mage.abilities.condition.common.HasCounterCondition; -import mage.abilities.costs.common.RemoveCountersSourceCost; -import mage.abilities.decorator.ConditionalContinousEffect; -import mage.abilities.decorator.ConditionalOneShotEffect; -import mage.abilities.effects.common.DestroyAllEffect; -import mage.abilities.effects.common.continious.GainAbilitySourceEffect; -import mage.abilities.effects.common.counter.AddCountersSourceEffect; -import mage.abilities.keyword.IndestructibleAbility; -import mage.cards.CardImpl; -import mage.counters.CounterType; -import mage.filter.common.FilterLandPermanent; -import mage.watchers.common.CastFromHandWatcher; - -/** - * @author LevelX - */ -public class MyojinOfInfiniteRage extends CardImpl { - - private static final FilterLandPermanent filter = new FilterLandPermanent("lands"); - - public MyojinOfInfiniteRage(UUID ownerId) { - super(ownerId, 181, "Myojin Of Infinite Rage", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{7}{R}{R}{R}"); - this.expansionSetCode = "CHK"; - this.supertype.add("Legendary"); - this.subtype.add("Spirit"); - - this.color.setRed(true); - this.power = new MageInt(7); - this.toughness = new MageInt(4); - - this.addWatcher(new CastFromHandWatcher()); - - // Myojin of Infinite Rage enters the battlefield with a divinity counter on it if you cast it from your hand. - this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.DIVINITY.createInstance()), new CastFromHandCondition(), ""), "{this} enters the battlefield with a divinity counter on it if you cast it from your hand")); - // Myojin of Infinite Rage is indestructible as long as it has a divinity counter on it. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ConditionalContinousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Constants.Duration.WhileOnBattlefield), - new HasCounterCondition(CounterType.DIVINITY), "{this} is indestructible as long as it has a divinity counter on it"))); - // Remove a divinity counter from Myojin of Infinite Rage: Destroy all lands. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyAllEffect(filter), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance()))); - } - - public MyojinOfInfiniteRage(final MyojinOfInfiniteRage card) { - super(card); - } - - @Override - public MyojinOfInfiniteRage copy() { - return new MyojinOfInfiniteRage(this); - } -} +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.championsofkamigawa; + +import java.util.UUID; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.MageInt; +import mage.abilities.common.EntersBattlefieldAbility; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.condition.common.CastFromHandCondition; +import mage.abilities.condition.common.HasCounterCondition; +import mage.abilities.costs.common.RemoveCountersSourceCost; +import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalOneShotEffect; +import mage.abilities.effects.common.DestroyAllEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; +import mage.abilities.effects.common.counter.AddCountersSourceEffect; +import mage.abilities.keyword.IndestructibleAbility; +import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; +import mage.counters.CounterType; +import mage.filter.common.FilterLandPermanent; +import mage.watchers.common.CastFromHandWatcher; + +/** + * @author LevelX + */ +public class MyojinOfInfiniteRage extends CardImpl { + + private static final FilterLandPermanent filter = new FilterLandPermanent("lands"); + + public MyojinOfInfiniteRage(UUID ownerId) { + super(ownerId, 181, "Myojin Of Infinite Rage", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{7}{R}{R}{R}"); + this.expansionSetCode = "CHK"; + this.supertype.add("Legendary"); + this.subtype.add("Spirit"); + + this.color.setRed(true); + this.power = new MageInt(7); + this.toughness = new MageInt(4); + + this.addWatcher(new CastFromHandWatcher()); + + // Myojin of Infinite Rage enters the battlefield with a divinity counter on it if you cast it from your hand. + this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.DIVINITY.createInstance()), new CastFromHandCondition(), ""), "{this} enters the battlefield with a divinity counter on it if you cast it from your hand")); + // Myojin of Infinite Rage is indestructible as long as it has a divinity counter on it. + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), + new HasCounterCondition(CounterType.DIVINITY), "{this} is indestructible as long as it has a divinity counter on it"))); + // Remove a divinity counter from Myojin of Infinite Rage: Destroy all lands. + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyAllEffect(filter), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance()))); + } + + public MyojinOfInfiniteRage(final MyojinOfInfiniteRage card) { + super(card); + } + + @Override + public MyojinOfInfiniteRage copy() { + return new MyojinOfInfiniteRage(this); + } +} diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfLifesWeb.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfLifesWeb.java index 267dec787cd..e2784289d27 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfLifesWeb.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfLifesWeb.java @@ -1,100 +1,98 @@ -/* - * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation are those of the - * authors and should not be interpreted as representing official policies, either expressed - * or implied, of BetaSteward_at_googlemail.com. - */ -package mage.sets.championsofkamigawa; - -import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.MageInt; -import mage.abilities.Ability; -import mage.abilities.common.EntersBattlefieldAbility; -import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CastFromHandCondition; -import mage.abilities.condition.common.HasCounterCondition; -import mage.abilities.costs.common.RemoveCountersSourceCost; -import mage.abilities.decorator.ConditionalContinousEffect; -import mage.abilities.decorator.ConditionalOneShotEffect; -import mage.abilities.effects.common.PutOntoBattlefieldTargetEffect; -import mage.abilities.effects.common.continious.GainAbilitySourceEffect; -import mage.abilities.effects.common.counter.AddCountersSourceEffect; -import mage.abilities.keyword.IndestructibleAbility; -import mage.cards.CardImpl; -import mage.counters.CounterType; -import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.CardTypePredicate; -import mage.filter.predicate.other.OwnerPredicate; -import mage.target.common.TargetCardInHand; -import mage.watchers.common.CastFromHandWatcher; - -/** - * @author LevelX - */ -public class MyojinOfLifesWeb extends CardImpl { - - private static final FilterCard filter = new FilterCard("any number of creature cards from your hand"); - static { - filter.add(new CardTypePredicate(CardType.CREATURE)); - filter.add(new OwnerPredicate(TargetController.YOU)); - } - - public MyojinOfLifesWeb(UUID ownerId) { - super(ownerId, 229, "Myojin of Life's Web", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{6}{G}{G}{G}"); - this.expansionSetCode = "CHK"; - this.supertype.add("Legendary"); - this.subtype.add("Spirit"); - - this.color.setGreen(true); - this.power = new MageInt(8); - this.toughness = new MageInt(8); - - this.addWatcher(new CastFromHandWatcher()); - - // Myojin of Life's Web enters the battlefield with a divinity counter on it if you cast it from your hand. - this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.DIVINITY.createInstance()), new CastFromHandCondition(), ""), "{this} enters the battlefield with a divinity counter on it if you cast it from your hand")); - // Myojin of Life's Web is indestructible as long as it has a divinity counter on it. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, - new ConditionalContinousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Constants.Duration.WhileOnBattlefield), - new HasCounterCondition(CounterType.DIVINITY), "{this} is indestructible as long as it has a divinity counter on it"))); - // Remove a divinity counter from Myojin of Life's Web: Put any number of creature cards from your hand onto the battlefield. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PutOntoBattlefieldTargetEffect(false), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance())); - ability.addTarget(new TargetCardInHand(0, Integer.MAX_VALUE, filter)); - this.addAbility(ability); - } - - public MyojinOfLifesWeb(final MyojinOfLifesWeb card) { - super(card); - } - - @Override - public MyojinOfLifesWeb copy() { - return new MyojinOfLifesWeb(this); - } -} +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.championsofkamigawa; + +import java.util.UUID; + +import mage.constants.*; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.EntersBattlefieldAbility; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.condition.common.CastFromHandCondition; +import mage.abilities.condition.common.HasCounterCondition; +import mage.abilities.costs.common.RemoveCountersSourceCost; +import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalOneShotEffect; +import mage.abilities.effects.common.PutOntoBattlefieldTargetEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; +import mage.abilities.effects.common.counter.AddCountersSourceEffect; +import mage.abilities.keyword.IndestructibleAbility; +import mage.cards.CardImpl; +import mage.counters.CounterType; +import mage.filter.FilterCard; +import mage.filter.predicate.mageobject.CardTypePredicate; +import mage.filter.predicate.other.OwnerPredicate; +import mage.target.common.TargetCardInHand; +import mage.watchers.common.CastFromHandWatcher; + +/** + * @author LevelX + */ +public class MyojinOfLifesWeb extends CardImpl { + + private static final FilterCard filter = new FilterCard("any number of creature cards from your hand"); + static { + filter.add(new CardTypePredicate(CardType.CREATURE)); + filter.add(new OwnerPredicate(TargetController.YOU)); + } + + public MyojinOfLifesWeb(UUID ownerId) { + super(ownerId, 229, "Myojin of Life's Web", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{6}{G}{G}{G}"); + this.expansionSetCode = "CHK"; + this.supertype.add("Legendary"); + this.subtype.add("Spirit"); + + this.color.setGreen(true); + this.power = new MageInt(8); + this.toughness = new MageInt(8); + + this.addWatcher(new CastFromHandWatcher()); + + // Myojin of Life's Web enters the battlefield with a divinity counter on it if you cast it from your hand. + this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.DIVINITY.createInstance()), new CastFromHandCondition(), ""), "{this} enters the battlefield with a divinity counter on it if you cast it from your hand")); + // Myojin of Life's Web is indestructible as long as it has a divinity counter on it. + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + new ConditionalContinousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), + new HasCounterCondition(CounterType.DIVINITY), "{this} is indestructible as long as it has a divinity counter on it"))); + // Remove a divinity counter from Myojin of Life's Web: Put any number of creature cards from your hand onto the battlefield. + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOntoBattlefieldTargetEffect(false), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance())); + ability.addTarget(new TargetCardInHand(0, Integer.MAX_VALUE, filter)); + this.addAbility(ability); + } + + public MyojinOfLifesWeb(final MyojinOfLifesWeb card) { + super(card); + } + + @Override + public MyojinOfLifesWeb copy() { + return new MyojinOfLifesWeb(this); + } +} diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfNightsReach.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfNightsReach.java index 62dc16fd75d..24b15f571eb 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfNightsReach.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfNightsReach.java @@ -1,118 +1,117 @@ -/* - * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation are those of the - * authors and should not be interpreted as representing official policies, either expressed - * or implied, of BetaSteward_at_googlemail.com. - */ -package mage.sets.championsofkamigawa; - -import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.MageInt; -import mage.abilities.Ability; -import mage.abilities.common.EntersBattlefieldAbility; -import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CastFromHandCondition; -import mage.abilities.condition.common.HasCounterCondition; -import mage.abilities.costs.common.RemoveCountersSourceCost; -import mage.abilities.decorator.ConditionalContinousEffect; -import mage.abilities.decorator.ConditionalOneShotEffect; -import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.continious.GainAbilitySourceEffect; -import mage.abilities.effects.common.counter.AddCountersSourceEffect; -import mage.abilities.keyword.IndestructibleAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.counters.CounterType; -import mage.game.Game; -import mage.players.Player; -import mage.watchers.common.CastFromHandWatcher; - -/** - * @author LevelX - */ -public class MyojinOfNightsReach extends CardImpl { - - public MyojinOfNightsReach(UUID ownerId) { - super(ownerId, 126, "Myojin of Night's Reach", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{B}{B}{B}"); - this.expansionSetCode = "CHK"; - this.supertype.add("Legendary"); - this.subtype.add("Spirit"); - - this.color.setBlack(true); - this.power = new MageInt(5); - this.toughness = new MageInt(2); - - this.addWatcher(new CastFromHandWatcher()); - - // Myojin of Night's Reach enters the battlefield with a divinity counter on it if you cast it from your hand. - this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.DIVINITY.createInstance()), new CastFromHandCondition(), ""), "{this} enters the battlefield with a divinity counter on it if you cast it from your hand")); - // Myojin of Night's Reach is indestructible as long as it has a divinity counter on it. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ConditionalContinousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Constants.Duration.WhileOnBattlefield), - new HasCounterCondition(CounterType.DIVINITY), "{this} is indestructible as long as it has a divinity counter on it"))); - // Remove a divinity counter from Myojin of Night's Reach: Each opponent discards his or her hand. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new MyojinOfNightsReachEffect(), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance())); - this.addAbility(ability); - } - - public MyojinOfNightsReach(final MyojinOfNightsReach card) { - super(card); - } - - @Override - public MyojinOfNightsReach copy() { - return new MyojinOfNightsReach(this); - } -} - -class MyojinOfNightsReachEffect extends OneShotEffect { - public MyojinOfNightsReachEffect() { - super(Constants.Outcome.Discard); - staticText = "Each opponent discards his or her hand"; - } - - public MyojinOfNightsReachEffect(final MyojinOfNightsReachEffect effect) { - super(effect); - } - - @Override - public boolean apply(Game game, Ability source) { - for (UUID opponentId : game.getOpponents(source.getControllerId())) { - Player opponent = game.getPlayer(opponentId); - for (Card c : opponent.getHand().getCards(game)) { - opponent.discard(c, source, game); - } - } - return true; - } - - @Override - public MyojinOfNightsReachEffect copy() { - return new MyojinOfNightsReachEffect(this); - } - -} \ No newline at end of file +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.championsofkamigawa; + +import java.util.UUID; + +import mage.constants.*; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.EntersBattlefieldAbility; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.condition.common.CastFromHandCondition; +import mage.abilities.condition.common.HasCounterCondition; +import mage.abilities.costs.common.RemoveCountersSourceCost; +import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalOneShotEffect; +import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; +import mage.abilities.effects.common.counter.AddCountersSourceEffect; +import mage.abilities.keyword.IndestructibleAbility; +import mage.cards.Card; +import mage.cards.CardImpl; +import mage.counters.CounterType; +import mage.game.Game; +import mage.players.Player; +import mage.watchers.common.CastFromHandWatcher; + +/** + * @author LevelX + */ +public class MyojinOfNightsReach extends CardImpl { + + public MyojinOfNightsReach(UUID ownerId) { + super(ownerId, 126, "Myojin of Night's Reach", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{B}{B}{B}"); + this.expansionSetCode = "CHK"; + this.supertype.add("Legendary"); + this.subtype.add("Spirit"); + + this.color.setBlack(true); + this.power = new MageInt(5); + this.toughness = new MageInt(2); + + this.addWatcher(new CastFromHandWatcher()); + + // Myojin of Night's Reach enters the battlefield with a divinity counter on it if you cast it from your hand. + this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.DIVINITY.createInstance()), new CastFromHandCondition(), ""), "{this} enters the battlefield with a divinity counter on it if you cast it from your hand")); + // Myojin of Night's Reach is indestructible as long as it has a divinity counter on it. + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), + new HasCounterCondition(CounterType.DIVINITY), "{this} is indestructible as long as it has a divinity counter on it"))); + // Remove a divinity counter from Myojin of Night's Reach: Each opponent discards his or her hand. + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MyojinOfNightsReachEffect(), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance())); + this.addAbility(ability); + } + + public MyojinOfNightsReach(final MyojinOfNightsReach card) { + super(card); + } + + @Override + public MyojinOfNightsReach copy() { + return new MyojinOfNightsReach(this); + } +} + +class MyojinOfNightsReachEffect extends OneShotEffect { + public MyojinOfNightsReachEffect() { + super(Outcome.Discard); + staticText = "Each opponent discards his or her hand"; + } + + public MyojinOfNightsReachEffect(final MyojinOfNightsReachEffect effect) { + super(effect); + } + + @Override + public boolean apply(Game game, Ability source) { + for (UUID opponentId : game.getOpponents(source.getControllerId())) { + Player opponent = game.getPlayer(opponentId); + for (Card c : opponent.getHand().getCards(game)) { + opponent.discard(c, source, game); + } + } + return true; + } + + @Override + public MyojinOfNightsReachEffect copy() { + return new MyojinOfNightsReachEffect(this); + } + +} diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfSeeingWinds.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfSeeingWinds.java index 7d1a09bee8c..9c08dfadea7 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfSeeingWinds.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfSeeingWinds.java @@ -1,96 +1,94 @@ -/* - * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation are those of the - * authors and should not be interpreted as representing official policies, either expressed - * or implied, of BetaSteward_at_googlemail.com. - */ -package mage.sets.championsofkamigawa; - -import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.MageInt; -import mage.abilities.Ability; -import mage.abilities.common.EntersBattlefieldAbility; -import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CastFromHandCondition; -import mage.abilities.condition.common.HasCounterCondition; -import mage.abilities.costs.common.RemoveCountersSourceCost; -import mage.abilities.decorator.ConditionalContinousEffect; -import mage.abilities.decorator.ConditionalOneShotEffect; -import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; -import mage.abilities.effects.common.DrawCardControllerEffect; -import mage.abilities.effects.common.continious.GainAbilitySourceEffect; -import mage.abilities.effects.common.counter.AddCountersSourceEffect; -import mage.abilities.keyword.IndestructibleAbility; -import mage.cards.CardImpl; -import mage.counters.CounterType; -import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; -import mage.watchers.common.CastFromHandWatcher; - -/** - * @author LevelX - */ -public class MyojinOfSeeingWinds extends CardImpl { - - private static final FilterPermanent filter = new FilterPermanent("permanent you control"); - static { - filter.add(new ControllerPredicate(TargetController.YOU)); - } - - public MyojinOfSeeingWinds(UUID ownerId) { - super(ownerId, 75, "Myojin of Seeing Winds", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{7}{U}{U}{U}"); - this.expansionSetCode = "CHK"; - this.supertype.add("Legendary"); - this.subtype.add("Spirit"); - - this.color.setBlue(true); - this.power = new MageInt(3); - this.toughness = new MageInt(3); - - this.addWatcher(new CastFromHandWatcher()); - - // Myojin of Seeing Winds enters the battlefield with a divinity counter on it if you cast it from your hand. - this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.DIVINITY.createInstance()), new CastFromHandCondition(), ""), "{this} enters the battlefield with a divinity counter on it if you cast it from your hand")); - // Myojin of Seeing Winds is indestructible as long as it has a divinity counter on it. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ConditionalContinousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Constants.Duration.WhileOnBattlefield), - new HasCounterCondition(CounterType.DIVINITY), "{this} is indestructible as long as it has a divinity counter on it"))); - // Remove a divinity counter from Myojin of Seeing Winds: Draw a card for each permanent you control. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(new PermanentsOnBattlefieldCount(filter, 1)), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance())); - this.addAbility(ability); - } - - public MyojinOfSeeingWinds(final MyojinOfSeeingWinds card) { - super(card); - } - - @Override - public MyojinOfSeeingWinds copy() { - return new MyojinOfSeeingWinds(this); - } -} +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.championsofkamigawa; + +import java.util.UUID; + +import mage.constants.*; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.EntersBattlefieldAbility; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.condition.common.CastFromHandCondition; +import mage.abilities.condition.common.HasCounterCondition; +import mage.abilities.costs.common.RemoveCountersSourceCost; +import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalOneShotEffect; +import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; +import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; +import mage.abilities.effects.common.counter.AddCountersSourceEffect; +import mage.abilities.keyword.IndestructibleAbility; +import mage.cards.CardImpl; +import mage.counters.CounterType; +import mage.filter.FilterPermanent; +import mage.filter.predicate.permanent.ControllerPredicate; +import mage.watchers.common.CastFromHandWatcher; + +/** + * @author LevelX + */ +public class MyojinOfSeeingWinds extends CardImpl { + + private static final FilterPermanent filter = new FilterPermanent("permanent you control"); + static { + filter.add(new ControllerPredicate(TargetController.YOU)); + } + + public MyojinOfSeeingWinds(UUID ownerId) { + super(ownerId, 75, "Myojin of Seeing Winds", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{7}{U}{U}{U}"); + this.expansionSetCode = "CHK"; + this.supertype.add("Legendary"); + this.subtype.add("Spirit"); + + this.color.setBlue(true); + this.power = new MageInt(3); + this.toughness = new MageInt(3); + + this.addWatcher(new CastFromHandWatcher()); + + // Myojin of Seeing Winds enters the battlefield with a divinity counter on it if you cast it from your hand. + this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.DIVINITY.createInstance()), new CastFromHandCondition(), ""), "{this} enters the battlefield with a divinity counter on it if you cast it from your hand")); + // Myojin of Seeing Winds is indestructible as long as it has a divinity counter on it. + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), + new HasCounterCondition(CounterType.DIVINITY), "{this} is indestructible as long as it has a divinity counter on it"))); + // Remove a divinity counter from Myojin of Seeing Winds: Draw a card for each permanent you control. + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(new PermanentsOnBattlefieldCount(filter, 1)), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance())); + this.addAbility(ability); + } + + public MyojinOfSeeingWinds(final MyojinOfSeeingWinds card) { + super(card); + } + + @Override + public MyojinOfSeeingWinds copy() { + return new MyojinOfSeeingWinds(this); + } +} diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MysticRestraints.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MysticRestraints.java index a33ebb3e993..deb4b63231b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MysticRestraints.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MysticRestraints.java @@ -29,11 +29,10 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -85,7 +84,7 @@ public class MysticRestraints extends CardImpl { class MysticRestraintsEffect extends OneShotEffect { MysticRestraintsEffect() { - super(Constants.Outcome.Tap); + super(Outcome.Tap); staticText = "tap enchanted creature"; } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NagaoBoundByHonor.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NagaoBoundByHonor.java index 55efb02391b..884ffa3fe91 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/NagaoBoundByHonor.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NagaoBoundByHonor.java @@ -29,14 +29,14 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.keyword.BushidoAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -62,7 +62,7 @@ public class NagaoBoundByHonor extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(new BushidoAbility(1)); - this.addAbility(new AttacksTriggeredAbility(new BoostControlledEffect(1, 1, Constants.Duration.EndOfTurn, filter, false), false)); + this.addAbility(new AttacksTriggeredAbility(new BoostControlledEffect(1, 1, Duration.EndOfTurn, filter, false), false)); } public NagaoBoundByHonor(final NagaoBoundByHonor card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiBoneReader.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiBoneReader.java index dceb78037a5..5d70cbaf189 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiBoneReader.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiBoneReader.java @@ -29,9 +29,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiCutthroat.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiCutthroat.java index 38a9802dbea..f3ffbaf9068 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiCutthroat.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiCutthroat.java @@ -30,8 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.abilities.keyword.FearAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiGraverobber.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiGraverobber.java index e710b59a77d..35255356d0c 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiGraverobber.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiGraverobber.java @@ -27,9 +27,8 @@ */ package mage.sets.championsofkamigawa; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.game.Game; @@ -70,11 +71,11 @@ public class NezumiGraverobber extends CardImpl { this.flipCard = true; this.flipCardName = "Nighteyes The Desecrator"; - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl("{1}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl("{1}{B}")); ability.addTarget(new TargetCardInOpponentsGraveyard(new FilterCard("card from an opponent's graveyard"))); ability.addEffect(new NezumiGraverobberFlipEffect()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ConditionalContinousEffect(new CopyTokenEffect(new NighteyesTheDesecratorToken()), FlippedCondition.getInstance(), ""))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new CopyTokenEffect(new NighteyesTheDesecratorToken()), FlippedCondition.getInstance(), ""))); } public NezumiGraverobber(final NezumiGraverobber card) { @@ -90,7 +91,7 @@ public class NezumiGraverobber extends CardImpl { class NezumiGraverobberFlipEffect extends OneShotEffect { NezumiGraverobberFlipEffect() { - super(Constants.Outcome.BecomeCreature); + super(Outcome.BecomeCreature); staticText = "If no cards are in that graveyard, flip {this}"; } @@ -132,7 +133,7 @@ class NighteyesTheDesecratorToken extends Token { subtype.add("Wizard"); power = new MageInt(4); toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl("{4}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl("{4}{B}")); ability.addTarget(new TargetCardInGraveyard(new FilterCreatureCard("creature card from a graveyard"))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiRonin.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiRonin.java index edbc328853b..33a3a99a9b0 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiRonin.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiRonin.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.BushidoAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiShortfang.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiShortfang.java index 7bd15d3b089..b330a16f3a1 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiShortfang.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiShortfang.java @@ -28,11 +28,11 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NightDealings.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NightDealings.java index e58dafb4247..1ccd1adafaf 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/NightDealings.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NightDealings.java @@ -29,10 +29,10 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +44,7 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.filter.Filter; import mage.filter.common.FilterNonlandCard; @@ -87,7 +88,7 @@ public class NightDealings extends CardImpl { private class NightDealingsTriggeredAbility extends TriggeredAbilityImpl { public NightDealingsTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new NightDealingsEffect()); + super(Zone.BATTLEFIELD, new NightDealingsEffect()); } public NightDealingsTriggeredAbility(final NightDealingsTriggeredAbility ability) { @@ -134,7 +135,7 @@ public class NightDealings extends CardImpl { private class NightDealingsEffect extends OneShotEffect { public NightDealingsEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); this.staticText = "put that many theft counters on Night Dealings"; } @@ -164,7 +165,7 @@ public class NightDealings extends CardImpl { private class NightDealingsSearchEffect extends OneShotEffect { public NightDealingsSearchEffect() { - super(Constants.Outcome.DrawCard); + super(Outcome.DrawCard); this.staticText = "Search your library for a nonland card with converted mana cost X, reveal it, and put it into your hand. Then shuffle your library"; } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NightOfSoulsBetrayal.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NightOfSoulsBetrayal.java index 9c0261bc2b3..5f2ac8abfe4 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/NightOfSoulsBetrayal.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NightOfSoulsBetrayal.java @@ -30,12 +30,13 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; /** @@ -50,7 +51,7 @@ public class NightOfSoulsBetrayal extends CardImpl { this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); this.color.setBlack(true); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostAllEffect(-1, -1, Constants.Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(-1, -1, Duration.WhileOnBattlefield, filter, false))); } public NightOfSoulsBetrayal (final NightOfSoulsBetrayal card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NineRingedBo.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NineRingedBo.java index acf6819ba32..eb530ffaacd 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/NineRingedBo.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NineRingedBo.java @@ -28,11 +28,11 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NoDachi.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NoDachi.java index 8b053c74597..b026a7879c6 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/NoDachi.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NoDachi.java @@ -30,9 +30,7 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; @@ -50,9 +48,9 @@ public class NoDachi extends CardImpl { super(ownerId, 264, "No-Dachi", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "CHK"; this.subtype.add("Equipment"); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(3))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); } public NoDachi (final NoDachi card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NumaiOutcast.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NumaiOutcast.java index 4d45bc4fdaa..593894386cf 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/NumaiOutcast.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NumaiOutcast.java @@ -30,9 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.BushidoAbility; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; /** * @@ -57,7 +58,7 @@ public class NumaiOutcast extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new BushidoAbility(2)); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new PayLifeCost(5)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OkinaTempleToTheGrandfathers.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OkinaTempleToTheGrandfathers.java index 0dfaa75b446..493efd1b329 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/OkinaTempleToTheGrandfathers.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OkinaTempleToTheGrandfathers.java @@ -30,9 +30,7 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -60,7 +58,7 @@ public class OkinaTempleToTheGrandfathers extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // At the beginning of your upkeep, sacrifice a creature. - Ability ability2 = new BeginningOfUpkeepTriggeredAbility(new SacrificeTargetEffect("sacrifice a creature"), Constants.TargetController.YOU, false); + Ability ability2 = new BeginningOfUpkeepTriggeredAbility(new SacrificeTargetEffect("sacrifice a creature"), TargetController.YOU, false); ability2.addTarget(new TargetControlledCreaturePermanent(1,1, new FilterControlledCreaturePermanent(),false, true)); this.addAbility(ability2); // Enchanted creature gets +3/+3 and has trample. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Constants.Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA))); // Enchanted creature is a Demon Spirit. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new SetCardSubtypeAttachedEffect(setSubtypes, Constants.Duration.WhileOnBattlefield, Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SetCardSubtypeAttachedEffect(setSubtypes, Duration.WhileOnBattlefield, AttachmentType.AURA))); } public OniPossession(final OniPossession card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OrbweaverKumo.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OrbweaverKumo.java index 7c6f505f17c..006dab0fad8 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/OrbweaverKumo.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OrbweaverKumo.java @@ -30,15 +30,15 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.ForestwalkAbility; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterSpiritOrArcaneCard; /** @@ -56,7 +56,7 @@ public class OrbweaverKumo extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(4); this.addAbility(ReachAbility.getInstance()); - this.addAbility(new SpellCastTriggeredAbility(new GainAbilitySourceEffect(new ForestwalkAbility(), Constants.Duration.EndOfTurn), filter, false)); + this.addAbility(new SpellCastTriggeredAbility(new GainAbilitySourceEffect(new ForestwalkAbility(), Duration.EndOfTurn), filter, false)); } public OrbweaverKumo(final OrbweaverKumo card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OrderOfTheSacredBell.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OrderOfTheSacredBell.java index 6f39bbce94b..dd6dcfc459f 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/OrderOfTheSacredBell.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OrderOfTheSacredBell.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OreGorger.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OreGorger.java index 263eb7a541f..ec73a6b9183 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/OreGorger.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OreGorger.java @@ -30,8 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiEggwatcher.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiEggwatcher.java index 33091c7a518..125a48931dd 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiEggwatcher.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiEggwatcher.java @@ -30,11 +30,10 @@ package mage.sets.championsofkamigawa; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -100,7 +99,7 @@ class ShidakoBroodmistress extends Token { ShidakoBroodmistress() { super("Shidako, Broodmistress", ""); supertype.add("Legendary"); - cardType.add(Constants.CardType.CREATURE); + cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add("Snake"); subtype.add("Shaman"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiHatchery.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiHatchery.java index fe01b050953..5c692f0a2c8 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiHatchery.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiHatchery.java @@ -28,10 +28,10 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.common.EntersBattlefieldAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiLeafcaller.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiLeafcaller.java index 39b39326549..92def53df1b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiLeafcaller.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiLeafcaller.java @@ -30,13 +30,13 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; /** * @@ -52,7 +52,7 @@ public class OrochiLeafcaller extends CardImpl { this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new AnyColorManaAbility(new ColoredManaCost(Constants.ColoredManaSymbol.G))); + this.addAbility(new AnyColorManaAbility(new ColoredManaCost(ColoredManaSymbol.G))); } public OrochiLeafcaller (final OrochiLeafcaller card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiRanger.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiRanger.java index 36425bbb5a6..6c4887e367a 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiRanger.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiRanger.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToACreatureTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiSustainer.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiSustainer.java index ab0258da3f6..3dc20703cd5 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiSustainer.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiSustainer.java @@ -30,8 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OtherworldlyJourney.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OtherworldlyJourney.java index dfc96c34c0e..0f44c10a63e 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/OtherworldlyJourney.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OtherworldlyJourney.java @@ -29,15 +29,17 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.delayed.AtEndOfTurnDelayedTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ReturnFromExileEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.ExileZone; import mage.game.Game; @@ -75,7 +77,7 @@ class OtherworldlyJourneyEffect extends OneShotEffect private static final String effectText = "Exile target creature. At the beginning of the next end step, return that card to the battlefield under its owner's control with a +1/+1 counter on it"; OtherworldlyJourneyEffect ( ) { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = effectText; } @@ -93,7 +95,7 @@ class OtherworldlyJourneyEffect extends OneShotEffect if (exile != null && !exile.isEmpty()) { //create delayed triggered ability AtEndOfTurnDelayedTriggeredAbility delayedAbility = new AtEndOfTurnDelayedTriggeredAbility( - new ReturnFromExileEffect(source.getSourceId(), Constants.Zone.BATTLEFIELD, "return that card to the battlefield under its owner's control with a +1/+1 counter on it")); + new ReturnFromExileEffect(source.getSourceId(), Zone.BATTLEFIELD, "return that card to the battlefield under its owner's control with a +1/+1 counter on it")); delayedAbility.setSourceId(source.getSourceId()); delayedAbility.setControllerId(source.getControllerId()); AddCountersTargetEffect effect = new AddCountersTargetEffect(CounterType.P1P1.createInstance()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/PainKami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/PainKami.java index 4ee12f877be..fa2730cef48 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/PainKami.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/PainKami.java @@ -30,9 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -55,7 +55,7 @@ public class PainKami extends CardImpl { this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(new ManacostVariableValue()), new ManaCostsImpl("{X}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new ManacostVariableValue()), new ManaCostsImpl("{X}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/PainwrackerOni.java b/Mage.Sets/src/mage/sets/championsofkamigawa/PainwrackerOni.java index ec1642b7564..fbcafd469d3 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/PainwrackerOni.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/PainwrackerOni.java @@ -29,9 +29,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/PartTheVeil.java b/Mage.Sets/src/mage/sets/championsofkamigawa/PartTheVeil.java index defbe653e42..99124592347 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/PartTheVeil.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/PartTheVeil.java @@ -30,12 +30,13 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -66,7 +67,7 @@ public class PartTheVeil extends CardImpl { class PartTheVeilEffect extends OneShotEffect { public PartTheVeilEffect() { - super(Constants.Outcome.ReturnToHand); + super(Outcome.ReturnToHand); staticText = "Return all creatures you control to their owner's hand."; } @@ -77,7 +78,7 @@ class PartTheVeilEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { for (Permanent creature : game.getBattlefield().getAllActivePermanents(new FilterCreaturePermanent(), source.getControllerId(), game)) { - creature.moveToZone(Constants.Zone.HAND, source.getSourceId(), game, true); + creature.moveToZone(Zone.HAND, source.getSourceId(), game, true); } return true; } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/PeerThroughDepths.java b/Mage.Sets/src/mage/sets/championsofkamigawa/PeerThroughDepths.java index 9d5eff68694..c116d40a963 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/PeerThroughDepths.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/PeerThroughDepths.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/PetalsOfInsight.java b/Mage.Sets/src/mage/sets/championsofkamigawa/PetalsOfInsight.java index b0670a1ff81..f4096248e67 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/PetalsOfInsight.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/PetalsOfInsight.java @@ -28,7 +28,7 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/PinecrestRidge.java b/Mage.Sets/src/mage/sets/championsofkamigawa/PinecrestRidge.java index 6b702825432..526aa4009ac 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/PinecrestRidge.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/PinecrestRidge.java @@ -28,8 +28,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.SkipNextUntapSourceEffect; import mage.abilities.mana.ColorlessManaAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/PullUnder.java b/Mage.Sets/src/mage/sets/championsofkamigawa/PullUnder.java index 98de5725431..af34263be5b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/PullUnder.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/PullUnder.java @@ -30,11 +30,11 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -48,7 +48,7 @@ public class PullUnder extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); this.color.setBlack(true); - this.getSpellAbility().addEffect(new BoostTargetEffect(-5, -5, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(-5, -5, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/QuietPurity.java b/Mage.Sets/src/mage/sets/championsofkamigawa/QuietPurity.java index b621cc1717c..173fbc0b4ac 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/QuietPurity.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/QuietPurity.java @@ -30,8 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/RagDealer.java b/Mage.Sets/src/mage/sets/championsofkamigawa/RagDealer.java index 611d054915a..59a34e7a9dc 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/RagDealer.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/RagDealer.java @@ -29,11 +29,11 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -83,7 +83,7 @@ public class RagDealer extends CardImpl { class RagDealerTargetCardsInGraveyard extends TargetCard { public RagDealerTargetCardsInGraveyard(int minNumTargets, int maxNumTargets, FilterCard filter) { - super(minNumTargets, maxNumTargets, Constants.Zone.GRAVEYARD, filter); + super(minNumTargets, maxNumTargets, Zone.GRAVEYARD, filter); this.targetName = "up to three target cards from a single graveyard"; } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/RaggedVeins.java b/Mage.Sets/src/mage/sets/championsofkamigawa/RaggedVeins.java index e92154ea559..61e92e35176 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/RaggedVeins.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/RaggedVeins.java @@ -29,11 +29,11 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.OneShotEffect; @@ -67,7 +67,7 @@ public class RaggedVeins extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); // Whenever enchanted creature is dealt damage, its controller loses that much life. diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ReachThroughMists.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ReachThroughMists.java index 4a6a7eda7f7..19ba21bbc56 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ReachThroughMists.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ReachThroughMists.java @@ -30,8 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Reciprocate.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Reciprocate.java index 6935518fd22..f93639f390b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Reciprocate.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Reciprocate.java @@ -32,8 +32,8 @@ import java.util.HashSet; import java.util.Set; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.common.ExileTargetEffect; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ReitoLantern.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ReitoLantern.java index 3778be85371..a4be26878e6 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ReitoLantern.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ReitoLantern.java @@ -28,9 +28,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/RendFlesh.java b/Mage.Sets/src/mage/sets/championsofkamigawa/RendFlesh.java index 3f1a71ad888..14b06def47f 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/RendFlesh.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/RendFlesh.java @@ -30,8 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/RendSpirit.java b/Mage.Sets/src/mage/sets/championsofkamigawa/RendSpirit.java index 7da25780c45..ff4f6b06e3b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/RendSpirit.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/RendSpirit.java @@ -30,8 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/RiverKaijin.java b/Mage.Sets/src/mage/sets/championsofkamigawa/RiverKaijin.java index b19c7954fe1..bf48145d022 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/RiverKaijin.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/RiverKaijin.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/RoninHoundmaster.java b/Mage.Sets/src/mage/sets/championsofkamigawa/RoninHoundmaster.java index a75a2c88043..568b9a99f79 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/RoninHoundmaster.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/RoninHoundmaster.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.BushidoAbility; import mage.abilities.keyword.HasteAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Rootrunner.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Rootrunner.java index 4c224aa4d3f..52debb5080d 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Rootrunner.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Rootrunner.java @@ -30,9 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.abilities.keyword.SoulshiftAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetLandPermanent; /** @@ -55,7 +55,7 @@ public class Rootrunner extends CardImpl { this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new ManaCostsImpl("{G}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new ManaCostsImpl("{G}{G}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/RyuseiTheFallingStar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/RyuseiTheFallingStar.java index cce831de772..0dec7f96719 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/RyuseiTheFallingStar.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/RyuseiTheFallingStar.java @@ -28,12 +28,13 @@ package mage.sets.championsofkamigawa; * or implied, of BetaSteward_at_googlemail.com. */ -import mage.Constants; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; @@ -52,7 +53,7 @@ public class RyuseiTheFallingStar extends CardImpl { } public RyuseiTheFallingStar(UUID ownerID) { - super(ownerID, 185, "Ryusei, The Falling Star", Constants.Rarity.RARE, new Constants.CardType[]{Constants.CardType.CREATURE}, "{5}{R}"); + super(ownerID, 185, "Ryusei, The Falling Star", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{R}"); this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); this.subtype.add("Dragon"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SachiDaughterOfSeshiro.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SachiDaughterOfSeshiro.java index 875ab51f878..0f7638a7426 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SachiDaughterOfSeshiro.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SachiDaughterOfSeshiro.java @@ -29,10 +29,10 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.Mana; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SakuraTribeElder.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SakuraTribeElder.java index 6b50cb9f81b..199f0f9d445 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SakuraTribeElder.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SakuraTribeElder.java @@ -28,12 +28,15 @@ package mage.sets.championsofkamigawa; * or implied, of BetaSteward_at_googlemail.com. */ -import mage.Constants; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.filter.common.FilterBasicLandCard; import mage.target.common.TargetCardInLibrary; @@ -47,7 +50,7 @@ public class SakuraTribeElder extends CardImpl { final static FilterBasicLandCard filterLands = new FilterBasicLandCard(); public SakuraTribeElder(UUID ownerId) { - super(ownerId, 239, "Sakura-Tribe Elder", Constants.Rarity.COMMON, new Constants.CardType[]{Constants.CardType.CREATURE}, "{1}{G}"); + super(ownerId, 239, "Sakura-Tribe Elder", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{G}"); this.expansionSetCode = "CHK"; this.subtype.add("Snake"); this.subtype.add("Shaman"); @@ -55,7 +58,7 @@ public class SakuraTribeElder extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); TargetCardInLibrary target = new TargetCardInLibrary(filterLands); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(target, true, Constants.Outcome.PutLandInPlay), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(target, true, Outcome.PutLandInPlay), new SacrificeSourceCost())); } public SakuraTribeElder(final SakuraTribeElder card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SamuraiEnforcers.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SamuraiEnforcers.java index 93895c6e7f1..63ec0016597 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SamuraiEnforcers.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SamuraiEnforcers.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.BushidoAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SamuraiOfThePaleCurtain.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SamuraiOfThePaleCurtain.java index 005353f2a16..8e4069f3eeb 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SamuraiOfThePaleCurtain.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SamuraiOfThePaleCurtain.java @@ -29,11 +29,11 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ScuttlingDeath.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ScuttlingDeath.java index 60c901d4069..fe7b7632d18 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ScuttlingDeath.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ScuttlingDeath.java @@ -30,9 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.SoulshiftAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -54,7 +55,7 @@ public class ScuttlingDeath extends CardImpl { this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Constants.Duration.EndOfTurn), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); this.addAbility(new SoulshiftAbility(4)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SeizanPerverterOfTruth.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SeizanPerverterOfTruth.java index 6676fd26fc4..f8d8fc261e1 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SeizanPerverterOfTruth.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SeizanPerverterOfTruth.java @@ -30,15 +30,15 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; /** * @@ -55,7 +55,7 @@ public class SeizanPerverterOfTruth extends CardImpl { this.color.setBlack(true); this.power = new MageInt(6); this.toughness = new MageInt(5); - Ability ability = new BeginningOfUpkeepTriggeredAbility(new DrawCardTargetEffect(2), Constants.TargetController.ANY, false); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new DrawCardTargetEffect(2), TargetController.ANY, false); ability.addEffect(new LoseLifeTargetEffect(2)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SenseiGoldenTail.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SenseiGoldenTail.java index 20b08e15866..cbbeca53ef7 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SenseiGoldenTail.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SenseiGoldenTail.java @@ -29,10 +29,10 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; @@ -43,6 +43,7 @@ import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.keyword.BushidoAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.Counter; import mage.target.common.TargetCreaturePermanent; @@ -64,7 +65,7 @@ public class SenseiGoldenTail extends CardImpl { // Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.) this.addAbility(new BushidoAbility(1)); // {1}{W}, {T}: Put a training counter on target creature. - Ability ability = new ActivateAsSorceryActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersTargetEffect(new TrainingCounter()), new ManaCostsImpl("{1}{W}")); + Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(new TrainingCounter()), new ManaCostsImpl("{1}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); // That creature gains bushido 1 and becomes a Samurai in addition to its other creature types. Activate this ability only any time you could cast a sorcery. diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SenseisDiviningTop.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SenseisDiviningTop.java index 7ad3295a72d..d9fa40cea2f 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SenseisDiviningTop.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SenseisDiviningTop.java @@ -30,10 +30,10 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SerpentSkin.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SerpentSkin.java index a050f86a132..bdae92b3a35 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SerpentSkin.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SerpentSkin.java @@ -30,9 +30,7 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -61,13 +59,13 @@ public class SerpentSkin extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); // {G}: Regenerate enchanted creature. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateAttachedEffect(Constants.AttachmentType.AURA),new ColoredManaCost(Constants.ColoredManaSymbol.G))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA),new ColoredManaCost(ColoredManaSymbol.G))); } public SerpentSkin (final SerpentSkin card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SeshiroTheAnointed.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SeshiroTheAnointed.java index 3d4c9089d36..9078460c8d5 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SeshiroTheAnointed.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SeshiroTheAnointed.java @@ -30,15 +30,16 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -66,7 +67,7 @@ public class SeshiroTheAnointed extends CardImpl { this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(4); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Constants.Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, true))); this.addAbility(new SeshiroTheAnointedAbility()); } @@ -84,7 +85,7 @@ public class SeshiroTheAnointed extends CardImpl { class SeshiroTheAnointedAbility extends TriggeredAbilityImpl { public SeshiroTheAnointedAbility() { - super(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), true); + super(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), true); } public SeshiroTheAnointedAbility(final SeshiroTheAnointedAbility ability) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ShimatsuTheBloodcloaked.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ShimatsuTheBloodcloaked.java index 2b315db0730..127af995739 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ShimatsuTheBloodcloaked.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ShimatsuTheBloodcloaked.java @@ -28,10 +28,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -64,7 +62,7 @@ public class ShimatsuTheBloodcloaked extends CardImpl { this.toughness = new MageInt(0); // As Shimatsu the Bloodcloaked enters the battlefield, sacrifice any number of permanents. Shimatsu enters the battlefield with that many +1/+1 counters on it. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ShimatsuTheBloodcloakedEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ShimatsuTheBloodcloakedEffect())); } public ShimatsuTheBloodcloaked(final ShimatsuTheBloodcloaked card) { @@ -80,7 +78,7 @@ public class ShimatsuTheBloodcloaked extends CardImpl { class ShimatsuTheBloodcloakedEffect extends ReplacementEffectImpl { public ShimatsuTheBloodcloakedEffect() { - super(Constants.Duration.WhileOnBattlefield, Outcome.BoostCreature); + super(Duration.WhileOnBattlefield, Outcome.BoostCreature); this.staticText = "As Shimatsu the Bloodcloaked enters the battlefield, sacrifice any number of permanents. Shimatsu enters the battlefield with that many +1/+1 counters on it"; } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ShinkaTheBloodsoakedKeep.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ShinkaTheBloodsoakedKeep.java index fb4f191af5f..5a0f04a93f0 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ShinkaTheBloodsoakedKeep.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ShinkaTheBloodsoakedKeep.java @@ -30,9 +30,7 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -61,7 +59,7 @@ public class ShinkaTheBloodsoakedKeep extends CardImpl this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); this.addAbility(new RedManaAbility()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ShisatoWhisperingHunter.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ShisatoWhisperingHunter.java index 5cc93b8c2b1..1b4359c31da 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ShisatoWhisperingHunter.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ShisatoWhisperingHunter.java @@ -28,15 +28,16 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.SacrificeControllerEffect; import mage.abilities.effects.common.SkipNextPlayerUntapStepEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -65,7 +66,7 @@ public class ShisatoWhisperingHunter extends CardImpl { this.toughness = new MageInt(2); // At the beginning of your upkeep, sacrifice a Snake. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeControllerEffect(filter, 1,""), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeControllerEffect(filter, 1,""), TargetController.YOU, false)); // Whenever Shisato, Whispering Hunter deals combat damage to a player, that player skips his or her next untap step. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new SkipNextPlayerUntapStepEffect("that "),false, true)); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ShizoDeathsStorehouse.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ShizoDeathsStorehouse.java index a9c664ffdf8..62ea57e0dbd 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ShizoDeathsStorehouse.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ShizoDeathsStorehouse.java @@ -30,9 +30,7 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -61,7 +59,7 @@ public class ShizoDeathsStorehouse extends CardImpl { this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); this.addAbility(new BlackManaAbility()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityTargetEffect(FearAbility.getInstance(), Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FearAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SilentChantZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SilentChantZubera.java index b4238b7e1e9..b40043f3c32 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SilentChantZubera.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SilentChantZubera.java @@ -30,8 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SireOfTheStorm.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SireOfTheStorm.java index f740b4905a2..ee69f9530ff 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SireOfTheStorm.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SireOfTheStorm.java @@ -30,8 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Soilshaper.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Soilshaper.java index 749cb93ce2b..2f566ac335a 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Soilshaper.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Soilshaper.java @@ -30,9 +30,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SokenzanBruiser.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SokenzanBruiser.java index 45266826761..400070374b9 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SokenzanBruiser.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SokenzanBruiser.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.MountainwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiCloudskater.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiCloudskater.java index 8c67d26ef96..eb57570c51f 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiCloudskater.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiCloudskater.java @@ -29,9 +29,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorGuard.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorGuard.java index 57a85fcaee0..8f481e7021d 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorGuard.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorGuard.java @@ -29,9 +29,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorMage.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorMage.java index 43cbb04d1c5..37aa45ac92c 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorMage.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorMage.java @@ -29,9 +29,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiRainshaper.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiRainshaper.java index b2240d5a125..a62ea767958 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiRainshaper.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiRainshaper.java @@ -29,9 +29,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +41,8 @@ import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.target.common.TargetControlledCreaturePermanent; @@ -66,7 +68,7 @@ public class SoratamiRainshaper extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {3}, Return a land you control to its owner's hand: Target creature you control gains shroud until end of turn. (It can't be the target of spells or abilities.) - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityTargetEffect(ShroudAbility.getInstance(), Constants.Duration.EndOfTurn), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(3)); ability.addCost(new ReturnToHandTargetCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiSavant.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiSavant.java index a6f54faf084..4e6d65c770b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiSavant.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiSavant.java @@ -29,9 +29,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +40,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.target.TargetSpell; @@ -65,7 +66,7 @@ public class SoratamiSavant extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {3}, Return a land you control to its owner's hand: Counter target spell unless its controller pays {3}. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(3)), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(3)), new GenericManaCost(3)); ability.addCost(new ReturnToHandTargetCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetSpell()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiSeer.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiSeer.java index 397c71e160a..06fa6d11f32 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiSeer.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiSeer.java @@ -29,10 +29,10 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +42,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.game.Game; @@ -87,7 +88,7 @@ public class SoratamiSeer extends CardImpl { class SoratamiSeerEffect extends OneShotEffect { public SoratamiSeerEffect() { - super(Constants.Outcome.DrawCard); + super(Outcome.DrawCard); staticText = "Discard all the cards in your hand, then draw that many cards"; } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SosukeSonOfSeshiro.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SosukeSonOfSeshiro.java index 12fd4feef9b..36bffe7b650 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SosukeSonOfSeshiro.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SosukeSonOfSeshiro.java @@ -28,10 +28,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -73,7 +71,7 @@ public class SosukeSonOfSeshiro extends CardImpl { this.toughness = new MageInt(4); // Other Snake creatures you control get +1/+0. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Constants.Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, filter, true))); // Whenever a Warrior you control deals combat damage to a creature, destroy that creature at end of combat. this.addAbility(new SosukeSonOfSeshiroTriggeredAbility()); } @@ -91,7 +89,7 @@ public class SosukeSonOfSeshiro extends CardImpl { class SosukeSonOfSeshiroTriggeredAbility extends TriggeredAbilityImpl { SosukeSonOfSeshiroTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new SosukeSonOfSeshiroEffect()); + super(Zone.BATTLEFIELD, new SosukeSonOfSeshiroEffect()); } SosukeSonOfSeshiroTriggeredAbility(final SosukeSonOfSeshiroTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SoulOfMagma.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoulOfMagma.java index a0e15139e43..fbb6480d0e2 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SoulOfMagma.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SoulOfMagma.java @@ -30,8 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Squelch.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Squelch.java index ffc96fabbb4..45400f73351 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Squelch.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Squelch.java @@ -30,14 +30,15 @@ package mage.sets.championsofkamigawa; import java.util.HashSet; import java.util.Set; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.ActivatedAbility; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.Filter; import mage.filter.FilterAbility; import mage.game.Game; @@ -79,7 +80,7 @@ class ActivatedAbilityTarget extends TargetObject { public ActivatedAbilityTarget() { this.minNumberOfTargets = 1; this.maxNumberOfTargets = 1; - this.zone = Constants.Zone.STACK; + this.zone = Zone.STACK; this.targetName = "activated ability"; } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/StrengthOfCedars.java b/Mage.Sets/src/mage/sets/championsofkamigawa/StrengthOfCedars.java index a3f87c7f4cf..5bc4ec710b5 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/StrengthOfCedars.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/StrengthOfCedars.java @@ -29,9 +29,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.continious.BoostTargetEffect; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/StudentOfElements.java b/Mage.Sets/src/mage/sets/championsofkamigawa/StudentOfElements.java index af2e00a7653..2b353480c17 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/StudentOfElements.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/StudentOfElements.java @@ -28,11 +28,11 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.StateTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -119,7 +119,7 @@ class TobitaMasterOfWinds extends Token { TobitaMasterOfWinds() { super("Tobita, Master of Winds", ""); supertype.add("Legendary"); - cardType.add(Constants.CardType.CREATURE); + cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add("Human"); subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SwallowingPlague.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SwallowingPlague.java index d8601460ca2..9d8be8fb500 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SwallowingPlague.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SwallowingPlague.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/TakenoSamuraiGeneral.java b/Mage.Sets/src/mage/sets/championsofkamigawa/TakenoSamuraiGeneral.java index a5a8293b49b..fc54dbd9c45 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/TakenoSamuraiGeneral.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/TakenoSamuraiGeneral.java @@ -28,9 +28,7 @@ package mage.sets.championsofkamigawa; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -59,7 +57,7 @@ public class TakenoSamuraiGeneral extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(new BushidoAbility(2)); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new TakenoSamuraiGeneralEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TakenoSamuraiGeneralEffect())); } public TakenoSamuraiGeneral(final TakenoSamuraiGeneral card) { @@ -81,7 +79,7 @@ class TakenoSamuraiGeneralEffect extends ContinuousEffectImpl { // Equipped creature gets +1/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); // As long as it's legendary, it gets an additional +2/+2. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ConditionalContinousEffect( + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( new BoostEquippedEffect(2, 2), new EquippedMatchesFilterCondition(legendaryFilter), rule1))); // As long as it's red, it has trample. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ConditionalContinousEffect( + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT), new EquippedMatchesFilterCondition(redFilter), rule2))); // Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.) - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(1), new TargetControlledCreaturePermanent())); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1), new TargetControlledCreaturePermanent())); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/TerashisCry.java b/Mage.Sets/src/mage/sets/championsofkamigawa/TerashisCry.java index ea44c0317ac..18798495d2c 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/TerashisCry.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/TerashisCry.java @@ -30,8 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.target.Target; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/TheUnspeakable.java b/Mage.Sets/src/mage/sets/championsofkamigawa/TheUnspeakable.java index 5f9743fcffe..2b9a8f81705 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/TheUnspeakable.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/TheUnspeakable.java @@ -28,8 +28,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope.java index 8477ef67d60..15486fda71b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope.java @@ -30,8 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Thoughtbind.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Thoughtbind.java index c8165fb3239..48626e1a575 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Thoughtbind.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Thoughtbind.java @@ -30,8 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.filter.Filter; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ThousandleggedKami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ThousandleggedKami.java index 78563ae0ce5..893b40892e1 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ThousandleggedKami.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ThousandleggedKami.java @@ -30,8 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.SoulshiftAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/TimeOfNeed.java b/Mage.Sets/src/mage/sets/championsofkamigawa/TimeOfNeed.java index 7ac3e1bf490..c170118bc33 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/TimeOfNeed.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/TimeOfNeed.java @@ -30,8 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.filter.FilterCard; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/TranquilGarden.java b/Mage.Sets/src/mage/sets/championsofkamigawa/TranquilGarden.java index c689b7c5c2a..a7dd73d6335 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/TranquilGarden.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/TranquilGarden.java @@ -28,8 +28,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.SkipNextUntapSourceEffect; import mage.abilities.mana.ColorlessManaAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/UncontrollableAnger.java b/Mage.Sets/src/mage/sets/championsofkamigawa/UncontrollableAnger.java index 6eb807930ea..0ba33b631c6 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/UncontrollableAnger.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/UncontrollableAnger.java @@ -30,9 +30,7 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.common.SimpleStaticAbility; @@ -58,12 +56,12 @@ public class UncontrollableAnger extends CardImpl { this.color.setRed(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); this.addAbility(FlashAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Constants.Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new AttacksEachTurnStaticAbility(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new AttacksEachTurnStaticAbility(), AttachmentType.AURA))); } public UncontrollableAnger (final UncontrollableAnger card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/UnearthlyBlizzard.java b/Mage.Sets/src/mage/sets/championsofkamigawa/UnearthlyBlizzard.java index 1d4e05e68c3..056cdd11e61 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/UnearthlyBlizzard.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/UnearthlyBlizzard.java @@ -30,9 +30,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.CantBlockTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/UnnaturalSpeed.java b/Mage.Sets/src/mage/sets/championsofkamigawa/UnnaturalSpeed.java index 12f1bf503ea..afe26e7019b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/UnnaturalSpeed.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/UnnaturalSpeed.java @@ -30,12 +30,12 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -49,7 +49,7 @@ public class UnnaturalSpeed extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); this.color.setRed(true); - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/UyoSilentProphet.java b/Mage.Sets/src/mage/sets/championsofkamigawa/UyoSilentProphet.java index bf0ee6b5707..aac24aeed95 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/UyoSilentProphet.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/UyoSilentProphet.java @@ -29,9 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CopyTargetSpellEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; @@ -71,7 +71,7 @@ public class UyoSilentProphet extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CopyTargetSpellEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CopyTargetSpellEffect(), new GenericManaCost(2)); ability.addCost(new ReturnToHandTargetCost(new TargetControlledPermanent(2, 2, new FilterLandPermanent("lands"), false))); ability.addTarget(new TargetSpell(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/VenerableKumo.java b/Mage.Sets/src/mage/sets/championsofkamigawa/VenerableKumo.java index 9f9930d25f5..f49569f2730 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/VenerableKumo.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/VenerableKumo.java @@ -30,8 +30,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.abilities.keyword.SoulshiftAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Vigilance.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Vigilance.java index 6e22ff17c3f..9405aac1cd6 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Vigilance.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Vigilance.java @@ -30,9 +30,7 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; @@ -54,8 +52,8 @@ public class Vigilance extends CardImpl { this.color.setWhite(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), Constants.AttachmentType.AURA))); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA))); } public Vigilance (final Vigilance card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/VillainousOgre.java b/Mage.Sets/src/mage/sets/championsofkamigawa/VillainousOgre.java index afaddb9e275..b7fdeed655f 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/VillainousOgre.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/VillainousOgre.java @@ -28,9 +28,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.condition.common.ControlsPermanentCondition; import mage.abilities.common.CantBlockAbility; @@ -38,6 +38,8 @@ import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.decorator.ConditionalGainActivatedAbility; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -67,9 +69,9 @@ public class VillainousOgre extends CardImpl { // As long as you control a Demon, Villainous Ogre has "{B}: Regenerate Villainous Ogre. this.addAbility( new ConditionalGainActivatedAbility( - Constants.Zone.BATTLEFIELD, + Zone.BATTLEFIELD, new RegenerateSourceEffect(), - new ColoredManaCost(Constants.ColoredManaSymbol.B), + new ColoredManaCost(ColoredManaSymbol.B), new ControlsPermanentCondition(filter), rule)); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/VineKami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/VineKami.java index adf9dca54b6..d2fc6293e18 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/VineKami.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/VineKami.java @@ -28,9 +28,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.CantBeBlockedByOneEffect; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/WakingNightmare.java b/Mage.Sets/src/mage/sets/championsofkamigawa/WakingNightmare.java index e59a13e8e70..ca2c27be00a 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/WakingNightmare.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/WakingNightmare.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DiscardTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/WanderingOnes.java b/Mage.Sets/src/mage/sets/championsofkamigawa/WanderingOnes.java index 2def10412ca..ff8bca771c0 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/WanderingOnes.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/WanderingOnes.java @@ -29,8 +29,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/WaterveilCavern.java b/Mage.Sets/src/mage/sets/championsofkamigawa/WaterveilCavern.java index c2b59d8eefe..b42f0b74958 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/WaterveilCavern.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/WaterveilCavern.java @@ -28,8 +28,8 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.SkipNextUntapSourceEffect; import mage.abilities.mana.BlackManaAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/WickedAkuba.java b/Mage.Sets/src/mage/sets/championsofkamigawa/WickedAkuba.java index de6a1312e05..828d69385ed 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/WickedAkuba.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/WickedAkuba.java @@ -28,16 +28,17 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; import mage.filter.FilterPlayer; import mage.filter.predicate.ObjectSourcePlayer; import mage.filter.predicate.ObjectSourcePlayerPredicate; @@ -68,7 +69,7 @@ public class WickedAkuba extends CardImpl { this.toughness = new MageInt(2); // {B}: Target player dealt damage by Wicked Akuba this turn loses 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ColoredManaCost(Constants.ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.B)); ability.addTarget(new TargetPlayer(1, 1, false, filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisFlame.java b/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisFlame.java index e7dafd4d690..e6d81a89848 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisFlame.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisFlame.java @@ -30,10 +30,10 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.DamageTargetEffect; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisStorm.java b/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisStorm.java index d8a64dc5fdd..851b09d6f9b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisStorm.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisStorm.java @@ -30,10 +30,10 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.DamageAllEffect; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/YoseiTheMorningStar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/YoseiTheMorningStar.java index d7cd342831c..e55ec018e14 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/YoseiTheMorningStar.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/YoseiTheMorningStar.java @@ -28,9 +28,9 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ZoZuThePunisher.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ZoZuThePunisher.java index 4170559198c..be1819268fd 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ZoZuThePunisher.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ZoZuThePunisher.java @@ -29,14 +29,14 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.game.Game; @@ -83,7 +83,7 @@ public class ZoZuThePunisher extends CardImpl { class ZoZuThePunisherAbility extends TriggeredAbilityImpl { public ZoZuThePunisherAbility() { - super(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(2)); + super(Zone.BATTLEFIELD, new DamageTargetEffect(2)); } ZoZuThePunisherAbility(final ZoZuThePunisherAbility ability) { diff --git a/Mage.Sets/src/mage/sets/coldsnap/AdarkarValkyrie.java b/Mage.Sets/src/mage/sets/coldsnap/AdarkarValkyrie.java index bf68ee402eb..1aed8cbb592 100644 --- a/Mage.Sets/src/mage/sets/coldsnap/AdarkarValkyrie.java +++ b/Mage.Sets/src/mage/sets/coldsnap/AdarkarValkyrie.java @@ -28,11 +28,11 @@ package mage.sets.coldsnap; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/coldsnap/BorealDruid.java b/Mage.Sets/src/mage/sets/coldsnap/BorealDruid.java index 34774ff56e5..e228a871542 100644 --- a/Mage.Sets/src/mage/sets/coldsnap/BorealDruid.java +++ b/Mage.Sets/src/mage/sets/coldsnap/BorealDruid.java @@ -28,8 +28,8 @@ package mage.sets.coldsnap; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/coldsnap/Counterbalance.java b/Mage.Sets/src/mage/sets/coldsnap/Counterbalance.java index c5796ead1f4..830ce264735 100644 --- a/Mage.Sets/src/mage/sets/coldsnap/Counterbalance.java +++ b/Mage.Sets/src/mage/sets/coldsnap/Counterbalance.java @@ -28,9 +28,9 @@ package mage.sets.coldsnap; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.OpponentCastsSpellTriggeredAbility; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/coldsnap/DarkDepths.java b/Mage.Sets/src/mage/sets/coldsnap/DarkDepths.java index 72b6326e0a9..075b427f684 100644 --- a/Mage.Sets/src/mage/sets/coldsnap/DarkDepths.java +++ b/Mage.Sets/src/mage/sets/coldsnap/DarkDepths.java @@ -28,9 +28,9 @@ package mage.sets.coldsnap; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.StateTriggeredAbility; @@ -44,6 +44,7 @@ import mage.abilities.effects.common.counter.RemoveCounterSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; @@ -65,7 +66,7 @@ public class DarkDepths extends CardImpl { // Dark Depths enters the battlefield with ten ice counters on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.ICE.createInstance(10)), "with ten ice counters on it")); // {3}: Remove an ice counter from Dark Depths. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RemoveCounterSourceEffect(CounterType.ICE.createInstance(1)), new ManaCostsImpl("{3}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RemoveCounterSourceEffect(CounterType.ICE.createInstance(1)), new ManaCostsImpl("{3}"))); // When Dark Depths has no ice counters on it, sacrifice it. If you do, put a legendary 20/20 black Avatar creature token with flying and "This creature is indestructible" named Marit Lage onto the battlefield. this.addAbility(new DarkDepthsAbility()); } @@ -83,7 +84,7 @@ public class DarkDepths extends CardImpl { class DarkDepthsAbility extends StateTriggeredAbility { public DarkDepthsAbility() { - super(Constants.Zone.BATTLEFIELD, new SacrificeSourceEffect()); + super(Zone.BATTLEFIELD, new SacrificeSourceEffect()); this.addEffect(new CreateTokenEffect(new MaritLageToken())); } diff --git a/Mage.Sets/src/mage/sets/coldsnap/KrovikanScoundrel.java b/Mage.Sets/src/mage/sets/coldsnap/KrovikanScoundrel.java index 3c657a1a593..fe47ee2e0bc 100644 --- a/Mage.Sets/src/mage/sets/coldsnap/KrovikanScoundrel.java +++ b/Mage.Sets/src/mage/sets/coldsnap/KrovikanScoundrel.java @@ -28,8 +28,8 @@ package mage.sets.coldsnap; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/coldsnap/MartyrOfSands.java b/Mage.Sets/src/mage/sets/coldsnap/MartyrOfSands.java index 5291c9ecca4..1d8ff48d735 100644 --- a/Mage.Sets/src/mage/sets/coldsnap/MartyrOfSands.java +++ b/Mage.Sets/src/mage/sets/coldsnap/MartyrOfSands.java @@ -28,10 +28,10 @@ package mage.sets.coldsnap; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/coldsnap/RiteOfFlame.java b/Mage.Sets/src/mage/sets/coldsnap/RiteOfFlame.java index d1863bf10a3..15a383e2f3c 100644 --- a/Mage.Sets/src/mage/sets/coldsnap/RiteOfFlame.java +++ b/Mage.Sets/src/mage/sets/coldsnap/RiteOfFlame.java @@ -28,8 +28,8 @@ package mage.sets.coldsnap; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.Ability; import mage.abilities.effects.common.ManaEffect; diff --git a/Mage.Sets/src/mage/sets/commander/AEthersnipe.java b/Mage.Sets/src/mage/sets/commander/AEthersnipe.java index aed81451a32..5a8c30000ef 100644 --- a/Mage.Sets/src/mage/sets/commander/AEthersnipe.java +++ b/Mage.Sets/src/mage/sets/commander/AEthersnipe.java @@ -28,17 +28,15 @@ package mage.sets.commander; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.EvokeAbility; import mage.cards.CardImpl; import mage.target.Target; -import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetNonlandPermanent; /** diff --git a/Mage.Sets/src/mage/sets/commander/BasandraBattleSeraph.java b/Mage.Sets/src/mage/sets/commander/BasandraBattleSeraph.java index 6c83e2f1281..50b23c0285a 100644 --- a/Mage.Sets/src/mage/sets/commander/BasandraBattleSeraph.java +++ b/Mage.Sets/src/mage/sets/commander/BasandraBattleSeraph.java @@ -28,11 +28,13 @@ package mage.sets.commander; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TurnPhase; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.TurnPhase; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -72,8 +74,8 @@ public class BasandraBattleSeraph extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BasandraBattleSeraphEffect())); // {R}: Target creature attacks this turn if able. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AttacksIfAbleTargetEffect(Constants.Duration.EndOfTurn), new ManaCostsImpl("{R}")); - ability.addEffect(new GainAbilityTargetEffect(AttacksThisTurnMarkerAbility.getInstance(), Constants.Duration.EndOfTurn, null)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttacksIfAbleTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{R}")); + ability.addEffect(new GainAbilityTargetEffect(AttacksThisTurnMarkerAbility.getInstance(), Duration.EndOfTurn, null)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); @@ -92,7 +94,7 @@ public class BasandraBattleSeraph extends CardImpl { class BasandraBattleSeraphEffect extends ReplacementEffectImpl { public BasandraBattleSeraphEffect() { - super(Constants.Duration.EndOfTurn, Constants.Outcome.Neutral); + super(Duration.EndOfTurn, Outcome.Neutral); staticText = "Players can't cast spells during combat"; } diff --git a/Mage.Sets/src/mage/sets/commander/Faultgrinder.java b/Mage.Sets/src/mage/sets/commander/Faultgrinder.java index da28c2791b7..1b0ea4b388d 100644 --- a/Mage.Sets/src/mage/sets/commander/Faultgrinder.java +++ b/Mage.Sets/src/mage/sets/commander/Faultgrinder.java @@ -28,8 +28,8 @@ package mage.sets.commander; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/commander/Flusterstorm.java b/Mage.Sets/src/mage/sets/commander/Flusterstorm.java index affe033ee58..51901261d1e 100644 --- a/Mage.Sets/src/mage/sets/commander/Flusterstorm.java +++ b/Mage.Sets/src/mage/sets/commander/Flusterstorm.java @@ -28,9 +28,9 @@ package mage.sets.commander; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.abilities.keyword.StormAbility; @@ -48,7 +48,7 @@ public class Flusterstorm extends CardImpl { private static final FilterSpell filter = new FilterSpell("instant or sorcery spell"); static { - filter.add(Predicates.or(new CardTypePredicate(Constants.CardType.INSTANT), new CardTypePredicate(Constants.CardType.SORCERY))); + filter.add(Predicates.or(new CardTypePredicate(CardType.INSTANT), new CardTypePredicate(CardType.SORCERY))); } public Flusterstorm(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/commander/Mulldrifter.java b/Mage.Sets/src/mage/sets/commander/Mulldrifter.java index af1b7babdc2..bef0877836c 100644 --- a/Mage.Sets/src/mage/sets/commander/Mulldrifter.java +++ b/Mage.Sets/src/mage/sets/commander/Mulldrifter.java @@ -28,8 +28,8 @@ package mage.sets.commander; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/commander/PerilousResearch.java b/Mage.Sets/src/mage/sets/commander/PerilousResearch.java index ffaef27f575..d7d3026ef04 100644 --- a/Mage.Sets/src/mage/sets/commander/PerilousResearch.java +++ b/Mage.Sets/src/mage/sets/commander/PerilousResearch.java @@ -28,16 +28,13 @@ package mage.sets.commander; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DrawCardControllerEffect; -import mage.abilities.effects.common.SacrificeEffect; import mage.cards.CardImpl; -import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/sets/commander/ScavengingOoze.java b/Mage.Sets/src/mage/sets/commander/ScavengingOoze.java index 349df246b18..fd4200fc9e6 100644 --- a/Mage.Sets/src/mage/sets/commander/ScavengingOoze.java +++ b/Mage.Sets/src/mage/sets/commander/ScavengingOoze.java @@ -28,10 +28,10 @@ package mage.sets.commander; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/commander/SerraAngel.java b/Mage.Sets/src/mage/sets/commander/SerraAngel.java index bf981f78155..93e947c26b0 100644 --- a/Mage.Sets/src/mage/sets/commander/SerraAngel.java +++ b/Mage.Sets/src/mage/sets/commander/SerraAngel.java @@ -28,7 +28,7 @@ package mage.sets.commander; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/commander/SewerNemesis.java b/Mage.Sets/src/mage/sets/commander/SewerNemesis.java index 4bea5c94f49..07a1513a657 100644 --- a/Mage.Sets/src/mage/sets/commander/SewerNemesis.java +++ b/Mage.Sets/src/mage/sets/commander/SewerNemesis.java @@ -28,11 +28,11 @@ package mage.sets.commander; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage.Sets/src/mage/sets/commander/Shriekmaw.java b/Mage.Sets/src/mage/sets/commander/Shriekmaw.java index 7bd564e7bd3..ec0a4bab359 100644 --- a/Mage.Sets/src/mage/sets/commander/Shriekmaw.java +++ b/Mage.Sets/src/mage/sets/commander/Shriekmaw.java @@ -28,19 +28,13 @@ package mage.sets.commander; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.costs.AlternativeCostImpl; -import mage.abilities.costs.Cost; -import mage.abilities.costs.CostsImpl; -import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; -import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.keyword.EvokeAbility; import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/commander/SpikeFeeder.java b/Mage.Sets/src/mage/sets/commander/SpikeFeeder.java index b821255d5bf..60d219834ab 100644 --- a/Mage.Sets/src/mage/sets/commander/SpikeFeeder.java +++ b/Mage.Sets/src/mage/sets/commander/SpikeFeeder.java @@ -28,7 +28,7 @@ package mage.sets.commander; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/commander/Spitebellows.java b/Mage.Sets/src/mage/sets/commander/Spitebellows.java index ee852f48923..ba4102a279d 100644 --- a/Mage.Sets/src/mage/sets/commander/Spitebellows.java +++ b/Mage.Sets/src/mage/sets/commander/Spitebellows.java @@ -28,8 +28,8 @@ package mage.sets.commander; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LeavesBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/commander/VeteranExplorer.java b/Mage.Sets/src/mage/sets/commander/VeteranExplorer.java index 54874337a47..3e917f8eebb 100644 --- a/Mage.Sets/src/mage/sets/commander/VeteranExplorer.java +++ b/Mage.Sets/src/mage/sets/commander/VeteranExplorer.java @@ -30,16 +30,17 @@ package mage.sets.commander; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterBasicLandCard; import mage.game.Game; import mage.players.Player; @@ -122,7 +123,7 @@ class VeteranExplorerEffect extends OneShotEffect { for (UUID cardId: (List)target.getTargets()) { Card card = player.getLibrary().getCard(cardId, game); if (card != null) { - card.putOntoBattlefield(game, Constants.Zone.LIBRARY, source.getId(), player.getId()); + card.putOntoBattlefield(game, Zone.LIBRARY, source.getId(), player.getId()); } } } diff --git a/Mage.Sets/src/mage/sets/conflux/AbsorbVis.java b/Mage.Sets/src/mage/sets/conflux/AbsorbVis.java index 6ef158e31e5..cf4480efc75 100644 --- a/Mage.Sets/src/mage/sets/conflux/AbsorbVis.java +++ b/Mage.Sets/src/mage/sets/conflux/AbsorbVis.java @@ -29,8 +29,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; diff --git a/Mage.Sets/src/mage/sets/conflux/AerieMystics.java b/Mage.Sets/src/mage/sets/conflux/AerieMystics.java index 5f4d560f3fc..6d5897358d0 100644 --- a/Mage.Sets/src/mage/sets/conflux/AerieMystics.java +++ b/Mage.Sets/src/mage/sets/conflux/AerieMystics.java @@ -29,10 +29,10 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/ApocalypseHydra.java b/Mage.Sets/src/mage/sets/conflux/ApocalypseHydra.java index 810529ca753..9df87bc3526 100644 --- a/Mage.Sets/src/mage/sets/conflux/ApocalypseHydra.java +++ b/Mage.Sets/src/mage/sets/conflux/ApocalypseHydra.java @@ -27,9 +27,8 @@ */ package mage.sets.conflux; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -41,6 +40,8 @@ import mage.abilities.effects.EntersBattlefieldEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -67,7 +68,7 @@ public class ApocalypseHydra extends CardImpl { // Apocalypse Hydra enters the battlefield with X +1/+1 counters on it. If X is 5 or more, it enters the battlefield with an additional X +1/+1 counters on it. this.addAbility(new EntersBattlefieldAbility(new ApocalypseHydraEffect(), true)); // {1}{R}, Remove a +1/+1 counter from Apocalypse Hydra: Apocalypse Hydra deals 1 damage to target creature or player. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}{R}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); @@ -85,7 +86,7 @@ public class ApocalypseHydra extends CardImpl { class ApocalypseHydraEffect extends OneShotEffect { ApocalypseHydraEffect() { - super(Constants.Outcome.BoostCreature); + super(Outcome.BoostCreature); staticText = "with X +1/+1 counters on it. If X is 5 or more, it enters the battlefield with an additional X +1/+1 counters on it"; } diff --git a/Mage.Sets/src/mage/sets/conflux/ArmillarySphere.java b/Mage.Sets/src/mage/sets/conflux/ArmillarySphere.java index 6cb19e35149..50cfb3a0e30 100644 --- a/Mage.Sets/src/mage/sets/conflux/ArmillarySphere.java +++ b/Mage.Sets/src/mage/sets/conflux/ArmillarySphere.java @@ -29,9 +29,9 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/conflux/AshasFavor.java b/Mage.Sets/src/mage/sets/conflux/AshasFavor.java index 8ca10558204..8d008559051 100644 --- a/Mage.Sets/src/mage/sets/conflux/AshasFavor.java +++ b/Mage.Sets/src/mage/sets/conflux/AshasFavor.java @@ -30,9 +30,7 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -59,13 +57,13 @@ public class AshasFavor extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), Constants.AttachmentType.AURA))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), Constants.AttachmentType.AURA))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA))); } public AshasFavor (final AshasFavor card) { diff --git a/Mage.Sets/src/mage/sets/conflux/AvenSquire.java b/Mage.Sets/src/mage/sets/conflux/AvenSquire.java index 1abd88e37ff..0b65a61dbd1 100644 --- a/Mage.Sets/src/mage/sets/conflux/AvenSquire.java +++ b/Mage.Sets/src/mage/sets/conflux/AvenSquire.java @@ -28,8 +28,8 @@ package mage.sets.conflux; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ExaltedAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/BeaconBehemoth.java b/Mage.Sets/src/mage/sets/conflux/BeaconBehemoth.java index f81fac3750d..4125541c1cc 100644 --- a/Mage.Sets/src/mage/sets/conflux/BeaconBehemoth.java +++ b/Mage.Sets/src/mage/sets/conflux/BeaconBehemoth.java @@ -29,10 +29,10 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/BloodhallOoze.java b/Mage.Sets/src/mage/sets/conflux/BloodhallOoze.java index f4f0654d964..0fc9c86ad98 100644 --- a/Mage.Sets/src/mage/sets/conflux/BloodhallOoze.java +++ b/Mage.Sets/src/mage/sets/conflux/BloodhallOoze.java @@ -28,9 +28,9 @@ package mage.sets.conflux; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/BoneSaw.java b/Mage.Sets/src/mage/sets/conflux/BoneSaw.java index eee41a7a1a0..12ea8cef379 100644 --- a/Mage.Sets/src/mage/sets/conflux/BoneSaw.java +++ b/Mage.Sets/src/mage/sets/conflux/BoneSaw.java @@ -29,10 +29,10 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; diff --git a/Mage.Sets/src/mage/sets/conflux/CanyonMinotaur.java b/Mage.Sets/src/mage/sets/conflux/CanyonMinotaur.java index 29b912a36ed..7ec6c5027bf 100644 --- a/Mage.Sets/src/mage/sets/conflux/CanyonMinotaur.java +++ b/Mage.Sets/src/mage/sets/conflux/CanyonMinotaur.java @@ -29,8 +29,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/CelestialPurge.java b/Mage.Sets/src/mage/sets/conflux/CelestialPurge.java index f1289778356..5020de6c05d 100644 --- a/Mage.Sets/src/mage/sets/conflux/CelestialPurge.java +++ b/Mage.Sets/src/mage/sets/conflux/CelestialPurge.java @@ -29,8 +29,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/CharnelhoardWurm.java b/Mage.Sets/src/mage/sets/conflux/CharnelhoardWurm.java index 36af94fdb8f..50cff806d6a 100644 --- a/Mage.Sets/src/mage/sets/conflux/CharnelhoardWurm.java +++ b/Mage.Sets/src/mage/sets/conflux/CharnelhoardWurm.java @@ -28,8 +28,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.DealsDamageToOpponentTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/CliffrunnerBehemoth.java b/Mage.Sets/src/mage/sets/conflux/CliffrunnerBehemoth.java index f8940938c8a..da40793a67c 100644 --- a/Mage.Sets/src/mage/sets/conflux/CliffrunnerBehemoth.java +++ b/Mage.Sets/src/mage/sets/conflux/CliffrunnerBehemoth.java @@ -29,9 +29,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -41,6 +40,8 @@ import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.ColorPredicate; @@ -71,16 +72,16 @@ public class CliffrunnerBehemoth extends CardImpl { // Cliffrunner Behemoth has haste as long as you control a red permanent. this.addAbility( new SimpleStaticAbility( - Constants.Zone.BATTLEFIELD, + Zone.BATTLEFIELD, new ConditionalContinousEffect( - new GainAbilitySourceEffect(HasteAbility.getInstance(), Constants.Duration.WhileOnBattlefield), + new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield), new ControlsPermanentCondition(redPermanentFilter), "{this} has haste as long as you control a red permanent"))); // Cliffrunner Behemoth has lifelink as long as you control a white permanent. this.addAbility( new SimpleStaticAbility( - Constants.Zone.BATTLEFIELD, + Zone.BATTLEFIELD, new ConditionalContinousEffect( - new GainAbilitySourceEffect(LifelinkAbility.getInstance(), Constants.Duration.WhileOnBattlefield), + new GainAbilitySourceEffect(LifelinkAbility.getInstance(), Duration.WhileOnBattlefield), new ControlsPermanentCondition(whitePermanentFilter), "{this} has lifelink as long as you control a white permanent"))); } diff --git a/Mage.Sets/src/mage/sets/conflux/ConstrictingTendrils.java b/Mage.Sets/src/mage/sets/conflux/ConstrictingTendrils.java index f3bf9d05914..bbea6f7d51e 100644 --- a/Mage.Sets/src/mage/sets/conflux/ConstrictingTendrils.java +++ b/Mage.Sets/src/mage/sets/conflux/ConstrictingTendrils.java @@ -29,9 +29,9 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.CyclingAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/ControlledInstincts.java b/Mage.Sets/src/mage/sets/conflux/ControlledInstincts.java index efcd0361d2a..74bdd80349f 100644 --- a/Mage.Sets/src/mage/sets/conflux/ControlledInstincts.java +++ b/Mage.Sets/src/mage/sets/conflux/ControlledInstincts.java @@ -28,10 +28,10 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; diff --git a/Mage.Sets/src/mage/sets/conflux/Countersquall.java b/Mage.Sets/src/mage/sets/conflux/Countersquall.java index d3203022c54..91554a85ed5 100644 --- a/Mage.Sets/src/mage/sets/conflux/Countersquall.java +++ b/Mage.Sets/src/mage/sets/conflux/Countersquall.java @@ -28,8 +28,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.LoseLifeControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/CourtHomunculus.java b/Mage.Sets/src/mage/sets/conflux/CourtHomunculus.java index 897f189c976..f6344c104c7 100644 --- a/Mage.Sets/src/mage/sets/conflux/CourtHomunculus.java +++ b/Mage.Sets/src/mage/sets/conflux/CourtHomunculus.java @@ -27,10 +27,10 @@ */ package mage.sets.conflux; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/CumberStone.java b/Mage.Sets/src/mage/sets/conflux/CumberStone.java index 36e96fe5c86..6b57e266b9d 100644 --- a/Mage.Sets/src/mage/sets/conflux/CumberStone.java +++ b/Mage.Sets/src/mage/sets/conflux/CumberStone.java @@ -29,12 +29,13 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostOpponentsEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -49,7 +50,7 @@ public class CumberStone extends CardImpl { this.color.setBlue(true); // Creatures your opponents control get -1/-0. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostOpponentsEffect(-1, 0, Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostOpponentsEffect(-1, 0, Duration.WhileOnBattlefield))); } public CumberStone(final CumberStone card) { diff --git a/Mage.Sets/src/mage/sets/conflux/DarkTemper.java b/Mage.Sets/src/mage/sets/conflux/DarkTemper.java index 324cd2bd634..c14c616bc62 100644 --- a/Mage.Sets/src/mage/sets/conflux/DarkTemper.java +++ b/Mage.Sets/src/mage/sets/conflux/DarkTemper.java @@ -27,9 +27,9 @@ */ package mage.sets.conflux; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/conflux/DarklitGargoyle.java b/Mage.Sets/src/mage/sets/conflux/DarklitGargoyle.java index bf8158e4400..6baf34b094a 100644 --- a/Mage.Sets/src/mage/sets/conflux/DarklitGargoyle.java +++ b/Mage.Sets/src/mage/sets/conflux/DarklitGargoyle.java @@ -29,10 +29,10 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/DragDown.java b/Mage.Sets/src/mage/sets/conflux/DragDown.java index 13045084e41..bb4f0bc3723 100644 --- a/Mage.Sets/src/mage/sets/conflux/DragDown.java +++ b/Mage.Sets/src/mage/sets/conflux/DragDown.java @@ -28,9 +28,9 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.DomainValue; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/Dreadwing.java b/Mage.Sets/src/mage/sets/conflux/Dreadwing.java index a8453a769fa..f1aa404dfdd 100644 --- a/Mage.Sets/src/mage/sets/conflux/Dreadwing.java +++ b/Mage.Sets/src/mage/sets/conflux/Dreadwing.java @@ -29,10 +29,10 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/ElderMastery.java b/Mage.Sets/src/mage/sets/conflux/ElderMastery.java index 43ff1dfbe0b..7478e35ffd0 100644 --- a/Mage.Sets/src/mage/sets/conflux/ElderMastery.java +++ b/Mage.Sets/src/mage/sets/conflux/ElderMastery.java @@ -29,9 +29,7 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerAttachedTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -63,12 +61,12 @@ public class ElderMastery extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature gets +3/+3 and has flying. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Constants.Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), Constants.AttachmentType.AURA, Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield))); // Whenever enchanted creature deals damage to a player, that player discards two cards. this.addAbility(new DealsCombatDamageToAPlayerAttachedTriggeredAbility(new DiscardTargetEffect(2), "enchanted", false, true)); } diff --git a/Mage.Sets/src/mage/sets/conflux/EmberWeaver.java b/Mage.Sets/src/mage/sets/conflux/EmberWeaver.java index 9d8a11dfb88..d17d946f4d5 100644 --- a/Mage.Sets/src/mage/sets/conflux/EmberWeaver.java +++ b/Mage.Sets/src/mage/sets/conflux/EmberWeaver.java @@ -29,9 +29,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -42,6 +41,8 @@ import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.ColorPredicate; @@ -68,15 +69,15 @@ public class EmberWeaver extends CardImpl { // As long as you control a red permanent, Ember Weaver gets +1/+0 and has first strike. this.addAbility( new SimpleStaticAbility( - Constants.Zone.BATTLEFIELD, + Zone.BATTLEFIELD, new ConditionalContinousEffect( - new BoostSourceEffect(1, 0, Constants.Duration.WhileOnBattlefield), + new BoostSourceEffect(1, 0, Duration.WhileOnBattlefield), new ControlsPermanentCondition(redPermanentFilter), "{this} gets +1/+0 as long as you control a red permanent"))); this.addAbility( new SimpleStaticAbility( - Constants.Zone.BATTLEFIELD, + Zone.BATTLEFIELD, new ConditionalContinousEffect( - new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Constants.Duration.WhileOnBattlefield), + new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield), new ControlsPermanentCondition(redPermanentFilter), "{this} has first strike as long as you control a red permanent"))); } diff --git a/Mage.Sets/src/mage/sets/conflux/EsperCormorants.java b/Mage.Sets/src/mage/sets/conflux/EsperCormorants.java index 12301180084..416983ec468 100644 --- a/Mage.Sets/src/mage/sets/conflux/EsperCormorants.java +++ b/Mage.Sets/src/mage/sets/conflux/EsperCormorants.java @@ -29,8 +29,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/Esperzoa.java b/Mage.Sets/src/mage/sets/conflux/Esperzoa.java index 8f43d393358..b9ae5db8240 100644 --- a/Mage.Sets/src/mage/sets/conflux/Esperzoa.java +++ b/Mage.Sets/src/mage/sets/conflux/Esperzoa.java @@ -30,15 +30,15 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledPermanent; @@ -62,7 +62,7 @@ public class Esperzoa extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new BeginningOfUpkeepTriggeredAbility(new ReturnToHandTargetEffect(), Constants.TargetController.YOU, false); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new ReturnToHandTargetEffect(), TargetController.YOU, false); TargetControlledPermanent t = new TargetControlledPermanent(filter); t.setRequired(true); ability.addTarget(t); diff --git a/Mage.Sets/src/mage/sets/conflux/EtherswornAdjudicator.java b/Mage.Sets/src/mage/sets/conflux/EtherswornAdjudicator.java index 3e75d455715..e858987dfbd 100644 --- a/Mage.Sets/src/mage/sets/conflux/EtherswornAdjudicator.java +++ b/Mage.Sets/src/mage/sets/conflux/EtherswornAdjudicator.java @@ -29,9 +29,9 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/ExoticOrchard.java b/Mage.Sets/src/mage/sets/conflux/ExoticOrchard.java index 3eafcda5e88..4150b05d5d0 100644 --- a/Mage.Sets/src/mage/sets/conflux/ExoticOrchard.java +++ b/Mage.Sets/src/mage/sets/conflux/ExoticOrchard.java @@ -29,10 +29,10 @@ package mage.sets.conflux; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.Mana; import mage.abilities.Abilities; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/conflux/ExplodingBorders.java b/Mage.Sets/src/mage/sets/conflux/ExplodingBorders.java index 689b1e94dfa..58ea474f171 100644 --- a/Mage.Sets/src/mage/sets/conflux/ExplodingBorders.java +++ b/Mage.Sets/src/mage/sets/conflux/ExplodingBorders.java @@ -28,8 +28,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.DomainValue; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; diff --git a/Mage.Sets/src/mage/sets/conflux/ExtractorDemon.java b/Mage.Sets/src/mage/sets/conflux/ExtractorDemon.java index 45541fcf35d..45872298b4f 100644 --- a/Mage.Sets/src/mage/sets/conflux/ExtractorDemon.java +++ b/Mage.Sets/src/mage/sets/conflux/ExtractorDemon.java @@ -28,8 +28,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesCreatureTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/FaerieMechanist.java b/Mage.Sets/src/mage/sets/conflux/FaerieMechanist.java index 523ac8ed7f4..bb49a65e2a9 100644 --- a/Mage.Sets/src/mage/sets/conflux/FaerieMechanist.java +++ b/Mage.Sets/src/mage/sets/conflux/FaerieMechanist.java @@ -29,8 +29,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.StaticValue; diff --git a/Mage.Sets/src/mage/sets/conflux/FieryFall.java b/Mage.Sets/src/mage/sets/conflux/FieryFall.java index 3f9ba8c096f..1432bc0c9d3 100644 --- a/Mage.Sets/src/mage/sets/conflux/FieryFall.java +++ b/Mage.Sets/src/mage/sets/conflux/FieryFall.java @@ -29,8 +29,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.BasicLandcyclingAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/FiligreeFracture.java b/Mage.Sets/src/mage/sets/conflux/FiligreeFracture.java index f93ab31f161..d226157b498 100644 --- a/Mage.Sets/src/mage/sets/conflux/FiligreeFracture.java +++ b/Mage.Sets/src/mage/sets/conflux/FiligreeFracture.java @@ -28,10 +28,10 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/conflux/FontOfMythos.java b/Mage.Sets/src/mage/sets/conflux/FontOfMythos.java index 5d75360098e..3bc183c6dac 100644 --- a/Mage.Sets/src/mage/sets/conflux/FontOfMythos.java +++ b/Mage.Sets/src/mage/sets/conflux/FontOfMythos.java @@ -29,9 +29,9 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/FrontlineSage.java b/Mage.Sets/src/mage/sets/conflux/FrontlineSage.java index 5cfb36cb23e..6d399cf2790 100644 --- a/Mage.Sets/src/mage/sets/conflux/FrontlineSage.java +++ b/Mage.Sets/src/mage/sets/conflux/FrontlineSage.java @@ -30,9 +30,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DrawDiscardControllerEffect; import mage.abilities.keyword.ExaltedAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -57,7 +57,7 @@ public class FrontlineSage extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(1); this.addAbility(new ExaltedAbility()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new ManaCostsImpl("{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new ManaCostsImpl("{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/conflux/FusionElemental.java b/Mage.Sets/src/mage/sets/conflux/FusionElemental.java index 9cc6151d5f8..5776d34d954 100644 --- a/Mage.Sets/src/mage/sets/conflux/FusionElemental.java +++ b/Mage.Sets/src/mage/sets/conflux/FusionElemental.java @@ -29,8 +29,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/GiltspireAvenger.java b/Mage.Sets/src/mage/sets/conflux/GiltspireAvenger.java index e547f4ec924..de4265809e5 100644 --- a/Mage.Sets/src/mage/sets/conflux/GiltspireAvenger.java +++ b/Mage.Sets/src/mage/sets/conflux/GiltspireAvenger.java @@ -30,9 +30,9 @@ package mage.sets.conflux; import java.util.HashSet; import java.util.Set; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/conflux/GleamOfResistance.java b/Mage.Sets/src/mage/sets/conflux/GleamOfResistance.java index eec23fa8881..3fe251f787c 100644 --- a/Mage.Sets/src/mage/sets/conflux/GleamOfResistance.java +++ b/Mage.Sets/src/mage/sets/conflux/GleamOfResistance.java @@ -27,15 +27,16 @@ */ package mage.sets.conflux; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.keyword.BasicLandcyclingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Outcome; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -55,7 +56,7 @@ public class GleamOfResistance extends CardImpl { this.color.setWhite(true); // Creatures you control get +1/+2 until end of turn. Untap those creatures. - this.getSpellAbility().addEffect(new BoostControlledEffect(1, 2, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostControlledEffect(1, 2, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GleamOfResistanceEffect()); this.addAbility(new BasicLandcyclingAbility(new ManaCostsImpl("{1}{W}"))); } @@ -72,7 +73,7 @@ public class GleamOfResistance extends CardImpl { class GleamOfResistanceEffect extends OneShotEffect { GleamOfResistanceEffect() { - super(Constants.Outcome.Untap); + super(Outcome.Untap); staticText = "Untap those creatures"; } diff --git a/Mage.Sets/src/mage/sets/conflux/GluttonousSlime.java b/Mage.Sets/src/mage/sets/conflux/GluttonousSlime.java index 5d8aeeb021e..5b48c97526d 100644 --- a/Mage.Sets/src/mage/sets/conflux/GluttonousSlime.java +++ b/Mage.Sets/src/mage/sets/conflux/GluttonousSlime.java @@ -28,8 +28,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.DevourEffect.DevourFactor; import mage.abilities.keyword.DevourAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/GoblinOutlander.java b/Mage.Sets/src/mage/sets/conflux/GoblinOutlander.java index 20624cf7f74..8cb75b291d8 100644 --- a/Mage.Sets/src/mage/sets/conflux/GoblinOutlander.java +++ b/Mage.Sets/src/mage/sets/conflux/GoblinOutlander.java @@ -29,8 +29,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.ProtectionAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/GoblinRazerunners.java b/Mage.Sets/src/mage/sets/conflux/GoblinRazerunners.java index cfcaac92d28..0a9e188a319 100644 --- a/Mage.Sets/src/mage/sets/conflux/GoblinRazerunners.java +++ b/Mage.Sets/src/mage/sets/conflux/GoblinRazerunners.java @@ -29,9 +29,9 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/GrixisSlavedriver.java b/Mage.Sets/src/mage/sets/conflux/GrixisSlavedriver.java index 99f9d85dfc7..d843ebc8bda 100644 --- a/Mage.Sets/src/mage/sets/conflux/GrixisSlavedriver.java +++ b/Mage.Sets/src/mage/sets/conflux/GrixisSlavedriver.java @@ -28,8 +28,8 @@ package mage.sets.conflux; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.LeavesBattlefieldTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/HellkiteHatchling.java b/Mage.Sets/src/mage/sets/conflux/HellkiteHatchling.java index beb60d343fc..ec739af7bea 100644 --- a/Mage.Sets/src/mage/sets/conflux/HellkiteHatchling.java +++ b/Mage.Sets/src/mage/sets/conflux/HellkiteHatchling.java @@ -28,9 +28,9 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; diff --git a/Mage.Sets/src/mage/sets/conflux/HellsparkElemental.java b/Mage.Sets/src/mage/sets/conflux/HellsparkElemental.java index 7757c130419..3b8d0080892 100644 --- a/Mage.Sets/src/mage/sets/conflux/HellsparkElemental.java +++ b/Mage.Sets/src/mage/sets/conflux/HellsparkElemental.java @@ -28,8 +28,8 @@ package mage.sets.conflux; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/InfectiousHorror.java b/Mage.Sets/src/mage/sets/conflux/InfectiousHorror.java index 874ebec06fa..7450b380bc0 100644 --- a/Mage.Sets/src/mage/sets/conflux/InfectiousHorror.java +++ b/Mage.Sets/src/mage/sets/conflux/InfectiousHorror.java @@ -30,14 +30,14 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; @@ -71,7 +71,7 @@ public class InfectiousHorror extends CardImpl { class InfectiousHorrorEffect extends OneShotEffect { InfectiousHorrorEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "each opponent loses 2 life"; } diff --git a/Mage.Sets/src/mage/sets/conflux/InkwellLeviathan.java b/Mage.Sets/src/mage/sets/conflux/InkwellLeviathan.java index 3fb8cd91fc3..5215b35194b 100644 --- a/Mage.Sets/src/mage/sets/conflux/InkwellLeviathan.java +++ b/Mage.Sets/src/mage/sets/conflux/InkwellLeviathan.java @@ -29,8 +29,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.IslandwalkAbility; import mage.abilities.keyword.ShroudAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/JhessianBalmgiver.java b/Mage.Sets/src/mage/sets/conflux/JhessianBalmgiver.java index b274bea433a..d83690912ce 100644 --- a/Mage.Sets/src/mage/sets/conflux/JhessianBalmgiver.java +++ b/Mage.Sets/src/mage/sets/conflux/JhessianBalmgiver.java @@ -29,10 +29,10 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/Kaleidostone.java b/Mage.Sets/src/mage/sets/conflux/Kaleidostone.java index b7f50e5b703..99458ffa555 100644 --- a/Mage.Sets/src/mage/sets/conflux/Kaleidostone.java +++ b/Mage.Sets/src/mage/sets/conflux/Kaleidostone.java @@ -28,9 +28,9 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/KederektParasite.java b/Mage.Sets/src/mage/sets/conflux/KederektParasite.java index 3cc7cab6246..8d187d7c8c6 100644 --- a/Mage.Sets/src/mage/sets/conflux/KederektParasite.java +++ b/Mage.Sets/src/mage/sets/conflux/KederektParasite.java @@ -28,13 +28,14 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -72,7 +73,7 @@ public class KederektParasite extends CardImpl { class KederektParasiteTriggeredAbility extends TriggeredAbilityImpl { KederektParasiteTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1, false, "opponent"), true); + super(Zone.BATTLEFIELD, new DamageTargetEffect(1, false, "opponent"), true); } KederektParasiteTriggeredAbility(final KederektParasiteTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/conflux/KnightOfTheReliquary.java b/Mage.Sets/src/mage/sets/conflux/KnightOfTheReliquary.java index c393853d325..5d7491eac80 100644 --- a/Mage.Sets/src/mage/sets/conflux/KnightOfTheReliquary.java +++ b/Mage.Sets/src/mage/sets/conflux/KnightOfTheReliquary.java @@ -28,11 +28,11 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/KnotvineMystic.java b/Mage.Sets/src/mage/sets/conflux/KnotvineMystic.java index 80d35333dfe..be16e7bb88c 100644 --- a/Mage.Sets/src/mage/sets/conflux/KnotvineMystic.java +++ b/Mage.Sets/src/mage/sets/conflux/KnotvineMystic.java @@ -29,8 +29,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/conflux/Kranioceros.java b/Mage.Sets/src/mage/sets/conflux/Kranioceros.java index cf4afb488e8..ef26fb60b25 100644 --- a/Mage.Sets/src/mage/sets/conflux/Kranioceros.java +++ b/Mage.Sets/src/mage/sets/conflux/Kranioceros.java @@ -29,10 +29,10 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/LapseOfCertainty.java b/Mage.Sets/src/mage/sets/conflux/LapseOfCertainty.java index bb0424a1c0f..ffb1af864f8 100644 --- a/Mage.Sets/src/mage/sets/conflux/LapseOfCertainty.java +++ b/Mage.Sets/src/mage/sets/conflux/LapseOfCertainty.java @@ -28,9 +28,9 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.effects.common.CounterTargetWithReplacementEffect; import mage.cards.CardImpl; import mage.target.TargetSpell; diff --git a/Mage.Sets/src/mage/sets/conflux/ManaCylix.java b/Mage.Sets/src/mage/sets/conflux/ManaCylix.java index 6b397297969..5edadaf23e4 100644 --- a/Mage.Sets/src/mage/sets/conflux/ManaCylix.java +++ b/Mage.Sets/src/mage/sets/conflux/ManaCylix.java @@ -28,8 +28,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; diff --git a/Mage.Sets/src/mage/sets/conflux/ManaforceMace.java b/Mage.Sets/src/mage/sets/conflux/ManaforceMace.java index e00f5de33f4..37824432ce8 100644 --- a/Mage.Sets/src/mage/sets/conflux/ManaforceMace.java +++ b/Mage.Sets/src/mage/sets/conflux/ManaforceMace.java @@ -28,10 +28,10 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.dynamicvalue.common.DomainValue; diff --git a/Mage.Sets/src/mage/sets/conflux/ManiacalRage.java b/Mage.Sets/src/mage/sets/conflux/ManiacalRage.java index af919f22ae4..441bd4dfd11 100644 --- a/Mage.Sets/src/mage/sets/conflux/ManiacalRage.java +++ b/Mage.Sets/src/mage/sets/conflux/ManiacalRage.java @@ -29,9 +29,7 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -58,12 +56,12 @@ public class ManiacalRage extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature gets +2/+2 and can't block. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2, Constants.Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new CantBlockAttachedEffect(Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAttachedEffect(AttachmentType.AURA))); } public ManiacalRage(final ManiacalRage card) { diff --git a/Mage.Sets/src/mage/sets/conflux/MartialCoup.java b/Mage.Sets/src/mage/sets/conflux/MartialCoup.java index ecbcfd7b490..bd7bfc9bab5 100644 --- a/Mage.Sets/src/mage/sets/conflux/MartialCoup.java +++ b/Mage.Sets/src/mage/sets/conflux/MartialCoup.java @@ -29,9 +29,9 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/MasterTransmuter.java b/Mage.Sets/src/mage/sets/conflux/MasterTransmuter.java index 12c4cde6d00..db5e117fa09 100644 --- a/Mage.Sets/src/mage/sets/conflux/MasterTransmuter.java +++ b/Mage.Sets/src/mage/sets/conflux/MasterTransmuter.java @@ -28,10 +28,10 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,7 +39,6 @@ import mage.abilities.costs.common.ReturnToHandTargetCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.PutOntoBattlefieldTargetEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.filter.common.FilterArtifactCard; diff --git a/Mage.Sets/src/mage/sets/conflux/MatcaRioters.java b/Mage.Sets/src/mage/sets/conflux/MatcaRioters.java index 30579e5d7b4..81b0f9788a0 100644 --- a/Mage.Sets/src/mage/sets/conflux/MatcaRioters.java +++ b/Mage.Sets/src/mage/sets/conflux/MatcaRioters.java @@ -29,14 +29,15 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.DomainValue; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -55,7 +56,7 @@ public class MatcaRioters extends CardImpl { this.toughness = new MageInt(0); // Domain - Matca Rioters's power and toughness are each equal to the number of basic land types among lands you control. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(new DomainValue(), new DomainValue(), Constants.Duration.EndOfGame))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new DomainValue(), new DomainValue(), Duration.EndOfGame))); } public MatcaRioters(final MatcaRioters card) { diff --git a/Mage.Sets/src/mage/sets/conflux/MightOfAlara.java b/Mage.Sets/src/mage/sets/conflux/MightOfAlara.java index aad1baf79af..7617fcf401e 100644 --- a/Mage.Sets/src/mage/sets/conflux/MightOfAlara.java +++ b/Mage.Sets/src/mage/sets/conflux/MightOfAlara.java @@ -29,12 +29,12 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.DomainValue; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -50,7 +50,7 @@ public class MightOfAlara extends CardImpl { this.color.setGreen(true); // Domain - Target creature gets +1/+1 until end of turn for each basic land type among lands you control. - this.getSpellAbility().addEffect(new BoostTargetEffect(new DomainValue(), new DomainValue(), Constants.Duration.EndOfTurn, true)); + this.getSpellAbility().addEffect(new BoostTargetEffect(new DomainValue(), new DomainValue(), Duration.EndOfTurn, true)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/conflux/MoltenFrame.java b/Mage.Sets/src/mage/sets/conflux/MoltenFrame.java index ccd4b4b5627..c9329962b11 100644 --- a/Mage.Sets/src/mage/sets/conflux/MoltenFrame.java +++ b/Mage.Sets/src/mage/sets/conflux/MoltenFrame.java @@ -29,8 +29,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.CyclingAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/NacatlOutlander.java b/Mage.Sets/src/mage/sets/conflux/NacatlOutlander.java index 50ba65c968a..c3c468c5e20 100644 --- a/Mage.Sets/src/mage/sets/conflux/NacatlOutlander.java +++ b/Mage.Sets/src/mage/sets/conflux/NacatlOutlander.java @@ -29,8 +29,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.ProtectionAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/NacatlSavage.java b/Mage.Sets/src/mage/sets/conflux/NacatlSavage.java index da8e41c36f7..d5e8f5ca1d4 100644 --- a/Mage.Sets/src/mage/sets/conflux/NacatlSavage.java +++ b/Mage.Sets/src/mage/sets/conflux/NacatlSavage.java @@ -28,8 +28,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/NicolBolasPlaneswalker.java b/Mage.Sets/src/mage/sets/conflux/NicolBolasPlaneswalker.java index 6f066daa6fb..95dfebcaf14 100644 --- a/Mage.Sets/src/mage/sets/conflux/NicolBolasPlaneswalker.java +++ b/Mage.Sets/src/mage/sets/conflux/NicolBolasPlaneswalker.java @@ -28,9 +28,9 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.LoyaltyAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.common.DamageTargetEffect; diff --git a/Mage.Sets/src/mage/sets/conflux/NobleHierarch.java b/Mage.Sets/src/mage/sets/conflux/NobleHierarch.java index f89feba5496..c97fff24724 100644 --- a/Mage.Sets/src/mage/sets/conflux/NobleHierarch.java +++ b/Mage.Sets/src/mage/sets/conflux/NobleHierarch.java @@ -29,8 +29,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ExaltedAbility; import mage.abilities.mana.BlueManaAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/ObeliskOfAlara.java b/Mage.Sets/src/mage/sets/conflux/ObeliskOfAlara.java index 1884f32fb9e..c2c63b64ca6 100644 --- a/Mage.Sets/src/mage/sets/conflux/ObeliskOfAlara.java +++ b/Mage.Sets/src/mage/sets/conflux/ObeliskOfAlara.java @@ -28,10 +28,10 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/conflux/PathToExile.java b/Mage.Sets/src/mage/sets/conflux/PathToExile.java index 6d8872f5ec6..da0ce75064f 100644 --- a/Mage.Sets/src/mage/sets/conflux/PathToExile.java +++ b/Mage.Sets/src/mage/sets/conflux/PathToExile.java @@ -29,10 +29,10 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/conflux/PestilentKathari.java b/Mage.Sets/src/mage/sets/conflux/PestilentKathari.java index 8b820270d98..8880ddbca9a 100644 --- a/Mage.Sets/src/mage/sets/conflux/PestilentKathari.java +++ b/Mage.Sets/src/mage/sets/conflux/PestilentKathari.java @@ -29,10 +29,10 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/Progenitus.java b/Mage.Sets/src/mage/sets/conflux/Progenitus.java index cc96ddc5daf..9e25b1976bc 100644 --- a/Mage.Sets/src/mage/sets/conflux/Progenitus.java +++ b/Mage.Sets/src/mage/sets/conflux/Progenitus.java @@ -28,10 +28,10 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/conflux/QuenchableFire.java b/Mage.Sets/src/mage/sets/conflux/QuenchableFire.java index dcfda303e43..1833b37d354 100644 --- a/Mage.Sets/src/mage/sets/conflux/QuenchableFire.java +++ b/Mage.Sets/src/mage/sets/conflux/QuenchableFire.java @@ -29,9 +29,9 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.SpecialAction; diff --git a/Mage.Sets/src/mage/sets/conflux/RakkaMar.java b/Mage.Sets/src/mage/sets/conflux/RakkaMar.java index 878f70a1a98..efbfd6dd6e5 100644 --- a/Mage.Sets/src/mage/sets/conflux/RakkaMar.java +++ b/Mage.Sets/src/mage/sets/conflux/RakkaMar.java @@ -29,9 +29,9 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/conflux/ReliquaryTower.java b/Mage.Sets/src/mage/sets/conflux/ReliquaryTower.java index 61d698f4977..807fcf30a31 100644 --- a/Mage.Sets/src/mage/sets/conflux/ReliquaryTower.java +++ b/Mage.Sets/src/mage/sets/conflux/ReliquaryTower.java @@ -28,10 +28,10 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continious.MaximumHandSizeControllerEffect; diff --git a/Mage.Sets/src/mage/sets/conflux/RhoxBodyguard.java b/Mage.Sets/src/mage/sets/conflux/RhoxBodyguard.java index 4673c6e9c34..69ad7d80d31 100644 --- a/Mage.Sets/src/mage/sets/conflux/RhoxBodyguard.java +++ b/Mage.Sets/src/mage/sets/conflux/RhoxBodyguard.java @@ -29,8 +29,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/conflux/RottingRats.java b/Mage.Sets/src/mage/sets/conflux/RottingRats.java index b2457481920..1476d0cd7d4 100644 --- a/Mage.Sets/src/mage/sets/conflux/RottingRats.java +++ b/Mage.Sets/src/mage/sets/conflux/RottingRats.java @@ -30,8 +30,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/RuptureSpire.java b/Mage.Sets/src/mage/sets/conflux/RuptureSpire.java index 24775a1da5b..b95c88bd40e 100644 --- a/Mage.Sets/src/mage/sets/conflux/RuptureSpire.java +++ b/Mage.Sets/src/mage/sets/conflux/RuptureSpire.java @@ -29,8 +29,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/SacellumArchers.java b/Mage.Sets/src/mage/sets/conflux/SacellumArchers.java index 0ae491b5701..09bc7a0a53a 100644 --- a/Mage.Sets/src/mage/sets/conflux/SacellumArchers.java +++ b/Mage.Sets/src/mage/sets/conflux/SacellumArchers.java @@ -29,9 +29,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetAttackingOrBlockingCreature; /** @@ -58,7 +58,7 @@ public class SacellumArchers extends CardImpl { this.toughness = new MageInt(3); // {R}{W}, {tap}: Sacellum Archers deals 2 damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{R}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{R}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/conflux/SalvageSlasher.java b/Mage.Sets/src/mage/sets/conflux/SalvageSlasher.java index f00134e5f92..24719835762 100644 --- a/Mage.Sets/src/mage/sets/conflux/SalvageSlasher.java +++ b/Mage.Sets/src/mage/sets/conflux/SalvageSlasher.java @@ -28,10 +28,10 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount; diff --git a/Mage.Sets/src/mage/sets/conflux/ScarlandThrinax.java b/Mage.Sets/src/mage/sets/conflux/ScarlandThrinax.java index 3867cac300b..8ec4567604c 100644 --- a/Mage.Sets/src/mage/sets/conflux/ScarlandThrinax.java +++ b/Mage.Sets/src/mage/sets/conflux/ScarlandThrinax.java @@ -28,9 +28,9 @@ package mage.sets.conflux; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/ScattershotArcher.java b/Mage.Sets/src/mage/sets/conflux/ScattershotArcher.java index 35f2d76fe9e..f799f7cd5b5 100644 --- a/Mage.Sets/src/mage/sets/conflux/ScattershotArcher.java +++ b/Mage.Sets/src/mage/sets/conflux/ScattershotArcher.java @@ -28,9 +28,9 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/conflux/ScepterOfDominance.java b/Mage.Sets/src/mage/sets/conflux/ScepterOfDominance.java index ee72b0162b7..b2e41ab961f 100644 --- a/Mage.Sets/src/mage/sets/conflux/ScepterOfDominance.java +++ b/Mage.Sets/src/mage/sets/conflux/ScepterOfDominance.java @@ -29,9 +29,9 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/ScepterOfFugue.java b/Mage.Sets/src/mage/sets/conflux/ScepterOfFugue.java index 9a3406870e4..72998bb7ab6 100644 --- a/Mage.Sets/src/mage/sets/conflux/ScepterOfFugue.java +++ b/Mage.Sets/src/mage/sets/conflux/ScepterOfFugue.java @@ -29,9 +29,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.OnlyDuringYourTurnCost; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DiscardTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetPlayer; /** @@ -54,7 +54,7 @@ public class ScepterOfFugue extends CardImpl { this.color.setBlack(true); // {1}{B}, {tap}: Target player discards a card. Activate this ability only during your turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl("{1}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl("{1}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new OnlyDuringYourTurnCost()); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/conflux/ScepterOfInsight.java b/Mage.Sets/src/mage/sets/conflux/ScepterOfInsight.java index edac5478ed9..1cdce06f7f8 100644 --- a/Mage.Sets/src/mage/sets/conflux/ScepterOfInsight.java +++ b/Mage.Sets/src/mage/sets/conflux/ScepterOfInsight.java @@ -29,9 +29,9 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/ScornfulAEtherLich.java b/Mage.Sets/src/mage/sets/conflux/ScornfulAEtherLich.java index 359f681dccf..47183230c19 100644 --- a/Mage.Sets/src/mage/sets/conflux/ScornfulAEtherLich.java +++ b/Mage.Sets/src/mage/sets/conflux/ScornfulAEtherLich.java @@ -29,9 +29,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FearAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -58,8 +59,8 @@ public class ScornfulAEtherLich extends CardImpl { this.toughness = new MageInt(4); // {W}{B}: Scornful AEther-Lich gains fear and vigilance until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(FearAbility.getInstance(), Constants.Duration.EndOfTurn), new ManaCostsImpl("{W}{B}")); - ability.addEffect(new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Constants.Duration.EndOfTurn)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FearAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{W}{B}")); + ability.addEffect(new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/conflux/ShamblingRemains.java b/Mage.Sets/src/mage/sets/conflux/ShamblingRemains.java index 65bd8bc33b9..befe22f352e 100644 --- a/Mage.Sets/src/mage/sets/conflux/ShamblingRemains.java +++ b/Mage.Sets/src/mage/sets/conflux/ShamblingRemains.java @@ -28,8 +28,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/ShardConvergence.java b/Mage.Sets/src/mage/sets/conflux/ShardConvergence.java index faec00438f6..0ee3d6b6080 100644 --- a/Mage.Sets/src/mage/sets/conflux/ShardConvergence.java +++ b/Mage.Sets/src/mage/sets/conflux/ShardConvergence.java @@ -29,15 +29,16 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterLandCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -72,7 +73,7 @@ public class ShardConvergence extends CardImpl { class ShardConvergenceEffect extends OneShotEffect { ShardConvergenceEffect() { - super(Constants.Outcome.DrawCard); + super(Outcome.DrawCard); staticText = "Search your library for a Plains card, an Island card, a Swamp card, and a Mountain card. Reveal those cards and put them into your hand. Then shuffle your library"; } @@ -107,7 +108,7 @@ class ShardConvergenceEffect extends OneShotEffect { if (player.searchLibrary(target, game)) { Card card = player.getLibrary().remove(target.getFirstTarget(), game); if (card != null) { - card.moveToZone(Constants.Zone.HAND, source.getId(), game, false); + card.moveToZone(Zone.HAND, source.getId(), game, false); cards.add(card); } } diff --git a/Mage.Sets/src/mage/sets/conflux/SigilOfTheEmptyThrone.java b/Mage.Sets/src/mage/sets/conflux/SigilOfTheEmptyThrone.java index f202e680d9b..188d9136b91 100644 --- a/Mage.Sets/src/mage/sets/conflux/SigilOfTheEmptyThrone.java +++ b/Mage.Sets/src/mage/sets/conflux/SigilOfTheEmptyThrone.java @@ -29,8 +29,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/SkywardEyeProphets.java b/Mage.Sets/src/mage/sets/conflux/SkywardEyeProphets.java index 3edcd5b3095..47304fbba77 100644 --- a/Mage.Sets/src/mage/sets/conflux/SkywardEyeProphets.java +++ b/Mage.Sets/src/mage/sets/conflux/SkywardEyeProphets.java @@ -28,10 +28,10 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/SoulsMajesty.java b/Mage.Sets/src/mage/sets/conflux/SoulsMajesty.java index 44e88c028e7..8672a12efd9 100644 --- a/Mage.Sets/src/mage/sets/conflux/SoulsMajesty.java +++ b/Mage.Sets/src/mage/sets/conflux/SoulsMajesty.java @@ -29,9 +29,9 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/SphinxSummoner.java b/Mage.Sets/src/mage/sets/conflux/SphinxSummoner.java index 34a1b267bd3..5a2cc127526 100644 --- a/Mage.Sets/src/mage/sets/conflux/SphinxSummoner.java +++ b/Mage.Sets/src/mage/sets/conflux/SphinxSummoner.java @@ -28,8 +28,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; diff --git a/Mage.Sets/src/mage/sets/conflux/SporeBurst.java b/Mage.Sets/src/mage/sets/conflux/SporeBurst.java index 28be23115ba..b17f7deb15a 100644 --- a/Mage.Sets/src/mage/sets/conflux/SporeBurst.java +++ b/Mage.Sets/src/mage/sets/conflux/SporeBurst.java @@ -28,8 +28,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.DomainValue; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/SylvanBounty.java b/Mage.Sets/src/mage/sets/conflux/SylvanBounty.java index 20c137cc1c8..a65600b8125 100644 --- a/Mage.Sets/src/mage/sets/conflux/SylvanBounty.java +++ b/Mage.Sets/src/mage/sets/conflux/SylvanBounty.java @@ -28,8 +28,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.GainLifeTargetEffect; import mage.abilities.keyword.BasicLandcyclingAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/Thornling.java b/Mage.Sets/src/mage/sets/conflux/Thornling.java index 97349e0143a..45cb39fea0f 100644 --- a/Mage.Sets/src/mage/sets/conflux/Thornling.java +++ b/Mage.Sets/src/mage/sets/conflux/Thornling.java @@ -29,10 +29,10 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/ToxicIguanar.java b/Mage.Sets/src/mage/sets/conflux/ToxicIguanar.java index 7334c19b7fe..693dd32fa9e 100644 --- a/Mage.Sets/src/mage/sets/conflux/ToxicIguanar.java +++ b/Mage.Sets/src/mage/sets/conflux/ToxicIguanar.java @@ -28,10 +28,10 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/TraumaticVisions.java b/Mage.Sets/src/mage/sets/conflux/TraumaticVisions.java index 44b4b7f5f20..b5894248906 100644 --- a/Mage.Sets/src/mage/sets/conflux/TraumaticVisions.java +++ b/Mage.Sets/src/mage/sets/conflux/TraumaticVisions.java @@ -28,8 +28,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.keyword.BasicLandcyclingAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/TukatongueThallid.java b/Mage.Sets/src/mage/sets/conflux/TukatongueThallid.java index 2e618f5ed61..81c5e6386e7 100644 --- a/Mage.Sets/src/mage/sets/conflux/TukatongueThallid.java +++ b/Mage.Sets/src/mage/sets/conflux/TukatongueThallid.java @@ -29,8 +29,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/conflux/VagrantPlowbeasts.java b/Mage.Sets/src/mage/sets/conflux/VagrantPlowbeasts.java index 01642fbf085..7c7c450fb2f 100644 --- a/Mage.Sets/src/mage/sets/conflux/VagrantPlowbeasts.java +++ b/Mage.Sets/src/mage/sets/conflux/VagrantPlowbeasts.java @@ -28,9 +28,9 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/ValeronOutlander.java b/Mage.Sets/src/mage/sets/conflux/ValeronOutlander.java index 9d1e07e7bbe..17ab8a4ade7 100644 --- a/Mage.Sets/src/mage/sets/conflux/ValeronOutlander.java +++ b/Mage.Sets/src/mage/sets/conflux/ValeronOutlander.java @@ -29,8 +29,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.ProtectionAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/ValiantGuard.java b/Mage.Sets/src/mage/sets/conflux/ValiantGuard.java index 8cacc8bba62..8866d14b867 100644 --- a/Mage.Sets/src/mage/sets/conflux/ValiantGuard.java +++ b/Mage.Sets/src/mage/sets/conflux/ValiantGuard.java @@ -29,8 +29,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/VectisAgents.java b/Mage.Sets/src/mage/sets/conflux/VectisAgents.java index 7b935df4273..8616814c875 100644 --- a/Mage.Sets/src/mage/sets/conflux/VectisAgents.java +++ b/Mage.Sets/src/mage/sets/conflux/VectisAgents.java @@ -29,10 +29,10 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/VedalkenOutlander.java b/Mage.Sets/src/mage/sets/conflux/VedalkenOutlander.java index 7377aef0514..ebcb261b6c4 100644 --- a/Mage.Sets/src/mage/sets/conflux/VedalkenOutlander.java +++ b/Mage.Sets/src/mage/sets/conflux/VedalkenOutlander.java @@ -29,8 +29,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.ProtectionAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/ViashinoSlaughtermaster.java b/Mage.Sets/src/mage/sets/conflux/ViashinoSlaughtermaster.java index 5f8febe58fb..07d65a8f111 100644 --- a/Mage.Sets/src/mage/sets/conflux/ViashinoSlaughtermaster.java +++ b/Mage.Sets/src/mage/sets/conflux/ViashinoSlaughtermaster.java @@ -29,15 +29,16 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.ActivateOncePerTurnActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.DoubleStrikeAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -57,7 +58,7 @@ public class ViashinoSlaughtermaster extends CardImpl { this.addAbility(DoubleStrikeAbility.getInstance()); // {B}{G}: Viashino Slaughtermaster gets +1/+1 until end of turn. Activate this ability only once each turn. - this.addAbility(new ActivateOncePerTurnActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Constants.Duration.EndOfTurn), new ManaCostsImpl("{B}{G}"))); + this.addAbility(new ActivateOncePerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{B}{G}"))); } public ViashinoSlaughtermaster(final ViashinoSlaughtermaster card) { diff --git a/Mage.Sets/src/mage/sets/conflux/ViewFromAbove.java b/Mage.Sets/src/mage/sets/conflux/ViewFromAbove.java index 776318bc1d8..c2e66f46389 100644 --- a/Mage.Sets/src/mage/sets/conflux/ViewFromAbove.java +++ b/Mage.Sets/src/mage/sets/conflux/ViewFromAbove.java @@ -27,10 +27,10 @@ */ package mage.sets.conflux; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.PostResolveEffect; diff --git a/Mage.Sets/src/mage/sets/conflux/VoicesFromTheVoid.java b/Mage.Sets/src/mage/sets/conflux/VoicesFromTheVoid.java index 1183afc65c3..62165f4a6ce 100644 --- a/Mage.Sets/src/mage/sets/conflux/VoicesFromTheVoid.java +++ b/Mage.Sets/src/mage/sets/conflux/VoicesFromTheVoid.java @@ -28,8 +28,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.DomainValue; import mage.abilities.effects.common.DiscardTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/VolcanicFallout.java b/Mage.Sets/src/mage/sets/conflux/VolcanicFallout.java index c1bcec50d35..076a9987493 100644 --- a/Mage.Sets/src/mage/sets/conflux/VolcanicFallout.java +++ b/Mage.Sets/src/mage/sets/conflux/VolcanicFallout.java @@ -28,8 +28,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.CantCounterAbility; import mage.abilities.effects.common.DamageEverythingEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/VoraciousDragon.java b/Mage.Sets/src/mage/sets/conflux/VoraciousDragon.java index bbb3dadf3f5..44b784ce500 100644 --- a/Mage.Sets/src/mage/sets/conflux/VoraciousDragon.java +++ b/Mage.Sets/src/mage/sets/conflux/VoraciousDragon.java @@ -29,8 +29,8 @@ package mage.sets.conflux; import java.util.ArrayList; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/WallOfReverence.java b/Mage.Sets/src/mage/sets/conflux/WallOfReverence.java index ebe559f7fd0..8a97e2e6f11 100644 --- a/Mage.Sets/src/mage/sets/conflux/WallOfReverence.java +++ b/Mage.Sets/src/mage/sets/conflux/WallOfReverence.java @@ -30,9 +30,9 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/WanderingGoblins.java b/Mage.Sets/src/mage/sets/conflux/WanderingGoblins.java index f5ae52d6e0d..62ff3725bf4 100644 --- a/Mage.Sets/src/mage/sets/conflux/WanderingGoblins.java +++ b/Mage.Sets/src/mage/sets/conflux/WanderingGoblins.java @@ -29,9 +29,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -39,6 +38,8 @@ import mage.abilities.dynamicvalue.common.DomainValue; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -57,7 +58,7 @@ public class WanderingGoblins extends CardImpl { this.toughness = new MageInt(3); // Domain - {3}: Wandering Goblins gets +1/+0 until end of turn for each basic land type among lands you control. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(new DomainValue(), new StaticValue(0), Constants.Duration.EndOfTurn), new GenericManaCost(3))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new DomainValue(), new StaticValue(0), Duration.EndOfTurn), new GenericManaCost(3))); } public WanderingGoblins(final WanderingGoblins card) { diff --git a/Mage.Sets/src/mage/sets/conflux/WildLeotau.java b/Mage.Sets/src/mage/sets/conflux/WildLeotau.java index 4c58b21948c..4254c9c3f52 100644 --- a/Mage.Sets/src/mage/sets/conflux/WildLeotau.java +++ b/Mage.Sets/src/mage/sets/conflux/WildLeotau.java @@ -29,14 +29,15 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.TargetController; /** * @@ -54,7 +55,7 @@ public class WildLeotau extends CardImpl { this.toughness = new MageInt(4); // At the beginning of your upkeep, sacrifice Wild Leotau unless you pay {G}. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ColoredManaCost(Constants.ColoredManaSymbol.G)), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ColoredManaCost(ColoredManaSymbol.G)), TargetController.YOU, false)); } public WildLeotau(final WildLeotau card) { diff --git a/Mage.Sets/src/mage/sets/conflux/WorldlyCounsel.java b/Mage.Sets/src/mage/sets/conflux/WorldlyCounsel.java index eb800300426..b1b95a4c88c 100644 --- a/Mage.Sets/src/mage/sets/conflux/WorldlyCounsel.java +++ b/Mage.Sets/src/mage/sets/conflux/WorldlyCounsel.java @@ -28,10 +28,10 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.dynamicvalue.common.DomainValue; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/conflux/WretchedBanquet.java b/Mage.Sets/src/mage/sets/conflux/WretchedBanquet.java index bc1f8b61f53..5f36436f91e 100644 --- a/Mage.Sets/src/mage/sets/conflux/WretchedBanquet.java +++ b/Mage.Sets/src/mage/sets/conflux/WretchedBanquet.java @@ -29,9 +29,9 @@ package mage.sets.conflux; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/ZombieOutlander.java b/Mage.Sets/src/mage/sets/conflux/ZombieOutlander.java index d0456ebf2a0..96742f738ed 100644 --- a/Mage.Sets/src/mage/sets/conflux/ZombieOutlander.java +++ b/Mage.Sets/src/mage/sets/conflux/ZombieOutlander.java @@ -29,8 +29,8 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.ProtectionAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/AfflictedDeserter.java b/Mage.Sets/src/mage/sets/darkascension/AfflictedDeserter.java index 2d6fb5fe0e0..98c0d6ee839 100644 --- a/Mage.Sets/src/mage/sets/darkascension/AfflictedDeserter.java +++ b/Mage.Sets/src/mage/sets/darkascension/AfflictedDeserter.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; @@ -40,6 +40,7 @@ import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; /** * @@ -67,7 +68,7 @@ public class AfflictedDeserter extends CardImpl { // At the beginning of each upkeep, if no spells were cast last turn, transform Afflicted Deserter. this.addAbility(new TransformAbility()); - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), Constants.TargetController.ANY, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), TargetController.ANY, false); this.addAbility(new ConditionalTriggeredAbility(ability, NoSpellsWereCastLastTurnCondition.getInstance(), TransformAbility.NO_SPELLS_TRANSFORM_RULE)); } diff --git a/Mage.Sets/src/mage/sets/darkascension/AlphaBrawl.java b/Mage.Sets/src/mage/sets/darkascension/AlphaBrawl.java index 086c3f5e013..a5c60aa829d 100644 --- a/Mage.Sets/src/mage/sets/darkascension/AlphaBrawl.java +++ b/Mage.Sets/src/mage/sets/darkascension/AlphaBrawl.java @@ -27,12 +27,13 @@ */ package mage.sets.darkascension; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; @@ -51,7 +52,7 @@ public class AlphaBrawl extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT)); + filter.add(new ControllerPredicate(TargetController.OPPONENT)); } public AlphaBrawl(UUID ownerId) { @@ -81,7 +82,7 @@ class AlphaBrawlEffect extends OneShotEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); public AlphaBrawlEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "Target creature an opponent controls deals damage equal to its power to each other creature that player controls, then each of those creatures deals damage equal to its power to that creature"; } diff --git a/Mage.Sets/src/mage/sets/darkascension/AltarOfTheLost.java b/Mage.Sets/src/mage/sets/darkascension/AltarOfTheLost.java index fbfda70d555..ee3ba1490f3 100644 --- a/Mage.Sets/src/mage/sets/darkascension/AltarOfTheLost.java +++ b/Mage.Sets/src/mage/sets/darkascension/AltarOfTheLost.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import mage.ConditionalMana; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageObject; import mage.Mana; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/darkascension/ArchangelsLight.java b/Mage.Sets/src/mage/sets/darkascension/ArchangelsLight.java index 5da1fbc72f2..cead52d959a 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ArchangelsLight.java +++ b/Mage.Sets/src/mage/sets/darkascension/ArchangelsLight.java @@ -28,14 +28,15 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; @@ -69,7 +70,7 @@ public class ArchangelsLight extends CardImpl { class ArchangelsLightEffect extends OneShotEffect { public ArchangelsLightEffect() { - super(Constants.Outcome.GainLife); + super(Outcome.GainLife); staticText = "You gain 2 life for each card in your graveyard, then shuffle your graveyard into your library"; } diff --git a/Mage.Sets/src/mage/sets/darkascension/ArchdemonOfGreed.java b/Mage.Sets/src/mage/sets/darkascension/ArchdemonOfGreed.java index bb1e873618d..2f6f8989597 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ArchdemonOfGreed.java +++ b/Mage.Sets/src/mage/sets/darkascension/ArchdemonOfGreed.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; @@ -38,6 +38,8 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -57,7 +59,7 @@ public class ArchdemonOfGreed extends CardImpl { static { filter.add(new SubtypePredicate("Human")); - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public ArchdemonOfGreed(UUID ownerId) { @@ -89,7 +91,7 @@ public class ArchdemonOfGreed extends CardImpl { class ArchdemonOfGreedEffect extends OneShotEffect { public ArchdemonOfGreedEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); this.staticText = "Sacrifice a Human. If you can't, tap Archdemon of Greed and it deals 9 damage to you."; } @@ -114,7 +116,7 @@ public class ArchdemonOfGreed extends CardImpl { // if they can pay the cost, then they must pay if (target.canChoose(player.getId(), game)) { while (!target.isChosen() && target.canChoose(player.getId(), game)) { - player.choose(Constants.Outcome.Sacrifice, target, source.getSourceId(), game); + player.choose(Outcome.Sacrifice, target, source.getSourceId(), game); } Permanent humanSacrifice = game.getPermanent(target.getFirstTarget()); if (permanent != null) { diff --git a/Mage.Sets/src/mage/sets/darkascension/ArtfulDodge.java b/Mage.Sets/src/mage/sets/darkascension/ArtfulDodge.java index 572b7cb53da..c4468ad7a21 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ArtfulDodge.java +++ b/Mage.Sets/src/mage/sets/darkascension/ArtfulDodge.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TimingRule; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TimingRule; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.UnblockableTargetEffect; import mage.abilities.keyword.FlashbackAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/AvacynsCollar.java b/Mage.Sets/src/mage/sets/darkascension/AvacynsCollar.java index 4b396fcfda8..eb618784451 100644 --- a/Mage.Sets/src/mage/sets/darkascension/AvacynsCollar.java +++ b/Mage.Sets/src/mage/sets/darkascension/AvacynsCollar.java @@ -28,11 +28,11 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; diff --git a/Mage.Sets/src/mage/sets/darkascension/BarTheDoor.java b/Mage.Sets/src/mage/sets/darkascension/BarTheDoor.java index b73b9867fbc..9960e3716f3 100644 --- a/Mage.Sets/src/mage/sets/darkascension/BarTheDoor.java +++ b/Mage.Sets/src/mage/sets/darkascension/BarTheDoor.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/darkascension/BeguilerOfWills.java b/Mage.Sets/src/mage/sets/darkascension/BeguilerOfWills.java index 224ac3f2d91..0ec84d74e34 100644 --- a/Mage.Sets/src/mage/sets/darkascension/BeguilerOfWills.java +++ b/Mage.Sets/src/mage/sets/darkascension/BeguilerOfWills.java @@ -27,10 +27,10 @@ */ package mage.sets.darkascension; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/BlackCat.java b/Mage.Sets/src/mage/sets/darkascension/BlackCat.java index 9aa485e1ef3..f6ba7012de4 100644 --- a/Mage.Sets/src/mage/sets/darkascension/BlackCat.java +++ b/Mage.Sets/src/mage/sets/darkascension/BlackCat.java @@ -29,8 +29,8 @@ */ package mage.sets.darkascension; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/BloodFeud.java b/Mage.Sets/src/mage/sets/darkascension/BloodFeud.java index 810a2ca6be3..f39aa753c6c 100644 --- a/Mage.Sets/src/mage/sets/darkascension/BloodFeud.java +++ b/Mage.Sets/src/mage/sets/darkascension/BloodFeud.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.FightTargetsEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/darkascension/BoneToAsh.java b/Mage.Sets/src/mage/sets/darkascension/BoneToAsh.java index 53fb9b9fd54..7fcbbc507b3 100644 --- a/Mage.Sets/src/mage/sets/darkascension/BoneToAsh.java +++ b/Mage.Sets/src/mage/sets/darkascension/BoneToAsh.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/darkascension/BreakOfDay.java b/Mage.Sets/src/mage/sets/darkascension/BreakOfDay.java index d3ff3b0c706..15ed8930447 100644 --- a/Mage.Sets/src/mage/sets/darkascension/BreakOfDay.java +++ b/Mage.Sets/src/mage/sets/darkascension/BreakOfDay.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.condition.common.FatefulHourCondition; import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.common.continious.BoostControlledEffect; diff --git a/Mage.Sets/src/mage/sets/darkascension/BriarpackAlpha.java b/Mage.Sets/src/mage/sets/darkascension/BriarpackAlpha.java index 4b9630f2596..8f962040fda 100644 --- a/Mage.Sets/src/mage/sets/darkascension/BriarpackAlpha.java +++ b/Mage.Sets/src/mage/sets/darkascension/BriarpackAlpha.java @@ -29,15 +29,15 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -57,7 +57,7 @@ public class BriarpackAlpha extends CardImpl { this.addAbility(FlashAbility.getInstance()); // When Briarpack Alpha enters the battlefield, target creature gets +2/+2 until end of turn. - Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(2, 2, Constants.Duration.EndOfTurn)); + Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/BurdenOfGuilt.java b/Mage.Sets/src/mage/sets/darkascension/BurdenOfGuilt.java index dab3cd3f43e..16485c778bc 100644 --- a/Mage.Sets/src/mage/sets/darkascension/BurdenOfGuilt.java +++ b/Mage.Sets/src/mage/sets/darkascension/BurdenOfGuilt.java @@ -29,9 +29,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -39,6 +38,8 @@ import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.TapEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -58,11 +59,11 @@ public class BurdenOfGuilt extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Detriment)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // {1}: Tap enchanted creature. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new TapEnchantedEffect(), new GenericManaCost(1))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapEnchantedEffect(), new GenericManaCost(1))); } public BurdenOfGuilt(final BurdenOfGuilt card) { diff --git a/Mage.Sets/src/mage/sets/darkascension/BurningOil.java b/Mage.Sets/src/mage/sets/darkascension/BurningOil.java index 7b5c2a97c9d..94bac6dad9b 100644 --- a/Mage.Sets/src/mage/sets/darkascension/BurningOil.java +++ b/Mage.Sets/src/mage/sets/darkascension/BurningOil.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TimingRule; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TimingRule; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlashbackAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/CallToTheKindred.java b/Mage.Sets/src/mage/sets/darkascension/CallToTheKindred.java index e64916399fa..ec65ce30b6f 100644 --- a/Mage.Sets/src/mage/sets/darkascension/CallToTheKindred.java +++ b/Mage.Sets/src/mage/sets/darkascension/CallToTheKindred.java @@ -29,10 +29,10 @@ package mage.sets.darkascension; import java.util.ArrayList; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/ChaliceOfDeath.java b/Mage.Sets/src/mage/sets/darkascension/ChaliceOfDeath.java index 27b191a1f44..c73c347545c 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ChaliceOfDeath.java +++ b/Mage.Sets/src/mage/sets/darkascension/ChaliceOfDeath.java @@ -28,14 +28,15 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetPlayer; /** @@ -53,7 +54,7 @@ public class ChaliceOfDeath extends CardImpl { this.canTransform = true; // {tap}: Target player loses 5 life. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new LoseLifeTargetEffect(5), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(5), new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/ChaliceOfLife.java b/Mage.Sets/src/mage/sets/darkascension/ChaliceOfLife.java index 29394c620ab..f2e0950cbc8 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ChaliceOfLife.java +++ b/Mage.Sets/src/mage/sets/darkascension/ChaliceOfLife.java @@ -28,15 +28,17 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -57,7 +59,7 @@ public class ChaliceOfLife extends CardImpl { // {tap}: You gain 1 life. Then if you have at least 10 life more than your starting life total, transform Chalice of Life. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ChaliceOfLifeEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ChaliceOfLifeEffect(), new TapSourceCost())); } public ChaliceOfLife(final ChaliceOfLife card) { @@ -73,7 +75,7 @@ public class ChaliceOfLife extends CardImpl { class ChaliceOfLifeEffect extends OneShotEffect { public ChaliceOfLifeEffect() { - super(Constants.Outcome.GainLife); + super(Outcome.GainLife); staticText = "You gain 1 life. Then if you have at least 10 life more than your starting life total, transform Chalice of Life"; } diff --git a/Mage.Sets/src/mage/sets/darkascension/ChantOfTheSkifsang.java b/Mage.Sets/src/mage/sets/darkascension/ChantOfTheSkifsang.java index 014f99fc769..85885d5ace5 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ChantOfTheSkifsang.java +++ b/Mage.Sets/src/mage/sets/darkascension/ChantOfTheSkifsang.java @@ -27,9 +27,7 @@ */ package mage.sets.darkascension; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -56,11 +54,11 @@ public class ChantOfTheSkifsang extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Detriment)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature gets -13/-0. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(-13, 0, Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-13, 0, Duration.WhileOnBattlefield))); } public ChantOfTheSkifsang(final ChantOfTheSkifsang card) { diff --git a/Mage.Sets/src/mage/sets/darkascension/ChillOfForeboding.java b/Mage.Sets/src/mage/sets/darkascension/ChillOfForeboding.java index d2084b3eb90..23db4c0a32f 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ChillOfForeboding.java +++ b/Mage.Sets/src/mage/sets/darkascension/ChillOfForeboding.java @@ -28,17 +28,18 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.TimingRule; import mage.game.Game; import mage.players.Player; @@ -57,7 +58,7 @@ public class ChillOfForeboding extends CardImpl { // Each player puts the top five cards of his or her library into his or her graveyard. this.getSpellAbility().addEffect(new ChillOfForebodingEffect()); // Flashback {7}{U} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{7}{U}"), Constants.TimingRule.SORCERY)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{7}{U}"), TimingRule.SORCERY)); } public ChillOfForeboding(final ChillOfForeboding card) { diff --git a/Mage.Sets/src/mage/sets/darkascension/ChosenOfMarkov.java b/Mage.Sets/src/mage/sets/darkascension/ChosenOfMarkov.java index 48af8a9e313..f5963a5b002 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ChosenOfMarkov.java +++ b/Mage.Sets/src/mage/sets/darkascension/ChosenOfMarkov.java @@ -29,9 +29,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,7 @@ import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -72,7 +72,7 @@ public class ChosenOfMarkov extends CardImpl { // {tap}, Tap an untapped Vampire you control: Transform Chosen of Markov. this.addAbility(new TransformAbility()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new TransformSourceEffect(true), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(true), new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledPermanent(filter))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/ClingingMists.java b/Mage.Sets/src/mage/sets/darkascension/ClingingMists.java index ec361d8f1ab..263a5cff53b 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ClingingMists.java +++ b/Mage.Sets/src/mage/sets/darkascension/ClingingMists.java @@ -27,9 +27,8 @@ */ package mage.sets.darkascension; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.condition.common.FatefulHourCondition; import mage.abilities.decorator.ConditionalOneShotEffect; @@ -37,6 +36,9 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.PreventAllDamageEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.PhaseStep; import mage.filter.FilterPermanent; import mage.filter.common.FilterAttackingCreature; import mage.game.Game; @@ -60,7 +62,7 @@ public class ClingingMists extends CardImpl { this.color.setGreen(true); // Prevent all combat damage that would be dealt this turn. - this.getSpellAbility().addEffect(new PreventAllDamageEffect(filter, Constants.Duration.EndOfTurn, true)); + this.getSpellAbility().addEffect(new PreventAllDamageEffect(filter, Duration.EndOfTurn, true)); // Fateful hour - If you have 5 or less life, tap all attacking creatures. Those creatures don't untap during their controller's next untap step. this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new ClingingMistsEffect(), @@ -83,7 +85,7 @@ class ClingingMistsEffect extends OneShotEffect { private static final FilterAttackingCreature filter = new FilterAttackingCreature("attacking creatures"); public ClingingMistsEffect() { - super(Constants.Outcome.Tap); + super(Outcome.Tap); staticText = "tap all attacking creatures. Those creatures don't untap during their controller's next untap step"; } @@ -112,7 +114,7 @@ class ClingingMistsEffect2 extends ReplacementEffectImpl { protected UUID creatureId; public ClingingMistsEffect2(UUID creatureId) { - super(Constants.Duration.OneUse, Constants.Outcome.Detriment); + super(Duration.OneUse, Outcome.Detriment); this.creatureId = creatureId; } @@ -139,7 +141,7 @@ class ClingingMistsEffect2 extends ReplacementEffectImpl { @Override public boolean applies(GameEvent event, Ability source, Game game) { - if (game.getTurn().getStepType() == Constants.PhaseStep.UNTAP && + if (game.getTurn().getStepType() == PhaseStep.UNTAP && event.getType() == GameEvent.EventType.UNTAP && event.getTargetId().equals(creatureId)) { return true; diff --git a/Mage.Sets/src/mage/sets/darkascension/Counterlash.java b/Mage.Sets/src/mage/sets/darkascension/Counterlash.java index dec7db0fb82..b4b4fabcd42 100644 --- a/Mage.Sets/src/mage/sets/darkascension/Counterlash.java +++ b/Mage.Sets/src/mage/sets/darkascension/Counterlash.java @@ -29,14 +29,15 @@ package mage.sets.darkascension; import java.util.ArrayList; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterCard; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; @@ -77,7 +78,7 @@ public class Counterlash extends CardImpl { class CounterlashEffect extends OneShotEffect { public CounterlashEffect() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); this.staticText = "Counter target spell. You may cast a nonland card in your hand that shares a card type with that spell without paying its mana cost"; } @@ -96,7 +97,7 @@ class CounterlashEffect extends OneShotEffect { Player player = game.getPlayer(source.getControllerId()); if (stackObject != null && player != null) { game.getStack().counter(source.getFirstTarget(), source.getSourceId(), game); - if (player.chooseUse(Constants.Outcome.PutCardInPlay, "Cast a nonland card in your hand that shares a card type with that spell without paying its mana cost?", game)) { + if (player.chooseUse(Outcome.PutCardInPlay, "Cast a nonland card in your hand that shares a card type with that spell without paying its mana cost?", game)) { FilterCard filter = new FilterCard(); ArrayList> types = new ArrayList>(); for (CardType type: stackObject.getCardType()) { @@ -106,7 +107,7 @@ class CounterlashEffect extends OneShotEffect { } filter.add(Predicates.or(types)); TargetCardInHand target = new TargetCardInHand(filter); - if (player.choose(Constants.Outcome.PutCardInPlay, target, source.getSourceId(), game)) { + if (player.choose(Outcome.PutCardInPlay, target, source.getSourceId(), game)) { Card card = player.getHand().get(target.getFirstTarget(), game); if (card != null) { player.cast(card.getSpellAbility(), game, true); diff --git a/Mage.Sets/src/mage/sets/darkascension/CrushingVines.java b/Mage.Sets/src/mage/sets/darkascension/CrushingVines.java index 63b25dccc70..a8ae85457bd 100644 --- a/Mage.Sets/src/mage/sets/darkascension/CrushingVines.java +++ b/Mage.Sets/src/mage/sets/darkascension/CrushingVines.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Mode; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/CurseOfBloodletting.java b/Mage.Sets/src/mage/sets/darkascension/CurseOfBloodletting.java index 1a82c160b40..cd9eb0c620f 100644 --- a/Mage.Sets/src/mage/sets/darkascension/CurseOfBloodletting.java +++ b/Mage.Sets/src/mage/sets/darkascension/CurseOfBloodletting.java @@ -28,9 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; @@ -61,11 +60,11 @@ public class CurseOfBloodletting extends CardImpl { // Enchant player TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Damage)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Damage)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); // If a source would deal damage to enchanted player, it deals double that damage to that player instead. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new CurseOfBloodlettingEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CurseOfBloodlettingEffect())); } public CurseOfBloodletting(final CurseOfBloodletting card) { @@ -81,7 +80,7 @@ public class CurseOfBloodletting extends CardImpl { class CurseOfBloodlettingEffect extends ReplacementEffectImpl { public CurseOfBloodlettingEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Damage); + super(Duration.WhileOnBattlefield, Outcome.Damage); staticText = "If a source would deal damage to enchanted player, it deals double that damage to that player instead"; } diff --git a/Mage.Sets/src/mage/sets/darkascension/CurseOfEchoes.java b/Mage.Sets/src/mage/sets/darkascension/CurseOfEchoes.java index 903b2a0e54a..5bc968705cd 100644 --- a/Mage.Sets/src/mage/sets/darkascension/CurseOfEchoes.java +++ b/Mage.Sets/src/mage/sets/darkascension/CurseOfEchoes.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.TriggeredAbilityImpl; @@ -38,6 +38,8 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -66,7 +68,7 @@ public class CurseOfEchoes extends CardImpl { // Enchant player TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Damage)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Damage)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); // Whenever enchanted player casts an instant or sorcery spell, each other player may copy that spell and may choose new targets for the copy he or she controls. @@ -94,7 +96,7 @@ class CurseOfEchoesCopyTriggeredAbility extends TriggeredAbilityImpl { public CurseOfEchoesEffect() { - super(Constants.Outcome.Copy); + super(Outcome.Copy); } public CurseOfEchoesEffect(final CurseOfEchoesEffect effect) { @@ -149,7 +151,7 @@ class CurseOfEchoesEffect extends OneShotEffect { for (UUID playerId: game.getPlayerList()) { if (!playerId.equals(spell.getControllerId())) { Player player = game.getPlayer(playerId); - if (player.chooseUse(Constants.Outcome.Copy, chooseMessage, game)) { + if (player.chooseUse(Outcome.Copy, chooseMessage, game)) { Spell copy = spell.copySpell(); copy.setControllerId(playerId); copy.setCopiedSpell(true); diff --git a/Mage.Sets/src/mage/sets/darkascension/CurseOfExhaustion.java b/Mage.Sets/src/mage/sets/darkascension/CurseOfExhaustion.java index a43db5175ba..0616f6c51e1 100644 --- a/Mage.Sets/src/mage/sets/darkascension/CurseOfExhaustion.java +++ b/Mage.Sets/src/mage/sets/darkascension/CurseOfExhaustion.java @@ -28,9 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; @@ -63,11 +62,11 @@ public class CurseOfExhaustion extends CardImpl { // Enchant player TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Detriment)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); // Enchanted player can't cast more than one spell each turn. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new CurseOfExhaustionEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CurseOfExhaustionEffect())); } public CurseOfExhaustion(final CurseOfExhaustion card) { @@ -83,7 +82,7 @@ public class CurseOfExhaustion extends CardImpl { class CurseOfExhaustionWatcher extends WatcherImpl { public CurseOfExhaustionWatcher() { - super("SpellCast", Constants.WatcherScope.PLAYER); + super("SpellCast", WatcherScope.PLAYER); } public CurseOfExhaustionWatcher(final CurseOfExhaustionWatcher watcher) { @@ -116,7 +115,7 @@ class CurseOfExhaustionWatcher extends WatcherImpl { class CurseOfExhaustionEffect extends ReplacementEffectImpl { public CurseOfExhaustionEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "Enchanted player can't cast more than one spell each turn"; } diff --git a/Mage.Sets/src/mage/sets/darkascension/CurseOfMisfortunes.java b/Mage.Sets/src/mage/sets/darkascension/CurseOfMisfortunes.java index a9ec0f04c9f..30a558d0a5b 100644 --- a/Mage.Sets/src/mage/sets/darkascension/CurseOfMisfortunes.java +++ b/Mage.Sets/src/mage/sets/darkascension/CurseOfMisfortunes.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -38,6 +38,8 @@ import mage.abilities.effects.common.AttachEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.NamePredicate; @@ -67,7 +69,7 @@ public class CurseOfMisfortunes extends CardImpl { // Enchant player TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Detriment)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); // At the beginning of your upkeep, you may search your library for a Curse card that doesn't have the same name as a Curse attached to enchanted player, put it onto the battlefield attached to that player, then shuffle your library. @@ -87,7 +89,7 @@ public class CurseOfMisfortunes extends CardImpl { class CurseOfMisfortunesEffect extends OneShotEffect { public CurseOfMisfortunesEffect() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); staticText = "you may search your library for a Curse card that doesn't have the same name as a Curse attached to enchanted player, put it onto the battlefield attached to that player, then shuffle your library"; } @@ -120,7 +122,7 @@ class CurseOfMisfortunesEffect extends OneShotEffect { this.setTargetPointer(new FixedTarget(targetPlayer.getId())); game.getState().setValue("attachTo:" + card.getId(), targetPlayer.getId()); player.shuffleLibrary(game); - return card.putOntoBattlefield(game, Constants.Zone.LIBRARY, source.getId(), source.getControllerId()); + return card.putOntoBattlefield(game, Zone.LIBRARY, source.getId(), source.getControllerId()); } } player.shuffleLibrary(game); diff --git a/Mage.Sets/src/mage/sets/darkascension/CurseOfThirst.java b/Mage.Sets/src/mage/sets/darkascension/CurseOfThirst.java index 57f5a190c8a..c30dcc7b265 100644 --- a/Mage.Sets/src/mage/sets/darkascension/CurseOfThirst.java +++ b/Mage.Sets/src/mage/sets/darkascension/CurseOfThirst.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.dynamicvalue.DynamicValue; @@ -38,6 +38,8 @@ import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -62,7 +64,7 @@ public class CurseOfThirst extends CardImpl { // Enchant player TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Detriment)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); // At the beginning of enchanted player's upkeep, Curse of Thirst deals damage to that player equal to the number of Curses attached to him or her. @@ -83,7 +85,7 @@ public class CurseOfThirst extends CardImpl { class CurseOfThirstAbility extends TriggeredAbilityImpl { public CurseOfThirstAbility() { - super(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(new CursesAttachedCount())); + super(Zone.BATTLEFIELD, new DamageTargetEffect(new CursesAttachedCount())); } public CurseOfThirstAbility(final CurseOfThirstAbility ability) { diff --git a/Mage.Sets/src/mage/sets/darkascension/DawntreaderElk.java b/Mage.Sets/src/mage/sets/darkascension/DawntreaderElk.java index 153a704c306..96e3e20ecd2 100644 --- a/Mage.Sets/src/mage/sets/darkascension/DawntreaderElk.java +++ b/Mage.Sets/src/mage/sets/darkascension/DawntreaderElk.java @@ -28,10 +28,10 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.ColoredManaSymbol; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/darkascension/DeadlyAllure.java b/Mage.Sets/src/mage/sets/darkascension/DeadlyAllure.java index fb9e5a73da7..850a7f2a662 100644 --- a/Mage.Sets/src/mage/sets/darkascension/DeadlyAllure.java +++ b/Mage.Sets/src/mage/sets/darkascension/DeadlyAllure.java @@ -28,9 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.MustBlockSourceEffect; @@ -53,12 +52,12 @@ public class DeadlyAllure extends CardImpl { this.color.setBlack(true); // Target creature gains deathtouch until end of turn and must be blocked this turn if able. - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new MustBlockSourceEffect()), Constants.Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBlockSourceEffect()), Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Flashback {G} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{G}"), Constants.TimingRule.SORCERY)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{G}"), TimingRule.SORCERY)); } diff --git a/Mage.Sets/src/mage/sets/darkascension/DeathsCaress.java b/Mage.Sets/src/mage/sets/darkascension/DeathsCaress.java index d01d95a3514..7e777629870 100644 --- a/Mage.Sets/src/mage/sets/darkascension/DeathsCaress.java +++ b/Mage.Sets/src/mage/sets/darkascension/DeathsCaress.java @@ -28,10 +28,10 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/darkascension/DerangedOutcast.java b/Mage.Sets/src/mage/sets/darkascension/DerangedOutcast.java index 565602a5828..0349df34a1e 100644 --- a/Mage.Sets/src/mage/sets/darkascension/DerangedOutcast.java +++ b/Mage.Sets/src/mage/sets/darkascension/DerangedOutcast.java @@ -29,9 +29,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -67,7 +67,7 @@ public class DerangedOutcast extends CardImpl { this.toughness = new MageInt(1); // {1}{G}, Sacrifice a Human: Put two +1/+1 counters on target creature. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance(2)), new ManaCostsImpl("{1}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance(2)), new ManaCostsImpl("{1}{G}")); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/darkascension/DiregrafCaptain.java b/Mage.Sets/src/mage/sets/darkascension/DiregrafCaptain.java index 6e70b7604a9..a72d85bd90e 100644 --- a/Mage.Sets/src/mage/sets/darkascension/DiregrafCaptain.java +++ b/Mage.Sets/src/mage/sets/darkascension/DiregrafCaptain.java @@ -27,9 +27,8 @@ */ package mage.sets.darkascension; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; @@ -37,6 +36,8 @@ import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -72,7 +73,7 @@ public class DiregrafCaptain extends CardImpl { this.addAbility(DeathtouchAbility.getInstance()); // Other Zombie creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Constants.Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); // Whenever another Zombie you control dies, target opponent loses 1 life. this.addAbility(new DiregrafCaptainTriggeredAbility()); } @@ -96,7 +97,7 @@ class DiregrafCaptainTriggeredAbility extends TriggeredAbilityImpl { this.addAbility(FlyingAbility.getInstance()); // Other Spirit creatures you control get +1/+1 and have hexproof. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Constants.Duration.WhileOnBattlefield, filter, true))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityControlledEffect(HexproofAbility.getInstance(), Constants.Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, filter, true))); } public DrogskolCaptain(final DrogskolCaptain card) { diff --git a/Mage.Sets/src/mage/sets/darkascension/DrogskolReaver.java b/Mage.Sets/src/mage/sets/darkascension/DrogskolReaver.java index a969146825a..e8b095795d8 100644 --- a/Mage.Sets/src/mage/sets/darkascension/DrogskolReaver.java +++ b/Mage.Sets/src/mage/sets/darkascension/DrogskolReaver.java @@ -29,9 +29,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DrawCardControllerEffect; @@ -39,6 +38,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.DoubleStrikeAbility; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -78,7 +78,7 @@ public class DrogskolReaver extends CardImpl { class DrogskolReaverAbility extends TriggeredAbilityImpl { public DrogskolReaverAbility() { - super(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), false); + super(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), false); } public DrogskolReaverAbility(final DrogskolReaverAbility ability) { diff --git a/Mage.Sets/src/mage/sets/darkascension/DungeonGeists.java b/Mage.Sets/src/mage/sets/darkascension/DungeonGeists.java index db880ea1b97..2dff86ef6ad 100644 --- a/Mage.Sets/src/mage/sets/darkascension/DungeonGeists.java +++ b/Mage.Sets/src/mage/sets/darkascension/DungeonGeists.java @@ -27,11 +27,10 @@ */ package mage.sets.darkascension; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.WatcherScope; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.*; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -59,7 +58,7 @@ public class DungeonGeists extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT)); + filter.add(new ControllerPredicate(TargetController.OPPONENT)); } public DungeonGeists(UUID ownerId) { @@ -96,7 +95,7 @@ public class DungeonGeists extends CardImpl { class DungeonGeistsEffect extends ReplacementEffectImpl { public DungeonGeistsEffect() { - super(Constants.Duration.OneUse, Constants.Outcome.Detriment); + super(Duration.OneUse, Outcome.Detriment); this.staticText = "That creature doesn't untap during its controller's untap step for as long as you control Dungeon Geists"; } @@ -136,7 +135,7 @@ class DungeonGeistsEffect extends ReplacementEffectImpl { } - if (game.getTurn().getStepType() == Constants.PhaseStep.UNTAP && event.getType() == GameEvent.EventType.UNTAP) { + if (game.getTurn().getStepType() == PhaseStep.UNTAP && event.getType() == GameEvent.EventType.UNTAP) { if (event.getTargetId().equals(targetPointer.getFirst(game, source))) { return true; } diff --git a/Mage.Sets/src/mage/sets/darkascension/ElbrusTheBindingBlade.java b/Mage.Sets/src/mage/sets/darkascension/ElbrusTheBindingBlade.java index 759a12e14a9..6c2c8958a86 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ElbrusTheBindingBlade.java +++ b/Mage.Sets/src/mage/sets/darkascension/ElbrusTheBindingBlade.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerAttachedTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +40,8 @@ import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; @@ -60,11 +62,11 @@ public class ElbrusTheBindingBlade extends CardImpl { this.addAbility(new TransformAbility()); // Equipped creature gets +1/+0. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0))); // When equipped creature deals combat damage to a player, unattach Elbrus, the Binding Blade, then transform it. this.addAbility(new DealsCombatDamageToAPlayerAttachedTriggeredAbility(new ElbrusTheBindingBladeEffect(), "equipped", true)); // Equip {1} - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(1))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1))); } public ElbrusTheBindingBlade(final ElbrusTheBindingBlade card) { @@ -79,7 +81,7 @@ public class ElbrusTheBindingBlade extends CardImpl { class ElbrusTheBindingBladeEffect extends OneShotEffect { public ElbrusTheBindingBladeEffect() { - super(Constants.Outcome.BecomeCreature); + super(Outcome.BecomeCreature); staticText = "unattach {this}, then transform it"; } diff --git a/Mage.Sets/src/mage/sets/darkascension/ElgaudInquisitor.java b/Mage.Sets/src/mage/sets/darkascension/ElgaudInquisitor.java index 853e758c06c..9b6543b456f 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ElgaudInquisitor.java +++ b/Mage.Sets/src/mage/sets/darkascension/ElgaudInquisitor.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/darkascension/ErdwalRipper.java b/Mage.Sets/src/mage/sets/darkascension/ErdwalRipper.java index 0cef7e3e585..eccdb697b7a 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ErdwalRipper.java +++ b/Mage.Sets/src/mage/sets/darkascension/ErdwalRipper.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/darkascension/ExecutionersHood.java b/Mage.Sets/src/mage/sets/darkascension/ExecutionersHood.java index 6b86661127b..63d077167a8 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ExecutionersHood.java +++ b/Mage.Sets/src/mage/sets/darkascension/ExecutionersHood.java @@ -29,9 +29,7 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; @@ -51,9 +49,9 @@ public class ExecutionersHood extends CardImpl { this.subtype.add("Equipment"); // Equipped creature has intimidate. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(IntimidateAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(IntimidateAbility.getInstance(), AttachmentType.EQUIPMENT))); // Equip {2} - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(2))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); } public ExecutionersHood(final ExecutionersHood card) { diff --git a/Mage.Sets/src/mage/sets/darkascension/FaithlessLooting.java b/Mage.Sets/src/mage/sets/darkascension/FaithlessLooting.java index e4f61028541..010a6220169 100644 --- a/Mage.Sets/src/mage/sets/darkascension/FaithlessLooting.java +++ b/Mage.Sets/src/mage/sets/darkascension/FaithlessLooting.java @@ -29,14 +29,14 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DiscardControllerEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; +import mage.constants.TimingRule; /** * @@ -54,7 +54,7 @@ public class FaithlessLooting extends CardImpl { this.getSpellAbility().addEffect(new DrawCardControllerEffect(2)); this.getSpellAbility().addEffect(new DiscardControllerEffect(2)); // Flashback {2}{R} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{2}{R}"), Constants.TimingRule.SORCERY)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{2}{R}"), TimingRule.SORCERY)); } public FaithlessLooting(final FaithlessLooting card) { diff --git a/Mage.Sets/src/mage/sets/darkascension/FaithsShield.java b/Mage.Sets/src/mage/sets/darkascension/FaithsShield.java index dd214182e1d..08064450a9b 100644 --- a/Mage.Sets/src/mage/sets/darkascension/FaithsShield.java +++ b/Mage.Sets/src/mage/sets/darkascension/FaithsShield.java @@ -27,10 +27,10 @@ */ package mage.sets.darkascension; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.condition.common.FatefulHourCondition; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/darkascension/FalkenrathAristocrat.java b/Mage.Sets/src/mage/sets/darkascension/FalkenrathAristocrat.java index 7c85814969d..72f8bdea239 100644 --- a/Mage.Sets/src/mage/sets/darkascension/FalkenrathAristocrat.java +++ b/Mage.Sets/src/mage/sets/darkascension/FalkenrathAristocrat.java @@ -28,11 +28,11 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/FalkenrathTorturer.java b/Mage.Sets/src/mage/sets/darkascension/FalkenrathTorturer.java index 51feef216f3..a696300b0dc 100644 --- a/Mage.Sets/src/mage/sets/darkascension/FalkenrathTorturer.java +++ b/Mage.Sets/src/mage/sets/darkascension/FalkenrathTorturer.java @@ -28,11 +28,11 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/FarbogBoneflinger.java b/Mage.Sets/src/mage/sets/darkascension/FarbogBoneflinger.java index 62323422222..2162224611c 100644 --- a/Mage.Sets/src/mage/sets/darkascension/FarbogBoneflinger.java +++ b/Mage.Sets/src/mage/sets/darkascension/FarbogBoneflinger.java @@ -29,14 +29,14 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -55,7 +55,7 @@ public class FarbogBoneflinger extends CardImpl { this.toughness = new MageInt(2); // When Farbog Boneflinger enters the battlefield, target creature gets -2/-2 until end of turn. - Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(-2, -2, Constants.Duration.EndOfTurn)); + Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(-2, -2, Duration.EndOfTurn)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/FavorOfTheWoods.java b/Mage.Sets/src/mage/sets/darkascension/FavorOfTheWoods.java index 986cbb642cd..bef3aee5e09 100644 --- a/Mage.Sets/src/mage/sets/darkascension/FavorOfTheWoods.java +++ b/Mage.Sets/src/mage/sets/darkascension/FavorOfTheWoods.java @@ -28,15 +28,16 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.BlocksAttachedTriggeredAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -56,7 +57,7 @@ public class FavorOfTheWoods extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Neutral)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Neutral)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Whenever enchanted creature blocks, you gain 3 life. diff --git a/Mage.Sets/src/mage/sets/darkascension/FeedThePack.java b/Mage.Sets/src/mage/sets/darkascension/FeedThePack.java index e47f6ea3f33..32a4985ecc9 100644 --- a/Mage.Sets/src/mage/sets/darkascension/FeedThePack.java +++ b/Mage.Sets/src/mage/sets/darkascension/FeedThePack.java @@ -28,10 +28,10 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -81,7 +81,7 @@ class FeedThePackEffect extends OneShotEffect { } public FeedThePackEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); this.staticText = "sacrifice a nontoken creature. If you do, put X 2/2 green Wolf creature tokens onto the battlefield, where X is the sacrificed creature's toughness"; } diff --git a/Mage.Sets/src/mage/sets/darkascension/FiendOfTheShadows.java b/Mage.Sets/src/mage/sets/darkascension/FiendOfTheShadows.java index de7b3e3cc84..2ed4e8a50fb 100644 --- a/Mage.Sets/src/mage/sets/darkascension/FiendOfTheShadows.java +++ b/Mage.Sets/src/mage/sets/darkascension/FiendOfTheShadows.java @@ -28,9 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -76,11 +75,11 @@ public class FiendOfTheShadows extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Whenever Fiend of the Shadows deals combat damage to a player, that player exiles a card from his or her hand. You may play that card for as long as it remains exiled. - this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new ExileFromZoneTargetEffect(Constants.Zone.HAND, exileId, "Fiend of the Shadows", new FilterCard()), false, true)); - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new FiendOfTheShadowsEffect(exileId))); + this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new ExileFromZoneTargetEffect(Zone.HAND, exileId, "Fiend of the Shadows", new FilterCard()), false, true)); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new FiendOfTheShadowsEffect(exileId))); // Sacrifice a Human: Regenerate Fiend of the Shadows. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false)))); } public FiendOfTheShadows(final FiendOfTheShadows card) { @@ -98,7 +97,7 @@ class FiendOfTheShadowsEffect extends AsThoughEffectImpl { class FlayerTriggeredAbility extends TriggeredAbilityImpl { public FlayerTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new FlayerEffect(), false); + super(Zone.BATTLEFIELD, new FlayerEffect(), false); } public FlayerTriggeredAbility(FlayerTriggeredAbility ability) { @@ -93,7 +94,7 @@ class FlayerTriggeredAbility extends TriggeredAbilityImpl { public FlayerEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "that creature deals damage equal to its power to target creature or player"; } @@ -136,7 +137,7 @@ class FlayerEffect extends OneShotEffect { UUID creatureId = (UUID) getValue("damageSource"); Permanent creature = game.getPermanent(creatureId); if (creature == null) { - creature = (Permanent) game.getLastKnownInformation(creatureId, Constants.Zone.BATTLEFIELD); + creature = (Permanent) game.getLastKnownInformation(creatureId, Zone.BATTLEFIELD); } if (creature != null) { int amount = creature.getPower().getValue(); diff --git a/Mage.Sets/src/mage/sets/darkascension/ForgeDevil.java b/Mage.Sets/src/mage/sets/darkascension/ForgeDevil.java index 129cfa5a2b0..0f93cec1026 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ForgeDevil.java +++ b/Mage.Sets/src/mage/sets/darkascension/ForgeDevil.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/GatherTheTownsfolk.java b/Mage.Sets/src/mage/sets/darkascension/GatherTheTownsfolk.java index 2737c1bc3a2..8a387142cce 100644 --- a/Mage.Sets/src/mage/sets/darkascension/GatherTheTownsfolk.java +++ b/Mage.Sets/src/mage/sets/darkascension/GatherTheTownsfolk.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.condition.common.FatefulHourCondition; diff --git a/Mage.Sets/src/mage/sets/darkascension/GavonyIronwright.java b/Mage.Sets/src/mage/sets/darkascension/GavonyIronwright.java index 7c93c615d0e..316fc1fc358 100644 --- a/Mage.Sets/src/mage/sets/darkascension/GavonyIronwright.java +++ b/Mage.Sets/src/mage/sets/darkascension/GavonyIronwright.java @@ -29,15 +29,16 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.FatefulHourCondition; import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -57,7 +58,7 @@ public class GavonyIronwright extends CardImpl { this.toughness = new MageInt(4); // Fateful hour - As long as you have 5 or less life, other creatures you control get +1/+4. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostControlledEffect(1, 4, Constants.Duration.WhileOnBattlefield, false), + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostControlledEffect(1, 4, Duration.WhileOnBattlefield, false), FatefulHourCondition.getInstance(), "As long as you have 5 or less life, other creatures you control get +1/+4"))); } diff --git a/Mage.Sets/src/mage/sets/darkascension/GeralfsMessenger.java b/Mage.Sets/src/mage/sets/darkascension/GeralfsMessenger.java index bdaf850a160..27cb812a76b 100644 --- a/Mage.Sets/src/mage/sets/darkascension/GeralfsMessenger.java +++ b/Mage.Sets/src/mage/sets/darkascension/GeralfsMessenger.java @@ -27,8 +27,8 @@ */ package mage.sets.darkascension; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/GeralfsMindcrusher.java b/Mage.Sets/src/mage/sets/darkascension/GeralfsMindcrusher.java index 4511994c3e0..aa9cca6f22e 100644 --- a/Mage.Sets/src/mage/sets/darkascension/GeralfsMindcrusher.java +++ b/Mage.Sets/src/mage/sets/darkascension/GeralfsMindcrusher.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/GhastlyHaunting.java b/Mage.Sets/src/mage/sets/darkascension/GhastlyHaunting.java index 78eb862bf7e..460625d92f6 100644 --- a/Mage.Sets/src/mage/sets/darkascension/GhastlyHaunting.java +++ b/Mage.Sets/src/mage/sets/darkascension/GhastlyHaunting.java @@ -28,12 +28,13 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.ControlEnchantedEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -57,7 +58,7 @@ public class GhastlyHaunting extends CardImpl { this.getSpellAbility().addTarget(auraTarget); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); } public GhastlyHaunting(final GhastlyHaunting card) { diff --git a/Mage.Sets/src/mage/sets/darkascension/Ghoultree.java b/Mage.Sets/src/mage/sets/darkascension/Ghoultree.java index d6b23ecacfe..06e85fd730a 100644 --- a/Mage.Sets/src/mage/sets/darkascension/Ghoultree.java +++ b/Mage.Sets/src/mage/sets/darkascension/Ghoultree.java @@ -28,10 +28,10 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/GrafdiggersCage.java b/Mage.Sets/src/mage/sets/darkascension/GrafdiggersCage.java index 893f5933a65..4c9375d5288 100644 --- a/Mage.Sets/src/mage/sets/darkascension/GrafdiggersCage.java +++ b/Mage.Sets/src/mage/sets/darkascension/GrafdiggersCage.java @@ -28,15 +28,17 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Outcome; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -71,7 +73,7 @@ public class GrafdiggersCage extends CardImpl { class GrafdiggersCageEffect extends ReplacementEffectImpl { public GrafdiggersCageEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "Creature cards can't enter the battlefield from graveyards or libraries"; } @@ -113,7 +115,7 @@ class GrafdiggersCageEffect extends ReplacementEffectImpl class GrafdiggersCageEffect2 extends ReplacementEffectImpl { public GrafdiggersCageEffect2() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "Players can't cast cards in graveyards or libraries"; } @@ -142,7 +144,7 @@ class GrafdiggersCageEffect2 extends ReplacementEffectImpl } public GravecrawlerPlayEffect() { - super(Constants.AsThoughEffectType.CAST, Constants.Duration.EndOfGame, Constants.Outcome.Benefit); + super(AsThoughEffectType.CAST, Duration.EndOfGame, Outcome.Benefit); staticText = "You may cast Gravecrawler from your graveyard as long as you control a Zombie"; } @@ -108,7 +110,7 @@ class GravecrawlerPlayEffect extends AsThoughEffectImpl public boolean applies(UUID sourceId, Ability source, Game game) { if (sourceId.equals(source.getSourceId())) { Card card = game.getCard(source.getSourceId()); - if (card != null && game.getState().getZone(source.getSourceId()) == Constants.Zone.GRAVEYARD && game.canPlaySorcery(source.getControllerId())) { + if (card != null && game.getState().getZone(source.getSourceId()) == Zone.GRAVEYARD && game.canPlaySorcery(source.getControllerId())) { if (game.getBattlefield().countAll(filter, source.getControllerId(), game) > 0) return true; } diff --git a/Mage.Sets/src/mage/sets/darkascension/Gravepurge.java b/Mage.Sets/src/mage/sets/darkascension/Gravepurge.java index b700831f044..4eac11ae3f1 100644 --- a/Mage.Sets/src/mage/sets/darkascension/Gravepurge.java +++ b/Mage.Sets/src/mage/sets/darkascension/Gravepurge.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/darkascension/GravetillerWurm.java b/Mage.Sets/src/mage/sets/darkascension/GravetillerWurm.java index d6dcc24d3c5..aca6629d0dd 100644 --- a/Mage.Sets/src/mage/sets/darkascension/GravetillerWurm.java +++ b/Mage.Sets/src/mage/sets/darkascension/GravetillerWurm.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.common.MorbidCondition; diff --git a/Mage.Sets/src/mage/sets/darkascension/GrimBackwoods.java b/Mage.Sets/src/mage/sets/darkascension/GrimBackwoods.java index 0a164c3c8cd..6e0ed121c1a 100644 --- a/Mage.Sets/src/mage/sets/darkascension/GrimBackwoods.java +++ b/Mage.Sets/src/mage/sets/darkascension/GrimBackwoods.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; diff --git a/Mage.Sets/src/mage/sets/darkascension/GrimFlowering.java b/Mage.Sets/src/mage/sets/darkascension/GrimFlowering.java index b25c4ffb961..6504cadf09e 100644 --- a/Mage.Sets/src/mage/sets/darkascension/GrimFlowering.java +++ b/Mage.Sets/src/mage/sets/darkascension/GrimFlowering.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/darkascension/Griptide.java b/Mage.Sets/src/mage/sets/darkascension/Griptide.java index 0cba6c1e16a..3da86bed2f6 100644 --- a/Mage.Sets/src/mage/sets/darkascension/Griptide.java +++ b/Mage.Sets/src/mage/sets/darkascension/Griptide.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/darkascension/GruesomeDiscovery.java b/Mage.Sets/src/mage/sets/darkascension/GruesomeDiscovery.java index ea63352f914..cf4fcd8c076 100644 --- a/Mage.Sets/src/mage/sets/darkascension/GruesomeDiscovery.java +++ b/Mage.Sets/src/mage/sets/darkascension/GruesomeDiscovery.java @@ -29,10 +29,10 @@ package mage.sets.darkascension; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.condition.common.MorbidCondition; import mage.abilities.decorator.ConditionalOneShotEffect; diff --git a/Mage.Sets/src/mage/sets/darkascension/HarrowingJourney.java b/Mage.Sets/src/mage/sets/darkascension/HarrowingJourney.java index ae1b9147c5a..3b2537ba29d 100644 --- a/Mage.Sets/src/mage/sets/darkascension/HarrowingJourney.java +++ b/Mage.Sets/src/mage/sets/darkascension/HarrowingJourney.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/darkascension/HauntedFengraf.java b/Mage.Sets/src/mage/sets/darkascension/HauntedFengraf.java index 577dae5751c..a5c66004661 100644 --- a/Mage.Sets/src/mage/sets/darkascension/HauntedFengraf.java +++ b/Mage.Sets/src/mage/sets/darkascension/HauntedFengraf.java @@ -29,11 +29,11 @@ package mage.sets.darkascension; import java.util.Random; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -100,7 +100,7 @@ class HauntedFengrafEffect extends OneShotEffect { if (cards.length > 0) { Random rnd = new Random(); Card card = cards[rnd.nextInt(cards.length)]; - card.moveToZone(Constants.Zone.HAND, source.getId(), game, true); + card.moveToZone(Zone.HAND, source.getId(), game, true); game.informPlayers(card.getName() + " returned to the hand of " + player.getName()); return true; } diff --git a/Mage.Sets/src/mage/sets/darkascension/HavengulLich.java b/Mage.Sets/src/mage/sets/darkascension/HavengulLich.java index 4f1cd009b7e..e30e1abc956 100644 --- a/Mage.Sets/src/mage/sets/darkascension/HavengulLich.java +++ b/Mage.Sets/src/mage/sets/darkascension/HavengulLich.java @@ -28,12 +28,13 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.AsThoughEffectType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.ActivatedAbility; @@ -45,6 +46,8 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Layer; +import mage.constants.SubLayer; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.game.Game; @@ -93,7 +96,7 @@ public class HavengulLich extends CardImpl { class HavengulLichPlayEffect extends AsThoughEffectImpl { public HavengulLichPlayEffect() { - super(Constants.AsThoughEffectType.CAST, Constants.Duration.EndOfTurn, Constants.Outcome.Benefit); + super(AsThoughEffectType.CAST, Duration.EndOfTurn, Outcome.Benefit); staticText = "You may cast target creature card in a graveyard this turn"; } @@ -114,7 +117,7 @@ class HavengulLichPlayEffect extends AsThoughEffectImpl @Override public boolean applies(UUID sourceId, Ability source, Game game) { Card card = game.getCard(sourceId); - if (card != null && game.getState().getZone(card.getId()) == Constants.Zone.GRAVEYARD) { + if (card != null && game.getState().getZone(card.getId()) == Zone.GRAVEYARD) { if (targetPointer.getFirst(game, source).equals(card.getId())) return true; } @@ -185,7 +188,7 @@ class HavengulLichEffect extends ContinuousEffectImpl { private UUID cardId; public HavengulLichEffect(UUID cardId) { - super(Duration.EndOfTurn, Constants.Layer.AbilityAddingRemovingEffects_6, Constants.SubLayer.NA, Constants.Outcome.AddAbility); + super(Duration.EndOfTurn, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility); this.cardId = cardId; } diff --git a/Mage.Sets/src/mage/sets/darkascension/HavengulRunebinder.java b/Mage.Sets/src/mage/sets/darkascension/HavengulRunebinder.java index 9f5832ddf7a..803ac499a34 100644 --- a/Mage.Sets/src/mage/sets/darkascension/HavengulRunebinder.java +++ b/Mage.Sets/src/mage/sets/darkascension/HavengulRunebinder.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.ExileFromGraveCost; diff --git a/Mage.Sets/src/mage/sets/darkascension/HeadlessSkaab.java b/Mage.Sets/src/mage/sets/darkascension/HeadlessSkaab.java index 76b9f59237b..67940b841e6 100644 --- a/Mage.Sets/src/mage/sets/darkascension/HeadlessSkaab.java +++ b/Mage.Sets/src/mage/sets/darkascension/HeadlessSkaab.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.costs.common.ExileFromGraveCost; diff --git a/Mage.Sets/src/mage/sets/darkascension/HeavyMattock.java b/Mage.Sets/src/mage/sets/darkascension/HeavyMattock.java index 778b9c0429d..06eff6b0cb6 100644 --- a/Mage.Sets/src/mage/sets/darkascension/HeavyMattock.java +++ b/Mage.Sets/src/mage/sets/darkascension/HeavyMattock.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EquippedHasSubtypeCondition; import mage.abilities.costs.mana.GenericManaCost; @@ -38,6 +38,8 @@ import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; /** * @@ -53,11 +55,11 @@ public class HeavyMattock extends CardImpl { this.subtype.add("Equipment"); // Equipped creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); // As long as equipped creature is a Human, it gets an additional +1/+1. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEquippedEffect(1, 1), new EquippedHasSubtypeCondition("Human"), staticText))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEquippedEffect(1, 1), new EquippedHasSubtypeCondition("Human"), staticText))); // Equip {2} - this.addAbility(new EquipAbility(Constants.Outcome.BoostCreature, new GenericManaCost(2))); + this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2))); } public HeavyMattock(final HeavyMattock card) { diff --git a/Mage.Sets/src/mage/sets/darkascension/HecklingFiends.java b/Mage.Sets/src/mage/sets/darkascension/HecklingFiends.java index 8eef0ab5635..e1267fb4956 100644 --- a/Mage.Sets/src/mage/sets/darkascension/HecklingFiends.java +++ b/Mage.Sets/src/mage/sets/darkascension/HecklingFiends.java @@ -29,14 +29,15 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.AttacksIfAbleTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -55,8 +56,8 @@ public class HecklingFiends extends CardImpl { this.toughness = new MageInt(2); // {2}{R}: Target creature attacks this turn if able. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, - new AttacksIfAbleTargetEffect(Constants.Duration.EndOfTurn), + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + new AttacksIfAbleTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{2}{R}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/darkascension/Hellrider.java b/Mage.Sets/src/mage/sets/darkascension/Hellrider.java index 2c251c07b01..d4da2c8c668 100644 --- a/Mage.Sets/src/mage/sets/darkascension/Hellrider.java +++ b/Mage.Sets/src/mage/sets/darkascension/Hellrider.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DamageTargetEffect; diff --git a/Mage.Sets/src/mage/sets/darkascension/Helvault.java b/Mage.Sets/src/mage/sets/darkascension/Helvault.java index cab0aeb1b18..b47e41395b8 100644 --- a/Mage.Sets/src/mage/sets/darkascension/Helvault.java +++ b/Mage.Sets/src/mage/sets/darkascension/Helvault.java @@ -28,10 +28,10 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/darkascension/HighbornGhoul.java b/Mage.Sets/src/mage/sets/darkascension/HighbornGhoul.java index 79141e7e57c..139856b8ee0 100644 --- a/Mage.Sets/src/mage/sets/darkascension/HighbornGhoul.java +++ b/Mage.Sets/src/mage/sets/darkascension/HighbornGhoul.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.IntimidateAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/darkascension/HinterlandHermit.java b/Mage.Sets/src/mage/sets/darkascension/HinterlandHermit.java index 144f252f40b..d5cad0ed2f3 100644 --- a/Mage.Sets/src/mage/sets/darkascension/HinterlandHermit.java +++ b/Mage.Sets/src/mage/sets/darkascension/HinterlandHermit.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -39,6 +39,7 @@ import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; /** * @@ -61,7 +62,7 @@ public class HinterlandHermit extends CardImpl { // At the beginning of each upkeep, if no spells were cast last turn, transform Hinterland Hermit. this.addAbility(new TransformAbility()); - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), Constants.TargetController.ANY, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), TargetController.ANY, false); this.addAbility(new ConditionalTriggeredAbility(ability, NoSpellsWereCastLastTurnCondition.getInstance(), TransformAbility.NO_SPELLS_TRANSFORM_RULE)); } diff --git a/Mage.Sets/src/mage/sets/darkascension/HinterlandScourge.java b/Mage.Sets/src/mage/sets/darkascension/HinterlandScourge.java index d16bad364e6..0b41a145e90 100644 --- a/Mage.Sets/src/mage/sets/darkascension/HinterlandScourge.java +++ b/Mage.Sets/src/mage/sets/darkascension/HinterlandScourge.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -41,6 +41,8 @@ import mage.abilities.effects.common.MustBlockSourceEffect; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; +import mage.constants.Zone; /** * @@ -61,10 +63,10 @@ public class HinterlandScourge extends CardImpl { this.toughness = new MageInt(2); // Hinterland Scourge must be blocked if able. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new MustBlockSourceEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBlockSourceEffect())); // At the beginning of each upkeep, if a player cast two or more spells last turn, transform Hinterland Scourge. - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), Constants.TargetController.ANY, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), TargetController.ANY, false); this.addAbility(new ConditionalTriggeredAbility(ability, TwoOrMoreSpellsWereCastLastTurnCondition.getInstance(), TransformAbility.TWO_OR_MORE_SPELLS_TRANSFORM_RULE)); } diff --git a/Mage.Sets/src/mage/sets/darkascension/HollowhengeBeast.java b/Mage.Sets/src/mage/sets/darkascension/HollowhengeBeast.java index 5c1605d9b3e..758ea9c901e 100644 --- a/Mage.Sets/src/mage/sets/darkascension/HollowhengeBeast.java +++ b/Mage.Sets/src/mage/sets/darkascension/HollowhengeBeast.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/darkascension/HollowhengeSpirit.java b/Mage.Sets/src/mage/sets/darkascension/HollowhengeSpirit.java index 6fb5cdee41c..54ef91877b4 100644 --- a/Mage.Sets/src/mage/sets/darkascension/HollowhengeSpirit.java +++ b/Mage.Sets/src/mage/sets/darkascension/HollowhengeSpirit.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/HungerOfTheHowlpack.java b/Mage.Sets/src/mage/sets/darkascension/HungerOfTheHowlpack.java index 3ca783ecac6..75ad33a0d99 100644 --- a/Mage.Sets/src/mage/sets/darkascension/HungerOfTheHowlpack.java +++ b/Mage.Sets/src/mage/sets/darkascension/HungerOfTheHowlpack.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.condition.common.MorbidCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; diff --git a/Mage.Sets/src/mage/sets/darkascension/HuntmasterOfTheFells.java b/Mage.Sets/src/mage/sets/darkascension/HuntmasterOfTheFells.java index 3780666cd97..9abcbef1eb5 100644 --- a/Mage.Sets/src/mage/sets/darkascension/HuntmasterOfTheFells.java +++ b/Mage.Sets/src/mage/sets/darkascension/HuntmasterOfTheFells.java @@ -27,9 +27,7 @@ */ package mage.sets.darkascension; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -88,7 +86,7 @@ public class HuntmasterOfTheFells extends CardImpl { // At the beginning of each upkeep, if no spells were cast last turn, transform Huntmaster of the Fells. this.addAbility(new TransformAbility()); - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), Constants.TargetController.ANY, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), TargetController.ANY, false); this.addAbility(new ConditionalTriggeredAbility(ability, NoSpellsWereCastLastTurnCondition.getInstance(), TransformAbility.NO_SPELLS_TRANSFORM_RULE)); } @@ -105,7 +103,7 @@ public class HuntmasterOfTheFells extends CardImpl { class HuntmasterOfTheFellsAbility extends TriggeredAbilityImpl { public HuntmasterOfTheFellsAbility() { - super(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new WolfToken(Token.Type.SECOND)), false); + super(Zone.BATTLEFIELD, new CreateTokenEffect(new WolfToken(Token.Type.SECOND)), false); this.addEffect(new GainLifeEffect(2)); } @@ -142,7 +140,7 @@ class HuntmasterOfTheFellsAbility extends TriggeredAbilityImpl { public RavagerOfTheFellsAbility() { - super(Constants.Zone.BATTLEFIELD, new RavagerOfTheFellsEffect(), false); + super(Zone.BATTLEFIELD, new RavagerOfTheFellsEffect(), false); Target target1 = new TargetOpponent(); target1.setRequired(true); this.addTarget(target1); @@ -181,7 +179,7 @@ class RavagerOfTheFellsAbility extends TriggeredAbilityImpl { public RavagerOfTheFellsEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); } public RavagerOfTheFellsEffect(final RavagerOfTheFellsEffect effect) { diff --git a/Mage.Sets/src/mage/sets/darkascension/Immerwolf.java b/Mage.Sets/src/mage/sets/darkascension/Immerwolf.java index 8a9036febcf..8caa3485320 100644 --- a/Mage.Sets/src/mage/sets/darkascension/Immerwolf.java +++ b/Mage.Sets/src/mage/sets/darkascension/Immerwolf.java @@ -27,9 +27,7 @@ */ package mage.sets.darkascension; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -71,10 +69,10 @@ public class Immerwolf extends CardImpl { this.addAbility(IntimidateAbility.getInstance()); // Other Wolf and Werewolf creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Constants.Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); // Non-Human Werewolves you control can't transform. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ImmerwolfEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ImmerwolfEffect())); } @@ -99,7 +97,7 @@ class ImmerwolfEffect extends ReplacementEffectImpl { } public ImmerwolfEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Detriment); + super(Duration.WhileOnBattlefield, Outcome.Detriment); staticText = "Non-Human Werewolves you control can't transform"; } diff --git a/Mage.Sets/src/mage/sets/darkascension/IncreasingAmbition.java b/Mage.Sets/src/mage/sets/darkascension/IncreasingAmbition.java index 7ebc5e6a1cd..fc7675c1f9b 100644 --- a/Mage.Sets/src/mage/sets/darkascension/IncreasingAmbition.java +++ b/Mage.Sets/src/mage/sets/darkascension/IncreasingAmbition.java @@ -29,16 +29,18 @@ package mage.sets.darkascension; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.SearchEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.TimingRule; import mage.filter.FilterCard; import mage.game.Game; import mage.game.stack.Spell; @@ -61,7 +63,7 @@ public class IncreasingAmbition extends CardImpl { this.getSpellAbility().addEffect(new IncreasingAmbitionEffect()); // Flashback {7}{B} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{7}{B}"), Constants.TimingRule.SORCERY)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{7}{B}"), TimingRule.SORCERY)); } public IncreasingAmbition(final IncreasingAmbition card) { @@ -77,7 +79,7 @@ public class IncreasingAmbition extends CardImpl { class IncreasingAmbitionEffect extends SearchEffect { public IncreasingAmbitionEffect() { - super(new TargetCardInLibrary(), Constants.Outcome.DrawCard); + super(new TargetCardInLibrary(), Outcome.DrawCard); staticText = "Search your library for a card and put that card into your hand. If Increasing Ambition was cast from a graveyard, instead search your library for two cards and put those cards into your hand. Then shuffle your library"; } @@ -107,7 +109,7 @@ class IncreasingAmbitionEffect extends SearchEffect { for (UUID cardId: (List)target.getTargets()) { Card card = player.getLibrary().remove(cardId, game); if (card != null) - card.moveToZone(Constants.Zone.HAND, source.getId(), game, false); + card.moveToZone(Zone.HAND, source.getId(), game, false); } } } diff --git a/Mage.Sets/src/mage/sets/darkascension/IncreasingConfusion.java b/Mage.Sets/src/mage/sets/darkascension/IncreasingConfusion.java index 98a455d79ae..34c0ffae327 100644 --- a/Mage.Sets/src/mage/sets/darkascension/IncreasingConfusion.java +++ b/Mage.Sets/src/mage/sets/darkascension/IncreasingConfusion.java @@ -28,9 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; @@ -59,7 +58,7 @@ public class IncreasingConfusion extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer()); // Flashback {X}{U} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{X}{U}"), Constants.TimingRule.SORCERY)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{X}{U}"), TimingRule.SORCERY)); } public IncreasingConfusion(final IncreasingConfusion card) { @@ -75,7 +74,7 @@ public class IncreasingConfusion extends CardImpl { class IncreasingConfusionEffect extends OneShotEffect { public IncreasingConfusionEffect() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); staticText = "Target player puts the top X cards of his or her library into his or her graveyard. If Increasing Confusion was cast from a graveyard, that player puts twice that many cards into his or her graveyard instead"; } @@ -90,14 +89,14 @@ class IncreasingConfusionEffect extends OneShotEffect int amount = source.getManaCostsToPay().getX(); Spell spell = (Spell) game.getStack().getStackObject(source.getSourceId()); if (spell != null) { - if (spell.getFromZone() == Constants.Zone.GRAVEYARD) { + if (spell.getFromZone() == Zone.GRAVEYARD) { amount *= 2; } Card card; for (int i = 0; i < amount; i++) { card = player.getLibrary().removeFromTop(game); if (card != null) { - card.moveToZone(Constants.Zone.GRAVEYARD, source.getId(), game, false); + card.moveToZone(Zone.GRAVEYARD, source.getId(), game, false); } else { break; } diff --git a/Mage.Sets/src/mage/sets/darkascension/IncreasingDevotion.java b/Mage.Sets/src/mage/sets/darkascension/IncreasingDevotion.java index fb4668f82b5..6d408915ff6 100644 --- a/Mage.Sets/src/mage/sets/darkascension/IncreasingDevotion.java +++ b/Mage.Sets/src/mage/sets/darkascension/IncreasingDevotion.java @@ -28,9 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; @@ -55,7 +54,7 @@ public class IncreasingDevotion extends CardImpl { this.getSpellAbility().addEffect(new IncreasingDevotionEffect()); // Flashback {7}{W}{W} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{7}{W}{W}"), Constants.TimingRule.SORCERY)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{7}{W}{W}"), TimingRule.SORCERY)); } public IncreasingDevotion(final IncreasingDevotion card) { @@ -73,7 +72,7 @@ class IncreasingDevotionEffect extends OneShotEffect { private static HumanToken token = new HumanToken(); public IncreasingDevotionEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); staticText = "Put five 1/1 white Human creature tokens onto the battlefield. If Increasing Devotion was cast from a graveyard, put ten of those tokens onto the battlefield instead"; } @@ -86,7 +85,7 @@ class IncreasingDevotionEffect extends OneShotEffect { int amount = 5; Spell spell = (Spell) game.getStack().getStackObject(source.getSourceId()); if (spell != null) { - if (spell.getFromZone() == Constants.Zone.GRAVEYARD) { + if (spell.getFromZone() == Zone.GRAVEYARD) { amount = 10; } token.putOntoBattlefield(amount, game, source.getSourceId(), source.getControllerId()); diff --git a/Mage.Sets/src/mage/sets/darkascension/IncreasingSavagery.java b/Mage.Sets/src/mage/sets/darkascension/IncreasingSavagery.java index 6b47b46036a..c15de6a2d05 100644 --- a/Mage.Sets/src/mage/sets/darkascension/IncreasingSavagery.java +++ b/Mage.Sets/src/mage/sets/darkascension/IncreasingSavagery.java @@ -28,9 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; @@ -59,7 +58,7 @@ public class IncreasingSavagery extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Flashback {5}{G}{G} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{5}{G}{G}"), Constants.TimingRule.SORCERY)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{5}{G}{G}"), TimingRule.SORCERY)); } public IncreasingSavagery(final IncreasingSavagery card) { @@ -75,7 +74,7 @@ public class IncreasingSavagery extends CardImpl { class IncreasingSavageryEffect extends OneShotEffect { public IncreasingSavageryEffect() { - super(Constants.Outcome.BoostCreature); + super(Outcome.BoostCreature); staticText = "Put five +1/+1 counters on target creature. If Increasing Savagery was cast from a graveyard, put ten +1/+1 counters on that creature instead"; } @@ -88,7 +87,7 @@ class IncreasingSavageryEffect extends OneShotEffect { int amount = 5; Spell spell = (Spell) game.getStack().getStackObject(source.getSourceId()); if (spell != null) { - if (spell.getFromZone() == Constants.Zone.GRAVEYARD) { + if (spell.getFromZone() == Zone.GRAVEYARD) { amount = 10; } Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); diff --git a/Mage.Sets/src/mage/sets/darkascension/IncreasingVengeance.java b/Mage.Sets/src/mage/sets/darkascension/IncreasingVengeance.java index 32686961ecc..aa280e446bf 100644 --- a/Mage.Sets/src/mage/sets/darkascension/IncreasingVengeance.java +++ b/Mage.Sets/src/mage/sets/darkascension/IncreasingVengeance.java @@ -28,9 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; @@ -56,7 +55,7 @@ public class IncreasingVengeance extends CardImpl { filter.add(Predicates.or( new CardTypePredicate(CardType.INSTANT), new CardTypePredicate(CardType.SORCERY))); - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public IncreasingVengeance(UUID ownerId) { @@ -70,7 +69,7 @@ public class IncreasingVengeance extends CardImpl { this.getSpellAbility().addTarget(new TargetSpell(filter)); // Flashback {3}{R}{R} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{3}{R}{R}"), Constants.TimingRule.INSTANT)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{3}{R}{R}"), TimingRule.INSTANT)); } public IncreasingVengeance(final IncreasingVengeance card) { @@ -86,7 +85,7 @@ public class IncreasingVengeance extends CardImpl { class IncreasingVengeanceEffect extends OneShotEffect { public IncreasingVengeanceEffect() { - super(Constants.Outcome.BoostCreature); + super(Outcome.BoostCreature); staticText = "Copy target instant or sorcery spell you control. If Increasing Vengeance was cast from a graveyard, copy that spell twice instead. You may choose new targets for the copies"; } @@ -105,7 +104,7 @@ class IncreasingVengeanceEffect extends OneShotEffect copy.chooseNewTargets(game, source.getControllerId()); Spell sourceSpell = (Spell) game.getStack().getStackObject(source.getSourceId()); if (sourceSpell != null) { - if (sourceSpell.getFromZone() == Constants.Zone.GRAVEYARD) { + if (sourceSpell.getFromZone() == Zone.GRAVEYARD) { copy = spell.copySpell(); copy.setControllerId(source.getControllerId()); copy.setCopiedSpell(true); diff --git a/Mage.Sets/src/mage/sets/darkascension/JarOfEyeballs.java b/Mage.Sets/src/mage/sets/darkascension/JarOfEyeballs.java index a91199446cd..7f026ea6e81 100644 --- a/Mage.Sets/src/mage/sets/darkascension/JarOfEyeballs.java +++ b/Mage.Sets/src/mage/sets/darkascension/JarOfEyeballs.java @@ -28,10 +28,10 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/KessigRecluse.java b/Mage.Sets/src/mage/sets/darkascension/KessigRecluse.java index abcbe447d89..ff35e65428d 100644 --- a/Mage.Sets/src/mage/sets/darkascension/KessigRecluse.java +++ b/Mage.Sets/src/mage/sets/darkascension/KessigRecluse.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.abilities.keyword.DeathtouchAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/KrallenhordeKiller.java b/Mage.Sets/src/mage/sets/darkascension/KrallenhordeKiller.java index e20f9266ac1..64a4e4ffd3b 100644 --- a/Mage.Sets/src/mage/sets/darkascension/KrallenhordeKiller.java +++ b/Mage.Sets/src/mage/sets/darkascension/KrallenhordeKiller.java @@ -29,9 +29,7 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.ActivateOncePerTurnActivatedAbility; @@ -62,10 +60,10 @@ public class KrallenhordeKiller extends CardImpl { this.canTransform = true; // {3}{G}: Krallenhorde Killer gets +4/+4 until end of turn. Activate this ability only once each turn. - this.addAbility(new ActivateOncePerTurnActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(4, 4, Constants.Duration.EndOfTurn), new ManaCostsImpl("{3}{G}"))); + this.addAbility(new ActivateOncePerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(4, 4, Duration.EndOfTurn), new ManaCostsImpl("{3}{G}"))); // At the beginning of each upkeep, if a player cast two or more spells last turn, transform Krallenhorde Killer. - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), Constants.TargetController.ANY, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), TargetController.ANY, false); this.addAbility(new ConditionalTriggeredAbility(ability, TwoOrMoreSpellsWereCastLastTurnCondition.getInstance(), TransformAbility.TWO_OR_MORE_SPELLS_TRANSFORM_RULE)); } diff --git a/Mage.Sets/src/mage/sets/darkascension/LambholtElder.java b/Mage.Sets/src/mage/sets/darkascension/LambholtElder.java index 58654834a56..fb0e45cd82a 100644 --- a/Mage.Sets/src/mage/sets/darkascension/LambholtElder.java +++ b/Mage.Sets/src/mage/sets/darkascension/LambholtElder.java @@ -29,9 +29,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -40,6 +39,7 @@ import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; /** * @@ -62,7 +62,7 @@ public class LambholtElder extends CardImpl { // At the beginning of each upkeep, if no spells were cast last turn, transform Lambholt Elder. this.addAbility(new TransformAbility()); - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), Constants.TargetController.ANY, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), TargetController.ANY, false); this.addAbility(new ConditionalTriggeredAbility(ability, NoSpellsWereCastLastTurnCondition.getInstance(), TransformAbility.NO_SPELLS_TRANSFORM_RULE)); } diff --git a/Mage.Sets/src/mage/sets/darkascension/LingeringSouls.java b/Mage.Sets/src/mage/sets/darkascension/LingeringSouls.java index c170ed7cfe0..8af1195cc4e 100644 --- a/Mage.Sets/src/mage/sets/darkascension/LingeringSouls.java +++ b/Mage.Sets/src/mage/sets/darkascension/LingeringSouls.java @@ -29,13 +29,13 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; +import mage.constants.TimingRule; import mage.game.permanent.token.SpiritWhiteToken; /** @@ -53,7 +53,7 @@ public class LingeringSouls extends CardImpl { // Put two 1/1 white Spirit creature tokens with flying onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new SpiritWhiteToken(), 2)); // Flashback {1}{B} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{1}{B}"), Constants.TimingRule.SORCERY)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{1}{B}"), TimingRule.SORCERY)); } public LingeringSouls(final LingeringSouls card) { diff --git a/Mage.Sets/src/mage/sets/darkascension/LostInTheWoods.java b/Mage.Sets/src/mage/sets/darkascension/LostInTheWoods.java index d5f076aea98..9ff6e7fc766 100644 --- a/Mage.Sets/src/mage/sets/darkascension/LostInTheWoods.java +++ b/Mage.Sets/src/mage/sets/darkascension/LostInTheWoods.java @@ -27,10 +27,9 @@ */ package mage.sets.darkascension; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.OneShotEffect; @@ -38,6 +37,7 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -102,7 +102,7 @@ class LostInTheWoodsEffect extends OneShotEffect { permanent.removeFromCombat(game); } } - card.moveToZone(Constants.Zone.LIBRARY, source.getId(), game, false); + card.moveToZone(Zone.LIBRARY, source.getId(), game, false); return true; } } @@ -119,7 +119,7 @@ class LostInTheWoodsEffect extends OneShotEffect { class LostInTheWoodsTriggeredAbility extends TriggeredAbilityImpl { public LostInTheWoodsTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new LostInTheWoodsEffect(), false); + super(Zone.BATTLEFIELD, new LostInTheWoodsEffect(), false); } public LostInTheWoodsTriggeredAbility(final LostInTheWoodsTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/darkascension/LoyalCathar.java b/Mage.Sets/src/mage/sets/darkascension/LoyalCathar.java index d5814bcc7ed..1eacda3c1e4 100644 --- a/Mage.Sets/src/mage/sets/darkascension/LoyalCathar.java +++ b/Mage.Sets/src/mage/sets/darkascension/LoyalCathar.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -40,6 +40,8 @@ import mage.abilities.keyword.TransformAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; @@ -84,7 +86,7 @@ class LoyalCatharEffect extends OneShotEffect { private static final String effectText = "return it to the battlefield transformed under your control at the beginning of the next end step"; LoyalCatharEffect ( ) { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = effectText; } @@ -114,7 +116,7 @@ class ReturnLoyalCatharEffect extends OneShotEffect { private UUID cardId; public ReturnLoyalCatharEffect(UUID cardId) { - super(Constants.Outcome.PutCardInPlay); + super(Outcome.PutCardInPlay); this.cardId = cardId; this.staticText = "return it to the battlefield transformed under your control"; } @@ -133,7 +135,7 @@ class ReturnLoyalCatharEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Card card = game.getCard(cardId); if (card != null) { - card.putOntoBattlefield(game, Constants.Zone.GRAVEYARD, source.getSourceId(), source.getControllerId()); + card.putOntoBattlefield(game, Zone.GRAVEYARD, source.getSourceId(), source.getControllerId()); Permanent perm = game.getPermanent(cardId); if (perm != null && perm.canTransform()) { perm.transform(game); diff --git a/Mage.Sets/src/mage/sets/darkascension/MarkovBlademaster.java b/Mage.Sets/src/mage/sets/darkascension/MarkovBlademaster.java index 1a1a3dce826..b24c2016ff7 100644 --- a/Mage.Sets/src/mage/sets/darkascension/MarkovBlademaster.java +++ b/Mage.Sets/src/mage/sets/darkascension/MarkovBlademaster.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/darkascension/MarkovWarlord.java b/Mage.Sets/src/mage/sets/darkascension/MarkovWarlord.java index 28d61ca6d52..a6d843fff2c 100644 --- a/Mage.Sets/src/mage/sets/darkascension/MarkovWarlord.java +++ b/Mage.Sets/src/mage/sets/darkascension/MarkovWarlord.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.common.CantBlockTargetEffect; diff --git a/Mage.Sets/src/mage/sets/darkascension/MarkovsServant.java b/Mage.Sets/src/mage/sets/darkascension/MarkovsServant.java index 5e4c2d45f71..773eb1b796d 100644 --- a/Mage.Sets/src/mage/sets/darkascension/MarkovsServant.java +++ b/Mage.Sets/src/mage/sets/darkascension/MarkovsServant.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/darkascension/MidnightGuard.java b/Mage.Sets/src/mage/sets/darkascension/MidnightGuard.java index 771fc8a2025..afda9800279 100644 --- a/Mage.Sets/src/mage/sets/darkascension/MidnightGuard.java +++ b/Mage.Sets/src/mage/sets/darkascension/MidnightGuard.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.effects.common.UntapSourceEffect; diff --git a/Mage.Sets/src/mage/sets/darkascension/MikaeusTheUnhallowed.java b/Mage.Sets/src/mage/sets/darkascension/MikaeusTheUnhallowed.java index c256c3c561d..702d684abb6 100644 --- a/Mage.Sets/src/mage/sets/darkascension/MikaeusTheUnhallowed.java +++ b/Mage.Sets/src/mage/sets/darkascension/MikaeusTheUnhallowed.java @@ -28,10 +28,10 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/MondronenShaman.java b/Mage.Sets/src/mage/sets/darkascension/MondronenShaman.java index 5588fe29527..58e5136d1c4 100644 --- a/Mage.Sets/src/mage/sets/darkascension/MondronenShaman.java +++ b/Mage.Sets/src/mage/sets/darkascension/MondronenShaman.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/MoonscarredWerewolf.java b/Mage.Sets/src/mage/sets/darkascension/MoonscarredWerewolf.java index f2e20df4473..0c5ad251f5d 100644 --- a/Mage.Sets/src/mage/sets/darkascension/MoonscarredWerewolf.java +++ b/Mage.Sets/src/mage/sets/darkascension/MoonscarredWerewolf.java @@ -28,10 +28,10 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.Mana; import mage.abilities.TriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/MoonveilDragon.java b/Mage.Sets/src/mage/sets/darkascension/MoonveilDragon.java index c4e988ba0fb..fcee2946dcb 100644 --- a/Mage.Sets/src/mage/sets/darkascension/MoonveilDragon.java +++ b/Mage.Sets/src/mage/sets/darkascension/MoonveilDragon.java @@ -29,9 +29,7 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -56,7 +54,7 @@ public class MoonveilDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {R}: Each creature you control gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); } public MoonveilDragon(final MoonveilDragon card) { diff --git a/Mage.Sets/src/mage/sets/darkascension/MysticRetrieval.java b/Mage.Sets/src/mage/sets/darkascension/MysticRetrieval.java index ac8e101a3ef..6de96b99c70 100644 --- a/Mage.Sets/src/mage/sets/darkascension/MysticRetrieval.java +++ b/Mage.Sets/src/mage/sets/darkascension/MysticRetrieval.java @@ -29,13 +29,13 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; +import mage.constants.TimingRule; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -64,7 +64,7 @@ public class MysticRetrieval extends CardImpl { this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(filter)); // Flashback {2}{R} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{2}{R}"), Constants.TimingRule.SORCERY)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{2}{R}"), TimingRule.SORCERY)); } public MysticRetrieval(final MysticRetrieval card) { diff --git a/Mage.Sets/src/mage/sets/darkascension/NearheathStalker.java b/Mage.Sets/src/mage/sets/darkascension/NearheathStalker.java index 9a660714d51..8372ff42e99 100644 --- a/Mage.Sets/src/mage/sets/darkascension/NearheathStalker.java +++ b/Mage.Sets/src/mage/sets/darkascension/NearheathStalker.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.UndyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/darkascension/NephaliaSeakite.java b/Mage.Sets/src/mage/sets/darkascension/NephaliaSeakite.java index eb55ea7dc53..a9f3aaac214 100644 --- a/Mage.Sets/src/mage/sets/darkascension/NephaliaSeakite.java +++ b/Mage.Sets/src/mage/sets/darkascension/NephaliaSeakite.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/NiblisOfTheBreath.java b/Mage.Sets/src/mage/sets/darkascension/NiblisOfTheBreath.java index 4edfebe5579..da7d0e8ab2f 100644 --- a/Mage.Sets/src/mage/sets/darkascension/NiblisOfTheBreath.java +++ b/Mage.Sets/src/mage/sets/darkascension/NiblisOfTheBreath.java @@ -29,9 +29,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.MayTapOrUntapTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -59,7 +60,7 @@ public class NiblisOfTheBreath extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {U}, {tap}: You may tap or untap target creature. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.U)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/darkascension/NiblisOfTheMist.java b/Mage.Sets/src/mage/sets/darkascension/NiblisOfTheMist.java index bfe08709b70..912b5cbafa4 100644 --- a/Mage.Sets/src/mage/sets/darkascension/NiblisOfTheMist.java +++ b/Mage.Sets/src/mage/sets/darkascension/NiblisOfTheMist.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/NiblisOfTheUrn.java b/Mage.Sets/src/mage/sets/darkascension/NiblisOfTheUrn.java index 398c7616790..4f3ee8b9f9c 100644 --- a/Mage.Sets/src/mage/sets/darkascension/NiblisOfTheUrn.java +++ b/Mage.Sets/src/mage/sets/darkascension/NiblisOfTheUrn.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/PredatorOoze.java b/Mage.Sets/src/mage/sets/darkascension/PredatorOoze.java index b513014e7b4..33954d213a9 100644 --- a/Mage.Sets/src/mage/sets/darkascension/PredatorOoze.java +++ b/Mage.Sets/src/mage/sets/darkascension/PredatorOoze.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.DiesAndDealtDamageThisTurnTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/PyreheartWolf.java b/Mage.Sets/src/mage/sets/darkascension/PyreheartWolf.java index 017f24cc7a4..89fb353f497 100644 --- a/Mage.Sets/src/mage/sets/darkascension/PyreheartWolf.java +++ b/Mage.Sets/src/mage/sets/darkascension/PyreheartWolf.java @@ -28,10 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -77,7 +75,7 @@ public class PyreheartWolf extends CardImpl { class PyreheartWolfEffect extends OneShotEffect { public PyreheartWolfEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); this.staticText = "creatures you control can't be blocked except by two or more creatures until end of turn"; } @@ -96,7 +94,7 @@ class PyreheartWolfEffect extends OneShotEffect { FilterCreaturePermanent filter = new FilterCreaturePermanent(); for (Permanent perm: game.getBattlefield().getAllActivePermanents(filter, source.getControllerId(), game)) { CantBeBlockedByOneEffect effect = new CantBeBlockedByOneEffect(2, Duration.EndOfTurn); - SimpleStaticAbility ability = new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect); + SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); perm.addAbility(ability, game); } return false; diff --git a/Mage.Sets/src/mage/sets/darkascension/RavagerOfTheFells.java b/Mage.Sets/src/mage/sets/darkascension/RavagerOfTheFells.java index 91fa4e24c20..dcbf918aa03 100644 --- a/Mage.Sets/src/mage/sets/darkascension/RavagerOfTheFells.java +++ b/Mage.Sets/src/mage/sets/darkascension/RavagerOfTheFells.java @@ -27,9 +27,8 @@ */ package mage.sets.darkascension; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -41,6 +40,8 @@ import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TrampleAbility; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; +import mage.constants.Zone; import java.util.UUID; @@ -67,10 +68,10 @@ public class RavagerOfTheFells extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Whenever this creature transforms into Ravager of the Fells, it deals 2 damage to target opponent and 2 damage to up to one target creature that player controls. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new EmptyEffect(rule))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EmptyEffect(rule))); // At the beginning of each upkeep, if a player cast two or more spells last turn, transform Ravager of the Fells. - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), Constants.TargetController.ANY, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), TargetController.ANY, false); this.addAbility(new ConditionalTriggeredAbility(ability, TwoOrMoreSpellsWereCastLastTurnCondition.getInstance(), TransformAbility.TWO_OR_MORE_SPELLS_TRANSFORM_RULE)); } diff --git a/Mage.Sets/src/mage/sets/darkascension/RavenousDemon.java b/Mage.Sets/src/mage/sets/darkascension/RavenousDemon.java index 88153c71aa3..881fecf4ae4 100644 --- a/Mage.Sets/src/mage/sets/darkascension/RavenousDemon.java +++ b/Mage.Sets/src/mage/sets/darkascension/RavenousDemon.java @@ -28,15 +28,16 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.ActivateAsSorceryActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; @@ -66,7 +67,7 @@ public class RavenousDemon extends CardImpl { // Sacrifice a Human: Transform Ravenous Demon. Activate this ability only any time you could cast a sorcery. this.addAbility(new TransformAbility()); - this.addAbility(new ActivateAsSorceryActivatedAbility(Constants.Zone.BATTLEFIELD, new TransformSourceEffect(true), new SacrificeTargetCost(new TargetControlledPermanent(filter)))); + this.addAbility(new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(true), new SacrificeTargetCost(new TargetControlledPermanent(filter)))); } public RavenousDemon(final RavenousDemon card) { diff --git a/Mage.Sets/src/mage/sets/darkascension/RayOfRevelation.java b/Mage.Sets/src/mage/sets/darkascension/RayOfRevelation.java index 15bd3eb1302..68bb76ed9ee 100644 --- a/Mage.Sets/src/mage/sets/darkascension/RayOfRevelation.java +++ b/Mage.Sets/src/mage/sets/darkascension/RayOfRevelation.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TimingRule; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TimingRule; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.FlashbackAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/ReapTheSeagraf.java b/Mage.Sets/src/mage/sets/darkascension/ReapTheSeagraf.java index 1b9cadb592f..35aa537a624 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ReapTheSeagraf.java +++ b/Mage.Sets/src/mage/sets/darkascension/ReapTheSeagraf.java @@ -1,10 +1,12 @@ package mage.sets.darkascension; -import mage.Constants; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TimingRule; import mage.game.permanent.token.ZombieToken; import java.util.UUID; @@ -15,13 +17,13 @@ import java.util.UUID; public class ReapTheSeagraf extends CardImpl { public ReapTheSeagraf(UUID ownerId) { - super(ownerId, 72, "Reap the Seagraf", Constants.Rarity.COMMON, new Constants.CardType[]{Constants.CardType.SORCERY}, "{2}{B}"); + super(ownerId, 72, "Reap the Seagraf", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{B}"); this.expansionSetCode = "DKA"; this.color.setBlack(true); this.getSpellAbility().addEffect(new CreateTokenEffect(new ZombieToken())); - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{4}{U}"), Constants.TimingRule.SORCERY)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{4}{U}"), TimingRule.SORCERY)); } public ReapTheSeagraf(final ReapTheSeagraf card) { diff --git a/Mage.Sets/src/mage/sets/darkascension/RelentlessSkaabs.java b/Mage.Sets/src/mage/sets/darkascension/RelentlessSkaabs.java index f740282dbfa..9c35c2b0266 100644 --- a/Mage.Sets/src/mage/sets/darkascension/RelentlessSkaabs.java +++ b/Mage.Sets/src/mage/sets/darkascension/RelentlessSkaabs.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.common.ExileFromGraveCost; import mage.abilities.keyword.UndyingAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/RequiemAngel.java b/Mage.Sets/src/mage/sets/darkascension/RequiemAngel.java index 4b56665db9c..7bb21821ca2 100644 --- a/Mage.Sets/src/mage/sets/darkascension/RequiemAngel.java +++ b/Mage.Sets/src/mage/sets/darkascension/RequiemAngel.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/darkascension/RussetWolves.java b/Mage.Sets/src/mage/sets/darkascension/RussetWolves.java index afda92c161b..1f5c9aaa034 100644 --- a/Mage.Sets/src/mage/sets/darkascension/RussetWolves.java +++ b/Mage.Sets/src/mage/sets/darkascension/RussetWolves.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/darkascension/SanctuaryCat.java b/Mage.Sets/src/mage/sets/darkascension/SanctuaryCat.java index 5eaa9dd50d3..73c3c64cf81 100644 --- a/Mage.Sets/src/mage/sets/darkascension/SanctuaryCat.java +++ b/Mage.Sets/src/mage/sets/darkascension/SanctuaryCat.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/darkascension/SavingGrasp.java b/Mage.Sets/src/mage/sets/darkascension/SavingGrasp.java index 22f6ba326f5..f433a5396b4 100644 --- a/Mage.Sets/src/mage/sets/darkascension/SavingGrasp.java +++ b/Mage.Sets/src/mage/sets/darkascension/SavingGrasp.java @@ -28,14 +28,15 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TimingRule; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TimingRule; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.other.OwnerPredicate; import mage.target.common.TargetCreaturePermanent; @@ -49,7 +50,7 @@ public class SavingGrasp extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you own"); static { - filter.add(new OwnerPredicate(Constants.TargetController.YOU)); + filter.add(new OwnerPredicate(TargetController.YOU)); } public SavingGrasp(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/darkascension/ScorchTheFields.java b/Mage.Sets/src/mage/sets/darkascension/ScorchTheFields.java index 817d417cd73..77740f51198 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ScorchTheFields.java +++ b/Mage.Sets/src/mage/sets/darkascension/ScorchTheFields.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/darkascension/ScornedVillager.java b/Mage.Sets/src/mage/sets/darkascension/ScornedVillager.java index 15b9595ece7..ca4fb68f2dc 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ScornedVillager.java +++ b/Mage.Sets/src/mage/sets/darkascension/ScornedVillager.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/ScreechingSkaab.java b/Mage.Sets/src/mage/sets/darkascension/ScreechingSkaab.java index de10812ec62..595b40e3ed6 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ScreechingSkaab.java +++ b/Mage.Sets/src/mage/sets/darkascension/ScreechingSkaab.java @@ -28,19 +28,13 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.PutTopCardOfYourLibraryIntoGraveEffect; -import mage.cards.Card; import mage.cards.CardImpl; -import mage.game.Game; -import mage.players.Player; /** * diff --git a/Mage.Sets/src/mage/sets/darkascension/Seance.java b/Mage.Sets/src/mage/sets/darkascension/Seance.java index 48c309cb87f..ee32b893f6e 100644 --- a/Mage.Sets/src/mage/sets/darkascension/Seance.java +++ b/Mage.Sets/src/mage/sets/darkascension/Seance.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -39,6 +39,8 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.sets.tokens.EmptyToken; @@ -59,7 +61,7 @@ public class Seance extends CardImpl { this.color.setWhite(true); // At the beginning of each upkeep, you may exile target creature card from your graveyard. If you do, put a token onto the battlefield that's a copy of that card except it's a Spirit in addition to its other types. Exile it at the beginning of the next end step. - Ability ability = new BeginningOfUpkeepTriggeredAbility(new SeanceEffect(), Constants.TargetController.ANY, true); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new SeanceEffect(), TargetController.ANY, true); ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard())); this.addAbility(ability); } @@ -77,7 +79,7 @@ public class Seance extends CardImpl { class SeanceEffect extends OneShotEffect { public SeanceEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); this.staticText = "put a token onto the battlefield that's a copy of that card except it's a Spirit in addition to its other types. Exile it at the beginning of the next end step"; } diff --git a/Mage.Sets/src/mage/sets/darkascension/SecretsOfTheDead.java b/Mage.Sets/src/mage/sets/darkascension/SecretsOfTheDead.java index 2be6e88de90..ec05a0b5927 100644 --- a/Mage.Sets/src/mage/sets/darkascension/SecretsOfTheDead.java +++ b/Mage.Sets/src/mage/sets/darkascension/SecretsOfTheDead.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/darkascension/ShatteredPerception.java b/Mage.Sets/src/mage/sets/darkascension/ShatteredPerception.java index cdd511ff691..a831944e38b 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ShatteredPerception.java +++ b/Mage.Sets/src/mage/sets/darkascension/ShatteredPerception.java @@ -29,10 +29,10 @@ package mage.sets.darkascension; import java.util.Set; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TimingRule; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TimingRule; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/darkascension/Shriekgeist.java b/Mage.Sets/src/mage/sets/darkascension/Shriekgeist.java index 4ae5d2eb943..8da4db01b4a 100644 --- a/Mage.Sets/src/mage/sets/darkascension/Shriekgeist.java +++ b/Mage.Sets/src/mage/sets/darkascension/Shriekgeist.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; diff --git a/Mage.Sets/src/mage/sets/darkascension/SightlessGhoul.java b/Mage.Sets/src/mage/sets/darkascension/SightlessGhoul.java index 7bf59eb550a..7d35a1e0dac 100644 --- a/Mage.Sets/src/mage/sets/darkascension/SightlessGhoul.java +++ b/Mage.Sets/src/mage/sets/darkascension/SightlessGhoul.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.abilities.keyword.UndyingAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/SilverclawGriffin.java b/Mage.Sets/src/mage/sets/darkascension/SilverclawGriffin.java index 494d367a500..5c135a1a176 100644 --- a/Mage.Sets/src/mage/sets/darkascension/SilverclawGriffin.java +++ b/Mage.Sets/src/mage/sets/darkascension/SilverclawGriffin.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/SilverpeltWerewolf.java b/Mage.Sets/src/mage/sets/darkascension/SilverpeltWerewolf.java index e6a0060cf42..3b5a54377e0 100644 --- a/Mage.Sets/src/mage/sets/darkascension/SilverpeltWerewolf.java +++ b/Mage.Sets/src/mage/sets/darkascension/SilverpeltWerewolf.java @@ -29,9 +29,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -42,6 +41,7 @@ import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; /** * @@ -64,7 +64,7 @@ public class SilverpeltWerewolf extends CardImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DrawCardControllerEffect(1), false)); // At the beginning of each upkeep, if a player cast two or more spells last turn, transform Silverpelt Werewolf. - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), Constants.TargetController.ANY, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), TargetController.ANY, false); this.addAbility(new ConditionalTriggeredAbility(ability, TwoOrMoreSpellsWereCastLastTurnCondition.getInstance(), TransformAbility.TWO_OR_MORE_SPELLS_TRANSFORM_RULE)); } diff --git a/Mage.Sets/src/mage/sets/darkascension/SkillfulLunge.java b/Mage.Sets/src/mage/sets/darkascension/SkillfulLunge.java index 7b6b13f833a..6d4044c0d8c 100644 --- a/Mage.Sets/src/mage/sets/darkascension/SkillfulLunge.java +++ b/Mage.Sets/src/mage/sets/darkascension/SkillfulLunge.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/SkirsdagFlayer.java b/Mage.Sets/src/mage/sets/darkascension/SkirsdagFlayer.java index 11f32edef21..34efc8c3797 100644 --- a/Mage.Sets/src/mage/sets/darkascension/SkirsdagFlayer.java +++ b/Mage.Sets/src/mage/sets/darkascension/SkirsdagFlayer.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/SomberwaldDryad.java b/Mage.Sets/src/mage/sets/darkascension/SomberwaldDryad.java index 8eb78c90fef..b78809ce6d7 100644 --- a/Mage.Sets/src/mage/sets/darkascension/SomberwaldDryad.java +++ b/Mage.Sets/src/mage/sets/darkascension/SomberwaldDryad.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ForestwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/darkascension/SorinLordOfInnistrad.java b/Mage.Sets/src/mage/sets/darkascension/SorinLordOfInnistrad.java index 848c21dbaa8..d307ac4f6d2 100644 --- a/Mage.Sets/src/mage/sets/darkascension/SorinLordOfInnistrad.java +++ b/Mage.Sets/src/mage/sets/darkascension/SorinLordOfInnistrad.java @@ -27,11 +27,10 @@ */ package mage.sets.darkascension; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; @@ -45,6 +44,7 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.LifelinkAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; @@ -107,7 +107,7 @@ public class SorinLordOfInnistrad extends CardImpl { class VampireToken extends Token { VampireToken() { super("Vampire", "a 1/1 black Vampire creature token with lifelink"); - cardType.add(Constants.CardType.CREATURE); + cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add("Vampire"); power = new MageInt(1); @@ -128,7 +128,7 @@ class SorinEmblem extends Emblem { class SorinLordOfInnistradEffect extends OneShotEffect { public SorinLordOfInnistradEffect() { - super(Constants.Outcome.Sacrifice); + super(Outcome.Sacrifice); this.staticText = "Destroy up to three target creatures and/or other planeswalkers. Return each card put into a graveyard this way to the battlefield under your control"; } diff --git a/Mage.Sets/src/mage/sets/darkascension/SoulSeizer.java b/Mage.Sets/src/mage/sets/darkascension/SoulSeizer.java index f4ea379c3a5..084ea969c63 100644 --- a/Mage.Sets/src/mage/sets/darkascension/SoulSeizer.java +++ b/Mage.Sets/src/mage/sets/darkascension/SoulSeizer.java @@ -28,10 +28,10 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -39,6 +39,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; @@ -86,7 +87,7 @@ public class SoulSeizer extends CardImpl { class SoulSeizerTriggeredAbility extends TriggeredAbilityImpl { public SoulSeizerTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new SoulSeizerEffect(), true); + super(Zone.BATTLEFIELD, new SoulSeizerEffect(), true); } public SoulSeizerTriggeredAbility(SoulSeizerTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/darkascension/SpitefulShadows.java b/Mage.Sets/src/mage/sets/darkascension/SpitefulShadows.java index 203c9f8b127..6d01b47a790 100644 --- a/Mage.Sets/src/mage/sets/darkascension/SpitefulShadows.java +++ b/Mage.Sets/src/mage/sets/darkascension/SpitefulShadows.java @@ -28,10 +28,10 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/darkascension/StormboundGeist.java b/Mage.Sets/src/mage/sets/darkascension/StormboundGeist.java index d2bf3af6fa2..6f0dcaf33b8 100644 --- a/Mage.Sets/src/mage/sets/darkascension/StormboundGeist.java +++ b/Mage.Sets/src/mage/sets/darkascension/StormboundGeist.java @@ -29,15 +29,15 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.CanBlockOnlyFlyingEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.UndyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @author Loki @@ -55,7 +55,7 @@ public class StormboundGeist extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Stormbound Geist can block only creatures with flying. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new CanBlockOnlyFlyingEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockOnlyFlyingEffect())); // Undying this.addAbility(new UndyingAbility()); } diff --git a/Mage.Sets/src/mage/sets/darkascension/StranglerootGeist.java b/Mage.Sets/src/mage/sets/darkascension/StranglerootGeist.java index edfda9d5039..001568082ea 100644 --- a/Mage.Sets/src/mage/sets/darkascension/StranglerootGeist.java +++ b/Mage.Sets/src/mage/sets/darkascension/StranglerootGeist.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.UndyingAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/StromkirkCaptain.java b/Mage.Sets/src/mage/sets/darkascension/StromkirkCaptain.java index df1b768a3f1..fa11ac2a9cd 100644 --- a/Mage.Sets/src/mage/sets/darkascension/StromkirkCaptain.java +++ b/Mage.Sets/src/mage/sets/darkascension/StromkirkCaptain.java @@ -29,15 +29,16 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -65,8 +66,8 @@ public class StromkirkCaptain extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // Other Vampire creatures you control get +1/+1 and have first strike. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Constants.Duration.WhileOnBattlefield, filter, true))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Constants.Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, true))); } public StromkirkCaptain(final StromkirkCaptain card) { diff --git a/Mage.Sets/src/mage/sets/darkascension/SuddenDisappearance.java b/Mage.Sets/src/mage/sets/darkascension/SuddenDisappearance.java index f0e2f6221a2..24dd840a691 100644 --- a/Mage.Sets/src/mage/sets/darkascension/SuddenDisappearance.java +++ b/Mage.Sets/src/mage/sets/darkascension/SuddenDisappearance.java @@ -27,15 +27,15 @@ */ package mage.sets.darkascension; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.delayed.AtEndOfTurnDelayedTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ReturnFromExileEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterNonlandPermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -91,7 +91,7 @@ class SuddenDisappearanceEffect extends OneShotEffect for (Permanent permanent: game.getBattlefield().getAllActivePermanents(filter, source.getFirstTarget(), game)) { permanent.moveToExile(source.getSourceId(), "Sudden Disappearance", source.getSourceId(), game); } - AtEndOfTurnDelayedTriggeredAbility delayedAbility = new AtEndOfTurnDelayedTriggeredAbility(new ReturnFromExileEffect(source.getSourceId(), Constants.Zone.BATTLEFIELD)); + AtEndOfTurnDelayedTriggeredAbility delayedAbility = new AtEndOfTurnDelayedTriggeredAbility(new ReturnFromExileEffect(source.getSourceId(), Zone.BATTLEFIELD)); delayedAbility.setSourceId(source.getSourceId()); delayedAbility.setControllerId(source.getControllerId()); game.addDelayedTriggeredAbility(delayedAbility); diff --git a/Mage.Sets/src/mage/sets/darkascension/TalonsOfFalkenrath.java b/Mage.Sets/src/mage/sets/darkascension/TalonsOfFalkenrath.java index cd1d167f307..319910b6cf8 100644 --- a/Mage.Sets/src/mage/sets/darkascension/TalonsOfFalkenrath.java +++ b/Mage.Sets/src/mage/sets/darkascension/TalonsOfFalkenrath.java @@ -28,12 +28,12 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/darkascension/ThaliaGuardianOfThraben.java b/Mage.Sets/src/mage/sets/darkascension/ThaliaGuardianOfThraben.java index f752a82b7d4..9320409a2e4 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ThaliaGuardianOfThraben.java +++ b/Mage.Sets/src/mage/sets/darkascension/ThaliaGuardianOfThraben.java @@ -27,9 +27,7 @@ */ package mage.sets.darkascension; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -65,7 +63,7 @@ public class ThaliaGuardianOfThraben extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // Noncreature spells cost {1} more to cast. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ThaliaGuardianOfThrabenCostReductionEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ThaliaGuardianOfThrabenCostReductionEffect())); } @@ -82,7 +80,7 @@ public class ThaliaGuardianOfThraben extends CardImpl { class ThaliaGuardianOfThrabenCostReductionEffect extends CostModificationEffectImpl { ThaliaGuardianOfThrabenCostReductionEffect ( ) { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "Noncreature spells cost {1} more to cast"; } diff --git a/Mage.Sets/src/mage/sets/darkascension/ThoughtScour.java b/Mage.Sets/src/mage/sets/darkascension/ThoughtScour.java index bac0a547a5e..f18f7b47bf1 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ThoughtScour.java +++ b/Mage.Sets/src/mage/sets/darkascension/ThoughtScour.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/darkascension/ThrabenDoomsayer.java b/Mage.Sets/src/mage/sets/darkascension/ThrabenDoomsayer.java index 52dc7a1d024..3e337723fa6 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ThrabenDoomsayer.java +++ b/Mage.Sets/src/mage/sets/darkascension/ThrabenDoomsayer.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +40,8 @@ import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -58,9 +60,9 @@ public class ThrabenDoomsayer extends CardImpl { this.toughness = new MageInt(2); // {tap}: Put a 1/1 white Human creature token onto the battlefield. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new HumanToken()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HumanToken()), new TapSourceCost())); // Fateful hour - As long as you have 5 or less life, other creatures you control get +2/+2. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostControlledEffect(2, 2, Constants.Duration.WhileOnBattlefield, false), + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, false), FatefulHourCondition.getInstance(), "As long as you have 5 or less life, other creatures you control get +2/+2"))); } diff --git a/Mage.Sets/src/mage/sets/darkascension/ThrabenHeretic.java b/Mage.Sets/src/mage/sets/darkascension/ThrabenHeretic.java index 6540efee4a9..c71a8a0ea42 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ThrabenHeretic.java +++ b/Mage.Sets/src/mage/sets/darkascension/ThrabenHeretic.java @@ -29,15 +29,15 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInGraveyard; @@ -58,7 +58,7 @@ public class ThrabenHeretic extends CardImpl { this.toughness = new MageInt(2); // {tap}: Exile target creature card from a graveyard. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ExileTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCardInGraveyard(new FilterCreatureCard("creature card from a graveyard"))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/TorchFiend.java b/Mage.Sets/src/mage/sets/darkascension/TorchFiend.java index 511ebf62be9..4384311c998 100644 --- a/Mage.Sets/src/mage/sets/darkascension/TorchFiend.java +++ b/Mage.Sets/src/mage/sets/darkascension/TorchFiend.java @@ -29,9 +29,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.target.common.TargetArtifactPermanent; /** @@ -57,7 +58,7 @@ public class TorchFiend extends CardImpl { this.toughness = new MageInt(1); // {R}, Sacrifice Torch Fiend: Destroy target artifact. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/darkascension/TovolarsMagehunter.java b/Mage.Sets/src/mage/sets/darkascension/TovolarsMagehunter.java index 881394de100..89eb59c79de 100644 --- a/Mage.Sets/src/mage/sets/darkascension/TovolarsMagehunter.java +++ b/Mage.Sets/src/mage/sets/darkascension/TovolarsMagehunter.java @@ -28,10 +28,10 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage.Sets/src/mage/sets/darkascension/TowerGeist.java b/Mage.Sets/src/mage/sets/darkascension/TowerGeist.java index d5061226970..34684f43c80 100644 --- a/Mage.Sets/src/mage/sets/darkascension/TowerGeist.java +++ b/Mage.Sets/src/mage/sets/darkascension/TowerGeist.java @@ -30,9 +30,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.StaticValue; diff --git a/Mage.Sets/src/mage/sets/darkascension/TrackersInstincts.java b/Mage.Sets/src/mage/sets/darkascension/TrackersInstincts.java index 20ceb5273e3..3e1363af84d 100644 --- a/Mage.Sets/src/mage/sets/darkascension/TrackersInstincts.java +++ b/Mage.Sets/src/mage/sets/darkascension/TrackersInstincts.java @@ -28,11 +28,11 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TimingRule; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TimingRule; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/darkascension/TragicSlip.java b/Mage.Sets/src/mage/sets/darkascension/TragicSlip.java index a9501f07fd0..21b0e0b246f 100644 --- a/Mage.Sets/src/mage/sets/darkascension/TragicSlip.java +++ b/Mage.Sets/src/mage/sets/darkascension/TragicSlip.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.condition.common.MorbidCondition; import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; diff --git a/Mage.Sets/src/mage/sets/darkascension/UlvenwaldBear.java b/Mage.Sets/src/mage/sets/darkascension/UlvenwaldBear.java index b7b0efd75d8..1048777d47a 100644 --- a/Mage.Sets/src/mage/sets/darkascension/UlvenwaldBear.java +++ b/Mage.Sets/src/mage/sets/darkascension/UlvenwaldBear.java @@ -29,9 +29,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -39,6 +38,7 @@ import mage.abilities.condition.common.MorbidCondition; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; @@ -58,7 +58,7 @@ public class UlvenwaldBear extends CardImpl { this.toughness = new MageInt(2); // Morbid - When Ulvenwald Bear enters the battlefield, if a creature died this turn, put two +1/+1 counters on target creature. - Ability ability = new ConditionalTriggeredAbility(new EntersBattlefieldTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance(2), Constants.Outcome.BoostCreature)), + Ability ability = new ConditionalTriggeredAbility(new EntersBattlefieldTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance(2), Outcome.BoostCreature)), MorbidCondition.getInstance(), "When {this} enters the battlefield, if a creature died this turn, put two +1/+1 counters on target creature."); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/darkascension/UndyingEvil.java b/Mage.Sets/src/mage/sets/darkascension/UndyingEvil.java index a253ad8f82c..e9f644d3d2f 100644 --- a/Mage.Sets/src/mage/sets/darkascension/UndyingEvil.java +++ b/Mage.Sets/src/mage/sets/darkascension/UndyingEvil.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.UndyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/darkascension/UnhallowedCathar.java b/Mage.Sets/src/mage/sets/darkascension/UnhallowedCathar.java index 6a987b0fe6b..c0b3fb72ad4 100644 --- a/Mage.Sets/src/mage/sets/darkascension/UnhallowedCathar.java +++ b/Mage.Sets/src/mage/sets/darkascension/UnhallowedCathar.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/darkascension/VaultOfTheArchangel.java b/Mage.Sets/src/mage/sets/darkascension/VaultOfTheArchangel.java index c0a6338e101..8539bcfe98c 100644 --- a/Mage.Sets/src/mage/sets/darkascension/VaultOfTheArchangel.java +++ b/Mage.Sets/src/mage/sets/darkascension/VaultOfTheArchangel.java @@ -28,10 +28,10 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/darkascension/VengefulVampire.java b/Mage.Sets/src/mage/sets/darkascension/VengefulVampire.java index e4b05443e1f..7b819d492ee 100644 --- a/Mage.Sets/src/mage/sets/darkascension/VengefulVampire.java +++ b/Mage.Sets/src/mage/sets/darkascension/VengefulVampire.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.UndyingAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/VillageSurvivors.java b/Mage.Sets/src/mage/sets/darkascension/VillageSurvivors.java index 517f96e8a25..cf4b27031be 100644 --- a/Mage.Sets/src/mage/sets/darkascension/VillageSurvivors.java +++ b/Mage.Sets/src/mage/sets/darkascension/VillageSurvivors.java @@ -29,10 +29,10 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MorbidCondition; diff --git a/Mage.Sets/src/mage/sets/darkascension/Vorapede.java b/Mage.Sets/src/mage/sets/darkascension/Vorapede.java index afcb3155fcb..e73c7491370 100644 --- a/Mage.Sets/src/mage/sets/darkascension/Vorapede.java +++ b/Mage.Sets/src/mage/sets/darkascension/Vorapede.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.abilities.keyword.UndyingAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/Wakedancer.java b/Mage.Sets/src/mage/sets/darkascension/Wakedancer.java index 8d2c0c1b505..487b63edc55 100644 --- a/Mage.Sets/src/mage/sets/darkascension/Wakedancer.java +++ b/Mage.Sets/src/mage/sets/darkascension/Wakedancer.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/darkascension/WardenOfTheWall.java b/Mage.Sets/src/mage/sets/darkascension/WardenOfTheWall.java index f7f586d2ab0..b3004f63b17 100644 --- a/Mage.Sets/src/mage/sets/darkascension/WardenOfTheWall.java +++ b/Mage.Sets/src/mage/sets/darkascension/WardenOfTheWall.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +40,8 @@ import mage.abilities.effects.common.continious.BecomesCreatureSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.permanent.token.Token; /** @@ -59,7 +61,7 @@ public class WardenOfTheWall extends CardImpl { this.addAbility(new ColorlessManaAbility()); // As long as it's not your turn, Warden of the Wall is a 2/3 Gargoyle artifact creature with flying. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ConditionalContinousEffect(new BecomesCreatureSourceEffect(new GargoyleToken(), "", Constants.Duration.WhileOnBattlefield), NotMyTurnCondition.getInstance(), "As long as it's not your turn, Warden of the Wall is a 2/3 Gargoyle artifact creature with flying"))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BecomesCreatureSourceEffect(new GargoyleToken(), "", Duration.WhileOnBattlefield), NotMyTurnCondition.getInstance(), "As long as it's not your turn, Warden of the Wall is a 2/3 Gargoyle artifact creature with flying"))); } public WardenOfTheWall(final WardenOfTheWall card) { diff --git a/Mage.Sets/src/mage/sets/darkascension/WerewolfRansacker.java b/Mage.Sets/src/mage/sets/darkascension/WerewolfRansacker.java index d222aabe273..605f26380cb 100644 --- a/Mage.Sets/src/mage/sets/darkascension/WerewolfRansacker.java +++ b/Mage.Sets/src/mage/sets/darkascension/WerewolfRansacker.java @@ -28,9 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; @@ -72,10 +71,10 @@ public class WerewolfRansacker extends CardImpl { this.toughness = new MageInt(4); // Whenever this creature transforms into Werewolf Ransacker, you may destroy target artifact. If that artifact is put into a graveyard this way, Werewolf Ransacker deals 3 damage to that artifact's controller. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new EmptyEffect(WerewolfRansackerAbility.RULE_TEXT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EmptyEffect(WerewolfRansackerAbility.RULE_TEXT))); // At the beginning of each upkeep, if a player cast two or more spells last turn, transform Werewolf Ransacker. - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), Constants.TargetController.ANY, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), TargetController.ANY, false); this.addAbility(new ConditionalTriggeredAbility(ability, TwoOrMoreSpellsWereCastLastTurnCondition.getInstance(), TransformAbility.TWO_OR_MORE_SPELLS_TRANSFORM_RULE)); } @@ -99,7 +98,7 @@ class WerewolfRansackerAbility extends TriggeredAbilityImpl { public WerewolfRansackerEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); } public WerewolfRansackerEffect(final WerewolfRansackerEffect effect) { @@ -157,7 +156,7 @@ class WerewolfRansackerEffect extends OneShotEffect { if (permanent != null) { if (permanent.destroy(source.getId(), game, false)) { affectedTargets++; - if (game.getState().getZone(permanent.getId()) == Constants.Zone.GRAVEYARD) { + if (game.getState().getZone(permanent.getId()) == Zone.GRAVEYARD) { Player player = game.getPlayer(permanent.getControllerId()); if (player != null) player.damage(3, source.getSourceId(), game, false, true); diff --git a/Mage.Sets/src/mage/sets/darkascension/WildHunger.java b/Mage.Sets/src/mage/sets/darkascension/WildHunger.java index 3840c9507d7..6d2b3033fa1 100644 --- a/Mage.Sets/src/mage/sets/darkascension/WildHunger.java +++ b/Mage.Sets/src/mage/sets/darkascension/WildHunger.java @@ -28,10 +28,10 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TimingRule; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TimingRule; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; diff --git a/Mage.Sets/src/mage/sets/darkascension/WithengarUnbound.java b/Mage.Sets/src/mage/sets/darkascension/WithengarUnbound.java index 389d2f8d27b..5eb19613aa2 100644 --- a/Mage.Sets/src/mage/sets/darkascension/WithengarUnbound.java +++ b/Mage.Sets/src/mage/sets/darkascension/WithengarUnbound.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -38,6 +38,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.IntimidateAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; @@ -82,7 +83,7 @@ public class WithengarUnbound extends CardImpl { class WithengarUnboundTriggeredAbility extends TriggeredAbilityImpl { public WithengarUnboundTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(13)), false); + super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(13)), false); } public WithengarUnboundTriggeredAbility(final WithengarUnboundTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/darkascension/WolfbittenCaptive.java b/Mage.Sets/src/mage/sets/darkascension/WolfbittenCaptive.java index 303ddd98e1f..84ab7fda3b9 100644 --- a/Mage.Sets/src/mage/sets/darkascension/WolfbittenCaptive.java +++ b/Mage.Sets/src/mage/sets/darkascension/WolfbittenCaptive.java @@ -29,9 +29,7 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.ActivateOncePerTurnActivatedAbility; @@ -64,11 +62,11 @@ public class WolfbittenCaptive extends CardImpl { this.secondSideCard = new KrallenhordeKiller(ownerId); // {1}{G}: Wolfbitten Captive gets +2/+2 until end of turn. Activate this ability only once each turn. - this.addAbility(new ActivateOncePerTurnActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Constants.Duration.EndOfTurn), new ManaCostsImpl("{1}{G}"))); + this.addAbility(new ActivateOncePerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("{1}{G}"))); // At the beginning of each upkeep, if no spells were cast last turn, transform Wolfbitten Captive. this.addAbility(new TransformAbility()); - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), Constants.TargetController.ANY, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), TargetController.ANY, false); this.addAbility(new ConditionalTriggeredAbility(ability, NoSpellsWereCastLastTurnCondition.getInstance(), TransformAbility.NO_SPELLS_TRANSFORM_RULE)); } diff --git a/Mage.Sets/src/mage/sets/darkascension/WolfhuntersQuiver.java b/Mage.Sets/src/mage/sets/darkascension/WolfhuntersQuiver.java index 5381b8fab1f..94d63ea9654 100644 --- a/Mage.Sets/src/mage/sets/darkascension/WolfhuntersQuiver.java +++ b/Mage.Sets/src/mage/sets/darkascension/WolfhuntersQuiver.java @@ -28,11 +28,11 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/darkascension/WrackWithMadness.java b/Mage.Sets/src/mage/sets/darkascension/WrackWithMadness.java index a9923cb850e..68e3dd69e2e 100644 --- a/Mage.Sets/src/mage/sets/darkascension/WrackWithMadness.java +++ b/Mage.Sets/src/mage/sets/darkascension/WrackWithMadness.java @@ -28,9 +28,9 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/darkascension/YoungWolf.java b/Mage.Sets/src/mage/sets/darkascension/YoungWolf.java index d7c5310375b..53afb8cfc0f 100644 --- a/Mage.Sets/src/mage/sets/darkascension/YoungWolf.java +++ b/Mage.Sets/src/mage/sets/darkascension/YoungWolf.java @@ -28,8 +28,8 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.UndyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/darkascension/ZombieApocalypse.java b/Mage.Sets/src/mage/sets/darkascension/ZombieApocalypse.java index 477f82908fb..f42e97ef9bf 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ZombieApocalypse.java +++ b/Mage.Sets/src/mage/sets/darkascension/ZombieApocalypse.java @@ -28,13 +28,15 @@ package mage.sets.darkascension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -79,7 +81,7 @@ class ZombieApocalypseEffect extends OneShotEffect { } public ZombieApocalypseEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); this.staticText = "Return all Zombie creature cards from your graveyard to the battlefield tapped, then destroy all Humans."; } @@ -98,7 +100,7 @@ class ZombieApocalypseEffect extends OneShotEffect { Player player = game.getPlayer(source.getControllerId()); for (Card card : player.getGraveyard().getCards(filterZombie, game)) { - card.putOntoBattlefield(game, Constants.Zone.GRAVEYARD, source.getId(), source.getControllerId()); + card.putOntoBattlefield(game, Zone.GRAVEYARD, source.getId(), source.getControllerId()); Permanent permanent = game.getPermanent(card.getId()); if (permanent != null) { permanent.setTapped(true); diff --git a/Mage.Sets/src/mage/sets/darksteel/AEtherVial.java b/Mage.Sets/src/mage/sets/darksteel/AEtherVial.java index 4e943dcb7e4..180baf3736c 100644 --- a/Mage.Sets/src/mage/sets/darksteel/AEtherVial.java +++ b/Mage.Sets/src/mage/sets/darksteel/AEtherVial.java @@ -28,11 +28,11 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/darksteel/ArcaneSpyglass.java b/Mage.Sets/src/mage/sets/darksteel/ArcaneSpyglass.java index 56ac492e457..13c42501a14 100644 --- a/Mage.Sets/src/mage/sets/darksteel/ArcaneSpyglass.java +++ b/Mage.Sets/src/mage/sets/darksteel/ArcaneSpyglass.java @@ -29,9 +29,9 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; @@ -41,6 +41,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; @@ -59,14 +60,14 @@ public class ArcaneSpyglass extends CardImpl { this.expansionSetCode = "DST"; // {2}, {T} , Sacrifice a land: Draw a card and put a charge counter on Arcane Spyglass. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); ability.addEffect(new AddCountersSourceEffect(CounterType.CHARGE.createInstance())); this.addAbility(ability); // Remove three charge counters from Arcane Spyglass: Draw a card. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(3)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(3)))); } public ArcaneSpyglass (final ArcaneSpyglass card) { diff --git a/Mage.Sets/src/mage/sets/darksteel/ArcboundBruiser.java b/Mage.Sets/src/mage/sets/darksteel/ArcboundBruiser.java index 79609079722..a775d794436 100644 --- a/Mage.Sets/src/mage/sets/darksteel/ArcboundBruiser.java +++ b/Mage.Sets/src/mage/sets/darksteel/ArcboundBruiser.java @@ -28,8 +28,8 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ModularAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/darksteel/ArcboundHybrid.java b/Mage.Sets/src/mage/sets/darksteel/ArcboundHybrid.java index b283468d2fb..b7022d32763 100644 --- a/Mage.Sets/src/mage/sets/darksteel/ArcboundHybrid.java +++ b/Mage.Sets/src/mage/sets/darksteel/ArcboundHybrid.java @@ -28,8 +28,8 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.ModularAbility; diff --git a/Mage.Sets/src/mage/sets/darksteel/ArcboundLancer.java b/Mage.Sets/src/mage/sets/darksteel/ArcboundLancer.java index b5c632d9131..7b4f66ce9d3 100644 --- a/Mage.Sets/src/mage/sets/darksteel/ArcboundLancer.java +++ b/Mage.Sets/src/mage/sets/darksteel/ArcboundLancer.java @@ -28,8 +28,8 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.ModularAbility; diff --git a/Mage.Sets/src/mage/sets/darksteel/ArcboundOverseer.java b/Mage.Sets/src/mage/sets/darksteel/ArcboundOverseer.java index 958af0484a2..e2c4e51a4ce 100644 --- a/Mage.Sets/src/mage/sets/darksteel/ArcboundOverseer.java +++ b/Mage.Sets/src/mage/sets/darksteel/ArcboundOverseer.java @@ -28,8 +28,8 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersAllEffect; diff --git a/Mage.Sets/src/mage/sets/darksteel/ArcboundRavager.java b/Mage.Sets/src/mage/sets/darksteel/ArcboundRavager.java index f6bb5db6414..e4d3a82f940 100644 --- a/Mage.Sets/src/mage/sets/darksteel/ArcboundRavager.java +++ b/Mage.Sets/src/mage/sets/darksteel/ArcboundRavager.java @@ -28,9 +28,9 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; diff --git a/Mage.Sets/src/mage/sets/darksteel/ArcboundStinger.java b/Mage.Sets/src/mage/sets/darksteel/ArcboundStinger.java index 5d281b7c133..87d0fb0886c 100644 --- a/Mage.Sets/src/mage/sets/darksteel/ArcboundStinger.java +++ b/Mage.Sets/src/mage/sets/darksteel/ArcboundStinger.java @@ -28,8 +28,8 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.ModularAbility; diff --git a/Mage.Sets/src/mage/sets/darksteel/ArcboundWorker.java b/Mage.Sets/src/mage/sets/darksteel/ArcboundWorker.java index 4fc4d88b776..8d59ae2c934 100644 --- a/Mage.Sets/src/mage/sets/darksteel/ArcboundWorker.java +++ b/Mage.Sets/src/mage/sets/darksteel/ArcboundWorker.java @@ -29,8 +29,8 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ModularAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/darksteel/AuriokGlaivemaster.java b/Mage.Sets/src/mage/sets/darksteel/AuriokGlaivemaster.java index 637a053917f..c0085baf6aa 100644 --- a/Mage.Sets/src/mage/sets/darksteel/AuriokGlaivemaster.java +++ b/Mage.Sets/src/mage/sets/darksteel/AuriokGlaivemaster.java @@ -28,10 +28,10 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EquippedCondition; @@ -40,6 +40,7 @@ import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -59,7 +60,7 @@ public class AuriokGlaivemaster extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - ConditionalContinousEffect effect1 = new ConditionalContinousEffect(new BoostSourceEffect(1, 1, Constants.Duration.WhileOnBattlefield), EquippedCondition.getInstance(), rule1); + ConditionalContinousEffect effect1 = new ConditionalContinousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), EquippedCondition.getInstance(), rule1); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect1)); ConditionalContinousEffect effect2 = new ConditionalContinousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), EquippedCondition.getInstance(), rule2); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect2)); diff --git a/Mage.Sets/src/mage/sets/darksteel/BlinkmothNexus.java b/Mage.Sets/src/mage/sets/darksteel/BlinkmothNexus.java index 45f4b4990bf..3393a603efe 100644 --- a/Mage.Sets/src/mage/sets/darksteel/BlinkmothNexus.java +++ b/Mage.Sets/src/mage/sets/darksteel/BlinkmothNexus.java @@ -30,10 +30,9 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,7 @@ import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.Token; @@ -64,8 +64,8 @@ public class BlinkmothNexus extends CardImpl { super(ownerId, 163, "Blinkmoth Nexus", Rarity.RARE, new CardType[]{CardType.LAND}, null); this.expansionSetCode = "DST"; this.addAbility(new ColorlessManaAbility()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new BlinkmothNexusToken(), "land", Duration.EndOfTurn), new GenericManaCost(1))); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Constants.Duration.EndOfTurn), new GenericManaCost(1)); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new BlinkmothNexusToken(), "land", Duration.EndOfTurn), new GenericManaCost(1))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/darksteel/Coretapper.java b/Mage.Sets/src/mage/sets/darksteel/Coretapper.java index 6055c6e349a..0b2f9431b83 100644 --- a/Mage.Sets/src/mage/sets/darksteel/Coretapper.java +++ b/Mage.Sets/src/mage/sets/darksteel/Coretapper.java @@ -30,9 +30,8 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,7 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -62,10 +62,10 @@ public class Coretapper extends CardImpl { this.subtype.add("Myr"); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability firstAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); + Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); firstAbility.addTarget(new TargetPermanent(filter)); this.addAbility(firstAbility); - Ability secondAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.CHARGE.createInstance(2)), new SacrificeSourceCost()); + Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.CHARGE.createInstance(2)), new SacrificeSourceCost()); secondAbility.addTarget(new TargetPermanent(filter)); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/sets/darksteel/CrazedGoblin.java b/Mage.Sets/src/mage/sets/darksteel/CrazedGoblin.java index 274fb7a443c..cb61c1ba1d8 100644 --- a/Mage.Sets/src/mage/sets/darksteel/CrazedGoblin.java +++ b/Mage.Sets/src/mage/sets/darksteel/CrazedGoblin.java @@ -30,8 +30,8 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/darksteel/DarksteelBrute.java b/Mage.Sets/src/mage/sets/darksteel/DarksteelBrute.java index f8773b7d43b..b63c14f0128 100644 --- a/Mage.Sets/src/mage/sets/darksteel/DarksteelBrute.java +++ b/Mage.Sets/src/mage/sets/darksteel/DarksteelBrute.java @@ -29,16 +29,17 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BecomesCreatureSourceEffect; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.permanent.token.Token; /** @@ -51,7 +52,7 @@ public class DarksteelBrute extends CardImpl { super(ownerId, 108, "Darksteel Brute", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "DST"; this.addAbility(IndestructibleAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new DarksteelBruteToken(), "", Duration.EndOfTurn), new GenericManaCost(3))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new DarksteelBruteToken(), "", Duration.EndOfTurn), new GenericManaCost(3))); } public DarksteelBrute (final DarksteelBrute card) { diff --git a/Mage.Sets/src/mage/sets/darksteel/DarksteelCitadel.java b/Mage.Sets/src/mage/sets/darksteel/DarksteelCitadel.java index fb51e492c18..a623014fe8f 100644 --- a/Mage.Sets/src/mage/sets/darksteel/DarksteelCitadel.java +++ b/Mage.Sets/src/mage/sets/darksteel/DarksteelCitadel.java @@ -29,8 +29,8 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.keyword.IndestructibleAbility; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/darksteel/DarksteelColossus.java b/Mage.Sets/src/mage/sets/darksteel/DarksteelColossus.java index 73ea5de9c90..970253d1005 100644 --- a/Mage.Sets/src/mage/sets/darksteel/DarksteelColossus.java +++ b/Mage.Sets/src/mage/sets/darksteel/DarksteelColossus.java @@ -29,9 +29,9 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.PutIntoGraveFromAnywhereTriggeredAbility; @@ -42,6 +42,8 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; @@ -74,7 +76,7 @@ public class DarksteelColossus extends CardImpl { class DarksteelColossusEffect extends OneShotEffect { DarksteelColossusEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "reveal {this} and shuffle it into its owner's library instead"; } @@ -91,7 +93,7 @@ class DarksteelColossusEffect extends OneShotEffect { Cards cards = new CardsImpl(); cards.add(c); player.revealCards("Blightsteel Colossus", cards, game); - c.moveToZone(Constants.Zone.LIBRARY, source.getSourceId(), game, true); + c.moveToZone(Zone.LIBRARY, source.getSourceId(), game, true); player.shuffleLibrary(game); return true; } diff --git a/Mage.Sets/src/mage/sets/darksteel/DarksteelForge.java b/Mage.Sets/src/mage/sets/darksteel/DarksteelForge.java index 9fcf067fa05..2c28f6171db 100644 --- a/Mage.Sets/src/mage/sets/darksteel/DarksteelForge.java +++ b/Mage.Sets/src/mage/sets/darksteel/DarksteelForge.java @@ -30,10 +30,10 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continious.GainAbilityAllEffect; diff --git a/Mage.Sets/src/mage/sets/darksteel/DarksteelGargoyle.java b/Mage.Sets/src/mage/sets/darksteel/DarksteelGargoyle.java index b350337873a..bafd63d53dc 100644 --- a/Mage.Sets/src/mage/sets/darksteel/DarksteelGargoyle.java +++ b/Mage.Sets/src/mage/sets/darksteel/DarksteelGargoyle.java @@ -30,8 +30,8 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.IndestructibleAbility; diff --git a/Mage.Sets/src/mage/sets/darksteel/DarksteelIngot.java b/Mage.Sets/src/mage/sets/darksteel/DarksteelIngot.java index 5c0489ee4f7..919fbf1f740 100644 --- a/Mage.Sets/src/mage/sets/darksteel/DarksteelIngot.java +++ b/Mage.Sets/src/mage/sets/darksteel/DarksteelIngot.java @@ -28,10 +28,11 @@ package mage.sets.darksteel; -import mage.Constants; import mage.abilities.keyword.IndestructibleAbility; import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import java.util.UUID; @@ -42,7 +43,7 @@ import java.util.UUID; public class DarksteelIngot extends CardImpl { public DarksteelIngot(UUID ownerId) { - super(ownerId, 112, "Darksteel Ingot", Constants.Rarity.COMMON, new Constants.CardType[]{Constants.CardType.ARTIFACT}, "{3}"); + super(ownerId, 112, "Darksteel Ingot", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "DST"; this.addAbility(IndestructibleAbility.getInstance()); this.addAbility(new AnyColorManaAbility()); diff --git a/Mage.Sets/src/mage/sets/darksteel/DarksteelReactor.java b/Mage.Sets/src/mage/sets/darksteel/DarksteelReactor.java index 4871d0ecf06..0d692056d84 100644 --- a/Mage.Sets/src/mage/sets/darksteel/DarksteelReactor.java +++ b/Mage.Sets/src/mage/sets/darksteel/DarksteelReactor.java @@ -28,10 +28,10 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.abilities.StateTriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.WinGameEffect; diff --git a/Mage.Sets/src/mage/sets/darksteel/EchoingCalm.java b/Mage.Sets/src/mage/sets/darksteel/EchoingCalm.java index a9c4aa4ee9a..fef5801afed 100644 --- a/Mage.Sets/src/mage/sets/darksteel/EchoingCalm.java +++ b/Mage.Sets/src/mage/sets/darksteel/EchoingCalm.java @@ -29,12 +29,12 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; @@ -73,7 +73,7 @@ public class EchoingCalm extends CardImpl { class EchoingCalmEffect extends OneShotEffect { EchoingCalmEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); staticText = "Destroy target enchantment and all other enchantments with the same name as that enchantment"; } diff --git a/Mage.Sets/src/mage/sets/darksteel/EmissaryOfHope.java b/Mage.Sets/src/mage/sets/darksteel/EmissaryOfHope.java index 004242f2402..7530c4ac6aa 100644 --- a/Mage.Sets/src/mage/sets/darksteel/EmissaryOfHope.java +++ b/Mage.Sets/src/mage/sets/darksteel/EmissaryOfHope.java @@ -29,15 +29,16 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -79,11 +80,11 @@ class EmissaryOfHopeEffect extends OneShotEffect { static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } EmissaryOfHopeEffect() { - super(Constants.Outcome.GainLife); + super(Outcome.GainLife); staticText = "you gain 1 life for each artifact that player controls"; } diff --git a/Mage.Sets/src/mage/sets/darksteel/EssenceDrain.java b/Mage.Sets/src/mage/sets/darksteel/EssenceDrain.java index b4a4df3495d..a224e5e58a0 100644 --- a/Mage.Sets/src/mage/sets/darksteel/EssenceDrain.java +++ b/Mage.Sets/src/mage/sets/darksteel/EssenceDrain.java @@ -29,8 +29,8 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/darksteel/GrimclawBats.java b/Mage.Sets/src/mage/sets/darksteel/GrimclawBats.java index 4ee36f75ce1..4bbcd7e1c4f 100644 --- a/Mage.Sets/src/mage/sets/darksteel/GrimclawBats.java +++ b/Mage.Sets/src/mage/sets/darksteel/GrimclawBats.java @@ -30,9 +30,7 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -55,7 +53,7 @@ public class GrimclawBats extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new PayLifeCost(1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darksteel/KrarkClanStoker.java b/Mage.Sets/src/mage/sets/darksteel/KrarkClanStoker.java index b49024e7651..94d08877250 100644 --- a/Mage.Sets/src/mage/sets/darksteel/KrarkClanStoker.java +++ b/Mage.Sets/src/mage/sets/darksteel/KrarkClanStoker.java @@ -29,9 +29,9 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/darksteel/LastWord.java b/Mage.Sets/src/mage/sets/darksteel/LastWord.java index a4b4b02c7d5..9d2c1b21cf9 100644 --- a/Mage.Sets/src/mage/sets/darksteel/LastWord.java +++ b/Mage.Sets/src/mage/sets/darksteel/LastWord.java @@ -29,8 +29,8 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.CantCounterAbility; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/darksteel/LeoninBola.java b/Mage.Sets/src/mage/sets/darksteel/LeoninBola.java index 9325f01d422..fc092dc03b9 100644 --- a/Mage.Sets/src/mage/sets/darksteel/LeoninBola.java +++ b/Mage.Sets/src/mage/sets/darksteel/LeoninBola.java @@ -28,10 +28,8 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -58,13 +56,13 @@ public class LeoninBola extends CardImpl { this.subtype.add("Equipment"); // Equipped creature has "{tap}, Unattach Leonin Bola: Tap target creature." - Ability gainAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); + Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); gainAbility.addCost(new UnattachCost(this.getId())); gainAbility.addTarget(new TargetCreaturePermanent()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, AttachmentType.EQUIPMENT))); // Equip {1} - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(1))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1))); } public LeoninBola(final LeoninBola card) { diff --git a/Mage.Sets/src/mage/sets/darksteel/LoxodonMystic.java b/Mage.Sets/src/mage/sets/darksteel/LoxodonMystic.java index b69eee98566..4afb5d244d9 100644 --- a/Mage.Sets/src/mage/sets/darksteel/LoxodonMystic.java +++ b/Mage.Sets/src/mage/sets/darksteel/LoxodonMystic.java @@ -30,9 +30,8 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -55,7 +56,7 @@ public class LoxodonMystic extends CardImpl { this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/darksteel/MagneticFlux.java b/Mage.Sets/src/mage/sets/darksteel/MagneticFlux.java index 06ff84702bd..650e65c9d5d 100644 --- a/Mage.Sets/src/mage/sets/darksteel/MagneticFlux.java +++ b/Mage.Sets/src/mage/sets/darksteel/MagneticFlux.java @@ -30,12 +30,12 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -55,7 +55,7 @@ public class MagneticFlux extends CardImpl { super(ownerId, 25, "Magnetic Flux", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "DST"; this.color.setBlue(true); - this.getSpellAbility().addEffect(new GainAbilityControlledEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn, filter, false)); + this.getSpellAbility().addEffect(new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.EndOfTurn, filter, false)); } public MagneticFlux(final MagneticFlux card) { diff --git a/Mage.Sets/src/mage/sets/darksteel/MirrodinsCore.java b/Mage.Sets/src/mage/sets/darksteel/MirrodinsCore.java index 664636a2790..2200a6982c8 100644 --- a/Mage.Sets/src/mage/sets/darksteel/MirrodinsCore.java +++ b/Mage.Sets/src/mage/sets/darksteel/MirrodinsCore.java @@ -28,9 +28,8 @@ package mage.sets.darksteel; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; @@ -39,6 +38,7 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.mana.AnyColorManaAbility; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import java.util.UUID; @@ -53,7 +53,7 @@ public class MirrodinsCore extends CardImpl { super(ownerId, 165, "Mirrodin's Core", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, ""); this.expansionSetCode = "DST"; this.addAbility(new ColorlessManaAbility()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost())); Ability ability = new AnyColorManaAbility(); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/darksteel/MyrMatrix.java b/Mage.Sets/src/mage/sets/darksteel/MyrMatrix.java index e41958c3aed..a4e61a3ee50 100644 --- a/Mage.Sets/src/mage/sets/darksteel/MyrMatrix.java +++ b/Mage.Sets/src/mage/sets/darksteel/MyrMatrix.java @@ -29,9 +29,9 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -39,6 +39,8 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.MyrToken; @@ -59,8 +61,8 @@ public class MyrMatrix extends CardImpl { super(ownerId, 132, "Myr Matrix", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{5}"); this.expansionSetCode = "DST"; this.addAbility(IndestructibleAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Constants.Duration.WhileOnBattlefield, filter, false))); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new MyrToken()), new GenericManaCost(5))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new MyrToken()), new GenericManaCost(5))); } diff --git a/Mage.Sets/src/mage/sets/darksteel/MyrMoonvessel.java b/Mage.Sets/src/mage/sets/darksteel/MyrMoonvessel.java index 763e0e11423..9af2fbaff40 100644 --- a/Mage.Sets/src/mage/sets/darksteel/MyrMoonvessel.java +++ b/Mage.Sets/src/mage/sets/darksteel/MyrMoonvessel.java @@ -30,8 +30,8 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/darksteel/NeurokProdigy.java b/Mage.Sets/src/mage/sets/darksteel/NeurokProdigy.java index d7960d518a6..7a1d698972c 100644 --- a/Mage.Sets/src/mage/sets/darksteel/NeurokProdigy.java +++ b/Mage.Sets/src/mage/sets/darksteel/NeurokProdigy.java @@ -30,15 +30,15 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.DiscardTargetCost; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCardInHand; @@ -63,7 +63,7 @@ public class NeurokProdigy extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new DiscardTargetCost(new TargetCardInHand(filter)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new DiscardTargetCost(new TargetCardInHand(filter)))); } public NeurokProdigy(final NeurokProdigy card) { diff --git a/Mage.Sets/src/mage/sets/darksteel/Nourish.java b/Mage.Sets/src/mage/sets/darksteel/Nourish.java index f7786465e94..a666602abf5 100644 --- a/Mage.Sets/src/mage/sets/darksteel/Nourish.java +++ b/Mage.Sets/src/mage/sets/darksteel/Nourish.java @@ -29,8 +29,8 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/darksteel/Oxidize.java b/Mage.Sets/src/mage/sets/darksteel/Oxidize.java index 98ab7837d4e..80c81e885dd 100644 --- a/Mage.Sets/src/mage/sets/darksteel/Oxidize.java +++ b/Mage.Sets/src/mage/sets/darksteel/Oxidize.java @@ -30,8 +30,8 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/darksteel/PteronGhost.java b/Mage.Sets/src/mage/sets/darksteel/PteronGhost.java index 9594bf19e58..e19cf6b3821 100644 --- a/Mage.Sets/src/mage/sets/darksteel/PteronGhost.java +++ b/Mage.Sets/src/mage/sets/darksteel/PteronGhost.java @@ -30,9 +30,8 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,7 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.RegenerateTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; @@ -63,7 +63,7 @@ public class PteronGhost extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darksteel/Reshape.java b/Mage.Sets/src/mage/sets/darksteel/Reshape.java index 37f7896f7cc..ec7fd37a5b1 100644 --- a/Mage.Sets/src/mage/sets/darksteel/Reshape.java +++ b/Mage.Sets/src/mage/sets/darksteel/Reshape.java @@ -28,14 +28,16 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.Filter; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; @@ -83,7 +85,7 @@ public class Reshape extends CardImpl { class ReshapeSearchEffect extends OneShotEffect { ReshapeSearchEffect() { - super(Constants.Outcome.PutCardInPlay); + super(Outcome.PutCardInPlay); staticText = "Search your library for an artifact card with converted mana cost X or less and put it onto the battlefield. Then shuffle your library"; } @@ -106,7 +108,7 @@ class ReshapeSearchEffect extends OneShotEffect { if (target.getTargets().size() > 0) { Card card = player.getLibrary().getCard(target.getFirstTarget(), game); if (card != null) { - card.putOntoBattlefield(game, Constants.Zone.LIBRARY, source.getId(), source.getControllerId()); + card.putOntoBattlefield(game, Zone.LIBRARY, source.getId(), source.getControllerId()); } } player.shuffleLibrary(game); diff --git a/Mage.Sets/src/mage/sets/darksteel/ScavengingScarab.java b/Mage.Sets/src/mage/sets/darksteel/ScavengingScarab.java index d4651ca42a0..a89f21d94d4 100644 --- a/Mage.Sets/src/mage/sets/darksteel/ScavengingScarab.java +++ b/Mage.Sets/src/mage/sets/darksteel/ScavengingScarab.java @@ -30,8 +30,8 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/darksteel/SerumPowder.java b/Mage.Sets/src/mage/sets/darksteel/SerumPowder.java index 613ce2788d2..54b1dda9954 100644 --- a/Mage.Sets/src/mage/sets/darksteel/SerumPowder.java +++ b/Mage.Sets/src/mage/sets/darksteel/SerumPowder.java @@ -28,11 +28,11 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; diff --git a/Mage.Sets/src/mage/sets/darksteel/ShieldOfKaldra.java b/Mage.Sets/src/mage/sets/darksteel/ShieldOfKaldra.java index 23ac4d1d0c9..5ea9569760e 100644 --- a/Mage.Sets/src/mage/sets/darksteel/ShieldOfKaldra.java +++ b/Mage.Sets/src/mage/sets/darksteel/ShieldOfKaldra.java @@ -28,13 +28,12 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.Effect; @@ -75,7 +74,7 @@ public class ShieldOfKaldra extends CardImpl { effect.setText("Equipment named Sword of Kaldra, Shield of Kaldra, and Helm of Kaldra are indestructible"); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); // Equipped creature is indestructible. - effect = new GainAbilityAttachedEffect(IndestructibleAbility.getInstance(), AttachmentType.EQUIPMENT, Constants.Duration.WhileOnBattlefield); + effect = new GainAbilityAttachedEffect(IndestructibleAbility.getInstance(), AttachmentType.EQUIPMENT, Duration.WhileOnBattlefield); effect.setText("Equipped creature is indestructible"); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); // Equip {4} diff --git a/Mage.Sets/src/mage/sets/darksteel/Skullclamp.java b/Mage.Sets/src/mage/sets/darksteel/Skullclamp.java index fb46439483c..a5cd06e63cb 100644 --- a/Mage.Sets/src/mage/sets/darksteel/Skullclamp.java +++ b/Mage.Sets/src/mage/sets/darksteel/Skullclamp.java @@ -29,9 +29,8 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.DiesAttachedTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -39,6 +38,8 @@ import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; /** * @@ -52,11 +53,11 @@ public class Skullclamp extends CardImpl { this.subtype.add("Equipment"); // Equipped creature gets +1/-1. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(1, -1))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, -1))); // Whenever equipped creature dies, draw two cards. this.addAbility(new DiesAttachedTriggeredAbility(new DrawCardControllerEffect(2), "equipped")); // Equip {1} - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(1))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1))); } public Skullclamp(final Skullclamp card) { diff --git a/Mage.Sets/src/mage/sets/darksteel/SlobadGoblinTinkerer.java b/Mage.Sets/src/mage/sets/darksteel/SlobadGoblinTinkerer.java index 75b61ecccb2..2a3dca12a21 100644 --- a/Mage.Sets/src/mage/sets/darksteel/SlobadGoblinTinkerer.java +++ b/Mage.Sets/src/mage/sets/darksteel/SlobadGoblinTinkerer.java @@ -30,10 +30,10 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/darksteel/Soulscour.java b/Mage.Sets/src/mage/sets/darksteel/Soulscour.java index 766d23c0859..087daba6752 100644 --- a/Mage.Sets/src/mage/sets/darksteel/Soulscour.java +++ b/Mage.Sets/src/mage/sets/darksteel/Soulscour.java @@ -30,12 +30,12 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -76,7 +76,7 @@ class SoulscourEffect extends OneShotEffect { } public SoulscourEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); staticText = "Destroy all nonartifact permanents"; } diff --git a/Mage.Sets/src/mage/sets/darksteel/SpawningPit.java b/Mage.Sets/src/mage/sets/darksteel/SpawningPit.java index a7102aed763..a6e21821131 100644 --- a/Mage.Sets/src/mage/sets/darksteel/SpawningPit.java +++ b/Mage.Sets/src/mage/sets/darksteel/SpawningPit.java @@ -30,9 +30,8 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.counters.common.ChargeCounter; import mage.game.permanent.token.Token; @@ -56,8 +56,8 @@ public class SpawningPit extends CardImpl { public SpawningPit (UUID ownerId) { super(ownerId, 141, "Spawning Pit", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "DST"; - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersSourceEffect(new ChargeCounter()), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new SpawningPitToken()), new GenericManaCost(1)); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(new ChargeCounter()), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SpawningPitToken()), new GenericManaCost(1)); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(2))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darksteel/Spincrusher.java b/Mage.Sets/src/mage/sets/darksteel/Spincrusher.java index 1eb240b9002..1eb6f008bcf 100644 --- a/Mage.Sets/src/mage/sets/darksteel/Spincrusher.java +++ b/Mage.Sets/src/mage/sets/darksteel/Spincrusher.java @@ -30,10 +30,10 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/darksteel/SteelshaperApprentice.java b/Mage.Sets/src/mage/sets/darksteel/SteelshaperApprentice.java index 4e3e61f3061..dd4667cee1f 100644 --- a/Mage.Sets/src/mage/sets/darksteel/SteelshaperApprentice.java +++ b/Mage.Sets/src/mage/sets/darksteel/SteelshaperApprentice.java @@ -30,10 +30,10 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.ColoredManaSymbol; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/darksteel/SunderingTitan.java b/Mage.Sets/src/mage/sets/darksteel/SunderingTitan.java index b15ef852182..52c65a50a51 100644 --- a/Mage.Sets/src/mage/sets/darksteel/SunderingTitan.java +++ b/Mage.Sets/src/mage/sets/darksteel/SunderingTitan.java @@ -30,9 +30,9 @@ package mage.sets.darksteel; import java.util.HashSet; import java.util.Set; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/darksteel/SwordOfFireAndIce.java b/Mage.Sets/src/mage/sets/darksteel/SwordOfFireAndIce.java index b802bf6d94d..559511db0d8 100644 --- a/Mage.Sets/src/mage/sets/darksteel/SwordOfFireAndIce.java +++ b/Mage.Sets/src/mage/sets/darksteel/SwordOfFireAndIce.java @@ -30,11 +30,11 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/darksteel/SwordOfLightAndShadow.java b/Mage.Sets/src/mage/sets/darksteel/SwordOfLightAndShadow.java index e4d3756bfe5..dc71d1365c9 100644 --- a/Mage.Sets/src/mage/sets/darksteel/SwordOfLightAndShadow.java +++ b/Mage.Sets/src/mage/sets/darksteel/SwordOfLightAndShadow.java @@ -30,11 +30,11 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/darksteel/TangleSpider.java b/Mage.Sets/src/mage/sets/darksteel/TangleSpider.java index ab6f50f89c7..cc296e27be2 100644 --- a/Mage.Sets/src/mage/sets/darksteel/TangleSpider.java +++ b/Mage.Sets/src/mage/sets/darksteel/TangleSpider.java @@ -30,8 +30,8 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.ReachAbility; diff --git a/Mage.Sets/src/mage/sets/darksteel/Tanglewalker.java b/Mage.Sets/src/mage/sets/darksteel/Tanglewalker.java index 2ef7fa00ecf..b2fb61b1445 100644 --- a/Mage.Sets/src/mage/sets/darksteel/Tanglewalker.java +++ b/Mage.Sets/src/mage/sets/darksteel/Tanglewalker.java @@ -28,10 +28,10 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.DefendingPlayerControlsCondition; diff --git a/Mage.Sets/src/mage/sets/darksteel/UrGolemsEye.java b/Mage.Sets/src/mage/sets/darksteel/UrGolemsEye.java index 29d6dddb99f..143512b709d 100644 --- a/Mage.Sets/src/mage/sets/darksteel/UrGolemsEye.java +++ b/Mage.Sets/src/mage/sets/darksteel/UrGolemsEye.java @@ -30,8 +30,8 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.mana.BasicManaAbility; diff --git a/Mage.Sets/src/mage/sets/darksteel/ViridianAcolyte.java b/Mage.Sets/src/mage/sets/darksteel/ViridianAcolyte.java index 7d71b8786f1..e59bf8d0d0d 100644 --- a/Mage.Sets/src/mage/sets/darksteel/ViridianAcolyte.java +++ b/Mage.Sets/src/mage/sets/darksteel/ViridianAcolyte.java @@ -30,8 +30,8 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/darksteel/ViridianZealot.java b/Mage.Sets/src/mage/sets/darksteel/ViridianZealot.java index f43e209761c..871af4b727b 100644 --- a/Mage.Sets/src/mage/sets/darksteel/ViridianZealot.java +++ b/Mage.Sets/src/mage/sets/darksteel/ViridianZealot.java @@ -30,9 +30,8 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,7 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -66,7 +66,7 @@ public class ViridianZealot extends CardImpl { this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{G}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/darksteel/VoltaicConstruct.java b/Mage.Sets/src/mage/sets/darksteel/VoltaicConstruct.java index 6de07591ea6..401b1433be0 100644 --- a/Mage.Sets/src/mage/sets/darksteel/VoltaicConstruct.java +++ b/Mage.Sets/src/mage/sets/darksteel/VoltaicConstruct.java @@ -30,15 +30,15 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.UntapTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCreaturePermanent; @@ -61,7 +61,7 @@ public class VoltaicConstruct extends CardImpl { this.subtype.add("Construct"); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new UntapTargetEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darksteel/VulshokMorningstar.java b/Mage.Sets/src/mage/sets/darksteel/VulshokMorningstar.java index ddc003fa2ce..a330e2bf7ee 100644 --- a/Mage.Sets/src/mage/sets/darksteel/VulshokMorningstar.java +++ b/Mage.Sets/src/mage/sets/darksteel/VulshokMorningstar.java @@ -30,14 +30,15 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; /** * @author Loki @@ -48,8 +49,8 @@ public class VulshokMorningstar extends CardImpl { super(ownerId, 157, "Vulshok Morningstar", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "DST"; this.subtype.add("Equipment"); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(2))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); } public VulshokMorningstar(final VulshokMorningstar card) { diff --git a/Mage.Sets/src/mage/sets/darksteel/WandOfTheElements.java b/Mage.Sets/src/mage/sets/darksteel/WandOfTheElements.java index 7dcdf7bae24..fab0ce3a773 100644 --- a/Mage.Sets/src/mage/sets/darksteel/WandOfTheElements.java +++ b/Mage.Sets/src/mage/sets/darksteel/WandOfTheElements.java @@ -30,9 +30,9 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/darksteel/WhispersilkCloak.java b/Mage.Sets/src/mage/sets/darksteel/WhispersilkCloak.java index affa25c94b8..a78608564a8 100644 --- a/Mage.Sets/src/mage/sets/darksteel/WhispersilkCloak.java +++ b/Mage.Sets/src/mage/sets/darksteel/WhispersilkCloak.java @@ -28,7 +28,7 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/dissension/AssaultZeppelid.java b/Mage.Sets/src/mage/sets/dissension/AssaultZeppelid.java index e52f240651f..208ef9b3065 100644 --- a/Mage.Sets/src/mage/sets/dissension/AssaultZeppelid.java +++ b/Mage.Sets/src/mage/sets/dissension/AssaultZeppelid.java @@ -28,8 +28,8 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TrampleAbility; diff --git a/Mage.Sets/src/mage/sets/dissension/AzoriusChancery.java b/Mage.Sets/src/mage/sets/dissension/AzoriusChancery.java index 5c4b24a3ebc..04b79529e4e 100644 --- a/Mage.Sets/src/mage/sets/dissension/AzoriusChancery.java +++ b/Mage.Sets/src/mage/sets/dissension/AzoriusChancery.java @@ -28,9 +28,9 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; diff --git a/Mage.Sets/src/mage/sets/dissension/AzoriusSignet.java b/Mage.Sets/src/mage/sets/dissension/AzoriusSignet.java index 29799a66ac3..04a83a6b3ba 100644 --- a/Mage.Sets/src/mage/sets/dissension/AzoriusSignet.java +++ b/Mage.Sets/src/mage/sets/dissension/AzoriusSignet.java @@ -28,15 +28,16 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -49,7 +50,7 @@ public class AzoriusSignet extends CardImpl { this.expansionSetCode = "DIS"; // {1}, {tap}: Add {W}{U} to your mana pool. - Ability ability = new SimpleManaAbility(Constants.Zone.BATTLEFIELD, new Mana(0, 0, 1, 1, 0, 0, 0), new GenericManaCost(1)); + Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(0, 0, 1, 1, 0, 0, 0), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/dissension/BeaconHawk.java b/Mage.Sets/src/mage/sets/dissension/BeaconHawk.java index d41286f60bd..3eb2cac9801 100644 --- a/Mage.Sets/src/mage/sets/dissension/BeaconHawk.java +++ b/Mage.Sets/src/mage/sets/dissension/BeaconHawk.java @@ -29,9 +29,7 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -60,7 +58,7 @@ public class BeaconHawk extends CardImpl { Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new UntapTargetEffect(), true); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.W))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W))); } public BeaconHawk(final BeaconHawk card) { diff --git a/Mage.Sets/src/mage/sets/dissension/BloodCrypt.java b/Mage.Sets/src/mage/sets/dissension/BloodCrypt.java index db630e9326c..40020ea6097 100644 --- a/Mage.Sets/src/mage/sets/dissension/BloodCrypt.java +++ b/Mage.Sets/src/mage/sets/dissension/BloodCrypt.java @@ -29,8 +29,8 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.effects.common.TapSourceUnlessPaysEffect; diff --git a/Mage.Sets/src/mage/sets/dissension/BreedingPool.java b/Mage.Sets/src/mage/sets/dissension/BreedingPool.java index 2cae8c8a23d..ecc859e2a31 100644 --- a/Mage.Sets/src/mage/sets/dissension/BreedingPool.java +++ b/Mage.Sets/src/mage/sets/dissension/BreedingPool.java @@ -29,8 +29,8 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.effects.common.TapSourceUnlessPaysEffect; diff --git a/Mage.Sets/src/mage/sets/dissension/CelestialAncient.java b/Mage.Sets/src/mage/sets/dissension/CelestialAncient.java index 19e9fd0a9a9..de11919ad07 100644 --- a/Mage.Sets/src/mage/sets/dissension/CelestialAncient.java +++ b/Mage.Sets/src/mage/sets/dissension/CelestialAncient.java @@ -28,8 +28,8 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersAllEffect; diff --git a/Mage.Sets/src/mage/sets/dissension/DeliriumSkeins.java b/Mage.Sets/src/mage/sets/dissension/DeliriumSkeins.java index 3775a52c606..ce37b551a60 100644 --- a/Mage.Sets/src/mage/sets/dissension/DeliriumSkeins.java +++ b/Mage.Sets/src/mage/sets/dissension/DeliriumSkeins.java @@ -28,8 +28,8 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DiscardEachPlayerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/dissension/ExperimentKraj.java b/Mage.Sets/src/mage/sets/dissension/ExperimentKraj.java index b3fbc9bcf2f..628f704d294 100644 --- a/Mage.Sets/src/mage/sets/dissension/ExperimentKraj.java +++ b/Mage.Sets/src/mage/sets/dissension/ExperimentKraj.java @@ -28,13 +28,13 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.ActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/dissension/FlaringFlameKin.java b/Mage.Sets/src/mage/sets/dissension/FlaringFlameKin.java index cb833cb4232..98d5524fbd8 100644 --- a/Mage.Sets/src/mage/sets/dissension/FlaringFlameKin.java +++ b/Mage.Sets/src/mage/sets/dissension/FlaringFlameKin.java @@ -28,10 +28,10 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/dissension/FreewindEquenaut.java b/Mage.Sets/src/mage/sets/dissension/FreewindEquenaut.java index ee05c8e5a08..9ca4f12bc80 100644 --- a/Mage.Sets/src/mage/sets/dissension/FreewindEquenaut.java +++ b/Mage.Sets/src/mage/sets/dissension/FreewindEquenaut.java @@ -28,10 +28,10 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/dissension/HaazdaExonerator.java b/Mage.Sets/src/mage/sets/dissension/HaazdaExonerator.java index 0e0a832af98..71950ff2c90 100644 --- a/Mage.Sets/src/mage/sets/dissension/HaazdaExonerator.java +++ b/Mage.Sets/src/mage/sets/dissension/HaazdaExonerator.java @@ -29,9 +29,8 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; @@ -63,7 +63,7 @@ public class HaazdaExonerator extends CardImpl { this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/dissension/HallowedFountain.java b/Mage.Sets/src/mage/sets/dissension/HallowedFountain.java index 3fddda21ece..24bbf1ea74e 100644 --- a/Mage.Sets/src/mage/sets/dissension/HallowedFountain.java +++ b/Mage.Sets/src/mage/sets/dissension/HallowedFountain.java @@ -29,8 +29,8 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.effects.common.TapSourceUnlessPaysEffect; diff --git a/Mage.Sets/src/mage/sets/dissension/IndrikStomphowler.java b/Mage.Sets/src/mage/sets/dissension/IndrikStomphowler.java index b4a067869cc..8f934c05743 100644 --- a/Mage.Sets/src/mage/sets/dissension/IndrikStomphowler.java +++ b/Mage.Sets/src/mage/sets/dissension/IndrikStomphowler.java @@ -29,8 +29,8 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/dissension/MinisterOfImpediments.java b/Mage.Sets/src/mage/sets/dissension/MinisterOfImpediments.java index 2cd347cf345..244e03a3447 100644 --- a/Mage.Sets/src/mage/sets/dissension/MinisterOfImpediments.java +++ b/Mage.Sets/src/mage/sets/dissension/MinisterOfImpediments.java @@ -29,15 +29,15 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -55,7 +55,7 @@ public class MinisterOfImpediments extends CardImpl { this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/dissension/MistralCharger.java b/Mage.Sets/src/mage/sets/dissension/MistralCharger.java index 1bb74cf2ab0..44b106349f7 100644 --- a/Mage.Sets/src/mage/sets/dissension/MistralCharger.java +++ b/Mage.Sets/src/mage/sets/dissension/MistralCharger.java @@ -28,8 +28,8 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/dissension/OddsEnds.java b/Mage.Sets/src/mage/sets/dissension/OddsEnds.java index 6e274d92f3a..dbb04b88c34 100644 --- a/Mage.Sets/src/mage/sets/dissension/OddsEnds.java +++ b/Mage.Sets/src/mage/sets/dissension/OddsEnds.java @@ -29,9 +29,9 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CopyTargetSpellEffect; diff --git a/Mage.Sets/src/mage/sets/dissension/ProperBurial.java b/Mage.Sets/src/mage/sets/dissension/ProperBurial.java index 6a06fa87792..e88abf3dbaa 100644 --- a/Mage.Sets/src/mage/sets/dissension/ProperBurial.java +++ b/Mage.Sets/src/mage/sets/dissension/ProperBurial.java @@ -28,9 +28,9 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/dissension/RakdosCarnarium.java b/Mage.Sets/src/mage/sets/dissension/RakdosCarnarium.java index 56fa992cf99..4ba1d10f36c 100644 --- a/Mage.Sets/src/mage/sets/dissension/RakdosCarnarium.java +++ b/Mage.Sets/src/mage/sets/dissension/RakdosCarnarium.java @@ -28,9 +28,9 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; diff --git a/Mage.Sets/src/mage/sets/dissension/RakdosPitDragon.java b/Mage.Sets/src/mage/sets/dissension/RakdosPitDragon.java index 5d47091efa4..04322658486 100644 --- a/Mage.Sets/src/mage/sets/dissension/RakdosPitDragon.java +++ b/Mage.Sets/src/mage/sets/dissension/RakdosPitDragon.java @@ -30,10 +30,10 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/dissension/RakdosSignet.java b/Mage.Sets/src/mage/sets/dissension/RakdosSignet.java index a29492b1057..4a076df9054 100644 --- a/Mage.Sets/src/mage/sets/dissension/RakdosSignet.java +++ b/Mage.Sets/src/mage/sets/dissension/RakdosSignet.java @@ -28,15 +28,16 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -49,7 +50,7 @@ public class RakdosSignet extends CardImpl { this.expansionSetCode = "DIS"; // {1}, {tap}: Add {B}{R} to your mana pool. - Ability ability = new SimpleManaAbility(Constants.Zone.BATTLEFIELD, new Mana(1, 0, 0, 0, 1, 0, 0), new GenericManaCost(1)); + Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(1, 0, 0, 0, 1, 0, 0), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/dissension/RiotSpikes.java b/Mage.Sets/src/mage/sets/dissension/RiotSpikes.java index 72b7096d38e..ad8a455daec 100644 --- a/Mage.Sets/src/mage/sets/dissension/RiotSpikes.java +++ b/Mage.Sets/src/mage/sets/dissension/RiotSpikes.java @@ -29,9 +29,7 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -55,10 +53,10 @@ public class RiotSpikes extends CardImpl { this.color.setBlack(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(2, -1, Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, -1, Duration.WhileOnBattlefield))); } public RiotSpikes(final RiotSpikes card) { diff --git a/Mage.Sets/src/mage/sets/dissension/RixMaadiDungeonPalace.java b/Mage.Sets/src/mage/sets/dissension/RixMaadiDungeonPalace.java index aab464d5259..86f434f7794 100644 --- a/Mage.Sets/src/mage/sets/dissension/RixMaadiDungeonPalace.java +++ b/Mage.Sets/src/mage/sets/dissension/RixMaadiDungeonPalace.java @@ -28,9 +28,9 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -38,6 +38,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DiscardEachPlayerEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -53,7 +54,7 @@ public class RixMaadiDungeonPalace extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {1}{B}{R}, {tap}: Each player discards a card. Activate this ability only any time you could cast a sorcery. - Ability ability = new ActivateAsSorceryActivatedAbility(Constants.Zone.BATTLEFIELD, new DiscardEachPlayerEffect(), new ManaCostsImpl("{1}{B}{R}")); + Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardEachPlayerEffect(), new ManaCostsImpl("{1}{B}{R}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/dissension/SealOfDoom.java b/Mage.Sets/src/mage/sets/dissension/SealOfDoom.java index c8ea6dd038d..d94b6c5774a 100644 --- a/Mage.Sets/src/mage/sets/dissension/SealOfDoom.java +++ b/Mage.Sets/src/mage/sets/dissension/SealOfDoom.java @@ -29,15 +29,15 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; @@ -58,7 +58,7 @@ public class SealOfDoom extends CardImpl { super(ownerId, 53, "Seal of Doom", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); this.expansionSetCode = "DIS"; this.color.setBlack(true); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(true), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(true), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/dissension/SimicGrowthChamber.java b/Mage.Sets/src/mage/sets/dissension/SimicGrowthChamber.java index 0016896f7e4..ab550863d0a 100644 --- a/Mage.Sets/src/mage/sets/dissension/SimicGrowthChamber.java +++ b/Mage.Sets/src/mage/sets/dissension/SimicGrowthChamber.java @@ -28,9 +28,9 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; diff --git a/Mage.Sets/src/mage/sets/dissension/SimicSignet.java b/Mage.Sets/src/mage/sets/dissension/SimicSignet.java index 663166025f5..1c9206790a7 100644 --- a/Mage.Sets/src/mage/sets/dissension/SimicSignet.java +++ b/Mage.Sets/src/mage/sets/dissension/SimicSignet.java @@ -28,15 +28,16 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -49,7 +50,7 @@ public class SimicSignet extends CardImpl { this.expansionSetCode = "DIS"; // {1}, {tap}: Add {G}{U} to your mana pool. - Ability ability = new SimpleManaAbility(Constants.Zone.BATTLEFIELD, new Mana(0, 1, 1, 0, 0, 0, 0), new GenericManaCost(1)); + Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(0, 1, 1, 0, 0, 0, 0), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/dissension/SimicSkySwallower.java b/Mage.Sets/src/mage/sets/dissension/SimicSkySwallower.java index d497ebbdfc2..9e1a3628b54 100644 --- a/Mage.Sets/src/mage/sets/dissension/SimicSkySwallower.java +++ b/Mage.Sets/src/mage/sets/dissension/SimicSkySwallower.java @@ -28,8 +28,8 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TrampleAbility; diff --git a/Mage.Sets/src/mage/sets/dissension/SpellSnare.java b/Mage.Sets/src/mage/sets/dissension/SpellSnare.java index 18e84efa77a..430cea75130 100644 --- a/Mage.Sets/src/mage/sets/dissension/SpellSnare.java +++ b/Mage.Sets/src/mage/sets/dissension/SpellSnare.java @@ -28,8 +28,8 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.filter.Filter; diff --git a/Mage.Sets/src/mage/sets/dissension/UtopiaSprawl.java b/Mage.Sets/src/mage/sets/dissension/UtopiaSprawl.java index f8847f40f06..d6e6db3ff4b 100644 --- a/Mage.Sets/src/mage/sets/dissension/UtopiaSprawl.java +++ b/Mage.Sets/src/mage/sets/dissension/UtopiaSprawl.java @@ -28,10 +28,10 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.Mana; import mage.ObjectColor; import mage.abilities.Ability; @@ -43,6 +43,7 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.mana.TriggeredManaAbility; import mage.cards.CardImpl; import mage.choices.ChoiceColor; +import mage.constants.Outcome; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -74,7 +75,7 @@ public class UtopiaSprawl extends CardImpl { // Enchant Forest TargetPermanent auraTarget = new TargetLandPermanent(filter); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // As Utopia Sprawl enters the battlefield, choose a color. @@ -96,7 +97,7 @@ public class UtopiaSprawl extends CardImpl { class ChooseColorEffect extends OneShotEffect { public ChooseColorEffect() { - super(Constants.Outcome.BoostCreature); + super(Outcome.BoostCreature); staticText = "choose a color"; } @@ -110,7 +111,7 @@ class ChooseColorEffect extends OneShotEffect { Permanent permanent = game.getPermanent(source.getSourceId()); if (player != null && permanent != null) { ChoiceColor colorChoice = new ChoiceColor(); - if (player.choose(Constants.Outcome.Neutral, colorChoice, game)) { + if (player.choose(Outcome.Neutral, colorChoice, game)) { game.informPlayers(permanent.getName() + ": " + player.getName() + " has chosen " + colorChoice.getChoice()); game.getState().setValue(permanent.getId() + "_color", colorChoice.getColor()); } diff --git a/Mage.Sets/src/mage/sets/dissension/WalkingArchive.java b/Mage.Sets/src/mage/sets/dissension/WalkingArchive.java index 8959372cd6d..739147a1027 100644 --- a/Mage.Sets/src/mage/sets/dissension/WalkingArchive.java +++ b/Mage.Sets/src/mage/sets/dissension/WalkingArchive.java @@ -28,9 +28,9 @@ package mage.sets.dissension; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.EntersBattlefieldAbility; @@ -41,6 +41,8 @@ import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.counters.CounterType; /** @@ -64,10 +66,10 @@ public class WalkingArchive extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), "Walking Archive enters the battlefield with a +1/+1 counter on it")); // At the beginning of each player's upkeep, that player draws a card for each +1/+1 counter on Walking Archive. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DrawCardTargetEffect(new CountersCount(CounterType.P1P1)), Constants.TargetController.ANY, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DrawCardTargetEffect(new CountersCount(CounterType.P1P1)), TargetController.ANY, false)); // {2}{W}{U}: Put a +1/+1 counter on Walking Archive. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl("{2}{W}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl("{2}{W}{U}"))); } public WalkingArchive(final WalkingArchive card) { diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/AEtherling.java b/Mage.Sets/src/mage/sets/dragonsmaze/AEtherling.java index 8250ee42212..49c3a5900c8 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/AEtherling.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/AEtherling.java @@ -29,11 +29,11 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/AdventOfTheWurm.java b/Mage.Sets/src/mage/sets/dragonsmaze/AdventOfTheWurm.java index 2583c8d7976..670e174ecfd 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/AdventOfTheWurm.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/AdventOfTheWurm.java @@ -29,9 +29,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.effects.common.CreateTokenEffect; @@ -70,7 +70,7 @@ public class AdventOfTheWurm extends CardImpl { private WurmToken() { super("Wurm", "5/5 green Wurm creature token with trample"); - cardType.add(Constants.CardType.CREATURE); + cardType.add(CardType.CREATURE); color = ObjectColor.GREEN; subtype.add("Wurm"); power = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/AliveWell.java b/Mage.Sets/src/mage/sets/dragonsmaze/AliveWell.java index b855477eb83..a8b0b366178 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/AliveWell.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/AliveWell.java @@ -28,9 +28,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ArmedDangerous.java b/Mage.Sets/src/mage/sets/dragonsmaze/ArmedDangerous.java index c21ae44f89e..11f6b0db770 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ArmedDangerous.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ArmedDangerous.java @@ -29,10 +29,10 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.MustBlockSourceEffect; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ArmoredWolfRider.java b/Mage.Sets/src/mage/sets/dragonsmaze/ArmoredWolfRider.java index 48e783e1f02..ac00f7af327 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ArmoredWolfRider.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ArmoredWolfRider.java @@ -29,8 +29,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/AscendedLawmage.java b/Mage.Sets/src/mage/sets/dragonsmaze/AscendedLawmage.java index 0f7fd0ba22b..9020472b109 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/AscendedLawmage.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/AscendedLawmage.java @@ -29,8 +29,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HexproofAbility; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/AweForTheGuilds.java b/Mage.Sets/src/mage/sets/dragonsmaze/AweForTheGuilds.java index e73ff190a3c..b3bd8a2c18b 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/AweForTheGuilds.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/AweForTheGuilds.java @@ -29,9 +29,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.CantBlockAllEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/AzoriusCluestone.java b/Mage.Sets/src/mage/sets/dragonsmaze/AzoriusCluestone.java index 46ecc50eb08..e6050efaecb 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/AzoriusCluestone.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/AzoriusCluestone.java @@ -29,9 +29,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/BaneAlleyBlackguard.java b/Mage.Sets/src/mage/sets/dragonsmaze/BaneAlleyBlackguard.java index dc78834cf42..ce2a1f2727b 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/BaneAlleyBlackguard.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/BaneAlleyBlackguard.java @@ -29,8 +29,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/BatteringKrasis.java b/Mage.Sets/src/mage/sets/dragonsmaze/BatteringKrasis.java index 5b5d017d885..7a240e95ae2 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/BatteringKrasis.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/BatteringKrasis.java @@ -29,8 +29,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.EvolveAbility; import mage.abilities.keyword.TrampleAbility; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/BeckCall.java b/Mage.Sets/src/mage/sets/dragonsmaze/BeckCall.java index ed67f11561c..992c68e9d9d 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/BeckCall.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/BeckCall.java @@ -29,14 +29,15 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.SplitCard; +import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.events.GameEvent; @@ -87,7 +88,7 @@ class BeckTriggeredAbility extends DelayedTriggeredAbility private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); public BeckTriggeredAbility() { - super(new DrawCardControllerEffect(1), Constants.Duration.EndOfTurn, false); + super(new DrawCardControllerEffect(1), Duration.EndOfTurn, false); optional = true; } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/BeetleformMage.java b/Mage.Sets/src/mage/sets/dragonsmaze/BeetleformMage.java index 93dddc97514..fad8ce6603a 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/BeetleformMage.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/BeetleformMage.java @@ -29,10 +29,10 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateOncePerTurnActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/BlastOfGenius.java b/Mage.Sets/src/mage/sets/dragonsmaze/BlastOfGenius.java index 778f3fb7205..fc6612c5d4f 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/BlastOfGenius.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/BlastOfGenius.java @@ -29,9 +29,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/BlazeCommando.java b/Mage.Sets/src/mage/sets/dragonsmaze/BlazeCommando.java index f2742f66f4c..d29f3fe2473 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/BlazeCommando.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/BlazeCommando.java @@ -31,10 +31,10 @@ package mage.sets.dragonsmaze; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.MageObject; import mage.abilities.TriggeredAbilityImpl; @@ -44,7 +44,6 @@ import mage.cards.CardImpl; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; -import mage.game.permanent.token.MerfolkToken; import mage.game.permanent.token.Token; import mage.game.stack.StackObject; @@ -130,7 +129,7 @@ class BlazeCommandoSoldierToken extends Token { public BlazeCommandoSoldierToken() { super("Soldier", "1/1 red and white Soldier creature tokens with haste"); - cardType.add(Constants.CardType.CREATURE); + cardType.add(CardType.CREATURE); color.setRed(true); color.setWhite(true); subtype.add("Soldier"); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/BloodBaronOfVizkopa.java b/Mage.Sets/src/mage/sets/dragonsmaze/BloodBaronOfVizkopa.java index 3bf86b84f11..b450dd8738b 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/BloodBaronOfVizkopa.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/BloodBaronOfVizkopa.java @@ -29,13 +29,13 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/BloodScrivener.java b/Mage.Sets/src/mage/sets/dragonsmaze/BloodScrivener.java index 77f3bdf2e4b..dfac997bf87 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/BloodScrivener.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/BloodScrivener.java @@ -29,11 +29,11 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/BorosBattleshaper.java b/Mage.Sets/src/mage/sets/dragonsmaze/BorosBattleshaper.java index cdbfe976870..968b9856ce8 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/BorosBattleshaper.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/BorosBattleshaper.java @@ -29,14 +29,13 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; -import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.BeginningOfCombatTriggeredAbility; import mage.abilities.effects.ContinuousEffectImpl; @@ -49,10 +48,8 @@ import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.AttacksThisTurnMarkerAbility; import mage.abilities.keyword.BlocksThisTurnMarkerAbility; import mage.cards.CardImpl; -import mage.filter.FilterCard; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; @@ -77,7 +74,7 @@ public class BorosBattleshaper extends CardImpl { this.toughness = new MageInt(5); // At the beginning of each combat, up to one target creature attacks or blocks this combat if able and up to one target creature can't attack or block this combat. - Ability ability = new BeginningOfCombatTriggeredAbility(Zone.BATTLEFIELD, new BorosBattleshaperEffect(), Constants.TargetController.ANY, false, false); + Ability ability = new BeginningOfCombatTriggeredAbility(Zone.BATTLEFIELD, new BorosBattleshaperEffect(), TargetController.ANY, false, false); ability.addTarget(new TargetCreaturePermanent(0,1,new FilterCreaturePermanent("creature that attacks or blocks if able"),false)); ability.addTarget(new TargetCreaturePermanent(0,1,new FilterCreaturePermanent("creature that can't attack or block"),false)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/BorosCluestone.java b/Mage.Sets/src/mage/sets/dragonsmaze/BorosCluestone.java index 86d6450104f..5203583cfa2 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/BorosCluestone.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/BorosCluestone.java @@ -29,9 +29,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/BorosMastiff.java b/Mage.Sets/src/mage/sets/dragonsmaze/BorosMastiff.java index ea6205e8d13..55435e17405 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/BorosMastiff.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/BorosMastiff.java @@ -29,9 +29,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.BattalionAbility; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/BreakingEntering.java b/Mage.Sets/src/mage/sets/dragonsmaze/BreakingEntering.java index d1d868cab50..a4e567a11c1 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/BreakingEntering.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/BreakingEntering.java @@ -29,11 +29,11 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; @@ -42,6 +42,7 @@ import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.Card; import mage.cards.SplitCard; +import mage.constants.Duration; import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.players.Player; @@ -119,7 +120,7 @@ class EnteringReturnFromGraveyardToBattlefieldEffect extends OneShotEffect { class CarnageGladiatorTriggeredAbility extends TriggeredAbilityImpl { public CarnageGladiatorTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new LoseLifeTargetEffect(1)); + super(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1)); } public CarnageGladiatorTriggeredAbility(final CarnageGladiatorTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/CatchRelease.java b/Mage.Sets/src/mage/sets/dragonsmaze/CatchRelease.java index 55807f40165..c71f5e487f1 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/CatchRelease.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/CatchRelease.java @@ -31,11 +31,11 @@ package mage.sets.dragonsmaze; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.UntapTargetEffect; @@ -43,6 +43,7 @@ import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.effects.common.continious.GainControlTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.SplitCard; +import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterArtifactPermanent; import mage.filter.common.FilterCreaturePermanent; @@ -107,15 +108,15 @@ class ReleaseSacrificeEffect extends OneShotEffect { private static final FilterPlaneswalkerPermanent filter5 = new FilterPlaneswalkerPermanent("planeswalker you control"); static { - filter1.add(new ControllerPredicate(Constants.TargetController.YOU)); - filter2.add(new ControllerPredicate(Constants.TargetController.YOU)); - filter3.add(new ControllerPredicate(Constants.TargetController.YOU)); - filter4.add(new ControllerPredicate(Constants.TargetController.YOU)); - filter5.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter1.add(new ControllerPredicate(TargetController.YOU)); + filter2.add(new ControllerPredicate(TargetController.YOU)); + filter3.add(new ControllerPredicate(TargetController.YOU)); + filter4.add(new ControllerPredicate(TargetController.YOU)); + filter5.add(new ControllerPredicate(TargetController.YOU)); } public ReleaseSacrificeEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); staticText = "Each player sacrifices an artifact, a creature, an enchantment, a land, and a planeswalker"; } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ClearAPath.java b/Mage.Sets/src/mage/sets/dragonsmaze/ClearAPath.java index cd76ec191b0..15ee1f752d1 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ClearAPath.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ClearAPath.java @@ -29,8 +29,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/CouncilOfTheAbsolute.java b/Mage.Sets/src/mage/sets/dragonsmaze/CouncilOfTheAbsolute.java index eb360965b37..165257baf68 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/CouncilOfTheAbsolute.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/CouncilOfTheAbsolute.java @@ -29,11 +29,11 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/CryptIncursion.java b/Mage.Sets/src/mage/sets/dragonsmaze/CryptIncursion.java index 35aec19b701..074f07d4e24 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/CryptIncursion.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/CryptIncursion.java @@ -29,9 +29,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/DeadbridgeChant.java b/Mage.Sets/src/mage/sets/dragonsmaze/DeadbridgeChant.java index a7152fafac6..182a41ffcd7 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/DeadbridgeChant.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/DeadbridgeChant.java @@ -28,11 +28,11 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -40,6 +40,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.PutTopCardOfYourLibraryIntoGraveEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.game.Game; import mage.players.Player; @@ -62,7 +63,7 @@ public class DeadbridgeChant extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new PutTopCardOfYourLibraryIntoGraveEffect(10))); // At the beginning of your upkeep, choose a card at random in your graveyard. If it's a creature card, put it onto the battlefield. Otherwise, put it into your hand. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new DeadbridgeChantEffect(), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new DeadbridgeChantEffect(), TargetController.YOU, false)); } public DeadbridgeChant(final DeadbridgeChant card) { diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/DebtToTheDeathless.java b/Mage.Sets/src/mage/sets/dragonsmaze/DebtToTheDeathless.java index 92d82b8bfa8..e17c5f3ddb5 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/DebtToTheDeathless.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/DebtToTheDeathless.java @@ -28,9 +28,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/DeputyOfAcquittals.java b/Mage.Sets/src/mage/sets/dragonsmaze/DeputyOfAcquittals.java index e0b0cf43d39..d6f326d32a1 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/DeputyOfAcquittals.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/DeputyOfAcquittals.java @@ -28,9 +28,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/DimirCluestone.java b/Mage.Sets/src/mage/sets/dragonsmaze/DimirCluestone.java index 1f6681b7b07..a5c9eab4a71 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/DimirCluestone.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/DimirCluestone.java @@ -29,9 +29,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/DownDirty.java b/Mage.Sets/src/mage/sets/dragonsmaze/DownDirty.java index 086ee950301..9806eb5443e 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/DownDirty.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/DownDirty.java @@ -29,8 +29,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DiscardTargetEffect; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; import mage.cards.SplitCard; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/Dragonshift.java b/Mage.Sets/src/mage/sets/dragonsmaze/Dragonshift.java index 4231d46db8f..b5540fbf3e0 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/Dragonshift.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/Dragonshift.java @@ -28,10 +28,10 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; @@ -42,6 +42,7 @@ import mage.abilities.effects.common.continious.LoseAllAbilitiesTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.OverloadAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; @@ -56,7 +57,7 @@ public class Dragonshift extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("all creatures you controls"); static { - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public Dragonshift(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/DrownInFilth.java b/Mage.Sets/src/mage/sets/dragonsmaze/DrownInFilth.java index b51d61b18dd..b1c78991ed6 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/DrownInFilth.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/DrownInFilth.java @@ -28,9 +28,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount; import mage.abilities.dynamicvalue.common.SignInversionDynamicValue; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/EmmaraTandris.java b/Mage.Sets/src/mage/sets/dragonsmaze/EmmaraTandris.java index cd3ded1ba60..42881cd6a8e 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/EmmaraTandris.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/EmmaraTandris.java @@ -28,11 +28,11 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.PreventAllDamageToEffect; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ExavaRakdosBloodWitch.java b/Mage.Sets/src/mage/sets/dragonsmaze/ExavaRakdosBloodWitch.java index b51ace54cb0..fcdce0ffb68 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ExavaRakdosBloodWitch.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ExavaRakdosBloodWitch.java @@ -28,11 +28,11 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityAllEffect; @@ -40,6 +40,7 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.UnleashAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -56,7 +57,7 @@ public class ExavaRakdosBloodWitch extends CardImpl { private static final FilterPermanent filter = new FilterPermanent(); static { filter.add(new CardTypePredicate(CardType.CREATURE)); - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(new CounterPredicate(CounterType.P1P1)); filter.add(new AnotherPredicate()); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/FarAway.java b/Mage.Sets/src/mage/sets/dragonsmaze/FarAway.java index 7a30cf398cf..fd5330b0fa6 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/FarAway.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/FarAway.java @@ -29,8 +29,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.effects.common.SacrificeEffect; import mage.cards.SplitCard; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/FatalFumes.java b/Mage.Sets/src/mage/sets/dragonsmaze/FatalFumes.java index 7e7eff2a9c6..9bc7f79a6fd 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/FatalFumes.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/FatalFumes.java @@ -29,9 +29,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/FleshBlood.java b/Mage.Sets/src/mage/sets/dragonsmaze/FleshBlood.java index 5ac29e7ba96..aa7de2b19dc 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/FleshBlood.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/FleshBlood.java @@ -29,10 +29,10 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/Fluxcharger.java b/Mage.Sets/src/mage/sets/dragonsmaze/Fluxcharger.java index c78bcedf374..9e7ebf3116a 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/Fluxcharger.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/Fluxcharger.java @@ -28,14 +28,15 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.common.continious.SwitchPowerToughnessSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -66,7 +67,7 @@ public class Fluxcharger extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Whenever you cast an instant or sorcery spell, you may switch Fluxcharger's power and toughness until end of turn. - this.addAbility(new SpellCastTriggeredAbility(new SwitchPowerToughnessSourceEffect(Constants.Duration.EndOfTurn), filter, true)); + this.addAbility(new SpellCastTriggeredAbility(new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), filter, true)); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/GazeOfGranite.java b/Mage.Sets/src/mage/sets/dragonsmaze/GazeOfGranite.java index 1399d28fdba..b21bb388dfe 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/GazeOfGranite.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/GazeOfGranite.java @@ -28,9 +28,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/GiveTake.java b/Mage.Sets/src/mage/sets/dragonsmaze/GiveTake.java index ba258db398e..b1c916b7d2a 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/GiveTake.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/GiveTake.java @@ -28,9 +28,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/GleamOfBattle.java b/Mage.Sets/src/mage/sets/dragonsmaze/GleamOfBattle.java index a35fe82f34f..d4fd8bdbfba 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/GleamOfBattle.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/GleamOfBattle.java @@ -28,8 +28,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.AttacksCreatureYourControlTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/GoblinTestPilot.java b/Mage.Sets/src/mage/sets/dragonsmaze/GoblinTestPilot.java index d7b7f6e5a5b..847ef7a64c3 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/GoblinTestPilot.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/GoblinTestPilot.java @@ -28,9 +28,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/GolgariCluestone.java b/Mage.Sets/src/mage/sets/dragonsmaze/GolgariCluestone.java index b108cb81c2e..006f8c25eeb 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/GolgariCluestone.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/GolgariCluestone.java @@ -29,9 +29,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/GruulCluestone.java b/Mage.Sets/src/mage/sets/dragonsmaze/GruulCluestone.java index 821e40aa4f5..0fcd1246c88 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/GruulCluestone.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/GruulCluestone.java @@ -29,9 +29,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/GruulWarChant.java b/Mage.Sets/src/mage/sets/dragonsmaze/GruulWarChant.java index a6d2f0aca4c..ca68859151b 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/GruulWarChant.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/GruulWarChant.java @@ -28,16 +28,17 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.abilities.effects.common.continious.CantBeBlockedByOneAllEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AttackingPredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -50,7 +51,7 @@ public class GruulWarChant extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("attacking creature you control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(new AttackingPredicate()); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/HaazdaSnareSquad.java b/Mage.Sets/src/mage/sets/dragonsmaze/HaazdaSnareSquad.java index 46ddff14ea1..c1816e503da 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/HaazdaSnareSquad.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/HaazdaSnareSquad.java @@ -29,9 +29,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -39,6 +39,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; @@ -54,7 +55,7 @@ public class HaazdaSnareSquad extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT)); + filter.add(new ControllerPredicate(TargetController.OPPONENT)); } public HaazdaSnareSquad (UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/HaunterOfNightveil.java b/Mage.Sets/src/mage/sets/dragonsmaze/HaunterOfNightveil.java index 5bd295b2310..37695ee655f 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/HaunterOfNightveil.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/HaunterOfNightveil.java @@ -28,10 +28,10 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostOpponentsEffect; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/HiddenStrings.java b/Mage.Sets/src/mage/sets/dragonsmaze/HiddenStrings.java index 95cff0de2c7..2391c6fa8e5 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/HiddenStrings.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/HiddenStrings.java @@ -29,10 +29,10 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CipherEffect; @@ -98,9 +98,9 @@ class HiddenStringsEffect extends OneShotEffect { for (UUID targetId : source.getTargets().get(0).getTargets()) { Permanent permanent = game.getPermanent(targetId); if (permanent != null) { - if (player.chooseUse(Constants.Outcome.Tap, new StringBuilder("Tap ").append(permanent.getName()).append("?").toString(), game)) { + if (player.chooseUse(Outcome.Tap, new StringBuilder("Tap ").append(permanent.getName()).append("?").toString(), game)) { permanent.tap(game); - } else if (player.chooseUse(Constants.Outcome.Untap, new StringBuilder("Untap ").append(permanent.getName()).append("?").toString(), game)) { + } else if (player.chooseUse(Outcome.Untap, new StringBuilder("Untap ").append(permanent.getName()).append("?").toString(), game)) { permanent.untap(game); } } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/HiredTorturer.java b/Mage.Sets/src/mage/sets/dragonsmaze/HiredTorturer.java index 99f58af0dbf..2a5b6c371a0 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/HiredTorturer.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/HiredTorturer.java @@ -29,10 +29,10 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/IzzetCluestone.java b/Mage.Sets/src/mage/sets/dragonsmaze/IzzetCluestone.java index 9e15fbb9ddd..d12d48ff9ea 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/IzzetCluestone.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/IzzetCluestone.java @@ -29,9 +29,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/JelennSphinx.java b/Mage.Sets/src/mage/sets/dragonsmaze/JelennSphinx.java index d243305268c..ae0520b4a53 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/JelennSphinx.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/JelennSphinx.java @@ -28,9 +28,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continious.BoostAllEffect; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/KorozdaGorgon.java b/Mage.Sets/src/mage/sets/dragonsmaze/KorozdaGorgon.java index 58687567e11..ce400638fbe 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/KorozdaGorgon.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/KorozdaGorgon.java @@ -28,10 +28,10 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/KrasisIncubation.java b/Mage.Sets/src/mage/sets/dragonsmaze/KrasisIncubation.java index 0b55ac888bf..8cbca92090b 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/KrasisIncubation.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/KrasisIncubation.java @@ -28,10 +28,10 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -42,6 +42,7 @@ import mage.abilities.effects.common.CantBlockAttackActivateAttachedEffect; import mage.abilities.effects.common.counter.AddPlusOneCountersAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -62,7 +63,7 @@ public class KrasisIncubation extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.LoseLife)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.LoseLife)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/KraulWarrior.java b/Mage.Sets/src/mage/sets/dragonsmaze/KraulWarrior.java index 618cf1b4536..481438e802f 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/KraulWarrior.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/KraulWarrior.java @@ -29,10 +29,10 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/LaviniaOfTheTenth.java b/Mage.Sets/src/mage/sets/dragonsmaze/LaviniaOfTheTenth.java index 5e25fef61e3..92c94099415 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/LaviniaOfTheTenth.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/LaviniaOfTheTenth.java @@ -29,15 +29,16 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DetainAllEffect; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.Filter; import mage.filter.FilterObject; import mage.filter.FilterPermanent; @@ -59,7 +60,7 @@ public class LaviniaOfTheTenth extends CardImpl { private static final FilterPermanent filterDetain = new FilterPermanent("each nonland permanent your opponents control with converted mana cost 4 or less"); static { filter.add(new ColorPredicate(ObjectColor.RED)); - filterDetain.add(new ControllerPredicate(Constants.TargetController.OPPONENT)); + filterDetain.add(new ControllerPredicate(TargetController.OPPONENT)); filterDetain.add(Predicates.not(new CardTypePredicate(CardType.LAND))); filterDetain.add(new ConvertedManaCostPredicate(Filter.ComparisonType.LessThan, 5)); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/LegionsInitiative.java b/Mage.Sets/src/mage/sets/dragonsmaze/LegionsInitiative.java index 1611a7e2f42..fb11fbca435 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/LegionsInitiative.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/LegionsInitiative.java @@ -28,12 +28,12 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -48,6 +48,7 @@ import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -104,7 +105,7 @@ class LegionsInitiativeExileEffect extends OneShotEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures your opponent controls"); static { - filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT)); + filter.add(new ControllerPredicate(TargetController.OPPONENT)); } public LyevDecree(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MasterOfCruelties.java b/Mage.Sets/src/mage/sets/dragonsmaze/MasterOfCruelties.java index 6aa216b5eb8..16bf16c0051 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/MasterOfCruelties.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/MasterOfCruelties.java @@ -28,11 +28,11 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MawOfTheObzedat.java b/Mage.Sets/src/mage/sets/dragonsmaze/MawOfTheObzedat.java index 4d4f73980c7..fb45b555327 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/MawOfTheObzedat.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/MawOfTheObzedat.java @@ -28,11 +28,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -65,7 +62,7 @@ public class MawOfTheObzedat extends CardImpl { this.toughness = new MageInt(3); // Sacrifice a creature: Creatures you control get +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.EndOfTurn, filter, false), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.EndOfTurn, filter, false), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MazeAbomination.java b/Mage.Sets/src/mage/sets/dragonsmaze/MazeAbomination.java index 3707c5e68fc..9d6b78251ef 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/MazeAbomination.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/MazeAbomination.java @@ -29,10 +29,10 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityAllEffect; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MazeBehemoth.java b/Mage.Sets/src/mage/sets/dragonsmaze/MazeBehemoth.java index ae2ff534f78..75315334ea7 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/MazeBehemoth.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/MazeBehemoth.java @@ -29,10 +29,10 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityAllEffect; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MazeGlider.java b/Mage.Sets/src/mage/sets/dragonsmaze/MazeGlider.java index e10b6b874e5..5c08e078341 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/MazeGlider.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/MazeGlider.java @@ -29,10 +29,10 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityAllEffect; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MazeRusher.java b/Mage.Sets/src/mage/sets/dragonsmaze/MazeRusher.java index 7cf46d4deb1..6e4a0c7ec5b 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/MazeRusher.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/MazeRusher.java @@ -29,10 +29,10 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityAllEffect; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MazeSentinel.java b/Mage.Sets/src/mage/sets/dragonsmaze/MazeSentinel.java index bc3c5476d1f..6586bad8972 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/MazeSentinel.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/MazeSentinel.java @@ -29,10 +29,10 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityAllEffect; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MazesEnd.java b/Mage.Sets/src/mage/sets/dragonsmaze/MazesEnd.java index 0bacb4b27a7..7b505fbfe3b 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/MazesEnd.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/MazesEnd.java @@ -31,10 +31,10 @@ package mage.sets.dragonsmaze; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MelekIzzetParagon.java b/Mage.Sets/src/mage/sets/dragonsmaze/MelekIzzetParagon.java index fecc1f629ae..127f667c62f 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/MelekIzzetParagon.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/MelekIzzetParagon.java @@ -28,10 +28,10 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; @@ -76,10 +76,10 @@ public class MelekIzzetParagon extends CardImpl { this.toughness = new MageInt(4); // Play with the top card of your library revealed. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new PlayWithTheTopCardRevealedEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithTheTopCardRevealedEffect())); // You may cast the top card of your library if it's an instant or sorcery card. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new PlayTheTopCardEffect(filter))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayTheTopCardEffect(filter))); // Whenever you cast an instant or sorcery spell from your library, copy it. You may choose new targets for the copy. this.addAbility(new MelekIzzetParagonTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MendingTouch.java b/Mage.Sets/src/mage/sets/dragonsmaze/MendingTouch.java index 71e41b11da0..36178f23ea9 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/MendingTouch.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/MendingTouch.java @@ -29,8 +29,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.RegenerateTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/Mindstatic.java b/Mage.Sets/src/mage/sets/dragonsmaze/Mindstatic.java index fb714db7d82..8ac877212a3 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/Mindstatic.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/Mindstatic.java @@ -29,8 +29,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MirkoVoskMindDrinker.java b/Mage.Sets/src/mage/sets/dragonsmaze/MirkoVoskMindDrinker.java index a29602025dc..898ebb40688 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/MirkoVoskMindDrinker.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/MirkoVoskMindDrinker.java @@ -29,10 +29,10 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MorgueBurst.java b/Mage.Sets/src/mage/sets/dragonsmaze/MorgueBurst.java index 5eaaca13a8a..c316c0d310a 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/MorgueBurst.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/MorgueBurst.java @@ -28,14 +28,16 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.game.permanent.Permanent; @@ -75,7 +77,7 @@ public class MorgueBurst extends CardImpl { class MorgueBurstEffect extends OneShotEffect { public MorgueBurstEffect() { - super(Constants.Outcome.ReturnToHand); + super(Outcome.ReturnToHand); } public MorgueBurstEffect(final MorgueBurstEffect effect) { @@ -93,7 +95,7 @@ class MorgueBurstEffect extends OneShotEffect { if (card != null) { Player player = game.getPlayer(card.getOwnerId()); if (player != null) { - card.moveToZone(Constants.Zone.HAND, source.getSourceId(), game, false); + card.moveToZone(Zone.HAND, source.getSourceId(), game, false); int damage = card.getPower().getValue(); Permanent creature = game.getPermanent(source.getTargets().get(1).getTargets().get(0)); if (creature != null) { diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MurmuringPhantasm.java b/Mage.Sets/src/mage/sets/dragonsmaze/MurmuringPhantasm.java index d743ac0f4ff..ab84ccabb4b 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/MurmuringPhantasm.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/MurmuringPhantasm.java @@ -29,18 +29,11 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.abilities.keyword.DefenderAbility; -import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; -import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.MulticoloredPredicate; /** * diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MutantsPrey.java b/Mage.Sets/src/mage/sets/dragonsmaze/MutantsPrey.java index 6777421b70a..450dded39c3 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/MutantsPrey.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/MutantsPrey.java @@ -29,11 +29,12 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.FightTargetsEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; @@ -51,9 +52,9 @@ public class MutantsPrey extends CardImpl { private static final FilterCreaturePermanent filter1 = new FilterCreaturePermanent("creature you control with a +1/+1 counter on it"); private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("creature an opponent controls"); static { - filter1.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter1.add(new ControllerPredicate(TargetController.YOU)); filter1.add(new CounterPredicate(CounterType.P1P1)); - filter2.add(new ControllerPredicate(Constants.TargetController.OPPONENT)); + filter2.add(new ControllerPredicate(TargetController.OPPONENT)); } public MutantsPrey(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/NivixCyclops.java b/Mage.Sets/src/mage/sets/dragonsmaze/NivixCyclops.java index faaf0563c71..62ca029971b 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/NivixCyclops.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/NivixCyclops.java @@ -27,13 +27,12 @@ */ package mage.sets.dragonsmaze; -import java.util.ArrayList; -import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.AsThoughEffectType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastTriggeredAbility; @@ -41,6 +40,7 @@ import mage.abilities.effects.AsThoughEffectImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -94,7 +94,7 @@ public class NivixCyclops extends CardImpl { class AsThoughNoDefenderEffect extends AsThoughEffectImpl { public AsThoughNoDefenderEffect() { - super(Constants.AsThoughEffectType.ATTACK, Constants.Duration.EndOfTurn, Constants.Outcome.Benefit); + super(AsThoughEffectType.ATTACK, Duration.EndOfTurn, Outcome.Benefit); staticText ="and it can attack as though it didn't have defender"; } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/NotionThief.java b/Mage.Sets/src/mage/sets/dragonsmaze/NotionThief.java index 09d0f941ee0..f24f7fa13d4 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/NotionThief.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/NotionThief.java @@ -31,13 +31,13 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.PhaseStep; -import mage.Constants.Rarity; -import mage.Constants.WatcherScope; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.PhaseStep; +import mage.constants.Rarity; +import mage.constants.WatcherScope; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ObzedatsAid.java b/Mage.Sets/src/mage/sets/dragonsmaze/ObzedatsAid.java index 5f6c9036e55..2181c35e21c 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ObzedatsAid.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ObzedatsAid.java @@ -28,8 +28,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterCard; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/OpalLakeGatekeepers.java b/Mage.Sets/src/mage/sets/dragonsmaze/OpalLakeGatekeepers.java index 146d871e53d..d8baf122a7e 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/OpalLakeGatekeepers.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/OpalLakeGatekeepers.java @@ -29,8 +29,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.ControlsPermanentCondition; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/OrzhovCluestone.java b/Mage.Sets/src/mage/sets/dragonsmaze/OrzhovCluestone.java index 177ee2883f9..e64e6f5a65b 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/OrzhovCluestone.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/OrzhovCluestone.java @@ -29,9 +29,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/Phytoburst.java b/Mage.Sets/src/mage/sets/dragonsmaze/Phytoburst.java index a8a10c117cb..c58bc5c78d4 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/Phytoburst.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/Phytoburst.java @@ -29,11 +29,12 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -50,7 +51,7 @@ public class Phytoburst extends CardImpl { this.color.setGreen(true); // Target creature gets +5/+5 until end of turn. - this.getSpellAbility().addEffect(new BoostTargetEffect(5,5,Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(5,5, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/PilferedPlans.java b/Mage.Sets/src/mage/sets/dragonsmaze/PilferedPlans.java index 5c59430c7f8..b095917f728 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/PilferedPlans.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/PilferedPlans.java @@ -28,8 +28,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/PlasmCapture.java b/Mage.Sets/src/mage/sets/dragonsmaze/PlasmCapture.java index 9e98c9a4793..e738f41bb0c 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/PlasmCapture.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/PlasmCapture.java @@ -28,11 +28,11 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.delayed.AtTheBeginOfPreCombatMainPhaseTriggeredAbility; @@ -133,7 +133,7 @@ class PlasmCaptureManaEffect extends ManaEffect { Mana mana = new Mana(); for(int i = 0; i < amountOfMana; i++){ ChoiceColor choiceColor = new ChoiceColor(); - while (!player.choose(Constants.Outcome.Benefit, choiceColor, game)) { + while (!player.choose(Outcome.Benefit, choiceColor, game)) { game.debugMessage("player canceled choosing color. retrying."); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/PontiffOfBlight.java b/Mage.Sets/src/mage/sets/dragonsmaze/PontiffOfBlight.java index 7820be4bf5a..8569dc6d9bf 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/PontiffOfBlight.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/PontiffOfBlight.java @@ -29,16 +29,17 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.abilities.keyword.ExtortAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -54,7 +55,7 @@ public class PontiffOfBlight extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Other creatures you control"); static { filter.add(new AnotherPredicate()); - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public PontiffOfBlight (UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/PossibilityStorm.java b/Mage.Sets/src/mage/sets/dragonsmaze/PossibilityStorm.java index e33cfd9a3b3..5c9bab8b0a2 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/PossibilityStorm.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/PossibilityStorm.java @@ -29,18 +29,17 @@ package mage.sets.dragonsmaze; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; -import mage.cards.CardsImpl; import mage.game.ExileZone; import mage.game.Game; import mage.game.events.GameEvent; @@ -167,7 +166,7 @@ class PossibilityStormEffect extends OneShotEffect { } private boolean sharesType (Card card, List cardTypes) { - for (Constants.CardType type : card.getCardType()) { + for (CardType type : card.getCardType()) { if (cardTypes.contains(type)) { return true; } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ProfitLoss.java b/Mage.Sets/src/mage/sets/dragonsmaze/ProfitLoss.java index 681076f79b9..73312024db2 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ProfitLoss.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ProfitLoss.java @@ -29,13 +29,14 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.SplitCard; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; @@ -49,7 +50,7 @@ public class ProfitLoss extends SplitCard { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT)); + filter.add(new ControllerPredicate(TargetController.OPPONENT)); } public ProfitLoss(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ProgenitorMimic.java b/Mage.Sets/src/mage/sets/dragonsmaze/ProgenitorMimic.java index 75011110f5b..fb6eca52ca0 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ProgenitorMimic.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ProgenitorMimic.java @@ -28,11 +28,11 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ProtectServe.java b/Mage.Sets/src/mage/sets/dragonsmaze/ProtectServe.java index 6d4771cea52..0894a08aed9 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ProtectServe.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ProtectServe.java @@ -29,9 +29,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.SplitCard; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/PunishTheEnemy.java b/Mage.Sets/src/mage/sets/dragonsmaze/PunishTheEnemy.java index 7aa63ff9c56..994d545e9c7 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/PunishTheEnemy.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/PunishTheEnemy.java @@ -29,8 +29,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.target.Target; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/PyrewildShaman.java b/Mage.Sets/src/mage/sets/dragonsmaze/PyrewildShaman.java index 9d3f0c2e290..115be381990 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/PyrewildShaman.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/PyrewildShaman.java @@ -31,10 +31,10 @@ package mage.sets.dragonsmaze; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/RakdosCluestone.java b/Mage.Sets/src/mage/sets/dragonsmaze/RakdosCluestone.java index 90ea3aaebcd..d9c81f86f17 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/RakdosCluestone.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/RakdosCluestone.java @@ -29,9 +29,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/RakdosDrake.java b/Mage.Sets/src/mage/sets/dragonsmaze/RakdosDrake.java index 2cf1ed0f429..0ff36b7c049 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/RakdosDrake.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/RakdosDrake.java @@ -29,13 +29,14 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.UnleashAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -51,7 +52,7 @@ public class RakdosDrake extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Other creatures you control"); static { filter.add(new AnotherPredicate()); - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public RakdosDrake (UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/RalZarek.java b/Mage.Sets/src/mage/sets/dragonsmaze/RalZarek.java index cea078dfd9e..0a204817e9a 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/RalZarek.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/RalZarek.java @@ -28,9 +28,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.EntersBattlefieldAbility; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ReadyWilling.java b/Mage.Sets/src/mage/sets/dragonsmaze/ReadyWilling.java index 8748018b3b7..29724941ea4 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ReadyWilling.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ReadyWilling.java @@ -28,9 +28,10 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.Effect; import mage.abilities.effects.common.UntapAllControllerEffect; import mage.abilities.effects.common.continious.GainAbilityAllEffect; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ReapIntellect.java b/Mage.Sets/src/mage/sets/dragonsmaze/ReapIntellect.java index 3d74b6c0564..3f6a166061a 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ReapIntellect.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ReapIntellect.java @@ -29,11 +29,11 @@ package mage.sets.dragonsmaze; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -86,7 +86,7 @@ class ReapIntellectEffect extends OneShotEffect { } public ReapIntellectEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "Target opponent reveals his or her hand. You choose up to X nonland cards from it and exile them. For each card exiled this way, search that player's graveyard, hand, and library for any number of cards with the same name as that card and exile them. Then that player shuffles his or her library"; } @@ -120,17 +120,17 @@ class ReapIntellectEffect extends OneShotEffect { Card card = game.getCard(cardId); // cards in Graveyard - Cards cardsInGraveyard = new CardsImpl(Constants.Zone.GRAVEYARD); + Cards cardsInGraveyard = new CardsImpl(Zone.GRAVEYARD); cardsInGraveyard.addAll(targetPlayer.getGraveyard()); you.lookAtCards("Reap Intellect search of Graveyard", cardsInGraveyard, game); // cards in Hand - Cards cardsInHand = new CardsImpl(Constants.Zone.HAND); + Cards cardsInHand = new CardsImpl(Zone.HAND); cardsInHand.addAll(targetPlayer.getHand()); you.lookAtCards("Reap Intellect search of Hand", cardsInHand, game); //cards in Library - Cards cardsInLibrary = new CardsImpl(Constants.Zone.LIBRARY); + Cards cardsInLibrary = new CardsImpl(Zone.LIBRARY); cardsInLibrary.addAll(targetPlayer.getLibrary().getCards(game)); you.lookAtCards("Reap Intellect search of Library", cardsInLibrary, game); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/RenderSilent.java b/Mage.Sets/src/mage/sets/dragonsmaze/RenderSilent.java index 4c8e1592be6..88bb98452c5 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/RenderSilent.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/RenderSilent.java @@ -29,15 +29,16 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.MulticoloredPredicate; import mage.game.Game; @@ -118,7 +119,7 @@ class RenderSilentCounterEffect extends OneShotEffect class RenderSilentEffect extends ReplacementEffectImpl { public RenderSilentEffect() { - super(Constants.Duration.EndOfTurn, Constants.Outcome.Benefit); + super(Duration.EndOfTurn, Outcome.Benefit); staticText = "Its controller can't cast spells this turn"; } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/RenegadeKrasis.java b/Mage.Sets/src/mage/sets/dragonsmaze/RenegadeKrasis.java index 67ed7862a49..28e34cc1534 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/RenegadeKrasis.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/RenegadeKrasis.java @@ -29,9 +29,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.counter.AddCountersAllEffect; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/RenounceTheGuilds.java b/Mage.Sets/src/mage/sets/dragonsmaze/RenounceTheGuilds.java index b474a146579..05cf351cd06 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/RenounceTheGuilds.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/RenounceTheGuilds.java @@ -29,8 +29,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.SacrificeAllEffect; import mage.cards.CardImpl; import mage.filter.common.FilterControlledPermanent; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/RestoreThePeace.java b/Mage.Sets/src/mage/sets/dragonsmaze/RestoreThePeace.java index 96e031e6347..54302fd8c56 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/RestoreThePeace.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/RestoreThePeace.java @@ -28,10 +28,10 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/RiotControl.java b/Mage.Sets/src/mage/sets/dragonsmaze/RiotControl.java index 4a829e78d88..ce9fe285477 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/RiotControl.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/RiotControl.java @@ -29,14 +29,15 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.PreventAllDamageToControllerEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; @@ -50,7 +51,7 @@ public class RiotControl extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature your opponents control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT)); + filter.add(new ControllerPredicate(TargetController.OPPONENT)); } public RiotControl(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/RiotPiker.java b/Mage.Sets/src/mage/sets/dragonsmaze/RiotPiker.java index 0128e46fd81..05ec465793f 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/RiotPiker.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/RiotPiker.java @@ -29,8 +29,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/RotFarmSkeleton.java b/Mage.Sets/src/mage/sets/dragonsmaze/RotFarmSkeleton.java index 7cbbec1bb75..103eba65b37 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/RotFarmSkeleton.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/RotFarmSkeleton.java @@ -28,9 +28,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/RubblebeltMaaka.java b/Mage.Sets/src/mage/sets/dragonsmaze/RubblebeltMaaka.java index 64d1307addf..fae1984ad66 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/RubblebeltMaaka.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/RubblebeltMaaka.java @@ -29,13 +29,14 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.BloodrushAbility; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -54,7 +55,7 @@ public class RubblebeltMaaka extends CardImpl { this.toughness = new MageInt(3); // Bloodrush — {R}, Discard Rubblebelt Maaka: Target attacking creature gets +3/+3 until end of turn. - this.addAbility(new BloodrushAbility("{R}", new BoostTargetEffect(3,3,Constants.Duration.EndOfTurn))); + this.addAbility(new BloodrushAbility("{R}", new BoostTargetEffect(3,3, Duration.EndOfTurn))); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/RunnersBane.java b/Mage.Sets/src/mage/sets/dragonsmaze/RunnersBane.java index d8ee62d75e2..0ab3c8c5428 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/RunnersBane.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/RunnersBane.java @@ -28,10 +28,10 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +40,7 @@ import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.SkipEnchantedUntapEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; @@ -69,7 +70,7 @@ public class RunnersBane extends CardImpl { // Enchant creature with power 3 or less TargetPermanent auraTarget = new TargetCreaturePermanent(filter); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.UnboostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); @@ -91,7 +92,7 @@ public class RunnersBane extends CardImpl { class RunnersBaneEffect extends OneShotEffect { RunnersBaneEffect() { - super(Constants.Outcome.Tap); + super(Outcome.Tap); staticText = "tap enchanted creature"; } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/RuricTharTheUnbowed.java b/Mage.Sets/src/mage/sets/dragonsmaze/RuricTharTheUnbowed.java index 90a62063397..50a7151f18a 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/RuricTharTheUnbowed.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/RuricTharTheUnbowed.java @@ -28,9 +28,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.AttacksEachTurnStaticAbility; @@ -39,6 +39,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.VigilanceAbility; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.stack.Spell; @@ -88,7 +89,7 @@ public class RuricTharTheUnbowed extends CardImpl { class RuricTharTheUnbowedAbility extends TriggeredAbilityImpl { public RuricTharTheUnbowedAbility() { - super(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(6), false); + super(Zone.BATTLEFIELD, new DamageTargetEffect(6), false); } public RuricTharTheUnbowedAbility(final RuricTharTheUnbowedAbility ability) { diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/SaruliGatekeepers.java b/Mage.Sets/src/mage/sets/dragonsmaze/SaruliGatekeepers.java index f4efffd16a9..841ed5a5e0e 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/SaruliGatekeepers.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/SaruliGatekeepers.java @@ -29,8 +29,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.ControlsPermanentCondition; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/SavagebornHydra.java b/Mage.Sets/src/mage/sets/dragonsmaze/SavagebornHydra.java index 58a93464d47..f5dfe79fb9e 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/SavagebornHydra.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/SavagebornHydra.java @@ -28,10 +28,10 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -42,6 +42,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.DoubleStrikeAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -85,7 +86,7 @@ public class SavagebornHydra extends CardImpl { class SavageBornHydraEffect extends OneShotEffect { public SavageBornHydraEffect() { - super(Constants.Outcome.BoostCreature); + super(Outcome.BoostCreature); staticText = "with X +1/+1 counters on it"; } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ScabClanGiant.java b/Mage.Sets/src/mage/sets/dragonsmaze/ScabClanGiant.java index d4d20168c7a..3efbaa0f706 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ScabClanGiant.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ScabClanGiant.java @@ -28,15 +28,16 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; @@ -52,7 +53,7 @@ public class ScabClanGiant extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT)); + filter.add(new ControllerPredicate(TargetController.OPPONENT)); } public ScabClanGiant(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ScionOfVituGhazi.java b/Mage.Sets/src/mage/sets/dragonsmaze/ScionOfVituGhazi.java index 8048248f487..5d3c11bee63 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ScionOfVituGhazi.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ScionOfVituGhazi.java @@ -29,8 +29,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/SelesnyaCluestone.java b/Mage.Sets/src/mage/sets/dragonsmaze/SelesnyaCluestone.java index 9f2b361396f..2bef665eec3 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/SelesnyaCluestone.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/SelesnyaCluestone.java @@ -29,9 +29,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/Showstopper.java b/Mage.Sets/src/mage/sets/dragonsmaze/Showstopper.java index cc6366fef41..17470acb911 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/Showstopper.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/Showstopper.java @@ -28,10 +28,10 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.abilities.TriggeredAbility; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.Effect; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/SimicCluestone.java b/Mage.Sets/src/mage/sets/dragonsmaze/SimicCluestone.java index 83e44b2c988..1a0e3f8ffc1 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/SimicCluestone.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/SimicCluestone.java @@ -29,9 +29,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/SinCollector.java b/Mage.Sets/src/mage/sets/dragonsmaze/SinCollector.java index 57efd71b39e..643be1280aa 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/SinCollector.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/SinCollector.java @@ -29,10 +29,10 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/SinisterPossession.java b/Mage.Sets/src/mage/sets/dragonsmaze/SinisterPossession.java index 1842754e76a..0ccc65ebc39 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/SinisterPossession.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/SinisterPossession.java @@ -28,10 +28,10 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.AttacksOrBlocksEnchantedTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/SireOfInsanity.java b/Mage.Sets/src/mage/sets/dragonsmaze/SireOfInsanity.java index fd7b430e0b1..f903f2a7c31 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/SireOfInsanity.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/SireOfInsanity.java @@ -28,15 +28,16 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; @@ -76,7 +77,7 @@ public class SireOfInsanity extends CardImpl { class SireOfInsanityEffect extends OneShotEffect { SireOfInsanityEffect() { - super(Constants.Outcome.Discard); + super(Outcome.Discard); staticText = "each player discards his or her hand"; } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/Skylasher.java b/Mage.Sets/src/mage/sets/dragonsmaze/Skylasher.java index eb7468b30f5..1ad970c873c 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/Skylasher.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/Skylasher.java @@ -29,8 +29,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.CantCounterAbility; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/SmeltWardGatekeepers.java b/Mage.Sets/src/mage/sets/dragonsmaze/SmeltWardGatekeepers.java index 20779c8685b..413cd212c5b 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/SmeltWardGatekeepers.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/SmeltWardGatekeepers.java @@ -29,11 +29,11 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -77,7 +77,7 @@ public class SmeltWardGatekeepers extends CardImpl { // When Smelt-Ward Gatekeepers enters the battlefield, if you control two or more Gates, gain control of target creature an opponent controls until end of turn. Untap that creature. That creature gains haste until end of turn. Ability ability = new ConditionalTriggeredAbility( - new EntersBattlefieldTriggeredAbility(new GainControlTargetEffect(Constants.Duration.EndOfTurn)), + new EntersBattlefieldTriggeredAbility(new GainControlTargetEffect(Duration.EndOfTurn)), new ControlsPermanentCondition(filter, ControlsPermanentCondition.CountType.MORE_THAN, 1), "When {this} enters the battlefield, if you control two or more Gates, gain control of target creature an opponent controls until end of turn. Untap that creature. That creature gains haste until end of turn."); ability.addEffect(new UntapTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/SpeciesGorger.java b/Mage.Sets/src/mage/sets/dragonsmaze/SpeciesGorger.java index 723670b31af..40b92b5685a 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/SpeciesGorger.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/SpeciesGorger.java @@ -28,10 +28,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -60,7 +58,7 @@ public class SpeciesGorger extends CardImpl { this.toughness = new MageInt(6); // At the beginning of your upkeep, return a creature you control to its owner's hand. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandChooseEffect(), TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new ReturnToHandChooseEffect(), TargetController.YOU, false)); } @@ -77,7 +75,7 @@ public class SpeciesGorger extends CardImpl { class ReturnToHandChooseEffect extends OneShotEffect { public ReturnToHandChooseEffect() { - super(Constants.Outcome.ReturnToHand); + super(Outcome.ReturnToHand); this.staticText = "return a creature you control to its owner's hand"; } @@ -99,7 +97,7 @@ class ReturnToHandChooseEffect extends OneShotEffect { if (player.choose(this.outcome, target, source.getSourceId(), game)) { Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null) { - return permanent.moveToZone(Constants.Zone.HAND, source.getId(), game, false); + return permanent.moveToZone(Zone.HAND, source.getId(), game, false); } } return true; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/SpikeJester.java b/Mage.Sets/src/mage/sets/dragonsmaze/SpikeJester.java index 7826f054007..cc2d79eea61 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/SpikeJester.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/SpikeJester.java @@ -28,8 +28,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/SteepleRoc.java b/Mage.Sets/src/mage/sets/dragonsmaze/SteepleRoc.java index 6d5190da400..bdfb43849d4 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/SteepleRoc.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/SteepleRoc.java @@ -29,8 +29,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/SunspireGatekeepers.java b/Mage.Sets/src/mage/sets/dragonsmaze/SunspireGatekeepers.java index da13e2aa95f..71eabb4b3a1 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/SunspireGatekeepers.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/SunspireGatekeepers.java @@ -29,8 +29,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.ControlsPermanentCondition; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/TajicBladeOfTheLegion.java b/Mage.Sets/src/mage/sets/dragonsmaze/TajicBladeOfTheLegion.java index 4e3cf250ccc..02458999777 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/TajicBladeOfTheLegion.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/TajicBladeOfTheLegion.java @@ -28,9 +28,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.BattalionAbility; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/TeysaEnvoyOfGhosts.java b/Mage.Sets/src/mage/sets/dragonsmaze/TeysaEnvoyOfGhosts.java index 7cdb6b25356..f3735c739dd 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/TeysaEnvoyOfGhosts.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/TeysaEnvoyOfGhosts.java @@ -28,9 +28,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.CreateTokenEffect; @@ -39,6 +39,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; @@ -87,7 +88,7 @@ public class TeysaEnvoyOfGhosts extends CardImpl { class TeysaEnvoyOfGhostsTriggeredAbility extends TriggeredAbilityImpl { public TeysaEnvoyOfGhostsTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect()); + super(Zone.BATTLEFIELD, new DestroyTargetEffect()); this.addEffect(new CreateTokenEffect(new TeysaEnvoyOfGhostsToken(), 1)); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ThrashingMossdog.java b/Mage.Sets/src/mage/sets/dragonsmaze/ThrashingMossdog.java index be7103e3f8f..6d70ce67a1e 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ThrashingMossdog.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ThrashingMossdog.java @@ -29,8 +29,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.ReachAbility; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/TitheDrinker.java b/Mage.Sets/src/mage/sets/dragonsmaze/TitheDrinker.java index bd05385835c..b8c8f9f3d5a 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/TitheDrinker.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/TitheDrinker.java @@ -28,8 +28,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.LifelinkAbility; import mage.abilities.keyword.ExtortAbility; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ToilTrouble.java b/Mage.Sets/src/mage/sets/dragonsmaze/ToilTrouble.java index 89fb71e2059..aaf6a80a306 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ToilTrouble.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ToilTrouble.java @@ -29,8 +29,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/TrostanisSummoner.java b/Mage.Sets/src/mage/sets/dragonsmaze/TrostanisSummoner.java index 1a9dea32c35..eb75a7e8412 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/TrostanisSummoner.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/TrostanisSummoner.java @@ -28,8 +28,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/TurnBurn.java b/Mage.Sets/src/mage/sets/dragonsmaze/TurnBurn.java index 9536ef0a533..cd584d7718f 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/TurnBurn.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/TurnBurn.java @@ -28,10 +28,10 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.effects.Effect; @@ -86,7 +86,7 @@ public class TurnBurn extends SplitCard { private WeirdToken() { super("Weird", "0/1 red Weird"); - cardType.add(Constants.CardType.CREATURE); + cardType.add(CardType.CREATURE); color = ObjectColor.RED; subtype.add("Weird"); power = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/UbulSarGatekeepers.java b/Mage.Sets/src/mage/sets/dragonsmaze/UbulSarGatekeepers.java index 1bae1297c7b..57ec0b2d7f1 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/UbulSarGatekeepers.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/UbulSarGatekeepers.java @@ -29,9 +29,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/UncoveredClues.java b/Mage.Sets/src/mage/sets/dragonsmaze/UncoveredClues.java index 040a2b45757..3828647a5ca 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/UncoveredClues.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/UncoveredClues.java @@ -29,8 +29,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; import mage.cards.CardImpl; import mage.filter.FilterCard; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/UnflinchingCourage.java b/Mage.Sets/src/mage/sets/dragonsmaze/UnflinchingCourage.java index 7da91dbbfbf..8a1b4c29474 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/UnflinchingCourage.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/UnflinchingCourage.java @@ -28,12 +28,12 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -43,6 +43,7 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.LifelinkAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -63,7 +64,7 @@ public class UnflinchingCourage extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/VarolzTheScarStriped.java b/Mage.Sets/src/mage/sets/dragonsmaze/VarolzTheScarStriped.java index 69aec8c54ae..0f47a1ae9ae 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/VarolzTheScarStriped.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/VarolzTheScarStriped.java @@ -28,10 +28,10 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +43,10 @@ import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.ScavengeAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; @@ -93,7 +97,7 @@ public class VarolzTheScarStriped extends CardImpl { class VarolzTheScarStripedEffect extends ContinuousEffectImpl { VarolzTheScarStripedEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Layer.AbilityAddingRemovingEffects_6, Constants.SubLayer.NA, Constants.Outcome.AddAbility); + super(Duration.WhileOnBattlefield, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility); staticText = "Each creature card in your graveyard has scavenge. The scavenge cost is equal to its mana cost"; } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ViashinoFirstblade.java b/Mage.Sets/src/mage/sets/dragonsmaze/ViashinoFirstblade.java index bb79fc6c16f..535d7d3a80e 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ViashinoFirstblade.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ViashinoFirstblade.java @@ -28,9 +28,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/VoiceOfResurgence.java b/Mage.Sets/src/mage/sets/dragonsmaze/VoiceOfResurgence.java index 4a2522832df..9a00ab30810 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/VoiceOfResurgence.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/VoiceOfResurgence.java @@ -28,9 +28,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.MageObject; import mage.abilities.TriggeredAbilityImpl; @@ -40,6 +40,8 @@ import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; @@ -81,7 +83,7 @@ public class VoiceOfResurgence extends CardImpl { class VoiceOfResurgenceTriggeredAbility extends TriggeredAbilityImpl { public VoiceOfResurgenceTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new VoiceOfResurgenceToken()), false); + super(Zone.BATTLEFIELD, new CreateTokenEffect(new VoiceOfResurgenceToken()), false); } public VoiceOfResurgenceTriggeredAbility(final VoiceOfResurgenceTriggeredAbility ability) { @@ -102,9 +104,9 @@ class VoiceOfResurgenceTriggeredAbility extends TriggeredAbilityImpl { this.toughness = new MageInt(4); // {G}{U}, {tap}: For each counter on target artifact, creature, or land, put another of those counters on that permanent. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new VorelOfTheHullCladeEffect(), new ManaCostsImpl("{G}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VorelOfTheHullCladeEffect(), new ManaCostsImpl("{G}{U}")); ability.addTarget(new TargetPermanent(filter)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/WakeTheReflections.java b/Mage.Sets/src/mage/sets/dragonsmaze/WakeTheReflections.java index b938366a932..12f7e3637f3 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/WakeTheReflections.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/WakeTheReflections.java @@ -29,8 +29,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.PopulateEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/WarleadersHelix.java b/Mage.Sets/src/mage/sets/dragonsmaze/WarleadersHelix.java index 8a730cec892..0afe197d11b 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/WarleadersHelix.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/WarleadersHelix.java @@ -30,8 +30,8 @@ package mage.sets.dragonsmaze; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/WarpedPhysique.java b/Mage.Sets/src/mage/sets/dragonsmaze/WarpedPhysique.java index d659899bc8e..fef0fcca906 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/WarpedPhysique.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/WarpedPhysique.java @@ -29,9 +29,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.CardsInControllerHandCount; import mage.abilities.dynamicvalue.common.SignInversionDynamicValue; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/WeaponSurge.java b/Mage.Sets/src/mage/sets/dragonsmaze/WeaponSurge.java index bb10d0ca712..543938cf0ad 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/WeaponSurge.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/WeaponSurge.java @@ -29,10 +29,10 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostAllEffect; @@ -42,6 +42,7 @@ import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.OverloadAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -56,7 +57,7 @@ public class WeaponSurge extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("All creature you control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public WeaponSurge(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/WearTear.java b/Mage.Sets/src/mage/sets/dragonsmaze/WearTear.java index f1e7edca1a2..8bc5ae6051c 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/WearTear.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/WearTear.java @@ -28,8 +28,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.SplitCard; import mage.filter.common.FilterEnchantment; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/WoodlotCrawler.java b/Mage.Sets/src/mage/sets/dragonsmaze/WoodlotCrawler.java index f6b99dff59e..addbf074c90 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/WoodlotCrawler.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/WoodlotCrawler.java @@ -29,8 +29,8 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.ForestwalkAbility; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ZhurTaaAncient.java b/Mage.Sets/src/mage/sets/dragonsmaze/ZhurTaaAncient.java index d663c003446..b5b93ff68e7 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ZhurTaaAncient.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ZhurTaaAncient.java @@ -28,9 +28,9 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.Abilities; @@ -41,6 +41,7 @@ import mage.abilities.mana.TriggeredManaAbility; import mage.cards.CardImpl; import mage.choices.Choice; import mage.choices.ChoiceImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -82,7 +83,7 @@ class ZhurTaaAncientAbility extends TriggeredManaAbility private static final String staticText = "Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced."; public ZhurTaaAncientAbility() { - super(Constants.Zone.BATTLEFIELD, new ZhurTaaAncientEffect()); + super(Zone.BATTLEFIELD, new ZhurTaaAncientEffect()); } public ZhurTaaAncientAbility(ZhurTaaAncientAbility ability) { @@ -94,7 +95,7 @@ class ZhurTaaAncientAbility extends TriggeredManaAbility if (event.getType() == GameEvent.EventType.TAPPED_FOR_MANA) { Permanent permanent = game.getPermanent(event.getSourceId()); if (permanent == null) { - permanent = (Permanent) game.getLastKnownInformation(event.getSourceId(), Constants.Zone.BATTLEFIELD); + permanent = (Permanent) game.getLastKnownInformation(event.getSourceId(), Zone.BATTLEFIELD); } if (permanent != null && permanent.getCardType().contains(CardType.LAND)) { getEffects().get(0).setTargetPointer(new FixedTarget(permanent.getId())); @@ -129,7 +130,7 @@ class ZhurTaaAncientEffect extends ManaEffect { @Override public boolean apply(Game game, Ability source) { Permanent land = game.getPermanent(this.targetPointer.getFirst(game, source)); - Abilities mana = land.getAbilities().getManaAbilities(Constants.Zone.BATTLEFIELD); + Abilities mana = land.getAbilities().getManaAbilities(Zone.BATTLEFIELD); Mana types = new Mana(); for (ManaAbility ability : mana) { types.add(ability.getNetMana(game)); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ZhurTaaDruid.java b/Mage.Sets/src/mage/sets/dragonsmaze/ZhurTaaDruid.java index debc491cf7c..85702d4ec32 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ZhurTaaDruid.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ZhurTaaDruid.java @@ -28,10 +28,10 @@ package mage.sets.dragonsmaze; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DamagePlayersEffect; diff --git a/Mage.Sets/src/mage/sets/eighthedition/AmbitionsCost.java b/Mage.Sets/src/mage/sets/eighthedition/AmbitionsCost.java index d39bfc3eff7..d5b9dc83219 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/AmbitionsCost.java +++ b/Mage.Sets/src/mage/sets/eighthedition/AmbitionsCost.java @@ -28,8 +28,8 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.LoseLifeSourceEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/eighthedition/ArdentMilitia.java b/Mage.Sets/src/mage/sets/eighthedition/ArdentMilitia.java index c2f9be23fab..14581976e6c 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/ArdentMilitia.java +++ b/Mage.Sets/src/mage/sets/eighthedition/ArdentMilitia.java @@ -28,8 +28,8 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/eighthedition/BalanceOfPower.java b/Mage.Sets/src/mage/sets/eighthedition/BalanceOfPower.java index c28d160e2c3..e2e7b05942e 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/BalanceOfPower.java +++ b/Mage.Sets/src/mage/sets/eighthedition/BalanceOfPower.java @@ -28,9 +28,9 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionBlack.java b/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionBlack.java index 1532805b473..eaff8a9dcdc 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionBlack.java +++ b/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionBlack.java @@ -28,7 +28,7 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionBlue.java b/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionBlue.java index 04b5e6a64be..237a7f27648 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionBlue.java +++ b/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionBlue.java @@ -28,7 +28,7 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionGreen.java b/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionGreen.java index e8f91a3a459..3f5db20943a 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionGreen.java +++ b/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionGreen.java @@ -28,7 +28,7 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionRed.java b/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionRed.java index 81b9715c8be..bfb1235d0ef 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionRed.java +++ b/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionRed.java @@ -28,7 +28,7 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionWhite.java b/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionWhite.java index 1627cd78ea5..279804236e2 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionWhite.java +++ b/Mage.Sets/src/mage/sets/eighthedition/CircleOfProtectionWhite.java @@ -28,7 +28,7 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/eighthedition/CoralEel.java b/Mage.Sets/src/mage/sets/eighthedition/CoralEel.java index 24791f11ffb..4139256c01c 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/CoralEel.java +++ b/Mage.Sets/src/mage/sets/eighthedition/CoralEel.java @@ -27,9 +27,10 @@ */ package mage.sets.eighthedition; -import mage.Constants; import mage.MageInt; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import java.util.UUID; @@ -40,7 +41,7 @@ import java.util.UUID; public class CoralEel extends CardImpl { public CoralEel(UUID ownerId) { - super(ownerId, 70, "Coral Eel", Constants.Rarity.COMMON, new Constants.CardType[]{Constants.CardType.CREATURE}, "{1}{U}"); + super(ownerId, 70, "Coral Eel", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); this.expansionSetCode = "8ED"; this.subtype.add("Fish"); diff --git a/Mage.Sets/src/mage/sets/eighthedition/Demolish.java b/Mage.Sets/src/mage/sets/eighthedition/Demolish.java index b8d4f969513..b6c4d0089fd 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/Demolish.java +++ b/Mage.Sets/src/mage/sets/eighthedition/Demolish.java @@ -28,7 +28,7 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/eighthedition/DivingGriffin.java b/Mage.Sets/src/mage/sets/eighthedition/DivingGriffin.java index 71533e7e55c..0959a79860d 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/DivingGriffin.java +++ b/Mage.Sets/src/mage/sets/eighthedition/DivingGriffin.java @@ -28,8 +28,8 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; diff --git a/Mage.Sets/src/mage/sets/eighthedition/DwarvenDemolitionTeam.java b/Mage.Sets/src/mage/sets/eighthedition/DwarvenDemolitionTeam.java index 270ef324b4d..a509612dd67 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/DwarvenDemolitionTeam.java +++ b/Mage.Sets/src/mage/sets/eighthedition/DwarvenDemolitionTeam.java @@ -28,15 +28,16 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; @@ -63,7 +64,7 @@ public class DwarvenDemolitionTeam extends CardImpl { this.toughness = new MageInt(1); // {tap}: Destroy target Wall. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eighthedition/EliteJavelineer.java b/Mage.Sets/src/mage/sets/eighthedition/EliteJavelineer.java index 3aa1bd2ba73..f0ee50b7f2e 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/EliteJavelineer.java +++ b/Mage.Sets/src/mage/sets/eighthedition/EliteJavelineer.java @@ -28,7 +28,7 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/eighthedition/ElvishLyrist.java b/Mage.Sets/src/mage/sets/eighthedition/ElvishLyrist.java index 44c8a557b32..f9228a7a0b1 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/ElvishLyrist.java +++ b/Mage.Sets/src/mage/sets/eighthedition/ElvishLyrist.java @@ -28,7 +28,7 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/eighthedition/FlashCounter.java b/Mage.Sets/src/mage/sets/eighthedition/FlashCounter.java index 8c7ca72af47..f0ffc983df4 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/FlashCounter.java +++ b/Mage.Sets/src/mage/sets/eighthedition/FlashCounter.java @@ -28,8 +28,8 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; diff --git a/Mage.Sets/src/mage/sets/eighthedition/GiantBadger.java b/Mage.Sets/src/mage/sets/eighthedition/GiantBadger.java index cbe05f96619..9e4b52b4845 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/GiantBadger.java +++ b/Mage.Sets/src/mage/sets/eighthedition/GiantBadger.java @@ -28,13 +28,14 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -52,7 +53,7 @@ public class GiantBadger extends CardImpl { this.toughness = new MageInt(2); // Whenever Giant Badger blocks, it gets +2/+2 until end of turn. - this.addAbility(new BlocksTriggeredAbility(new BoostSourceEffect(2, 2, Constants.Duration.EndOfTurn), false)); + this.addAbility(new BlocksTriggeredAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), false)); } public GiantBadger(final GiantBadger card) { diff --git a/Mage.Sets/src/mage/sets/eighthedition/Larceny.java b/Mage.Sets/src/mage/sets/eighthedition/Larceny.java index 727a6aee7f7..1319c78968b 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/Larceny.java +++ b/Mage.Sets/src/mage/sets/eighthedition/Larceny.java @@ -28,7 +28,7 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/eighthedition/LavaHounds.java b/Mage.Sets/src/mage/sets/eighthedition/LavaHounds.java index 999dd66c359..2608f324b58 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/LavaHounds.java +++ b/Mage.Sets/src/mage/sets/eighthedition/LavaHounds.java @@ -28,7 +28,7 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/eighthedition/LightningBlast.java b/Mage.Sets/src/mage/sets/eighthedition/LightningBlast.java index 72612b108b3..0796e4eefd5 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/LightningBlast.java +++ b/Mage.Sets/src/mage/sets/eighthedition/LightningBlast.java @@ -28,7 +28,7 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/eighthedition/LoneWolf.java b/Mage.Sets/src/mage/sets/eighthedition/LoneWolf.java index 1b379b9e1f9..ff8b8b3e61d 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/LoneWolf.java +++ b/Mage.Sets/src/mage/sets/eighthedition/LoneWolf.java @@ -28,7 +28,7 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/eighthedition/MerchantScroll.java b/Mage.Sets/src/mage/sets/eighthedition/MerchantScroll.java index 073a1a5e59e..39b91057df9 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/MerchantScroll.java +++ b/Mage.Sets/src/mage/sets/eighthedition/MerchantScroll.java @@ -28,8 +28,8 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/eighthedition/MossMonster.java b/Mage.Sets/src/mage/sets/eighthedition/MossMonster.java index 87104d113c7..0f182b63991 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/MossMonster.java +++ b/Mage.Sets/src/mage/sets/eighthedition/MossMonster.java @@ -28,8 +28,8 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/eighthedition/PeachGardenOath.java b/Mage.Sets/src/mage/sets/eighthedition/PeachGardenOath.java index a6a8a4047a2..264718c3181 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/PeachGardenOath.java +++ b/Mage.Sets/src/mage/sets/eighthedition/PeachGardenOath.java @@ -28,8 +28,8 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/eighthedition/PhyrexianHulk.java b/Mage.Sets/src/mage/sets/eighthedition/PhyrexianHulk.java index f8cf0d9699d..1bbef5b6c76 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/PhyrexianHulk.java +++ b/Mage.Sets/src/mage/sets/eighthedition/PhyrexianHulk.java @@ -28,7 +28,7 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/eighthedition/PrimevalForce.java b/Mage.Sets/src/mage/sets/eighthedition/PrimevalForce.java index 3c47ebd4107..817033a77dd 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/PrimevalForce.java +++ b/Mage.Sets/src/mage/sets/eighthedition/PrimevalForce.java @@ -28,8 +28,8 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.common.SacrificeTargetCost; diff --git a/Mage.Sets/src/mage/sets/eighthedition/Rewind.java b/Mage.Sets/src/mage/sets/eighthedition/Rewind.java index a05fd8eb2ae..8805b35122b 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/Rewind.java +++ b/Mage.Sets/src/mage/sets/eighthedition/Rewind.java @@ -28,7 +28,7 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/eighthedition/SageOfLatNam.java b/Mage.Sets/src/mage/sets/eighthedition/SageOfLatNam.java index 974c670ca50..fb3305d382f 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/SageOfLatNam.java +++ b/Mage.Sets/src/mage/sets/eighthedition/SageOfLatNam.java @@ -28,7 +28,7 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/eighthedition/SavannahLions.java b/Mage.Sets/src/mage/sets/eighthedition/SavannahLions.java index a55b65c8b33..b99a3b7e1bd 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/SavannahLions.java +++ b/Mage.Sets/src/mage/sets/eighthedition/SavannahLions.java @@ -28,8 +28,8 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/eighthedition/SkullOfOrm.java b/Mage.Sets/src/mage/sets/eighthedition/SkullOfOrm.java index 9d591379c98..451aaf5aeaf 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/SkullOfOrm.java +++ b/Mage.Sets/src/mage/sets/eighthedition/SkullOfOrm.java @@ -28,7 +28,7 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/eighthedition/StandingTroops.java b/Mage.Sets/src/mage/sets/eighthedition/StandingTroops.java index 8f0fbcbd246..27ce8f10fda 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/StandingTroops.java +++ b/Mage.Sets/src/mage/sets/eighthedition/StandingTroops.java @@ -28,8 +28,8 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/eighthedition/StreamOfLife.java b/Mage.Sets/src/mage/sets/eighthedition/StreamOfLife.java index f2207d4081c..1a68a48febd 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/StreamOfLife.java +++ b/Mage.Sets/src/mage/sets/eighthedition/StreamOfLife.java @@ -28,7 +28,7 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/eighthedition/UrzasArmor.java b/Mage.Sets/src/mage/sets/eighthedition/UrzasArmor.java index a7fe6ddf096..6806941ec6b 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/UrzasArmor.java +++ b/Mage.Sets/src/mage/sets/eighthedition/UrzasArmor.java @@ -28,7 +28,7 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/eighthedition/VampiricSpirit.java b/Mage.Sets/src/mage/sets/eighthedition/VampiricSpirit.java index 06cfb5acd31..f4ac5c2b1a6 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/VampiricSpirit.java +++ b/Mage.Sets/src/mage/sets/eighthedition/VampiricSpirit.java @@ -28,8 +28,8 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LoseLifeControllerEffect; diff --git a/Mage.Sets/src/mage/sets/eighthedition/WallOfSpears.java b/Mage.Sets/src/mage/sets/eighthedition/WallOfSpears.java index f38fc6f6a72..07ba06267fc 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/WallOfSpears.java +++ b/Mage.Sets/src/mage/sets/eighthedition/WallOfSpears.java @@ -28,7 +28,7 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/eighthedition/WrathOfMaritLage.java b/Mage.Sets/src/mage/sets/eighthedition/WrathOfMaritLage.java index bd2ff12032e..5a21da8e2cd 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/WrathOfMaritLage.java +++ b/Mage.Sets/src/mage/sets/eighthedition/WrathOfMaritLage.java @@ -28,7 +28,7 @@ package mage.sets.eighthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/AEtherSpellbomb.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/AEtherSpellbomb.java index 0396fe1e093..c1c3231bf8a 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/AEtherSpellbomb.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/AEtherSpellbomb.java @@ -28,9 +28,9 @@ package mage.sets.elspethvstezzeret; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.GenericManaCost; diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/ArgivianRestoration.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/ArgivianRestoration.java index 77f5b89ec3e..6dcaff765b0 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/ArgivianRestoration.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/ArgivianRestoration.java @@ -28,8 +28,8 @@ package mage.sets.elspethvstezzeret; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterArtifactCard; diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/BurrentonBombardier.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/BurrentonBombardier.java index fec06937429..10babe48f3b 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/BurrentonBombardier.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/BurrentonBombardier.java @@ -29,8 +29,8 @@ package mage.sets.elspethvstezzeret; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/CelestialCrusader.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/CelestialCrusader.java index 1d6a50a9a5a..8728903abfb 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/CelestialCrusader.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/CelestialCrusader.java @@ -29,9 +29,8 @@ package mage.sets.elspethvstezzeret; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +39,8 @@ import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.SplitSecondAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; @@ -66,7 +67,7 @@ public class CelestialCrusader extends CardImpl { this.addAbility(FlashAbility.getInstance()); this.addAbility(SplitSecondAbility.getInstance()); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Constants.Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); } public CelestialCrusader(final CelestialCrusader card) { diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/ConclaveEquenaut.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/ConclaveEquenaut.java index fad72b7e9e2..4a3e4b50500 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/ConclaveEquenaut.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/ConclaveEquenaut.java @@ -28,8 +28,8 @@ package mage.sets.elspethvstezzeret; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ConvokeAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/ConclavePhalanx.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/ConclavePhalanx.java index 6bc8b3ce544..cd264276d64 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/ConclavePhalanx.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/ConclavePhalanx.java @@ -28,8 +28,8 @@ package mage.sets.elspethvstezzeret; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/Crusade.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/Crusade.java index dc1738338c0..766e27e5421 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/Crusade.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/Crusade.java @@ -28,10 +28,10 @@ package mage.sets.elspethvstezzeret; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostAllEffect; diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/DaruEncampment.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/DaruEncampment.java index 88edc2d0060..25897a2cfdd 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/DaruEncampment.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/DaruEncampment.java @@ -28,10 +28,10 @@ package mage.sets.elspethvstezzeret; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/EchoingTruth.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/EchoingTruth.java index 8ce10ba5297..2b2cf677b86 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/EchoingTruth.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/EchoingTruth.java @@ -28,10 +28,10 @@ package mage.sets.elspethvstezzeret; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/Frogmite.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/Frogmite.java index fe3a0784cc4..a8f149c411f 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/Frogmite.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/Frogmite.java @@ -28,8 +28,8 @@ package mage.sets.elspethvstezzeret; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.AffinityForArtifactsAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/GoldmeadowHarrier.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/GoldmeadowHarrier.java index 3a73c04019a..81de74387fc 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/GoldmeadowHarrier.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/GoldmeadowHarrier.java @@ -30,9 +30,8 @@ package mage.sets.elspethvstezzeret; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -56,7 +56,7 @@ public class GoldmeadowHarrier extends CardImpl { this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/MishrasFactory.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/MishrasFactory.java index ee67a7c42df..f77983be365 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/MishrasFactory.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/MishrasFactory.java @@ -28,10 +28,10 @@ package mage.sets.elspethvstezzeret; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/MoongloveExtract.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/MoongloveExtract.java index a5cc0d06a4a..a80cded6a66 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/MoongloveExtract.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/MoongloveExtract.java @@ -28,9 +28,9 @@ package mage.sets.elspethvstezzeret; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/MosquitoGuard.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/MosquitoGuard.java index e0466801971..9b0413a0f8a 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/MosquitoGuard.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/MosquitoGuard.java @@ -29,8 +29,8 @@ package mage.sets.elspethvstezzeret; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/Pentavus.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/Pentavus.java index eeead992bd0..541b3a45bdb 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/Pentavus.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/Pentavus.java @@ -29,9 +29,8 @@ package mage.sets.elspethvstezzeret; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -43,6 +42,7 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -68,10 +68,10 @@ public class Pentavus extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(0); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(5)))); - Ability firstAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new PentaviteToken(), 1), new GenericManaCost(1)); + Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new PentaviteToken(), 1), new GenericManaCost(1)); firstAbility.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); this.addAbility(firstAbility); - Ability secondAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(1)); + Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(1)); secondAbility.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); this.addAbility(secondAbility); } @@ -89,8 +89,8 @@ public class Pentavus extends CardImpl { class PentaviteToken extends Token { public PentaviteToken() { super("Pentavite", "1/1 colorless Pentavite artifact creature token with flying"); - cardType.add(Constants.CardType.ARTIFACT); - cardType.add(Constants.CardType.CREATURE); + cardType.add(CardType.ARTIFACT); + cardType.add(CardType.CREATURE); subtype.add("Pentavite"); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/Qumulox.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/Qumulox.java index 67f6fe85633..31d27361b53 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/Qumulox.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/Qumulox.java @@ -28,8 +28,8 @@ package mage.sets.elspethvstezzeret; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.AffinityForArtifactsAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/SeasonedMarshal.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/SeasonedMarshal.java index fdc0fb9b9f4..df039b540f0 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/SeasonedMarshal.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/SeasonedMarshal.java @@ -28,8 +28,8 @@ package mage.sets.elspethvstezzeret; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/TempleAcolyte.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/TempleAcolyte.java index e646fabd2c4..f715b4bc576 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/TempleAcolyte.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/TempleAcolyte.java @@ -29,8 +29,8 @@ package mage.sets.elspethvstezzeret; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/Thoughtcast.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/Thoughtcast.java index badfb670f60..3bdb607dc81 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/Thoughtcast.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/Thoughtcast.java @@ -28,8 +28,8 @@ package mage.sets.elspethvstezzeret; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.keyword.AffinityForArtifactsAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/TrinketMage.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/TrinketMage.java index 38c2de6515c..629847cc9b6 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/TrinketMage.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/TrinketMage.java @@ -29,7 +29,7 @@ package mage.sets.elspethvstezzeret; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/TripNoose.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/TripNoose.java index 9a951ca5c94..312a15185f7 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/TripNoose.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/TripNoose.java @@ -28,9 +28,9 @@ package mage.sets.elspethvstezzeret; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/eventide/ArchonOfJustice.java b/Mage.Sets/src/mage/sets/eventide/ArchonOfJustice.java index 87a044c21b1..a772de48903 100644 --- a/Mage.Sets/src/mage/sets/eventide/ArchonOfJustice.java +++ b/Mage.Sets/src/mage/sets/eventide/ArchonOfJustice.java @@ -28,8 +28,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher.java b/Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher.java index b586620e9a2..8e684d6e3cc 100644 --- a/Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher.java +++ b/Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher.java @@ -30,13 +30,13 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.SacrificeTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; @@ -76,7 +76,7 @@ public class AshlingTheExtinguisher extends CardImpl { class AshlingTheExtinguisherTriggeredAbility extends TriggeredAbilityImpl { public AshlingTheExtinguisherTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new SacrificeTargetEffect()); + super(Zone.BATTLEFIELD, new SacrificeTargetEffect()); this.addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/eventide/BalefireLiege.java b/Mage.Sets/src/mage/sets/eventide/BalefireLiege.java index 8e87d835206..f0f853053b5 100644 --- a/Mage.Sets/src/mage/sets/eventide/BalefireLiege.java +++ b/Mage.Sets/src/mage/sets/eventide/BalefireLiege.java @@ -28,9 +28,9 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -40,6 +40,8 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; @@ -71,8 +73,8 @@ public class BalefireLiege extends CardImpl { this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(4); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Constants.Duration.WhileOnBattlefield, filterRedCreature, true))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Constants.Duration.WhileOnBattlefield, filterWhiteCreature, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterRedCreature, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterWhiteCreature, true))); Ability ability = new SpellCastTriggeredAbility(new DamageTargetEffect(3), filterRedSpell, false); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/eventide/BallynockTrapper.java b/Mage.Sets/src/mage/sets/eventide/BallynockTrapper.java index dbae1a90c7e..bcc915e0ae7 100644 --- a/Mage.Sets/src/mage/sets/eventide/BallynockTrapper.java +++ b/Mage.Sets/src/mage/sets/eventide/BallynockTrapper.java @@ -28,9 +28,9 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -40,6 +40,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.TapTargetEffect; import mage.abilities.effects.common.UntapSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; @@ -63,7 +64,7 @@ public class BallynockTrapper extends CardImpl { this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); this.addAbility(new SpellCastTriggeredAbility(new UntapSourceEffect(), filterWhiteSpell, true)); diff --git a/Mage.Sets/src/mage/sets/eventide/BanishingKnack.java b/Mage.Sets/src/mage/sets/eventide/BanishingKnack.java index f3d80821d42..c99734e7768 100644 --- a/Mage.Sets/src/mage/sets/eventide/BanishingKnack.java +++ b/Mage.Sets/src/mage/sets/eventide/BanishingKnack.java @@ -29,15 +29,16 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterNonlandPermanent; import mage.target.TargetPermanent; @@ -55,9 +56,9 @@ public class BanishingKnack extends CardImpl { super(ownerId, 17, "Banishing Knack", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "EVE"; this.color.setBlue(true); - Ability gainedAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new TapSourceCost()); + Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new TapSourceCost()); gainedAbility.addTarget(new TargetPermanent(filter)); - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(gainedAbility, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(gainedAbility, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/eventide/BeckonApparition.java b/Mage.Sets/src/mage/sets/eventide/BeckonApparition.java index 974059441aa..de4be9b939c 100644 --- a/Mage.Sets/src/mage/sets/eventide/BeckonApparition.java +++ b/Mage.Sets/src/mage/sets/eventide/BeckonApparition.java @@ -29,8 +29,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.ExileTargetEffect; diff --git a/Mage.Sets/src/mage/sets/eventide/BelligerentHatchling.java b/Mage.Sets/src/mage/sets/eventide/BelligerentHatchling.java index d0fa745dda4..a9d574a10e4 100644 --- a/Mage.Sets/src/mage/sets/eventide/BelligerentHatchling.java +++ b/Mage.Sets/src/mage/sets/eventide/BelligerentHatchling.java @@ -28,8 +28,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/eventide/BloodiedGhost.java b/Mage.Sets/src/mage/sets/eventide/BloodiedGhost.java index a239cb8c049..b12735f7f85 100644 --- a/Mage.Sets/src/mage/sets/eventide/BloodiedGhost.java +++ b/Mage.Sets/src/mage/sets/eventide/BloodiedGhost.java @@ -29,8 +29,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/eventide/CacheRaiders.java b/Mage.Sets/src/mage/sets/eventide/CacheRaiders.java index ccfebd52da3..441942af4f0 100644 --- a/Mage.Sets/src/mage/sets/eventide/CacheRaiders.java +++ b/Mage.Sets/src/mage/sets/eventide/CacheRaiders.java @@ -29,14 +29,14 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.target.Target; import mage.target.common.TargetControlledPermanent; @@ -54,7 +54,7 @@ public class CacheRaiders extends CardImpl { this.color.setBlue(true); this.power = new MageInt(4); this.toughness = new MageInt(4); - Ability ability = new BeginningOfUpkeepTriggeredAbility(new ReturnToHandTargetEffect(), Constants.TargetController.YOU, false); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new ReturnToHandTargetEffect(), TargetController.YOU, false); Target target = new TargetControlledPermanent(); target.setRequired(true); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/sets/eventide/CascadeBluffs.java b/Mage.Sets/src/mage/sets/eventide/CascadeBluffs.java index e95c4095eba..db21e7bba34 100644 --- a/Mage.Sets/src/mage/sets/eventide/CascadeBluffs.java +++ b/Mage.Sets/src/mage/sets/eventide/CascadeBluffs.java @@ -30,8 +30,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.BasicManaEffect; diff --git a/Mage.Sets/src/mage/sets/eventide/CennsEnlistment.java b/Mage.Sets/src/mage/sets/eventide/CennsEnlistment.java index 1e0aaae972d..fd6b4cd995f 100644 --- a/Mage.Sets/src/mage/sets/eventide/CennsEnlistment.java +++ b/Mage.Sets/src/mage/sets/eventide/CennsEnlistment.java @@ -28,13 +28,14 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.RetraceAbility; import mage.cards.CardImpl; +import mage.constants.TimingRule; import mage.game.permanent.token.KithkinToken; /** @@ -52,7 +53,7 @@ public class CennsEnlistment extends CardImpl { // Put two 1/1 white Kithkin Soldier creature tokens onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new KithkinToken(), 2)); // Retrace - this.addAbility(new RetraceAbility(new ManaCostsImpl("{3}{W}"), Constants.TimingRule.SORCERY)); + this.addAbility(new RetraceAbility(new ManaCostsImpl("{3}{W}"), TimingRule.SORCERY)); } public CennsEnlistment(final CennsEnlistment card) { diff --git a/Mage.Sets/src/mage/sets/eventide/CinderPyromancer.java b/Mage.Sets/src/mage/sets/eventide/CinderPyromancer.java index a14932f2423..2f436d2f681 100644 --- a/Mage.Sets/src/mage/sets/eventide/CinderPyromancer.java +++ b/Mage.Sets/src/mage/sets/eventide/CinderPyromancer.java @@ -29,9 +29,9 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -41,6 +41,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.UntapSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetPlayer; @@ -64,7 +65,7 @@ public class CinderPyromancer extends CardImpl { this.color.setRed(true); this.power = new MageInt(0); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); this.addAbility(new SpellCastTriggeredAbility(new UntapSourceEffect(), filter, true)); diff --git a/Mage.Sets/src/mage/sets/eventide/CreakwoodGhoul.java b/Mage.Sets/src/mage/sets/eventide/CreakwoodGhoul.java index 7fbb5b3a72c..24b7b5e96e7 100644 --- a/Mage.Sets/src/mage/sets/eventide/CreakwoodGhoul.java +++ b/Mage.Sets/src/mage/sets/eventide/CreakwoodGhoul.java @@ -28,9 +28,9 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +38,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCardInGraveyard; @@ -55,7 +56,7 @@ public class CreakwoodGhoul extends CardImpl { this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl("{B/G}{B/G}")) ; + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl("{B/G}{B/G}")) ; ability.addTarget(new TargetCardInGraveyard()); ability.addEffect(new GainLifeEffect(1)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/eventide/CreakwoodLiege.java b/Mage.Sets/src/mage/sets/eventide/CreakwoodLiege.java index eb69121c18d..204995862e4 100644 --- a/Mage.Sets/src/mage/sets/eventide/CreakwoodLiege.java +++ b/Mage.Sets/src/mage/sets/eventide/CreakwoodLiege.java @@ -29,9 +29,7 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -66,9 +64,9 @@ public class CreakwoodLiege extends CardImpl { this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Constants.Duration.WhileOnBattlefield, filterBlackCreature, true))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Constants.Duration.WhileOnBattlefield, filterGreenCreature, true))); - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new CreakwoodLiegeToken(), 1), Constants.TargetController.YOU, true)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBlackCreature, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterGreenCreature, true))); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new CreakwoodLiegeToken(), 1), TargetController.YOU, true)); } public CreakwoodLiege(final CreakwoodLiege card) { diff --git a/Mage.Sets/src/mage/sets/eventide/DeathbringerLiege.java b/Mage.Sets/src/mage/sets/eventide/DeathbringerLiege.java index c7fceed1b74..8a7bacd2d80 100644 --- a/Mage.Sets/src/mage/sets/eventide/DeathbringerLiege.java +++ b/Mage.Sets/src/mage/sets/eventide/DeathbringerLiege.java @@ -29,9 +29,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -73,8 +72,8 @@ public class DeathbringerLiege extends CardImpl { this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(4); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Constants.Duration.WhileOnBattlefield, filterWhite, true))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Constants.Duration.WhileOnBattlefield, filterBlack, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterWhite, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBlack, true))); Ability ability = new SpellCastTriggeredAbility(new TapTargetEffect(), filterWhiteSpellCard, true); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); @@ -96,7 +95,7 @@ public class DeathbringerLiege extends CardImpl { class DeathbringerLiegeEffect extends OneShotEffect { DeathbringerLiegeEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); staticText = "destroy target creature if it's tapped"; } diff --git a/Mage.Sets/src/mage/sets/eventide/DeityOfScars.java b/Mage.Sets/src/mage/sets/eventide/DeityOfScars.java index bac9fa9f567..39e6603d272 100644 --- a/Mage.Sets/src/mage/sets/eventide/DeityOfScars.java +++ b/Mage.Sets/src/mage/sets/eventide/DeityOfScars.java @@ -29,9 +29,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -42,6 +41,7 @@ import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; /** @@ -60,7 +60,7 @@ public class DeityOfScars extends CardImpl { this.toughness = new MageInt(7); this.addAbility(TrampleAbility.getInstance()); this.addAbility(new EntersBattlefieldTriggeredAbility(new AddCountersSourceEffect(CounterType.M1M1.createInstance(2)))); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B/G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B/G}")); ability.addCost(new RemoveCountersSourceCost(CounterType.M1M1.createInstance())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/DivinityOfPride.java b/Mage.Sets/src/mage/sets/eventide/DivinityOfPride.java index 6f79d77e82f..b5ebbc595c8 100644 --- a/Mage.Sets/src/mage/sets/eventide/DivinityOfPride.java +++ b/Mage.Sets/src/mage/sets/eventide/DivinityOfPride.java @@ -29,10 +29,10 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/eventide/DominusOfFealty.java b/Mage.Sets/src/mage/sets/eventide/DominusOfFealty.java index 91189a0e21a..0c6ccfbd4b9 100644 --- a/Mage.Sets/src/mage/sets/eventide/DominusOfFealty.java +++ b/Mage.Sets/src/mage/sets/eventide/DominusOfFealty.java @@ -29,9 +29,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -41,6 +40,8 @@ import mage.abilities.effects.common.continious.GainControlTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.TargetController; import mage.target.TargetPermanent; /** @@ -59,9 +60,9 @@ public class DominusOfFealty extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new BeginningOfUpkeepTriggeredAbility(new GainControlTargetEffect(Constants.Duration.EndOfTurn), Constants.TargetController.YOU, true); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new GainControlTargetEffect(Duration.EndOfTurn), TargetController.YOU, true); ability.addEffect(new UntapTargetEffect()); - ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Constants.Duration.EndOfTurn)); + ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/DoubleCleave.java b/Mage.Sets/src/mage/sets/eventide/DoubleCleave.java index 308a590a1b8..35d6ed47f89 100644 --- a/Mage.Sets/src/mage/sets/eventide/DoubleCleave.java +++ b/Mage.Sets/src/mage/sets/eventide/DoubleCleave.java @@ -29,12 +29,12 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.DoubleStrikeAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -48,7 +48,7 @@ public class DoubleCleave extends CardImpl { this.expansionSetCode = "EVE"; this.color.setRed(true); this.color.setWhite(true); - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/eventide/DrainTheWell.java b/Mage.Sets/src/mage/sets/eventide/DrainTheWell.java index c5ae5e9dba7..536413144f9 100644 --- a/Mage.Sets/src/mage/sets/eventide/DrainTheWell.java +++ b/Mage.Sets/src/mage/sets/eventide/DrainTheWell.java @@ -28,8 +28,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/eventide/DuergarCaveGuard.java b/Mage.Sets/src/mage/sets/eventide/DuergarCaveGuard.java index 415ba929abb..e892c3dff0d 100644 --- a/Mage.Sets/src/mage/sets/eventide/DuergarCaveGuard.java +++ b/Mage.Sets/src/mage/sets/eventide/DuergarCaveGuard.java @@ -29,15 +29,16 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.WitherAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -54,7 +55,7 @@ public class DuergarCaveGuard extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); this.addAbility(WitherAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Constants.Duration.EndOfTurn), new ManaCostsImpl("{R/W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R/W}"))); } public DuergarCaveGuard(final DuergarCaveGuard card) { diff --git a/Mage.Sets/src/mage/sets/eventide/FableOfWolfAndOwl.java b/Mage.Sets/src/mage/sets/eventide/FableOfWolfAndOwl.java index 9a38df2c5fd..40c0bbaf9a8 100644 --- a/Mage.Sets/src/mage/sets/eventide/FableOfWolfAndOwl.java +++ b/Mage.Sets/src/mage/sets/eventide/FableOfWolfAndOwl.java @@ -28,8 +28,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SpellCastTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/eventide/FangSkulkin.java b/Mage.Sets/src/mage/sets/eventide/FangSkulkin.java index 012534c4bca..73812ad8941 100644 --- a/Mage.Sets/src/mage/sets/eventide/FangSkulkin.java +++ b/Mage.Sets/src/mage/sets/eventide/FangSkulkin.java @@ -29,9 +29,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -40,6 +39,8 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.WitherAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; @@ -61,7 +62,7 @@ public class FangSkulkin extends CardImpl { this.subtype.add("Scarecrow"); this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityTargetEffect(WitherAbility.getInstance(), Constants.Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(WitherAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent(filterBlackCreature)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/FetidHeath.java b/Mage.Sets/src/mage/sets/eventide/FetidHeath.java index 968fa38d0e4..9db94177067 100644 --- a/Mage.Sets/src/mage/sets/eventide/FetidHeath.java +++ b/Mage.Sets/src/mage/sets/eventide/FetidHeath.java @@ -29,8 +29,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.BasicManaEffect; diff --git a/Mage.Sets/src/mage/sets/eventide/FigureOfDestiny.java b/Mage.Sets/src/mage/sets/eventide/FigureOfDestiny.java index 2052f920937..3982d150e55 100644 --- a/Mage.Sets/src/mage/sets/eventide/FigureOfDestiny.java +++ b/Mage.Sets/src/mage/sets/eventide/FigureOfDestiny.java @@ -28,10 +28,10 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.SourceMatchesFilterCondition; diff --git a/Mage.Sets/src/mage/sets/eventide/FlameJab.java b/Mage.Sets/src/mage/sets/eventide/FlameJab.java index fe250cc63c9..c6587666b83 100644 --- a/Mage.Sets/src/mage/sets/eventide/FlameJab.java +++ b/Mage.Sets/src/mage/sets/eventide/FlameJab.java @@ -28,13 +28,14 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.RetraceAbility; import mage.cards.CardImpl; +import mage.constants.TimingRule; import mage.target.common.TargetCreatureOrPlayer; /** @@ -53,7 +54,7 @@ public class FlameJab extends CardImpl { this.getSpellAbility().addEffect(new DamageTargetEffect(1)); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); // Retrace - this.addAbility(new RetraceAbility(new ManaCostsImpl("{R}"), Constants.TimingRule.SORCERY)); + this.addAbility(new RetraceAbility(new ManaCostsImpl("{R}"), TimingRule.SORCERY)); } public FlameJab(final FlameJab card) { diff --git a/Mage.Sets/src/mage/sets/eventide/Flickerwisp.java b/Mage.Sets/src/mage/sets/eventide/Flickerwisp.java index 8be29011107..a50aab361aa 100644 --- a/Mage.Sets/src/mage/sets/eventide/Flickerwisp.java +++ b/Mage.Sets/src/mage/sets/eventide/Flickerwisp.java @@ -28,10 +28,10 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/eventide/FloodedGrove.java b/Mage.Sets/src/mage/sets/eventide/FloodedGrove.java index 5810d3feaf1..0d1280dead0 100644 --- a/Mage.Sets/src/mage/sets/eventide/FloodedGrove.java +++ b/Mage.Sets/src/mage/sets/eventide/FloodedGrove.java @@ -29,8 +29,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.BasicManaEffect; diff --git a/Mage.Sets/src/mage/sets/eventide/GlenElendraArchmage.java b/Mage.Sets/src/mage/sets/eventide/GlenElendraArchmage.java index 1670544a918..a73e920bfcf 100644 --- a/Mage.Sets/src/mage/sets/eventide/GlenElendraArchmage.java +++ b/Mage.Sets/src/mage/sets/eventide/GlenElendraArchmage.java @@ -28,9 +28,9 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +40,7 @@ import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.PersistAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -70,7 +71,7 @@ public class GlenElendraArchmage extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {U}, Sacrifice Glen Elendra Archmage: Counter target noncreature spell. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl("{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl("{U}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetSpell(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/eventide/HarvestGwyllion.java b/Mage.Sets/src/mage/sets/eventide/HarvestGwyllion.java index 3bb493240fc..51cb8641465 100644 --- a/Mage.Sets/src/mage/sets/eventide/HarvestGwyllion.java +++ b/Mage.Sets/src/mage/sets/eventide/HarvestGwyllion.java @@ -28,8 +28,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.WitherAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/eventide/HearthfireHobgoblin.java b/Mage.Sets/src/mage/sets/eventide/HearthfireHobgoblin.java index 292201eb03f..f6af5a3feab 100644 --- a/Mage.Sets/src/mage/sets/eventide/HearthfireHobgoblin.java +++ b/Mage.Sets/src/mage/sets/eventide/HearthfireHobgoblin.java @@ -28,8 +28,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DoubleStrikeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/eventide/HobgoblinDragoon.java b/Mage.Sets/src/mage/sets/eventide/HobgoblinDragoon.java index 72b96a48eef..dcf9245766c 100644 --- a/Mage.Sets/src/mage/sets/eventide/HobgoblinDragoon.java +++ b/Mage.Sets/src/mage/sets/eventide/HobgoblinDragoon.java @@ -28,8 +28,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/eventide/HoofSkulkin.java b/Mage.Sets/src/mage/sets/eventide/HoofSkulkin.java index d083911c5e1..3a3143d5035 100644 --- a/Mage.Sets/src/mage/sets/eventide/HoofSkulkin.java +++ b/Mage.Sets/src/mage/sets/eventide/HoofSkulkin.java @@ -29,9 +29,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -39,6 +38,8 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; @@ -61,7 +62,7 @@ public class HoofSkulkin extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Constants.Duration.EndOfTurn), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new GenericManaCost(3)); ability.addTarget(new TargetCreaturePermanent(filterGreenCreature)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/JawboneSkulkin.java b/Mage.Sets/src/mage/sets/eventide/JawboneSkulkin.java index 0687c180bbb..f1002b27131 100644 --- a/Mage.Sets/src/mage/sets/eventide/JawboneSkulkin.java +++ b/Mage.Sets/src/mage/sets/eventide/JawboneSkulkin.java @@ -29,9 +29,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -40,6 +39,8 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; @@ -61,7 +62,7 @@ public class JawboneSkulkin extends CardImpl { this.subtype.add("Scarecrow"); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Constants.Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent(filterRedCreature)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/eventide/KithkinSpellduster.java b/Mage.Sets/src/mage/sets/eventide/KithkinSpellduster.java index 7fd961fc058..394032ac596 100644 --- a/Mage.Sets/src/mage/sets/eventide/KithkinSpellduster.java +++ b/Mage.Sets/src/mage/sets/eventide/KithkinSpellduster.java @@ -29,9 +29,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.PersistAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; @@ -69,7 +69,7 @@ public class KithkinSpellduster extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}{W}, Sacrifice Kithkin Spellduster: Destroy target enchantment. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{W}")); ability.addTarget(new TargetPermanent(filter)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/eventide/LeeringEmblem.java b/Mage.Sets/src/mage/sets/eventide/LeeringEmblem.java index 0217413eae8..967a1a63578 100644 --- a/Mage.Sets/src/mage/sets/eventide/LeeringEmblem.java +++ b/Mage.Sets/src/mage/sets/eventide/LeeringEmblem.java @@ -29,14 +29,15 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Outcome; /** * @@ -48,8 +49,8 @@ public class LeeringEmblem extends CardImpl { super(ownerId, 171, "Leering Emblem", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "EVE"; this.subtype.add("Equipment"); - this.addAbility(new SpellCastTriggeredAbility(new BoostEquippedEffect(2, 2, Constants.Duration.EndOfTurn), false)); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(2))); + this.addAbility(new SpellCastTriggeredAbility(new BoostEquippedEffect(2, 2, Duration.EndOfTurn), false)); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); } public LeeringEmblem(final LeeringEmblem card) { diff --git a/Mage.Sets/src/mage/sets/eventide/LingeringTormentor.java b/Mage.Sets/src/mage/sets/eventide/LingeringTormentor.java index 99a2e67b208..eaf4ab0ff31 100644 --- a/Mage.Sets/src/mage/sets/eventide/LingeringTormentor.java +++ b/Mage.Sets/src/mage/sets/eventide/LingeringTormentor.java @@ -28,8 +28,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FearAbility; import mage.abilities.keyword.PersistAbility; diff --git a/Mage.Sets/src/mage/sets/eventide/MerrowLevitator.java b/Mage.Sets/src/mage/sets/eventide/MerrowLevitator.java index 89ed69bb221..d9ac152902b 100644 --- a/Mage.Sets/src/mage/sets/eventide/MerrowLevitator.java +++ b/Mage.Sets/src/mage/sets/eventide/MerrowLevitator.java @@ -28,9 +28,9 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -41,6 +41,8 @@ import mage.abilities.effects.common.UntapSourceEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; @@ -66,7 +68,7 @@ public class MerrowLevitator extends CardImpl { this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); this.addAbility(new SpellCastTriggeredAbility(new UntapSourceEffect(), filterBlueSpell, true)); diff --git a/Mage.Sets/src/mage/sets/eventide/Monstrify.java b/Mage.Sets/src/mage/sets/eventide/Monstrify.java index 49020e51fc8..6e9c5a3ed84 100644 --- a/Mage.Sets/src/mage/sets/eventide/Monstrify.java +++ b/Mage.Sets/src/mage/sets/eventide/Monstrify.java @@ -28,13 +28,15 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.RetraceAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.TimingRule; import mage.target.common.TargetCreaturePermanent; /** @@ -50,10 +52,10 @@ public class Monstrify extends CardImpl { this.color.setGreen(true); // Target creature gets +4/+4 until end of turn. - this.getSpellAbility().addEffect(new BoostTargetEffect(4, 4, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(4, 4, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Retrace - this.addAbility(new RetraceAbility(new ManaCostsImpl("{3}{G}"), Constants.TimingRule.SORCERY)); + this.addAbility(new RetraceAbility(new ManaCostsImpl("{3}{G}"), TimingRule.SORCERY)); } public Monstrify(final Monstrify card) { diff --git a/Mage.Sets/src/mage/sets/eventide/NettleSentinel.java b/Mage.Sets/src/mage/sets/eventide/NettleSentinel.java index 07b65a8b9f8..ab8d8f2bb63 100644 --- a/Mage.Sets/src/mage/sets/eventide/NettleSentinel.java +++ b/Mage.Sets/src/mage/sets/eventide/NettleSentinel.java @@ -28,9 +28,9 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/eventide/NipGwyllion.java b/Mage.Sets/src/mage/sets/eventide/NipGwyllion.java index 0642c7e3e31..c670dfe5dcc 100644 --- a/Mage.Sets/src/mage/sets/eventide/NipGwyllion.java +++ b/Mage.Sets/src/mage/sets/eventide/NipGwyllion.java @@ -28,8 +28,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/eventide/NoggleBridgebreaker.java b/Mage.Sets/src/mage/sets/eventide/NoggleBridgebreaker.java index 5fe290ddb0d..3a3649704f0 100644 --- a/Mage.Sets/src/mage/sets/eventide/NoggleBridgebreaker.java +++ b/Mage.Sets/src/mage/sets/eventide/NoggleBridgebreaker.java @@ -28,8 +28,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/eventide/NoxiousHatchling.java b/Mage.Sets/src/mage/sets/eventide/NoxiousHatchling.java index 317a93e11b0..5870e58d1c2 100644 --- a/Mage.Sets/src/mage/sets/eventide/NoxiousHatchling.java +++ b/Mage.Sets/src/mage/sets/eventide/NoxiousHatchling.java @@ -28,8 +28,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/eventide/Nucklavee.java b/Mage.Sets/src/mage/sets/eventide/Nucklavee.java index f58ee2f945f..b2ffabd898c 100644 --- a/Mage.Sets/src/mage/sets/eventide/Nucklavee.java +++ b/Mage.Sets/src/mage/sets/eventide/Nucklavee.java @@ -28,8 +28,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/eventide/OdiousTrow.java b/Mage.Sets/src/mage/sets/eventide/OdiousTrow.java index 4dbd4f5130e..f9ec77a4ba5 100644 --- a/Mage.Sets/src/mage/sets/eventide/OdiousTrow.java +++ b/Mage.Sets/src/mage/sets/eventide/OdiousTrow.java @@ -29,14 +29,14 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -52,7 +52,7 @@ public class OdiousTrow extends CardImpl { this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B/G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B/G}"))); } public OdiousTrow(final OdiousTrow card) { diff --git a/Mage.Sets/src/mage/sets/eventide/OonasGrace.java b/Mage.Sets/src/mage/sets/eventide/OonasGrace.java index 8abcd33c4cc..1d78d398088 100644 --- a/Mage.Sets/src/mage/sets/eventide/OonasGrace.java +++ b/Mage.Sets/src/mage/sets/eventide/OonasGrace.java @@ -28,13 +28,14 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.keyword.RetraceAbility; import mage.cards.CardImpl; +import mage.constants.TimingRule; import mage.target.TargetPlayer; /** @@ -53,7 +54,7 @@ public class OonasGrace extends CardImpl { this.getSpellAbility().addEffect(new DrawCardTargetEffect(1)); this.getSpellAbility().addTarget(new TargetPlayer()); // Retrace - this.addAbility(new RetraceAbility(new ManaCostsImpl("{2}{U}"), Constants.TimingRule.INSTANT)); + this.addAbility(new RetraceAbility(new ManaCostsImpl("{2}{U}"), TimingRule.INSTANT)); } public OonasGrace(final OonasGrace card) { diff --git a/Mage.Sets/src/mage/sets/eventide/PunctureBlast.java b/Mage.Sets/src/mage/sets/eventide/PunctureBlast.java index 4cb04e206c3..7a3bd3b94ea 100644 --- a/Mage.Sets/src/mage/sets/eventide/PunctureBlast.java +++ b/Mage.Sets/src/mage/sets/eventide/PunctureBlast.java @@ -29,8 +29,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.WitherAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/eventide/RavensCrime.java b/Mage.Sets/src/mage/sets/eventide/RavensCrime.java index 869d4cc0868..51bdb49bfc1 100644 --- a/Mage.Sets/src/mage/sets/eventide/RavensCrime.java +++ b/Mage.Sets/src/mage/sets/eventide/RavensCrime.java @@ -28,13 +28,14 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DiscardTargetEffect; import mage.abilities.keyword.RetraceAbility; import mage.cards.CardImpl; +import mage.constants.TimingRule; import mage.target.TargetPlayer; /** @@ -53,7 +54,7 @@ public class RavensCrime extends CardImpl { this.getSpellAbility().getEffects().add(new DiscardTargetEffect(1)); this.getSpellAbility().getTargets().add(new TargetPlayer()); // Retrace - this.addAbility(new RetraceAbility(new ManaCostsImpl("{B}"), Constants.TimingRule.SORCERY)); + this.addAbility(new RetraceAbility(new ManaCostsImpl("{B}"), TimingRule.SORCERY)); } public RavensCrime(final RavensCrime card) { diff --git a/Mage.Sets/src/mage/sets/eventide/RecumbentBliss.java b/Mage.Sets/src/mage/sets/eventide/RecumbentBliss.java index 1499cb2eecf..a261fdad0a3 100644 --- a/Mage.Sets/src/mage/sets/eventide/RecumbentBliss.java +++ b/Mage.Sets/src/mage/sets/eventide/RecumbentBliss.java @@ -29,9 +29,7 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -58,11 +56,11 @@ public class RecumbentBliss extends CardImpl { this.color.setWhite(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Detriment)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new RecumbentBlissEffect())); - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new GainLifeEffect(1), Constants.TargetController.YOU, true)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new RecumbentBlissEffect())); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new GainLifeEffect(1), TargetController.YOU, true)); } public RecumbentBliss(final RecumbentBliss card) { @@ -78,7 +76,7 @@ public class RecumbentBliss extends CardImpl { class RecumbentBlissEffect extends RestrictionEffect { public RecumbentBlissEffect() { - super(Constants.Duration.WhileOnBattlefield); + super(Duration.WhileOnBattlefield); staticText = "Enchanted creature can't attack or block"; } diff --git a/Mage.Sets/src/mage/sets/eventide/RegalForce.java b/Mage.Sets/src/mage/sets/eventide/RegalForce.java index bf6d66fe925..fb8d7d972c2 100644 --- a/Mage.Sets/src/mage/sets/eventide/RegalForce.java +++ b/Mage.Sets/src/mage/sets/eventide/RegalForce.java @@ -28,8 +28,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/eventide/RendclawTrow.java b/Mage.Sets/src/mage/sets/eventide/RendclawTrow.java index 32633308064..1b675aab4b1 100644 --- a/Mage.Sets/src/mage/sets/eventide/RendclawTrow.java +++ b/Mage.Sets/src/mage/sets/eventide/RendclawTrow.java @@ -28,8 +28,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.PersistAbility; import mage.abilities.keyword.WitherAbility; diff --git a/Mage.Sets/src/mage/sets/eventide/RestlessApparition.java b/Mage.Sets/src/mage/sets/eventide/RestlessApparition.java index b26e2aa5e60..8edb8749720 100644 --- a/Mage.Sets/src/mage/sets/eventide/RestlessApparition.java +++ b/Mage.Sets/src/mage/sets/eventide/RestlessApparition.java @@ -29,15 +29,16 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.PersistAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -56,7 +57,7 @@ public class RestlessApparition extends CardImpl { this.toughness = new MageInt(2); // {WB}{WB}{WB}: Restless Apparition gets +3/+3 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(3, 3, Constants.Duration.EndOfTurn), new ManaCostsImpl("{W/B}{W/B}{W/B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3, 3, Duration.EndOfTurn), new ManaCostsImpl("{W/B}{W/B}{W/B}"))); // Persist this.addAbility(new PersistAbility()); } diff --git a/Mage.Sets/src/mage/sets/eventide/RuggedPrairie.java b/Mage.Sets/src/mage/sets/eventide/RuggedPrairie.java index fdc2c8e574a..689bd4fc4ab 100644 --- a/Mage.Sets/src/mage/sets/eventide/RuggedPrairie.java +++ b/Mage.Sets/src/mage/sets/eventide/RuggedPrairie.java @@ -29,8 +29,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.BasicManaEffect; diff --git a/Mage.Sets/src/mage/sets/eventide/SavageConception.java b/Mage.Sets/src/mage/sets/eventide/SavageConception.java index ac31a631277..30f3b903aba 100644 --- a/Mage.Sets/src/mage/sets/eventide/SavageConception.java +++ b/Mage.Sets/src/mage/sets/eventide/SavageConception.java @@ -28,13 +28,14 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.RetraceAbility; import mage.cards.CardImpl; +import mage.constants.TimingRule; import mage.game.permanent.token.BeastToken; /** @@ -52,7 +53,7 @@ public class SavageConception extends CardImpl { // Put a 3/3 green Beast creature token onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new BeastToken())); // Retrace - this.addAbility(new RetraceAbility(new ManaCostsImpl("{3}{G}{G}"), Constants.TimingRule.SORCERY)); + this.addAbility(new RetraceAbility(new ManaCostsImpl("{3}{G}{G}"), TimingRule.SORCERY)); } public SavageConception(final SavageConception card) { diff --git a/Mage.Sets/src/mage/sets/eventide/Scarecrone.java b/Mage.Sets/src/mage/sets/eventide/Scarecrone.java index 76fbb8bc6a3..4d6fd8df3f4 100644 --- a/Mage.Sets/src/mage/sets/eventide/Scarecrone.java +++ b/Mage.Sets/src/mage/sets/eventide/Scarecrone.java @@ -29,9 +29,9 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/eventide/ShellSkulkin.java b/Mage.Sets/src/mage/sets/eventide/ShellSkulkin.java index 2414f18f856..eb2be5e98f2 100644 --- a/Mage.Sets/src/mage/sets/eventide/ShellSkulkin.java +++ b/Mage.Sets/src/mage/sets/eventide/ShellSkulkin.java @@ -29,9 +29,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -40,6 +39,8 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; @@ -61,7 +62,7 @@ public class ShellSkulkin extends CardImpl { this.subtype.add("Scarecrow"); this.power = new MageInt(3); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityTargetEffect(ShroudAbility.getInstance(), Constants.Duration.EndOfTurn), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(3)); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/SlipperyBogle.java b/Mage.Sets/src/mage/sets/eventide/SlipperyBogle.java index 2d4de1b7dba..cedce2b8ee0 100644 --- a/Mage.Sets/src/mage/sets/eventide/SlipperyBogle.java +++ b/Mage.Sets/src/mage/sets/eventide/SlipperyBogle.java @@ -28,8 +28,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/eventide/SmolderingButcher.java b/Mage.Sets/src/mage/sets/eventide/SmolderingButcher.java index 6fe0074aee5..500dfd58001 100644 --- a/Mage.Sets/src/mage/sets/eventide/SmolderingButcher.java +++ b/Mage.Sets/src/mage/sets/eventide/SmolderingButcher.java @@ -29,8 +29,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.WitherAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/eventide/SoulSnuffers.java b/Mage.Sets/src/mage/sets/eventide/SoulSnuffers.java index d3b10ff3b37..be2f7d9bec7 100644 --- a/Mage.Sets/src/mage/sets/eventide/SoulSnuffers.java +++ b/Mage.Sets/src/mage/sets/eventide/SoulSnuffers.java @@ -29,8 +29,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersAllEffect; diff --git a/Mage.Sets/src/mage/sets/eventide/StalkerHag.java b/Mage.Sets/src/mage/sets/eventide/StalkerHag.java index 13f151106f5..462f49902f6 100644 --- a/Mage.Sets/src/mage/sets/eventide/StalkerHag.java +++ b/Mage.Sets/src/mage/sets/eventide/StalkerHag.java @@ -28,8 +28,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.SwampwalkAbility; import mage.abilities.keyword.ForestwalkAbility; diff --git a/Mage.Sets/src/mage/sets/eventide/StillmoonCavalier.java b/Mage.Sets/src/mage/sets/eventide/StillmoonCavalier.java index cd610a8cc13..338f9479a0c 100644 --- a/Mage.Sets/src/mage/sets/eventide/StillmoonCavalier.java +++ b/Mage.Sets/src/mage/sets/eventide/StillmoonCavalier.java @@ -28,10 +28,10 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/eventide/StreamHopper.java b/Mage.Sets/src/mage/sets/eventide/StreamHopper.java index 65e6bb24655..6acfd91992e 100644 --- a/Mage.Sets/src/mage/sets/eventide/StreamHopper.java +++ b/Mage.Sets/src/mage/sets/eventide/StreamHopper.java @@ -29,15 +29,16 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -53,7 +54,7 @@ public class StreamHopper extends CardImpl { this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn), new ManaCostsImpl("{U/R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{U/R}"))); } public StreamHopper(final StreamHopper card) { diff --git a/Mage.Sets/src/mage/sets/eventide/SturdyHatchling.java b/Mage.Sets/src/mage/sets/eventide/SturdyHatchling.java index ef8c4ac6304..57f5a515d29 100644 --- a/Mage.Sets/src/mage/sets/eventide/SturdyHatchling.java +++ b/Mage.Sets/src/mage/sets/eventide/SturdyHatchling.java @@ -28,9 +28,9 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -42,6 +42,8 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.effects.common.counter.RemoveCounterSourceEffect; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; @@ -68,7 +70,7 @@ public class SturdyHatchling extends CardImpl { this.power = new MageInt(6); this.toughness = new MageInt(6); this.addAbility(new EntersBattlefieldTriggeredAbility(new AddCountersSourceEffect(CounterType.M1M1.createInstance(4)), false)); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(ShroudAbility.getInstance(), Constants.Duration.EndOfTurn), new ManaCostsImpl("{G/U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{G/U}"))); this.addAbility(new SpellCastTriggeredAbility(new RemoveCounterSourceEffect(CounterType.M1M1.createInstance(1)), filterGreenSpell, false)); this.addAbility(new SpellCastTriggeredAbility(new RemoveCounterSourceEffect(CounterType.M1M1.createInstance(1)), filterBlueSpell, false)); } diff --git a/Mage.Sets/src/mage/sets/eventide/SutureSpirit.java b/Mage.Sets/src/mage/sets/eventide/SutureSpirit.java index e013e937609..089514c3b0a 100644 --- a/Mage.Sets/src/mage/sets/eventide/SutureSpirit.java +++ b/Mage.Sets/src/mage/sets/eventide/SutureSpirit.java @@ -29,9 +29,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -55,7 +55,7 @@ public class SutureSpirit extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{W/B}{W/B}{W/B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{W/B}{W/B}{W/B}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/SyphonLife.java b/Mage.Sets/src/mage/sets/eventide/SyphonLife.java index 3453bab3f91..b7bca0ad42f 100644 --- a/Mage.Sets/src/mage/sets/eventide/SyphonLife.java +++ b/Mage.Sets/src/mage/sets/eventide/SyphonLife.java @@ -28,14 +28,15 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.abilities.keyword.RetraceAbility; import mage.cards.CardImpl; +import mage.constants.TimingRule; import mage.target.TargetPlayer; /** @@ -55,7 +56,7 @@ public class SyphonLife extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new GainLifeEffect(2)); // Retrace - this.addAbility(new RetraceAbility(new ManaCostsImpl("{1}{B}{B}"), Constants.TimingRule.SORCERY)); + this.addAbility(new RetraceAbility(new ManaCostsImpl("{1}{B}{B}"), TimingRule.SORCERY)); } public SyphonLife(final SyphonLife card) { diff --git a/Mage.Sets/src/mage/sets/eventide/Talonrend.java b/Mage.Sets/src/mage/sets/eventide/Talonrend.java index 1a56e98c405..09b213e2983 100644 --- a/Mage.Sets/src/mage/sets/eventide/Talonrend.java +++ b/Mage.Sets/src/mage/sets/eventide/Talonrend.java @@ -29,15 +29,16 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -53,7 +54,7 @@ public class Talonrend extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Constants.Duration.EndOfTurn), new ManaCostsImpl("{U/R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl("{U/R}"))); } public Talonrend(final Talonrend card) { diff --git a/Mage.Sets/src/mage/sets/eventide/TrapjawKelpie.java b/Mage.Sets/src/mage/sets/eventide/TrapjawKelpie.java index f3c6a2e58ed..a774e1c88d4 100644 --- a/Mage.Sets/src/mage/sets/eventide/TrapjawKelpie.java +++ b/Mage.Sets/src/mage/sets/eventide/TrapjawKelpie.java @@ -28,8 +28,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.PersistAbility; diff --git a/Mage.Sets/src/mage/sets/eventide/TwilightMire.java b/Mage.Sets/src/mage/sets/eventide/TwilightMire.java index 8a8b5aa1371..fb76acd0fa6 100644 --- a/Mage.Sets/src/mage/sets/eventide/TwilightMire.java +++ b/Mage.Sets/src/mage/sets/eventide/TwilightMire.java @@ -29,8 +29,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.BasicManaEffect; diff --git a/Mage.Sets/src/mage/sets/eventide/TwinbladeSlasher.java b/Mage.Sets/src/mage/sets/eventide/TwinbladeSlasher.java index 27708e3243b..bee84141b63 100644 --- a/Mage.Sets/src/mage/sets/eventide/TwinbladeSlasher.java +++ b/Mage.Sets/src/mage/sets/eventide/TwinbladeSlasher.java @@ -29,15 +29,16 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.ActivateOncePerTurnActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.WitherAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -54,7 +55,7 @@ public class TwinbladeSlasher extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(WitherAbility.getInstance()); - this.addAbility(new ActivateOncePerTurnActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Constants.Duration.EndOfTurn), new ManaCostsImpl("{1}{G}"))); + this.addAbility(new ActivateOncePerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("{1}{G}"))); } public TwinbladeSlasher(final TwinbladeSlasher card) { diff --git a/Mage.Sets/src/mage/sets/eventide/Unmake.java b/Mage.Sets/src/mage/sets/eventide/Unmake.java index db9fbeaefeb..2bc82afb0cb 100644 --- a/Mage.Sets/src/mage/sets/eventide/Unmake.java +++ b/Mage.Sets/src/mage/sets/eventide/Unmake.java @@ -29,8 +29,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/eventide/VoraciousHatchling.java b/Mage.Sets/src/mage/sets/eventide/VoraciousHatchling.java index 45e9a848020..f5147b5bd61 100644 --- a/Mage.Sets/src/mage/sets/eventide/VoraciousHatchling.java +++ b/Mage.Sets/src/mage/sets/eventide/VoraciousHatchling.java @@ -28,8 +28,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/eventide/WakeThrasher.java b/Mage.Sets/src/mage/sets/eventide/WakeThrasher.java index b185990807b..f071c6d6fb5 100644 --- a/Mage.Sets/src/mage/sets/eventide/WakeThrasher.java +++ b/Mage.Sets/src/mage/sets/eventide/WakeThrasher.java @@ -28,14 +28,16 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -56,7 +58,7 @@ public class WakeThrasher extends CardImpl { this.toughness = new MageInt(1); // Whenever a permanent you control becomes untapped, Wake Thrasher gets +1/+1 until end of turn. - this.addAbility(new BecomesUntappedControlledPermanentTriggeredAbility(new BoostSourceEffect(1,1, Constants.Duration.EndOfTurn), false)); + this.addAbility(new BecomesUntappedControlledPermanentTriggeredAbility(new BoostSourceEffect(1,1, Duration.EndOfTurn), false)); } @@ -73,7 +75,7 @@ public class WakeThrasher extends CardImpl { class BecomesUntappedControlledPermanentTriggeredAbility extends TriggeredAbilityImpl{ public BecomesUntappedControlledPermanentTriggeredAbility(Effect effect, boolean optional) { - super(Constants.Zone.BATTLEFIELD, effect, optional); + super(Zone.BATTLEFIELD, effect, optional); } public BecomesUntappedControlledPermanentTriggeredAbility(final BecomesUntappedControlledPermanentTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/eventide/WickerboughElder.java b/Mage.Sets/src/mage/sets/eventide/WickerboughElder.java index 90784aec214..ef669295580 100644 --- a/Mage.Sets/src/mage/sets/eventide/WickerboughElder.java +++ b/Mage.Sets/src/mage/sets/eventide/WickerboughElder.java @@ -29,9 +29,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +40,8 @@ import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; @@ -69,7 +70,7 @@ public class WickerboughElder extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); this.addAbility(new EntersBattlefieldTriggeredAbility(new AddCountersSourceEffect(CounterType.M1M1.createInstance(1)), false)); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.G)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new RemoveCountersSourceCost(CounterType.M1M1.createInstance(1))); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/eventide/WildernessHypnotist.java b/Mage.Sets/src/mage/sets/eventide/WildernessHypnotist.java index 02e52cf08a7..a0c8b01cac4 100644 --- a/Mage.Sets/src/mage/sets/eventide/WildernessHypnotist.java +++ b/Mage.Sets/src/mage/sets/eventide/WildernessHypnotist.java @@ -29,9 +29,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -39,6 +38,8 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; @@ -65,7 +66,7 @@ public class WildernessHypnotist extends CardImpl { this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Constants.Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/WistfulSelkie.java b/Mage.Sets/src/mage/sets/eventide/WistfulSelkie.java index 6b824bbb0f5..7564cb69ab7 100644 --- a/Mage.Sets/src/mage/sets/eventide/WistfulSelkie.java +++ b/Mage.Sets/src/mage/sets/eventide/WistfulSelkie.java @@ -29,8 +29,8 @@ package mage.sets.eventide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/exodus/CatBurglar.java b/Mage.Sets/src/mage/sets/exodus/CatBurglar.java index acde751a79d..4788342b1e6 100644 --- a/Mage.Sets/src/mage/sets/exodus/CatBurglar.java +++ b/Mage.Sets/src/mage/sets/exodus/CatBurglar.java @@ -28,9 +28,9 @@ package mage.sets.exodus; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; @@ -38,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DiscardTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetPlayer; /** @@ -58,7 +59,7 @@ public class CatBurglar extends CardImpl { this.toughness = new MageInt(2); // {2}{B}, {tap}: Target player discards a card. Activate this ability only any time you could cast a sorcery. - Ability ability = new ActivateAsSorceryActivatedAbility(Constants.Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl("{2}{B}")); + Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl("{2}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/exodus/Cataclysm.java b/Mage.Sets/src/mage/sets/exodus/Cataclysm.java index fc1232f1fb2..87fe77b47d5 100644 --- a/Mage.Sets/src/mage/sets/exodus/Cataclysm.java +++ b/Mage.Sets/src/mage/sets/exodus/Cataclysm.java @@ -30,13 +30,15 @@ package mage.sets.exodus; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.filter.common.FilterArtifactPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterEnchantmentPermanent; @@ -82,14 +84,14 @@ class CataclysmEffect extends OneShotEffect { private static final FilterLandPermanent filter4 = new FilterLandPermanent("land you control"); static { - filter1.add(new ControllerPredicate(Constants.TargetController.YOU)); - filter2.add(new ControllerPredicate(Constants.TargetController.YOU)); - filter3.add(new ControllerPredicate(Constants.TargetController.YOU)); - filter4.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter1.add(new ControllerPredicate(TargetController.YOU)); + filter2.add(new ControllerPredicate(TargetController.YOU)); + filter3.add(new ControllerPredicate(TargetController.YOU)); + filter4.add(new ControllerPredicate(TargetController.YOU)); } public CataclysmEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); staticText = "Each player chooses from the permanents he or she controls an artifact, a creature, an enchantment, and a land, then sacrifices the rest"; } @@ -121,7 +123,7 @@ class CataclysmEffect extends OneShotEffect { if (target1.canChoose(player.getId(), game)) { while (!target1.isChosen() && target1.canChoose(player.getId(), game)) { - player.choose(Constants.Outcome.Benefit, target1, source.getSourceId(), game); + player.choose(Outcome.Benefit, target1, source.getSourceId(), game); } Permanent artifact = game.getPermanent(target1.getFirstTarget()); if (artifact != null) { @@ -132,7 +134,7 @@ class CataclysmEffect extends OneShotEffect { if (target2.canChoose(player.getId(), game)) { while (!target2.isChosen() && target2.canChoose(player.getId(), game)) { - player.choose(Constants.Outcome.Benefit, target2, source.getSourceId(), game); + player.choose(Outcome.Benefit, target2, source.getSourceId(), game); } Permanent creature = game.getPermanent(target2.getFirstTarget()); if (creature != null) { @@ -143,7 +145,7 @@ class CataclysmEffect extends OneShotEffect { if (target3.canChoose(player.getId(), game)) { while (!target3.isChosen() && target3.canChoose(player.getId(), game)) { - player.choose(Constants.Outcome.Benefit, target3, source.getSourceId(), game); + player.choose(Outcome.Benefit, target3, source.getSourceId(), game); } Permanent enchantment = game.getPermanent(target3.getFirstTarget()); if (enchantment != null) { @@ -154,7 +156,7 @@ class CataclysmEffect extends OneShotEffect { if (target4.canChoose(player.getId(), game)) { while (!target4.isChosen() && target4.canChoose(player.getId(), game)) { - player.choose(Constants.Outcome.Benefit, target4, source.getSourceId(), game); + player.choose(Outcome.Benefit, target4, source.getSourceId(), game); } Permanent land = game.getPermanent(target4.getFirstTarget()); if (land != null) { diff --git a/Mage.Sets/src/mage/sets/exodus/CityOfTraitors.java b/Mage.Sets/src/mage/sets/exodus/CityOfTraitors.java index 48ce9c39fb9..c980abe4f8b 100644 --- a/Mage.Sets/src/mage/sets/exodus/CityOfTraitors.java +++ b/Mage.Sets/src/mage/sets/exodus/CityOfTraitors.java @@ -28,15 +28,16 @@ package mage.sets.exodus; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -55,7 +56,7 @@ public class CityOfTraitors extends CardImpl { this.addAbility(new CityOfTraitorsTriggeredAbility()); // {tap}: Add {2} to your mana pool. - this.addAbility(new SimpleManaAbility(Constants.Zone.BATTLEFIELD, Mana.ColorlessMana(2), new TapSourceCost())); + this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(2), new TapSourceCost())); } public CityOfTraitors(final CityOfTraitors card) { @@ -71,7 +72,7 @@ public class CityOfTraitors extends CardImpl { class CityOfTraitorsTriggeredAbility extends TriggeredAbilityImpl { CityOfTraitorsTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new SacrificeSourceEffect()); + super(Zone.BATTLEFIELD, new SacrificeSourceEffect()); } CityOfTraitorsTriggeredAbility(CityOfTraitorsTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/exodus/Convalescence.java b/Mage.Sets/src/mage/sets/exodus/Convalescence.java index f81c20e6c04..441de34ea9e 100644 --- a/Mage.Sets/src/mage/sets/exodus/Convalescence.java +++ b/Mage.Sets/src/mage/sets/exodus/Convalescence.java @@ -28,13 +28,15 @@ package mage.sets.exodus; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.game.Game; import mage.players.Player; @@ -51,7 +53,7 @@ public class Convalescence extends CardImpl { this.color.setWhite(true); // At the beginning of your upkeep, if you have 10 or less life, you gain 1 life. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new ConvalescenceEffect(), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new ConvalescenceEffect(), TargetController.YOU, false)); } public Convalescence(final Convalescence card) { @@ -67,7 +69,7 @@ public class Convalescence extends CardImpl { class ConvalescenceEffect extends OneShotEffect { public ConvalescenceEffect() { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); staticText = "if you have 10 or less life, you gain 1 life"; } diff --git a/Mage.Sets/src/mage/sets/exodus/EntropicSpecter.java b/Mage.Sets/src/mage/sets/exodus/EntropicSpecter.java index 6f09e5daa01..019c94e69b0 100644 --- a/Mage.Sets/src/mage/sets/exodus/EntropicSpecter.java +++ b/Mage.Sets/src/mage/sets/exodus/EntropicSpecter.java @@ -28,9 +28,8 @@ package mage.sets.exodus; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; @@ -70,7 +69,7 @@ public class EntropicSpecter extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseOpponent())); // Entropic Specter's power and toughness are each equal to the number of cards in the chosen player's hand. - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new CardsInTargetPlayerHandCount(), Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new CardsInTargetPlayerHandCount(), Duration.WhileOnBattlefield))); // Whenever Entropic Specter deals damage to a player, that player discards a card. this.addAbility(new DealsDamageToAPlayerTriggeredAbility(new DiscardTargetEffect(1, false), false, true)); @@ -89,7 +88,7 @@ public class EntropicSpecter extends CardImpl { class ChooseOpponent extends OneShotEffect { public ChooseOpponent() { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); this.staticText = "choose an opponent"; } diff --git a/Mage.Sets/src/mage/sets/exodus/Ephemeron.java b/Mage.Sets/src/mage/sets/exodus/Ephemeron.java index 87193095efe..1318993c535 100644 --- a/Mage.Sets/src/mage/sets/exodus/Ephemeron.java +++ b/Mage.Sets/src/mage/sets/exodus/Ephemeron.java @@ -28,15 +28,16 @@ package mage.sets.exodus; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.DiscardTargetCost; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCardInHand; /** @@ -58,7 +59,7 @@ public class Ephemeron extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Discard a card: Return Ephemeron to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new DiscardTargetCost(new TargetCardInHand()))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new DiscardTargetCost(new TargetCardInHand()))); } public Ephemeron(final Ephemeron card) { diff --git a/Mage.Sets/src/mage/sets/exodus/Equilibrium.java b/Mage.Sets/src/mage/sets/exodus/Equilibrium.java index 37caa3b7745..4aabc256aa5 100644 --- a/Mage.Sets/src/mage/sets/exodus/Equilibrium.java +++ b/Mage.Sets/src/mage/sets/exodus/Equilibrium.java @@ -28,8 +28,8 @@ package mage.sets.exodus; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DoIfCostPaid; diff --git a/Mage.Sets/src/mage/sets/exodus/ErraticPortal.java b/Mage.Sets/src/mage/sets/exodus/ErraticPortal.java index 3fb3ff748f5..145f12b3641 100644 --- a/Mage.Sets/src/mage/sets/exodus/ErraticPortal.java +++ b/Mage.Sets/src/mage/sets/exodus/ErraticPortal.java @@ -28,9 +28,9 @@ package mage.sets.exodus; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.Cost; @@ -39,6 +39,8 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -55,7 +57,7 @@ public class ErraticPortal extends CardImpl { this.expansionSetCode = "EXO"; // {1}, {tap}: Return target creature to its owner's hand unless its controller pays {1}. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ErraticPortalEffect(new GenericManaCost(1)), new ManaCostsImpl("{1}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ErraticPortalEffect(new GenericManaCost(1)), new ManaCostsImpl("{1}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); @@ -76,7 +78,7 @@ class ErraticPortalEffect extends OneShotEffect { protected Cost cost; public ErraticPortalEffect(Cost cost) { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); this.staticText = "Return target creature to its owner's hand unless its controller pays {1}"; this.cost = cost; } @@ -99,7 +101,7 @@ class ErraticPortalEffect extends OneShotEffect { if (player != null) { cost.clearPaid(); if (!cost.pay(source, game, targetCreature.getControllerId(), targetCreature.getControllerId(), false)) { - return targetCreature.moveToZone(Constants.Zone.HAND, source.getSourceId(), game, true); + return targetCreature.moveToZone(Zone.HAND, source.getSourceId(), game, true); } } } diff --git a/Mage.Sets/src/mage/sets/exodus/ErtaiWizardAdept.java b/Mage.Sets/src/mage/sets/exodus/ErtaiWizardAdept.java index 497ae1f56f2..f1e833ab75f 100644 --- a/Mage.Sets/src/mage/sets/exodus/ErtaiWizardAdept.java +++ b/Mage.Sets/src/mage/sets/exodus/ErtaiWizardAdept.java @@ -28,9 +28,9 @@ package mage.sets.exodus; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetSpell; /** @@ -58,7 +59,7 @@ public class ErtaiWizardAdept extends CardImpl { this.toughness = new MageInt(1); // {2}{U}{U}, {tap}: Counter target spell. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl("{2}{U}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl("{2}{U}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetSpell()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/exodus/FlowstoneFlood.java b/Mage.Sets/src/mage/sets/exodus/FlowstoneFlood.java index bf0f807743c..1e4c436e8cb 100644 --- a/Mage.Sets/src/mage/sets/exodus/FlowstoneFlood.java +++ b/Mage.Sets/src/mage/sets/exodus/FlowstoneFlood.java @@ -28,8 +28,8 @@ package mage.sets.exodus; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.common.DiscardCardCost; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/exodus/Manabond.java b/Mage.Sets/src/mage/sets/exodus/Manabond.java index 494ca84d72c..7df87531d26 100644 --- a/Mage.Sets/src/mage/sets/exodus/Manabond.java +++ b/Mage.Sets/src/mage/sets/exodus/Manabond.java @@ -28,10 +28,10 @@ package mage.sets.exodus; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/exodus/RecurringNightmare.java b/Mage.Sets/src/mage/sets/exodus/RecurringNightmare.java index f1e687e2968..2847722c1d9 100644 --- a/Mage.Sets/src/mage/sets/exodus/RecurringNightmare.java +++ b/Mage.Sets/src/mage/sets/exodus/RecurringNightmare.java @@ -28,15 +28,16 @@ package mage.sets.exodus; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; import mage.abilities.costs.common.ReturnToHandSourceCost; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; @@ -58,7 +59,7 @@ public class RecurringNightmare extends CardImpl { this.color.setBlack(true); // Sacrifice a creature, Return Recurring Nightmare to its owner's hand: Return target creature card from your graveyard to the battlefield. Activate this ability only any time you could cast a sorcery. - Ability ability = new ActivateAsSorceryActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new SacrificeTargetCost(new TargetControlledPermanent(filter2))); + Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new SacrificeTargetCost(new TargetControlledPermanent(filter2))); ability.addTarget(new TargetCardInYourGraveyard(filter)); ability.addCost(new ReturnToHandSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/exodus/SabertoothWyvern.java b/Mage.Sets/src/mage/sets/exodus/SabertoothWyvern.java index 3415f9dd884..c0926e51939 100644 --- a/Mage.Sets/src/mage/sets/exodus/SabertoothWyvern.java +++ b/Mage.Sets/src/mage/sets/exodus/SabertoothWyvern.java @@ -28,8 +28,8 @@ package mage.sets.exodus; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/exodus/SoltariVisionary.java b/Mage.Sets/src/mage/sets/exodus/SoltariVisionary.java index ccac86e845c..f0ba6c0737e 100644 --- a/Mage.Sets/src/mage/sets/exodus/SoltariVisionary.java +++ b/Mage.Sets/src/mage/sets/exodus/SoltariVisionary.java @@ -28,9 +28,9 @@ package mage.sets.exodus; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/exodus/SpikeWeaver.java b/Mage.Sets/src/mage/sets/exodus/SpikeWeaver.java index 14260ee8d00..b80b0d3c6f0 100644 --- a/Mage.Sets/src/mage/sets/exodus/SpikeWeaver.java +++ b/Mage.Sets/src/mage/sets/exodus/SpikeWeaver.java @@ -28,9 +28,9 @@ package mage.sets.exodus; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -41,6 +41,8 @@ import mage.abilities.effects.common.PreventAllDamageEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; @@ -63,13 +65,13 @@ public class SpikeWeaver extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(3)))); // {2}, Remove a +1/+1 counter from Spike Weaver: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {1}, Remove a +1/+1 counter from Spike Weaver: Prevent all combat damage that would be dealt this turn. - Ability ability2 = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PreventAllDamageEffect(Constants.Duration.EndOfTurn, true), new GenericManaCost(1)); + Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventAllDamageEffect(Duration.EndOfTurn, true), new GenericManaCost(1)); ability2.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/exodus/SurvivalOfTheFittest.java b/Mage.Sets/src/mage/sets/exodus/SurvivalOfTheFittest.java index 9a3679ff9bd..018995af889 100644 --- a/Mage.Sets/src/mage/sets/exodus/SurvivalOfTheFittest.java +++ b/Mage.Sets/src/mage/sets/exodus/SurvivalOfTheFittest.java @@ -28,15 +28,17 @@ package mage.sets.exodus; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.DiscardTargetCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCardInHand; @@ -61,7 +63,7 @@ public class SurvivalOfTheFittest extends CardImpl { this.color.setGreen(true); // {G}, Discard a creature card: Search your library for a creature card, reveal that card, and put it into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true), new ColoredManaCost(Constants.ColoredManaSymbol.G)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new DiscardTargetCost(new TargetCardInHand(filter))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/exodus/ThrullSurgeon.java b/Mage.Sets/src/mage/sets/exodus/ThrullSurgeon.java index 94020981a49..2122e9ce6ed 100644 --- a/Mage.Sets/src/mage/sets/exodus/ThrullSurgeon.java +++ b/Mage.Sets/src/mage/sets/exodus/ThrullSurgeon.java @@ -28,7 +28,7 @@ package mage.sets.exodus; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/fallenempires/GoblinGrenade.java b/Mage.Sets/src/mage/sets/fallenempires/GoblinGrenade.java index 725de425216..0396099817d 100644 --- a/Mage.Sets/src/mage/sets/fallenempires/GoblinGrenade.java +++ b/Mage.Sets/src/mage/sets/fallenempires/GoblinGrenade.java @@ -28,7 +28,7 @@ package mage.sets.fallenempires; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/fallenempires/GoblinWarDrums1.java b/Mage.Sets/src/mage/sets/fallenempires/GoblinWarDrums1.java index 68053f6a8d1..551bc446dbd 100644 --- a/Mage.Sets/src/mage/sets/fallenempires/GoblinWarDrums1.java +++ b/Mage.Sets/src/mage/sets/fallenempires/GoblinWarDrums1.java @@ -28,13 +28,14 @@ package mage.sets.fallenempires; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.CantBeBlockedByOneAllEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; @@ -46,7 +47,7 @@ import mage.filter.predicate.permanent.ControllerPredicate; private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public GoblinWarDrums1(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/fallenempires/HighTide.java b/Mage.Sets/src/mage/sets/fallenempires/HighTide.java index 1e568519d0c..79f7a248104 100644 --- a/Mage.Sets/src/mage/sets/fallenempires/HighTide.java +++ b/Mage.Sets/src/mage/sets/fallenempires/HighTide.java @@ -28,9 +28,9 @@ package mage.sets.fallenempires; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.Ability; import mage.abilities.effects.Effect; @@ -38,6 +38,7 @@ import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.ManaEffect; import mage.abilities.mana.DelayedTriggeredManaAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -81,7 +82,7 @@ class HighTideTriggeredAbility extends DelayedTriggeredManaAbility { this.toughness = new MageInt(1); FilterPermanent seasinger = new FilterPermanent(); - seasinger.add(new ControllerPredicate(Constants.TargetController.YOU)); + seasinger.add(new ControllerPredicate(TargetController.YOU)); seasinger.add(new CardIdPredicate(this.getId())); // When you control no Islands, sacrifice Seasinger. @@ -91,8 +89,8 @@ public class Seasinger extends CardImpl { this.addAbility(new SkipUntapOptionalAbility()); // {tap}: Gain control of target creature whose controller controls an Island for as long as you control Seasinger and Seasinger remains tapped. - ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainControlTargetEffect(Constants.Duration.Custom), new ControlsPermanentCondition(seasinger, ControlsPermanentCondition.CountType.EQUAL_TO, 1, TappedCondition.getInstance()), rule); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, effect, new TapSourceCost()); + ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainControlTargetEffect(Duration.Custom), new ControlsPermanentCondition(seasinger, ControlsPermanentCondition.CountType.EQUAL_TO, 1, TappedCondition.getInstance()), rule); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); creatureWhoseControllerControlsIsland.add(new ControllerControlsIslandPredicate()); ability.addTarget(new TargetCreaturePermanent(creatureWhoseControllerControlsIsland)); this.addAbility(ability); @@ -128,7 +126,7 @@ class ControllerControlsIslandPredicate implements Predicate { class SeasingerTriggeredAbility extends StateTriggeredAbility { public SeasingerTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new SacrificeSourceEffect()); + super(Zone.BATTLEFIELD, new SacrificeSourceEffect()); } public SeasingerTriggeredAbility(final SeasingerTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/fallenempires/Thallid.java b/Mage.Sets/src/mage/sets/fallenempires/Thallid.java index 7b04c9fa446..fbd413fcba2 100644 --- a/Mage.Sets/src/mage/sets/fallenempires/Thallid.java +++ b/Mage.Sets/src/mage/sets/fallenempires/Thallid.java @@ -28,7 +28,7 @@ package mage.sets.fallenempires; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/fifthdawn/Arachnoid.java b/Mage.Sets/src/mage/sets/fifthdawn/Arachnoid.java index 9fc5ffd4641..acaa8ecfaa0 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/Arachnoid.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/Arachnoid.java @@ -28,8 +28,8 @@ package mage.sets.fifthdawn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fifthdawn/AuriokSalvagers.java b/Mage.Sets/src/mage/sets/fifthdawn/AuriokSalvagers.java index def072d3c85..5ebdbc4f623 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/AuriokSalvagers.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/AuriokSalvagers.java @@ -28,7 +28,7 @@ package mage.sets.fifthdawn; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/fifthdawn/BatonOfCourage.java b/Mage.Sets/src/mage/sets/fifthdawn/BatonOfCourage.java index 59d330d121b..218eb307fc9 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/BatonOfCourage.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/BatonOfCourage.java @@ -28,9 +28,9 @@ package mage.sets.fifthdawn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; @@ -38,6 +38,8 @@ import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.SunburstAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; @@ -56,7 +58,7 @@ public class BatonOfCourage extends CardImpl { // Sunburst this.addAbility(new SunburstAbility()); // Remove a charge counter from Baton of Courage: Target creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Constants.Duration.EndOfTurn), new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(1))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(1))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfCreation.java b/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfCreation.java index eb078641ecc..14c9ab140b4 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfCreation.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfCreation.java @@ -28,8 +28,8 @@ package mage.sets.fifthdawn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.ShuffleSpellEffect; diff --git a/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfTomorrows.java b/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfTomorrows.java index e27cba703fa..81dddde7744 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfTomorrows.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfTomorrows.java @@ -28,9 +28,9 @@ package mage.sets.fifthdawn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ShuffleSpellEffect; diff --git a/Mage.Sets/src/mage/sets/fifthdawn/BlindCreeper.java b/Mage.Sets/src/mage/sets/fifthdawn/BlindCreeper.java index 715f89db433..149f7b50651 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/BlindCreeper.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/BlindCreeper.java @@ -29,13 +29,14 @@ package mage.sets.fifthdawn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.stack.Spell; @@ -73,7 +74,7 @@ public class BlindCreeper extends CardImpl { class BlindCreeperAbility extends TriggeredAbilityImpl { public BlindCreeperAbility() { - super(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(-1, -1, Constants.Duration.EndOfTurn), false); + super(Zone.BATTLEFIELD, new BoostSourceEffect(-1, -1, Duration.EndOfTurn), false); } public BlindCreeperAbility(final BlindCreeperAbility ability) { diff --git a/Mage.Sets/src/mage/sets/fifthdawn/ClearwaterGoblet.java b/Mage.Sets/src/mage/sets/fifthdawn/ClearwaterGoblet.java index f185ce2caba..dad83e18d8e 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/ClearwaterGoblet.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/ClearwaterGoblet.java @@ -28,14 +28,16 @@ package mage.sets.fifthdawn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.dynamicvalue.common.CountersCount; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.keyword.SunburstAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.counters.CounterType; /** @@ -51,7 +53,7 @@ public class ClearwaterGoblet extends CardImpl { // Sunburst this.addAbility(new SunburstAbility()); // At the beginning of your upkeep, you may gain life equal to the number of charge counters on Clearwater Goblet. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(Constants.Zone.BATTLEFIELD, new GainLifeEffect(new CountersCount(CounterType.CHARGE)), Constants.TargetController.YOU, true)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new GainLifeEffect(new CountersCount(CounterType.CHARGE)), TargetController.YOU, true)); } public ClearwaterGoblet(final ClearwaterGoblet card) { diff --git a/Mage.Sets/src/mage/sets/fifthdawn/Condescend.java b/Mage.Sets/src/mage/sets/fifthdawn/Condescend.java index 6f98f60763e..7fffe8cb0ac 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/Condescend.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/Condescend.java @@ -28,8 +28,8 @@ package mage.sets.fifthdawn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.abilities.effects.common.ScryEffect; diff --git a/Mage.Sets/src/mage/sets/fifthdawn/ConjurersBauble.java b/Mage.Sets/src/mage/sets/fifthdawn/ConjurersBauble.java index 8ef26942795..5ba50b69531 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/ConjurersBauble.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/ConjurersBauble.java @@ -28,10 +28,10 @@ package mage.sets.fifthdawn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -39,6 +39,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.FilterCard; import mage.filter.predicate.other.OwnerPredicate; import mage.target.common.TargetCardInYourGraveyard; @@ -52,7 +53,7 @@ public class ConjurersBauble extends CardImpl { private static final FilterCard filter = new FilterCard("card from your graveyard"); static { - filter.add(new OwnerPredicate(Constants.TargetController.YOU)); + filter.add(new OwnerPredicate(TargetController.YOU)); } static final String rule = "Put up to one target card from your graveyard on the bottom of your library"; diff --git a/Mage.Sets/src/mage/sets/fifthdawn/EngineeredExplosives.java b/Mage.Sets/src/mage/sets/fifthdawn/EngineeredExplosives.java index e7de7106976..31aa69f8d7d 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/EngineeredExplosives.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/EngineeredExplosives.java @@ -28,9 +28,9 @@ package mage.sets.fifthdawn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +39,8 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.SunburstAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterNonlandPermanent; import mage.game.Game; @@ -58,7 +60,7 @@ public class EngineeredExplosives extends CardImpl { // Sunburst this.addAbility(new SunburstAbility()); // {2}, Sacrifice Engineered Explosives: Destroy each nonland permanent with converted mana cost equal to the number of charge counters on Engineered Explosives. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new EngineeredExplosivesEffect(), new ManaCostsImpl("{2}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new EngineeredExplosivesEffect(), new ManaCostsImpl("{2}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } @@ -79,7 +81,7 @@ class EngineeredExplosivesEffect extends OneShotEffect { public EngineeredExplosivesEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); staticText = "Destroy each nonland permanent with converted mana cost equal to the number of charge counters on Engineered Explosives"; } @@ -95,7 +97,7 @@ class EngineeredExplosivesEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - MageObject engineeredExplosives = game.getLastKnownInformation(source.getSourceId(), Constants.Zone.BATTLEFIELD); + MageObject engineeredExplosives = game.getLastKnownInformation(source.getSourceId(), Zone.BATTLEFIELD); if(engineeredExplosives != null && engineeredExplosives instanceof Permanent){ int count = ((Permanent)engineeredExplosives).getCounters().getCount(CounterType.CHARGE); for (Permanent permanent : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { diff --git a/Mage.Sets/src/mage/sets/fifthdawn/EternalWitness.java b/Mage.Sets/src/mage/sets/fifthdawn/EternalWitness.java index db5090b11e5..76f90905ffd 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/EternalWitness.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/EternalWitness.java @@ -28,8 +28,8 @@ package mage.sets.fifthdawn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/fifthdawn/FoldIntoAEther.java b/Mage.Sets/src/mage/sets/fifthdawn/FoldIntoAEther.java index 30a4a8fd585..6c46311baeb 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/FoldIntoAEther.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/FoldIntoAEther.java @@ -28,10 +28,10 @@ package mage.sets.fifthdawn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/fifthdawn/GrindingStation.java b/Mage.Sets/src/mage/sets/fifthdawn/GrindingStation.java index 3a41d2ec420..d51e60fcdc0 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/GrindingStation.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/GrindingStation.java @@ -28,10 +28,10 @@ package mage.sets.fifthdawn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -62,7 +62,7 @@ public class GrindingStation extends CardImpl { this.expansionSetCode = "5DN"; // {tap}, Sacrifice an artifact: Target player puts the top three cards of his or her library into his or her graveyard. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PutTopCardOfTargetPlayerLibraryIntoGraveEffect(3), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutTopCardOfTargetPlayerLibraryIntoGraveEffect(3), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/KrarkClanIronworks.java b/Mage.Sets/src/mage/sets/fifthdawn/KrarkClanIronworks.java index f914319ca41..5e4f5b7be8c 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/KrarkClanIronworks.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/KrarkClanIronworks.java @@ -28,9 +28,9 @@ package mage.sets.fifthdawn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.SacrificeTargetCost; diff --git a/Mage.Sets/src/mage/sets/fifthdawn/MagmaJet.java b/Mage.Sets/src/mage/sets/fifthdawn/MagmaJet.java index 01276292928..b75f5d07369 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/MagmaJet.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/MagmaJet.java @@ -28,8 +28,8 @@ package mage.sets.fifthdawn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.ScryEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fifthdawn/NightsWhisper.java b/Mage.Sets/src/mage/sets/fifthdawn/NightsWhisper.java index f0adae5a908..fdc06e707de 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/NightsWhisper.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/NightsWhisper.java @@ -28,8 +28,8 @@ package mage.sets.fifthdawn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.LoseLifeSourceEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fifthdawn/ParadiseMantle.java b/Mage.Sets/src/mage/sets/fifthdawn/ParadiseMantle.java index 02a428856aa..3c35b5b5460 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/ParadiseMantle.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/ParadiseMantle.java @@ -28,12 +28,12 @@ package mage.sets.fifthdawn; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; diff --git a/Mage.Sets/src/mage/sets/fifthdawn/SawtoothThresher.java b/Mage.Sets/src/mage/sets/fifthdawn/SawtoothThresher.java index 04df8142b99..ef57a368362 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/SawtoothThresher.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/SawtoothThresher.java @@ -28,15 +28,17 @@ package mage.sets.fifthdawn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.SunburstAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.counters.CounterType; /** @@ -56,7 +58,7 @@ public class SawtoothThresher extends CardImpl { // Sunburst this.addAbility(new SunburstAbility()); // Remove two +1/+1 counters from Sawtooth Thresher: Sawtooth Thresher gets +4/+4 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(4, 4, Constants.Duration.EndOfTurn), new RemoveCountersSourceCost(CounterType.P1P1.createInstance(2)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(4, 4, Duration.EndOfTurn), new RemoveCountersSourceCost(CounterType.P1P1.createInstance(2)))); } public SawtoothThresher(final SawtoothThresher card) { diff --git a/Mage.Sets/src/mage/sets/fifthdawn/SerumVisions.java b/Mage.Sets/src/mage/sets/fifthdawn/SerumVisions.java index 6e4f1a48e2a..2f4b23fb8a5 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/SerumVisions.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/SerumVisions.java @@ -28,8 +28,8 @@ package mage.sets.fifthdawn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.ScryEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fifthdawn/SkyreachManta.java b/Mage.Sets/src/mage/sets/fifthdawn/SkyreachManta.java index 598e9800228..a5ebb277535 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/SkyreachManta.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/SkyreachManta.java @@ -28,8 +28,8 @@ package mage.sets.fifthdawn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.SunburstAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/fifthdawn/SparkElemental.java b/Mage.Sets/src/mage/sets/fifthdawn/SparkElemental.java index 422dea612e5..73e0777cf8e 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/SparkElemental.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/SparkElemental.java @@ -28,7 +28,7 @@ package mage.sets.fifthdawn; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/fifthdawn/SteelshapersGift.java b/Mage.Sets/src/mage/sets/fifthdawn/SteelshapersGift.java index d61b17fbe83..4470b291c98 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/SteelshapersGift.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/SteelshapersGift.java @@ -28,8 +28,8 @@ package mage.sets.fifthdawn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.filter.FilterCard; diff --git a/Mage.Sets/src/mage/sets/fifthdawn/TrinketMage.java b/Mage.Sets/src/mage/sets/fifthdawn/TrinketMage.java index 0d11a8a1474..06a0166aa4e 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/TrinketMage.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/TrinketMage.java @@ -28,7 +28,7 @@ package mage.sets.fifthdawn; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/fifthdawn/VulshokSorcerer.java b/Mage.Sets/src/mage/sets/fifthdawn/VulshokSorcerer.java index 429a34d6b89..2e4cdc19906 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/VulshokSorcerer.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/VulshokSorcerer.java @@ -29,9 +29,8 @@ package mage.sets.fifthdawn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; /** @@ -59,7 +59,7 @@ public class VulshokSorcerer extends CardImpl { this.addAbility(HasteAbility.getInstance()); // {tap}: Vulshok Sorcerer deals 1 damage to target creature or player. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/fifthedition/AbyssalSpecter.java b/Mage.Sets/src/mage/sets/fifthedition/AbyssalSpecter.java index c65efeb5a89..594e7a27d38 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/AbyssalSpecter.java +++ b/Mage.Sets/src/mage/sets/fifthedition/AbyssalSpecter.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.DiscardTargetEffect; diff --git a/Mage.Sets/src/mage/sets/fifthedition/AmbushParty.java b/Mage.Sets/src/mage/sets/fifthedition/AmbushParty.java index 089414b9fe2..9437af93b61 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/AmbushParty.java +++ b/Mage.Sets/src/mage/sets/fifthedition/AmbushParty.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.HasteAbility; diff --git a/Mage.Sets/src/mage/sets/fifthedition/Armageddon.java b/Mage.Sets/src/mage/sets/fifthedition/Armageddon.java index e6b16b12a87..ab81f777fa1 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Armageddon.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Armageddon.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.filter.common.FilterLandPermanent; diff --git a/Mage.Sets/src/mage/sets/fifthedition/AshesToAshes.java b/Mage.Sets/src/mage/sets/fifthedition/AshesToAshes.java index 11c51a77061..893eb9cc686 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/AshesToAshes.java +++ b/Mage.Sets/src/mage/sets/fifthedition/AshesToAshes.java @@ -28,13 +28,14 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DamageControllerEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -79,7 +80,7 @@ public class AshesToAshes extends CardImpl { class AshesToAshesEffect extends OneShotEffect { public AshesToAshesEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "Exile two target nonartifact creatures"; } diff --git a/Mage.Sets/src/mage/sets/fifthedition/AzureDrake.java b/Mage.Sets/src/mage/sets/fifthedition/AzureDrake.java index 93eb2cc689e..85ce24518e7 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/AzureDrake.java +++ b/Mage.Sets/src/mage/sets/fifthedition/AzureDrake.java @@ -28,7 +28,7 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/fifthedition/BadMoon.java b/Mage.Sets/src/mage/sets/fifthedition/BadMoon.java index 7308e3a3a13..3c90d664fcb 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/BadMoon.java +++ b/Mage.Sets/src/mage/sets/fifthedition/BadMoon.java @@ -28,13 +28,15 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; @@ -57,7 +59,7 @@ public class BadMoon extends CardImpl { this.color.setBlack(true); // Black creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Constants.Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); } diff --git a/Mage.Sets/src/mage/sets/fifthedition/BirdMaiden.java b/Mage.Sets/src/mage/sets/fifthedition/BirdMaiden.java index 112a8f8ec4b..d6ae21ee99f 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/BirdMaiden.java +++ b/Mage.Sets/src/mage/sets/fifthedition/BirdMaiden.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fifthedition/Blight.java b/Mage.Sets/src/mage/sets/fifthedition/Blight.java index 133bf2dfb08..9dc9ed1c6ea 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Blight.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Blight.java @@ -28,9 +28,9 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -38,6 +38,8 @@ import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -61,7 +63,7 @@ public class Blight extends CardImpl { // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Detriment)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); @@ -81,7 +83,7 @@ public class Blight extends CardImpl { class BlightTriggeredAbility extends TriggeredAbilityImpl { BlightTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect()); + super(Zone.BATTLEFIELD, new DestroyTargetEffect()); } BlightTriggeredAbility(final BlightTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/fifthedition/BogImp.java b/Mage.Sets/src/mage/sets/fifthedition/BogImp.java index 89bbf28efc4..069f68e5110 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/BogImp.java +++ b/Mage.Sets/src/mage/sets/fifthedition/BogImp.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fifthedition/Brainstorm.java b/Mage.Sets/src/mage/sets/fifthedition/Brainstorm.java index 2b424822fe4..38b3730aeac 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Brainstorm.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Brainstorm.java @@ -28,10 +28,10 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/fifthedition/BreedingPit.java b/Mage.Sets/src/mage/sets/fifthedition/BreedingPit.java index 0cd259b304d..e91537f2739 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/BreedingPit.java +++ b/Mage.Sets/src/mage/sets/fifthedition/BreedingPit.java @@ -28,9 +28,9 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; @@ -38,6 +38,8 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.game.permanent.token.Token; /** @@ -53,7 +55,7 @@ public class BreedingPit extends CardImpl { this.color.setBlack(true); // At the beginning of your upkeep, sacrifice Breeding Pit unless you pay {B}{B}. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(Constants.Zone.BATTLEFIELD, new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{B}{B}")), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{B}{B}")), TargetController.YOU, false)); // At the beginning of your end step, put a 0/1 black Thrull creature token onto the battlefield. this.addAbility(new BeginningOfYourEndStepTriggeredAbility(new CreateTokenEffect(new ThrullToken()), false)); diff --git a/Mage.Sets/src/mage/sets/fifthedition/CatWarriors.java b/Mage.Sets/src/mage/sets/fifthedition/CatWarriors.java index b71b2193d7e..2274522887c 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/CatWarriors.java +++ b/Mage.Sets/src/mage/sets/fifthedition/CatWarriors.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ForestwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fifthedition/ColossusOfSardia.java b/Mage.Sets/src/mage/sets/fifthedition/ColossusOfSardia.java index 17108cbf7bc..7587e95032f 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/ColossusOfSardia.java +++ b/Mage.Sets/src/mage/sets/fifthedition/ColossusOfSardia.java @@ -28,10 +28,10 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -64,7 +64,7 @@ public class ColossusOfSardia extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipUntapSourceEffect())); // {9}: Untap Colossus of Sardia. Activate this ability only during your upkeep. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl("{9}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl("{9}")); ability.addCost(new OnlyDuringUpkeepCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/fifthedition/DancingScimitar.java b/Mage.Sets/src/mage/sets/fifthedition/DancingScimitar.java index d2788741daf..597c39ea440 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/DancingScimitar.java +++ b/Mage.Sets/src/mage/sets/fifthedition/DancingScimitar.java @@ -28,7 +28,7 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/fifthedition/DurkwoodBoars.java b/Mage.Sets/src/mage/sets/fifthedition/DurkwoodBoars.java index e7b1859587e..38bc0159a58 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/DurkwoodBoars.java +++ b/Mage.Sets/src/mage/sets/fifthedition/DurkwoodBoars.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fifthedition/ElvishArchers.java b/Mage.Sets/src/mage/sets/fifthedition/ElvishArchers.java index 345dd51ea66..37f55e6b4aa 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/ElvishArchers.java +++ b/Mage.Sets/src/mage/sets/fifthedition/ElvishArchers.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fifthedition/EvilPresence.java b/Mage.Sets/src/mage/sets/fifthedition/EvilPresence.java index 8eafab6f996..e88b59a265d 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/EvilPresence.java +++ b/Mage.Sets/src/mage/sets/fifthedition/EvilPresence.java @@ -28,7 +28,7 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/fifthedition/FallenAngel.java b/Mage.Sets/src/mage/sets/fifthedition/FallenAngel.java index e3b33557d70..636f63ca639 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/FallenAngel.java +++ b/Mage.Sets/src/mage/sets/fifthedition/FallenAngel.java @@ -28,7 +28,7 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/fifthedition/Fireball.java b/Mage.Sets/src/mage/sets/fifthedition/Fireball.java index eb8a2ed026c..a179db62248 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Fireball.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Fireball.java @@ -28,7 +28,7 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/fifthedition/Flashfires.java b/Mage.Sets/src/mage/sets/fifthedition/Flashfires.java index d7885f50734..6701cff96db 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Flashfires.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Flashfires.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.filter.common.FilterLandPermanent; diff --git a/Mage.Sets/src/mage/sets/fifthedition/GlacialWall.java b/Mage.Sets/src/mage/sets/fifthedition/GlacialWall.java index f2f92ebecc9..ab63a2fe808 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/GlacialWall.java +++ b/Mage.Sets/src/mage/sets/fifthedition/GlacialWall.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fifthedition/GoblinHero.java b/Mage.Sets/src/mage/sets/fifthedition/GoblinHero.java index 5ba10d0d603..2192d20c627 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/GoblinHero.java +++ b/Mage.Sets/src/mage/sets/fifthedition/GoblinHero.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fifthedition/GoblinWarDrums.java b/Mage.Sets/src/mage/sets/fifthedition/GoblinWarDrums.java index 4ac137707a6..94df86dfae1 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/GoblinWarDrums.java +++ b/Mage.Sets/src/mage/sets/fifthedition/GoblinWarDrums.java @@ -28,7 +28,7 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/fifthedition/HurkylsRecall.java b/Mage.Sets/src/mage/sets/fifthedition/HurkylsRecall.java index 8c83cc8f288..0f713c4095e 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/HurkylsRecall.java +++ b/Mage.Sets/src/mage/sets/fifthedition/HurkylsRecall.java @@ -28,10 +28,10 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fifthedition/HurloonMinotaur.java b/Mage.Sets/src/mage/sets/fifthedition/HurloonMinotaur.java index b592cae2249..e7b9d583bc8 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/HurloonMinotaur.java +++ b/Mage.Sets/src/mage/sets/fifthedition/HurloonMinotaur.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fifthedition/IronrootTreefolk.java b/Mage.Sets/src/mage/sets/fifthedition/IronrootTreefolk.java index 84285fd9967..cc234284845 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/IronrootTreefolk.java +++ b/Mage.Sets/src/mage/sets/fifthedition/IronrootTreefolk.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fifthedition/Justice.java b/Mage.Sets/src/mage/sets/fifthedition/Justice.java index 9b120bb7a6d..c469b14c6f9 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Justice.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Justice.java @@ -27,9 +27,7 @@ */ package mage.sets.fifthedition; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -61,7 +59,7 @@ public class Justice extends CardImpl { this.color.setWhite(true); // At the beginning of your upkeep, sacrifice Justice unless you pay {W}{W}. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(Constants.Zone.BATTLEFIELD, new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{W}{W}")), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{W}{W}")), TargetController.YOU, false)); // Whenever a red creature or spell deals damage, Justice deals that much damage to that creature's or spell's controller. this.addAbility(new JusticeTriggeredAbility(new JusticeEffect())); @@ -80,7 +78,7 @@ public class Justice extends CardImpl { class JusticeTriggeredAbility extends TriggeredAbilityImpl { public JusticeTriggeredAbility(Effect effect) { - super(Constants.Zone.BATTLEFIELD, effect); + super(Zone.BATTLEFIELD, effect); } public JusticeTriggeredAbility(final JusticeTriggeredAbility ability) { @@ -119,7 +117,7 @@ class JusticeTriggeredAbility extends TriggeredAbilityImpl { public JusticeEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); } public JusticeEffect(final JusticeEffect effect) { diff --git a/Mage.Sets/src/mage/sets/fifthedition/Karma.java b/Mage.Sets/src/mage/sets/fifthedition/Karma.java index 67d6d5616cb..a6f41914a22 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Karma.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Karma.java @@ -28,14 +28,16 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -57,7 +59,7 @@ public class Karma extends CardImpl { this.color.setWhite(true); // At the beginning of each player's upkeep, Karma deals damage to that player equal to the number of Swamps he or she controls. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new KarmaDamageTargetEffect(), Constants.TargetController.ANY, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new KarmaDamageTargetEffect(), TargetController.ANY, false)); } public Karma(final Karma card) { @@ -79,7 +81,7 @@ class KarmaDamageTargetEffect extends OneShotEffect{ public KarmaDamageTargetEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); } public KarmaDamageTargetEffect(KarmaDamageTargetEffect copy) diff --git a/Mage.Sets/src/mage/sets/fifthedition/LordOfAtlantis.java b/Mage.Sets/src/mage/sets/fifthedition/LordOfAtlantis.java index 9d1b0617721..c4cfc7d381f 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/LordOfAtlantis.java +++ b/Mage.Sets/src/mage/sets/fifthedition/LordOfAtlantis.java @@ -28,15 +28,17 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.IslandwalkAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -62,8 +64,8 @@ public class LordOfAtlantis extends CardImpl { this.toughness = new MageInt(2); // Other Merfolk creatures get +1/+1 and have islandwalk. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Constants.Duration.WhileOnBattlefield, filter, true))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityControlledEffect(new IslandwalkAbility(), Constants.Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(new IslandwalkAbility(), Duration.WhileOnBattlefield, filter, true))); } public LordOfAtlantis(final LordOfAtlantis card) { diff --git a/Mage.Sets/src/mage/sets/fifthedition/LostSoul.java b/Mage.Sets/src/mage/sets/fifthedition/LostSoul.java index 760d1310836..23501128d52 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/LostSoul.java +++ b/Mage.Sets/src/mage/sets/fifthedition/LostSoul.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fifthedition/MerfolkOfThePearlTrident.java b/Mage.Sets/src/mage/sets/fifthedition/MerfolkOfThePearlTrident.java index cff3cd12ffc..e09c89ae8f7 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/MerfolkOfThePearlTrident.java +++ b/Mage.Sets/src/mage/sets/fifthedition/MerfolkOfThePearlTrident.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fifthedition/Millstone.java b/Mage.Sets/src/mage/sets/fifthedition/Millstone.java index 59d18972a7f..2424d1d7185 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Millstone.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Millstone.java @@ -28,13 +28,13 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/fifthedition/MonssGoblinRaiders.java b/Mage.Sets/src/mage/sets/fifthedition/MonssGoblinRaiders.java index 8feee564e56..71fb557f731 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/MonssGoblinRaiders.java +++ b/Mage.Sets/src/mage/sets/fifthedition/MonssGoblinRaiders.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fifthedition/MountainGoat.java b/Mage.Sets/src/mage/sets/fifthedition/MountainGoat.java index 6257cf517cd..47ebd0aa9ea 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/MountainGoat.java +++ b/Mage.Sets/src/mage/sets/fifthedition/MountainGoat.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.MountainwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fifthedition/NevinyrralsDisk.java b/Mage.Sets/src/mage/sets/fifthedition/NevinyrralsDisk.java index 25eb21831f7..f8d8a957f63 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/NevinyrralsDisk.java +++ b/Mage.Sets/src/mage/sets/fifthedition/NevinyrralsDisk.java @@ -28,9 +28,9 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -66,7 +67,7 @@ public class NevinyrralsDisk extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); // {1}, {tap}: Destroy all artifacts, creatures, and enchantments. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyAllEffect(filter, false), new ManaCostsImpl("{1}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyAllEffect(filter, false), new ManaCostsImpl("{1}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/fifthedition/PearledUnicorn.java b/Mage.Sets/src/mage/sets/fifthedition/PearledUnicorn.java index 92ae7bf49a3..ce837dc9b5f 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/PearledUnicorn.java +++ b/Mage.Sets/src/mage/sets/fifthedition/PearledUnicorn.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fifthedition/PhantomMonster.java b/Mage.Sets/src/mage/sets/fifthedition/PhantomMonster.java index 70e91e0a7bd..4bd5a0a60ae 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/PhantomMonster.java +++ b/Mage.Sets/src/mage/sets/fifthedition/PhantomMonster.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fifthedition/PrimalClay.java b/Mage.Sets/src/mage/sets/fifthedition/PrimalClay.java index 0690516fb51..0325d37e887 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/PrimalClay.java +++ b/Mage.Sets/src/mage/sets/fifthedition/PrimalClay.java @@ -29,10 +29,7 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -60,7 +57,7 @@ public class PrimalClay extends CardImpl { this.toughness = new MageInt(0); // As Primal Clay enters the battlefield, it becomes your choice of a 3/3 artifact creature, a 2/2 artifact creature with flying, or a 1/6 Wall artifact creature with defender in addition to its other types. - Ability ability = new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new EntersBattlefieldEffect(new PrimalClayEffect(), "As {this} enters the battlefield, it becomes your choice of a 3/3 artifact creature, a 2/2 artifact creature with flying, or a 1/6 Wall artifact creature with defender in addition to its other types")); + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new EntersBattlefieldEffect(new PrimalClayEffect(), "As {this} enters the battlefield, it becomes your choice of a 3/3 artifact creature, a 2/2 artifact creature with flying, or a 1/6 Wall artifact creature with defender in addition to its other types")); ability.addChoice(new PrimalClayChoice()); this.addAbility(ability); } @@ -77,7 +74,7 @@ public class PrimalClay extends CardImpl { class PrimalClayEffect extends ContinuousEffectImpl { PrimalClayEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.BecomeCreature); + super(Duration.WhileOnBattlefield, Outcome.BecomeCreature); } PrimalClayEffect(final PrimalClayEffect effect) { @@ -85,7 +82,7 @@ class PrimalClayEffect extends ContinuousEffectImpl { } @Override - public boolean apply(Constants.Layer layer, Constants.SubLayer sublayer, Ability source, Game game) { + public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) { Permanent permanent = game.getPermanent(source.getSourceId()); PrimalClayChoice choice = (PrimalClayChoice) source.getChoices().get(0); if (permanent == null) { @@ -124,8 +121,8 @@ class PrimalClayEffect extends ContinuousEffectImpl { } @Override - public boolean hasLayer(Constants.Layer layer) { - return layer == Constants.Layer.PTChangingEffects_7 || layer == Constants.Layer.AbilityAddingRemovingEffects_6 || layer == Constants.Layer.TypeChangingEffects_4; + public boolean hasLayer(Layer layer) { + return layer == Layer.PTChangingEffects_7 || layer == Layer.AbilityAddingRemovingEffects_6 || layer == Layer.TypeChangingEffects_4; } @Override diff --git a/Mage.Sets/src/mage/sets/fifthedition/ProdigalSorcerer.java b/Mage.Sets/src/mage/sets/fifthedition/ProdigalSorcerer.java index 002e35b47a8..807a0021057 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/ProdigalSorcerer.java +++ b/Mage.Sets/src/mage/sets/fifthedition/ProdigalSorcerer.java @@ -28,7 +28,7 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/fifthedition/Pyroblast.java b/Mage.Sets/src/mage/sets/fifthedition/Pyroblast.java index 2f9d81090e2..168fd727004 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Pyroblast.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Pyroblast.java @@ -28,7 +28,7 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/fifthedition/SabretoothTiger.java b/Mage.Sets/src/mage/sets/fifthedition/SabretoothTiger.java index eebe3cf3ced..6a998f95322 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/SabretoothTiger.java +++ b/Mage.Sets/src/mage/sets/fifthedition/SabretoothTiger.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fifthedition/ScrybSprites.java b/Mage.Sets/src/mage/sets/fifthedition/ScrybSprites.java index 8ee974ac919..0c75555e06c 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/ScrybSprites.java +++ b/Mage.Sets/src/mage/sets/fifthedition/ScrybSprites.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fifthedition/SegovianLeviathan.java b/Mage.Sets/src/mage/sets/fifthedition/SegovianLeviathan.java index e359c209fa4..b6e8185b406 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/SegovianLeviathan.java +++ b/Mage.Sets/src/mage/sets/fifthedition/SegovianLeviathan.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.IslandwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fifthedition/ShanodinDryads.java b/Mage.Sets/src/mage/sets/fifthedition/ShanodinDryads.java index 9a1d3032a9f..1ff67e03f5d 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/ShanodinDryads.java +++ b/Mage.Sets/src/mage/sets/fifthedition/ShanodinDryads.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ForestwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fifthedition/Shatterstorm.java b/Mage.Sets/src/mage/sets/fifthedition/Shatterstorm.java index 800b42aeb93..0c4b328ae57 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Shatterstorm.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Shatterstorm.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.filter.common.FilterArtifactPermanent; diff --git a/Mage.Sets/src/mage/sets/fifthedition/Stasis.java b/Mage.Sets/src/mage/sets/fifthedition/Stasis.java index ef2f8da0e6b..917f6de1e40 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Stasis.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Stasis.java @@ -28,9 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -54,10 +53,10 @@ public class Stasis extends CardImpl { this.color.setBlue(true); // Players skip their untap steps. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new SkipUntapStepEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipUntapStepEffect())); // At the beginning of your upkeep, sacrifice Stasis unless you pay {U}. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{U}")), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{U}")), TargetController.YOU, false)); } @@ -74,7 +73,7 @@ public class Stasis extends CardImpl { class SkipUntapStepEffect extends ReplacementEffectImpl { public SkipUntapStepEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Neutral); + super(Duration.WhileOnBattlefield, Outcome.Neutral); staticText = "Players skip their untap steps"; } diff --git a/Mage.Sets/src/mage/sets/fifthedition/UrzasMine.java b/Mage.Sets/src/mage/sets/fifthedition/UrzasMine.java index c53287ccea4..9d11d86153f 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/UrzasMine.java +++ b/Mage.Sets/src/mage/sets/fifthedition/UrzasMine.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.Ability; import mage.abilities.dynamicvalue.common.UrzaTerrainValue; diff --git a/Mage.Sets/src/mage/sets/fifthedition/UrzasPowerPlant.java b/Mage.Sets/src/mage/sets/fifthedition/UrzasPowerPlant.java index 5726feeb9e5..9e40da10b52 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/UrzasPowerPlant.java +++ b/Mage.Sets/src/mage/sets/fifthedition/UrzasPowerPlant.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.Ability; import mage.abilities.dynamicvalue.common.UrzaTerrainValue; diff --git a/Mage.Sets/src/mage/sets/fifthedition/UrzasTower.java b/Mage.Sets/src/mage/sets/fifthedition/UrzasTower.java index 1b2e134f66b..9430bc493dd 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/UrzasTower.java +++ b/Mage.Sets/src/mage/sets/fifthedition/UrzasTower.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.Ability; import mage.abilities.dynamicvalue.common.UrzaTerrainValue; diff --git a/Mage.Sets/src/mage/sets/fifthedition/VodalianSoldiers.java b/Mage.Sets/src/mage/sets/fifthedition/VodalianSoldiers.java index a425ec21cc5..59eaee478a2 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/VodalianSoldiers.java +++ b/Mage.Sets/src/mage/sets/fifthedition/VodalianSoldiers.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fifthedition/WallOfSpears.java b/Mage.Sets/src/mage/sets/fifthedition/WallOfSpears.java index b01e1108b50..0044d5d1804 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/WallOfSpears.java +++ b/Mage.Sets/src/mage/sets/fifthedition/WallOfSpears.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/fifthedition/WallOfStone.java b/Mage.Sets/src/mage/sets/fifthedition/WallOfStone.java index becb972a99f..72b6ead7546 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/WallOfStone.java +++ b/Mage.Sets/src/mage/sets/fifthedition/WallOfStone.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fifthedition/WarMammoth.java b/Mage.Sets/src/mage/sets/fifthedition/WarMammoth.java index e820631881f..b4f62e3940b 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/WarMammoth.java +++ b/Mage.Sets/src/mage/sets/fifthedition/WarMammoth.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fifthedition/WhirlingDervish.java b/Mage.Sets/src/mage/sets/fifthedition/WhirlingDervish.java index bb0e6253e8c..b969db8f815 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/WhirlingDervish.java +++ b/Mage.Sets/src/mage/sets/fifthedition/WhirlingDervish.java @@ -28,7 +28,7 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/fifthedition/ZephyrFalcon.java b/Mage.Sets/src/mage/sets/fifthedition/ZephyrFalcon.java index d69d466f4cb..32bb33bcfb7 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/ZephyrFalcon.java +++ b/Mage.Sets/src/mage/sets/fifthedition/ZephyrFalcon.java @@ -28,8 +28,8 @@ package mage.sets.fifthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; diff --git a/Mage.Sets/src/mage/sets/fourthedition/Blessing.java b/Mage.Sets/src/mage/sets/fourthedition/Blessing.java index f1e2092ef4b..4270062c068 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/Blessing.java +++ b/Mage.Sets/src/mage/sets/fourthedition/Blessing.java @@ -28,12 +28,12 @@ package mage.sets.fourthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.ColoredManaSymbol; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; diff --git a/Mage.Sets/src/mage/sets/fourthedition/CarnivorousPlant.java b/Mage.Sets/src/mage/sets/fourthedition/CarnivorousPlant.java index dc95650cee0..a6c77062c8f 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/CarnivorousPlant.java +++ b/Mage.Sets/src/mage/sets/fourthedition/CarnivorousPlant.java @@ -28,8 +28,8 @@ package mage.sets.fourthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fourthedition/Counterspell.java b/Mage.Sets/src/mage/sets/fourthedition/Counterspell.java index d4adc30ba3c..fd811712fcc 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/Counterspell.java +++ b/Mage.Sets/src/mage/sets/fourthedition/Counterspell.java @@ -28,7 +28,7 @@ package mage.sets.fourthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/fourthedition/DancingScimitar.java b/Mage.Sets/src/mage/sets/fourthedition/DancingScimitar.java index 4ff11545673..bb6d8320a6c 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/DancingScimitar.java +++ b/Mage.Sets/src/mage/sets/fourthedition/DancingScimitar.java @@ -28,7 +28,7 @@ package mage.sets.fourthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/fourthedition/EvilPresence.java b/Mage.Sets/src/mage/sets/fourthedition/EvilPresence.java index 9c1b40b63ac..d19f42f1e53 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/EvilPresence.java +++ b/Mage.Sets/src/mage/sets/fourthedition/EvilPresence.java @@ -28,7 +28,7 @@ package mage.sets.fourthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/fourthedition/FireElemental.java b/Mage.Sets/src/mage/sets/fourthedition/FireElemental.java index 41672cf5b37..40ec0a90f29 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/FireElemental.java +++ b/Mage.Sets/src/mage/sets/fourthedition/FireElemental.java @@ -28,7 +28,7 @@ package mage.sets.fourthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/fourthedition/Fireball.java b/Mage.Sets/src/mage/sets/fourthedition/Fireball.java index 232dcb18fa4..c4156e7c369 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/Fireball.java +++ b/Mage.Sets/src/mage/sets/fourthedition/Fireball.java @@ -28,7 +28,7 @@ package mage.sets.fourthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/fourthedition/GoblinBalloonBrigade.java b/Mage.Sets/src/mage/sets/fourthedition/GoblinBalloonBrigade.java index 0c00497ac7a..96b24f1282e 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/GoblinBalloonBrigade.java +++ b/Mage.Sets/src/mage/sets/fourthedition/GoblinBalloonBrigade.java @@ -28,7 +28,7 @@ package mage.sets.fourthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/fourthedition/GrayOgre.java b/Mage.Sets/src/mage/sets/fourthedition/GrayOgre.java index 1fa8405b3e0..dc722b09eb8 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/GrayOgre.java +++ b/Mage.Sets/src/mage/sets/fourthedition/GrayOgre.java @@ -28,8 +28,8 @@ package mage.sets.fourthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fourthedition/HolyArmor.java b/Mage.Sets/src/mage/sets/fourthedition/HolyArmor.java index 9119dfcff35..cef28cc2374 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/HolyArmor.java +++ b/Mage.Sets/src/mage/sets/fourthedition/HolyArmor.java @@ -28,12 +28,12 @@ package mage.sets.fourthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.ColoredManaSymbol; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/fourthedition/HypnoticSpecter.java b/Mage.Sets/src/mage/sets/fourthedition/HypnoticSpecter.java index 9c9e038e0fd..2357e8fcdbd 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/HypnoticSpecter.java +++ b/Mage.Sets/src/mage/sets/fourthedition/HypnoticSpecter.java @@ -28,7 +28,7 @@ package mage.sets.fourthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/fourthedition/LandLeeches.java b/Mage.Sets/src/mage/sets/fourthedition/LandLeeches.java index 36b6a9b610d..ad3c7a9a7ff 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/LandLeeches.java +++ b/Mage.Sets/src/mage/sets/fourthedition/LandLeeches.java @@ -28,8 +28,8 @@ package mage.sets.fourthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fourthedition/ProdigalSorcerer.java b/Mage.Sets/src/mage/sets/fourthedition/ProdigalSorcerer.java index 08d14609a48..76487582343 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/ProdigalSorcerer.java +++ b/Mage.Sets/src/mage/sets/fourthedition/ProdigalSorcerer.java @@ -28,7 +28,7 @@ package mage.sets.fourthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/fourthedition/SengirVampire.java b/Mage.Sets/src/mage/sets/fourthedition/SengirVampire.java index d56340db555..6e44f93d305 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/SengirVampire.java +++ b/Mage.Sets/src/mage/sets/fourthedition/SengirVampire.java @@ -28,7 +28,7 @@ package mage.sets.fourthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/fourthedition/SerraAngel.java b/Mage.Sets/src/mage/sets/fourthedition/SerraAngel.java index 468fc4f5433..8ad48470759 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/SerraAngel.java +++ b/Mage.Sets/src/mage/sets/fourthedition/SerraAngel.java @@ -28,7 +28,7 @@ package mage.sets.fourthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/fourthedition/StripMine.java b/Mage.Sets/src/mage/sets/fourthedition/StripMine.java index aafa2684572..7f7c4cea8ba 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/StripMine.java +++ b/Mage.Sets/src/mage/sets/fourthedition/StripMine.java @@ -28,9 +28,9 @@ package mage.sets.fourthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -38,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetLandPermanent; /** @@ -54,7 +55,7 @@ public class StripMine extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {tap}, Sacrifice Strip Mine: Destroy target land. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/fourthedition/SwordsToPlowshares.java b/Mage.Sets/src/mage/sets/fourthedition/SwordsToPlowshares.java index ea923bbe024..b5a5b99a402 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/SwordsToPlowshares.java +++ b/Mage.Sets/src/mage/sets/fourthedition/SwordsToPlowshares.java @@ -28,10 +28,10 @@ package mage.sets.fourthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileTargetEffect; diff --git a/Mage.Sets/src/mage/sets/fourthedition/WallOfIce.java b/Mage.Sets/src/mage/sets/fourthedition/WallOfIce.java index b6ff10b80b4..5daef2b6058 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/WallOfIce.java +++ b/Mage.Sets/src/mage/sets/fourthedition/WallOfIce.java @@ -28,8 +28,8 @@ package mage.sets.fourthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fourthedition/WaterElemental.java b/Mage.Sets/src/mage/sets/fourthedition/WaterElemental.java index e0d977702af..d22399d9922 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/WaterElemental.java +++ b/Mage.Sets/src/mage/sets/fourthedition/WaterElemental.java @@ -28,8 +28,8 @@ package mage.sets.fourthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fourthedition/WhirlingDervish.java b/Mage.Sets/src/mage/sets/fourthedition/WhirlingDervish.java index 2c62b9fcda1..fa0a05a1a95 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/WhirlingDervish.java +++ b/Mage.Sets/src/mage/sets/fourthedition/WhirlingDervish.java @@ -28,7 +28,7 @@ package mage.sets.fourthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/futuresight/AkromasMemorial.java b/Mage.Sets/src/mage/sets/futuresight/AkromasMemorial.java index 0bb3b5a88cf..23744575c2d 100644 --- a/Mage.Sets/src/mage/sets/futuresight/AkromasMemorial.java +++ b/Mage.Sets/src/mage/sets/futuresight/AkromasMemorial.java @@ -28,7 +28,7 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/futuresight/AvenMindcensor.java b/Mage.Sets/src/mage/sets/futuresight/AvenMindcensor.java index 09ecf6a1c00..5dc0689214d 100644 --- a/Mage.Sets/src/mage/sets/futuresight/AvenMindcensor.java +++ b/Mage.Sets/src/mage/sets/futuresight/AvenMindcensor.java @@ -28,11 +28,11 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/futuresight/BladeOfTheSixthPride.java b/Mage.Sets/src/mage/sets/futuresight/BladeOfTheSixthPride.java index 07d916fc946..158c9c232f3 100644 --- a/Mage.Sets/src/mage/sets/futuresight/BladeOfTheSixthPride.java +++ b/Mage.Sets/src/mage/sets/futuresight/BladeOfTheSixthPride.java @@ -28,8 +28,8 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/futuresight/BlindPhantasm.java b/Mage.Sets/src/mage/sets/futuresight/BlindPhantasm.java index bfda08f376d..b4043938abe 100644 --- a/Mage.Sets/src/mage/sets/futuresight/BlindPhantasm.java +++ b/Mage.Sets/src/mage/sets/futuresight/BlindPhantasm.java @@ -28,8 +28,8 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/futuresight/BoundInSilence.java b/Mage.Sets/src/mage/sets/futuresight/BoundInSilence.java index 89253831eff..22064a4aa3e 100644 --- a/Mage.Sets/src/mage/sets/futuresight/BoundInSilence.java +++ b/Mage.Sets/src/mage/sets/futuresight/BoundInSilence.java @@ -28,7 +28,7 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/futuresight/BridgeFromBelow.java b/Mage.Sets/src/mage/sets/futuresight/BridgeFromBelow.java index 5c429a2aeac..b6d232f0e79 100644 --- a/Mage.Sets/src/mage/sets/futuresight/BridgeFromBelow.java +++ b/Mage.Sets/src/mage/sets/futuresight/BridgeFromBelow.java @@ -28,14 +28,16 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.ExileSourceEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.ControllerPredicate; @@ -58,9 +60,9 @@ public class BridgeFromBelow extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("When a creature is put into an opponent's graveyard from the battlefield"); static{ - filter1.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter1.add(new ControllerPredicate(TargetController.YOU)); filter1.add(Predicates.not(new TokenPredicate())); - filter2.add(new ControllerPredicate(Constants.TargetController.OPPONENT)); + filter2.add(new ControllerPredicate(TargetController.OPPONENT)); } public BridgeFromBelow(UUID ownerId) { @@ -90,7 +92,7 @@ class BridgeFromBelowAbility extends TriggeredAbilityImpl { this.addAbility(ability); // Enchanted creature gets +3/+3 and has first strike, vigilance, and lifelink. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Constants.Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), Constants.AttachmentType.AURA))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), Constants.AttachmentType.AURA))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA))); } public DaybreakCoronet(final DaybreakCoronet card) { diff --git a/Mage.Sets/src/mage/sets/futuresight/DryadArbor.java b/Mage.Sets/src/mage/sets/futuresight/DryadArbor.java index 0ba6f51e5bf..627bac996a1 100644 --- a/Mage.Sets/src/mage/sets/futuresight/DryadArbor.java +++ b/Mage.Sets/src/mage/sets/futuresight/DryadArbor.java @@ -28,8 +28,8 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/futuresight/FomoriNomad.java b/Mage.Sets/src/mage/sets/futuresight/FomoriNomad.java index 163e1eaea5f..fe7e1f0a196 100644 --- a/Mage.Sets/src/mage/sets/futuresight/FomoriNomad.java +++ b/Mage.Sets/src/mage/sets/futuresight/FomoriNomad.java @@ -28,8 +28,8 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/futuresight/ForceOfSavagery.java b/Mage.Sets/src/mage/sets/futuresight/ForceOfSavagery.java index 616df94d64b..eea5d8def4a 100644 --- a/Mage.Sets/src/mage/sets/futuresight/ForceOfSavagery.java +++ b/Mage.Sets/src/mage/sets/futuresight/ForceOfSavagery.java @@ -28,8 +28,8 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/futuresight/GlitteringWish.java b/Mage.Sets/src/mage/sets/futuresight/GlitteringWish.java index bea3ef38bcc..0c37b2d0b7a 100644 --- a/Mage.Sets/src/mage/sets/futuresight/GlitteringWish.java +++ b/Mage.Sets/src/mage/sets/futuresight/GlitteringWish.java @@ -29,9 +29,9 @@ package mage.sets.futuresight; import java.util.Set; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -39,6 +39,8 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicate; import mage.game.Game; @@ -93,7 +95,7 @@ class GlitteringWishEffect extends OneShotEffect { } public GlitteringWishEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); this.staticText = "You may choose a multicolored card you own from outside the game, reveal that card, and put it into your hand. Exile Glittering Wish"; } @@ -110,7 +112,7 @@ class GlitteringWishEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); if (player != null) { - while (player.chooseUse(Constants.Outcome.Benefit, choiceText, game)) { + while (player.chooseUse(Outcome.Benefit, choiceText, game)) { Cards cards = player.getSideboard(); if(cards.isEmpty()) { game.informPlayer(player, "You have no cards outside the game."); @@ -128,12 +130,12 @@ class GlitteringWishEffect extends OneShotEffect { filteredCards.add(card.getId()); } - TargetCard target = new TargetCard(Constants.Zone.PICK, filter); - if (player.choose(Constants.Outcome.Benefit, filteredCards, target, game)) { + TargetCard target = new TargetCard(Zone.PICK, filter); + if (player.choose(Outcome.Benefit, filteredCards, target, game)) { Card card = player.getSideboard().get(target.getFirstTarget(), game); if (card != null) { - card.moveToZone(Constants.Zone.HAND, source.getId(), game, false); + card.moveToZone(Zone.HAND, source.getId(), game, false); Cards revealCard = new CardsImpl(); revealCard.add(card); player.revealCards("Glittering Wish", revealCard, game); diff --git a/Mage.Sets/src/mage/sets/futuresight/GroveOfTheBurnwillows.java b/Mage.Sets/src/mage/sets/futuresight/GroveOfTheBurnwillows.java index 007136c16b2..9d710e7a9b1 100644 --- a/Mage.Sets/src/mage/sets/futuresight/GroveOfTheBurnwillows.java +++ b/Mage.Sets/src/mage/sets/futuresight/GroveOfTheBurnwillows.java @@ -28,15 +28,16 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; @@ -74,7 +75,7 @@ public class GroveOfTheBurnwillows extends CardImpl { class GroveOfTheBurnwillowsEffect extends OneShotEffect { GroveOfTheBurnwillowsEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "Each opponent gains 1 life"; } diff --git a/Mage.Sets/src/mage/sets/futuresight/HorizonCanopy.java b/Mage.Sets/src/mage/sets/futuresight/HorizonCanopy.java index e139da914dc..f133cf8d5dc 100644 --- a/Mage.Sets/src/mage/sets/futuresight/HorizonCanopy.java +++ b/Mage.Sets/src/mage/sets/futuresight/HorizonCanopy.java @@ -28,9 +28,9 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.PayLifeCost; @@ -41,6 +41,7 @@ import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -60,7 +61,7 @@ public class HorizonCanopy extends CardImpl { ability2.addCost(new PayLifeCost(1)); this.addAbility(ability2); // {1}, {tap}, Sacrifice Horizon Canopy: Draw a card. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/futuresight/IchorSlick.java b/Mage.Sets/src/mage/sets/futuresight/IchorSlick.java index a6065eb997e..783bff2428a 100644 --- a/Mage.Sets/src/mage/sets/futuresight/IchorSlick.java +++ b/Mage.Sets/src/mage/sets/futuresight/IchorSlick.java @@ -27,14 +27,14 @@ */ package mage.sets.futuresight; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.CyclingAbility; import mage.abilities.keyword.MadnessAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -52,7 +52,7 @@ public class IchorSlick extends CardImpl { this.color.setBlack(true); // Target creature gets -3/-3 until end of turn. - this.getSpellAbility().addEffect(new BoostTargetEffect(-3, -3, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(-3, -3, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Cycling {2} diff --git a/Mage.Sets/src/mage/sets/futuresight/InterventionPact.java b/Mage.Sets/src/mage/sets/futuresight/InterventionPact.java index d450cc8ac56..1f11b49d80c 100644 --- a/Mage.Sets/src/mage/sets/futuresight/InterventionPact.java +++ b/Mage.Sets/src/mage/sets/futuresight/InterventionPact.java @@ -28,9 +28,9 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.delayed.PactDelayedTriggeredAbility; @@ -38,6 +38,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.PreventionEffectImpl; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; @@ -77,7 +78,7 @@ class InterventionPactPreventDamageEffect extends PreventionEffectImpl { class NarcomoebaAbility extends ZoneChangeTriggeredAbility { public NarcomoebaAbility() { - super(Constants.Zone.LIBRARY, Constants.Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(), "", true); - this.zone = Constants.Zone.ALL; + super(Zone.LIBRARY, Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(), "", true); + this.zone = Zone.ALL; } public NarcomoebaAbility(final NarcomoebaAbility ability) { diff --git a/Mage.Sets/src/mage/sets/futuresight/NessianCourser.java b/Mage.Sets/src/mage/sets/futuresight/NessianCourser.java index a60884ca6be..fcd743f4eca 100644 --- a/Mage.Sets/src/mage/sets/futuresight/NessianCourser.java +++ b/Mage.Sets/src/mage/sets/futuresight/NessianCourser.java @@ -28,8 +28,8 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/futuresight/NewBenalia.java b/Mage.Sets/src/mage/sets/futuresight/NewBenalia.java index 28ff795566c..2f853dd2dcf 100644 --- a/Mage.Sets/src/mage/sets/futuresight/NewBenalia.java +++ b/Mage.Sets/src/mage/sets/futuresight/NewBenalia.java @@ -28,8 +28,8 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.ScryEffect; diff --git a/Mage.Sets/src/mage/sets/futuresight/PactOfNegation.java b/Mage.Sets/src/mage/sets/futuresight/PactOfNegation.java index e42d371d4ed..b2f731b5467 100644 --- a/Mage.Sets/src/mage/sets/futuresight/PactOfNegation.java +++ b/Mage.Sets/src/mage/sets/futuresight/PactOfNegation.java @@ -28,8 +28,8 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.delayed.PactDelayedTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CounterTargetEffect; diff --git a/Mage.Sets/src/mage/sets/futuresight/PactOfTheTitan.java b/Mage.Sets/src/mage/sets/futuresight/PactOfTheTitan.java index 7e6fd33e894..c042d0a151d 100644 --- a/Mage.Sets/src/mage/sets/futuresight/PactOfTheTitan.java +++ b/Mage.Sets/src/mage/sets/futuresight/PactOfTheTitan.java @@ -28,8 +28,8 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.delayed.PactDelayedTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/futuresight/RiverOfTears.java b/Mage.Sets/src/mage/sets/futuresight/RiverOfTears.java index ba0c248ae20..6c4a5efb624 100644 --- a/Mage.Sets/src/mage/sets/futuresight/RiverOfTears.java +++ b/Mage.Sets/src/mage/sets/futuresight/RiverOfTears.java @@ -28,9 +28,9 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.Mana; import mage.abilities.condition.common.LandfallCondition; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/futuresight/SlaughterPact.java b/Mage.Sets/src/mage/sets/futuresight/SlaughterPact.java index 5b610b8c4ce..d786f865d4f 100644 --- a/Mage.Sets/src/mage/sets/futuresight/SlaughterPact.java +++ b/Mage.Sets/src/mage/sets/futuresight/SlaughterPact.java @@ -28,8 +28,8 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.common.delayed.PactDelayedTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/futuresight/StreetWraith.java b/Mage.Sets/src/mage/sets/futuresight/StreetWraith.java index 3d25b905af4..fd372d947d1 100644 --- a/Mage.Sets/src/mage/sets/futuresight/StreetWraith.java +++ b/Mage.Sets/src/mage/sets/futuresight/StreetWraith.java @@ -28,8 +28,8 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.keyword.CyclingAbility; diff --git a/Mage.Sets/src/mage/sets/futuresight/StrongholdRats.java b/Mage.Sets/src/mage/sets/futuresight/StrongholdRats.java index bd4525a9eb3..7006f1bc6d8 100644 --- a/Mage.Sets/src/mage/sets/futuresight/StrongholdRats.java +++ b/Mage.Sets/src/mage/sets/futuresight/StrongholdRats.java @@ -28,8 +28,8 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.DiscardEachPlayerEffect; diff --git a/Mage.Sets/src/mage/sets/futuresight/SummonersPact.java b/Mage.Sets/src/mage/sets/futuresight/SummonersPact.java index 6e9b8d0b808..5b36f59879f 100644 --- a/Mage.Sets/src/mage/sets/futuresight/SummonersPact.java +++ b/Mage.Sets/src/mage/sets/futuresight/SummonersPact.java @@ -28,8 +28,8 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.common.delayed.PactDelayedTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/futuresight/Tarmogoyf.java b/Mage.Sets/src/mage/sets/futuresight/Tarmogoyf.java index d0550c1c638..c380ff61d79 100644 --- a/Mage.Sets/src/mage/sets/futuresight/Tarmogoyf.java +++ b/Mage.Sets/src/mage/sets/futuresight/Tarmogoyf.java @@ -28,13 +28,13 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/futuresight/ThornwealdArcher.java b/Mage.Sets/src/mage/sets/futuresight/ThornwealdArcher.java index dbadc6e882f..215aa4bb16a 100644 --- a/Mage.Sets/src/mage/sets/futuresight/ThornwealdArcher.java +++ b/Mage.Sets/src/mage/sets/futuresight/ThornwealdArcher.java @@ -28,8 +28,8 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.abilities.keyword.DeathtouchAbility; diff --git a/Mage.Sets/src/mage/sets/futuresight/TolariaWest.java b/Mage.Sets/src/mage/sets/futuresight/TolariaWest.java index 2c73462a820..cc529a200cc 100644 --- a/Mage.Sets/src/mage/sets/futuresight/TolariaWest.java +++ b/Mage.Sets/src/mage/sets/futuresight/TolariaWest.java @@ -28,8 +28,8 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.keyword.TransmuteAbility; import mage.abilities.mana.BlueManaAbility; diff --git a/Mage.Sets/src/mage/sets/futuresight/WitchsMist.java b/Mage.Sets/src/mage/sets/futuresight/WitchsMist.java index e00c675349c..03866716482 100644 --- a/Mage.Sets/src/mage/sets/futuresight/WitchsMist.java +++ b/Mage.Sets/src/mage/sets/futuresight/WitchsMist.java @@ -28,9 +28,9 @@ package mage.sets.futuresight; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/gatecrash/AEtherize.java b/Mage.Sets/src/mage/sets/gatecrash/AEtherize.java index a5287f28d16..53d54726f9f 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/AEtherize.java +++ b/Mage.Sets/src/mage/sets/gatecrash/AEtherize.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ReturnToHandAllEffect; import mage.cards.CardImpl; import mage.filter.common.FilterAttackingCreature; diff --git a/Mage.Sets/src/mage/sets/gatecrash/ActOfTreason.java b/Mage.Sets/src/mage/sets/gatecrash/ActOfTreason.java index 7cceb85484e..cfabb260343 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ActOfTreason.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ActOfTreason.java @@ -28,7 +28,7 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/gatecrash/AdaptiveSnapjaw.java b/Mage.Sets/src/mage/sets/gatecrash/AdaptiveSnapjaw.java index 6eb4121f8ed..a04b3a40dac 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/AdaptiveSnapjaw.java +++ b/Mage.Sets/src/mage/sets/gatecrash/AdaptiveSnapjaw.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.EvolveAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/AerialManeuver.java b/Mage.Sets/src/mage/sets/gatecrash/AerialManeuver.java index 04b5d746b01..31f2096605e 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/AerialManeuver.java +++ b/Mage.Sets/src/mage/sets/gatecrash/AerialManeuver.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/Agoraphobia.java b/Mage.Sets/src/mage/sets/gatecrash/Agoraphobia.java index 6578ddcec23..5333b34b6ec 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Agoraphobia.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Agoraphobia.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +40,8 @@ import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.effects.common.continious.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -59,15 +61,15 @@ public class Agoraphobia extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature gets -5/-0. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(-5, 0))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-5, 0))); // {2}{U}: Return Agoraphobia to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ManaCostsImpl("{2}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ManaCostsImpl("{2}{U}"))); } public Agoraphobia(final Agoraphobia card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/AlmsBeast.java b/Mage.Sets/src/mage/sets/gatecrash/AlmsBeast.java index 44049f5c3ee..0b4a064e96a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/AlmsBeast.java +++ b/Mage.Sets/src/mage/sets/gatecrash/AlmsBeast.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityAllEffect; diff --git a/Mage.Sets/src/mage/sets/gatecrash/AlphaAuthority.java b/Mage.Sets/src/mage/sets/gatecrash/AlphaAuthority.java index f7428245351..a290cfc7612 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/AlphaAuthority.java +++ b/Mage.Sets/src/mage/sets/gatecrash/AlphaAuthority.java @@ -28,15 +28,15 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; + +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; @@ -72,7 +72,7 @@ public class AlphaAuthority extends CardImpl { this.addAbility(ability); // Enchanted creature has hexproof and can't be blocked by more than one creature. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HexproofAbility.getInstance(), Constants.AttachmentType.AURA, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HexproofAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield)); ability.addEffect(new CantBeBlockedByMoreThanOneAttachedEffect(AttachmentType.AURA,1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/AngelicEdict.java b/Mage.Sets/src/mage/sets/gatecrash/AngelicEdict.java index ebb1e295e86..d925262f8cb 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/AngelicEdict.java +++ b/Mage.Sets/src/mage/sets/gatecrash/AngelicEdict.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/gatecrash/AngelicSkirmisher.java b/Mage.Sets/src/mage/sets/gatecrash/AngelicSkirmisher.java index e6dc53852c7..f20e3674311 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/AngelicSkirmisher.java +++ b/Mage.Sets/src/mage/sets/gatecrash/AngelicSkirmisher.java @@ -30,10 +30,12 @@ package mage.sets.gatecrash; import java.util.HashSet; import java.util.Set; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfCombatTriggeredAbility; @@ -97,7 +99,7 @@ public class AngelicSkirmisher extends CardImpl { class AngelicSkirmisherEffect extends OneShotEffect { AngelicSkirmisherEffect() { - super(Constants.Outcome.AddAbility); + super(Outcome.AddAbility); staticText = "choose first strike, vigilance or lifelink. Creatures you control gain that ability until end of turn"; } @@ -120,7 +122,7 @@ class AngelicSkirmisherEffect extends OneShotEffect { ability = LifelinkAbility.getInstance(); } if (ability != null) { - GainAbilityControlledEffect effect = new GainAbilityControlledEffect(ability, Constants.Duration.EndOfTurn, new FilterControlledCreaturePermanent()); + GainAbilityControlledEffect effect = new GainAbilityControlledEffect(ability, Duration.EndOfTurn, new FilterControlledCreaturePermanent()); game.addEffect(effect, source); game.informPlayers(new StringBuilder(sourcePermanent.getName()) .append(": ") diff --git a/Mage.Sets/src/mage/sets/gatecrash/ArmoredTransport.java b/Mage.Sets/src/mage/sets/gatecrash/ArmoredTransport.java index f9cf3f9af84..7b5c86303f7 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ArmoredTransport.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ArmoredTransport.java @@ -28,15 +28,16 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.PreventionEffectImpl; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.DamageEvent; import mage.game.events.GameEvent; @@ -57,7 +58,7 @@ public class ArmoredTransport extends CardImpl { this.toughness = new MageInt(1); // Prevent all combat damage that would be dealt to Armored Transport by creatures blocking it. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ArmoredTransportPreventCombatDamageSourceEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ArmoredTransportPreventCombatDamageSourceEffect(Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/ArrowsOfJustice.java b/Mage.Sets/src/mage/sets/gatecrash/ArrowsOfJustice.java index ae0fd3900ac..d357d757ebb 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ArrowsOfJustice.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ArrowsOfJustice.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetAttackingOrBlockingCreature; diff --git a/Mage.Sets/src/mage/sets/gatecrash/AssembleTheLegion.java b/Mage.Sets/src/mage/sets/gatecrash/AssembleTheLegion.java index c8b2b3b18bd..a0dc846237a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/AssembleTheLegion.java +++ b/Mage.Sets/src/mage/sets/gatecrash/AssembleTheLegion.java @@ -28,11 +28,11 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/gatecrash/AureliaTheWarleader.java b/Mage.Sets/src/mage/sets/gatecrash/AureliaTheWarleader.java index e2229fdb1f3..36110cfb3d0 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/AureliaTheWarleader.java +++ b/Mage.Sets/src/mage/sets/gatecrash/AureliaTheWarleader.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -43,6 +43,8 @@ import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.TurnPhase; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.game.events.GameEvent; @@ -154,7 +156,7 @@ class AureliaAttacksTriggeredAbility extends TriggeredAbilityImpl { public AdditionalCombatPhaseEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "After this phase, there is an additional combat phase"; } @@ -169,7 +171,7 @@ class AdditionalCombatPhaseEffect extends OneShotEffect { class AureliasFuryCantCastEffect extends ReplacementEffectImpl { public AureliasFuryCantCastEffect() { - super(Constants.Duration.EndOfTurn, Outcome.Benefit); + super(Duration.EndOfTurn, Outcome.Benefit); staticText = "Players dealt damage this way can't cast noncreature spells this turn"; } diff --git a/Mage.Sets/src/mage/sets/gatecrash/BalustradeSpy.java b/Mage.Sets/src/mage/sets/gatecrash/BalustradeSpy.java index 91f01c99101..e56a2cc6561 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BalustradeSpy.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BalustradeSpy.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/BaneAlleyBroker.java b/Mage.Sets/src/mage/sets/gatecrash/BaneAlleyBroker.java index e5607da4ebc..0a5ffeaf5ba 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BaneAlleyBroker.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BaneAlleyBroker.java @@ -30,12 +30,12 @@ package mage.sets.gatecrash; import java.util.HashSet; import java.util.Set; import java.util.UUID; -import mage.Constants.AsThoughEffectType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AsThoughEffectType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/BasilicaGuards.java b/Mage.Sets/src/mage/sets/gatecrash/BasilicaGuards.java index f79215ee1eb..0d438bbabe2 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BasilicaGuards.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BasilicaGuards.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.ExtortAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/BasilicaScreecher.java b/Mage.Sets/src/mage/sets/gatecrash/BasilicaScreecher.java index 1598a24bcd4..db537b8d53a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BasilicaScreecher.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BasilicaScreecher.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ExtortAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/BiomassMutation.java b/Mage.Sets/src/mage/sets/gatecrash/BiomassMutation.java index f77e3ed3391..0fae01dd671 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BiomassMutation.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BiomassMutation.java @@ -28,13 +28,14 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.continious.SetPowerToughnessAllEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; /** @@ -52,7 +53,7 @@ public class BiomassMutation extends CardImpl { // Creatures you control become X/X until end of turn. DynamicValue variableMana = new ManacostVariableValue(); - this.getSpellAbility().addEffect(new SetPowerToughnessAllEffect(variableMana, variableMana, Constants.Duration.EndOfTurn, new FilterControlledCreaturePermanent("Creatures you control"), true)); + this.getSpellAbility().addEffect(new SetPowerToughnessAllEffect(variableMana, variableMana, Duration.EndOfTurn, new FilterControlledCreaturePermanent("Creatures you control"), true)); } public BiomassMutation(final BiomassMutation card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/Bioshift.java b/Mage.Sets/src/mage/sets/gatecrash/Bioshift.java index c8faac289f9..367fa9537c4 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Bioshift.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Bioshift.java @@ -28,12 +28,13 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -103,7 +104,7 @@ class TargetCreaturePermanentSameController extends TargetCreaturePermanent { class MoveCounterFromTargetToTargetEffect extends OneShotEffect { public MoveCounterFromTargetToTargetEffect() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); this.staticText = "Move any number of +1/+1 counters from target creature onto another target creature with the same controller"; } diff --git a/Mage.Sets/src/mage/sets/gatecrash/Biovisionary.java b/Mage.Sets/src/mage/sets/gatecrash/Biovisionary.java index f709758602f..bfa3de6db99 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Biovisionary.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Biovisionary.java @@ -28,14 +28,16 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.ControlsPermanentCondition; import mage.abilities.effects.common.WinGameEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.NamePredicate; @@ -64,7 +66,7 @@ public class Biovisionary extends CardImpl { this.toughness = new MageInt(3); //At the beginning of the end step, if you control four or more creatures named Biovisionary, you win the game. - this.addAbility(new BeginningOfEndStepTriggeredAbility(Constants.Zone.BATTLEFIELD, new WinGameEffect(), Constants.TargetController.ANY, new ControlsPermanentCondition(filter, ControlsPermanentCondition.CountType.MORE_THAN, 3), false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new WinGameEffect(), TargetController.ANY, new ControlsPermanentCondition(filter, ControlsPermanentCondition.CountType.MORE_THAN, 3), false)); } public Biovisionary(final Biovisionary card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/BlindObedience.java b/Mage.Sets/src/mage/sets/gatecrash/BlindObedience.java index 6f6ab247fe4..03a3b7e8a2b 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BlindObedience.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BlindObedience.java @@ -28,11 +28,11 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/BomberCorps.java b/Mage.Sets/src/mage/sets/gatecrash/BomberCorps.java index 8e6137a7bd6..91811e528b0 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BomberCorps.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BomberCorps.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.DamageTargetEffect; diff --git a/Mage.Sets/src/mage/sets/gatecrash/BorborygmosEnraged.java b/Mage.Sets/src/mage/sets/gatecrash/BorborygmosEnraged.java index 23a4445be25..bb8b394c1a5 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BorborygmosEnraged.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BorborygmosEnraged.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -43,6 +43,8 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterLandCard; import mage.game.Game; import mage.players.Player; @@ -75,7 +77,7 @@ public class BorborygmosEnraged extends CardImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new BorborygmosEnragedEffect(), false, false)); //Discard a land card: Borborygmos Enraged deals 3 damage to target creature or player - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(3), new DiscardTargetCost(new TargetCardInHand(new FilterLandCard()))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new DiscardTargetCost(new TargetCardInHand(new FilterLandCard()))); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } @@ -93,7 +95,7 @@ public class BorborygmosEnraged extends CardImpl { class BorborygmosEnragedEffect extends OneShotEffect { public BorborygmosEnragedEffect() { - super(Constants.Outcome.DrawCard); + super(Outcome.DrawCard); this.staticText = "reveal the top three cards of your library. Put all land cards revealed this way into your hand and the rest into your graveyard"; } @@ -110,17 +112,17 @@ class BorborygmosEnragedEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); if (player != null) { - Cards cards = new CardsImpl(Constants.Zone.PICK); + Cards cards = new CardsImpl(Zone.PICK); int count = Math.min(player.getLibrary().size(), 3); for (int i = 0; i < count; i++) { Card card = player.getLibrary().removeFromTop(game); if (card != null) { cards.add(card); - game.setZone(card.getId(), Constants.Zone.PICK); + game.setZone(card.getId(), Zone.PICK); if (card.getCardType().contains(CardType.LAND)) { - card.moveToZone(Constants.Zone.HAND, source.getId(), game, true); + card.moveToZone(Zone.HAND, source.getId(), game, true); } else { - card.moveToZone(Constants.Zone.GRAVEYARD, source.getId(), game, false); + card.moveToZone(Zone.GRAVEYARD, source.getId(), game, false); } } } diff --git a/Mage.Sets/src/mage/sets/gatecrash/BorosCharm.java b/Mage.Sets/src/mage/sets/gatecrash/BorosCharm.java index 78bfd58bb60..540c2998e67 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BorosCharm.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BorosCharm.java @@ -28,10 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Mode; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; @@ -40,6 +39,7 @@ import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.DoubleStrikeAbility; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterControlledPermanent; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; @@ -68,7 +68,7 @@ public class BorosCharm extends CardImpl { this.getSpellAbility().addMode(mode); //or target creature gains double strike until end of turn. Mode mode2 = new Mode(); - mode2.getEffects().add(new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Constants.Duration.EndOfTurn)); + mode2.getEffects().add(new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn)); mode2.getTargets().add(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode2); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/BorosElite.java b/Mage.Sets/src/mage/sets/gatecrash/BorosElite.java index c9bdb83028d..6e33e31cbf9 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BorosElite.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BorosElite.java @@ -28,13 +28,14 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.BattalionAbility; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -53,7 +54,7 @@ public class BorosElite extends CardImpl { this.toughness = new MageInt(1); // Battalion - Whenever Boros Elite and at least two other creatures attack, Boros Elite gets +2/+2 until end of turn. - this.addAbility(new BattalionAbility(new BoostSourceEffect(2,2, Constants.Duration.EndOfTurn))); + this.addAbility(new BattalionAbility(new BoostSourceEffect(2,2, Duration.EndOfTurn))); } public BorosElite(final BorosElite card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/BorosGuildgate.java b/Mage.Sets/src/mage/sets/gatecrash/BorosGuildgate.java index ee7c382d977..063ca7ddbe3 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BorosGuildgate.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BorosGuildgate.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.RedManaAbility; import mage.abilities.mana.WhiteManaAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/BorosKeyrune.java b/Mage.Sets/src/mage/sets/gatecrash/BorosKeyrune.java index 3ce9303cb93..0ea1aead9be 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BorosKeyrune.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BorosKeyrune.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/BorosReckoner.java b/Mage.Sets/src/mage/sets/gatecrash/BorosReckoner.java index 70e293305af..26a9b8122a2 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BorosReckoner.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BorosReckoner.java @@ -28,11 +28,11 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealtDamageToSourceTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/BurningTreeEmissary.java b/Mage.Sets/src/mage/sets/gatecrash/BurningTreeEmissary.java index c6219fd4f2a..2e88c7ecbeb 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BurningTreeEmissary.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BurningTreeEmissary.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/BurstOfStrength.java b/Mage.Sets/src/mage/sets/gatecrash/BurstOfStrength.java index 2cb00018fa7..b581a842e79 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BurstOfStrength.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BurstOfStrength.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/CallOfTheNightwing.java b/Mage.Sets/src/mage/sets/gatecrash/CallOfTheNightwing.java index c0a2c0994ec..b62f1b7dcf2 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/CallOfTheNightwing.java +++ b/Mage.Sets/src/mage/sets/gatecrash/CallOfTheNightwing.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.CipherEffect; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/gatecrash/CartelAristocrat.java b/Mage.Sets/src/mage/sets/gatecrash/CartelAristocrat.java index c5ad11e0add..b1519b11990 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/CartelAristocrat.java +++ b/Mage.Sets/src/mage/sets/gatecrash/CartelAristocrat.java @@ -28,11 +28,11 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/CinderElemental.java b/Mage.Sets/src/mage/sets/gatecrash/CinderElemental.java index 61ed578a99c..167f7c7df1c 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/CinderElemental.java +++ b/Mage.Sets/src/mage/sets/gatecrash/CinderElemental.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +40,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; /** @@ -58,7 +59,7 @@ public class CinderElemental extends CardImpl { this.toughness = new MageInt(2); // {X}{R}, {tap}, Sacrifice Cinder Elemental: Cinder Elemental deals X damage to target creature or player. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(new ManacostVariableValue()), new ManaCostsImpl("{X}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new ManacostVariableValue()), new ManaCostsImpl("{X}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/ClanDefiance.java b/Mage.Sets/src/mage/sets/gatecrash/ClanDefiance.java index 5f40b40640d..70cbf444f9f 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ClanDefiance.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ClanDefiance.java @@ -30,8 +30,8 @@ package mage.sets.gatecrash; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Mode; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DamageTargetEffect; diff --git a/Mage.Sets/src/mage/sets/gatecrash/ClingingAnemones.java b/Mage.Sets/src/mage/sets/gatecrash/ClingingAnemones.java index cca5483cd07..9b0e06eb2cd 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ClingingAnemones.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ClingingAnemones.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.EvolveAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/CloudfinRaptor.java b/Mage.Sets/src/mage/sets/gatecrash/CloudfinRaptor.java index 90c6fac8d35..d8607b523ed 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/CloudfinRaptor.java +++ b/Mage.Sets/src/mage/sets/gatecrash/CloudfinRaptor.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.EvolveAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/CoercedConfession.java b/Mage.Sets/src/mage/sets/gatecrash/CoercedConfession.java index 1b767822a9b..1f5ad4bb81b 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/CoercedConfession.java +++ b/Mage.Sets/src/mage/sets/gatecrash/CoercedConfession.java @@ -28,14 +28,15 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; @@ -96,7 +97,7 @@ class CoercedConfessionMillEffect extends OneShotEffect 0) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/ConsumingAberration.java b/Mage.Sets/src/mage/sets/gatecrash/ConsumingAberration.java index 09ecd340393..af78029c473 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ConsumingAberration.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ConsumingAberration.java @@ -28,11 +28,11 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -44,6 +44,7 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Duration; import mage.game.Game; import mage.players.Player; @@ -66,7 +67,7 @@ public class ConsumingAberration extends CardImpl { this.toughness = new MageInt(0); //Consuming Aberration's power and toughness are each equal to the number of cards in your opponents' graveyards. - this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new CardsInOpponentsGraveyardsCount(), Constants.Duration.EndOfGame))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new CardsInOpponentsGraveyardsCount(), Duration.EndOfGame))); //Whenever you cast a spell, each opponent reveals cards from the top of his or her library until he or she reveals a land card, then puts those cards into his or her graveyard. this.addAbility(new SpellCastTriggeredAbility(new ConsumingAberrationEffect(), false)); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/CorpseBlockade.java b/Mage.Sets/src/mage/sets/gatecrash/CorpseBlockade.java index f8be5ebd448..8b8be130345 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/CorpseBlockade.java +++ b/Mage.Sets/src/mage/sets/gatecrash/CorpseBlockade.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -39,6 +39,7 @@ import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -69,7 +70,7 @@ public class CorpseBlockade extends CardImpl { // Sacrifice another creature: Corpse Blockade gains deathtouch until end of turn. this.addAbility(new SimpleActivatedAbility( Zone.BATTLEFIELD, - new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Constants.Duration.EndOfTurn), + new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1,filter, true)))); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/CourtStreetDenizen.java b/Mage.Sets/src/mage/sets/gatecrash/CourtStreetDenizen.java index ba76f5e2d77..932863128a2 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/CourtStreetDenizen.java +++ b/Mage.Sets/src/mage/sets/gatecrash/CourtStreetDenizen.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/gatecrash/CracklingPerimeter.java b/Mage.Sets/src/mage/sets/gatecrash/CracklingPerimeter.java index 1f1a59d58bd..3503ec330ba 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/CracklingPerimeter.java +++ b/Mage.Sets/src/mage/sets/gatecrash/CracklingPerimeter.java @@ -28,23 +28,19 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; -import mage.abilities.Ability; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; -import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DamagePlayersEffect; import mage.cards.CardImpl; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; -import mage.game.Game; -import mage.players.Player; import mage.target.common.TargetControlledPermanent; /** diff --git a/Mage.Sets/src/mage/sets/gatecrash/Crocanura.java b/Mage.Sets/src/mage/sets/gatecrash/Crocanura.java index 32c93f18c4c..d56e15de9a3 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Crocanura.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Crocanura.java @@ -29,8 +29,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.EvolveAbility; import mage.abilities.keyword.ReachAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/CrownedCeratok.java b/Mage.Sets/src/mage/sets/gatecrash/CrownedCeratok.java index fe02a0ca2a4..8f6487e0b04 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/CrownedCeratok.java +++ b/Mage.Sets/src/mage/sets/gatecrash/CrownedCeratok.java @@ -28,11 +28,11 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityAllEffect; diff --git a/Mage.Sets/src/mage/sets/gatecrash/CryptGhast.java b/Mage.Sets/src/mage/sets/gatecrash/CryptGhast.java index d2a0a863691..ce05fcebc45 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/CryptGhast.java +++ b/Mage.Sets/src/mage/sets/gatecrash/CryptGhast.java @@ -29,9 +29,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.Mana; import mage.abilities.effects.common.BasicManaEffect; diff --git a/Mage.Sets/src/mage/sets/gatecrash/DaringSkyjek.java b/Mage.Sets/src/mage/sets/gatecrash/DaringSkyjek.java index 0b2d316f9b7..f1d2c12b204 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DaringSkyjek.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DaringSkyjek.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.BattalionAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/DeathcultRogue.java b/Mage.Sets/src/mage/sets/gatecrash/DeathcultRogue.java index b654f1e9ae7..3d424c73d7a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DeathcultRogue.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DeathcultRogue.java @@ -28,15 +28,16 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.RestrictionEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; @@ -58,7 +59,7 @@ public class DeathcultRogue extends CardImpl { this.toughness = new MageInt(2); // Deathcult Rogue can't be blocked except by Rogues. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new DeathcultRogueRestrictionEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DeathcultRogueRestrictionEffect())); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/DeathpactAngel.java b/Mage.Sets/src/mage/sets/gatecrash/DeathpactAngel.java index b95835bce35..cf3a4358dcd 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DeathpactAngel.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DeathpactAngel.java @@ -29,9 +29,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -43,6 +43,7 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.NamePredicate; import mage.game.permanent.token.Token; @@ -99,7 +100,7 @@ class DeathpactAngelToken extends Token { power = new MageInt(1); toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl("{3}{W}{B}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl("{3}{W}{B}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(filter)); diff --git a/Mage.Sets/src/mage/sets/gatecrash/DeathsApproach.java b/Mage.Sets/src/mage/sets/gatecrash/DeathsApproach.java index 6725705eaff..0db3fa9f1d6 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DeathsApproach.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DeathsApproach.java @@ -28,11 +28,11 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; diff --git a/Mage.Sets/src/mage/sets/gatecrash/DebtorsPulpit.java b/Mage.Sets/src/mage/sets/gatecrash/DebtorsPulpit.java index 936e90d27e0..dfdc4689e4b 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DebtorsPulpit.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DebtorsPulpit.java @@ -28,11 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -68,9 +65,9 @@ public class DebtorsPulpit extends CardImpl { // Enchanted land has "{T}: Tap target creature." - Ability gainAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); + Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); gainAbility.addTarget(new TargetCreaturePermanent()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, Constants.AttachmentType.AURA, + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{T}: Tap target creature.\""))); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/DevourFlesh.java b/Mage.Sets/src/mage/sets/gatecrash/DevourFlesh.java index 2de5aeed304..04b15ceebec 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DevourFlesh.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DevourFlesh.java @@ -28,13 +28,14 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -53,7 +54,7 @@ public class DevourFlesh extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static{ - filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT)); + filter.add(new ControllerPredicate(TargetController.OPPONENT)); } public DevourFlesh (UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/DiluvianPrimordial.java b/Mage.Sets/src/mage/sets/gatecrash/DiluvianPrimordial.java index 295483371bd..f856ebef860 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DiluvianPrimordial.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DiluvianPrimordial.java @@ -28,11 +28,11 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/DimirCharm.java b/Mage.Sets/src/mage/sets/gatecrash/DimirCharm.java index c5238f58b07..7605fdd3f54 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DimirCharm.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DimirCharm.java @@ -28,11 +28,11 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; @@ -105,7 +105,7 @@ class DimirCharmEffect extends OneShotEffect { public DimirCharmEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/DimirGuildgate.java b/Mage.Sets/src/mage/sets/gatecrash/DimirGuildgate.java index 0ce0500b103..5469ddab08c 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DimirGuildgate.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DimirGuildgate.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.BlueManaAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/DimirKeyrune.java b/Mage.Sets/src/mage/sets/gatecrash/DimirKeyrune.java index 3f78a79e4bd..db4064dd598 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DimirKeyrune.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DimirKeyrune.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/DinrovaHorror.java b/Mage.Sets/src/mage/sets/gatecrash/DinrovaHorror.java index b0880256b3a..0173fa290c0 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DinrovaHorror.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DinrovaHorror.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/DiscipleOfTheOldWays.java b/Mage.Sets/src/mage/sets/gatecrash/DiscipleOfTheOldWays.java index aa4423c61a0..ff326f0a67b 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DiscipleOfTheOldWays.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DiscipleOfTheOldWays.java @@ -28,15 +28,17 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -55,7 +57,7 @@ public class DiscipleOfTheOldWays extends CardImpl { this.toughness = new MageInt(2); // {R}: Disciple of the Old Ways gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Constants.Duration.EndOfTurn), new ManaCostsImpl("{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{R}"))); } public DiscipleOfTheOldWays(final DiscipleOfTheOldWays card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/DomriRade.java b/Mage.Sets/src/mage/sets/gatecrash/DomriRade.java index c8362c9b2bd..e138caee414 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DomriRade.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DomriRade.java @@ -28,11 +28,11 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.EntersBattlefieldAbility; @@ -49,6 +49,7 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardsImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; @@ -99,7 +100,7 @@ public class DomriRade extends CardImpl { class DomriRadeEffect1 extends OneShotEffect { public DomriRadeEffect1() { - super(Constants.Outcome.DrawCard); + super(Outcome.DrawCard); this.staticText = "Look at the top card of your library. If it's a creature card, you may reveal it and put it into your hand"; } diff --git a/Mage.Sets/src/mage/sets/gatecrash/DrakewingKrasis.java b/Mage.Sets/src/mage/sets/gatecrash/DrakewingKrasis.java index 65737ead5d8..872cf961862 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DrakewingKrasis.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DrakewingKrasis.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TrampleAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/DuskmantleGuildmage.java b/Mage.Sets/src/mage/sets/gatecrash/DuskmantleGuildmage.java index 11230621214..838b9ed6d06 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DuskmantleGuildmage.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DuskmantleGuildmage.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/DuskmantleSeer.java b/Mage.Sets/src/mage/sets/gatecrash/DuskmantleSeer.java index 0191fa33947..9eb0475e659 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DuskmantleSeer.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DuskmantleSeer.java @@ -28,11 +28,11 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -42,6 +42,7 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.TargetController; import mage.game.Game; import mage.players.Player; @@ -65,7 +66,7 @@ public class DuskmantleSeer extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // At the beginning of your upkeep, each player reveals the top card of his or her library, loses life equal to that card's converted mana cost, then puts it into his or her hand. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(Constants.Zone.BATTLEFIELD, new DuskmantleSeerEffect(), Constants.TargetController.YOU, false, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new DuskmantleSeerEffect(), TargetController.YOU, false, false)); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/DutifulThrull.java b/Mage.Sets/src/mage/sets/gatecrash/DutifulThrull.java index e26d25a3734..7dfd897f18e 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DutifulThrull.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DutifulThrull.java @@ -28,14 +28,16 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; /** * @@ -53,7 +55,7 @@ public class DutifulThrull extends CardImpl { this.toughness = new MageInt(1); // {B}: Regenerate Dutiful Thrull. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.B))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.B))); } public DutifulThrull(final DutifulThrull card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/DyingWish.java b/Mage.Sets/src/mage/sets/gatecrash/DyingWish.java index ae1227d4870..22d9a75c33e 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DyingWish.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DyingWish.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; diff --git a/Mage.Sets/src/mage/sets/gatecrash/ElusiveKrasis.java b/Mage.Sets/src/mage/sets/gatecrash/ElusiveKrasis.java index b9cb3766b92..f6144279320 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ElusiveKrasis.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ElusiveKrasis.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.EvolveAbility; import mage.abilities.keyword.UnblockableAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/EmberBeast.java b/Mage.Sets/src/mage/sets/gatecrash/EmberBeast.java index 7d726494813..99654e872e1 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/EmberBeast.java +++ b/Mage.Sets/src/mage/sets/gatecrash/EmberBeast.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.CantAttackAloneAbility; import mage.abilities.keyword.CantBlockAloneAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/EnterTheInfinite.java b/Mage.Sets/src/mage/sets/gatecrash/EnterTheInfinite.java index 5f6d5693805..98778340077 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/EnterTheInfinite.java +++ b/Mage.Sets/src/mage/sets/gatecrash/EnterTheInfinite.java @@ -28,9 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.OneShotEffect; @@ -105,7 +104,7 @@ class CardsInControllerLibraryCount implements DynamicValue { class PutCardOnLibraryEffect extends OneShotEffect { public PutCardOnLibraryEffect() { - super(Constants.Outcome.DrawCard); + super(Outcome.DrawCard); staticText = "Then put a card from your hand on top of your library"; } @@ -124,11 +123,11 @@ class PutCardOnLibraryEffect extends OneShotEffect { if (player != null) { TargetCardInHand target = new TargetCardInHand(); target.setRequired(true); - player.chooseTarget(Constants.Outcome.ReturnToHand, target, source, game); + player.chooseTarget(Outcome.ReturnToHand, target, source, game); Card card = player.getHand().get(target.getFirstTarget(), game); if (card != null) { player.getHand().remove(card); - card.moveToZone(Constants.Zone.LIBRARY, source.getId(), game, true); + card.moveToZone(Zone.LIBRARY, source.getId(), game, true); } return true; } @@ -140,7 +139,7 @@ class PutCardOnLibraryEffect extends OneShotEffect { class MaximumHandSizeEffect extends MaximumHandSizeControllerEffect{ public MaximumHandSizeEffect(){ - super(Integer.MAX_VALUE, Constants.Duration.Custom, MaximumHandSizeControllerEffect.HandSizeModification.SET); + super(Integer.MAX_VALUE, Duration.Custom, MaximumHandSizeControllerEffect.HandSizeModification.SET); staticText = "You have no maximum hand size until your next turn"; } @@ -150,7 +149,7 @@ class MaximumHandSizeEffect extends MaximumHandSizeControllerEffect{ @Override public boolean isInactive(Ability source, Game game) { - if (game.getPhase().getStep().getType() == Constants.PhaseStep.UNTAP && game.getStep().getStepPart() == Step.StepPart.PRE) + if (game.getPhase().getStep().getType() == PhaseStep.UNTAP && game.getStep().getStepPart() == Step.StepPart.PRE) { if (game.getActivePlayerId().equals(source.getControllerId())) { return true; diff --git a/Mage.Sets/src/mage/sets/gatecrash/ExecutionersSwing.java b/Mage.Sets/src/mage/sets/gatecrash/ExecutionersSwing.java index 4889c829fa9..e067b251d9a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ExecutionersSwing.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ExecutionersSwing.java @@ -30,9 +30,9 @@ package mage.sets.gatecrash; import java.util.HashSet; import java.util.Set; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.common.continious.BoostTargetEffect; diff --git a/Mage.Sets/src/mage/sets/gatecrash/ExperimentOne.java b/Mage.Sets/src/mage/sets/gatecrash/ExperimentOne.java index 5139bd89ae8..b473c06dbf7 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ExperimentOne.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ExperimentOne.java @@ -29,15 +29,16 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.EvolveAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; /** @@ -61,7 +62,7 @@ public class ExperimentOne extends CardImpl { this.addAbility(new EvolveAbility()); //Remove two +1/+1 counters from Experiment One: Regenerate Experiment One. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new RemoveCountersSourceCost(CounterType.P1P1.createInstance(2)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new RemoveCountersSourceCost(CounterType.P1P1.createInstance(2)))); } public ExperimentOne(final ExperimentOne card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/FathomMage.java b/Mage.Sets/src/mage/sets/gatecrash/FathomMage.java index d578479345f..b990bff26db 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/FathomMage.java +++ b/Mage.Sets/src/mage/sets/gatecrash/FathomMage.java @@ -29,14 +29,15 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.keyword.EvolveAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; @@ -80,7 +81,7 @@ public class FathomMage extends CardImpl { class FathomMageTriggeredAbility extends TriggeredAbilityImpl { public FathomMageTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), true); + super(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), true); } public FathomMageTriggeredAbility(FathomMageTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/FirefistStriker.java b/Mage.Sets/src/mage/sets/gatecrash/FirefistStriker.java index baff0c6d671..bc4fd632e77 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/FirefistStriker.java +++ b/Mage.Sets/src/mage/sets/gatecrash/FirefistStriker.java @@ -29,9 +29,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.CantBlockTargetEffect; diff --git a/Mage.Sets/src/mage/sets/gatecrash/FiremaneAvenger.java b/Mage.Sets/src/mage/sets/gatecrash/FiremaneAvenger.java index d34e95a1c1d..ef72d060d89 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/FiremaneAvenger.java +++ b/Mage.Sets/src/mage/sets/gatecrash/FiremaneAvenger.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.DamageTargetEffect; diff --git a/Mage.Sets/src/mage/sets/gatecrash/FiveAlarmFire.java b/Mage.Sets/src/mage/sets/gatecrash/FiveAlarmFire.java index 985a8bb4070..e42e9c40b16 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/FiveAlarmFire.java +++ b/Mage.Sets/src/mage/sets/gatecrash/FiveAlarmFire.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/ForcedAdaptation.java b/Mage.Sets/src/mage/sets/gatecrash/ForcedAdaptation.java index 4792339374b..fba404642de 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ForcedAdaptation.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ForcedAdaptation.java @@ -28,11 +28,11 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.AttachEffect; diff --git a/Mage.Sets/src/mage/sets/gatecrash/FortressCyclops.java b/Mage.Sets/src/mage/sets/gatecrash/FortressCyclops.java index 3cd9e601df1..fc70f4cfa7f 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/FortressCyclops.java +++ b/Mage.Sets/src/mage/sets/gatecrash/FortressCyclops.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.BlocksTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/FoundryChampion.java b/Mage.Sets/src/mage/sets/gatecrash/FoundryChampion.java index 87dc0ee1662..64b47648df5 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/FoundryChampion.java +++ b/Mage.Sets/src/mage/sets/gatecrash/FoundryChampion.java @@ -29,9 +29,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +41,8 @@ import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetCreatureOrPlayer; @@ -68,10 +70,10 @@ public class FoundryChampion extends CardImpl { this.addAbility(ability); //{R}: Foundry Champion gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Constants.Duration.EndOfTurn), new ManaCostsImpl("{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}"))); //{W}: Foundry Champion gets +0/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Constants.Duration.EndOfTurn), new ManaCostsImpl("{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl("{W}"))); } public FoundryChampion(final FoundryChampion card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/FoundryStreetDenizen.java b/Mage.Sets/src/mage/sets/gatecrash/FoundryStreetDenizen.java index 98140be3534..5ede50399bd 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/FoundryStreetDenizen.java +++ b/Mage.Sets/src/mage/sets/gatecrash/FoundryStreetDenizen.java @@ -28,11 +28,11 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/FrenziedTilling.java b/Mage.Sets/src/mage/sets/gatecrash/FrenziedTilling.java index 5c4386adee9..a694205aee6 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/FrenziedTilling.java +++ b/Mage.Sets/src/mage/sets/gatecrash/FrenziedTilling.java @@ -28,7 +28,7 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/gatecrash/FrilledOculus.java b/Mage.Sets/src/mage/sets/gatecrash/FrilledOculus.java index b0b172f859e..601a4ad94b1 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/FrilledOculus.java +++ b/Mage.Sets/src/mage/sets/gatecrash/FrilledOculus.java @@ -28,14 +28,16 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.ActivateOncePerTurnActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -53,7 +55,7 @@ public class FrilledOculus extends CardImpl { this.toughness = new MageInt(3); // {1}{G}: Frilled Oculus gets +2/+2 until end of turn. Activate this ability only once each turn. - this.addAbility(new ActivateOncePerTurnActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Constants.Duration.EndOfTurn), new ManaCostsImpl("{1}{G}"))); + this.addAbility(new ActivateOncePerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("{1}{G}"))); } public FrilledOculus(final FrilledOculus card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/FrontlineMedic.java b/Mage.Sets/src/mage/sets/gatecrash/FrontlineMedic.java index b0157a62cbf..13a288b79b0 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/FrontlineMedic.java +++ b/Mage.Sets/src/mage/sets/gatecrash/FrontlineMedic.java @@ -28,10 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.abilities.keyword.BattalionAbility; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.VariableManaCostPredicate; @@ -76,7 +77,7 @@ public class FrontlineMedic extends CardImpl { this.addAbility(new BattalionAbility(effect)); // Sacrifice Frontline Medic: Counter target spell with {X} in its mana cost unless its controller pays 3. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(3)), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(3)), new SacrificeSourceCost()); ability.addTarget(new TargetSpell(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/gatecrash/FuriousResistance.java b/Mage.Sets/src/mage/sets/gatecrash/FuriousResistance.java index fac9b42dd62..75de4f43947 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/FuriousResistance.java +++ b/Mage.Sets/src/mage/sets/gatecrash/FuriousResistance.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; @@ -38,6 +38,8 @@ import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Outcome; import mage.filter.common.FilterBlockingCreature; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -77,7 +79,7 @@ public class FuriousResistance extends CardImpl { class FuriousResistanceEffect extends OneShotEffect { public FuriousResistanceEffect() { - super(Constants.Outcome.BoostCreature); + super(Outcome.BoostCreature); staticText = "Target blocking creature gets +3/+0 and gains first strike until end of turn"; } @@ -92,8 +94,8 @@ class FuriousResistanceEffect extends OneShotEffect { return false; } - ContinuousEffect effect = new BoostTargetEffect(3, 0, Constants.Duration.EndOfTurn); - ContinuousEffect effect2 = new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Constants.Duration.EndOfTurn); + ContinuousEffect effect = new BoostTargetEffect(3, 0, Duration.EndOfTurn); + ContinuousEffect effect2 = new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn); effect.setTargetPointer(new FixedTarget(target.getId())); effect2.setTargetPointer(new FixedTarget(target.getId())); game.addEffect(effect, source); diff --git a/Mage.Sets/src/mage/sets/gatecrash/GatewayShade.java b/Mage.Sets/src/mage/sets/gatecrash/GatewayShade.java index 5f174167031..6d703fddc48 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GatewayShade.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GatewayShade.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; diff --git a/Mage.Sets/src/mage/sets/gatecrash/GhorClanRampager.java b/Mage.Sets/src/mage/sets/gatecrash/GhorClanRampager.java index 3ef6d81e2de..c5adcd9555a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GhorClanRampager.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GhorClanRampager.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.continious.BoostTargetEffect; @@ -38,6 +38,7 @@ import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.BloodrushAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -58,8 +59,8 @@ public class GhorClanRampager extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // Bloodrush - {R}{G}, Discard Ghor-Clan Rampager: Target attacking creature gets +4/+4 and gains trample until end of turn. - Ability ability = new BloodrushAbility("{R}{G}",new BoostTargetEffect(4,4, Constants.Duration.EndOfTurn)); - ability.addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Constants.Duration.EndOfTurn)); + Ability ability = new BloodrushAbility("{R}{G}",new BoostTargetEffect(4,4, Duration.EndOfTurn)); + ability.addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/GiantAdephage.java b/Mage.Sets/src/mage/sets/gatecrash/GiantAdephage.java index 8322d4c1d09..fb722f2451b 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GiantAdephage.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GiantAdephage.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -39,6 +39,7 @@ import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.sets.tokens.EmptyToken; @@ -94,7 +95,7 @@ class GiantAdephageCopyEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - MageObject thisCard = game.getLastKnownInformation(source.getSourceId(), Constants.Zone.BATTLEFIELD); + MageObject thisCard = game.getLastKnownInformation(source.getSourceId(), Zone.BATTLEFIELD); if (thisCard != null && thisCard instanceof Permanent) { EmptyToken token = new EmptyToken(); CardUtil.copyTo(token).from((Permanent)thisCard); diff --git a/Mage.Sets/src/mage/sets/gatecrash/GideonChampionOfJustice.java b/Mage.Sets/src/mage/sets/gatecrash/GideonChampionOfJustice.java index 7028d7da68c..5eca650549b 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GideonChampionOfJustice.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GideonChampionOfJustice.java @@ -28,9 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; @@ -73,8 +72,8 @@ public class GideonChampionOfJustice extends CardImpl { this.addAbility(ability1); // 0: Until end of turn, Gideon becomes an indestructible Human Soldier creature with power and toughness each equal to the number of loyalty counters on him. He's still a planeswalker. Prevent all damage that would be dealt to him this turn. - LoyaltyAbility ability2 = new LoyaltyAbility(new BecomesCreatureSourceEffect(new GideonChampionOfJusticeToken(), "planeswalker", Constants.Duration.EndOfTurn), 0); - ability2.addEffect(new PreventAllDamageSourceEffect(Constants.Duration.EndOfTurn)); + LoyaltyAbility ability2 = new LoyaltyAbility(new BecomesCreatureSourceEffect(new GideonChampionOfJusticeToken(), "planeswalker", Duration.EndOfTurn), 0); + ability2.addEffect(new PreventAllDamageSourceEffect(Duration.EndOfTurn)); this.addAbility(ability2); // -15: Exile all other permanents. @@ -128,7 +127,7 @@ class PermanentsTargetOpponentControlsCount implements DynamicValue { class GideonExileAllOtherPermanentsEffect extends OneShotEffect { public GideonExileAllOtherPermanentsEffect() { - super(Constants.Outcome.Exile); + super(Outcome.Exile); staticText = "Exile all other permanents"; } @@ -163,7 +162,7 @@ class GideonChampionOfJusticeToken extends Token { toughness = new MageInt(0); this.addAbility(IndestructibleAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new CountersCount(CounterType.LOYALTY), Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new CountersCount(CounterType.LOYALTY), Duration.WhileOnBattlefield))); } } diff --git a/Mage.Sets/src/mage/sets/gatecrash/GiftOfOrzhova.java b/Mage.Sets/src/mage/sets/gatecrash/GiftOfOrzhova.java index 9078736d066..1f6991b154a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GiftOfOrzhova.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GiftOfOrzhova.java @@ -28,12 +28,12 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; diff --git a/Mage.Sets/src/mage/sets/gatecrash/GlaringSpotlight.java b/Mage.Sets/src/mage/sets/gatecrash/GlaringSpotlight.java index 7e9769ff9eb..a626dbe7c54 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GlaringSpotlight.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GlaringSpotlight.java @@ -28,12 +28,13 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.AsThoughEffectType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -71,9 +72,9 @@ public class GlaringSpotlight extends CardImpl { // {3}, Sacrifice Glaring Spotlight: Creatures you control gain hexproof until end of turn and are unblockable this turn. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new GainAbilityControlledEffect(HexproofAbility.getInstance(), Constants.Duration.EndOfTurn, new FilterCreaturePermanent(),false), + Zone.BATTLEFIELD, new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.EndOfTurn, new FilterCreaturePermanent(),false), new GenericManaCost(3)); - ability.addEffect(new UnblockableAllEffect(new FilterControlledCreaturePermanent(), Constants.Duration.EndOfTurn)); + ability.addEffect(new UnblockableAllEffect(new FilterControlledCreaturePermanent(), Duration.EndOfTurn)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } @@ -91,7 +92,7 @@ public class GlaringSpotlight extends CardImpl { class GlaringSpotlightEffect extends AsThoughEffectImpl { public GlaringSpotlightEffect() { - super(Constants.AsThoughEffectType.HEXPROOF, Duration.WhileOnBattlefield, Outcome.Benefit); + super(AsThoughEffectType.HEXPROOF, Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "Creatures your opponents control with hexproof can be the targets of spells and abilities you control as though they didn't have hexproof"; } diff --git a/Mage.Sets/src/mage/sets/gatecrash/GreensideWatcher.java b/Mage.Sets/src/mage/sets/gatecrash/GreensideWatcher.java index 239ec203b8a..fc0f3871aa9 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GreensideWatcher.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GreensideWatcher.java @@ -28,15 +28,16 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.UntapTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; @@ -63,7 +64,7 @@ public class GreensideWatcher extends CardImpl { this.toughness = new MageInt(1); // {tap}: Untap target Gate. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/Gridlock.java b/Mage.Sets/src/mage/sets/gatecrash/Gridlock.java index 32ba34deb90..c116f828da2 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Gridlock.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Gridlock.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.effects.common.TapTargetEffect; diff --git a/Mage.Sets/src/mage/sets/gatecrash/GrislySpectacle.java b/Mage.Sets/src/mage/sets/gatecrash/GrislySpectacle.java index d15a3f97b02..ac86f0194d2 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GrislySpectacle.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GrislySpectacle.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/gatecrash/GroundAssault.java b/Mage.Sets/src/mage/sets/gatecrash/GroundAssault.java index 9c0297c6a2b..3a02c7ce03d 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GroundAssault.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GroundAssault.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/GruulCharm.java b/Mage.Sets/src/mage/sets/gatecrash/GruulCharm.java index 92430bb6a8c..2c12c87a853 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GruulCharm.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GruulCharm.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.ContinuousEffectImpl; @@ -71,11 +71,11 @@ public class GruulCharm extends CardImpl { this.color.setGreen(true); // Choose one - Creatures without flying can't block this turn; - this.getSpellAbility().addEffect(new CantBlockAllEffect(filter, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new CantBlockAllEffect(filter, Duration.EndOfTurn)); // or gain control of all permanents you own; Mode mode = new Mode(); - mode.getEffects().add(new GainControlAllEffect(Constants.Duration.EndOfGame, filter2)); + mode.getEffects().add(new GainControlAllEffect(Duration.EndOfGame, filter2)); this.getSpellAbility().addMode(mode); // or Gruul Charm deals 3 damage to each creature with flying. @@ -98,8 +98,8 @@ class GainControlAllEffect extends ContinuousEffectImpl { final FilterPermanent filter; - public GainControlAllEffect(Constants.Duration duration, FilterPermanent filter) { - super(duration, Constants.Layer.ControlChangingEffects_2, Constants.SubLayer.NA, Constants.Outcome.GainControl); + public GainControlAllEffect(Duration duration, FilterPermanent filter) { + super(duration, Layer.ControlChangingEffects_2, SubLayer.NA, Outcome.GainControl); this.filter = filter; } diff --git a/Mage.Sets/src/mage/sets/gatecrash/GruulGuildgate.java b/Mage.Sets/src/mage/sets/gatecrash/GruulGuildgate.java index b39373bc68f..25947a3a64d 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GruulGuildgate.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GruulGuildgate.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.RedManaAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/GruulKeyrune.java b/Mage.Sets/src/mage/sets/gatecrash/GruulKeyrune.java index f7e8b535c7c..bcd15ecf9f6 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GruulKeyrune.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GruulKeyrune.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/GruulRagebeast.java b/Mage.Sets/src/mage/sets/gatecrash/GruulRagebeast.java index 39ae7d0e013..b4ac7ebb332 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GruulRagebeast.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GruulRagebeast.java @@ -28,10 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -92,7 +90,7 @@ public class GruulRagebeast extends CardImpl { class GruulRagebeastTriggeredAbility extends TriggeredAbilityImpl { GruulRagebeastTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new GruulRagebeastEffect(), false); + super(Zone.BATTLEFIELD, new GruulRagebeastEffect(), false); } GruulRagebeastTriggeredAbility(final GruulRagebeastTriggeredAbility ability) { @@ -131,7 +129,7 @@ class GruulRagebeastTriggeredAbility extends TriggeredAbilityImpl { GruulRagebeastEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); } GruulRagebeastEffect(final GruulRagebeastEffect effect) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/GuardianOfTheGateless.java b/Mage.Sets/src/mage/sets/gatecrash/GuardianOfTheGateless.java index 8ecae84cdc1..0e8508748f6 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GuardianOfTheGateless.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GuardianOfTheGateless.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/GuildscornWard.java b/Mage.Sets/src/mage/sets/gatecrash/GuildscornWard.java index e64b84e1925..ee02c5d1002 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GuildscornWard.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GuildscornWard.java @@ -28,12 +28,12 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; diff --git a/Mage.Sets/src/mage/sets/gatecrash/GutterSkulk.java b/Mage.Sets/src/mage/sets/gatecrash/GutterSkulk.java index e47815c3e47..ca49553a6ee 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GutterSkulk.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GutterSkulk.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/GyreSage.java b/Mage.Sets/src/mage/sets/gatecrash/GyreSage.java index b2a6a4644e8..e73cd7e462d 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GyreSage.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GyreSage.java @@ -29,8 +29,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.dynamicvalue.common.CountersCount; diff --git a/Mage.Sets/src/mage/sets/gatecrash/HandsOfBinding.java b/Mage.Sets/src/mage/sets/gatecrash/HandsOfBinding.java index 1b81cb48184..a311e349606 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/HandsOfBinding.java +++ b/Mage.Sets/src/mage/sets/gatecrash/HandsOfBinding.java @@ -28,13 +28,14 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CipherEffect; import mage.abilities.effects.common.SkipNextUntapTargetEffect; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; @@ -47,7 +48,7 @@ public class HandsOfBinding extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static{ - filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT)); + filter.add(new ControllerPredicate(TargetController.OPPONENT)); } public HandsOfBinding (UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/HellkiteTyrant.java b/Mage.Sets/src/mage/sets/gatecrash/HellkiteTyrant.java index 8af16d7f751..bb8cde8ebe9 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/HellkiteTyrant.java +++ b/Mage.Sets/src/mage/sets/gatecrash/HellkiteTyrant.java @@ -29,13 +29,13 @@ package mage.sets.gatecrash; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; @@ -50,6 +50,7 @@ import mage.abilities.effects.common.WinGameEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; @@ -81,7 +82,7 @@ public class HellkiteTyrant extends CardImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new HellkiteTyrantEffect(),false, true)); // At the beginning of your upkeep, if you control twenty or more artifacts, you win the game. - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new WinGameEffect(), Constants.TargetController.YOU, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new WinGameEffect(), TargetController.YOU, false); this.addAbility(new ConditionalTriggeredAbility( ability, new ControlsPermanentCondition(new FilterArtifactPermanent(), ControlsPermanentCondition.CountType.MORE_THAN,19), diff --git a/Mage.Sets/src/mage/sets/gatecrash/HellraiserGoblin.java b/Mage.Sets/src/mage/sets/gatecrash/HellraiserGoblin.java index cca87557366..19455a4ea70 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/HellraiserGoblin.java +++ b/Mage.Sets/src/mage/sets/gatecrash/HellraiserGoblin.java @@ -29,10 +29,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -41,6 +41,7 @@ import mage.abilities.effects.RequirementEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -64,7 +65,7 @@ public class HellraiserGoblin extends CardImpl { this.toughness = new MageInt(2); // Creatures you control have haste and attack each combat if able. - Ability ability = new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent())); + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent())); ability.addEffect(new AttacksIfAbleAllEffect(Duration.WhileOnBattlefield)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/HighPriestOfPenance.java b/Mage.Sets/src/mage/sets/gatecrash/HighPriestOfPenance.java index d74e1a1c64e..1a1c5b07f5a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/HighPriestOfPenance.java +++ b/Mage.Sets/src/mage/sets/gatecrash/HighPriestOfPenance.java @@ -29,13 +29,14 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.common.TargetNonlandPermanent; @@ -76,7 +77,7 @@ class HighPriestOfPenanceTriggeredAbility extends TriggeredAbilityImpl { this.color.setWhite(true); // Creatures you control get +0/+1 for each Gate you control and have vigilance. - Ability ability = new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(new StaticValue(0),new PermanentsOnBattlefieldCount(filter), Duration.WhileOnBattlefield)); ability.addEffect(new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Creatures"))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/gatecrash/HolyMantle.java b/Mage.Sets/src/mage/sets/gatecrash/HolyMantle.java index 5a7c1b8c97e..6f615c56901 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/HolyMantle.java +++ b/Mage.Sets/src/mage/sets/gatecrash/HolyMantle.java @@ -28,12 +28,12 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; diff --git a/Mage.Sets/src/mage/sets/gatecrash/HomingLightning.java b/Mage.Sets/src/mage/sets/gatecrash/HomingLightning.java index 1e83b69d020..cb844bd5365 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/HomingLightning.java +++ b/Mage.Sets/src/mage/sets/gatecrash/HomingLightning.java @@ -29,12 +29,13 @@ package mage.sets.gatecrash; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.NamePredicate; import mage.game.Game; @@ -71,7 +72,7 @@ public class HomingLightning extends CardImpl { class HomingLightningEffect extends OneShotEffect { public HomingLightningEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "{this} deals 4 damage to target creature and each other creature with the same name as that creature"; } diff --git a/Mage.Sets/src/mage/sets/gatecrash/HorrorOfTheDim.java b/Mage.Sets/src/mage/sets/gatecrash/HorrorOfTheDim.java index 3eca84e5a38..193997f05de 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/HorrorOfTheDim.java +++ b/Mage.Sets/src/mage/sets/gatecrash/HorrorOfTheDim.java @@ -28,16 +28,18 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; /** * @@ -58,8 +60,8 @@ public class HorrorOfTheDim extends CardImpl { // {U}: Horror of the Dim gains hexproof until end of turn. this.addAbility(new SimpleActivatedAbility( Zone.BATTLEFIELD, - new GainAbilitySourceEffect(HexproofAbility.getInstance(), Constants.Duration.EndOfTurn), - new ColoredManaCost(Constants.ColoredManaSymbol.U))); + new GainAbilitySourceEffect(HexproofAbility.getInstance(), Duration.EndOfTurn), + new ColoredManaCost(ColoredManaSymbol.U))); } public HorrorOfTheDim(final HorrorOfTheDim card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/Hydroform.java b/Mage.Sets/src/mage/sets/gatecrash/Hydroform.java index 69e8b967e13..7fd9e8c2810 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Hydroform.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Hydroform.java @@ -28,13 +28,14 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.continious.BecomesCreatureTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.game.permanent.token.Token; import mage.target.common.TargetLandPermanent; @@ -52,7 +53,7 @@ public class Hydroform extends CardImpl { this.color.setGreen(true); // Target land becomes a 3/3 Elemental creature with flying until end of turn. It's still a land. - this.getSpellAbility().addEffect(new BecomesCreatureTargetEffect(new HydroformToken(), "land", Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BecomesCreatureTargetEffect(new HydroformToken(), "land", Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetLandPermanent()); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/IllnessInTheRanks.java b/Mage.Sets/src/mage/sets/gatecrash/IllnessInTheRanks.java index 73475e65bbc..f2499369a21 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/IllnessInTheRanks.java +++ b/Mage.Sets/src/mage/sets/gatecrash/IllnessInTheRanks.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/IllusionistsBracers.java b/Mage.Sets/src/mage/sets/gatecrash/IllusionistsBracers.java index 8074bfbf83c..c2591ea1e51 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/IllusionistsBracers.java +++ b/Mage.Sets/src/mage/sets/gatecrash/IllusionistsBracers.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.GenericManaCost; diff --git a/Mage.Sets/src/mage/sets/gatecrash/ImmortalServitude.java b/Mage.Sets/src/mage/sets/gatecrash/ImmortalServitude.java index 3857fb431c6..bb5251cdd59 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ImmortalServitude.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ImmortalServitude.java @@ -29,10 +29,10 @@ package mage.sets.gatecrash; import java.util.Set; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/gatecrash/IncursionSpecialist.java b/Mage.Sets/src/mage/sets/gatecrash/IncursionSpecialist.java index 6864d490127..fb16cebb869 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/IncursionSpecialist.java +++ b/Mage.Sets/src/mage/sets/gatecrash/IncursionSpecialist.java @@ -28,9 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.UnblockableSourceEffect; @@ -76,8 +75,8 @@ public class IncursionSpecialist extends CardImpl { class IncursionTriggeredAbility extends TriggeredAbilityImpl { public IncursionTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Constants.Duration.EndOfTurn)); - this.addEffect(new UnblockableSourceEffect(Constants.Duration.EndOfTurn)); + super(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn)); + this.addEffect(new UnblockableSourceEffect(Duration.EndOfTurn)); } public IncursionTriggeredAbility(final IncursionTriggeredAbility ability) { @@ -111,7 +110,7 @@ class IncursionWatcher extends WatcherImpl { int spellCount = 0; public IncursionWatcher() { - super("SecondSpellCast", Constants.WatcherScope.PLAYER); + super("SecondSpellCast", WatcherScope.PLAYER); } public IncursionWatcher(final IncursionWatcher watcher) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/IvyLaneDenizen.java b/Mage.Sets/src/mage/sets/gatecrash/IvyLaneDenizen.java index 16aac38e059..ede044b4c55 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/IvyLaneDenizen.java +++ b/Mage.Sets/src/mage/sets/gatecrash/IvyLaneDenizen.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/gatecrash/KeymasterRogue.java b/Mage.Sets/src/mage/sets/gatecrash/KeymasterRogue.java index 8f06d2e9f39..73db2e762eb 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/KeymasterRogue.java +++ b/Mage.Sets/src/mage/sets/gatecrash/KeymasterRogue.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/KillingGlare.java b/Mage.Sets/src/mage/sets/gatecrash/KillingGlare.java index 5f3f16fcd4e..b6d8a43e90d 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/KillingGlare.java +++ b/Mage.Sets/src/mage/sets/gatecrash/KillingGlare.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/gatecrash/KingpinsPet.java b/Mage.Sets/src/mage/sets/gatecrash/KingpinsPet.java index a68d62c78db..8cf85bf07e8 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/KingpinsPet.java +++ b/Mage.Sets/src/mage/sets/gatecrash/KingpinsPet.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.ExtortAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/KnightOfObligation.java b/Mage.Sets/src/mage/sets/gatecrash/KnightOfObligation.java index 6c120732981..d8819ae28e6 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/KnightOfObligation.java +++ b/Mage.Sets/src/mage/sets/gatecrash/KnightOfObligation.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ExtortAbility; import mage.abilities.keyword.VigilanceAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/KnightWatch.java b/Mage.Sets/src/mage/sets/gatecrash/KnightWatch.java index 98373570aaf..4c0f11253eb 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/KnightWatch.java +++ b/Mage.Sets/src/mage/sets/gatecrash/KnightWatch.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.game.permanent.token.KnightToken; diff --git a/Mage.Sets/src/mage/sets/gatecrash/LastThoughts.java b/Mage.Sets/src/mage/sets/gatecrash/LastThoughts.java index 1127b9a288b..f6c4baf9c22 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/LastThoughts.java +++ b/Mage.Sets/src/mage/sets/gatecrash/LastThoughts.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CipherEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/LazavDimirMastermind.java b/Mage.Sets/src/mage/sets/gatecrash/LazavDimirMastermind.java index b77dc8dab1f..2a27dffbc65 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/LazavDimirMastermind.java +++ b/Mage.Sets/src/mage/sets/gatecrash/LazavDimirMastermind.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -39,6 +39,10 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.keyword.HexproofAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -124,7 +128,7 @@ class LazavDimirEffect extends ContinuousEffectImpl { protected Card cardToCopy; public LazavDimirEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Layer.CopyEffects_1, Constants.SubLayer.NA, Constants.Outcome.BecomeCreature); + super(Duration.WhileOnBattlefield, Layer.CopyEffects_1, SubLayer.NA, Outcome.BecomeCreature); } public LazavDimirEffect(final LazavDimirEffect effect) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/LegionLoyalist.java b/Mage.Sets/src/mage/sets/gatecrash/LegionLoyalist.java index 50153013ca0..1c481630892 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/LegionLoyalist.java +++ b/Mage.Sets/src/mage/sets/gatecrash/LegionLoyalist.java @@ -29,9 +29,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.RestrictionEffect; @@ -41,6 +41,7 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -67,8 +68,8 @@ public class LegionLoyalist extends CardImpl { this.addAbility(HasteAbility.getInstance()); //Battalion - Whenever Legion Loyalist and at least two other creatures attack, //creatures you control gain first strike and trample until end of turn and can't be blocked by tokens this turn. - Ability ability = new BattalionAbility(new GainAbilityAllEffect(FirstStrikeAbility.getInstance(), Constants.Duration.EndOfTurn, new FilterControlledCreaturePermanent())); - ability.addEffect(new GainAbilityAllEffect(TrampleAbility.getInstance(), Constants.Duration.EndOfTurn, new FilterControlledCreaturePermanent())); + Ability ability = new BattalionAbility(new GainAbilityAllEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent())); + ability.addEffect(new GainAbilityAllEffect(TrampleAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent())); ability.addEffect(new CantBeBlockedByTokenEffect()); this.addAbility(ability); } @@ -86,7 +87,7 @@ public class LegionLoyalist extends CardImpl { class CantBeBlockedByTokenEffect extends RestrictionEffect { public CantBeBlockedByTokenEffect() { - super(Constants.Duration.EndOfTurn); + super(Duration.EndOfTurn); staticText = "Creatures you control can't be blocked by tokens this turn"; } diff --git a/Mage.Sets/src/mage/sets/gatecrash/LeylinePhantom.java b/Mage.Sets/src/mage/sets/gatecrash/LeylinePhantom.java index 95796242313..2b6ee817766 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/LeylinePhantom.java +++ b/Mage.Sets/src/mage/sets/gatecrash/LeylinePhantom.java @@ -29,13 +29,14 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.DamagedEvent; import mage.game.events.GameEvent; @@ -75,7 +76,7 @@ class LeylinePhantomTriggeredAbility extends TriggeredAbilityImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature gets +3/+0 and can't be blocked except by two or more creatures. diff --git a/Mage.Sets/src/mage/sets/gatecrash/MarkForDeath.java b/Mage.Sets/src/mage/sets/gatecrash/MarkForDeath.java index cf4237b996d..f2b813474c8 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MarkForDeath.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MarkForDeath.java @@ -28,15 +28,18 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.BlocksIfAbleTargetEffect; import mage.abilities.effects.common.CantBlockAllEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardIdPredicate; @@ -56,7 +59,7 @@ public class MarkForDeath extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT)); + filter.add(new ControllerPredicate(TargetController.OPPONENT)); } public MarkForDeath(UUID ownerId) { @@ -83,7 +86,7 @@ public class MarkForDeath extends CardImpl { class MarkForDeathEffect extends OneShotEffect { public MarkForDeathEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "Target creature an opponent controls blocks this turn if able. Untap that creature. Other creatures that player controls can't block this turn"; } @@ -101,13 +104,13 @@ class MarkForDeathEffect extends OneShotEffect { filter.add(new ControllerIdPredicate(target.getControllerId())); filter.add(Predicates.not(new CardIdPredicate(target.getId()))); - ContinuousEffect effect = new BlocksIfAbleTargetEffect(Constants.Duration.EndOfTurn); + ContinuousEffect effect = new BlocksIfAbleTargetEffect(Duration.EndOfTurn); effect.setTargetPointer(new FixedTarget(target.getId())); game.addEffect(effect, source); target.untap(game); - ContinuousEffect effect2 = new CantBlockAllEffect(filter, Constants.Duration.EndOfTurn); + ContinuousEffect effect2 = new CantBlockAllEffect(filter, Duration.EndOfTurn); game.addEffect(effect2, source); return true; } diff --git a/Mage.Sets/src/mage/sets/gatecrash/MartialGlory.java b/Mage.Sets/src/mage/sets/gatecrash/MartialGlory.java index 2ff4f915530..a4971dafa14 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MartialGlory.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MartialGlory.java @@ -28,21 +28,15 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.abilities.Ability; -import mage.abilities.effects.ContinuousEffect; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.Effect; -import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; -import mage.game.Game; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; -import mage.target.targetpointer.FixedTarget; import mage.target.targetpointer.SecondTargetPointer; /** diff --git a/Mage.Sets/src/mage/sets/gatecrash/MassiveRaid.java b/Mage.Sets/src/mage/sets/gatecrash/MassiveRaid.java index 6e3b980bf7b..8816cf295b2 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MassiveRaid.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MassiveRaid.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/MasterBiomancer.java b/Mage.Sets/src/mage/sets/gatecrash/MasterBiomancer.java index 395d5456d32..2536bb2de8a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MasterBiomancer.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MasterBiomancer.java @@ -28,11 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -65,7 +62,7 @@ public class MasterBiomancer extends CardImpl { this.toughness = new MageInt(4); // Each other creature you control enters the battlefield with a number of additional +1/+1 counters on it equal to Master Biomancer's power and as a Mutant in addition to its other types. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new MasterBiomancerEntersBattlefieldEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MasterBiomancerEntersBattlefieldEffect())); } public MasterBiomancer(final MasterBiomancer card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/MentalVapors.java b/Mage.Sets/src/mage/sets/gatecrash/MentalVapors.java index 86fef8ae577..9cb595eb275 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MentalVapors.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MentalVapors.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CipherEffect; import mage.abilities.effects.common.DiscardTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/MercilessEviction.java b/Mage.Sets/src/mage/sets/gatecrash/MercilessEviction.java index 418e4d3c516..2e58cbdcc51 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MercilessEviction.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MercilessEviction.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Mode; import mage.abilities.effects.common.ExileAllEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/MerfolkOfTheDepths.java b/Mage.Sets/src/mage/sets/gatecrash/MerfolkOfTheDepths.java index e201275c756..6bf4010f3db 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MerfolkOfTheDepths.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MerfolkOfTheDepths.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/MetropolisSprite.java b/Mage.Sets/src/mage/sets/gatecrash/MetropolisSprite.java index ca668a8627f..64e1022b612 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MetropolisSprite.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MetropolisSprite.java @@ -28,15 +28,17 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -57,7 +59,7 @@ public class MetropolisSprite extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {U}: Metropolis Sprite gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Constants.Duration.EndOfTurn), new ManaCostsImpl("{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl("{U}"))); } public MetropolisSprite(final MetropolisSprite card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/MidnightRecovery.java b/Mage.Sets/src/mage/sets/gatecrash/MidnightRecovery.java index 5dc4d8f7e2a..871ca8dc550 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MidnightRecovery.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MidnightRecovery.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CipherEffect; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/MillennialGargoyle.java b/Mage.Sets/src/mage/sets/gatecrash/MillennialGargoyle.java index d128b8f4415..807a04932d4 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MillennialGargoyle.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MillennialGargoyle.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/MimingSlime.java b/Mage.Sets/src/mage/sets/gatecrash/MimingSlime.java index 9accd74125e..a39b97b2a6a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MimingSlime.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MimingSlime.java @@ -29,9 +29,9 @@ package mage.sets.gatecrash; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/gatecrash/MindGrind.java b/Mage.Sets/src/mage/sets/gatecrash/MindGrind.java index 07b9b5a3fa6..71ebe16600a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MindGrind.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MindGrind.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.costs.VariableCost; import mage.abilities.costs.mana.VariableManaCost; diff --git a/Mage.Sets/src/mage/sets/gatecrash/MindeyeDrake.java b/Mage.Sets/src/mage/sets/gatecrash/MindeyeDrake.java index c4b532021cb..20d329964cf 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MindeyeDrake.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MindeyeDrake.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/MoltenPrimordial.java b/Mage.Sets/src/mage/sets/gatecrash/MoltenPrimordial.java index 64a71cd228e..79ef70fd92c 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MoltenPrimordial.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MoltenPrimordial.java @@ -28,11 +28,11 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -126,7 +126,7 @@ class MoltenPrimordialEffect extends OneShotEffect { effect1.setTargetPointer(new FixedTarget(targetCreature.getId())); game.addEffect(effect1, source); - ContinuousEffect effect2 = new GainAbilityTargetEffect(HasteAbility.getInstance(), Constants.Duration.EndOfTurn); + ContinuousEffect effect2 = new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn); effect2.setTargetPointer(new FixedTarget(targetCreature.getId())); game.addEffect(effect2, source); diff --git a/Mage.Sets/src/mage/sets/gatecrash/MortusStrider.java b/Mage.Sets/src/mage/sets/gatecrash/MortusStrider.java index 049f166d4ea..877c24dbed8 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MortusStrider.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MortusStrider.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.ReturnToHandSourceEffect; diff --git a/Mage.Sets/src/mage/sets/gatecrash/Mugging.java b/Mage.Sets/src/mage/sets/gatecrash/Mugging.java index fd5b3e3258d..618cbd4b4f4 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Mugging.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Mugging.java @@ -28,12 +28,13 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CantBlockTargetEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -50,7 +51,7 @@ public class Mugging extends CardImpl { // Mugging deals 2 damage to target creature. That creature can't block this turn. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); - this.getSpellAbility().addEffect(new CantBlockTargetEffect(Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new CantBlockTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/MurderInvestigation.java b/Mage.Sets/src/mage/sets/gatecrash/MurderInvestigation.java index 92ed67aa35e..7a620867dc5 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MurderInvestigation.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MurderInvestigation.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; diff --git a/Mage.Sets/src/mage/sets/gatecrash/MysticGenesis.java b/Mage.Sets/src/mage/sets/gatecrash/MysticGenesis.java index 95014e04986..982b708723d 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MysticGenesis.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MysticGenesis.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/gatecrash/NavSquadCommandos.java b/Mage.Sets/src/mage/sets/gatecrash/NavSquadCommandos.java index 73889d91ed0..06517697027 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/NavSquadCommandos.java +++ b/Mage.Sets/src/mage/sets/gatecrash/NavSquadCommandos.java @@ -28,15 +28,16 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.UntapSourceEffect; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.BattalionAbility; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -55,7 +56,7 @@ public class NavSquadCommandos extends CardImpl { this.toughness = new MageInt(5); // Battalion — Whenever Nav Squad Commandos and at least two other creatures attack, Nav Squad Commandos gets +1/+1 until end of turn. Untap it. - Ability ability = new BattalionAbility(new BoostSourceEffect(1,1, Constants.Duration.EndOfTurn)); + Ability ability = new BattalionAbility(new BoostSourceEffect(1,1, Duration.EndOfTurn)); ability.addEffect(new UntapSourceEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/NightveilSpecter.java b/Mage.Sets/src/mage/sets/gatecrash/NightveilSpecter.java index 14967cdbb50..23503ce098f 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/NightveilSpecter.java +++ b/Mage.Sets/src/mage/sets/gatecrash/NightveilSpecter.java @@ -28,12 +28,12 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.AsThoughEffectType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AsThoughEffectType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsDamageToAPlayerTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/NimbusSwimmer.java b/Mage.Sets/src/mage/sets/gatecrash/NimbusSwimmer.java index f923a2989a5..b6edaeb834e 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/NimbusSwimmer.java +++ b/Mage.Sets/src/mage/sets/gatecrash/NimbusSwimmer.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -38,6 +38,7 @@ import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -77,7 +78,7 @@ public class NimbusSwimmer extends CardImpl { class NimbusSwimmerEffect extends OneShotEffect { public NimbusSwimmerEffect() { - super(Constants.Outcome.BoostCreature); + super(Outcome.BoostCreature); staticText = "{this} enters the battlefield with X +1/+1 counters on it"; } diff --git a/Mage.Sets/src/mage/sets/gatecrash/ObzedatGhostCouncil.java b/Mage.Sets/src/mage/sets/gatecrash/ObzedatGhostCouncil.java index 43475f0589c..bee6b16ff1b 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ObzedatGhostCouncil.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ObzedatGhostCouncil.java @@ -29,9 +29,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -46,6 +46,8 @@ import mage.abilities.effects.common.ReturnToBattlefieldUnderOwnerControlSourceE import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.TargetController; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.common.TargetOpponent; @@ -93,11 +95,11 @@ public class ObzedatGhostCouncil extends CardImpl { class BeginningOfYourUpkeepdelayTriggeredAbility extends DelayedTriggeredAbility { public BeginningOfYourUpkeepdelayTriggeredAbility() { - this(new ReturnToBattlefieldUnderOwnerControlSourceEffect(), Constants.TargetController.YOU); - this.addEffect(new GainAbilitySourceEffect(HasteAbility.getInstance(), Constants.Duration.EndOfTurn)); + this(new ReturnToBattlefieldUnderOwnerControlSourceEffect(), TargetController.YOU); + this.addEffect(new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); } - public BeginningOfYourUpkeepdelayTriggeredAbility(Effect effect, Constants.TargetController targetController) { + public BeginningOfYourUpkeepdelayTriggeredAbility(Effect effect, TargetController targetController) { super(effect); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/OgreSlumlord.java b/Mage.Sets/src/mage/sets/gatecrash/OgreSlumlord.java index 5927ca1f466..a5ff184df9e 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/OgreSlumlord.java +++ b/Mage.Sets/src/mage/sets/gatecrash/OgreSlumlord.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.DiesCreatureTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/OneThousandLashes.java b/Mage.Sets/src/mage/sets/gatecrash/OneThousandLashes.java index 26ece7987a4..83effca4747 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/OneThousandLashes.java +++ b/Mage.Sets/src/mage/sets/gatecrash/OneThousandLashes.java @@ -28,11 +28,12 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Outcome; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -61,7 +62,7 @@ public class OneThousandLashes extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/gatecrash/OozeFlux.java b/Mage.Sets/src/mage/sets/gatecrash/OozeFlux.java index a9a7742801a..0c5a43b1943 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/OozeFlux.java +++ b/Mage.Sets/src/mage/sets/gatecrash/OozeFlux.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.Cost; diff --git a/Mage.Sets/src/mage/sets/gatecrash/OrdruunVeteran.java b/Mage.Sets/src/mage/sets/gatecrash/OrdruunVeteran.java index 972e73c3b4e..0b4a8d85865 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/OrdruunVeteran.java +++ b/Mage.Sets/src/mage/sets/gatecrash/OrdruunVeteran.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.BattalionAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/OrzhovCharm.java b/Mage.Sets/src/mage/sets/gatecrash/OrzhovCharm.java index d0bcc528b8a..59f7b642562 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/OrzhovCharm.java +++ b/Mage.Sets/src/mage/sets/gatecrash/OrzhovCharm.java @@ -29,10 +29,10 @@ package mage.sets.gatecrash; import java.util.LinkedList; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/gatecrash/OrzhovGuildgate.java b/Mage.Sets/src/mage/sets/gatecrash/OrzhovGuildgate.java index 241d6502c91..377cf52aa0a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/OrzhovGuildgate.java +++ b/Mage.Sets/src/mage/sets/gatecrash/OrzhovGuildgate.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.WhiteManaAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/OrzhovKeyrune.java b/Mage.Sets/src/mage/sets/gatecrash/OrzhovKeyrune.java index 6357f622e7d..1b77422f47d 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/OrzhovKeyrune.java +++ b/Mage.Sets/src/mage/sets/gatecrash/OrzhovKeyrune.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/ParanoidDelusions.java b/Mage.Sets/src/mage/sets/gatecrash/ParanoidDelusions.java index 14bfbbb88ac..b74ed5109f3 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ParanoidDelusions.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ParanoidDelusions.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CipherEffect; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/PitFight.java b/Mage.Sets/src/mage/sets/gatecrash/PitFight.java index a13761651ed..b54e66e50e0 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/PitFight.java +++ b/Mage.Sets/src/mage/sets/gatecrash/PitFight.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.FightTargetsEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/PredatorsRapport.java b/Mage.Sets/src/mage/sets/gatecrash/PredatorsRapport.java index 00d300c17a5..7c00e84e1b3 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/PredatorsRapport.java +++ b/Mage.Sets/src/mage/sets/gatecrash/PredatorsRapport.java @@ -28,11 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; -import mage.abilities.dynamicvalue.common.TargetPermanentPowerCount; import mage.abilities.effects.Effect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/PrimalVisitation.java b/Mage.Sets/src/mage/sets/gatecrash/PrimalVisitation.java index 82860c23c41..e95cda95263 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/PrimalVisitation.java +++ b/Mage.Sets/src/mage/sets/gatecrash/PrimalVisitation.java @@ -28,12 +28,12 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -42,6 +42,7 @@ import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -62,7 +63,7 @@ public class PrimalVisitation extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/gatecrash/PrimeSpeakerZegana.java b/Mage.Sets/src/mage/sets/gatecrash/PrimeSpeakerZegana.java index b4fa77e6483..906aebe4c26 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/PrimeSpeakerZegana.java +++ b/Mage.Sets/src/mage/sets/gatecrash/PrimeSpeakerZegana.java @@ -29,8 +29,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/PsychicStrike.java b/Mage.Sets/src/mage/sets/gatecrash/PsychicStrike.java index 0ba08ce7f32..4c20660b53d 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/PsychicStrike.java +++ b/Mage.Sets/src/mage/sets/gatecrash/PsychicStrike.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/gatecrash/PurgeTheProfane.java b/Mage.Sets/src/mage/sets/gatecrash/PurgeTheProfane.java index 0aee7f0557f..69412e91dee 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/PurgeTheProfane.java +++ b/Mage.Sets/src/mage/sets/gatecrash/PurgeTheProfane.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DiscardTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/RapidHybridization.java b/Mage.Sets/src/mage/sets/gatecrash/RapidHybridization.java index 6376a52abae..e003f5ffb31 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/RapidHybridization.java +++ b/Mage.Sets/src/mage/sets/gatecrash/RapidHybridization.java @@ -28,15 +28,17 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; @@ -73,7 +75,7 @@ public class RapidHybridization extends CardImpl { class RapidHybridizationEffect extends OneShotEffect { public RapidHybridizationEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); staticText = "That creature's controller puts a 3/3 green Frog Lizard creature token onto the battlefield"; } @@ -88,7 +90,7 @@ class RapidHybridizationEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = (Permanent) game.getLastKnownInformation(targetPointer.getFirst(game, source), Constants.Zone.BATTLEFIELD); + Permanent permanent = (Permanent) game.getLastKnownInformation(targetPointer.getFirst(game, source), Zone.BATTLEFIELD); if (permanent != null) { RapidHybridizationToken token = new RapidHybridizationToken(); token.putOntoBattlefield(1, game, source.getId(), permanent.getControllerId()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/RazortipWhip.java b/Mage.Sets/src/mage/sets/gatecrash/RazortipWhip.java index 4c4b134cd4d..eb0b21da6d2 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/RazortipWhip.java +++ b/Mage.Sets/src/mage/sets/gatecrash/RazortipWhip.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/gatecrash/Realmwright.java b/Mage.Sets/src/mage/sets/gatecrash/Realmwright.java index 176bec3bf23..6be1e3b77b0 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Realmwright.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Realmwright.java @@ -29,13 +29,13 @@ package mage.sets.gatecrash; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/RighteousCharge.java b/Mage.Sets/src/mage/sets/gatecrash/RighteousCharge.java index 920da44b222..0e1fcc93b33 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/RighteousCharge.java +++ b/Mage.Sets/src/mage/sets/gatecrash/RighteousCharge.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/RiotGear.java b/Mage.Sets/src/mage/sets/gatecrash/RiotGear.java index 871b17ab7d4..d9058eb5e4f 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/RiotGear.java +++ b/Mage.Sets/src/mage/sets/gatecrash/RiotGear.java @@ -28,14 +28,16 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; /** * @@ -49,10 +51,10 @@ public class RiotGear extends CardImpl { this.subtype.add("Equipment"); // Equipped creature gets +1/+2. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(1, 2))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 2))); // Equip {2} - this.addAbility(new EquipAbility(Constants.Outcome.BoostCreature, new GenericManaCost(2))); + this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2))); } public RiotGear(final RiotGear card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/RipscalePredator.java b/Mage.Sets/src/mage/sets/gatecrash/RipscalePredator.java index 4ef1f18a01b..368523633e7 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/RipscalePredator.java +++ b/Mage.Sets/src/mage/sets/gatecrash/RipscalePredator.java @@ -28,13 +28,14 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.CantBeBlockedByOneEffect; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -52,7 +53,7 @@ public class RipscalePredator extends CardImpl { this.toughness = new MageInt(5); // Ripscale Predator can't be blocked except by two or more creatures. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(2))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(2))); } public RipscalePredator(final RipscalePredator card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/RubblebeltRaiders.java b/Mage.Sets/src/mage/sets/gatecrash/RubblebeltRaiders.java index 3e4ef7d743b..025dcab1d3d 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/RubblebeltRaiders.java +++ b/Mage.Sets/src/mage/sets/gatecrash/RubblebeltRaiders.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.dynamicvalue.common.AttackingCreatureCount; diff --git a/Mage.Sets/src/mage/sets/gatecrash/Rubblehulk.java b/Mage.Sets/src/mage/sets/gatecrash/Rubblehulk.java index 16bdd55920f..e1f7e8c26f7 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Rubblehulk.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Rubblehulk.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; @@ -40,6 +40,7 @@ import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect; import mage.abilities.keyword.BloodrushAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; @@ -64,7 +65,7 @@ public class Rubblehulk extends CardImpl { DynamicValue controlledLands = new PermanentsOnBattlefieldCount(filter); // Rubblehulk's power and toughness are each equal to the number of lands you control. - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(controlledLands, Constants.Duration.EndOfGame))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(controlledLands, Duration.EndOfGame))); // Bloodrush - 1{R}{G}, Discard Rubblehulk: Target attacking creature gets +X/+X until end of turn, where X is the number of lands you control. this.addAbility(new BloodrushAbility("{1}{R}{G}", new BoostTargetEffect(controlledLands,controlledLands, Duration.EndOfTurn))); diff --git a/Mage.Sets/src/mage/sets/gatecrash/RuinationWurm.java b/Mage.Sets/src/mage/sets/gatecrash/RuinationWurm.java index e25f914cdf4..68378100442 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/RuinationWurm.java +++ b/Mage.Sets/src/mage/sets/gatecrash/RuinationWurm.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/RustScarab.java b/Mage.Sets/src/mage/sets/gatecrash/RustScarab.java index 7870fb6002c..5bac1575aca 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/RustScarab.java +++ b/Mage.Sets/src/mage/sets/gatecrash/RustScarab.java @@ -28,15 +28,16 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -87,7 +88,7 @@ public class RustScarab extends CardImpl { class BecomesBlockedTriggeredAbility extends TriggeredAbilityImpl { public BecomesBlockedTriggeredAbility(Effect effect, boolean optional) { - super(Constants.Zone.BATTLEFIELD, effect, optional); + super(Zone.BATTLEFIELD, effect, optional); } public BecomesBlockedTriggeredAbility(final BecomesBlockedTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/SagesRowDenizen.java b/Mage.Sets/src/mage/sets/gatecrash/SagesRowDenizen.java index 8f48aef3965..fdc3715ab07 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SagesRowDenizen.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SagesRowDenizen.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/gatecrash/SapphireDrake.java b/Mage.Sets/src/mage/sets/gatecrash/SapphireDrake.java index d7a99e9c3c3..bd7e41e84a5 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SapphireDrake.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SapphireDrake.java @@ -28,10 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityAllEffect; @@ -72,7 +70,7 @@ public class SapphireDrake extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Each creature you control with a +1/+1 counter on it has flying. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAllEffect(FlyingAbility.getInstance(), Constants.Duration.WhileOnBattlefield, filter, rule))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter, rule))); } public SapphireDrake(final SapphireDrake card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/ScabClanCharger.java b/Mage.Sets/src/mage/sets/gatecrash/ScabClanCharger.java index 3e4a2354f81..8bef90deca9 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ScabClanCharger.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ScabClanCharger.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.BloodrushAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/ScatterArc.java b/Mage.Sets/src/mage/sets/gatecrash/ScatterArc.java index cedf51ee641..45434574a3a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ScatterArc.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ScatterArc.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/Scorchwalker.java b/Mage.Sets/src/mage/sets/gatecrash/Scorchwalker.java index b9be7390ee1..1218f029b24 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Scorchwalker.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Scorchwalker.java @@ -28,13 +28,14 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.BloodrushAbility; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -52,7 +53,7 @@ public class Scorchwalker extends CardImpl { this.toughness = new MageInt(1); // Bloodrush - {1}{R}{R}, Discard Scorchwalker: Target attacking creature gets +5/+1 until end of turn. - this.addAbility(new BloodrushAbility("{1}{R}{R}", new BoostTargetEffect(5, 1, Constants.Duration.EndOfTurn))); + this.addAbility(new BloodrushAbility("{1}{R}{R}", new BoostTargetEffect(5, 1, Duration.EndOfTurn))); } public Scorchwalker(final Scorchwalker card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/SepulchralPrimordial.java b/Mage.Sets/src/mage/sets/gatecrash/SepulchralPrimordial.java index 5873ebacec6..d16cf086e06 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SepulchralPrimordial.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SepulchralPrimordial.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/SereneRemembrance.java b/Mage.Sets/src/mage/sets/gatecrash/SereneRemembrance.java index 6c65fd765c8..3f20b2231f3 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SereneRemembrance.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SereneRemembrance.java @@ -28,14 +28,15 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.game.Game; import mage.players.Player; @@ -96,13 +97,13 @@ class SereneRemembranceEffect extends OneShotEffect { if (player.getGraveyard().contains(card.getId())) { graveyardPlayer = player; player.getGraveyard().remove(card); - result |= card.moveToZone(Constants.Zone.LIBRARY, source.getId(), game, true); + result |= card.moveToZone(Zone.LIBRARY, source.getId(), game, true); } } } } Card card = game.getCard(source.getSourceId()); - result |= card.moveToZone(Constants.Zone.LIBRARY, source.getId(), game, false); + result |= card.moveToZone(Zone.LIBRARY, source.getId(), game, false); Player player = game.getPlayer(card.getOwnerId()); if (player != null){ player.shuffleLibrary(game); @@ -117,7 +118,7 @@ class SereneRemembranceEffect extends OneShotEffect { class SereneRemembranceTargetCardsInGraveyard extends TargetCard { public SereneRemembranceTargetCardsInGraveyard(int minNumTargets, int maxNumTargets, FilterCard filter) { - super(minNumTargets, maxNumTargets, Constants.Zone.GRAVEYARD, filter); + super(minNumTargets, maxNumTargets, Zone.GRAVEYARD, filter); this.targetName = "up to three target cards from a single graveyard"; } diff --git a/Mage.Sets/src/mage/sets/gatecrash/ShadowAlleyDenizen.java b/Mage.Sets/src/mage/sets/gatecrash/ShadowAlleyDenizen.java index c2ed549a529..c2153b8c1c1 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ShadowAlleyDenizen.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ShadowAlleyDenizen.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/gatecrash/ShadowSlice.java b/Mage.Sets/src/mage/sets/gatecrash/ShadowSlice.java index ef6db76e06e..81083648e2a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ShadowSlice.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ShadowSlice.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CipherEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/Shambleshark.java b/Mage.Sets/src/mage/sets/gatecrash/Shambleshark.java index 22e7f9625e2..86aa83eb64b 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Shambleshark.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Shambleshark.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.EvolveAbility; import mage.abilities.keyword.FlashAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/ShatteringBlow.java b/Mage.Sets/src/mage/sets/gatecrash/ShatteringBlow.java index d4271e256f5..a974623c93c 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ShatteringBlow.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ShatteringBlow.java @@ -29,8 +29,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetArtifactPermanent; diff --git a/Mage.Sets/src/mage/sets/gatecrash/ShieldedPassage.java b/Mage.Sets/src/mage/sets/gatecrash/ShieldedPassage.java index 87ca095be72..f363059dd8d 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ShieldedPassage.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ShieldedPassage.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.PreventDamageTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/gatecrash/SignalTheClans.java b/Mage.Sets/src/mage/sets/gatecrash/SignalTheClans.java index 24e3d5f8dde..f8f3d67a23a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SignalTheClans.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SignalTheClans.java @@ -29,15 +29,17 @@ package mage.sets.gatecrash; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.SearchEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.players.Player; @@ -74,7 +76,7 @@ class SignalTheClansEffect extends SearchEffect { public SignalTheClansEffect() { - super(new TargetCardInLibrary(3, new FilterCreatureCard()), Constants.Outcome.DrawCard); + super(new TargetCardInLibrary(3, new FilterCreatureCard()), Outcome.DrawCard); staticText = "Search your library for three creature cards and reveal them. If you reveal three cards with different names, choose one of them at random and put that card into your hand. Shuffle the rest into your library"; } @@ -110,12 +112,12 @@ class SignalTheClansEffect extends SearchEffect { if(cardsArray.length == 3 && !cardsArray[0].getName().equals(cardsArray[1]) && !cardsArray[0].getName().equals(cardsArray[2]) && !cardsArray[1].getName().equals(cardsArray[2])){ //Choose one of them at random and put that card into your hand Card randomCard = cards.getRandom(game); - randomCard.moveToZone(Constants.Zone.HAND, source.getId(), game, true); + randomCard.moveToZone(Zone.HAND, source.getId(), game, true); cards.remove(randomCard); } //Shuffle the rest into your library for(Card card : cards.getCards(game)){ - card.moveToZone(Constants.Zone.LIBRARY, source.getId(), game, true); + card.moveToZone(Zone.LIBRARY, source.getId(), game, true); } } player.shuffleLibrary(game); diff --git a/Mage.Sets/src/mage/sets/gatecrash/SimicCharm.java b/Mage.Sets/src/mage/sets/gatecrash/SimicCharm.java index c4190535581..c2bfa2afe2b 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SimicCharm.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SimicCharm.java @@ -28,15 +28,16 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Mode; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -54,11 +55,11 @@ public class SimicCharm extends CardImpl { this.color.setBlue(true); //Choose one - Target creature gets +3/+3 until end of turn - this.getSpellAbility().addEffect(new BoostTargetEffect(3, 3, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(3, 3, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); //permanents you control gain hexproof until end of turn Mode mode = new Mode(); - mode.getEffects().add(new GainAbilityAllEffect(HexproofAbility.getInstance(), Constants.Duration.EndOfTurn, new FilterControlledPermanent())); + mode.getEffects().add(new GainAbilityAllEffect(HexproofAbility.getInstance(), Duration.EndOfTurn, new FilterControlledPermanent())); this.getSpellAbility().addMode(mode); //return target creature to its owner's hand. Mode mode2 = new Mode(); diff --git a/Mage.Sets/src/mage/sets/gatecrash/SimicFluxmage.java b/Mage.Sets/src/mage/sets/gatecrash/SimicFluxmage.java index a9573d6ee41..fcb40c416c6 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SimicFluxmage.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SimicFluxmage.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +40,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.EvolveAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -65,7 +66,7 @@ public class SimicFluxmage extends CardImpl { this.addAbility(new EvolveAbility()); // 1{U}, {T}: Move a +1/+1 counter from Simic Fluxmage onto target creature. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new MoveCounterFromSourceToTargetEffect(),new ManaCostsImpl("{1}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MoveCounterFromSourceToTargetEffect(),new ManaCostsImpl("{1}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/gatecrash/SimicGuildgate.java b/Mage.Sets/src/mage/sets/gatecrash/SimicGuildgate.java index baf70055471..d0ef88250e1 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SimicGuildgate.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SimicGuildgate.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.GreenManaAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/SimicKeyrune.java b/Mage.Sets/src/mage/sets/gatecrash/SimicKeyrune.java index 6b131d92a4b..27ce03c903c 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SimicKeyrune.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SimicKeyrune.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/SimicManipulator.java b/Mage.Sets/src/mage/sets/gatecrash/SimicManipulator.java index 9c3da52b972..a5e3155bdf2 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SimicManipulator.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SimicManipulator.java @@ -28,13 +28,13 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; diff --git a/Mage.Sets/src/mage/sets/gatecrash/SkarrgGoliath.java b/Mage.Sets/src/mage/sets/gatecrash/SkarrgGoliath.java index 3999c52644f..5a62d479d21 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SkarrgGoliath.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SkarrgGoliath.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.continious.BoostTargetEffect; diff --git a/Mage.Sets/src/mage/sets/gatecrash/SkarrgGuildmage.java b/Mage.Sets/src/mage/sets/gatecrash/SkarrgGuildmage.java index f58d0057945..1b6d25ab899 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SkarrgGuildmage.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SkarrgGuildmage.java @@ -28,11 +28,11 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/SkinbrandGoblin.java b/Mage.Sets/src/mage/sets/gatecrash/SkinbrandGoblin.java index ae1e5136113..f02ed09ae98 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SkinbrandGoblin.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SkinbrandGoblin.java @@ -28,13 +28,14 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.BloodrushAbility; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -53,7 +54,7 @@ public class SkinbrandGoblin extends CardImpl { this.toughness = new MageInt(1); // Bloodrush - {R}, Discard Skinbrand Goblin: Target attacking creature gets +2/+1 until end of turn. - this.addAbility(new BloodrushAbility("{R}", new BoostTargetEffect(2, 1, Constants.Duration.EndOfTurn))); + this.addAbility(new BloodrushAbility("{R}", new BoostTargetEffect(2, 1, Duration.EndOfTurn))); } public SkinbrandGoblin(final SkinbrandGoblin card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/Skullcrack.java b/Mage.Sets/src/mage/sets/gatecrash/Skullcrack.java index bc7baea8ab5..c5a4e9df631 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Skullcrack.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Skullcrack.java @@ -28,14 +28,15 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.TargetPlayer; @@ -73,7 +74,7 @@ public class Skullcrack extends CardImpl { class DamageCantBePreventedEffect extends ReplacementEffectImpl { public DamageCantBePreventedEffect() { - super(Constants.Duration.EndOfTurn, Outcome.Benefit); + super(Duration.EndOfTurn, Outcome.Benefit); staticText = "Damage can't be prevented this turn"; } @@ -108,7 +109,7 @@ class DamageCantBePreventedEffect extends ReplacementEffectImpl { public PlayersCantGetLiveEffect() { - super(Constants.Duration.EndOfTurn, Outcome.Benefit); + super(Duration.EndOfTurn, Outcome.Benefit); staticText = "Players can't gain life this turn"; } diff --git a/Mage.Sets/src/mage/sets/gatecrash/SkyblinderStaff.java b/Mage.Sets/src/mage/sets/gatecrash/SkyblinderStaff.java index 144fa942782..e8728c5e569 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SkyblinderStaff.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SkyblinderStaff.java @@ -28,10 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -55,12 +53,12 @@ public class SkyblinderStaff extends CardImpl { this.subtype.add("Equipment"); // Equipped creature gets +1/+0 and can't be blocked by creatures with flying. - Ability ability = new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0)); + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0)); ability.addEffect(new CantBeBlockedByCreaturesWithFlyingAttachedEffect()); this.addAbility(ability); // Equip {3} - this.addAbility(new EquipAbility(Constants.Outcome.BoostCreature, new GenericManaCost(3))); + this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(3))); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/Skygames.java b/Mage.Sets/src/mage/sets/gatecrash/Skygames.java index c4d8bcc04c3..0ebf9fdad2a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Skygames.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Skygames.java @@ -28,10 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -62,14 +60,14 @@ public class Skygames extends CardImpl { // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Benefit)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted land has "{tap}: Target creature gains flying until end of turn. Activate this ability only any time you could cast a sorcery." - Ability gainAbility = new ActivateAsSorceryActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn), new TapSourceCost()); + Ability gainAbility = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); gainAbility.addTarget(new TargetCreaturePermanent()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, Constants.AttachmentType.AURA, + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{T}: Target creature gains flying until end of turn. Activate this ability only any time you could cast a sorcery.\""))); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/SlateStreetRuffian.java b/Mage.Sets/src/mage/sets/gatecrash/SlateStreetRuffian.java index 64d6153c694..9f9d415a9ab 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SlateStreetRuffian.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SlateStreetRuffian.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BecomesBlockedByCreatureTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/Slaughterhorn.java b/Mage.Sets/src/mage/sets/gatecrash/Slaughterhorn.java index c2a1ebd1267..0f9bfe35bfa 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Slaughterhorn.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Slaughterhorn.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.BloodrushAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/SmogElemental.java b/Mage.Sets/src/mage/sets/gatecrash/SmogElemental.java index a19b05fd937..2fc91dfb36b 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SmogElemental.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SmogElemental.java @@ -28,11 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostAllEffect; @@ -67,7 +64,7 @@ public class SmogElemental extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Creatures with flying your opponents control get -1/-1. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostAllEffect(-1,-1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(-1,-1, Duration.WhileOnBattlefield, filter, false))); } public SmogElemental(final SmogElemental card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/SoulRansom.java b/Mage.Sets/src/mage/sets/gatecrash/SoulRansom.java index ba89180ff61..81f2d985a34 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SoulRansom.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SoulRansom.java @@ -28,9 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -64,20 +63,20 @@ public class SoulRansom extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.GainControl)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); // Discard two cards: Soul Ransom's controller sacrifices it, then draws two cards. Only any opponent may activate this ability. Effect effect = new SacrificeSourceEffect(); effect.setText("{this}'s controller sacrifices it"); - SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, effect , new DiscardTargetCost(new TargetCardInHand(2,2, new FilterCard("two cards")))); + SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect , new DiscardTargetCost(new TargetCardInHand(2,2, new FilterCard("two cards")))); effect = new DrawCardControllerEffect(2); effect.setText("Then draws two cards. Only any opponent may activate this ability"); ability2.addEffect(effect); - ability2.setMayActivate(Constants.TargetController.OPPONENT); + ability2.setMayActivate(TargetController.OPPONENT); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/SparkTrooper.java b/Mage.Sets/src/mage/sets/gatecrash/SparkTrooper.java index 02274223e0d..76cb6ca7acd 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SparkTrooper.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SparkTrooper.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; diff --git a/Mage.Sets/src/mage/sets/gatecrash/SpellRupture.java b/Mage.Sets/src/mage/sets/gatecrash/SpellRupture.java index 5b3a84d1e85..a3aa3c852ad 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SpellRupture.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SpellRupture.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.Mode; @@ -38,6 +38,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -75,7 +76,7 @@ public class SpellRupture extends CardImpl { class SpellRuptureCounterUnlessPaysEffect extends OneShotEffect { public SpellRuptureCounterUnlessPaysEffect() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); } public SpellRuptureCounterUnlessPaysEffect(final SpellRuptureCounterUnlessPaysEffect effect) { @@ -98,7 +99,7 @@ class SpellRuptureCounterUnlessPaysEffect extends OneShotEffect { class CantBeBlockedExceptByCreaturesWithFlyingOrReachEffect extends RestrictionEffect { public CantBeBlockedExceptByCreaturesWithFlyingOrReachEffect() { - super(Constants.Duration.WhileOnBattlefield); + super(Duration.WhileOnBattlefield); staticText = "Can't be blocked except by creatures with flying or reach"; } diff --git a/Mage.Sets/src/mage/sets/gatecrash/StolenIdentity.java b/Mage.Sets/src/mage/sets/gatecrash/StolenIdentity.java index ff25b092c15..106fda79314 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/StolenIdentity.java +++ b/Mage.Sets/src/mage/sets/gatecrash/StolenIdentity.java @@ -28,14 +28,15 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CipherEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -85,7 +86,7 @@ class StolenIdentityEffect extends OneShotEffect { public StolenIdentityEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); this.staticText = "Put a token onto the battlefield that's a copy of target artifact or creature"; } diff --git a/Mage.Sets/src/mage/sets/gatecrash/StructuralCollapse.java b/Mage.Sets/src/mage/sets/gatecrash/StructuralCollapse.java index ec0eb25b5e2..d70b799abf2 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/StructuralCollapse.java +++ b/Mage.Sets/src/mage/sets/gatecrash/StructuralCollapse.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.SacrificeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/SunhomeGuildmage.java b/Mage.Sets/src/mage/sets/gatecrash/SunhomeGuildmage.java index 428f444b988..d0c89c8d3f8 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SunhomeGuildmage.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SunhomeGuildmage.java @@ -29,9 +29,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +40,8 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.permanent.token.Token; /** @@ -62,10 +64,10 @@ public class SunhomeGuildmage extends CardImpl { //{1}{R}{W}: Creatures you control get +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Constants.Duration.EndOfTurn), new ManaCostsImpl("{1}{R}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{R}{W}"))); //{2}{R}{W}: Put a 1/1 red and white Soldier creature token with haste onto the battlefield. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new SoldierToken()), new ManaCostsImpl("{2}{R}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SoldierToken()), new ManaCostsImpl("{2}{R}{W}"))); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/SylvanPrimordial.java b/Mage.Sets/src/mage/sets/gatecrash/SylvanPrimordial.java index d6f68b9a7a1..8886156e0d9 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SylvanPrimordial.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SylvanPrimordial.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/SyndicOfTithes.java b/Mage.Sets/src/mage/sets/gatecrash/SyndicOfTithes.java index beeb4dffcca..15e404bfb9d 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SyndicOfTithes.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SyndicOfTithes.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ExtortAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/SyndicateEnforcer.java b/Mage.Sets/src/mage/sets/gatecrash/SyndicateEnforcer.java index bca39e57fde..31c1bd9f740 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SyndicateEnforcer.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SyndicateEnforcer.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ExtortAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/ThespiansStage.java b/Mage.Sets/src/mage/sets/gatecrash/ThespiansStage.java index c620b9426c1..dda58a5dc78 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ThespiansStage.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ThespiansStage.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -39,6 +39,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetLandPermanent; @@ -58,7 +59,7 @@ public class ThespiansStage extends CardImpl { this.addAbility(new ColorlessManaAbility()); // 2, {T}: Thespian's Stage becomes a copy of target land and gains this ability. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ThespiansStageCopyEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ThespiansStageCopyEffect(), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); @@ -97,7 +98,7 @@ class ThespiansStageCopyEffect extends OneShotEffect { Permanent copyFromPermanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (sourcePermanent != null && copyFromPermanent != null) { Permanent newPermanent = game.copyPermanent(copyFromPermanent, sourcePermanent, source, new EmptyApplyToPermanent()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ThespiansStageCopyEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ThespiansStageCopyEffect(), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetLandPermanent()); newPermanent.addAbility(ability, source.getSourceId(), game); diff --git a/Mage.Sets/src/mage/sets/gatecrash/ThrullParasite.java b/Mage.Sets/src/mage/sets/gatecrash/ThrullParasite.java index 48bd56710f4..023b09f40b3 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ThrullParasite.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ThrullParasite.java @@ -30,10 +30,10 @@ package mage.sets.gatecrash; import java.util.HashSet; import java.util.Set; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +44,7 @@ import mage.abilities.keyword.ExtortAbility; import mage.cards.CardImpl; import mage.choices.Choice; import mage.choices.ChoiceImpl; +import mage.constants.Zone; import mage.counters.Counter; import mage.counters.CounterType; import mage.game.Game; @@ -69,7 +70,7 @@ public class ThrullParasite extends CardImpl { // Extort this.addAbility(new ExtortAbility()); // {tap}, Pay 2 life: Remove a counter from target nonland permanent. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RemoveCounterTargetEffect(),new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RemoveCounterTargetEffect(),new TapSourceCost()); ability.addTarget(new TargetNonlandPermanent()); ability.addCost(new PayLifeCost(2)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/gatecrash/TinStreetMarket.java b/Mage.Sets/src/mage/sets/gatecrash/TinStreetMarket.java index 427b6974f67..a58e6c98ee4 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/TinStreetMarket.java +++ b/Mage.Sets/src/mage/sets/gatecrash/TinStreetMarket.java @@ -28,10 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -67,9 +65,9 @@ public class TinStreetMarket extends CardImpl { // Enchanted land has "{T}, Discard a card: Draw a card." - Ability gainAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new TapSourceCost()); + Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new TapSourceCost()); gainAbility.addCost(new DiscardCardCost()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/TotallyLost.java b/Mage.Sets/src/mage/sets/gatecrash/TotallyLost.java index f3e05c8339a..a56de83a8be 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/TotallyLost.java +++ b/Mage.Sets/src/mage/sets/gatecrash/TotallyLost.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetNonlandPermanent; diff --git a/Mage.Sets/src/mage/sets/gatecrash/TowerDefense.java b/Mage.Sets/src/mage/sets/gatecrash/TowerDefense.java index 23ce17ee86a..606a57535c0 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/TowerDefense.java +++ b/Mage.Sets/src/mage/sets/gatecrash/TowerDefense.java @@ -28,13 +28,15 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; @@ -46,7 +48,7 @@ public class TowerDefense extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures you control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public TowerDefense(UUID ownerId) { @@ -56,8 +58,8 @@ public class TowerDefense extends CardImpl { this.color.setGreen(true); // Creatures you control get +0/+5 and gain reach until end of turn. - this.getSpellAbility().addEffect(new BoostAllEffect(0, 5, Constants.Duration.EndOfTurn, filter , false)); - this.getSpellAbility().addEffect(new GainAbilityAllEffect(ReachAbility.getInstance(), Constants.Duration.EndOfTurn, filter)); + this.getSpellAbility().addEffect(new BoostAllEffect(0, 5, Duration.EndOfTurn, filter , false)); + this.getSpellAbility().addEffect(new GainAbilityAllEffect(ReachAbility.getInstance(), Duration.EndOfTurn, filter)); } public TowerDefense(final TowerDefense card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/ToweringThunderfist.java b/Mage.Sets/src/mage/sets/gatecrash/ToweringThunderfist.java index 84f7c9202be..b70118910d6 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ToweringThunderfist.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ToweringThunderfist.java @@ -28,15 +28,16 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -55,7 +56,7 @@ public class ToweringThunderfist extends CardImpl { this.toughness = new MageInt(4); // {W}: Towering Thunderfist gains vigilance until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(VigilanceAbility.getInstance()), new ManaCostsImpl("{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(VigilanceAbility.getInstance()), new ManaCostsImpl("{W}"))); } public ToweringThunderfist(final ToweringThunderfist card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/TreasuryThrull.java b/Mage.Sets/src/mage/sets/gatecrash/TreasuryThrull.java index 86dd2f2f689..3ebc9f62a31 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/TreasuryThrull.java +++ b/Mage.Sets/src/mage/sets/gatecrash/TreasuryThrull.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/TruefirePaladin.java b/Mage.Sets/src/mage/sets/gatecrash/TruefirePaladin.java index f0dd1fccc93..2d320a9ea64 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/TruefirePaladin.java +++ b/Mage.Sets/src/mage/sets/gatecrash/TruefirePaladin.java @@ -29,10 +29,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/UndercityInformer.java b/Mage.Sets/src/mage/sets/gatecrash/UndercityInformer.java index 812174773e7..a1f57bca726 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/UndercityInformer.java +++ b/Mage.Sets/src/mage/sets/gatecrash/UndercityInformer.java @@ -29,10 +29,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/UndercityPlague.java b/Mage.Sets/src/mage/sets/gatecrash/UndercityPlague.java index 8709d549aa4..c0db8ed28f5 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/UndercityPlague.java +++ b/Mage.Sets/src/mage/sets/gatecrash/UndercityPlague.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CipherEffect; import mage.abilities.effects.common.DiscardTargetEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; diff --git a/Mage.Sets/src/mage/sets/gatecrash/UnexpectedResults.java b/Mage.Sets/src/mage/sets/gatecrash/UnexpectedResults.java index 8b7d2bc94ee..f831c66e4cd 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/UnexpectedResults.java +++ b/Mage.Sets/src/mage/sets/gatecrash/UnexpectedResults.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/gatecrash/UrbanEvolution.java b/Mage.Sets/src/mage/sets/gatecrash/UrbanEvolution.java index f9e40c14973..219971d7533 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/UrbanEvolution.java +++ b/Mage.Sets/src/mage/sets/gatecrash/UrbanEvolution.java @@ -29,12 +29,13 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.continious.PlayAdditionalLandsControllerEffect; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -54,7 +55,7 @@ public class UrbanEvolution extends CardImpl { this.getSpellAbility().addEffect(new DrawCardControllerEffect(3)); //You may play an additional land this turn. - this.getSpellAbility().addEffect(new PlayAdditionalLandsControllerEffect(1, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new PlayAdditionalLandsControllerEffect(1, Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/UrbisProtector.java b/Mage.Sets/src/mage/sets/gatecrash/UrbisProtector.java index 9042d2873ae..d144768bda3 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/UrbisProtector.java +++ b/Mage.Sets/src/mage/sets/gatecrash/UrbisProtector.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/gatecrash/VerdantHaven.java b/Mage.Sets/src/mage/sets/gatecrash/VerdantHaven.java index 060eeace47e..bc796779a55 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/VerdantHaven.java +++ b/Mage.Sets/src/mage/sets/gatecrash/VerdantHaven.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -42,6 +42,7 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.mana.TriggeredManaAbility; import mage.cards.CardImpl; import mage.choices.ChoiceColor; +import mage.constants.Outcome; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -65,7 +66,7 @@ public class VerdantHaven extends CardImpl { // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Benefit)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/gatecrash/ViashinoShanktail.java b/Mage.Sets/src/mage/sets/gatecrash/ViashinoShanktail.java index 31f08ca077b..1b86c3b98db 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ViashinoShanktail.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ViashinoShanktail.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.continious.BoostTargetEffect; diff --git a/Mage.Sets/src/mage/sets/gatecrash/VizkopaConfessor.java b/Mage.Sets/src/mage/sets/gatecrash/VizkopaConfessor.java index 70544c767c1..57a35a9b8d7 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/VizkopaConfessor.java +++ b/Mage.Sets/src/mage/sets/gatecrash/VizkopaConfessor.java @@ -29,10 +29,10 @@ package mage.sets.gatecrash; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/gatecrash/VizkopaGuildmage.java b/Mage.Sets/src/mage/sets/gatecrash/VizkopaGuildmage.java index 1e798ec7f94..71972570126 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/VizkopaGuildmage.java +++ b/Mage.Sets/src/mage/sets/gatecrash/VizkopaGuildmage.java @@ -29,12 +29,12 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -101,7 +101,7 @@ public class VizkopaGuildmage extends CardImpl { class VizkopaGuildmageDelayedTriggeredAbility extends DelayedTriggeredAbility { public VizkopaGuildmageDelayedTriggeredAbility() { - super(new OpponentsLoseLifeEffect(), Constants.Duration.EndOfTurn, false); + super(new OpponentsLoseLifeEffect(), Duration.EndOfTurn, false); } public VizkopaGuildmageDelayedTriggeredAbility(VizkopaGuildmageDelayedTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/Voidwalk.java b/Mage.Sets/src/mage/sets/gatecrash/Voidwalk.java index 05c62bce6c4..6575771fc22 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Voidwalk.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Voidwalk.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.delayed.AtEndOfTurnDelayedTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -38,6 +38,8 @@ import mage.abilities.effects.common.CipherEffect; import mage.abilities.effects.common.ReturnFromExileEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; @@ -77,7 +79,7 @@ class VoidwalkEffect extends OneShotEffect { private static final String effectText = "Exile target creature. Return it to the battlefield under its owner's control at the beginning of the next end step"; VoidwalkEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = effectText; } @@ -93,7 +95,7 @@ class VoidwalkEffect extends OneShotEffect { if (permanent != null) { if (permanent.moveToExile(source.getSourceId(), "Voidwalk", source.getSourceId(), game)) { if (card != null) { - AtEndOfTurnDelayedTriggeredAbility delayedAbility = new AtEndOfTurnDelayedTriggeredAbility(new ReturnFromExileEffect(source.getSourceId(), Constants.Zone.BATTLEFIELD)); + AtEndOfTurnDelayedTriggeredAbility delayedAbility = new AtEndOfTurnDelayedTriggeredAbility(new ReturnFromExileEffect(source.getSourceId(), Zone.BATTLEFIELD)); delayedAbility.setSourceId(source.getSourceId()); delayedAbility.setControllerId(card.getOwnerId()); game.addDelayedTriggeredAbility(delayedAbility); diff --git a/Mage.Sets/src/mage/sets/gatecrash/WarmindInfantry.java b/Mage.Sets/src/mage/sets/gatecrash/WarmindInfantry.java index 5ecf0e2e19a..5689cc77c0d 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/WarmindInfantry.java +++ b/Mage.Sets/src/mage/sets/gatecrash/WarmindInfantry.java @@ -28,13 +28,14 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.BattalionAbility; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -53,7 +54,7 @@ public class WarmindInfantry extends CardImpl { this.toughness = new MageInt(3); // Battalion - Whenever Warmind Infantry and at least two other creatures attack, Warmind Infantry gets +2/+0 until end of turn. - this.addAbility(new BattalionAbility(new BoostSourceEffect(2, 0, Constants.Duration.EndOfTurn))); + this.addAbility(new BattalionAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn))); } public WarmindInfantry(final WarmindInfantry card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/WastelandViper.java b/Mage.Sets/src/mage/sets/gatecrash/WastelandViper.java index f7fdb850292..4ff97f43dbd 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/WastelandViper.java +++ b/Mage.Sets/src/mage/sets/gatecrash/WastelandViper.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.continious.BoostTargetEffect; @@ -38,6 +38,7 @@ import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.BloodrushAbility; import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -57,8 +58,8 @@ public class WastelandViper extends CardImpl { // Deathtouch this.addAbility(DeathtouchAbility.getInstance()); // Bloodrush - {G}, Discard Wasteland Viper: Target attacking creature gets +1/+2 and gains deathtouch until end of turn. - Ability ability = new BloodrushAbility("{G}", new BoostTargetEffect(1, 2, Constants.Duration.EndOfTurn)); - ability.addEffect(new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Constants.Duration.EndOfTurn)); + Ability ability = new BloodrushAbility("{G}", new BoostTargetEffect(1, 2, Duration.EndOfTurn)); + ability.addEffect(new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/WayOfTheThief.java b/Mage.Sets/src/mage/sets/gatecrash/WayOfTheThief.java index be37d262051..a8798671916 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/WayOfTheThief.java +++ b/Mage.Sets/src/mage/sets/gatecrash/WayOfTheThief.java @@ -28,12 +28,12 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.ControlsPermanentCondition; @@ -43,6 +43,7 @@ import mage.abilities.effects.common.UnblockableAttachedEffect; import mage.abilities.effects.common.continious.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; @@ -72,7 +73,7 @@ public class WayOfTheThief extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); @@ -80,7 +81,7 @@ public class WayOfTheThief extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Enchanted creature is unblockable as long as you control a Gate. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ConditionalContinousEffect(new UnblockableAttachedEffect(AttachmentType.AURA), new ControlsPermanentCondition(filter), rule))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new UnblockableAttachedEffect(AttachmentType.AURA), new ControlsPermanentCondition(filter), rule))); } public WayOfTheThief(final WayOfTheThief card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/WhisperingMadness.java b/Mage.Sets/src/mage/sets/gatecrash/WhisperingMadness.java index eaa3832c1ff..b0cbf6892a2 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/WhisperingMadness.java +++ b/Mage.Sets/src/mage/sets/gatecrash/WhisperingMadness.java @@ -28,14 +28,15 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CipherEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; @@ -70,7 +71,7 @@ public class WhisperingMadness extends CardImpl { class WhisperingMadnessEffect extends OneShotEffect { WhisperingMadnessEffect() { - super(Constants.Outcome.Discard); + super(Outcome.Discard); staticText = "Each player discards his or her hand, then draws cards equal to the greatest number of cards a player discarded this way"; } diff --git a/Mage.Sets/src/mage/sets/gatecrash/WightOfPrecinctSix.java b/Mage.Sets/src/mage/sets/gatecrash/WightOfPrecinctSix.java index d01c90d3568..e89f6615fe5 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/WightOfPrecinctSix.java +++ b/Mage.Sets/src/mage/sets/gatecrash/WightOfPrecinctSix.java @@ -28,16 +28,17 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.game.Game; @@ -62,7 +63,7 @@ public class WightOfPrecinctSix extends CardImpl { // Wight of Precinct Six gets +1/+1 for each creature card in your opponents' graveyards. DynamicValue boost = new CardsInOpponentGraveyardsCount(filter); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(boost, boost, Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(boost, boost, Duration.WhileOnBattlefield))); } public WightOfPrecinctSix(final WightOfPrecinctSix card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/WildwoodRebirth.java b/Mage.Sets/src/mage/sets/gatecrash/WildwoodRebirth.java index 49a7cd0d096..83c354793d4 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/WildwoodRebirth.java +++ b/Mage.Sets/src/mage/sets/gatecrash/WildwoodRebirth.java @@ -28,8 +28,8 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreatureCard; diff --git a/Mage.Sets/src/mage/sets/gatecrash/WojekHalberdiers.java b/Mage.Sets/src/mage/sets/gatecrash/WojekHalberdiers.java index 5a46c340e67..c564d8e0940 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/WojekHalberdiers.java +++ b/Mage.Sets/src/mage/sets/gatecrash/WojekHalberdiers.java @@ -28,14 +28,15 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.BattalionAbility; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -55,7 +56,7 @@ public class WojekHalberdiers extends CardImpl { this.toughness = new MageInt(2); // Battalion - Whenever Wojek Halberdiers and at least two other creatures attack, Wojek Halberdiers gains first strike until end of turn. - this.addAbility(new BattalionAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Constants.Duration.EndOfTurn))); + this.addAbility(new BattalionAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn))); } public WojekHalberdiers(final WojekHalberdiers card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/WreckingOgre.java b/Mage.Sets/src/mage/sets/gatecrash/WreckingOgre.java index b021b33790c..de3e1c0261a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/WreckingOgre.java +++ b/Mage.Sets/src/mage/sets/gatecrash/WreckingOgre.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.continious.BoostTargetEffect; diff --git a/Mage.Sets/src/mage/sets/gatecrash/ZameckGuildmage.java b/Mage.Sets/src/mage/sets/gatecrash/ZameckGuildmage.java index a2820feaa69..57698be82fd 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ZameckGuildmage.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ZameckGuildmage.java @@ -28,10 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -44,6 +44,7 @@ import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; @@ -96,7 +97,7 @@ class EntersBattlefieldEffect extends ReplacementEffectImpl { this.toughness = new MageInt(3); // 1{W}, {T}: You gain 2 life. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainLifeEffect(2), new ManaCostsImpl("{1}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), new ManaCostsImpl("{1}{W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/ZhurTaaSwine.java b/Mage.Sets/src/mage/sets/gatecrash/ZhurTaaSwine.java index bfd4fa9e9d1..5cb1b5e0400 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ZhurTaaSwine.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ZhurTaaSwine.java @@ -28,9 +28,9 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.BloodrushAbility; diff --git a/Mage.Sets/src/mage/sets/guildpact/AbsolverThrull.java b/Mage.Sets/src/mage/sets/guildpact/AbsolverThrull.java index 2818003603f..eb570642784 100644 --- a/Mage.Sets/src/mage/sets/guildpact/AbsolverThrull.java +++ b/Mage.Sets/src/mage/sets/guildpact/AbsolverThrull.java @@ -28,8 +28,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/guildpact/AgentOfMasks.java b/Mage.Sets/src/mage/sets/guildpact/AgentOfMasks.java index 2e9d66c7013..acd6b2eb81c 100644 --- a/Mage.Sets/src/mage/sets/guildpact/AgentOfMasks.java +++ b/Mage.Sets/src/mage/sets/guildpact/AgentOfMasks.java @@ -28,14 +28,16 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.game.Game; /** @@ -53,7 +55,7 @@ public class AgentOfMasks extends CardImpl { this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AgentOfMasksEffect(), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AgentOfMasksEffect(), TargetController.YOU, false)); } public AgentOfMasks(final AgentOfMasks card) { @@ -68,7 +70,7 @@ public class AgentOfMasks extends CardImpl { class AgentOfMasksEffect extends OneShotEffect { public AgentOfMasksEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "each opponent loses 1 life. You gain life equal to the life lost this way"; } diff --git a/Mage.Sets/src/mage/sets/guildpact/AngelOfDespair.java b/Mage.Sets/src/mage/sets/guildpact/AngelOfDespair.java index 6f1b286e3e4..1c05501abc0 100644 --- a/Mage.Sets/src/mage/sets/guildpact/AngelOfDespair.java +++ b/Mage.Sets/src/mage/sets/guildpact/AngelOfDespair.java @@ -29,8 +29,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/guildpact/BatteringWurm.java b/Mage.Sets/src/mage/sets/guildpact/BatteringWurm.java index 08939fa63a4..8c718dad367 100644 --- a/Mage.Sets/src/mage/sets/guildpact/BatteringWurm.java +++ b/Mage.Sets/src/mage/sets/guildpact/BatteringWurm.java @@ -28,9 +28,9 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.CantBeBlockedByCreaturesWithLessPowerEffect; diff --git a/Mage.Sets/src/mage/sets/guildpact/BelfrySpirit.java b/Mage.Sets/src/mage/sets/guildpact/BelfrySpirit.java index bc8bb5965e2..5459ed8a73d 100644 --- a/Mage.Sets/src/mage/sets/guildpact/BelfrySpirit.java +++ b/Mage.Sets/src/mage/sets/guildpact/BelfrySpirit.java @@ -28,8 +28,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/guildpact/BlindHunter.java b/Mage.Sets/src/mage/sets/guildpact/BlindHunter.java index 6e9cc3d1013..48067efaf47 100644 --- a/Mage.Sets/src/mage/sets/guildpact/BlindHunter.java +++ b/Mage.Sets/src/mage/sets/guildpact/BlindHunter.java @@ -28,8 +28,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/guildpact/BurningTreeShaman.java b/Mage.Sets/src/mage/sets/guildpact/BurningTreeShaman.java index 67b8674f88f..3b454c3bad7 100644 --- a/Mage.Sets/src/mage/sets/guildpact/BurningTreeShaman.java +++ b/Mage.Sets/src/mage/sets/guildpact/BurningTreeShaman.java @@ -30,10 +30,10 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.AbilityType; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AbilityType; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DamageTargetEffect; diff --git a/Mage.Sets/src/mage/sets/guildpact/CausticRain.java b/Mage.Sets/src/mage/sets/guildpact/CausticRain.java index f69cc6ff010..f983e624477 100644 --- a/Mage.Sets/src/mage/sets/guildpact/CausticRain.java +++ b/Mage.Sets/src/mage/sets/guildpact/CausticRain.java @@ -28,8 +28,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetLandPermanent; diff --git a/Mage.Sets/src/mage/sets/guildpact/Cremate.java b/Mage.Sets/src/mage/sets/guildpact/Cremate.java index 3b86b61774f..4f76d62f96a 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Cremate.java +++ b/Mage.Sets/src/mage/sets/guildpact/Cremate.java @@ -28,8 +28,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/guildpact/CrystalSeer.java b/Mage.Sets/src/mage/sets/guildpact/CrystalSeer.java index 77621e4bb43..30a4b00cf50 100644 --- a/Mage.Sets/src/mage/sets/guildpact/CrystalSeer.java +++ b/Mage.Sets/src/mage/sets/guildpact/CrystalSeer.java @@ -30,9 +30,9 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/guildpact/CullingSun.java b/Mage.Sets/src/mage/sets/guildpact/CullingSun.java index 9b1249c65cc..2e631286f6e 100644 --- a/Mage.Sets/src/mage/sets/guildpact/CullingSun.java +++ b/Mage.Sets/src/mage/sets/guildpact/CullingSun.java @@ -28,8 +28,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.filter.Filter; diff --git a/Mage.Sets/src/mage/sets/guildpact/DaggerclawImp.java b/Mage.Sets/src/mage/sets/guildpact/DaggerclawImp.java index f9ecb1fb582..9d9415a6bb2 100644 --- a/Mage.Sets/src/mage/sets/guildpact/DaggerclawImp.java +++ b/Mage.Sets/src/mage/sets/guildpact/DaggerclawImp.java @@ -29,8 +29,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/guildpact/DouseInGloom.java b/Mage.Sets/src/mage/sets/guildpact/DouseInGloom.java index 2d010b519d1..ed9ab5f02e5 100644 --- a/Mage.Sets/src/mage/sets/guildpact/DouseInGloom.java +++ b/Mage.Sets/src/mage/sets/guildpact/DouseInGloom.java @@ -28,8 +28,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/guildpact/DuneBroodNephilim.java b/Mage.Sets/src/mage/sets/guildpact/DuneBroodNephilim.java index 1acb1b9ab88..cdf44271d2a 100644 --- a/Mage.Sets/src/mage/sets/guildpact/DuneBroodNephilim.java +++ b/Mage.Sets/src/mage/sets/guildpact/DuneBroodNephilim.java @@ -28,8 +28,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; diff --git a/Mage.Sets/src/mage/sets/guildpact/Electrolyze.java b/Mage.Sets/src/mage/sets/guildpact/Electrolyze.java index 43c553920c9..532866c9dd5 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Electrolyze.java +++ b/Mage.Sets/src/mage/sets/guildpact/Electrolyze.java @@ -28,8 +28,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageMultiEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/guildpact/ExhumerThrull.java b/Mage.Sets/src/mage/sets/guildpact/ExhumerThrull.java index 592c8a63e1a..e4999ac9524 100644 --- a/Mage.Sets/src/mage/sets/guildpact/ExhumerThrull.java +++ b/Mage.Sets/src/mage/sets/guildpact/ExhumerThrull.java @@ -28,8 +28,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.ReturnToHandTargetEffect; diff --git a/Mage.Sets/src/mage/sets/guildpact/FeralAnimist.java b/Mage.Sets/src/mage/sets/guildpact/FeralAnimist.java index 8cf3f330214..59ccfa5179e 100644 --- a/Mage.Sets/src/mage/sets/guildpact/FeralAnimist.java +++ b/Mage.Sets/src/mage/sets/guildpact/FeralAnimist.java @@ -28,10 +28,10 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; diff --git a/Mage.Sets/src/mage/sets/guildpact/Frazzle.java b/Mage.Sets/src/mage/sets/guildpact/Frazzle.java index 5c2620a649d..f0eafd5e42a 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Frazzle.java +++ b/Mage.Sets/src/mage/sets/guildpact/Frazzle.java @@ -28,8 +28,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/guildpact/Gelectrode.java b/Mage.Sets/src/mage/sets/guildpact/Gelectrode.java index 00629dc8fea..449a480c52b 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Gelectrode.java +++ b/Mage.Sets/src/mage/sets/guildpact/Gelectrode.java @@ -28,9 +28,9 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +39,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.UntapSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -66,7 +67,7 @@ public class Gelectrode extends CardImpl { this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); this.addAbility(new SpellCastTriggeredAbility(new UntapSourceEffect(), filter, true)); diff --git a/Mage.Sets/src/mage/sets/guildpact/GhorClanBloodscale.java b/Mage.Sets/src/mage/sets/guildpact/GhorClanBloodscale.java index 10cfa13b779..9a1eaae7aa8 100644 --- a/Mage.Sets/src/mage/sets/guildpact/GhorClanBloodscale.java +++ b/Mage.Sets/src/mage/sets/guildpact/GhorClanBloodscale.java @@ -28,15 +28,17 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.ActivateOncePerTurnActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -53,7 +55,7 @@ public class GhorClanBloodscale extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(FirstStrikeAbility.getInstance()); - this.addAbility(new ActivateOncePerTurnActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Constants.Duration.EndOfTurn), new ManaCostsImpl("{3}{G}"))); + this.addAbility(new ActivateOncePerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("{3}{G}"))); } public GhorClanBloodscale(final GhorClanBloodscale card) { diff --git a/Mage.Sets/src/mage/sets/guildpact/GhorClanSavage.java b/Mage.Sets/src/mage/sets/guildpact/GhorClanSavage.java index c4e8876a6a6..b69773ea613 100644 --- a/Mage.Sets/src/mage/sets/guildpact/GhorClanSavage.java +++ b/Mage.Sets/src/mage/sets/guildpact/GhorClanSavage.java @@ -28,8 +28,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.BloodthirstAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/guildpact/GhostCouncilOfOrzhova.java b/Mage.Sets/src/mage/sets/guildpact/GhostCouncilOfOrzhova.java index 336203da561..f076a89f1c6 100644 --- a/Mage.Sets/src/mage/sets/guildpact/GhostCouncilOfOrzhova.java +++ b/Mage.Sets/src/mage/sets/guildpact/GhostCouncilOfOrzhova.java @@ -29,10 +29,10 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/guildpact/Ghostway.java b/Mage.Sets/src/mage/sets/guildpact/Ghostway.java index 005b983c4d3..f9a1b42957c 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Ghostway.java +++ b/Mage.Sets/src/mage/sets/guildpact/Ghostway.java @@ -28,10 +28,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.delayed.AtEndOfTurnDelayedTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -79,7 +77,7 @@ class GhostwayEffect extends OneShotEffect { } public GhostwayEffect() { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); staticText = "Exile each creature you control. Return those cards to the battlefield under their owner's control at the beginning of the next end step"; } @@ -94,7 +92,7 @@ class GhostwayEffect extends OneShotEffect { for (Permanent creature : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), game)) { if (creature != null) { if (creature.moveToExile(source.getSourceId(), "Ghostway Exile", source.getId(), game)) { - AtEndOfTurnDelayedTriggeredAbility delayedAbility = new AtEndOfTurnDelayedTriggeredAbility(new ReturnFromExileEffect(source.getSourceId(), Constants.Zone.BATTLEFIELD, true)); + AtEndOfTurnDelayedTriggeredAbility delayedAbility = new AtEndOfTurnDelayedTriggeredAbility(new ReturnFromExileEffect(source.getSourceId(), Zone.BATTLEFIELD, true)); delayedAbility.setSourceId(source.getSourceId()); delayedAbility.setControllerId(source.getControllerId()); game.addDelayedTriggeredAbility(delayedAbility); diff --git a/Mage.Sets/src/mage/sets/guildpact/GiantSolifuge.java b/Mage.Sets/src/mage/sets/guildpact/GiantSolifuge.java index 3ecd3720727..8997fe2f9b2 100644 --- a/Mage.Sets/src/mage/sets/guildpact/GiantSolifuge.java +++ b/Mage.Sets/src/mage/sets/guildpact/GiantSolifuge.java @@ -28,8 +28,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.ShroudAbility; diff --git a/Mage.Sets/src/mage/sets/guildpact/GodlessShrine.java b/Mage.Sets/src/mage/sets/guildpact/GodlessShrine.java index 1f4e64c6e0b..8a4f9abb960 100644 --- a/Mage.Sets/src/mage/sets/guildpact/GodlessShrine.java +++ b/Mage.Sets/src/mage/sets/guildpact/GodlessShrine.java @@ -29,8 +29,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.effects.common.TapSourceUnlessPaysEffect; diff --git a/Mage.Sets/src/mage/sets/guildpact/GravenDominator.java b/Mage.Sets/src/mage/sets/guildpact/GravenDominator.java index 804285819a8..95a4e20c47f 100644 --- a/Mage.Sets/src/mage/sets/guildpact/GravenDominator.java +++ b/Mage.Sets/src/mage/sets/guildpact/GravenDominator.java @@ -28,9 +28,9 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.continious.SetPowerToughnessAllEffect; diff --git a/Mage.Sets/src/mage/sets/guildpact/GruulGuildmage.java b/Mage.Sets/src/mage/sets/guildpact/GruulGuildmage.java index 2eea8a0edbc..bd99c830e14 100644 --- a/Mage.Sets/src/mage/sets/guildpact/GruulGuildmage.java +++ b/Mage.Sets/src/mage/sets/guildpact/GruulGuildmage.java @@ -28,9 +28,9 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +39,8 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.target.TargetPlayer; @@ -63,12 +65,12 @@ public class GruulGuildmage extends CardImpl { this.toughness = new MageInt(2); // {3}{R}, Sacrifice a land: Gruul Guildmage deals 2 damage to target player. - Ability firstAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{3}{R}")); + Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{3}{R}")); firstAbility.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); firstAbility.addTarget(new TargetPlayer(1)); this.addAbility(firstAbility); // {3}{G}: Target creature gets +2/+2 until end of turn. - Ability secondAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Constants.Duration.EndOfTurn), new ManaCostsImpl("{3}{G}")); + Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("{3}{G}")); secondAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/sets/guildpact/GruulNodorog.java b/Mage.Sets/src/mage/sets/guildpact/GruulNodorog.java index f55ac111f8a..b3c20ba1503 100644 --- a/Mage.Sets/src/mage/sets/guildpact/GruulNodorog.java +++ b/Mage.Sets/src/mage/sets/guildpact/GruulNodorog.java @@ -28,9 +28,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -55,7 +54,7 @@ public class GruulNodorog extends CardImpl { this.toughness = new MageInt(4); //{R}: Gruul Nodorog can't be blocked this turn except by two or more creatures. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(2, Constants.Duration.EndOfTurn), new ManaCostsImpl("{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(2, Duration.EndOfTurn), new ManaCostsImpl("{R}"))); } public GruulNodorog(final GruulNodorog card) { @@ -70,7 +69,7 @@ public class GruulNodorog extends CardImpl { class GruulNodorogEffect extends OneShotEffect { public GruulNodorogEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "each opponent loses 1 life. You gain life equal to the life lost this way"; } diff --git a/Mage.Sets/src/mage/sets/guildpact/GruulSignet.java b/Mage.Sets/src/mage/sets/guildpact/GruulSignet.java index a9d3e8b1bf2..2599b3270dd 100644 --- a/Mage.Sets/src/mage/sets/guildpact/GruulSignet.java +++ b/Mage.Sets/src/mage/sets/guildpact/GruulSignet.java @@ -28,15 +28,16 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -47,7 +48,7 @@ public class GruulSignet extends CardImpl { public GruulSignet(UUID ownerId) { super(ownerId, 150, "Gruul Signet", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "GPT"; - Ability ability = new SimpleManaAbility(Constants.Zone.BATTLEFIELD, new Mana(1, 1, 0, 0, 0, 0, 0), new GenericManaCost(1)); + Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(1, 1, 0, 0, 0, 0, 0), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/guildpact/GruulWarPlow.java b/Mage.Sets/src/mage/sets/guildpact/GruulWarPlow.java index ab83af5b3c7..6cd9931cc84 100644 --- a/Mage.Sets/src/mage/sets/guildpact/GruulWarPlow.java +++ b/Mage.Sets/src/mage/sets/guildpact/GruulWarPlow.java @@ -28,10 +28,10 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +40,7 @@ import mage.abilities.effects.common.continious.BecomesCreatureSourceEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.game.permanent.token.Token; @@ -51,8 +52,8 @@ public class GruulWarPlow extends CardImpl { public GruulWarPlow(UUID ownerId) { super(ownerId, 151, "Gruul War Plow", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{4}"); this.expansionSetCode = "GPT"; - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityControlledEffect(TrampleAbility.getInstance(), Constants.Duration.WhileOnBattlefield, new FilterCreaturePermanent()))); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new GruulWarPlowToken(), "", Duration.EndOfTurn), new ManaCostsImpl("{1}{R}{G}"))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent()))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new GruulWarPlowToken(), "", Duration.EndOfTurn), new ManaCostsImpl("{1}{R}{G}"))); } public GruulWarPlow(final GruulWarPlow card) { diff --git a/Mage.Sets/src/mage/sets/guildpact/HarrierGriffin.java b/Mage.Sets/src/mage/sets/guildpact/HarrierGriffin.java index e9ee1a6166a..78b7dfca7ae 100644 --- a/Mage.Sets/src/mage/sets/guildpact/HarrierGriffin.java +++ b/Mage.Sets/src/mage/sets/guildpact/HarrierGriffin.java @@ -28,15 +28,16 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.TapTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.target.common.TargetCreaturePermanent; /** @@ -53,7 +54,7 @@ public class HarrierGriffin extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new BeginningOfUpkeepTriggeredAbility(new TapTargetEffect(), Constants.TargetController.YOU, false); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new TapTargetEffect(), TargetController.YOU, false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/guildpact/HatchingPlans.java b/Mage.Sets/src/mage/sets/guildpact/HatchingPlans.java index b8cd64e6fd8..ac464621499 100644 --- a/Mage.Sets/src/mage/sets/guildpact/HatchingPlans.java +++ b/Mage.Sets/src/mage/sets/guildpact/HatchingPlans.java @@ -29,8 +29,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/guildpact/HypervoltGrasp.java b/Mage.Sets/src/mage/sets/guildpact/HypervoltGrasp.java index 3340bcb3d7d..7a0b5820723 100644 --- a/Mage.Sets/src/mage/sets/guildpact/HypervoltGrasp.java +++ b/Mage.Sets/src/mage/sets/guildpact/HypervoltGrasp.java @@ -28,9 +28,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -59,13 +58,13 @@ public class HypervoltGrasp extends CardImpl { this.color.setRed(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - Ability gainedAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); gainedAbility.addTarget(new TargetCreatureOrPlayer()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, Constants.AttachmentType.AURA))); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ManaCostsImpl("{1}{U}"))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ManaCostsImpl("{1}{U}"))); } public HypervoltGrasp(final HypervoltGrasp card) { diff --git a/Mage.Sets/src/mage/sets/guildpact/InvokeTheFiremind.java b/Mage.Sets/src/mage/sets/guildpact/InvokeTheFiremind.java index 62a295a224d..12c6dc9f05a 100644 --- a/Mage.Sets/src/mage/sets/guildpact/InvokeTheFiremind.java +++ b/Mage.Sets/src/mage/sets/guildpact/InvokeTheFiremind.java @@ -28,8 +28,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Mode; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DamageTargetEffect; diff --git a/Mage.Sets/src/mage/sets/guildpact/IzzetBoilerworks.java b/Mage.Sets/src/mage/sets/guildpact/IzzetBoilerworks.java index 5155418e700..20c8cf8657d 100644 --- a/Mage.Sets/src/mage/sets/guildpact/IzzetBoilerworks.java +++ b/Mage.Sets/src/mage/sets/guildpact/IzzetBoilerworks.java @@ -28,9 +28,9 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; diff --git a/Mage.Sets/src/mage/sets/guildpact/IzzetChronarch.java b/Mage.Sets/src/mage/sets/guildpact/IzzetChronarch.java index 723f7ed25ae..b10e1b56330 100644 --- a/Mage.Sets/src/mage/sets/guildpact/IzzetChronarch.java +++ b/Mage.Sets/src/mage/sets/guildpact/IzzetChronarch.java @@ -28,8 +28,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/guildpact/IzzetSignet.java b/Mage.Sets/src/mage/sets/guildpact/IzzetSignet.java index e8046fd063b..c4153836f0e 100644 --- a/Mage.Sets/src/mage/sets/guildpact/IzzetSignet.java +++ b/Mage.Sets/src/mage/sets/guildpact/IzzetSignet.java @@ -28,15 +28,16 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -47,7 +48,7 @@ public class IzzetSignet extends CardImpl { public IzzetSignet(UUID ownerId) { super(ownerId, 152, "Izzet Signet", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "GPT"; - Ability ability = new SimpleManaAbility(Constants.Zone.BATTLEFIELD, new Mana(1, 0, 1, 0, 0, 0, 0), new GenericManaCost(1)); + Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(1, 0, 1, 0, 0, 0, 0), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/guildpact/LionheartMaverick.java b/Mage.Sets/src/mage/sets/guildpact/LionheartMaverick.java index ad6443ad2a7..6c40a26159c 100644 --- a/Mage.Sets/src/mage/sets/guildpact/LionheartMaverick.java +++ b/Mage.Sets/src/mage/sets/guildpact/LionheartMaverick.java @@ -28,15 +28,17 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -53,7 +55,7 @@ public class LionheartMaverick extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(VigilanceAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 2, Constants.Duration.EndOfTurn), new ManaCostsImpl("{4}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 2, Duration.EndOfTurn), new ManaCostsImpl("{4}{W}"))); } public LionheartMaverick(final LionheartMaverick card) { diff --git a/Mage.Sets/src/mage/sets/guildpact/Mortify.java b/Mage.Sets/src/mage/sets/guildpact/Mortify.java index c08447c3d15..2f9a663fa7d 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Mortify.java +++ b/Mage.Sets/src/mage/sets/guildpact/Mortify.java @@ -28,8 +28,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/guildpact/NivMizzetTheFiremind.java b/Mage.Sets/src/mage/sets/guildpact/NivMizzetTheFiremind.java index 3ae6d611f9a..9e127bb3e33 100644 --- a/Mage.Sets/src/mage/sets/guildpact/NivMizzetTheFiremind.java +++ b/Mage.Sets/src/mage/sets/guildpact/NivMizzetTheFiremind.java @@ -28,9 +28,9 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DrawCardTriggeredAbility; @@ -40,6 +40,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; /** @@ -62,7 +63,7 @@ public class NivMizzetTheFiremind extends CardImpl { Ability ability = new DrawCardTriggeredAbility(new DamageTargetEffect(1), false); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new TapSourceCost())); } public NivMizzetTheFiremind(final NivMizzetTheFiremind card) { diff --git a/Mage.Sets/src/mage/sets/guildpact/OrzhovBasilica.java b/Mage.Sets/src/mage/sets/guildpact/OrzhovBasilica.java index c38c2a1efeb..858af10b147 100644 --- a/Mage.Sets/src/mage/sets/guildpact/OrzhovBasilica.java +++ b/Mage.Sets/src/mage/sets/guildpact/OrzhovBasilica.java @@ -28,9 +28,9 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; diff --git a/Mage.Sets/src/mage/sets/guildpact/OrzhovEuthanist.java b/Mage.Sets/src/mage/sets/guildpact/OrzhovEuthanist.java index 1a521287875..a930125044d 100644 --- a/Mage.Sets/src/mage/sets/guildpact/OrzhovEuthanist.java +++ b/Mage.Sets/src/mage/sets/guildpact/OrzhovEuthanist.java @@ -28,18 +28,16 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.HauntAbility; import mage.cards.CardImpl; -import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.WasDealtDamageThisTurnPredicate; import mage.target.Target; -import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/sets/guildpact/OrzhovPontiff.java b/Mage.Sets/src/mage/sets/guildpact/OrzhovPontiff.java index dadffbe783e..38f3e40db95 100644 --- a/Mage.Sets/src/mage/sets/guildpact/OrzhovPontiff.java +++ b/Mage.Sets/src/mage/sets/guildpact/OrzhovPontiff.java @@ -28,10 +28,10 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -39,7 +39,6 @@ import mage.abilities.effects.common.continious.BoostAllEffect; import mage.abilities.keyword.HauntAbility; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.ControllerPredicate; /** diff --git a/Mage.Sets/src/mage/sets/guildpact/OrzhovSignet.java b/Mage.Sets/src/mage/sets/guildpact/OrzhovSignet.java index c785c52017d..9e5d8070603 100644 --- a/Mage.Sets/src/mage/sets/guildpact/OrzhovSignet.java +++ b/Mage.Sets/src/mage/sets/guildpact/OrzhovSignet.java @@ -28,15 +28,16 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -47,7 +48,7 @@ public class OrzhovSignet extends CardImpl { public OrzhovSignet(UUID ownerId) { super(ownerId, 155, "Orzhov Signet", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "GPT"; - Ability ability = new SimpleManaAbility(Constants.Zone.BATTLEFIELD, new Mana(0, 0, 0, 1, 1, 0, 0), new GenericManaCost(1)); + Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(0, 0, 0, 1, 1, 0, 0), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/guildpact/OrzhovaTheChurchOfDeals.java b/Mage.Sets/src/mage/sets/guildpact/OrzhovaTheChurchOfDeals.java index 88161a57dc0..1526d95867b 100644 --- a/Mage.Sets/src/mage/sets/guildpact/OrzhovaTheChurchOfDeals.java +++ b/Mage.Sets/src/mage/sets/guildpact/OrzhovaTheChurchOfDeals.java @@ -28,9 +28,9 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -39,6 +39,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetPlayer; /** @@ -51,7 +52,7 @@ public class OrzhovaTheChurchOfDeals extends CardImpl { super(ownerId, 162, "Orzhova, the Church of Deals", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, ""); this.expansionSetCode = "GPT"; this.addAbility(new ColorlessManaAbility()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl("{3}{W}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl("{3}{W}{B}")); ability.addCost(new TapSourceCost()); ability.addEffect(new GainLifeEffect(1)); ability.addTarget(new TargetPlayer(1)); diff --git a/Mage.Sets/src/mage/sets/guildpact/OstiaryThrull.java b/Mage.Sets/src/mage/sets/guildpact/OstiaryThrull.java index ba61a1005c5..1bc2388446b 100644 --- a/Mage.Sets/src/mage/sets/guildpact/OstiaryThrull.java +++ b/Mage.Sets/src/mage/sets/guildpact/OstiaryThrull.java @@ -28,9 +28,9 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +38,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -53,7 +55,7 @@ public class OstiaryThrull extends CardImpl { this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/guildpact/Petrahydrox.java b/Mage.Sets/src/mage/sets/guildpact/Petrahydrox.java index 4a93b254f43..c7ec4451b1d 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Petrahydrox.java +++ b/Mage.Sets/src/mage/sets/guildpact/Petrahydrox.java @@ -28,8 +28,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BecomesTargetTriggeredAbility; import mage.abilities.effects.common.ReturnToHandSourceEffect; diff --git a/Mage.Sets/src/mage/sets/guildpact/PlaguedRusalka.java b/Mage.Sets/src/mage/sets/guildpact/PlaguedRusalka.java index 1b148d3db35..71d6af099a3 100644 --- a/Mage.Sets/src/mage/sets/guildpact/PlaguedRusalka.java +++ b/Mage.Sets/src/mage/sets/guildpact/PlaguedRusalka.java @@ -28,9 +28,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -54,7 +53,7 @@ public class PlaguedRusalka extends CardImpl { this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/guildpact/Quicken.java b/Mage.Sets/src/mage/sets/guildpact/Quicken.java index c7d1f9025d8..eef4a042bad 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Quicken.java +++ b/Mage.Sets/src/mage/sets/guildpact/Quicken.java @@ -30,12 +30,12 @@ package mage.sets.guildpact; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import mage.Constants.AsThoughEffectType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.WatcherScope; +import mage.constants.AsThoughEffectType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.WatcherScope; import mage.abilities.Ability; import mage.abilities.effects.AsThoughEffectImpl; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/guildpact/Repeal.java b/Mage.Sets/src/mage/sets/guildpact/Repeal.java index 990dab063c6..74027af3dab 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Repeal.java +++ b/Mage.Sets/src/mage/sets/guildpact/Repeal.java @@ -28,8 +28,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/guildpact/RestlessBones.java b/Mage.Sets/src/mage/sets/guildpact/RestlessBones.java index e05a01c71e1..9d3472884c0 100644 --- a/Mage.Sets/src/mage/sets/guildpact/RestlessBones.java +++ b/Mage.Sets/src/mage/sets/guildpact/RestlessBones.java @@ -28,9 +28,9 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +40,8 @@ import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -55,11 +57,11 @@ public class RestlessBones extends CardImpl { this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityTargetEffect(new SwampwalkAbility(), Constants.Duration.EndOfTurn), new ManaCostsImpl("{3}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new SwampwalkAbility(), Duration.EndOfTurn), new ManaCostsImpl("{3}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}"))); } public RestlessBones(final RestlessBones card) { diff --git a/Mage.Sets/src/mage/sets/guildpact/Runeboggle.java b/Mage.Sets/src/mage/sets/guildpact/Runeboggle.java index b909411473f..886a0d09c6f 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Runeboggle.java +++ b/Mage.Sets/src/mage/sets/guildpact/Runeboggle.java @@ -28,8 +28,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/guildpact/ScabClanMauler.java b/Mage.Sets/src/mage/sets/guildpact/ScabClanMauler.java index ad35c2e335f..3b779ea6b1d 100644 --- a/Mage.Sets/src/mage/sets/guildpact/ScabClanMauler.java +++ b/Mage.Sets/src/mage/sets/guildpact/ScabClanMauler.java @@ -28,8 +28,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.BloodthirstAbility; import mage.abilities.keyword.TrampleAbility; diff --git a/Mage.Sets/src/mage/sets/guildpact/ScorchedRusalka.java b/Mage.Sets/src/mage/sets/guildpact/ScorchedRusalka.java index ce250422a49..16dfeb24ecf 100644 --- a/Mage.Sets/src/mage/sets/guildpact/ScorchedRusalka.java +++ b/Mage.Sets/src/mage/sets/guildpact/ScorchedRusalka.java @@ -28,9 +28,9 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +38,8 @@ import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.target.TargetPlayer; import mage.target.common.TargetControlledCreaturePermanent; @@ -54,7 +56,7 @@ public class ScorchedRusalka extends CardImpl { this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1), new ColoredManaCost(Constants.ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/guildpact/ShadowLance.java b/Mage.Sets/src/mage/sets/guildpact/ShadowLance.java index 2ed29431a37..518dfab85d1 100644 --- a/Mage.Sets/src/mage/sets/guildpact/ShadowLance.java +++ b/Mage.Sets/src/mage/sets/guildpact/ShadowLance.java @@ -29,9 +29,7 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -60,11 +58,11 @@ public class ShadowLance extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), Constants.AttachmentType.AURA))); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2, Constants.Duration.EndOfTurn), new ManaCostsImpl("{1}{B}"))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("{1}{B}"))); } public ShadowLance(final ShadowLance card) { diff --git a/Mage.Sets/src/mage/sets/guildpact/SilhanaLedgewalker.java b/Mage.Sets/src/mage/sets/guildpact/SilhanaLedgewalker.java index 2b51111bc09..db9a2fa3494 100644 --- a/Mage.Sets/src/mage/sets/guildpact/SilhanaLedgewalker.java +++ b/Mage.Sets/src/mage/sets/guildpact/SilhanaLedgewalker.java @@ -29,10 +29,10 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +40,7 @@ import mage.abilities.effects.RestrictionEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; @@ -62,7 +63,7 @@ public class SilhanaLedgewalker extends CardImpl { this.addAbility(HexproofAbility.getInstance()); // Silhana Ledgewalker can't be blocked except by creatures with flying. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new SilhanaLedgewalkerEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SilhanaLedgewalkerEffect())); } public SilhanaLedgewalker (final SilhanaLedgewalker card) { diff --git a/Mage.Sets/src/mage/sets/guildpact/SkarrgTheRagePits.java b/Mage.Sets/src/mage/sets/guildpact/SkarrgTheRagePits.java index 9edf461cbca..4a6db604994 100644 --- a/Mage.Sets/src/mage/sets/guildpact/SkarrgTheRagePits.java +++ b/Mage.Sets/src/mage/sets/guildpact/SkarrgTheRagePits.java @@ -28,9 +28,9 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -40,6 +40,8 @@ import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.TrampleAbility; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -52,9 +54,9 @@ public class SkarrgTheRagePits extends CardImpl { super(ownerId, 163, "Skarrg, the Rage Pits", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, ""); this.expansionSetCode = "GPT"; this.addAbility(new ColorlessManaAbility()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Constants.Duration.EndOfTurn), new ManaCostsImpl("{R}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{R}{G}")); ability.addCost(new TapSourceCost()); - ability.addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Constants.Duration.EndOfTurn)); + ability.addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/guildpact/SkarrganPitSkulk.java b/Mage.Sets/src/mage/sets/guildpact/SkarrganPitSkulk.java index 07de8af255b..dd3e28507be 100644 --- a/Mage.Sets/src/mage/sets/guildpact/SkarrganPitSkulk.java +++ b/Mage.Sets/src/mage/sets/guildpact/SkarrganPitSkulk.java @@ -28,9 +28,9 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.CantBeBlockedByCreaturesWithLessPowerEffect; diff --git a/Mage.Sets/src/mage/sets/guildpact/SkeletalVampire.java b/Mage.Sets/src/mage/sets/guildpact/SkeletalVampire.java index d9c14228719..9e7a197f869 100644 --- a/Mage.Sets/src/mage/sets/guildpact/SkeletalVampire.java +++ b/Mage.Sets/src/mage/sets/guildpact/SkeletalVampire.java @@ -28,9 +28,9 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -42,6 +42,7 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.Token; @@ -69,10 +70,10 @@ public class SkeletalVampire extends CardImpl { this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new BatToken(), 2))); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new BatToken(), 2), new ManaCostsImpl("{3}{B}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new BatToken(), 2), new ManaCostsImpl("{3}{B}{B}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false))); this.addAbility(ability); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false)))); } public SkeletalVampire(final SkeletalVampire card) { diff --git a/Mage.Sets/src/mage/sets/guildpact/SkyriderTrainee.java b/Mage.Sets/src/mage/sets/guildpact/SkyriderTrainee.java index df15567da25..c5779cbb909 100644 --- a/Mage.Sets/src/mage/sets/guildpact/SkyriderTrainee.java +++ b/Mage.Sets/src/mage/sets/guildpact/SkyriderTrainee.java @@ -28,10 +28,10 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EnchantedCondition; diff --git a/Mage.Sets/src/mage/sets/guildpact/SmogsteedRider.java b/Mage.Sets/src/mage/sets/guildpact/SmogsteedRider.java index 7ef7dd11d10..d62b0b9510d 100644 --- a/Mage.Sets/src/mage/sets/guildpact/SmogsteedRider.java +++ b/Mage.Sets/src/mage/sets/guildpact/SmogsteedRider.java @@ -28,14 +28,15 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterAttackingCreature; /** @@ -52,7 +53,7 @@ public class SmogsteedRider extends CardImpl { this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new AttacksTriggeredAbility(new GainAbilityControlledEffect(FearAbility.getInstance(), Constants.Duration.EndOfTurn, new FilterAttackingCreature(), true), false)); + this.addAbility(new AttacksTriggeredAbility(new GainAbilityControlledEffect(FearAbility.getInstance(), Duration.EndOfTurn, new FilterAttackingCreature(), true), false)); } public SmogsteedRider(final SmogsteedRider card) { diff --git a/Mage.Sets/src/mage/sets/guildpact/StarvedRusalka.java b/Mage.Sets/src/mage/sets/guildpact/StarvedRusalka.java index fc282e2fb0a..fe6ed916480 100644 --- a/Mage.Sets/src/mage/sets/guildpact/StarvedRusalka.java +++ b/Mage.Sets/src/mage/sets/guildpact/StarvedRusalka.java @@ -28,9 +28,9 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +38,8 @@ import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -53,7 +55,7 @@ public class StarvedRusalka extends CardImpl { this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainLifeEffect(1), new ColoredManaCost(Constants.ColoredManaSymbol.G)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/guildpact/SteamVents.java b/Mage.Sets/src/mage/sets/guildpact/SteamVents.java index e7589f5b959..83e45b56fe2 100644 --- a/Mage.Sets/src/mage/sets/guildpact/SteamVents.java +++ b/Mage.Sets/src/mage/sets/guildpact/SteamVents.java @@ -29,8 +29,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.effects.common.TapSourceUnlessPaysEffect; diff --git a/Mage.Sets/src/mage/sets/guildpact/StitchInTime.java b/Mage.Sets/src/mage/sets/guildpact/StitchInTime.java index e38cb5c78ab..d2fe748f03b 100644 --- a/Mage.Sets/src/mage/sets/guildpact/StitchInTime.java +++ b/Mage.Sets/src/mage/sets/guildpact/StitchInTime.java @@ -28,9 +28,9 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/guildpact/StompingGround.java b/Mage.Sets/src/mage/sets/guildpact/StompingGround.java index 7e486a5eb41..bc539efd118 100644 --- a/Mage.Sets/src/mage/sets/guildpact/StompingGround.java +++ b/Mage.Sets/src/mage/sets/guildpact/StompingGround.java @@ -29,8 +29,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.effects.common.TapSourceUnlessPaysEffect; diff --git a/Mage.Sets/src/mage/sets/guildpact/StreetbreakerWurm.java b/Mage.Sets/src/mage/sets/guildpact/StreetbreakerWurm.java index c6b09fac213..d330f55faa0 100644 --- a/Mage.Sets/src/mage/sets/guildpact/StreetbreakerWurm.java +++ b/Mage.Sets/src/mage/sets/guildpact/StreetbreakerWurm.java @@ -28,8 +28,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/guildpact/TiborAndLumia.java b/Mage.Sets/src/mage/sets/guildpact/TiborAndLumia.java index 90d7e82ef65..b0c580c03f2 100644 --- a/Mage.Sets/src/mage/sets/guildpact/TiborAndLumia.java +++ b/Mage.Sets/src/mage/sets/guildpact/TiborAndLumia.java @@ -28,9 +28,9 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -39,6 +39,7 @@ import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.FilterSpell; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -72,7 +73,7 @@ public class TiborAndLumia extends CardImpl { this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); - Ability firstAbility = new SpellCastTriggeredAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn), filterBlue, false); + Ability firstAbility = new SpellCastTriggeredAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), filterBlue, false); firstAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(firstAbility); this.addAbility(new SpellCastTriggeredAbility(new DamageAllEffect(1, filter), filterRed, false)); diff --git a/Mage.Sets/src/mage/sets/guildpact/TorchDrake.java b/Mage.Sets/src/mage/sets/guildpact/TorchDrake.java index ff68d7cb544..0210b0dbeca 100644 --- a/Mage.Sets/src/mage/sets/guildpact/TorchDrake.java +++ b/Mage.Sets/src/mage/sets/guildpact/TorchDrake.java @@ -30,15 +30,16 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** @@ -55,7 +56,7 @@ public class TorchDrake extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Constants.Duration.EndOfTurn), new ManaCostsImpl("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{R}"))); } public TorchDrake (final TorchDrake card) { diff --git a/Mage.Sets/src/mage/sets/guildpact/WeeDragonauts.java b/Mage.Sets/src/mage/sets/guildpact/WeeDragonauts.java index 538fb7a6e7c..0c058f51386 100644 --- a/Mage.Sets/src/mage/sets/guildpact/WeeDragonauts.java +++ b/Mage.Sets/src/mage/sets/guildpact/WeeDragonauts.java @@ -28,14 +28,15 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -63,7 +64,7 @@ public class WeeDragonauts extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SpellCastTriggeredAbility(new BoostSourceEffect(2, 0, Constants.Duration.EndOfTurn), filter, false)); + this.addAbility(new SpellCastTriggeredAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), filter, false)); } public WeeDragonauts(final WeeDragonauts card) { diff --git a/Mage.Sets/src/mage/sets/guildpact/WildCantor.java b/Mage.Sets/src/mage/sets/guildpact/WildCantor.java index 7dc1f04976e..4fcc2e7f2e5 100644 --- a/Mage.Sets/src/mage/sets/guildpact/WildCantor.java +++ b/Mage.Sets/src/mage/sets/guildpact/WildCantor.java @@ -28,8 +28,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.mana.AnyColorManaAbility; diff --git a/Mage.Sets/src/mage/sets/guildpact/Wildsize.java b/Mage.Sets/src/mage/sets/guildpact/Wildsize.java index 0ca726d5818..ae63cae0b0e 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Wildsize.java +++ b/Mage.Sets/src/mage/sets/guildpact/Wildsize.java @@ -28,14 +28,15 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -48,8 +49,8 @@ public class Wildsize extends CardImpl { super(ownerId, 98, "Wildsize", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{G}"); this.expansionSetCode = "GPT"; this.color.setGreen(true); - this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Constants.Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/guildpact/WitchMawNephilim.java b/Mage.Sets/src/mage/sets/guildpact/WitchMawNephilim.java index 18b1b429ff5..b7970f77dce 100644 --- a/Mage.Sets/src/mage/sets/guildpact/WitchMawNephilim.java +++ b/Mage.Sets/src/mage/sets/guildpact/WitchMawNephilim.java @@ -28,9 +28,9 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.SpellCastTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/guildpact/Withstand.java b/Mage.Sets/src/mage/sets/guildpact/Withstand.java index 9d649d9dfed..fc3d828a5e6 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Withstand.java +++ b/Mage.Sets/src/mage/sets/guildpact/Withstand.java @@ -28,12 +28,13 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.PreventDamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreatureOrPlayer; /** @@ -46,7 +47,7 @@ public class Withstand extends CardImpl { super(ownerId, 21, "Withstand", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "GPT"; this.color.setWhite(true); - this.getSpellAbility().addEffect(new PreventDamageTargetEffect(Constants.Duration.EndOfTurn, 3)); + this.getSpellAbility().addEffect(new PreventDamageTargetEffect(Duration.EndOfTurn, 3)); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); // Prevent the next 3 damage that would be dealt to target creature or player this turn. diff --git a/Mage.Sets/src/mage/sets/guildpact/WreakHavoc.java b/Mage.Sets/src/mage/sets/guildpact/WreakHavoc.java index db75a73e390..6863cac2f6a 100644 --- a/Mage.Sets/src/mage/sets/guildpact/WreakHavoc.java +++ b/Mage.Sets/src/mage/sets/guildpact/WreakHavoc.java @@ -28,8 +28,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.CantCounterAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/guildpact/WurmweaverCoil.java b/Mage.Sets/src/mage/sets/guildpact/WurmweaverCoil.java index ee45a5d3512..d2da667a63f 100644 --- a/Mage.Sets/src/mage/sets/guildpact/WurmweaverCoil.java +++ b/Mage.Sets/src/mage/sets/guildpact/WurmweaverCoil.java @@ -28,9 +28,8 @@ package mage.sets.guildpact; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -68,11 +67,11 @@ public class WurmweaverCoil extends CardImpl { this.color.setGreen(true); TargetPermanent auraTarget = new TargetCreaturePermanent(filter); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Benefit)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(6, 6, Constants.Duration.WhileOnBattlefield))); - Ability activatedAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new WurmweaverCoilToken(), 1), new ManaCostsImpl("{G}{G}{G}")); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(6, 6, Duration.WhileOnBattlefield))); + Ability activatedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new WurmweaverCoilToken(), 1), new ManaCostsImpl("{G}{G}{G}")); activatedAbility.addCost(new SacrificeSourceCost()); this.addAbility(activatedAbility); } diff --git a/Mage.Sets/src/mage/sets/homelands/DwarvenTrader.java b/Mage.Sets/src/mage/sets/homelands/DwarvenTrader.java index 21566da7d2f..cbb5d453a63 100644 --- a/Mage.Sets/src/mage/sets/homelands/DwarvenTrader.java +++ b/Mage.Sets/src/mage/sets/homelands/DwarvenTrader.java @@ -28,8 +28,8 @@ package mage.sets.homelands; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/homelands/EbonyRhino.java b/Mage.Sets/src/mage/sets/homelands/EbonyRhino.java index aff713173fd..7c42de98548 100644 --- a/Mage.Sets/src/mage/sets/homelands/EbonyRhino.java +++ b/Mage.Sets/src/mage/sets/homelands/EbonyRhino.java @@ -28,8 +28,8 @@ package mage.sets.homelands; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/homelands/MerchantScroll.java b/Mage.Sets/src/mage/sets/homelands/MerchantScroll.java index b2de08b580f..62b9cd0f9e6 100644 --- a/Mage.Sets/src/mage/sets/homelands/MerchantScroll.java +++ b/Mage.Sets/src/mage/sets/homelands/MerchantScroll.java @@ -28,7 +28,7 @@ package mage.sets.homelands; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/homelands/WillowFaerie.java b/Mage.Sets/src/mage/sets/homelands/WillowFaerie.java index 306fd6cfb43..9bffa4ce897 100644 --- a/Mage.Sets/src/mage/sets/homelands/WillowFaerie.java +++ b/Mage.Sets/src/mage/sets/homelands/WillowFaerie.java @@ -28,8 +28,8 @@ package mage.sets.homelands; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/iceage/BalduvianBears.java b/Mage.Sets/src/mage/sets/iceage/BalduvianBears.java index 06b1942e2a1..1b3aa67a9ee 100644 --- a/Mage.Sets/src/mage/sets/iceage/BalduvianBears.java +++ b/Mage.Sets/src/mage/sets/iceage/BalduvianBears.java @@ -28,8 +28,8 @@ package mage.sets.iceage; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/iceage/CircleOfProtectionBlack.java b/Mage.Sets/src/mage/sets/iceage/CircleOfProtectionBlack.java index a17d94b339c..67c1c6020ed 100644 --- a/Mage.Sets/src/mage/sets/iceage/CircleOfProtectionBlack.java +++ b/Mage.Sets/src/mage/sets/iceage/CircleOfProtectionBlack.java @@ -28,9 +28,8 @@ package mage.sets.iceage; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -58,7 +57,7 @@ public class CircleOfProtectionBlack extends CardImpl { this.color.setWhite(true); // {1}: The next time a black source of your choice would deal damage to you this turn, prevent that damage. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CircleOfProtectionBlackEffect() , new ManaCostsImpl("1"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CircleOfProtectionBlackEffect() , new ManaCostsImpl("1"))); } public CircleOfProtectionBlack(final CircleOfProtectionBlack card) { @@ -80,7 +79,7 @@ class CircleOfProtectionBlackEffect extends PreventionEffectImpl { this.color.setWhite(true); // {1}: The next time a blue source of your choice would deal damage to you this turn, prevent that damage. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CircleOfProtectionBlueEffect() , new ManaCostsImpl("1"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CircleOfProtectionBlueEffect() , new ManaCostsImpl("1"))); } @@ -78,7 +77,7 @@ class CircleOfProtectionBlueEffect extends PreventionEffectImpl { this.color.setWhite(true); // {1}: The next time a green source of your choice would deal damage to you this turn, prevent that damage. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CircleOfProtectionGreenEffect() , new ManaCostsImpl("1"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CircleOfProtectionGreenEffect() , new ManaCostsImpl("1"))); } @@ -79,7 +78,7 @@ class CircleOfProtectionGreenEffect extends PreventionEffectImpl { this.color.setWhite(true); // {1}: The next time a red source of your choice would deal damage to you this turn, prevent that damage. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CircleOfProtectionRedEffect() , new ManaCostsImpl("1"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CircleOfProtectionRedEffect() , new ManaCostsImpl("1"))); } @@ -79,7 +78,7 @@ class CircleOfProtectionRedEffect extends PreventionEffectImpl { this.color.setWhite(true); // {1}: The next time a white source of your choice would deal damage to you this turn, prevent that damage. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CircleOfProtectionWhiteEffect() , new ManaCostsImpl("1"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CircleOfProtectionWhiteEffect() , new ManaCostsImpl("1"))); } @@ -79,7 +78,7 @@ class CircleOfProtectionWhiteEffect extends PreventionEffectImpl { this.toughness = new MageInt(1); // {tap}: Add {G}{G} to your mana pool. - this.addAbility(new SimpleManaAbility(Constants.Zone.BATTLEFIELD, new Mana(0, 2, 0, 0, 0, 0, 0), new TapSourceCost())); + this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(0, 2, 0, 0, 0, 0, 0), new TapSourceCost())); } public FyndhornElder(final FyndhornElder card) { diff --git a/Mage.Sets/src/mage/sets/iceage/FyndhornElves.java b/Mage.Sets/src/mage/sets/iceage/FyndhornElves.java index ad488fc8ddd..f74d6854f2f 100644 --- a/Mage.Sets/src/mage/sets/iceage/FyndhornElves.java +++ b/Mage.Sets/src/mage/sets/iceage/FyndhornElves.java @@ -28,11 +28,10 @@ package mage.sets.iceage; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/iceage/GlacialChasm.java b/Mage.Sets/src/mage/sets/iceage/GlacialChasm.java index d0012b163e8..6b54b69bcd4 100644 --- a/Mage.Sets/src/mage/sets/iceage/GlacialChasm.java +++ b/Mage.Sets/src/mage/sets/iceage/GlacialChasm.java @@ -28,11 +28,8 @@ package mage.sets.iceage; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -69,9 +66,9 @@ public class GlacialChasm extends CardImpl { // When Glacial Chasm enters the battlefield, sacrifice a land. this.addAbility(new EntersBattlefieldTriggeredAbility(new SacrificeControllerEffect(new FilterLandPermanent(), 1, ""))); // Creatures you control can't attack. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new CantAttackEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackEffect())); // Prevent all damage that would be dealt to you. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new PreventAllDamageToControllerEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventAllDamageToControllerEffect(Duration.WhileOnBattlefield))); } public GlacialChasm(final GlacialChasm card) { @@ -113,7 +110,7 @@ class SacrificeControllerEffect extends OneShotEffect return false; } - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); int amount = count.calculate(game, source); int realCount = game.getBattlefield().countAll(filter, player.getId(), game); diff --git a/Mage.Sets/src/mage/sets/iceage/ImposingVisage.java b/Mage.Sets/src/mage/sets/iceage/ImposingVisage.java index 77b297588c6..05bd3bb35e6 100644 --- a/Mage.Sets/src/mage/sets/iceage/ImposingVisage.java +++ b/Mage.Sets/src/mage/sets/iceage/ImposingVisage.java @@ -28,11 +28,11 @@ package mage.sets.iceage; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; diff --git a/Mage.Sets/src/mage/sets/iceage/Lhurgoyf.java b/Mage.Sets/src/mage/sets/iceage/Lhurgoyf.java index 3ce4d6e5839..fb85de74f03 100644 --- a/Mage.Sets/src/mage/sets/iceage/Lhurgoyf.java +++ b/Mage.Sets/src/mage/sets/iceage/Lhurgoyf.java @@ -28,9 +28,8 @@ package mage.sets.iceage; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -57,7 +56,7 @@ public class Lhurgoyf extends CardImpl { this.toughness = new MageInt(0); // Lhurgoyf's power is equal to the number of creature cards in all graveyards and its toughness is equal to that number plus 1. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new LhurgoyfEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LhurgoyfEffect())); } public Lhurgoyf(final Lhurgoyf card) { @@ -76,7 +75,7 @@ class LhurgoyfEffect extends ContinuousEffectImpl { public LhurgoyfEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Layer.PTChangingEffects_7, Constants.SubLayer.SetPT_7b, Constants.Outcome.BoostCreature); + super(Duration.WhileOnBattlefield, Layer.PTChangingEffects_7, SubLayer.SetPT_7b, Outcome.BoostCreature); staticText = "{this}'s power is equal to the number of creature cards in all graveyards and its toughness is equal to that number plus 1"; } diff --git a/Mage.Sets/src/mage/sets/iceage/MoorFiend.java b/Mage.Sets/src/mage/sets/iceage/MoorFiend.java index ef05d551aba..7310fb55a7c 100644 --- a/Mage.Sets/src/mage/sets/iceage/MoorFiend.java +++ b/Mage.Sets/src/mage/sets/iceage/MoorFiend.java @@ -28,8 +28,8 @@ package mage.sets.iceage; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/iceage/PaleBears.java b/Mage.Sets/src/mage/sets/iceage/PaleBears.java index 602ac7fc452..e5c077dcacb 100644 --- a/Mage.Sets/src/mage/sets/iceage/PaleBears.java +++ b/Mage.Sets/src/mage/sets/iceage/PaleBears.java @@ -28,8 +28,8 @@ package mage.sets.iceage; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.IslandwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/iceage/PestilenceRats.java b/Mage.Sets/src/mage/sets/iceage/PestilenceRats.java index 2f451f5e0e3..128e560ca44 100644 --- a/Mage.Sets/src/mage/sets/iceage/PestilenceRats.java +++ b/Mage.Sets/src/mage/sets/iceage/PestilenceRats.java @@ -28,10 +28,10 @@ package mage.sets.iceage; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; diff --git a/Mage.Sets/src/mage/sets/iceage/PolarKraken.java b/Mage.Sets/src/mage/sets/iceage/PolarKraken.java index f1bc0c72c1c..85e5e9994c2 100644 --- a/Mage.Sets/src/mage/sets/iceage/PolarKraken.java +++ b/Mage.Sets/src/mage/sets/iceage/PolarKraken.java @@ -28,8 +28,8 @@ package mage.sets.iceage; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.costs.common.SacrificeTargetCost; diff --git a/Mage.Sets/src/mage/sets/iceage/PygmyAllosaurus.java b/Mage.Sets/src/mage/sets/iceage/PygmyAllosaurus.java index dbfda9b19f4..616f150464c 100644 --- a/Mage.Sets/src/mage/sets/iceage/PygmyAllosaurus.java +++ b/Mage.Sets/src/mage/sets/iceage/PygmyAllosaurus.java @@ -28,8 +28,8 @@ package mage.sets.iceage; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/iceage/Pyroblast.java b/Mage.Sets/src/mage/sets/iceage/Pyroblast.java index a4adf7dbbb3..3f60f1b8853 100644 --- a/Mage.Sets/src/mage/sets/iceage/Pyroblast.java +++ b/Mage.Sets/src/mage/sets/iceage/Pyroblast.java @@ -28,17 +28,14 @@ package mage.sets.iceage; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.ObjectColor; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; -import mage.filter.FilterPermanent; -import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.ColorPredicate; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -80,7 +77,7 @@ public class Pyroblast extends CardImpl { class CounterTargetEffect extends OneShotEffect { public CounterTargetEffect() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); } public CounterTargetEffect(final CounterTargetEffect effect) { @@ -112,7 +109,7 @@ class DestroyTargetEffect extends OneShotEffect { public DestroyTargetEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); } public DestroyTargetEffect(final DestroyTargetEffect effect) { diff --git a/Mage.Sets/src/mage/sets/iceage/Regeneration.java b/Mage.Sets/src/mage/sets/iceage/Regeneration.java index e7e3b17fd2d..433f3001de4 100644 --- a/Mage.Sets/src/mage/sets/iceage/Regeneration.java +++ b/Mage.Sets/src/mage/sets/iceage/Regeneration.java @@ -28,9 +28,8 @@ package mage.sets.iceage; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -57,11 +56,11 @@ public class Regeneration extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // {G}: Regenerate enchanted creature. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateAttachedEffect(Constants.AttachmentType.AURA), new ManaCostsImpl("{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new ManaCostsImpl("{G}"))); } public Regeneration(final Regeneration card) { diff --git a/Mage.Sets/src/mage/sets/iceage/SilverErne.java b/Mage.Sets/src/mage/sets/iceage/SilverErne.java index e49c82e2f04..ed9728261a2 100644 --- a/Mage.Sets/src/mage/sets/iceage/SilverErne.java +++ b/Mage.Sets/src/mage/sets/iceage/SilverErne.java @@ -28,8 +28,8 @@ package mage.sets.iceage; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TrampleAbility; diff --git a/Mage.Sets/src/mage/sets/iceage/TinderWall.java b/Mage.Sets/src/mage/sets/iceage/TinderWall.java index 4950c7f744c..dba488dd32f 100644 --- a/Mage.Sets/src/mage/sets/iceage/TinderWall.java +++ b/Mage.Sets/src/mage/sets/iceage/TinderWall.java @@ -27,9 +27,8 @@ */ package mage.sets.iceage; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -41,6 +40,8 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.DefenderAbility; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; +import mage.constants.WatcherScope; +import mage.constants.Zone; import mage.filter.common.FilterAttackingCreature; import mage.filter.predicate.Predicate; import mage.game.Game; @@ -72,11 +73,11 @@ public class TinderWall extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // Sacrifice Tinder Wall: Add {R}{R} to your mana pool. - this.addAbility(new SimpleManaAbility(Constants.Zone.BATTLEFIELD, new BasicManaEffect(Mana.RedMana(2)), new SacrificeSourceCost())); + this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new BasicManaEffect(Mana.RedMana(2)), new SacrificeSourceCost())); // {R}, Sacrifice Tinder Wall: Tinder Wall deals 2 damage to target creature it's blocking. FilterAttackingCreature filter = new FilterAttackingCreature("creature it's blocking"); filter.add(new BlockingByPredicate(this.getId())); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{R}")); ability.addTarget(new TargetCreaturePermanent(filter)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); @@ -101,7 +102,7 @@ class BlockedByWatcher extends WatcherImpl { public List blockedByWatcher = new ArrayList(); public BlockedByWatcher() { - super("BlockedByWatcher", Constants.WatcherScope.CARD); + super("BlockedByWatcher", WatcherScope.CARD); } public BlockedByWatcher(final BlockedByWatcher watcher) { diff --git a/Mage.Sets/src/mage/sets/iceage/TorGiant.java b/Mage.Sets/src/mage/sets/iceage/TorGiant.java index d005e4e10ac..94828c2cb82 100644 --- a/Mage.Sets/src/mage/sets/iceage/TorGiant.java +++ b/Mage.Sets/src/mage/sets/iceage/TorGiant.java @@ -28,8 +28,8 @@ package mage.sets.iceage; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/iceage/WildGrowth.java b/Mage.Sets/src/mage/sets/iceage/WildGrowth.java index e25c55a34d1..80124a6fb7f 100644 --- a/Mage.Sets/src/mage/sets/iceage/WildGrowth.java +++ b/Mage.Sets/src/mage/sets/iceage/WildGrowth.java @@ -28,9 +28,9 @@ package mage.sets.iceage; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.Ability; import mage.abilities.effects.common.AttachEffect; @@ -38,6 +38,8 @@ import mage.abilities.effects.common.ManaEffect; import mage.abilities.keyword.EnchantAbility; import mage.abilities.mana.TriggeredManaAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -61,7 +63,7 @@ public class WildGrowth extends CardImpl { // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Whenever enchanted land is tapped for mana, its controller adds {G} to his or her mana pool. @@ -82,7 +84,7 @@ class WildGrowthTriggeredAbility extends TriggeredManaAbility { this.addAbility(FlyingAbility.getInstance()); // Wind Spirit can't be blocked except by two or more creatures. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(2))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(2))); } public WindSpirit(final WindSpirit card) { diff --git a/Mage.Sets/src/mage/sets/iceage/WrathOfMaritLage.java b/Mage.Sets/src/mage/sets/iceage/WrathOfMaritLage.java index 47ace86968a..5bde861e128 100644 --- a/Mage.Sets/src/mage/sets/iceage/WrathOfMaritLage.java +++ b/Mage.Sets/src/mage/sets/iceage/WrathOfMaritLage.java @@ -29,10 +29,8 @@ package mage.sets.iceage; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.Mode; @@ -64,7 +62,7 @@ public class WrathOfMaritLage extends CardImpl { // When Wrath of Marit Lage enters the battlefield, tap all red creatures. this.addAbility(new EntersBattlefieldTriggeredAbility(new TapAllEffect())); // Red creatures don't untap during their controllers' untap steps. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new DontUntapEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapEffect())); } public WrathOfMaritLage(final WrathOfMaritLage card) { @@ -114,7 +112,7 @@ class DontUntapEffect extends ReplacementEffectImpl { public DontUntapEffect() { - super(Constants.Duration.WhileOnBattlefield, Outcome.Detriment); + super(Duration.WhileOnBattlefield, Outcome.Detriment); } public DontUntapEffect(final DontUntapEffect effect) { @@ -140,7 +138,7 @@ class DontUntapEffect extends ReplacementEffectImpl { @Override public boolean applies(GameEvent event, Ability source, Game game) { Permanent creature = game.getPermanent(event.getTargetId()); - if (game.getTurn().getStepType() == Constants.PhaseStep.UNTAP && event.getType() == GameEvent.EventType.UNTAP + if (game.getTurn().getStepType() == PhaseStep.UNTAP && event.getType() == GameEvent.EventType.UNTAP && creature != null && creature.getCardType().contains(CardType.CREATURE) && creature.getColor().isRed() && creature.getControllerId() == event.getPlayerId()) { return true; } diff --git a/Mage.Sets/src/mage/sets/iceage/ZuranOrb.java b/Mage.Sets/src/mage/sets/iceage/ZuranOrb.java index 703e17a33bb..dca293d3abf 100644 --- a/Mage.Sets/src/mage/sets/iceage/ZuranOrb.java +++ b/Mage.Sets/src/mage/sets/iceage/ZuranOrb.java @@ -28,13 +28,14 @@ package mage.sets.iceage; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.target.common.TargetControlledPermanent; @@ -49,7 +50,7 @@ public class ZuranOrb extends CardImpl { this.expansionSetCode = "ICE"; // Sacrifice a land: You gain 2 life. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainLifeEffect(2), new SacrificeTargetCost(new TargetControlledPermanent(new FilterControlledLandPermanent())))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), new SacrificeTargetCost(new TargetControlledPermanent(new FilterControlledLandPermanent())))); } public ZuranOrb(final ZuranOrb card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/AbattoirGhoul.java b/Mage.Sets/src/mage/sets/innistrad/AbattoirGhoul.java index 65c71381f4b..9fdc64b4164 100644 --- a/Mage.Sets/src/mage/sets/innistrad/AbattoirGhoul.java +++ b/Mage.Sets/src/mage/sets/innistrad/AbattoirGhoul.java @@ -27,13 +27,13 @@ */ package mage.sets.innistrad; -import mage.Constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; diff --git a/Mage.Sets/src/mage/sets/innistrad/AbbeyGriffin.java b/Mage.Sets/src/mage/sets/innistrad/AbbeyGriffin.java index 4a0fc7a5391..ba1347db5c8 100644 --- a/Mage.Sets/src/mage/sets/innistrad/AbbeyGriffin.java +++ b/Mage.Sets/src/mage/sets/innistrad/AbbeyGriffin.java @@ -29,8 +29,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/AltarsReap.java b/Mage.Sets/src/mage/sets/innistrad/AltarsReap.java index 98e79039c09..50336964bd5 100644 --- a/Mage.Sets/src/mage/sets/innistrad/AltarsReap.java +++ b/Mage.Sets/src/mage/sets/innistrad/AltarsReap.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/innistrad/AmbushViper.java b/Mage.Sets/src/mage/sets/innistrad/AmbushViper.java index 93d33f11a60..3be9aed605e 100644 --- a/Mage.Sets/src/mage/sets/innistrad/AmbushViper.java +++ b/Mage.Sets/src/mage/sets/innistrad/AmbushViper.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.DeathtouchAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/AncientGrudge.java b/Mage.Sets/src/mage/sets/innistrad/AncientGrudge.java index c2e04940dae..ee181e05c88 100644 --- a/Mage.Sets/src/mage/sets/innistrad/AncientGrudge.java +++ b/Mage.Sets/src/mage/sets/innistrad/AncientGrudge.java @@ -27,13 +27,13 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; +import mage.constants.TimingRule; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; @@ -62,7 +62,7 @@ public class AncientGrudge extends CardImpl { this.getSpellAbility().addTarget(new TargetPermanent(filter)); // Flashback {G} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{G}"), Constants.TimingRule.INSTANT)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{G}"), TimingRule.INSTANT)); } public AncientGrudge(final AncientGrudge card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/AngelOfFlightAlabaster.java b/Mage.Sets/src/mage/sets/innistrad/AngelOfFlightAlabaster.java index 1d034ac5e77..c0b28927266 100644 --- a/Mage.Sets/src/mage/sets/innistrad/AngelOfFlightAlabaster.java +++ b/Mage.Sets/src/mage/sets/innistrad/AngelOfFlightAlabaster.java @@ -1,12 +1,14 @@ package mage.sets.innistrad; -import mage.Constants; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.Target; @@ -22,7 +24,7 @@ public class AngelOfFlightAlabaster extends CardImpl { } public AngelOfFlightAlabaster(UUID ownerId) { - super(ownerId, 2, "Angel of Flight Alabaster", Constants.Rarity.RARE, new Constants.CardType[]{Constants.CardType.CREATURE}, "{4}{W}"); + super(ownerId, 2, "Angel of Flight Alabaster", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{W}"); this.expansionSetCode = "ISD"; this.subtype.add("Angel"); this.color.setWhite(true); @@ -30,7 +32,7 @@ public class AngelOfFlightAlabaster extends CardImpl { this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new BeginningOfUpkeepTriggeredAbility(new ReturnToHandTargetEffect(), Constants.TargetController.YOU, false); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new ReturnToHandTargetEffect(), TargetController.YOU, false); Target target = new TargetCardInYourGraveyard(filter); target.setRequired(true); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/sets/innistrad/AngelicOverseer.java b/Mage.Sets/src/mage/sets/innistrad/AngelicOverseer.java index e5520b3b084..7cd23077b3b 100644 --- a/Mage.Sets/src/mage/sets/innistrad/AngelicOverseer.java +++ b/Mage.Sets/src/mage/sets/innistrad/AngelicOverseer.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.ControlsPermanentCondition; @@ -38,6 +38,7 @@ import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.*; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -68,9 +69,9 @@ public class AngelicOverseer extends CardImpl { // As long as you control a Human, Angelic Overseer has hexproof and is indestructible. ConditionalContinousEffect effect1 = new ConditionalContinousEffect(new GainAbilitySourceEffect(HexproofAbility.getInstance()), new ControlsPermanentCondition(filter), rule1); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect1)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect1)); ConditionalContinousEffect effect2 = new ConditionalContinousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance()), new ControlsPermanentCondition(filter), rule2); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect2)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect2)); } diff --git a/Mage.Sets/src/mage/sets/innistrad/ArmoredSkaab.java b/Mage.Sets/src/mage/sets/innistrad/ArmoredSkaab.java index 57eeb882ec4..78edbdf8d94 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ArmoredSkaab.java +++ b/Mage.Sets/src/mage/sets/innistrad/ArmoredSkaab.java @@ -28,10 +28,10 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/ArmyOfTheDamned.java b/Mage.Sets/src/mage/sets/innistrad/ArmyOfTheDamned.java index 67803965a8f..94ebc646914 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ArmyOfTheDamned.java +++ b/Mage.Sets/src/mage/sets/innistrad/ArmyOfTheDamned.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TimingRule; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TimingRule; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlashbackAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/AshmouthHound.java b/Mage.Sets/src/mage/sets/innistrad/AshmouthHound.java index 9a5b2c695f3..40270cba41c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/AshmouthHound.java +++ b/Mage.Sets/src/mage/sets/innistrad/AshmouthHound.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BlocksOrBecomesBlockedByCreatureTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/AvacynianPriest.java b/Mage.Sets/src/mage/sets/innistrad/AvacynianPriest.java index 5c7c162d8e7..d20eefc4423 100644 --- a/Mage.Sets/src/mage/sets/innistrad/AvacynianPriest.java +++ b/Mage.Sets/src/mage/sets/innistrad/AvacynianPriest.java @@ -27,9 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,6 +36,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.target.common.TargetCreaturePermanent; import mage.filter.predicate.Predicates; @@ -66,7 +66,7 @@ public class AvacynianPriest extends CardImpl { this.toughness = new MageInt(2); // {1}, {T}: Tap target non-Human creature. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/innistrad/AvacynsPilgrim.java b/Mage.Sets/src/mage/sets/innistrad/AvacynsPilgrim.java index cd46d924247..c97c5e141a3 100644 --- a/Mage.Sets/src/mage/sets/innistrad/AvacynsPilgrim.java +++ b/Mage.Sets/src/mage/sets/innistrad/AvacynsPilgrim.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/innistrad/BackFromTheBrink.java b/Mage.Sets/src/mage/sets/innistrad/BackFromTheBrink.java index d4ec8036f13..6b26a2bb35e 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BackFromTheBrink.java +++ b/Mage.Sets/src/mage/sets/innistrad/BackFromTheBrink.java @@ -28,11 +28,11 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; import mage.abilities.costs.CostImpl; @@ -131,7 +131,7 @@ class BackFromTheBrinkCost extends CostImpl { Player player = game.getPlayer(controllerId); if (player != null) { Card card = player.getGraveyard().get(targets.getFirstTarget(), game); - if (card != null && card.moveToZone(Constants.Zone.EXILED, sourceId, game, false)) { + if (card != null && card.moveToZone(Zone.EXILED, sourceId, game, false)) { ability.getEffects().get(0).setTargetPointer(new FixedTarget(card.getId())); paid = card.getManaCost().pay(ability, game, sourceId, controllerId, noMana); } diff --git a/Mage.Sets/src/mage/sets/innistrad/BalefireDragon.java b/Mage.Sets/src/mage/sets/innistrad/BalefireDragon.java index 9910eec4a57..3f785b8bdcc 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BalefireDragon.java +++ b/Mage.Sets/src/mage/sets/innistrad/BalefireDragon.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/BaneOfHanweir.java b/Mage.Sets/src/mage/sets/innistrad/BaneOfHanweir.java index 9edb86430b2..46e2e2a2dbf 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BaneOfHanweir.java +++ b/Mage.Sets/src/mage/sets/innistrad/BaneOfHanweir.java @@ -27,9 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.AttacksEachTurnStaticAbility; @@ -39,6 +38,7 @@ import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import java.util.UUID; @@ -64,7 +64,7 @@ public class BaneOfHanweir extends CardImpl { this.addAbility(new AttacksEachTurnStaticAbility()); // At the beginning of each upkeep, if a player cast two or more spells last turn, transform Bane of Hanweir. - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), Constants.TargetController.ANY, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), TargetController.ANY, false); this.addAbility(new ConditionalTriggeredAbility(ability, TwoOrMoreSpellsWereCastLastTurnCondition.getInstance(), TransformAbility.TWO_OR_MORE_SPELLS_TRANSFORM_RULE)); } diff --git a/Mage.Sets/src/mage/sets/innistrad/BattlegroundGeist.java b/Mage.Sets/src/mage/sets/innistrad/BattlegroundGeist.java index ef9b79f1e49..9b102bc8bba 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BattlegroundGeist.java +++ b/Mage.Sets/src/mage/sets/innistrad/BattlegroundGeist.java @@ -27,14 +27,15 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -63,7 +64,7 @@ public class BattlegroundGeist extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Other Spirit creatures you control get +1/+0. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Constants.Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, filter, true))); } public BattlegroundGeist(final BattlegroundGeist card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/BitterheartWitch.java b/Mage.Sets/src/mage/sets/innistrad/BitterheartWitch.java index 93e6aeb3371..458f55edc43 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BitterheartWitch.java +++ b/Mage.Sets/src/mage/sets/innistrad/BitterheartWitch.java @@ -29,10 +29,10 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/BlasphemousAct.java b/Mage.Sets/src/mage/sets/innistrad/BlasphemousAct.java index 4056e0533a5..32da32935f2 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BlasphemousAct.java +++ b/Mage.Sets/src/mage/sets/innistrad/BlasphemousAct.java @@ -29,12 +29,13 @@ package mage.sets.innistrad; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -82,7 +83,7 @@ public class BlasphemousAct extends CardImpl { class BlasphemousActEffect extends OneShotEffect { public BlasphemousActEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "{this} costs {1} less to cast for each creature on the battlefield.\n {this} deals 13 damage to each creature"; } diff --git a/Mage.Sets/src/mage/sets/innistrad/BlazingTorch.java b/Mage.Sets/src/mage/sets/innistrad/BlazingTorch.java index 3e8f96904cc..cabfe2e85d5 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BlazingTorch.java +++ b/Mage.Sets/src/mage/sets/innistrad/BlazingTorch.java @@ -28,7 +28,7 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/innistrad/BloodcrazedNeonate.java b/Mage.Sets/src/mage/sets/innistrad/BloodcrazedNeonate.java index e180ccd7d49..c807a6535be 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BloodcrazedNeonate.java +++ b/Mage.Sets/src/mage/sets/innistrad/BloodcrazedNeonate.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/BloodgiftDemon.java b/Mage.Sets/src/mage/sets/innistrad/BloodgiftDemon.java index 66b6f1889d9..71acee820e2 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BloodgiftDemon.java +++ b/Mage.Sets/src/mage/sets/innistrad/BloodgiftDemon.java @@ -27,8 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/BloodlineKeeper.java b/Mage.Sets/src/mage/sets/innistrad/BloodlineKeeper.java index 4cfa8fbe559..5224f8691c7 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BloodlineKeeper.java +++ b/Mage.Sets/src/mage/sets/innistrad/BloodlineKeeper.java @@ -29,9 +29,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -68,10 +69,10 @@ public class BloodlineKeeper extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {tap}: Put a 2/2 black Vampire creature token with flying onto the battlefield. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new VampireToken()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new VampireToken()), new TapSourceCost())); // {B}: Transform Bloodline Keeper. Activate this ability only if you control five or more Vampires. this.addAbility(new TransformAbility()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new TransformSourceEffect(true), new ColoredManaCost(Constants.ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(true), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new ControlFiveVampiresCost()); this.addAbility(ability); } @@ -89,7 +90,7 @@ public class BloodlineKeeper extends CardImpl { class VampireToken extends Token { VampireToken() { super("Vampire", "a 2/2 black Vampire creature token with flying"); - cardType.add(Constants.CardType.CREATURE); + cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add("Vampire"); power = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/innistrad/BondsOfFaith.java b/Mage.Sets/src/mage/sets/innistrad/BondsOfFaith.java index 15da6a47cfa..4ad5d355c6d 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BondsOfFaith.java +++ b/Mage.Sets/src/mage/sets/innistrad/BondsOfFaith.java @@ -28,9 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; @@ -63,13 +62,13 @@ public class BondsOfFaith extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Neutral)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Neutral)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature gets +2/+2 as long as it's a Human. Otherwise, it can't attack or block. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEquippedEffect(2, 2), new EquippedHasSubtypeCondition("Human"), rule))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BondsOfFaithEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEquippedEffect(2, 2), new EquippedHasSubtypeCondition("Human"), rule))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BondsOfFaithEffect())); } public BondsOfFaith(final BondsOfFaith card) { @@ -87,7 +86,7 @@ class BondsOfFaithEffect extends RestrictionEffect { private static final Condition condition = new EquippedHasSubtypeCondition("Human"); public BondsOfFaithEffect() { - super(Constants.Duration.WhileOnBattlefield); + super(Duration.WhileOnBattlefield); staticText = "Otherwise, it can't attack or block"; } diff --git a/Mage.Sets/src/mage/sets/innistrad/BoneyardWurm.java b/Mage.Sets/src/mage/sets/innistrad/BoneyardWurm.java index 536fcbed36d..b644d0b7ff4 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BoneyardWurm.java +++ b/Mage.Sets/src/mage/sets/innistrad/BoneyardWurm.java @@ -27,15 +27,15 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount; import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterCreatureCard; import java.util.UUID; @@ -53,7 +53,7 @@ public class BoneyardWurm extends CardImpl { // Boneyard Wurm's power and toughness are each equal to the number of creature cards in your graveyard. DynamicValue value = new CardsInControllerGraveyardCount(new FilterCreatureCard()); - this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(value, Constants.Duration.EndOfGame))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(value, Duration.EndOfGame))); } public BoneyardWurm(final BoneyardWurm card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/BrainWeevil.java b/Mage.Sets/src/mage/sets/innistrad/BrainWeevil.java index 867834fb864..727b6c3fe19 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BrainWeevil.java +++ b/Mage.Sets/src/mage/sets/innistrad/BrainWeevil.java @@ -29,9 +29,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.DiscardTargetEffect; import mage.abilities.keyword.IntimidateAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetPlayer; /** @@ -58,7 +58,7 @@ public class BrainWeevil extends CardImpl { this.addAbility(IntimidateAbility.getInstance()); // Sacrifice Brain Weevil: Target player discards two cards. Activate this ability only any time you could cast a sorcery. - Ability ability = new ActivateAsSorceryActivatedAbility(Constants.Zone.BATTLEFIELD, new DiscardTargetEffect(2), new SacrificeSourceCost()); + Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(2), new SacrificeSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/Bramblecrush.java b/Mage.Sets/src/mage/sets/innistrad/Bramblecrush.java index 8493d02cdcf..b8a4015afc5 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Bramblecrush.java +++ b/Mage.Sets/src/mage/sets/innistrad/Bramblecrush.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/innistrad/BrimstoneVolley.java b/Mage.Sets/src/mage/sets/innistrad/BrimstoneVolley.java index f843c6759bb..0ff7d8ad34d 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BrimstoneVolley.java +++ b/Mage.Sets/src/mage/sets/innistrad/BrimstoneVolley.java @@ -27,12 +27,12 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -71,7 +71,7 @@ public class BrimstoneVolley extends CardImpl { class BrimstoneVolleyEffect extends OneShotEffect { public BrimstoneVolleyEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "{this} deals 3 damage to target creature or player.\n Morbid - {this} deals 5 damage to that creature or player instead if a creature died this turn"; } diff --git a/Mage.Sets/src/mage/sets/innistrad/BumpInTheNight.java b/Mage.Sets/src/mage/sets/innistrad/BumpInTheNight.java index bb2e93d48e1..bc7e2fd5d22 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BumpInTheNight.java +++ b/Mage.Sets/src/mage/sets/innistrad/BumpInTheNight.java @@ -27,13 +27,13 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; +import mage.constants.TimingRule; import mage.target.common.TargetOpponent; import java.util.UUID; @@ -54,7 +54,7 @@ public class BumpInTheNight extends CardImpl { this.getSpellAbility().addTarget(new TargetOpponent()); // Flashback {5}{R} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{5}{R}"), Constants.TimingRule.SORCERY)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{5}{R}"), TimingRule.SORCERY)); } public BumpInTheNight(final BumpInTheNight card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/BurningVengeance.java b/Mage.Sets/src/mage/sets/innistrad/BurningVengeance.java index 9168e42ea5e..a413242186c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BurningVengeance.java +++ b/Mage.Sets/src/mage/sets/innistrad/BurningVengeance.java @@ -27,12 +27,12 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.common.TargetCreatureOrPlayer; @@ -69,7 +69,7 @@ class BurningVengeanceOnCastAbility extends TriggeredAbilityImpl { this.subtype.add("Equipment"); // Equipped creature gets +3/+0. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(3, 0))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 0))); // As long as equipped creature is a Human, it has lifelink. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ConditionalContinousEffect(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), Constants.AttachmentType.EQUIPMENT), new EquippedHasSubtypeCondition("Human"), staticText))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.EQUIPMENT), new EquippedHasSubtypeCondition("Human"), staticText))); // Equip {3} - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(3))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3))); } diff --git a/Mage.Sets/src/mage/sets/innistrad/CacklingCounterpart.java b/Mage.Sets/src/mage/sets/innistrad/CacklingCounterpart.java index f6c0e7328a1..b17243edd95 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CacklingCounterpart.java +++ b/Mage.Sets/src/mage/sets/innistrad/CacklingCounterpart.java @@ -28,11 +28,11 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TimingRule; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TimingRule; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/CaravanVigil.java b/Mage.Sets/src/mage/sets/innistrad/CaravanVigil.java index 92d062e471e..7f2ed591342 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CaravanVigil.java +++ b/Mage.Sets/src/mage/sets/innistrad/CaravanVigil.java @@ -28,10 +28,10 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.condition.common.MorbidCondition; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/CellarDoor.java b/Mage.Sets/src/mage/sets/innistrad/CellarDoor.java index 5ff7832c335..5ce583959eb 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CellarDoor.java +++ b/Mage.Sets/src/mage/sets/innistrad/CellarDoor.java @@ -28,10 +28,10 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/innistrad/ChampionOfTheParish.java b/Mage.Sets/src/mage/sets/innistrad/ChampionOfTheParish.java index afd8009fdb1..f5cf5131b7e 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ChampionOfTheParish.java +++ b/Mage.Sets/src/mage/sets/innistrad/ChampionOfTheParish.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/ChapelGeist.java b/Mage.Sets/src/mage/sets/innistrad/ChapelGeist.java index 72e9af332d5..30180b63b00 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ChapelGeist.java +++ b/Mage.Sets/src/mage/sets/innistrad/ChapelGeist.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/innistrad/CharmbreakerDevils.java b/Mage.Sets/src/mage/sets/innistrad/CharmbreakerDevils.java index 1e25616c4b1..d498f854b26 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CharmbreakerDevils.java +++ b/Mage.Sets/src/mage/sets/innistrad/CharmbreakerDevils.java @@ -29,11 +29,11 @@ package mage.sets.innistrad; import java.util.Random; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/CivilizedScholar.java b/Mage.Sets/src/mage/sets/innistrad/CivilizedScholar.java index 7f78f666f0c..89bafd059cd 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CivilizedScholar.java +++ b/Mage.Sets/src/mage/sets/innistrad/CivilizedScholar.java @@ -27,9 +27,7 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -66,7 +64,7 @@ public class CivilizedScholar extends CardImpl { this.toughness = new MageInt(1); // {tap}: Draw a card, then discard a card. If a creature card is discarded this way, untap Civilized Scholar, then transform it. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CivilizedScholarEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CivilizedScholarEffect(), new TapSourceCost())); this.addAbility(new TransformAbility()); this.addWatcher(new HomicidalBruteWatcher()); @@ -85,7 +83,7 @@ public class CivilizedScholar extends CardImpl { class HomicidalBruteWatcher extends WatcherImpl { public HomicidalBruteWatcher() { - super("HomicidalBruteAttacked", Constants.WatcherScope.CARD); + super("HomicidalBruteAttacked", WatcherScope.CARD); } public HomicidalBruteWatcher(final HomicidalBruteWatcher watcher) { @@ -110,7 +108,7 @@ class HomicidalBruteWatcher extends WatcherImpl { class CivilizedScholarEffect extends OneShotEffect { public CivilizedScholarEffect() { - super(Constants.Outcome.DrawCard); + super(Outcome.DrawCard); staticText = "Draw a card, then discard a card"; } @@ -129,7 +127,7 @@ class CivilizedScholarEffect extends OneShotEffect { if (player != null) { player.drawCards(1, game); TargetDiscard target = new TargetDiscard(player.getId()); - player.choose(Constants.Outcome.Discard, target, source.getSourceId(), game); + player.choose(Outcome.Discard, target, source.getSourceId(), game); Card card = player.getHand().get(target.getFirstTarget(), game); if (card != null) { player.discard(card, source, game); diff --git a/Mage.Sets/src/mage/sets/innistrad/Claustrophobia.java b/Mage.Sets/src/mage/sets/innistrad/Claustrophobia.java index 1f1db3812cb..900c64a2f3b 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Claustrophobia.java +++ b/Mage.Sets/src/mage/sets/innistrad/Claustrophobia.java @@ -29,10 +29,10 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/ClifftopRetreat.java b/Mage.Sets/src/mage/sets/innistrad/ClifftopRetreat.java index bed121f05ce..fa70242084c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ClifftopRetreat.java +++ b/Mage.Sets/src/mage/sets/innistrad/ClifftopRetreat.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; diff --git a/Mage.Sets/src/mage/sets/innistrad/CloisteredYouth.java b/Mage.Sets/src/mage/sets/innistrad/CloisteredYouth.java index 7f08575778e..96a26e20903 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CloisteredYouth.java +++ b/Mage.Sets/src/mage/sets/innistrad/CloisteredYouth.java @@ -29,14 +29,14 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; /** * @@ -58,7 +58,7 @@ public class CloisteredYouth extends CardImpl { // At the beginning of your upkeep, you may transform Cloistered Youth. this.addAbility(new TransformAbility()); - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), Constants.TargetController.YOU, true)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), TargetController.YOU, true)); } public CloisteredYouth(final CloisteredYouth card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/CobbledWings.java b/Mage.Sets/src/mage/sets/innistrad/CobbledWings.java index b0d54f8c508..8cbb9dc68fa 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CobbledWings.java +++ b/Mage.Sets/src/mage/sets/innistrad/CobbledWings.java @@ -29,11 +29,11 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/CorpseLunge.java b/Mage.Sets/src/mage/sets/innistrad/CorpseLunge.java index 0e64426cf62..33ad47594f5 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CorpseLunge.java +++ b/Mage.Sets/src/mage/sets/innistrad/CorpseLunge.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.common.ExileFromGraveCost; diff --git a/Mage.Sets/src/mage/sets/innistrad/CreepingRenaissance.java b/Mage.Sets/src/mage/sets/innistrad/CreepingRenaissance.java index 6a89b3728f1..586933b2444 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CreepingRenaissance.java +++ b/Mage.Sets/src/mage/sets/innistrad/CreepingRenaissance.java @@ -29,9 +29,7 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; @@ -59,7 +57,7 @@ public class CreepingRenaissance extends CardImpl { this.getSpellAbility().addEffect(new CreepingRenaissanceEffect()); // Flashback {5}{G}{G} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{5}{G}{G}"), Constants.TimingRule.SORCERY)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{5}{G}{G}"), TimingRule.SORCERY)); } public CreepingRenaissance(final CreepingRenaissance card) { @@ -75,7 +73,7 @@ public class CreepingRenaissance extends CardImpl { class CreepingRenaissanceEffect extends OneShotEffect { public CreepingRenaissanceEffect() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); staticText = "Choose a permanent type. Return all cards of the chosen type from your graveyard to your hand"; } @@ -96,7 +94,7 @@ class CreepingRenaissanceEffect extends OneShotEffect typeChoice.getChoices().add(CardType.LAND.toString()); typeChoice.getChoices().add(CardType.PLANESWALKER.toString()); - while (!controller.choose(Constants.Outcome.ReturnToHand, typeChoice, game)); + while (!controller.choose(Outcome.ReturnToHand, typeChoice, game)); String typeName = typeChoice.getChoice(); CardType chosenType = null; @@ -108,7 +106,7 @@ class CreepingRenaissanceEffect extends OneShotEffect if (chosenType != null) { for (Card card : controller.getGraveyard().getCards(game)) { if (card.getCardType().contains(chosenType)) { - card.moveToZone(Constants.Zone.HAND, source.getSourceId(), game, false); + card.moveToZone(Zone.HAND, source.getSourceId(), game, false); } } return true; diff --git a/Mage.Sets/src/mage/sets/innistrad/CreepyDoll.java b/Mage.Sets/src/mage/sets/innistrad/CreepyDoll.java index bc3dec0ea2e..4f804e7d2d0 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CreepyDoll.java +++ b/Mage.Sets/src/mage/sets/innistrad/CreepyDoll.java @@ -26,15 +26,16 @@ * or implied, of BetaSteward_at_googlemail.com. */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.DamagedCreatureEvent; import mage.game.events.GameEvent; @@ -77,7 +78,7 @@ public class CreepyDoll extends CardImpl { class CreepyDollTriggeredAbility extends TriggeredAbilityImpl { CreepyDollTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new CreepyDollEffect()); + super(Zone.BATTLEFIELD, new CreepyDollEffect()); } CreepyDollTriggeredAbility(final CreepyDollTriggeredAbility ability) { @@ -109,7 +110,7 @@ class CreepyDollTriggeredAbility extends TriggeredAbilityImpl { CreepyDollEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); staticText = ""; } diff --git a/Mage.Sets/src/mage/sets/innistrad/CrosswayVampire.java b/Mage.Sets/src/mage/sets/innistrad/CrosswayVampire.java index 6a79b141316..a92103ed532 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CrosswayVampire.java +++ b/Mage.Sets/src/mage/sets/innistrad/CrosswayVampire.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/Curiosity.java b/Mage.Sets/src/mage/sets/innistrad/Curiosity.java index b6c5778bddd..e5986ea03ed 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Curiosity.java +++ b/Mage.Sets/src/mage/sets/innistrad/Curiosity.java @@ -27,15 +27,16 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; @@ -61,7 +62,7 @@ public class Curiosity extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Neutral)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Neutral)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); @@ -83,7 +84,7 @@ public class Curiosity extends CardImpl { class CuriosityAbility extends TriggeredAbilityImpl { public CuriosityAbility() { - super(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), true); + super(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), true); } public CuriosityAbility(final CuriosityAbility ability) { diff --git a/Mage.Sets/src/mage/sets/innistrad/CurseOfDeathsHold.java b/Mage.Sets/src/mage/sets/innistrad/CurseOfDeathsHold.java index 3bf52bbd5bd..845f36512aa 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CurseOfDeathsHold.java +++ b/Mage.Sets/src/mage/sets/innistrad/CurseOfDeathsHold.java @@ -27,13 +27,13 @@ */ package mage.sets.innistrad; -import mage.Constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.AttachEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/sets/innistrad/CurseOfOblivion.java b/Mage.Sets/src/mage/sets/innistrad/CurseOfOblivion.java index 80f216290c7..8c0d2f73d9c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CurseOfOblivion.java +++ b/Mage.Sets/src/mage/sets/innistrad/CurseOfOblivion.java @@ -28,16 +28,17 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.ExileFromZoneTargetEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterCard; import mage.game.Game; import mage.game.events.GameEvent; @@ -64,7 +65,7 @@ public class CurseOfOblivion extends CardImpl { // Enchant player TargetPlayer target = new TargetPlayer(); this.getSpellAbility().addTarget(target); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(target.getTargetName()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/innistrad/CurseOfStalkedPrey.java b/Mage.Sets/src/mage/sets/innistrad/CurseOfStalkedPrey.java index be8105760a2..9430e39a1e1 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CurseOfStalkedPrey.java +++ b/Mage.Sets/src/mage/sets/innistrad/CurseOfStalkedPrey.java @@ -28,16 +28,17 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; @@ -65,7 +66,7 @@ public class CurseOfStalkedPrey extends CardImpl { // Enchant player TargetPlayer target = new TargetPlayer(); this.getSpellAbility().addTarget(target); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(target.getTargetName()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/innistrad/CurseOfTheBloodyTome.java b/Mage.Sets/src/mage/sets/innistrad/CurseOfTheBloodyTome.java index 5dd5e6c92b5..351cea75786 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CurseOfTheBloodyTome.java +++ b/Mage.Sets/src/mage/sets/innistrad/CurseOfTheBloodyTome.java @@ -28,10 +28,10 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.AttachEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/CurseOfTheNightlyHunt.java b/Mage.Sets/src/mage/sets/innistrad/CurseOfTheNightlyHunt.java index a2ff6dd7b0f..e83f04722c6 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CurseOfTheNightlyHunt.java +++ b/Mage.Sets/src/mage/sets/innistrad/CurseOfTheNightlyHunt.java @@ -28,11 +28,11 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.RequirementEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/CurseOfThePiercedHeart.java b/Mage.Sets/src/mage/sets/innistrad/CurseOfThePiercedHeart.java index 005a393e3bd..e7c98e6e204 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CurseOfThePiercedHeart.java +++ b/Mage.Sets/src/mage/sets/innistrad/CurseOfThePiercedHeart.java @@ -28,16 +28,17 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -63,7 +64,7 @@ public class CurseOfThePiercedHeart extends CardImpl { // Enchant player TargetPlayer target = new TargetPlayer(); this.getSpellAbility().addTarget(target); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(target.getTargetName()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/innistrad/DarkthicketWolf.java b/Mage.Sets/src/mage/sets/innistrad/DarkthicketWolf.java index fe813863d71..4757a09ec4f 100644 --- a/Mage.Sets/src/mage/sets/innistrad/DarkthicketWolf.java +++ b/Mage.Sets/src/mage/sets/innistrad/DarkthicketWolf.java @@ -29,14 +29,15 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.ActivateOncePerTurnActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -54,7 +55,7 @@ public class DarkthicketWolf extends CardImpl { this.toughness = new MageInt(2); // {2}{G}: Darkthicket Wolf gets +2/+2 until end of turn. Activate this ability only once each turn. - this.addAbility(new ActivateOncePerTurnActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Constants.Duration.EndOfTurn), new ManaCostsImpl("{2}{G}"))); + this.addAbility(new ActivateOncePerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("{2}{G}"))); } public DarkthicketWolf(final DarkthicketWolf card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/DaybreakRanger.java b/Mage.Sets/src/mage/sets/innistrad/DaybreakRanger.java index 554a9a77b6b..e0c8d52e240 100644 --- a/Mage.Sets/src/mage/sets/innistrad/DaybreakRanger.java +++ b/Mage.Sets/src/mage/sets/innistrad/DaybreakRanger.java @@ -28,10 +28,10 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/DeadWeight.java b/Mage.Sets/src/mage/sets/innistrad/DeadWeight.java index 6c397aafbbb..886bae43dcf 100644 --- a/Mage.Sets/src/mage/sets/innistrad/DeadWeight.java +++ b/Mage.Sets/src/mage/sets/innistrad/DeadWeight.java @@ -29,9 +29,7 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -57,11 +55,11 @@ public class DeadWeight extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Neutral)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Neutral)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature gets -2/-2. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(-2, -2, Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-2, -2, Duration.WhileOnBattlefield))); } public DeadWeight(final DeadWeight card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/DearlyDeparted.java b/Mage.Sets/src/mage/sets/innistrad/DearlyDeparted.java index abf2810b1fc..286c8fb0c3c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/DearlyDeparted.java +++ b/Mage.Sets/src/mage/sets/innistrad/DearlyDeparted.java @@ -28,9 +28,8 @@ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -42,6 +41,8 @@ import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; @@ -70,7 +71,7 @@ public class DearlyDeparted extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // As long as Dearly Departed is in your graveyard, each Human creature you control enters the battlefield with an additional +1/+1 counter on it. - this.addAbility(new SimpleStaticAbility(Constants.Zone.GRAVEYARD, + this.addAbility(new SimpleStaticAbility(Zone.GRAVEYARD, new EntersBattlefieldEffect(new AddCountersTargetEffect(CounterType.P1P1.createInstance(1)), ruleText))); } @@ -96,7 +97,7 @@ class EntersBattlefieldEffect extends ReplacementEffectImpl { class DelverOfSecretsAbility extends TriggeredAbilityImpl { public DelverOfSecretsAbility() { - super(Constants.Zone.BATTLEFIELD, new TransformSourceEffect(true), false); + super(Zone.BATTLEFIELD, new TransformSourceEffect(true), false); } public DelverOfSecretsAbility(DelverOfSecretsAbility ability) { diff --git a/Mage.Sets/src/mage/sets/innistrad/DemonmailHauberk.java b/Mage.Sets/src/mage/sets/innistrad/DemonmailHauberk.java index 815c11ec9bc..be904faf15e 100644 --- a/Mage.Sets/src/mage/sets/innistrad/DemonmailHauberk.java +++ b/Mage.Sets/src/mage/sets/innistrad/DemonmailHauberk.java @@ -29,14 +29,15 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -51,10 +52,10 @@ public class DemonmailHauberk extends CardImpl { this.subtype.add("Equipment"); // Equip - Sacrifice a creature. - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); // Equipped creature gets +4/+2. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(4, 2))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(4, 2))); } public DemonmailHauberk(final DemonmailHauberk card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/DerangedAssistant.java b/Mage.Sets/src/mage/sets/innistrad/DerangedAssistant.java index 75166d67a63..532784e6cf3 100644 --- a/Mage.Sets/src/mage/sets/innistrad/DerangedAssistant.java +++ b/Mage.Sets/src/mage/sets/innistrad/DerangedAssistant.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.common.PutTopCardOfYourLibraryToGraveyardCost; import mage.abilities.mana.ColorlessManaAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/DesperateRavings.java b/Mage.Sets/src/mage/sets/innistrad/DesperateRavings.java index bc8ad5be75e..c3b80cbdf95 100644 --- a/Mage.Sets/src/mage/sets/innistrad/DesperateRavings.java +++ b/Mage.Sets/src/mage/sets/innistrad/DesperateRavings.java @@ -28,10 +28,10 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TimingRule; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TimingRule; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/DevilsPlay.java b/Mage.Sets/src/mage/sets/innistrad/DevilsPlay.java index f2c8fb43f88..a1d96bd2d2f 100644 --- a/Mage.Sets/src/mage/sets/innistrad/DevilsPlay.java +++ b/Mage.Sets/src/mage/sets/innistrad/DevilsPlay.java @@ -29,14 +29,14 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; +import mage.constants.TimingRule; import mage.target.common.TargetCreatureOrPlayer; /** @@ -55,7 +55,7 @@ public class DevilsPlay extends CardImpl { this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); // Flashback {X}{R}{R}{R} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{X}{R}{R}{R}"), Constants.TimingRule.SORCERY)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{X}{R}{R}{R}"), TimingRule.SORCERY)); } public DevilsPlay(final DevilsPlay card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/DiregrafGhoul.java b/Mage.Sets/src/mage/sets/innistrad/DiregrafGhoul.java index 983e7079eca..3ad639eea78 100644 --- a/Mage.Sets/src/mage/sets/innistrad/DiregrafGhoul.java +++ b/Mage.Sets/src/mage/sets/innistrad/DiregrafGhoul.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.common.TapSourceEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/DiscipleOfGriselbrand.java b/Mage.Sets/src/mage/sets/innistrad/DiscipleOfGriselbrand.java index b1633ae04fc..d1c4202512c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/DiscipleOfGriselbrand.java +++ b/Mage.Sets/src/mage/sets/innistrad/DiscipleOfGriselbrand.java @@ -28,10 +28,10 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/Dissipate.java b/Mage.Sets/src/mage/sets/innistrad/Dissipate.java index 005509e0861..097519acbea 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Dissipate.java +++ b/Mage.Sets/src/mage/sets/innistrad/Dissipate.java @@ -27,11 +27,11 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetWithReplacementEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetSpell; import java.util.UUID; @@ -48,7 +48,7 @@ public class Dissipate extends CardImpl { this.color.setBlue(true); // Counter target spell. If that spell is countered this way, exile it instead of putting it into its owner's graveyard. - this.getSpellAbility().addEffect(new CounterTargetWithReplacementEffect(Constants.Zone.EXILED)); + this.getSpellAbility().addEffect(new CounterTargetWithReplacementEffect(Zone.EXILED)); this.getSpellAbility().addTarget(new TargetSpell()); } diff --git a/Mage.Sets/src/mage/sets/innistrad/DivineReckoning.java b/Mage.Sets/src/mage/sets/innistrad/DivineReckoning.java index e72aacd6385..525d36a70cc 100644 --- a/Mage.Sets/src/mage/sets/innistrad/DivineReckoning.java +++ b/Mage.Sets/src/mage/sets/innistrad/DivineReckoning.java @@ -27,15 +27,17 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.TargetController; +import mage.constants.TimingRule; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; @@ -63,7 +65,7 @@ public class DivineReckoning extends CardImpl { this.getSpellAbility().addEffect(new DivineReckoningEffect()); // Flashback {5}{W}{W} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{5}{W}{W}"), Constants.TimingRule.SORCERY)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{5}{W}{W}"), TimingRule.SORCERY)); } public DivineReckoning(final DivineReckoning card) { @@ -81,11 +83,11 @@ class DivineReckoningEffect extends OneShotEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public DivineReckoningEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); staticText = "Each player chooses a creature he or she controls. Destroy the rest"; } @@ -104,7 +106,7 @@ class DivineReckoningEffect extends OneShotEffect { target.setRequired(true); if (target.canChoose(player.getId(), game)) { while (!target.isChosen() && target.canChoose(player.getId(), game)) { - player.choose(Constants.Outcome.Benefit, target, source.getSourceId(), game); + player.choose(Outcome.Benefit, target, source.getSourceId(), game); } Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null) { diff --git a/Mage.Sets/src/mage/sets/innistrad/DoomedTraveler.java b/Mage.Sets/src/mage/sets/innistrad/DoomedTraveler.java index 501182403d3..b091468fb3c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/DoomedTraveler.java +++ b/Mage.Sets/src/mage/sets/innistrad/DoomedTraveler.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/DreamTwist.java b/Mage.Sets/src/mage/sets/innistrad/DreamTwist.java index be3a2c16ca8..639016f9689 100644 --- a/Mage.Sets/src/mage/sets/innistrad/DreamTwist.java +++ b/Mage.Sets/src/mage/sets/innistrad/DreamTwist.java @@ -27,13 +27,13 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; +import mage.constants.TimingRule; import mage.target.TargetPlayer; import java.util.UUID; @@ -54,7 +54,7 @@ public class DreamTwist extends CardImpl { this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(3)); // Flashback {1}{U} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{1}{U}"), Constants.TimingRule.INSTANT)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{1}{U}"), TimingRule.INSTANT)); } public DreamTwist(final DreamTwist card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/ElderCathar.java b/Mage.Sets/src/mage/sets/innistrad/ElderCathar.java index 2e4bf0687d3..79ca7a2a976 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ElderCathar.java +++ b/Mage.Sets/src/mage/sets/innistrad/ElderCathar.java @@ -27,14 +27,14 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.Counter; import mage.counters.CounterType; import mage.game.Game; @@ -80,7 +80,7 @@ class ElderCatharAddCountersTargetEffect extends OneShotEffect { this.getSpellAbility().addTarget(new TargetCreaturePermanent(0, 2)); // Flashback {1}{U} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{1}{U}"), Constants.TimingRule.INSTANT)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{1}{U}"), TimingRule.INSTANT)); } public FeelingOfDread(final FeelingOfDread card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/FeralRidgewolf.java b/Mage.Sets/src/mage/sets/innistrad/FeralRidgewolf.java index 27b9e48235e..632e7fcabeb 100644 --- a/Mage.Sets/src/mage/sets/innistrad/FeralRidgewolf.java +++ b/Mage.Sets/src/mage/sets/innistrad/FeralRidgewolf.java @@ -29,15 +29,16 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @author nantuko @@ -56,7 +57,7 @@ public class FeralRidgewolf extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // {1}{R}: Feral Ridgewolf gets +2/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Constants.Duration.EndOfTurn), new ManaCostsImpl("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{R}"))); } public FeralRidgewolf(final FeralRidgewolf card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/FesterhideBoar.java b/Mage.Sets/src/mage/sets/innistrad/FesterhideBoar.java index 183eb4c5373..2217fc9afe1 100644 --- a/Mage.Sets/src/mage/sets/innistrad/FesterhideBoar.java +++ b/Mage.Sets/src/mage/sets/innistrad/FesterhideBoar.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.common.MorbidCondition; diff --git a/Mage.Sets/src/mage/sets/innistrad/FiendHunter.java b/Mage.Sets/src/mage/sets/innistrad/FiendHunter.java index 957a883c90e..8238a2d5a98 100644 --- a/Mage.Sets/src/mage/sets/innistrad/FiendHunter.java +++ b/Mage.Sets/src/mage/sets/innistrad/FiendHunter.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,6 +38,7 @@ import mage.abilities.common.LeavesBattlefieldTriggeredAbility; import mage.abilities.effects.common.ExileTargetForSourceEffect; import mage.abilities.effects.common.ReturnFromExileForSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.Target; @@ -71,7 +72,7 @@ public class FiendHunter extends CardImpl { this.addAbility(ability1); // When Fiend Hunter leaves the battlefield, return the exiled card to the battlefield under its owner's control. - Ability ability2 = new LeavesBattlefieldTriggeredAbility(new ReturnFromExileForSourceEffect(Constants.Zone.BATTLEFIELD), false); + Ability ability2 = new LeavesBattlefieldTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.BATTLEFIELD), false); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/innistrad/ForbiddenAlchemy.java b/Mage.Sets/src/mage/sets/innistrad/ForbiddenAlchemy.java index dce383ba5f7..b3583aedcd1 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ForbiddenAlchemy.java +++ b/Mage.Sets/src/mage/sets/innistrad/ForbiddenAlchemy.java @@ -28,11 +28,11 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TimingRule; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TimingRule; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/FortressCrab.java b/Mage.Sets/src/mage/sets/innistrad/FortressCrab.java index 8c6bb473ed6..6290e246d2f 100644 --- a/Mage.Sets/src/mage/sets/innistrad/FortressCrab.java +++ b/Mage.Sets/src/mage/sets/innistrad/FortressCrab.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/innistrad/FrightfulDelusion.java b/Mage.Sets/src/mage/sets/innistrad/FrightfulDelusion.java index ca0071ce62a..eecb6fb2f1c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/FrightfulDelusion.java +++ b/Mage.Sets/src/mage/sets/innistrad/FrightfulDelusion.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.mana.GenericManaCost; diff --git a/Mage.Sets/src/mage/sets/innistrad/FullMoonsRise.java b/Mage.Sets/src/mage/sets/innistrad/FullMoonsRise.java index 0d06301106a..dbf779fe7a4 100644 --- a/Mage.Sets/src/mage/sets/innistrad/FullMoonsRise.java +++ b/Mage.Sets/src/mage/sets/innistrad/FullMoonsRise.java @@ -27,9 +27,7 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -68,11 +66,11 @@ public class FullMoonsRise extends CardImpl { this.color.setGreen(true); // Werewolf creatures you control get +1/+0 and have trample. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Constants.Duration.WhileOnBattlefield, filter))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityControlledEffect(TrampleAbility.getInstance(), Constants.Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter))); // Sacrifice Full Moon's Rise: Regenerate all Werewolf creatures you control. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new FullMoonsRiseEffect(filter), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new FullMoonsRiseEffect(filter), new SacrificeSourceCost())); } public FullMoonsRise(final FullMoonsRise card) { @@ -90,7 +88,7 @@ class FullMoonsRiseEffect extends OneShotEffect { private FilterPermanent filter; public FullMoonsRiseEffect(FilterPermanent filter) { - super(Constants.Outcome.Regenerate); + super(Outcome.Regenerate); this.filter = filter; staticText = "Regenerate all Werewolf creatures you control"; } diff --git a/Mage.Sets/src/mage/sets/innistrad/FurorOfTheBitten.java b/Mage.Sets/src/mage/sets/innistrad/FurorOfTheBitten.java index 40f5bd1e308..6f43648ec59 100644 --- a/Mage.Sets/src/mage/sets/innistrad/FurorOfTheBitten.java +++ b/Mage.Sets/src/mage/sets/innistrad/FurorOfTheBitten.java @@ -28,12 +28,12 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/GallowsWarden.java b/Mage.Sets/src/mage/sets/innistrad/GallowsWarden.java index 03afa754d35..c2c146b5c2e 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GallowsWarden.java +++ b/Mage.Sets/src/mage/sets/innistrad/GallowsWarden.java @@ -27,14 +27,15 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -63,7 +64,7 @@ public class GallowsWarden extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Other Spirit creatures you control get +0/+1. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Constants.Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, filter, true))); } public GallowsWarden(final GallowsWarden card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/GalvanicJuggernaut.java b/Mage.Sets/src/mage/sets/innistrad/GalvanicJuggernaut.java index 417fda0513f..d9e68bbb5dd 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GalvanicJuggernaut.java +++ b/Mage.Sets/src/mage/sets/innistrad/GalvanicJuggernaut.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.common.DiesCreatureTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/GarrukRelentless.java b/Mage.Sets/src/mage/sets/innistrad/GarrukRelentless.java index ab6135b0bcd..0ab7bda6e07 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GarrukRelentless.java +++ b/Mage.Sets/src/mage/sets/innistrad/GarrukRelentless.java @@ -27,9 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.TriggeredAbilityImpl; @@ -40,6 +39,8 @@ import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; @@ -93,7 +94,7 @@ public class GarrukRelentless extends CardImpl { class GarrukRelentlessTriggeredAbility extends TriggeredAbilityImpl { public GarrukRelentlessTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new TransformSourceEffect(true), false); + super(Zone.BATTLEFIELD, new TransformSourceEffect(true), false); } public GarrukRelentlessTriggeredAbility(GarrukRelentlessTriggeredAbility ability) { @@ -125,7 +126,7 @@ class GarrukRelentlessTriggeredAbility extends TriggeredAbilityImpl { public GarrukRelentlessDamageEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "Garruk Relentless deals 3 damage to target creature. That creature deals damage equal to its power to him"; } diff --git a/Mage.Sets/src/mage/sets/innistrad/GarrukTheVeilCursed.java b/Mage.Sets/src/mage/sets/innistrad/GarrukTheVeilCursed.java index 68d05f6fbd2..b90e9007094 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GarrukTheVeilCursed.java +++ b/Mage.Sets/src/mage/sets/innistrad/GarrukTheVeilCursed.java @@ -27,9 +27,7 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.dynamicvalue.DynamicValue; @@ -85,12 +83,12 @@ public class GarrukTheVeilCursed extends CardImpl { // -3 : Creatures you control gain trample and get +X/+X until end of turn, where X is the number of creature cards in your graveyard. Effects effects1 = new Effects(); - BoostControlledEffect effect = new BoostControlledEffect(new GarrukTheVeilCursedValue(), new GarrukTheVeilCursedValue(), Constants.Duration.EndOfTurn); + BoostControlledEffect effect = new BoostControlledEffect(new GarrukTheVeilCursedValue(), new GarrukTheVeilCursedValue(), Duration.EndOfTurn); // +X/+X should be counted only once effect.setLockedIn(true); effect.setRule("Creatures you control get +X/+X until end of turn, where X is the number of creature cards in your graveyard"); effects1.add(effect); - effects1.add(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Constants.Duration.EndOfTurn, new FilterCreaturePermanent())); + effects1.add(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.EndOfTurn, new FilterCreaturePermanent())); this.addAbility(new LoyaltyAbility(effects1, -3)); } @@ -137,11 +135,11 @@ class GarrukTheVeilCursedEffect extends OneShotEffect static { filterCreature.add(new CardTypePredicate(CardType.CREATURE)); - filterCreature.add(new ControllerPredicate(Constants.TargetController.YOU)); + filterCreature.add(new ControllerPredicate(TargetController.YOU)); } public GarrukTheVeilCursedEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "Sacrifice a creature. If you do, search your library for a creature card, reveal it, put it into your hand, then shuffle your library"; } @@ -162,7 +160,7 @@ class GarrukTheVeilCursedEffect extends OneShotEffect boolean sacrificed = false; if (target.canChoose(player.getId(), game)) { while (!target.isChosen() && target.canChoose(player.getId(), game)) { - player.choose(Constants.Outcome.Sacrifice, target, source.getSourceId(), game); + player.choose(Outcome.Sacrifice, target, source.getSourceId(), game); } for (int idx = 0; idx < target.getTargets().size(); idx++) { @@ -182,7 +180,7 @@ class GarrukTheVeilCursedEffect extends OneShotEffect for (UUID cardId : targetInLibrary.getTargets()) { Card card = player.getLibrary().remove(cardId, game); if (card != null) { - card.moveToZone(Constants.Zone.HAND, source.getId(), game, false); + card.moveToZone(Zone.HAND, source.getId(), game, false); cards.add(card); } } diff --git a/Mage.Sets/src/mage/sets/innistrad/GatstafHowler.java b/Mage.Sets/src/mage/sets/innistrad/GatstafHowler.java index 9c5da80f02d..832d434e8ef 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GatstafHowler.java +++ b/Mage.Sets/src/mage/sets/innistrad/GatstafHowler.java @@ -27,9 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -39,6 +38,7 @@ import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.IntimidateAbility; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import java.util.UUID; @@ -63,7 +63,7 @@ public class GatstafHowler extends CardImpl { this.addAbility(IntimidateAbility.getInstance()); // At the beginning of each upkeep, if a player cast two or more spells last turn, transform Gatstaf Howler. - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), Constants.TargetController.ANY, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), TargetController.ANY, false); this.addAbility(new ConditionalTriggeredAbility(ability, TwoOrMoreSpellsWereCastLastTurnCondition.getInstance(), TransformAbility.TWO_OR_MORE_SPELLS_TRANSFORM_RULE)); } diff --git a/Mage.Sets/src/mage/sets/innistrad/GatstafShepherd.java b/Mage.Sets/src/mage/sets/innistrad/GatstafShepherd.java index 69772c410e9..9147917e72d 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GatstafShepherd.java +++ b/Mage.Sets/src/mage/sets/innistrad/GatstafShepherd.java @@ -27,9 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -38,6 +37,7 @@ import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import java.util.UUID; @@ -61,7 +61,7 @@ public class GatstafShepherd extends CardImpl { // At the beginning of each upkeep, if no spells were cast last turn, transform Gatstaf Shepherd. this.addAbility(new TransformAbility()); - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), Constants.TargetController.ANY, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), TargetController.ANY, false); this.addAbility(new ConditionalTriggeredAbility(ability, NoSpellsWereCastLastTurnCondition.getInstance(), TransformAbility.NO_SPELLS_TRANSFORM_RULE)); } diff --git a/Mage.Sets/src/mage/sets/innistrad/GavonyTownship.java b/Mage.Sets/src/mage/sets/innistrad/GavonyTownship.java index 93351a548ca..b8a1fc2a762 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GavonyTownship.java +++ b/Mage.Sets/src/mage/sets/innistrad/GavonyTownship.java @@ -1,6 +1,5 @@ package mage.sets.innistrad; -import mage.Constants; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -8,6 +7,9 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.counter.AddCountersAllEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; @@ -15,11 +17,11 @@ import java.util.UUID; public class GavonyTownship extends CardImpl { public GavonyTownship(UUID ownerId) { - super(ownerId, 239, "Gavony Township", Constants.Rarity.RARE, new Constants.CardType[]{Constants.CardType.LAND}, null); + super(ownerId, 239, "Gavony Township", Rarity.RARE, new CardType[]{CardType.LAND}, null); this.expansionSetCode = "ISD"; this.addAbility(new ColorlessManaAbility()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersAllEffect(CounterType.P1P1.createInstance(), new FilterControlledCreaturePermanent("creature you control")), new ManaCostsImpl("{2}{G}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersAllEffect(CounterType.P1P1.createInstance(), new FilterControlledCreaturePermanent("creature you control")), new ManaCostsImpl("{2}{G}{W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/GeistHonoredMonk.java b/Mage.Sets/src/mage/sets/innistrad/GeistHonoredMonk.java index dd865a89e0c..bc1471e41b3 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GeistHonoredMonk.java +++ b/Mage.Sets/src/mage/sets/innistrad/GeistHonoredMonk.java @@ -27,9 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -38,6 +37,8 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.permanent.token.SpiritWhiteToken; @@ -61,7 +62,7 @@ public class GeistHonoredMonk extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Geist-Honored Monk's power and toughness are each equal to the number of creatures you control. - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()), Constants.Duration.EndOfGame))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()), Duration.EndOfGame))); // When Geist-Honored Monk enters the battlefield, put two 1/1 white Spirit creature tokens with flying onto the battlefield. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new SpiritWhiteToken(), 2))); diff --git a/Mage.Sets/src/mage/sets/innistrad/GeistOfSaintTraft.java b/Mage.Sets/src/mage/sets/innistrad/GeistOfSaintTraft.java index 56867244fce..e79c91e0453 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GeistOfSaintTraft.java +++ b/Mage.Sets/src/mage/sets/innistrad/GeistOfSaintTraft.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -41,6 +41,7 @@ import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.AngelToken; @@ -81,7 +82,7 @@ public class GeistOfSaintTraft extends CardImpl { class GeistOfSaintTraftEffect extends OneShotEffect { GeistOfSaintTraftEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); staticText = "put a 4/4 white Angel creature token with flying onto the battlefield tapped and attacking. Exile that token at end of combat"; } diff --git a/Mage.Sets/src/mage/sets/innistrad/GeistcatchersRig.java b/Mage.Sets/src/mage/sets/innistrad/GeistcatchersRig.java index 6363bcaa77d..cc254021fed 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GeistcatchersRig.java +++ b/Mage.Sets/src/mage/sets/innistrad/GeistcatchersRig.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/Geistflame.java b/Mage.Sets/src/mage/sets/innistrad/Geistflame.java index a7014515bd1..ea3db2418df 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Geistflame.java +++ b/Mage.Sets/src/mage/sets/innistrad/Geistflame.java @@ -27,13 +27,13 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; +import mage.constants.TimingRule; import mage.target.common.TargetCreatureOrPlayer; import java.util.UUID; @@ -54,7 +54,7 @@ public class Geistflame extends CardImpl { this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); // Flashback {3}{R} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{3}{R}"), Constants.TimingRule.INSTANT)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{3}{R}"), TimingRule.INSTANT)); } public Geistflame(final Geistflame card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/GhostQuarter.java b/Mage.Sets/src/mage/sets/innistrad/GhostQuarter.java index 27e2048f874..2231c29c839 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GhostQuarter.java +++ b/Mage.Sets/src/mage/sets/innistrad/GhostQuarter.java @@ -28,10 +28,10 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/innistrad/GhostlyPossession.java b/Mage.Sets/src/mage/sets/innistrad/GhostlyPossession.java index 329ba29b759..27aff664583 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GhostlyPossession.java +++ b/Mage.Sets/src/mage/sets/innistrad/GhostlyPossession.java @@ -29,10 +29,7 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.PreventionEffectImpl; @@ -63,15 +60,15 @@ public class GhostlyPossession extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); //Enchanted creature has flying - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); //Prevent all combat damage that would be dealt to and dealt by enchanted creature - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GhostlyPossessionEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GhostlyPossessionEffect())); } public GhostlyPossession(final GhostlyPossession card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/GhoulcallersBell.java b/Mage.Sets/src/mage/sets/innistrad/GhoulcallersBell.java index 6783d8f51dc..f065f2736f3 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GhoulcallersBell.java +++ b/Mage.Sets/src/mage/sets/innistrad/GhoulcallersBell.java @@ -29,10 +29,10 @@ package mage.sets.innistrad; import java.util.Collection; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/innistrad/GhoulcallersChant.java b/Mage.Sets/src/mage/sets/innistrad/GhoulcallersChant.java index 81ed5709381..216f854bb49 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GhoulcallersChant.java +++ b/Mage.Sets/src/mage/sets/innistrad/GhoulcallersChant.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Mode; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/innistrad/Ghoulraiser.java b/Mage.Sets/src/mage/sets/innistrad/Ghoulraiser.java index a6739fad25c..a276ae9d691 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Ghoulraiser.java +++ b/Mage.Sets/src/mage/sets/innistrad/Ghoulraiser.java @@ -29,10 +29,10 @@ package mage.sets.innistrad; import java.util.Random; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/GnawToTheBone.java b/Mage.Sets/src/mage/sets/innistrad/GnawToTheBone.java index 899de024f11..61f7f5b9208 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GnawToTheBone.java +++ b/Mage.Sets/src/mage/sets/innistrad/GnawToTheBone.java @@ -29,15 +29,15 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; +import mage.constants.TimingRule; import mage.filter.common.FilterCreatureCard; /** @@ -57,7 +57,7 @@ public class GnawToTheBone extends CardImpl { this.getSpellAbility().addEffect(new GainLifeEffect(value)); // Flashback {2}{G} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{2}{G}"), Constants.TimingRule.INSTANT)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{2}{G}"), TimingRule.INSTANT)); } public GnawToTheBone(final GnawToTheBone card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/GraspOfPhantoms.java b/Mage.Sets/src/mage/sets/innistrad/GraspOfPhantoms.java index 3e43358ea11..b9e476f852c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GraspOfPhantoms.java +++ b/Mage.Sets/src/mage/sets/innistrad/GraspOfPhantoms.java @@ -29,13 +29,13 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; +import mage.constants.TimingRule; import mage.target.common.TargetCreaturePermanent; /** @@ -55,7 +55,7 @@ public class GraspOfPhantoms extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Flashback {7}{U} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{7}{U}"), Constants.TimingRule.SORCERY)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{7}{U}"), TimingRule.SORCERY)); } public GraspOfPhantoms(final GraspOfPhantoms card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/GraveBramble.java b/Mage.Sets/src/mage/sets/innistrad/GraveBramble.java index e3bc5a8461d..636fbf21f71 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GraveBramble.java +++ b/Mage.Sets/src/mage/sets/innistrad/GraveBramble.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.ProtectionAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/GraveyardShovel.java b/Mage.Sets/src/mage/sets/innistrad/GraveyardShovel.java index 1596e679f9c..a41a5f14057 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GraveyardShovel.java +++ b/Mage.Sets/src/mage/sets/innistrad/GraveyardShovel.java @@ -27,10 +27,10 @@ */ package mage.sets.innistrad; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/innistrad/GrimgrinCorpseBorn.java b/Mage.Sets/src/mage/sets/innistrad/GrimgrinCorpseBorn.java index 5517f130ae6..675d3c65b7c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GrimgrinCorpseBorn.java +++ b/Mage.Sets/src/mage/sets/innistrad/GrimgrinCorpseBorn.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.EntersBattlefieldTappedAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/GrimoireOfTheDead.java b/Mage.Sets/src/mage/sets/innistrad/GrimoireOfTheDead.java index 602f89bcaf8..5b73a7570a5 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GrimoireOfTheDead.java +++ b/Mage.Sets/src/mage/sets/innistrad/GrimoireOfTheDead.java @@ -28,13 +28,13 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.DiscardTargetCost; diff --git a/Mage.Sets/src/mage/sets/innistrad/GrizzledOutcasts.java b/Mage.Sets/src/mage/sets/innistrad/GrizzledOutcasts.java index 80d7eb066ad..86c07203b99 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GrizzledOutcasts.java +++ b/Mage.Sets/src/mage/sets/innistrad/GrizzledOutcasts.java @@ -27,9 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -38,6 +37,7 @@ import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import java.util.UUID; @@ -61,7 +61,7 @@ public class GrizzledOutcasts extends CardImpl { // At the beginning of each upkeep, if no spells were cast last turn, transform Grizzled Outcasts. this.addAbility(new TransformAbility()); - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), Constants.TargetController.ANY, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), TargetController.ANY, false); this.addAbility(new ConditionalTriggeredAbility(ability, NoSpellsWereCastLastTurnCondition.getInstance(), TransformAbility.NO_SPELLS_TRANSFORM_RULE)); } diff --git a/Mage.Sets/src/mage/sets/innistrad/GruesomeDeformity.java b/Mage.Sets/src/mage/sets/innistrad/GruesomeDeformity.java index e1a891a8251..57c5c8b3add 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GruesomeDeformity.java +++ b/Mage.Sets/src/mage/sets/innistrad/GruesomeDeformity.java @@ -29,9 +29,7 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -58,11 +56,11 @@ public class GruesomeDeformity extends CardImpl { // Enchant creature TargetPermanent target = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(target); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(target.getTargetName()); this.addAbility(ability); // Enchanted creature has intimidate. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(IntimidateAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(IntimidateAbility.getInstance(), AttachmentType.AURA))); } public GruesomeDeformity(final GruesomeDeformity card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/GutterGrime.java b/Mage.Sets/src/mage/sets/innistrad/GutterGrime.java index 656b7c10aa5..3f2f3f1805c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GutterGrime.java +++ b/Mage.Sets/src/mage/sets/innistrad/GutterGrime.java @@ -28,11 +28,11 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/innistrad/HamletCaptain.java b/Mage.Sets/src/mage/sets/innistrad/HamletCaptain.java index 0f8681a6dee..8cfa8e10972 100644 --- a/Mage.Sets/src/mage/sets/innistrad/HamletCaptain.java +++ b/Mage.Sets/src/mage/sets/innistrad/HamletCaptain.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksOrBlocksTriggeredAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/HanweirWatchkeep.java b/Mage.Sets/src/mage/sets/innistrad/HanweirWatchkeep.java index a33d8ad2f16..1c21d8cc8bc 100644 --- a/Mage.Sets/src/mage/sets/innistrad/HanweirWatchkeep.java +++ b/Mage.Sets/src/mage/sets/innistrad/HanweirWatchkeep.java @@ -27,9 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -39,6 +38,7 @@ import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import java.util.UUID; @@ -64,7 +64,7 @@ public class HanweirWatchkeep extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // At the beginning of each upkeep, if no spells were cast last turn, transform Hanweir Watchkeep. this.addAbility(new TransformAbility()); - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), Constants.TargetController.ANY, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), TargetController.ANY, false); this.addAbility(new ConditionalTriggeredAbility(ability, NoSpellsWereCastLastTurnCondition.getInstance(), TransformAbility.NO_SPELLS_TRANSFORM_RULE)); } diff --git a/Mage.Sets/src/mage/sets/innistrad/HarvestPyre.java b/Mage.Sets/src/mage/sets/innistrad/HarvestPyre.java index f2d5fc62bad..600b33192b6 100644 --- a/Mage.Sets/src/mage/sets/innistrad/HarvestPyre.java +++ b/Mage.Sets/src/mage/sets/innistrad/HarvestPyre.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.CostImpl; import mage.abilities.costs.VariableCost; diff --git a/Mage.Sets/src/mage/sets/innistrad/HeartlessSummoning.java b/Mage.Sets/src/mage/sets/innistrad/HeartlessSummoning.java index 4d7cecc3215..56f3df93e8e 100644 --- a/Mage.Sets/src/mage/sets/innistrad/HeartlessSummoning.java +++ b/Mage.Sets/src/mage/sets/innistrad/HeartlessSummoning.java @@ -28,10 +28,10 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.effects.common.cost.SpellsCostReductionEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/HereticsPunishment.java b/Mage.Sets/src/mage/sets/innistrad/HereticsPunishment.java index e58a1545183..3a731e8bdad 100644 --- a/Mage.Sets/src/mage/sets/innistrad/HereticsPunishment.java +++ b/Mage.Sets/src/mage/sets/innistrad/HereticsPunishment.java @@ -28,10 +28,10 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/innistrad/HinterlandHarbor.java b/Mage.Sets/src/mage/sets/innistrad/HinterlandHarbor.java index 88df0849956..d5edd169efe 100644 --- a/Mage.Sets/src/mage/sets/innistrad/HinterlandHarbor.java +++ b/Mage.Sets/src/mage/sets/innistrad/HinterlandHarbor.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; diff --git a/Mage.Sets/src/mage/sets/innistrad/HollowhengeScavenger.java b/Mage.Sets/src/mage/sets/innistrad/HollowhengeScavenger.java index 2a2ad55591b..b184f3e9694 100644 --- a/Mage.Sets/src/mage/sets/innistrad/HollowhengeScavenger.java +++ b/Mage.Sets/src/mage/sets/innistrad/HollowhengeScavenger.java @@ -27,8 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/HomicidalBrute.java b/Mage.Sets/src/mage/sets/innistrad/HomicidalBrute.java index 0de9ef35a80..d35c0fad52c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/HomicidalBrute.java +++ b/Mage.Sets/src/mage/sets/innistrad/HomicidalBrute.java @@ -27,14 +27,14 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.effects.common.TransformSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -78,7 +78,7 @@ public class HomicidalBrute extends CardImpl { class HomicidalBruteTriggeredAbility extends TriggeredAbilityImpl { public HomicidalBruteTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new TapSourceEffect(), false); + super(Zone.BATTLEFIELD, new TapSourceEffect(), false); addEffect(new TransformSourceEffect(false)); } diff --git a/Mage.Sets/src/mage/sets/innistrad/HowlpackAlpha.java b/Mage.Sets/src/mage/sets/innistrad/HowlpackAlpha.java index 660eaee7e89..c690bf50792 100644 --- a/Mage.Sets/src/mage/sets/innistrad/HowlpackAlpha.java +++ b/Mage.Sets/src/mage/sets/innistrad/HowlpackAlpha.java @@ -27,7 +27,6 @@ */ package mage.sets.innistrad; -import mage.Constants.*; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -41,6 +40,7 @@ import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; diff --git a/Mage.Sets/src/mage/sets/innistrad/HowlpackOfEstwald.java b/Mage.Sets/src/mage/sets/innistrad/HowlpackOfEstwald.java index 3f216dcccb0..5aa670be0dc 100644 --- a/Mage.Sets/src/mage/sets/innistrad/HowlpackOfEstwald.java +++ b/Mage.Sets/src/mage/sets/innistrad/HowlpackOfEstwald.java @@ -27,9 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -38,6 +37,7 @@ import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import java.util.UUID; @@ -60,7 +60,7 @@ public class HowlpackOfEstwald extends CardImpl { this.toughness = new MageInt(6); // At the beginning of each upkeep, if a player cast two or more spells last turn, transform Howlpack of Estwald. - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), Constants.TargetController.ANY, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), TargetController.ANY, false); this.addAbility(new ConditionalTriggeredAbility(ability, TwoOrMoreSpellsWereCastLastTurnCondition.getInstance(), TransformAbility.TWO_OR_MORE_SPELLS_TRANSFORM_RULE)); } diff --git a/Mage.Sets/src/mage/sets/innistrad/HystericalBlindness.java b/Mage.Sets/src/mage/sets/innistrad/HystericalBlindness.java index 6bb27629af9..365a068ad68 100644 --- a/Mage.Sets/src/mage/sets/innistrad/HystericalBlindness.java +++ b/Mage.Sets/src/mage/sets/innistrad/HystericalBlindness.java @@ -28,10 +28,10 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/innistrad/InfernalPlunge.java b/Mage.Sets/src/mage/sets/innistrad/InfernalPlunge.java index 8ac042f3749..894122e8c57 100644 --- a/Mage.Sets/src/mage/sets/innistrad/InfernalPlunge.java +++ b/Mage.Sets/src/mage/sets/innistrad/InfernalPlunge.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.BasicManaEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/InquisitorsFlail.java b/Mage.Sets/src/mage/sets/innistrad/InquisitorsFlail.java index 3ad26a8d863..337bed82b41 100644 --- a/Mage.Sets/src/mage/sets/innistrad/InquisitorsFlail.java +++ b/Mage.Sets/src/mage/sets/innistrad/InquisitorsFlail.java @@ -27,9 +27,7 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -56,10 +54,10 @@ public class InquisitorsFlail extends CardImpl { // If equipped creature would deal combat damage, it deals double that damage instead. // If another creature would deal combat damage to equipped creature, it deals double that damage to equipped creature instead. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new InquisitorsFlailEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new InquisitorsFlailEffect())); // Equip {2} - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(2))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); } public InquisitorsFlail(final InquisitorsFlail card) { @@ -75,7 +73,7 @@ public class InquisitorsFlail extends CardImpl { class InquisitorsFlailEffect extends ReplacementEffectImpl { public InquisitorsFlailEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Damage); + super(Duration.WhileOnBattlefield, Outcome.Damage); staticText = "If equipped creature would deal combat damage, it deals double that damage instead. \n" + "If another creature would deal combat damage to equipped creature, it deals double that damage to equipped creature instead"; } diff --git a/Mage.Sets/src/mage/sets/innistrad/InsectileAberration.java b/Mage.Sets/src/mage/sets/innistrad/InsectileAberration.java index 2b5d49024b5..6575da45dcc 100644 --- a/Mage.Sets/src/mage/sets/innistrad/InsectileAberration.java +++ b/Mage.Sets/src/mage/sets/innistrad/InsectileAberration.java @@ -29,8 +29,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/innistrad/InstigatorGang.java b/Mage.Sets/src/mage/sets/innistrad/InstigatorGang.java index c3408e497cd..2354ea6e077 100644 --- a/Mage.Sets/src/mage/sets/innistrad/InstigatorGang.java +++ b/Mage.Sets/src/mage/sets/innistrad/InstigatorGang.java @@ -27,9 +27,7 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -63,11 +61,11 @@ public class InstigatorGang extends CardImpl { this.toughness = new MageInt(3); // Attacking creatures you control get +1/+0. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Constants.Duration.WhileOnBattlefield, new FilterAttackingCreature(), false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, new FilterAttackingCreature(), false))); // At the beginning of each upkeep, if no spells were cast last turn, transform Instigator Gang. this.addAbility(new TransformAbility()); - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), Constants.TargetController.ANY, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), TargetController.ANY, false); this.addAbility(new ConditionalTriggeredAbility(ability, NoSpellsWereCastLastTurnCondition.getInstance(), TransformAbility.NO_SPELLS_TRANSFORM_RULE)); } diff --git a/Mage.Sets/src/mage/sets/innistrad/IntangibleVirtue.java b/Mage.Sets/src/mage/sets/innistrad/IntangibleVirtue.java index 699568bb29a..f7172849259 100644 --- a/Mage.Sets/src/mage/sets/innistrad/IntangibleVirtue.java +++ b/Mage.Sets/src/mage/sets/innistrad/IntangibleVirtue.java @@ -28,14 +28,16 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.TokenPredicate; @@ -58,8 +60,8 @@ public class IntangibleVirtue extends CardImpl { this.color.setWhite(true); // Creature tokens you control get +1/+1 and have vigilance. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Constants.Duration.WhileOnBattlefield, filter))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Constants.Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filter))); } diff --git a/Mage.Sets/src/mage/sets/innistrad/IntoTheMawOfHell.java b/Mage.Sets/src/mage/sets/innistrad/IntoTheMawOfHell.java index 95dcfc64ce3..d7d753cc55d 100644 --- a/Mage.Sets/src/mage/sets/innistrad/IntoTheMawOfHell.java +++ b/Mage.Sets/src/mage/sets/innistrad/IntoTheMawOfHell.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/InvisibleStalker.java b/Mage.Sets/src/mage/sets/innistrad/InvisibleStalker.java index 64e3530642f..4fae08535af 100644 --- a/Mage.Sets/src/mage/sets/innistrad/InvisibleStalker.java +++ b/Mage.Sets/src/mage/sets/innistrad/InvisibleStalker.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.HexproofAbility; import mage.abilities.keyword.UnblockableAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/Ironfang.java b/Mage.Sets/src/mage/sets/innistrad/Ironfang.java index 2349e86f89e..8c240761273 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Ironfang.java +++ b/Mage.Sets/src/mage/sets/innistrad/Ironfang.java @@ -27,9 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -39,6 +38,7 @@ import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import java.util.UUID; @@ -63,7 +63,7 @@ public class Ironfang extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // At the beginning of each upkeep, if a player cast two or more spells last turn, transform Ironfang. - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), Constants.TargetController.ANY, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), TargetController.ANY, false); this.addAbility(new ConditionalTriggeredAbility(ability, TwoOrMoreSpellsWereCastLastTurnCondition.getInstance(), TransformAbility.TWO_OR_MORE_SPELLS_TRANSFORM_RULE)); } diff --git a/Mage.Sets/src/mage/sets/innistrad/IsolatedChapel.java b/Mage.Sets/src/mage/sets/innistrad/IsolatedChapel.java index e73f77fe640..93bb155cb8e 100644 --- a/Mage.Sets/src/mage/sets/innistrad/IsolatedChapel.java +++ b/Mage.Sets/src/mage/sets/innistrad/IsolatedChapel.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; diff --git a/Mage.Sets/src/mage/sets/innistrad/KessigCagebreakers.java b/Mage.Sets/src/mage/sets/innistrad/KessigCagebreakers.java index faa5f902dfe..b9961aa6685 100644 --- a/Mage.Sets/src/mage/sets/innistrad/KessigCagebreakers.java +++ b/Mage.Sets/src/mage/sets/innistrad/KessigCagebreakers.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/KessigWolf.java b/Mage.Sets/src/mage/sets/innistrad/KessigWolf.java index 7094c77585f..43ca9970bca 100644 --- a/Mage.Sets/src/mage/sets/innistrad/KessigWolf.java +++ b/Mage.Sets/src/mage/sets/innistrad/KessigWolf.java @@ -28,10 +28,10 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/innistrad/KessigWolfRun.java b/Mage.Sets/src/mage/sets/innistrad/KessigWolfRun.java index cce56562a36..6f5ca59fc96 100644 --- a/Mage.Sets/src/mage/sets/innistrad/KessigWolfRun.java +++ b/Mage.Sets/src/mage/sets/innistrad/KessigWolfRun.java @@ -27,8 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -43,8 +43,8 @@ import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; -import mage.Constants.Duration; -import mage.Constants.Zone; +import mage.constants.Duration; +import mage.constants.Zone; /** * @author nantuko diff --git a/Mage.Sets/src/mage/sets/innistrad/Kindercatch.java b/Mage.Sets/src/mage/sets/innistrad/Kindercatch.java index 4304ee8e1d4..9c2c538d979 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Kindercatch.java +++ b/Mage.Sets/src/mage/sets/innistrad/Kindercatch.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/innistrad/KrallenhordeWantons.java b/Mage.Sets/src/mage/sets/innistrad/KrallenhordeWantons.java index e8c971f530f..79ecd74a60f 100644 --- a/Mage.Sets/src/mage/sets/innistrad/KrallenhordeWantons.java +++ b/Mage.Sets/src/mage/sets/innistrad/KrallenhordeWantons.java @@ -27,9 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -38,6 +37,7 @@ import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import java.util.UUID; @@ -61,7 +61,7 @@ public class KrallenhordeWantons extends CardImpl { this.toughness = new MageInt(7); // At the beginning of each upkeep, if a player cast two or more spells last turn, transform Krallenhorde Wantons. - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), Constants.TargetController.ANY, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), TargetController.ANY, false); this.addAbility(new ConditionalTriggeredAbility(ability, TwoOrMoreSpellsWereCastLastTurnCondition.getInstance(), TransformAbility.TWO_OR_MORE_SPELLS_TRANSFORM_RULE)); } diff --git a/Mage.Sets/src/mage/sets/innistrad/KruinOutlaw.java b/Mage.Sets/src/mage/sets/innistrad/KruinOutlaw.java index 725f00c9946..cf21e762e78 100644 --- a/Mage.Sets/src/mage/sets/innistrad/KruinOutlaw.java +++ b/Mage.Sets/src/mage/sets/innistrad/KruinOutlaw.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/LaboratoryManiac.java b/Mage.Sets/src/mage/sets/innistrad/LaboratoryManiac.java index f39eb80aee0..be25089c9f5 100644 --- a/Mage.Sets/src/mage/sets/innistrad/LaboratoryManiac.java +++ b/Mage.Sets/src/mage/sets/innistrad/LaboratoryManiac.java @@ -28,11 +28,11 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/LanternSpirit.java b/Mage.Sets/src/mage/sets/innistrad/LanternSpirit.java index 4bdebeae872..f007b398ad6 100644 --- a/Mage.Sets/src/mage/sets/innistrad/LanternSpirit.java +++ b/Mage.Sets/src/mage/sets/innistrad/LanternSpirit.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/innistrad/LilianaOfTheVeil.java b/Mage.Sets/src/mage/sets/innistrad/LilianaOfTheVeil.java index af01d6997bf..ddde523d739 100644 --- a/Mage.Sets/src/mage/sets/innistrad/LilianaOfTheVeil.java +++ b/Mage.Sets/src/mage/sets/innistrad/LilianaOfTheVeil.java @@ -27,9 +27,9 @@ */ package mage.sets.innistrad; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.EntersBattlefieldAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/LordOfLineage.java b/Mage.Sets/src/mage/sets/innistrad/LordOfLineage.java index 22a86187734..eb28f6c3150 100644 --- a/Mage.Sets/src/mage/sets/innistrad/LordOfLineage.java +++ b/Mage.Sets/src/mage/sets/innistrad/LordOfLineage.java @@ -29,10 +29,10 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/LostInTheMist.java b/Mage.Sets/src/mage/sets/innistrad/LostInTheMist.java index c4191e4c54c..9c3c505006b 100644 --- a/Mage.Sets/src/mage/sets/innistrad/LostInTheMist.java +++ b/Mage.Sets/src/mage/sets/innistrad/LostInTheMist.java @@ -28,10 +28,10 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CounterTargetEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/LudevicsAbomination.java b/Mage.Sets/src/mage/sets/innistrad/LudevicsAbomination.java index feb447627cb..fec15b629e2 100644 --- a/Mage.Sets/src/mage/sets/innistrad/LudevicsAbomination.java +++ b/Mage.Sets/src/mage/sets/innistrad/LudevicsAbomination.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/innistrad/LudevicsTestSubject.java b/Mage.Sets/src/mage/sets/innistrad/LudevicsTestSubject.java index f16d6543ef5..ccc8c643d1c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/LudevicsTestSubject.java +++ b/Mage.Sets/src/mage/sets/innistrad/LudevicsTestSubject.java @@ -29,9 +29,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -67,7 +68,7 @@ public class LudevicsTestSubject extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {1}{U}: Put a hatchling counter on Ludevic's Test Subject. Then if there are five or more hatchling counters on it, remove all of them and transform it. this.addAbility(new TransformAbility()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.HATCHLING.createInstance()), new ManaCostsImpl("{1}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.HATCHLING.createInstance()), new ManaCostsImpl("{1}{U}")); ability.addEffect(new LudevicsTestSubjectEffect()); this.addAbility(ability); } @@ -84,7 +85,7 @@ public class LudevicsTestSubject extends CardImpl { class LudevicsTestSubjectEffect extends OneShotEffect { LudevicsTestSubjectEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "Then if there are five or more hatchling counters on it, remove all of them and transform it"; } diff --git a/Mage.Sets/src/mage/sets/innistrad/Lumberknot.java b/Mage.Sets/src/mage/sets/innistrad/Lumberknot.java index 9e81924abb4..23fe8b57cf1 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Lumberknot.java +++ b/Mage.Sets/src/mage/sets/innistrad/Lumberknot.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/MakeAWish.java b/Mage.Sets/src/mage/sets/innistrad/MakeAWish.java index 6ed62edfde7..dad5b25a851 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MakeAWish.java +++ b/Mage.Sets/src/mage/sets/innistrad/MakeAWish.java @@ -28,10 +28,10 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/innistrad/MakeshiftMauler.java b/Mage.Sets/src/mage/sets/innistrad/MakeshiftMauler.java index 35282c02465..75777428442 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MakeshiftMauler.java +++ b/Mage.Sets/src/mage/sets/innistrad/MakeshiftMauler.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.common.ExileFromGraveCost; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/innistrad/ManorGargoyle.java b/Mage.Sets/src/mage/sets/innistrad/ManorGargoyle.java index 705e39cdcc6..2766263da29 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ManorGargoyle.java +++ b/Mage.Sets/src/mage/sets/innistrad/ManorGargoyle.java @@ -29,13 +29,13 @@ package mage.sets.innistrad; import java.util.Iterator; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Abilities; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/innistrad/ManorSkeleton.java b/Mage.Sets/src/mage/sets/innistrad/ManorSkeleton.java index a6f3bdfd4b3..6029ef34899 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ManorSkeleton.java +++ b/Mage.Sets/src/mage/sets/innistrad/ManorSkeleton.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/innistrad/MarkovPatrician.java b/Mage.Sets/src/mage/sets/innistrad/MarkovPatrician.java index 5cf8fcd157c..17b55cdcb11 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MarkovPatrician.java +++ b/Mage.Sets/src/mage/sets/innistrad/MarkovPatrician.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/innistrad/MaskOfAvacyn.java b/Mage.Sets/src/mage/sets/innistrad/MaskOfAvacyn.java index f5d59f50ef4..7413bbf5d4b 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MaskOfAvacyn.java +++ b/Mage.Sets/src/mage/sets/innistrad/MaskOfAvacyn.java @@ -27,9 +27,7 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; @@ -51,11 +49,11 @@ public class MaskOfAvacyn extends CardImpl { this.subtype.add("Equipment"); // Equip {3} - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(3))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3))); // Equipped creature gets +1/+2 and has hexproof. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HexproofAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(1, 2))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HexproofAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 2))); } public MaskOfAvacyn(final MaskOfAvacyn card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/MausoleumGuard.java b/Mage.Sets/src/mage/sets/innistrad/MausoleumGuard.java index c8b1c9398e7..a679f524823 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MausoleumGuard.java +++ b/Mage.Sets/src/mage/sets/innistrad/MausoleumGuard.java @@ -27,8 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/MawOfTheMire.java b/Mage.Sets/src/mage/sets/innistrad/MawOfTheMire.java index 7022e355572..ae69ea8ae6c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MawOfTheMire.java +++ b/Mage.Sets/src/mage/sets/innistrad/MawOfTheMire.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/innistrad/MayorOfAvabruck.java b/Mage.Sets/src/mage/sets/innistrad/MayorOfAvabruck.java index d8c0b64d187..0a647aabbc8 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MayorOfAvabruck.java +++ b/Mage.Sets/src/mage/sets/innistrad/MayorOfAvabruck.java @@ -27,7 +27,6 @@ */ package mage.sets.innistrad; -import mage.Constants.*; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -42,6 +41,7 @@ import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; diff --git a/Mage.Sets/src/mage/sets/innistrad/MemorysJourney.java b/Mage.Sets/src/mage/sets/innistrad/MemorysJourney.java index ddaedcdf202..9f75a7c3ea4 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MemorysJourney.java +++ b/Mage.Sets/src/mage/sets/innistrad/MemorysJourney.java @@ -29,11 +29,11 @@ package mage.sets.innistrad; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TimingRule; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TimingRule; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/MentorOfTheMeek.java b/Mage.Sets/src/mage/sets/innistrad/MentorOfTheMeek.java index ce4700aa4cc..5399e92915b 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MentorOfTheMeek.java +++ b/Mage.Sets/src/mage/sets/innistrad/MentorOfTheMeek.java @@ -29,9 +29,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/innistrad/MercilessPredator.java b/Mage.Sets/src/mage/sets/innistrad/MercilessPredator.java index 6fd83821f23..91b7cf6810b 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MercilessPredator.java +++ b/Mage.Sets/src/mage/sets/innistrad/MercilessPredator.java @@ -27,9 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -38,6 +37,7 @@ import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import java.util.UUID; @@ -60,7 +60,7 @@ public class MercilessPredator extends CardImpl { this.toughness = new MageInt(2); // At the beginning of each upkeep, if a player cast two or more spells last turn, transform Merciless Predator. - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), Constants.TargetController.ANY, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), TargetController.ANY, false); this.addAbility(new ConditionalTriggeredAbility(ability, TwoOrMoreSpellsWereCastLastTurnCondition.getInstance(), TransformAbility.TWO_OR_MORE_SPELLS_TRANSFORM_RULE)); } diff --git a/Mage.Sets/src/mage/sets/innistrad/MidnightHaunting.java b/Mage.Sets/src/mage/sets/innistrad/MidnightHaunting.java index f1e86f56c51..5a6d6464ebb 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MidnightHaunting.java +++ b/Mage.Sets/src/mage/sets/innistrad/MidnightHaunting.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.game.permanent.token.SpiritWhiteToken; diff --git a/Mage.Sets/src/mage/sets/innistrad/MikaeusTheLunarch.java b/Mage.Sets/src/mage/sets/innistrad/MikaeusTheLunarch.java index d00718597ad..11a9d2a9603 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MikaeusTheLunarch.java +++ b/Mage.Sets/src/mage/sets/innistrad/MikaeusTheLunarch.java @@ -27,9 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -43,6 +42,8 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersAllEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; @@ -77,11 +78,11 @@ public class MikaeusTheLunarch extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new MikaeusTheLunarchEffect())); // {T}: Put a +1/+1 counter on Mikaeus. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new TapSourceCost())); // {T}, Remove a +1/+1 counter from Mikaeus: Put a +1/+1 counter on each other creature you control. Effect effect = new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); this.addAbility(ability); } @@ -99,7 +100,7 @@ public class MikaeusTheLunarch extends CardImpl { class MikaeusTheLunarchEffect extends OneShotEffect { public MikaeusTheLunarchEffect() { - super(Constants.Outcome.BoostCreature); + super(Outcome.BoostCreature); staticText = "{this} enters the battlefield with X +1/+1 counters on it"; } diff --git a/Mage.Sets/src/mage/sets/innistrad/Mindshrieker.java b/Mage.Sets/src/mage/sets/innistrad/Mindshrieker.java index d3f564101ab..adc909e0774 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Mindshrieker.java +++ b/Mage.Sets/src/mage/sets/innistrad/Mindshrieker.java @@ -28,11 +28,11 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/MirrorMadPhantasm.java b/Mage.Sets/src/mage/sets/innistrad/MirrorMadPhantasm.java index f1164c34a6c..6ced0e39a79 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MirrorMadPhantasm.java +++ b/Mage.Sets/src/mage/sets/innistrad/MirrorMadPhantasm.java @@ -28,10 +28,10 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/MoanOfTheUnhallowed.java b/Mage.Sets/src/mage/sets/innistrad/MoanOfTheUnhallowed.java index b22d01c61e4..47cde1d505d 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MoanOfTheUnhallowed.java +++ b/Mage.Sets/src/mage/sets/innistrad/MoanOfTheUnhallowed.java @@ -29,13 +29,13 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; +import mage.constants.TimingRule; import mage.game.permanent.token.ZombieToken; /** @@ -54,7 +54,7 @@ public class MoanOfTheUnhallowed extends CardImpl { this.getSpellAbility().addEffect(new CreateTokenEffect(new ZombieToken(), 2)); // Flashback {5}{B}{B} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{5}{B}{B}"), Constants.TimingRule.SORCERY)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{5}{B}{B}"), TimingRule.SORCERY)); } public MoanOfTheUnhallowed(final MoanOfTheUnhallowed card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/MoldgrafMonstrosity.java b/Mage.Sets/src/mage/sets/innistrad/MoldgrafMonstrosity.java index b66f2f2b329..637e2c977f5 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MoldgrafMonstrosity.java +++ b/Mage.Sets/src/mage/sets/innistrad/MoldgrafMonstrosity.java @@ -30,10 +30,10 @@ package mage.sets.innistrad; import java.util.Random; import java.util.Set; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/MomentOfHeroism.java b/Mage.Sets/src/mage/sets/innistrad/MomentOfHeroism.java index 2ded72c780b..7f908f2267d 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MomentOfHeroism.java +++ b/Mage.Sets/src/mage/sets/innistrad/MomentOfHeroism.java @@ -27,13 +27,13 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -50,8 +50,8 @@ public class MomentOfHeroism extends CardImpl { this.color.setWhite(true); // Target creature gets +2/+2 and gains lifelink until end of turn. - this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Constants.Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/innistrad/MoonHeron.java b/Mage.Sets/src/mage/sets/innistrad/MoonHeron.java index 2988922830f..61ecb9cc52d 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MoonHeron.java +++ b/Mage.Sets/src/mage/sets/innistrad/MoonHeron.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/innistrad/Moonmist.java b/Mage.Sets/src/mage/sets/innistrad/Moonmist.java index b69d74f66f7..7c542e128ae 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Moonmist.java +++ b/Mage.Sets/src/mage/sets/innistrad/Moonmist.java @@ -28,10 +28,10 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.PreventAllDamageEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/MoorlandHaunt.java b/Mage.Sets/src/mage/sets/innistrad/MoorlandHaunt.java index 1ce97280c1c..2953918f0d2 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MoorlandHaunt.java +++ b/Mage.Sets/src/mage/sets/innistrad/MoorlandHaunt.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.ExileFromGraveCost; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/innistrad/MorkrutBanshee.java b/Mage.Sets/src/mage/sets/innistrad/MorkrutBanshee.java index 38bff1b5d5a..3616c6df85b 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MorkrutBanshee.java +++ b/Mage.Sets/src/mage/sets/innistrad/MorkrutBanshee.java @@ -27,15 +27,15 @@ */ package mage.sets.innistrad; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; -import mage.Constants.Duration; +import mage.constants.Duration; import mage.abilities.TriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.MorbidCondition; diff --git a/Mage.Sets/src/mage/sets/innistrad/Mulch.java b/Mage.Sets/src/mage/sets/innistrad/Mulch.java index 21c142b0e81..f294c5947e2 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Mulch.java +++ b/Mage.Sets/src/mage/sets/innistrad/Mulch.java @@ -28,10 +28,10 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/innistrad/MurderOfCrows.java b/Mage.Sets/src/mage/sets/innistrad/MurderOfCrows.java index 6c27aa9d7b2..45401659ca9 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MurderOfCrows.java +++ b/Mage.Sets/src/mage/sets/innistrad/MurderOfCrows.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesCreatureTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/NephaliaDrownyard.java b/Mage.Sets/src/mage/sets/innistrad/NephaliaDrownyard.java index 70233affb93..a41264fc197 100644 --- a/Mage.Sets/src/mage/sets/innistrad/NephaliaDrownyard.java +++ b/Mage.Sets/src/mage/sets/innistrad/NephaliaDrownyard.java @@ -27,9 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -37,6 +36,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetPlayer; import java.util.UUID; @@ -54,7 +54,7 @@ public class NephaliaDrownyard extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {1}{U}{B}, {T}: Target player puts the top three cards of his or her library into his or her graveyard. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(3), new ManaCostsImpl("{1}{U}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(3), new ManaCostsImpl("{1}{U}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/innistrad/Nevermore.java b/Mage.Sets/src/mage/sets/innistrad/Nevermore.java index 28b56039879..4b16006fbfe 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Nevermore.java +++ b/Mage.Sets/src/mage/sets/innistrad/Nevermore.java @@ -28,11 +28,11 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/NightRevelers.java b/Mage.Sets/src/mage/sets/innistrad/NightRevelers.java index 6c729374d24..823815b61c5 100644 --- a/Mage.Sets/src/mage/sets/innistrad/NightRevelers.java +++ b/Mage.Sets/src/mage/sets/innistrad/NightRevelers.java @@ -27,9 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -38,6 +37,7 @@ import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.game.Game; @@ -64,7 +64,7 @@ public class NightRevelers extends CardImpl { // Night Revelers has haste as long as an opponent controls a Human. ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainAbilitySourceEffect(HasteAbility.getInstance()), new NightRevelersCondition(), rule); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } diff --git a/Mage.Sets/src/mage/sets/innistrad/NightTerrors.java b/Mage.Sets/src/mage/sets/innistrad/NightTerrors.java index e4206fd9a6e..b5f9d43e239 100644 --- a/Mage.Sets/src/mage/sets/innistrad/NightTerrors.java +++ b/Mage.Sets/src/mage/sets/innistrad/NightTerrors.java @@ -28,14 +28,15 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterNonlandCard; import mage.game.Game; import mage.players.Player; @@ -92,7 +93,7 @@ class NightTerrorsEffect extends OneShotEffect { if (player != null && targetPlayer != null) { targetPlayer.revealCards("Night Terrors", targetPlayer.getHand(), game); - TargetCard target = new TargetCard(Constants.Zone.PICK, new FilterNonlandCard("nonland card to exile")); + TargetCard target = new TargetCard(Zone.PICK, new FilterNonlandCard("nonland card to exile")); target.setRequired(true); if (player.choose(Outcome.Exile, targetPlayer.getHand(), target, game)) { Card card = targetPlayer.getHand().get(target.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/sets/innistrad/NightbirdsClutches.java b/Mage.Sets/src/mage/sets/innistrad/NightbirdsClutches.java index 7cba8e3b526..ce1f02f56e0 100644 --- a/Mage.Sets/src/mage/sets/innistrad/NightbirdsClutches.java +++ b/Mage.Sets/src/mage/sets/innistrad/NightbirdsClutches.java @@ -28,10 +28,10 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TimingRule; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TimingRule; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CantBlockTargetEffect; import mage.abilities.keyword.FlashbackAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/NightfallPredator.java b/Mage.Sets/src/mage/sets/innistrad/NightfallPredator.java index c046703d690..721834ecd56 100644 --- a/Mage.Sets/src/mage/sets/innistrad/NightfallPredator.java +++ b/Mage.Sets/src/mage/sets/innistrad/NightfallPredator.java @@ -28,11 +28,11 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/OliviaVoldaren.java b/Mage.Sets/src/mage/sets/innistrad/OliviaVoldaren.java index e3ebb13d8da..ab9afbda376 100644 --- a/Mage.Sets/src/mage/sets/innistrad/OliviaVoldaren.java +++ b/Mage.Sets/src/mage/sets/innistrad/OliviaVoldaren.java @@ -29,9 +29,7 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -81,21 +79,21 @@ public class OliviaVoldaren extends CardImpl { String rule = "Gain control of target Vampire for as long as you control Olivia Voldaren"; FilterPermanent filter2 = new FilterPermanent(); - filter2.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter2.add(new ControllerPredicate(TargetController.YOU)); filter2.add(new CardIdPredicate(this.getId())); this.addAbility(FlyingAbility.getInstance()); // {1}{R}: Olivia Voldaren deals 1 damage to another target creature. That creature becomes a Vampire in addition to its other types. Put a +1/+1 counter on Olivia Voldaren. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}{R}")); ability.addTarget(new TargetCreaturePermanent(filter)); - ability.addEffect(new AddCardSubTypeTargetEffect("Vampire", Constants.Duration.WhileOnBattlefield)); + ability.addEffect(new AddCardSubTypeTargetEffect("Vampire", Duration.WhileOnBattlefield)); ability.addEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance())); this.addAbility(ability); // {3}{B}{B}: Gain control of target Vampire for as long as you control Olivia Voldaren. - ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainControlTargetEffect(Constants.Duration.Custom), new ControlsPermanentCondition(filter2), rule); - Ability ability2 = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, effect, new ManaCostsImpl("{3}{B}{B}")); + ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainControlTargetEffect(Duration.Custom), new ControlsPermanentCondition(filter2), rule); + Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{3}{B}{B}")); ability2.addTarget(new TargetCreaturePermanent(vampireFilter)); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/innistrad/OneEyedScarecrow.java b/Mage.Sets/src/mage/sets/innistrad/OneEyedScarecrow.java index c6a7fcc4d7e..ae8eaa1365d 100644 --- a/Mage.Sets/src/mage/sets/innistrad/OneEyedScarecrow.java +++ b/Mage.Sets/src/mage/sets/innistrad/OneEyedScarecrow.java @@ -28,11 +28,11 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostAllEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/OrchardSpirit.java b/Mage.Sets/src/mage/sets/innistrad/OrchardSpirit.java index f9c67b95f33..cfb661fd2d7 100644 --- a/Mage.Sets/src/mage/sets/innistrad/OrchardSpirit.java +++ b/Mage.Sets/src/mage/sets/innistrad/OrchardSpirit.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.EvasionAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/ParallelLives.java b/Mage.Sets/src/mage/sets/innistrad/ParallelLives.java index 3064c4a8b95..7b0af81fa0f 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ParallelLives.java +++ b/Mage.Sets/src/mage/sets/innistrad/ParallelLives.java @@ -28,11 +28,11 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; diff --git a/Mage.Sets/src/mage/sets/innistrad/Paraselene.java b/Mage.Sets/src/mage/sets/innistrad/Paraselene.java index c4bce32fb90..ac130add68e 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Paraselene.java +++ b/Mage.Sets/src/mage/sets/innistrad/Paraselene.java @@ -27,12 +27,12 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.common.FilterEnchantment; import mage.game.Game; import mage.game.permanent.Permanent; @@ -68,7 +68,7 @@ public class Paraselene extends CardImpl { class ParaseleneEffect extends OneShotEffect { public ParaseleneEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); staticText = "Destroy all enchantments. You gain 1 life for each enchantment destroyed this way"; } diff --git a/Mage.Sets/src/mage/sets/innistrad/PastInFlames.java b/Mage.Sets/src/mage/sets/innistrad/PastInFlames.java index 304791b07f3..319fb037722 100644 --- a/Mage.Sets/src/mage/sets/innistrad/PastInFlames.java +++ b/Mage.Sets/src/mage/sets/innistrad/PastInFlames.java @@ -28,13 +28,13 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.TimingRule; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.TimingRule; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.ContinuousEffectImpl; diff --git a/Mage.Sets/src/mage/sets/innistrad/PitchburnDevils.java b/Mage.Sets/src/mage/sets/innistrad/PitchburnDevils.java index a338d61c555..473ddc619e0 100644 --- a/Mage.Sets/src/mage/sets/innistrad/PitchburnDevils.java +++ b/Mage.Sets/src/mage/sets/innistrad/PitchburnDevils.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/PreyUpon.java b/Mage.Sets/src/mage/sets/innistrad/PreyUpon.java index 9143e768237..d157cb1d878 100644 --- a/Mage.Sets/src/mage/sets/innistrad/PreyUpon.java +++ b/Mage.Sets/src/mage/sets/innistrad/PreyUpon.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.abilities.effects.common.FightTargetsEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/innistrad/PurifyTheGrave.java b/Mage.Sets/src/mage/sets/innistrad/PurifyTheGrave.java index 3d741618653..730ec3466ef 100644 --- a/Mage.Sets/src/mage/sets/innistrad/PurifyTheGrave.java +++ b/Mage.Sets/src/mage/sets/innistrad/PurifyTheGrave.java @@ -29,13 +29,13 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; +import mage.constants.TimingRule; import mage.target.common.TargetCardInGraveyard; /** @@ -55,7 +55,7 @@ public class PurifyTheGrave extends CardImpl { this.getSpellAbility().addTarget(new TargetCardInGraveyard()); // Flashback {W} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{W}"), Constants.TimingRule.INSTANT)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{W}"), TimingRule.INSTANT)); } public PurifyTheGrave(final PurifyTheGrave card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/RageThrower.java b/Mage.Sets/src/mage/sets/innistrad/RageThrower.java index d0d0195d989..d21db617c82 100644 --- a/Mage.Sets/src/mage/sets/innistrad/RageThrower.java +++ b/Mage.Sets/src/mage/sets/innistrad/RageThrower.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/RakishHeir.java b/Mage.Sets/src/mage/sets/innistrad/RakishHeir.java index 22b2027a690..a69da60d87f 100644 --- a/Mage.Sets/src/mage/sets/innistrad/RakishHeir.java +++ b/Mage.Sets/src/mage/sets/innistrad/RakishHeir.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.counter.AddCountersTargetEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/RallyThePeasants.java b/Mage.Sets/src/mage/sets/innistrad/RallyThePeasants.java index 3ddb8929d7d..ffa8eb1eaf9 100644 --- a/Mage.Sets/src/mage/sets/innistrad/RallyThePeasants.java +++ b/Mage.Sets/src/mage/sets/innistrad/RallyThePeasants.java @@ -27,13 +27,14 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.TimingRule; import java.util.UUID; @@ -49,10 +50,10 @@ public class RallyThePeasants extends CardImpl { this.color.setWhite(true); // Creatures you control get +2/+0 until end of turn. - this.getSpellAbility().addEffect(new BoostControlledEffect(2, 0, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostControlledEffect(2, 0, Duration.EndOfTurn)); // Flashback {2}{R} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{2}{R}"), Constants.TimingRule.INSTANT)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{2}{R}"), TimingRule.INSTANT)); } public RallyThePeasants(final RallyThePeasants card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/RampagingWerewolf.java b/Mage.Sets/src/mage/sets/innistrad/RampagingWerewolf.java index 9d41d7ae5c4..4f41ace97b0 100644 --- a/Mage.Sets/src/mage/sets/innistrad/RampagingWerewolf.java +++ b/Mage.Sets/src/mage/sets/innistrad/RampagingWerewolf.java @@ -27,9 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -38,6 +37,7 @@ import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import java.util.UUID; @@ -60,7 +60,7 @@ public class RampagingWerewolf extends CardImpl { this.toughness = new MageInt(4); // At the beginning of each upkeep, if a player cast two or more spells last turn, transform Rampaging Werewolf. - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), Constants.TargetController.ANY, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), TargetController.ANY, false); this.addAbility(new ConditionalTriggeredAbility(ability, TwoOrMoreSpellsWereCastLastTurnCondition.getInstance(), TransformAbility.TWO_OR_MORE_SPELLS_TRANSFORM_RULE)); } diff --git a/Mage.Sets/src/mage/sets/innistrad/RangersGuile.java b/Mage.Sets/src/mage/sets/innistrad/RangersGuile.java index 972af38610d..18e01af7f5e 100644 --- a/Mage.Sets/src/mage/sets/innistrad/RangersGuile.java +++ b/Mage.Sets/src/mage/sets/innistrad/RangersGuile.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.HexproofAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/ReaperFromTheAbyss.java b/Mage.Sets/src/mage/sets/innistrad/ReaperFromTheAbyss.java index 2979058a8fc..2e6a837a706 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ReaperFromTheAbyss.java +++ b/Mage.Sets/src/mage/sets/innistrad/ReaperFromTheAbyss.java @@ -29,15 +29,16 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -86,7 +87,7 @@ public class ReaperFromTheAbyss extends CardImpl { class ReaperFromTheAbyssAbility extends TriggeredAbilityImpl { public ReaperFromTheAbyssAbility() { - super(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(), false); + super(Zone.BATTLEFIELD, new DestroyTargetEffect(), false); } public ReaperFromTheAbyssAbility(final ReaperFromTheAbyssAbility ability) { diff --git a/Mage.Sets/src/mage/sets/innistrad/Rebuke.java b/Mage.Sets/src/mage/sets/innistrad/Rebuke.java index e203add70f7..9cd0a58813f 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Rebuke.java +++ b/Mage.Sets/src/mage/sets/innistrad/Rebuke.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterAttackingCreature; diff --git a/Mage.Sets/src/mage/sets/innistrad/RecklessWaif.java b/Mage.Sets/src/mage/sets/innistrad/RecklessWaif.java index 7d5cc36eacb..6295a49b98c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/RecklessWaif.java +++ b/Mage.Sets/src/mage/sets/innistrad/RecklessWaif.java @@ -27,9 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -38,6 +37,7 @@ import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import java.util.UUID; @@ -62,7 +62,7 @@ public class RecklessWaif extends CardImpl { // At the beginning of each upkeep, if no spells were cast last turn, transform Reckless Waif. this.addAbility(new TransformAbility()); - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), Constants.TargetController.ANY, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), TargetController.ANY, false); this.addAbility(new ConditionalTriggeredAbility(ability, NoSpellsWereCastLastTurnCondition.getInstance(), TransformAbility.NO_SPELLS_TRANSFORM_RULE)); } diff --git a/Mage.Sets/src/mage/sets/innistrad/RiotDevils.java b/Mage.Sets/src/mage/sets/innistrad/RiotDevils.java index 9a12a448fe3..b4bffaada2a 100644 --- a/Mage.Sets/src/mage/sets/innistrad/RiotDevils.java +++ b/Mage.Sets/src/mage/sets/innistrad/RiotDevils.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/innistrad/RollingTemblor.java b/Mage.Sets/src/mage/sets/innistrad/RollingTemblor.java index ffbff5762cf..48af72fd6f6 100644 --- a/Mage.Sets/src/mage/sets/innistrad/RollingTemblor.java +++ b/Mage.Sets/src/mage/sets/innistrad/RollingTemblor.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TimingRule; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TimingRule; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.keyword.FlashbackAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/RooftopStorm.java b/Mage.Sets/src/mage/sets/innistrad/RooftopStorm.java index baca5e5b0f0..9cb438d076e 100644 --- a/Mage.Sets/src/mage/sets/innistrad/RooftopStorm.java +++ b/Mage.Sets/src/mage/sets/innistrad/RooftopStorm.java @@ -27,10 +27,7 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.common.SimpleStaticAbility; @@ -59,7 +56,7 @@ public class RooftopStorm extends CardImpl { this.color.setBlue(true); // You may pay {0} rather than pay the mana cost for Zombie creature spells you cast. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new RooftopStormCostReductionEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new RooftopStormCostReductionEffect())); } @@ -78,7 +75,7 @@ class RooftopStormCostReductionEffect extends CostModificationEffectImpl { this.subtype.add("Equipment"); // Equip {2} - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(2))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); // Equipped creature has first strike and gets +X/+0 where X is the number of instant and sorcery cards in your graveyard. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(new RunechantersPikeValue(), new StaticValue(0)))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(new RunechantersPikeValue(), new StaticValue(0)))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); } public RunechantersPike(final RunechantersPike card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/RunicRepetition.java b/Mage.Sets/src/mage/sets/innistrad/RunicRepetition.java index 2935abeaad0..b9422ff171d 100644 --- a/Mage.Sets/src/mage/sets/innistrad/RunicRepetition.java +++ b/Mage.Sets/src/mage/sets/innistrad/RunicRepetition.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/innistrad/ScourgeOfGeierReach.java b/Mage.Sets/src/mage/sets/innistrad/ScourgeOfGeierReach.java index b20f326be2d..0c404ab5b43 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ScourgeOfGeierReach.java +++ b/Mage.Sets/src/mage/sets/innistrad/ScourgeOfGeierReach.java @@ -28,11 +28,11 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; diff --git a/Mage.Sets/src/mage/sets/innistrad/ScreechingBat.java b/Mage.Sets/src/mage/sets/innistrad/ScreechingBat.java index ffa8655fb9a..2f3b1b2472c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ScreechingBat.java +++ b/Mage.Sets/src/mage/sets/innistrad/ScreechingBat.java @@ -27,9 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -39,6 +38,8 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -84,7 +85,7 @@ public class ScreechingBat extends CardImpl { class ScreechingBatBeginningOfUpkeepTriggeredAbility extends TriggeredAbilityImpl { public ScreechingBatBeginningOfUpkeepTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new ScreechingBatTransformSourceEffect()); + super(Zone.BATTLEFIELD, new ScreechingBatTransformSourceEffect()); } public ScreechingBatBeginningOfUpkeepTriggeredAbility(final ScreechingBatBeginningOfUpkeepTriggeredAbility ability) { @@ -113,7 +114,7 @@ class ScreechingBatBeginningOfUpkeepTriggeredAbility extends TriggeredAbilityImp class ScreechingBatTransformSourceEffect extends OneShotEffect { public ScreechingBatTransformSourceEffect() { - super(Constants.Outcome.Transform); + super(Outcome.Transform); staticText = "transform {this}"; } diff --git a/Mage.Sets/src/mage/sets/innistrad/SelflessCathar.java b/Mage.Sets/src/mage/sets/innistrad/SelflessCathar.java index a6b6b777f95..61578dd7436 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SelflessCathar.java +++ b/Mage.Sets/src/mage/sets/innistrad/SelflessCathar.java @@ -27,9 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,6 +36,8 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import java.util.UUID; @@ -56,7 +57,7 @@ public class SelflessCathar extends CardImpl { this.toughness = new MageInt(1); // {1}{W}, Sacrifice Selfless Cathar: Creatures you control get +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Constants.Duration.EndOfTurn), new ManaCostsImpl("{1}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{1}{W}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/SelhoffOccultist.java b/Mage.Sets/src/mage/sets/innistrad/SelhoffOccultist.java index 1b8bc9a84ef..0be0f434f8c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SelhoffOccultist.java +++ b/Mage.Sets/src/mage/sets/innistrad/SelhoffOccultist.java @@ -27,8 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesThisOrAnotherCreatureTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/SensoryDeprivation.java b/Mage.Sets/src/mage/sets/innistrad/SensoryDeprivation.java index 07191978151..a01a52e7266 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SensoryDeprivation.java +++ b/Mage.Sets/src/mage/sets/innistrad/SensoryDeprivation.java @@ -28,11 +28,11 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continious.BoostEnchantedEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/SeverTheBloodline.java b/Mage.Sets/src/mage/sets/innistrad/SeverTheBloodline.java index fb2691e7fa9..81176caf304 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SeverTheBloodline.java +++ b/Mage.Sets/src/mage/sets/innistrad/SeverTheBloodline.java @@ -29,10 +29,10 @@ package mage.sets.innistrad; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TimingRule; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TimingRule; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/SharpenedPitchfork.java b/Mage.Sets/src/mage/sets/innistrad/SharpenedPitchfork.java index a58d13de825..c5b02cb9e5f 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SharpenedPitchfork.java +++ b/Mage.Sets/src/mage/sets/innistrad/SharpenedPitchfork.java @@ -28,11 +28,11 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EquippedHasSubtypeCondition; import mage.abilities.costs.mana.GenericManaCost; @@ -42,6 +42,7 @@ import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; /** * @@ -57,13 +58,13 @@ public class SharpenedPitchfork extends CardImpl { this.subtype.add("Equipment"); // Equip {1} - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(1))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1))); // Equipped creature has first strike. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); // As long as equipped creature is a Human, it gets +1/+1. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEquippedEffect(1, 1), new EquippedHasSubtypeCondition("Human"), staticText))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEquippedEffect(1, 1), new EquippedHasSubtypeCondition("Human"), staticText))); } public SharpenedPitchfork(final SharpenedPitchfork card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/SilentDeparture.java b/Mage.Sets/src/mage/sets/innistrad/SilentDeparture.java index a43f7aaea45..d08a461cf86 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SilentDeparture.java +++ b/Mage.Sets/src/mage/sets/innistrad/SilentDeparture.java @@ -29,13 +29,13 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; +import mage.constants.TimingRule; import mage.target.common.TargetCreaturePermanent; /** @@ -55,7 +55,7 @@ public class SilentDeparture extends CardImpl { this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); // Flashback {4}{U} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{4}{U}"), Constants.TimingRule.SORCERY)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{4}{U}"), TimingRule.SORCERY)); } public SilentDeparture(final SilentDeparture card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/SilverInlaidDagger.java b/Mage.Sets/src/mage/sets/innistrad/SilverInlaidDagger.java index fddc287b5f5..9a576cb60d3 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SilverInlaidDagger.java +++ b/Mage.Sets/src/mage/sets/innistrad/SilverInlaidDagger.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EquippedHasSubtypeCondition; import mage.abilities.costs.mana.GenericManaCost; @@ -38,6 +38,8 @@ import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; /** * @author nantuko @@ -52,13 +54,13 @@ public class SilverInlaidDagger extends CardImpl { this.subtype.add("Equipment"); // Equip {2} - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(2))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); // Equipped creature gets +2/+0 - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); // As long as equipped creature is a Human, it gets an additional +1/+0 - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEquippedEffect(1, 0), new EquippedHasSubtypeCondition("Human"), staticText))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEquippedEffect(1, 0), new EquippedHasSubtypeCondition("Human"), staticText))); } public SilverInlaidDagger(final SilverInlaidDagger card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/SilverchaseFox.java b/Mage.Sets/src/mage/sets/innistrad/SilverchaseFox.java index 02748f205f2..a51bb451d31 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SilverchaseFox.java +++ b/Mage.Sets/src/mage/sets/innistrad/SilverchaseFox.java @@ -27,9 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,6 +36,7 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; @@ -64,7 +64,7 @@ public class SilverchaseFox extends CardImpl { this.toughness = new MageInt(2); // {1}{W}, Sacrifice Silverchase Fox: Exile target enchantment. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl("{1}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl("{1}{W}")); ability.addTarget(new TargetPermanent(filter)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/innistrad/SkaabGoliath.java b/Mage.Sets/src/mage/sets/innistrad/SkaabGoliath.java index 8e33b065a78..0a500a8d78e 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SkaabGoliath.java +++ b/Mage.Sets/src/mage/sets/innistrad/SkaabGoliath.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.common.ExileFromGraveCost; import mage.abilities.keyword.TrampleAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/SkaabRuinator.java b/Mage.Sets/src/mage/sets/innistrad/SkaabRuinator.java index 9cf38e7e522..92297e315bc 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SkaabRuinator.java +++ b/Mage.Sets/src/mage/sets/innistrad/SkaabRuinator.java @@ -29,11 +29,11 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TimingRule; -import mage.Constants; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Outcome; +import mage.constants.TimingRule; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.ActivatedAbilityImpl; @@ -87,8 +87,8 @@ public class SkaabRuinator extends CardImpl { class SkaabRuinatorAbility extends ActivatedAbilityImpl { - public SkaabRuinatorAbility(ManaCosts costs, Constants.TimingRule timingRule) { - super(Constants.Zone.GRAVEYARD, new SkaabRuinatorEffect(), costs); + public SkaabRuinatorAbility(ManaCosts costs, TimingRule timingRule) { + super(Zone.GRAVEYARD, new SkaabRuinatorEffect(), costs); this.timing = TimingRule.SORCERY; this.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(3, 3, new FilterCreatureCard("creature card from your graveyard")))); this.usesStack = false; @@ -122,7 +122,7 @@ class SkaabRuinatorAbility extends ActivatedAbilityImpl { class SkaabRuinatorEffect extends OneShotEffect { public SkaabRuinatorEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); staticText = ""; } diff --git a/Mage.Sets/src/mage/sets/innistrad/SkeletalGrimace.java b/Mage.Sets/src/mage/sets/innistrad/SkeletalGrimace.java index 92782dafbdd..7e3bde391e0 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SkeletalGrimace.java +++ b/Mage.Sets/src/mage/sets/innistrad/SkeletalGrimace.java @@ -28,12 +28,12 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/SkirsdagCultist.java b/Mage.Sets/src/mage/sets/innistrad/SkirsdagCultist.java index 1e52b25bd53..071a4d81ab1 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SkirsdagCultist.java +++ b/Mage.Sets/src/mage/sets/innistrad/SkirsdagCultist.java @@ -27,9 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +37,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreatureOrPlayer; @@ -59,7 +59,7 @@ public class SkirsdagCultist extends CardImpl { this.toughness = new MageInt(2); // {R}, {T}, Sacrifice a creature: Skirsdag Cultist deals 2 damage to target creature or player. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); ability.addTarget(new TargetCreatureOrPlayer()); diff --git a/Mage.Sets/src/mage/sets/innistrad/SkirsdagHighPriest.java b/Mage.Sets/src/mage/sets/innistrad/SkirsdagHighPriest.java index ec384db1d55..fdf9a5327dc 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SkirsdagHighPriest.java +++ b/Mage.Sets/src/mage/sets/innistrad/SkirsdagHighPriest.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/SlayerOfTheWicked.java b/Mage.Sets/src/mage/sets/innistrad/SlayerOfTheWicked.java index 1ee4d980020..a8e7ab45888 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SlayerOfTheWicked.java +++ b/Mage.Sets/src/mage/sets/innistrad/SlayerOfTheWicked.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/SmiteTheMonstrous.java b/Mage.Sets/src/mage/sets/innistrad/SmiteTheMonstrous.java index 344e57c590a..42f8667f33f 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SmiteTheMonstrous.java +++ b/Mage.Sets/src/mage/sets/innistrad/SmiteTheMonstrous.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.Filter; diff --git a/Mage.Sets/src/mage/sets/innistrad/SnapcasterMage.java b/Mage.Sets/src/mage/sets/innistrad/SnapcasterMage.java index fee9afdf692..40b29b2935c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SnapcasterMage.java +++ b/Mage.Sets/src/mage/sets/innistrad/SnapcasterMage.java @@ -28,13 +28,13 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.TimingRule; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.TimingRule; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/innistrad/SomberwaldSpider.java b/Mage.Sets/src/mage/sets/innistrad/SomberwaldSpider.java index 2e14c6c8490..39a0655c176 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SomberwaldSpider.java +++ b/Mage.Sets/src/mage/sets/innistrad/SomberwaldSpider.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.common.MorbidCondition; diff --git a/Mage.Sets/src/mage/sets/innistrad/SpareFromEvil.java b/Mage.Sets/src/mage/sets/innistrad/SpareFromEvil.java index 625f694d8f7..3aefa999383 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SpareFromEvil.java +++ b/Mage.Sets/src/mage/sets/innistrad/SpareFromEvil.java @@ -27,12 +27,12 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -58,7 +58,7 @@ public class SpareFromEvil extends CardImpl { this.color.setWhite(true); // Creatures you control gain protection from non-Human creatures until end of turn. - this.getSpellAbility().addEffect(new GainAbilityControlledEffect(new ProtectionAbility(filterNonHuman), Constants.Duration.EndOfTurn, new FilterCreaturePermanent(), false)); + this.getSpellAbility().addEffect(new GainAbilityControlledEffect(new ProtectionAbility(filterNonHuman), Duration.EndOfTurn, new FilterCreaturePermanent(), false)); } public SpareFromEvil(final SpareFromEvil card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/SpectralFlight.java b/Mage.Sets/src/mage/sets/innistrad/SpectralFlight.java index 0f6479d9053..1c6a070f108 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SpectralFlight.java +++ b/Mage.Sets/src/mage/sets/innistrad/SpectralFlight.java @@ -29,9 +29,7 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -59,13 +57,13 @@ public class SpectralFlight extends CardImpl { // Enchant creature TargetPermanent target = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(target); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(target.getTargetName()); this.addAbility(ability); // Enchanted creature gets +2/+2 and has flying. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Constants.Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); } public SpectralFlight(final SpectralFlight card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/SpectralRider.java b/Mage.Sets/src/mage/sets/innistrad/SpectralRider.java index cb6855ad00e..6996765169a 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SpectralRider.java +++ b/Mage.Sets/src/mage/sets/innistrad/SpectralRider.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.IntimidateAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/innistrad/SpiderSpawning.java b/Mage.Sets/src/mage/sets/innistrad/SpiderSpawning.java index 921a0b68cf4..2c9f08d9409 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SpiderSpawning.java +++ b/Mage.Sets/src/mage/sets/innistrad/SpiderSpawning.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TimingRule; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TimingRule; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount; diff --git a/Mage.Sets/src/mage/sets/innistrad/SpideryGrasp.java b/Mage.Sets/src/mage/sets/innistrad/SpideryGrasp.java index c920f806f6c..615926cbd9b 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SpideryGrasp.java +++ b/Mage.Sets/src/mage/sets/innistrad/SpideryGrasp.java @@ -27,14 +27,14 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -51,8 +51,8 @@ public class SpideryGrasp extends CardImpl { // Untap target creature. It gets +2/+4 and gains reach until end of turn. this.getSpellAbility().addEffect(new UntapTargetEffect()); - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(ReachAbility.getInstance(), Constants.Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new BoostTargetEffect(2, 4, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(ReachAbility.getInstance(), Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(2, 4, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/innistrad/Splinterfright.java b/Mage.Sets/src/mage/sets/innistrad/Splinterfright.java index bd8e58ecd4c..1f7e7bf4c32 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Splinterfright.java +++ b/Mage.Sets/src/mage/sets/innistrad/Splinterfright.java @@ -28,26 +28,20 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; -import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount; -import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.PutTopCardOfYourLibraryIntoGraveEffect; import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect; import mage.abilities.keyword.TrampleAbility; -import mage.cards.Card; import mage.cards.CardImpl; import mage.filter.common.FilterCreatureCard; -import mage.game.Game; import mage.game.events.GameEvent.EventType; -import mage.players.Player; /** * diff --git a/Mage.Sets/src/mage/sets/innistrad/StalkingVampire.java b/Mage.Sets/src/mage/sets/innistrad/StalkingVampire.java index 843ec63b2cd..6650adb7ada 100644 --- a/Mage.Sets/src/mage/sets/innistrad/StalkingVampire.java +++ b/Mage.Sets/src/mage/sets/innistrad/StalkingVampire.java @@ -27,8 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/innistrad/StensiaBloodhall.java b/Mage.Sets/src/mage/sets/innistrad/StensiaBloodhall.java index a4c7f83b3ed..af4ff2947f3 100644 --- a/Mage.Sets/src/mage/sets/innistrad/StensiaBloodhall.java +++ b/Mage.Sets/src/mage/sets/innistrad/StensiaBloodhall.java @@ -27,9 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -37,6 +36,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetPlayer; import java.util.UUID; @@ -54,7 +54,7 @@ public class StensiaBloodhall extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {3}{B}{R}, {T}: Stensia Bloodhall deals 2 damage to target player. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{3}{B}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{3}{B}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/innistrad/StitchedDrake.java b/Mage.Sets/src/mage/sets/innistrad/StitchedDrake.java index b2430433fdf..60bff6e5705 100644 --- a/Mage.Sets/src/mage/sets/innistrad/StitchedDrake.java +++ b/Mage.Sets/src/mage/sets/innistrad/StitchedDrake.java @@ -27,8 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.common.ExileFromGraveCost; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/StitchersApprentice.java b/Mage.Sets/src/mage/sets/innistrad/StitchersApprentice.java index c575f5039ba..7730ca1fa99 100644 --- a/Mage.Sets/src/mage/sets/innistrad/StitchersApprentice.java +++ b/Mage.Sets/src/mage/sets/innistrad/StitchersApprentice.java @@ -28,10 +28,10 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/StonySilence.java b/Mage.Sets/src/mage/sets/innistrad/StonySilence.java index 9e014e89828..85b75fac599 100644 --- a/Mage.Sets/src/mage/sets/innistrad/StonySilence.java +++ b/Mage.Sets/src/mage/sets/innistrad/StonySilence.java @@ -28,11 +28,11 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; diff --git a/Mage.Sets/src/mage/sets/innistrad/StromkirkNoble.java b/Mage.Sets/src/mage/sets/innistrad/StromkirkNoble.java index 97ff697465f..409e242b3de 100644 --- a/Mage.Sets/src/mage/sets/innistrad/StromkirkNoble.java +++ b/Mage.Sets/src/mage/sets/innistrad/StromkirkNoble.java @@ -29,10 +29,10 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/StromkirkPatrol.java b/Mage.Sets/src/mage/sets/innistrad/StromkirkPatrol.java index da2929ff7be..e3c2c319b7e 100644 --- a/Mage.Sets/src/mage/sets/innistrad/StromkirkPatrol.java +++ b/Mage.Sets/src/mage/sets/innistrad/StromkirkPatrol.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/Sturmgeist.java b/Mage.Sets/src/mage/sets/innistrad/Sturmgeist.java index 802e69ffb02..c61cfcc6732 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Sturmgeist.java +++ b/Mage.Sets/src/mage/sets/innistrad/Sturmgeist.java @@ -28,10 +28,10 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/SulfurFalls.java b/Mage.Sets/src/mage/sets/innistrad/SulfurFalls.java index 5e50d3fd103..fd33939215c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SulfurFalls.java +++ b/Mage.Sets/src/mage/sets/innistrad/SulfurFalls.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; diff --git a/Mage.Sets/src/mage/sets/innistrad/TerrorOfKruinPass.java b/Mage.Sets/src/mage/sets/innistrad/TerrorOfKruinPass.java index 300fe63ec81..29b1d7364ab 100644 --- a/Mage.Sets/src/mage/sets/innistrad/TerrorOfKruinPass.java +++ b/Mage.Sets/src/mage/sets/innistrad/TerrorOfKruinPass.java @@ -28,10 +28,10 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/ThinkTwice.java b/Mage.Sets/src/mage/sets/innistrad/ThinkTwice.java index 7311383dc10..04f3489f376 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ThinkTwice.java +++ b/Mage.Sets/src/mage/sets/innistrad/ThinkTwice.java @@ -29,13 +29,13 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; +import mage.constants.TimingRule; /** * @@ -53,7 +53,7 @@ public class ThinkTwice extends CardImpl { this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); // Flashback {2}{U} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{2}{U}"), Constants.TimingRule.INSTANT)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{2}{U}"), TimingRule.INSTANT)); } public ThinkTwice(final ThinkTwice card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/ThrabenMilitia.java b/Mage.Sets/src/mage/sets/innistrad/ThrabenMilitia.java index bcb1c739c65..5a32566af7f 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ThrabenMilitia.java +++ b/Mage.Sets/src/mage/sets/innistrad/ThrabenMilitia.java @@ -27,8 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/innistrad/ThrabenPurebloods.java b/Mage.Sets/src/mage/sets/innistrad/ThrabenPurebloods.java index 774172ff25f..ea32ddc0864 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ThrabenPurebloods.java +++ b/Mage.Sets/src/mage/sets/innistrad/ThrabenPurebloods.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/innistrad/ThrabenSentry.java b/Mage.Sets/src/mage/sets/innistrad/ThrabenSentry.java index f11efd7da42..09fa605b026 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ThrabenSentry.java +++ b/Mage.Sets/src/mage/sets/innistrad/ThrabenSentry.java @@ -27,15 +27,15 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -81,7 +81,7 @@ public class ThrabenSentry extends CardImpl { class ThrabenSentryTriggeredAbility extends TriggeredAbilityImpl { public ThrabenSentryTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new TransformSourceEffect(true), true); + super(Zone.BATTLEFIELD, new TransformSourceEffect(true), true); } public ThrabenSentryTriggeredAbility(ThrabenSentryTriggeredAbility ability) { @@ -106,8 +106,8 @@ class ThrabenSentryTriggeredAbility extends TriggeredAbilityImpl { // At the beginning of each upkeep, if no spells were cast last turn, transform Tormented Pariah. this.addAbility(new TransformAbility()); - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), Constants.TargetController.ANY, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), TargetController.ANY, false); this.addAbility(new ConditionalTriggeredAbility(ability, NoSpellsWereCastLastTurnCondition.getInstance(), TransformAbility.NO_SPELLS_TRANSFORM_RULE)); } diff --git a/Mage.Sets/src/mage/sets/innistrad/TraitorousBlood.java b/Mage.Sets/src/mage/sets/innistrad/TraitorousBlood.java index 61e1fc0716d..57c27db3e24 100644 --- a/Mage.Sets/src/mage/sets/innistrad/TraitorousBlood.java +++ b/Mage.Sets/src/mage/sets/innistrad/TraitorousBlood.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.effects.common.continious.GainControlTargetEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/TravelPreparations.java b/Mage.Sets/src/mage/sets/innistrad/TravelPreparations.java index a9a9ca7484c..7393e9536d1 100644 --- a/Mage.Sets/src/mage/sets/innistrad/TravelPreparations.java +++ b/Mage.Sets/src/mage/sets/innistrad/TravelPreparations.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TimingRule; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TimingRule; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.keyword.FlashbackAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/TravelersAmulet.java b/Mage.Sets/src/mage/sets/innistrad/TravelersAmulet.java index 39219d567fe..17540bbf3b9 100644 --- a/Mage.Sets/src/mage/sets/innistrad/TravelersAmulet.java +++ b/Mage.Sets/src/mage/sets/innistrad/TravelersAmulet.java @@ -29,15 +29,15 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterBasicLandCard; import mage.target.common.TargetCardInLibrary; @@ -53,7 +53,7 @@ public class TravelersAmulet extends CardImpl { // {1}, Sacrifice Traveler's Amulet: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(new FilterBasicLandCard()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(target, true), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(target, true), new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/TreeOfRedemption.java b/Mage.Sets/src/mage/sets/innistrad/TreeOfRedemption.java index efecaa39bd7..61aefef0bc3 100644 --- a/Mage.Sets/src/mage/sets/innistrad/TreeOfRedemption.java +++ b/Mage.Sets/src/mage/sets/innistrad/TreeOfRedemption.java @@ -28,11 +28,11 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/TrepanationBlade.java b/Mage.Sets/src/mage/sets/innistrad/TrepanationBlade.java index 8c1c6075bd6..3c378e61596 100644 --- a/Mage.Sets/src/mage/sets/innistrad/TrepanationBlade.java +++ b/Mage.Sets/src/mage/sets/innistrad/TrepanationBlade.java @@ -28,13 +28,13 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.AttacksEquippedTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/TributeToHunger.java b/Mage.Sets/src/mage/sets/innistrad/TributeToHunger.java index 761c82eed91..6ca86d52af9 100644 --- a/Mage.Sets/src/mage/sets/innistrad/TributeToHunger.java +++ b/Mage.Sets/src/mage/sets/innistrad/TributeToHunger.java @@ -28,10 +28,10 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/innistrad/TyphoidRats.java b/Mage.Sets/src/mage/sets/innistrad/TyphoidRats.java index 97ed98ec504..d2e549cae00 100644 --- a/Mage.Sets/src/mage/sets/innistrad/TyphoidRats.java +++ b/Mage.Sets/src/mage/sets/innistrad/TyphoidRats.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/innistrad/UlvenwaldMystics.java b/Mage.Sets/src/mage/sets/innistrad/UlvenwaldMystics.java index 2197df75d51..f9a49dc2d26 100644 --- a/Mage.Sets/src/mage/sets/innistrad/UlvenwaldMystics.java +++ b/Mage.Sets/src/mage/sets/innistrad/UlvenwaldMystics.java @@ -27,9 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -38,6 +37,7 @@ import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import java.util.UUID; @@ -62,7 +62,7 @@ public class UlvenwaldMystics extends CardImpl { // At the beginning of each upkeep, if no spells were cast last turn, transform Ulvenwald Mystics. this.addAbility(new TransformAbility()); - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), Constants.TargetController.ANY, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), TargetController.ANY, false); this.addAbility(new ConditionalTriggeredAbility(ability, NoSpellsWereCastLastTurnCondition.getInstance(), TransformAbility.NO_SPELLS_TRANSFORM_RULE)); } diff --git a/Mage.Sets/src/mage/sets/innistrad/UlvenwaldPrimordials.java b/Mage.Sets/src/mage/sets/innistrad/UlvenwaldPrimordials.java index f2d6a176dfa..d28fbfa0323 100644 --- a/Mage.Sets/src/mage/sets/innistrad/UlvenwaldPrimordials.java +++ b/Mage.Sets/src/mage/sets/innistrad/UlvenwaldPrimordials.java @@ -27,9 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -41,6 +40,8 @@ import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; +import mage.constants.Zone; import java.util.UUID; @@ -63,10 +64,10 @@ public class UlvenwaldPrimordials extends CardImpl { this.toughness = new MageInt(5); // {G}: Regenerate Ulvenwald Primordials. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{G}"))); // At the beginning of each upkeep, if a player cast two or more spells last turn, transform Ulvenwald Primordials. - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), Constants.TargetController.ANY, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), TargetController.ANY, false); this.addAbility(new ConditionalTriggeredAbility(ability, TwoOrMoreSpellsWereCastLastTurnCondition.getInstance(), TransformAbility.TWO_OR_MORE_SPELLS_TRANSFORM_RULE)); } diff --git a/Mage.Sets/src/mage/sets/innistrad/UnbreathingHorde.java b/Mage.Sets/src/mage/sets/innistrad/UnbreathingHorde.java index dfbde00d895..599641aa388 100644 --- a/Mage.Sets/src/mage/sets/innistrad/UnbreathingHorde.java +++ b/Mage.Sets/src/mage/sets/innistrad/UnbreathingHorde.java @@ -28,11 +28,11 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/UnburialRites.java b/Mage.Sets/src/mage/sets/innistrad/UnburialRites.java index 636c0405371..16cbb32200e 100644 --- a/Mage.Sets/src/mage/sets/innistrad/UnburialRites.java +++ b/Mage.Sets/src/mage/sets/innistrad/UnburialRites.java @@ -27,13 +27,13 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; +import mage.constants.TimingRule; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; @@ -55,7 +55,7 @@ public class UnburialRites extends CardImpl { this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard"))); // Flashback {3}{W} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{3}{W}"), Constants.TimingRule.SORCERY)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{3}{W}"), TimingRule.SORCERY)); } public UnburialRites(final UnburialRites card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/UndeadAlchemist.java b/Mage.Sets/src/mage/sets/innistrad/UndeadAlchemist.java index c1fb6dfcdbf..555db5016c1 100644 --- a/Mage.Sets/src/mage/sets/innistrad/UndeadAlchemist.java +++ b/Mage.Sets/src/mage/sets/innistrad/UndeadAlchemist.java @@ -28,10 +28,10 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -41,6 +41,8 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Outcome; import mage.game.Game; import mage.game.events.DamagePlayerEvent; import mage.game.events.GameEvent; @@ -85,7 +87,7 @@ public class UndeadAlchemist extends CardImpl { class UndeadAlchemistTriggeredAbility extends TriggeredAbilityImpl { public UndeadAlchemistTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new ExileTargetEffect(), true); + super(Zone.BATTLEFIELD, new ExileTargetEffect(), true); this.addEffect(new CreateTokenEffect(new ZombieToken())); } @@ -102,7 +104,7 @@ class UndeadAlchemistTriggeredAbility extends TriggeredAbilityImpl { UndeadAlchemistEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.RedirectDamage); + super(Duration.WhileOnBattlefield, Outcome.RedirectDamage); staticText = "If a Zombie you control would deal combat damage to a player, instead that player puts that many cards from the top of his or her library into his or her graveyard"; } diff --git a/Mage.Sets/src/mage/sets/innistrad/UnholyFiend.java b/Mage.Sets/src/mage/sets/innistrad/UnholyFiend.java index 3f82000c364..526fdac798c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/UnholyFiend.java +++ b/Mage.Sets/src/mage/sets/innistrad/UnholyFiend.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; import mage.abilities.effects.common.LoseLifeSourceEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/UnrulyMob.java b/Mage.Sets/src/mage/sets/innistrad/UnrulyMob.java index 15e524f3150..6922102befe 100644 --- a/Mage.Sets/src/mage/sets/innistrad/UnrulyMob.java +++ b/Mage.Sets/src/mage/sets/innistrad/UnrulyMob.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/UrgentExorcism.java b/Mage.Sets/src/mage/sets/innistrad/UrgentExorcism.java index 629a8516ad6..246357bac78 100644 --- a/Mage.Sets/src/mage/sets/innistrad/UrgentExorcism.java +++ b/Mage.Sets/src/mage/sets/innistrad/UrgentExorcism.java @@ -27,8 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/innistrad/VampireInterloper.java b/Mage.Sets/src/mage/sets/innistrad/VampireInterloper.java index 6363a213a34..ea4e7dc6a43 100644 --- a/Mage.Sets/src/mage/sets/innistrad/VampireInterloper.java +++ b/Mage.Sets/src/mage/sets/innistrad/VampireInterloper.java @@ -27,8 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/VampiricFury.java b/Mage.Sets/src/mage/sets/innistrad/VampiricFury.java index aca4be3a979..b2f43d8b21b 100644 --- a/Mage.Sets/src/mage/sets/innistrad/VampiricFury.java +++ b/Mage.Sets/src/mage/sets/innistrad/VampiricFury.java @@ -27,14 +27,14 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Duration; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Duration; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -50,7 +50,7 @@ public class VampiricFury extends CardImpl { static { vampires.add(new SubtypePredicate("Vampire")); - vampires.add(new ControllerPredicate(Constants.TargetController.YOU)); + vampires.add(new ControllerPredicate(TargetController.YOU)); } public VampiricFury(UUID ownerId) { @@ -60,7 +60,7 @@ public class VampiricFury extends CardImpl { this.color.setRed(true); // Vampire creatures you control get +2/+0 and gain first strike until end of turn. - this.getSpellAbility().addEffect(new BoostControlledEffect(2, 0, Constants.Duration.EndOfTurn, vampires)); + this.getSpellAbility().addEffect(new BoostControlledEffect(2, 0, Duration.EndOfTurn, vampires)); this.getSpellAbility().addEffect(new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn, vampires)); } diff --git a/Mage.Sets/src/mage/sets/innistrad/VictimOfNight.java b/Mage.Sets/src/mage/sets/innistrad/VictimOfNight.java index c9208076e29..7f90df407fa 100644 --- a/Mage.Sets/src/mage/sets/innistrad/VictimOfNight.java +++ b/Mage.Sets/src/mage/sets/innistrad/VictimOfNight.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/innistrad/VillageBellRinger.java b/Mage.Sets/src/mage/sets/innistrad/VillageBellRinger.java index d4fb45a2336..3a4eff0e773 100644 --- a/Mage.Sets/src/mage/sets/innistrad/VillageBellRinger.java +++ b/Mage.Sets/src/mage/sets/innistrad/VillageBellRinger.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.UntapAllControllerEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/VillageCannibals.java b/Mage.Sets/src/mage/sets/innistrad/VillageCannibals.java index 24363315862..1766efb911d 100644 --- a/Mage.Sets/src/mage/sets/innistrad/VillageCannibals.java +++ b/Mage.Sets/src/mage/sets/innistrad/VillageCannibals.java @@ -28,9 +28,9 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/innistrad/VillageIronsmith.java b/Mage.Sets/src/mage/sets/innistrad/VillageIronsmith.java index 2ec4da44280..475e0ab9c3f 100644 --- a/Mage.Sets/src/mage/sets/innistrad/VillageIronsmith.java +++ b/Mage.Sets/src/mage/sets/innistrad/VillageIronsmith.java @@ -27,9 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -39,6 +38,7 @@ import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import java.util.UUID; @@ -64,7 +64,7 @@ public class VillageIronsmith extends CardImpl { // At the beginning of each upkeep, if no spells were cast last turn, transform Village Ironsmith. this.addAbility(new TransformAbility()); - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), Constants.TargetController.ANY, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), TargetController.ANY, false); this.addAbility(new ConditionalTriggeredAbility(ability, NoSpellsWereCastLastTurnCondition.getInstance(), TransformAbility.NO_SPELLS_TRANSFORM_RULE)); } diff --git a/Mage.Sets/src/mage/sets/innistrad/VillagersOfEstwald.java b/Mage.Sets/src/mage/sets/innistrad/VillagersOfEstwald.java index c7960cf9360..a656eab0857 100644 --- a/Mage.Sets/src/mage/sets/innistrad/VillagersOfEstwald.java +++ b/Mage.Sets/src/mage/sets/innistrad/VillagersOfEstwald.java @@ -27,9 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -38,6 +37,7 @@ import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import java.util.UUID; @@ -61,7 +61,7 @@ public class VillagersOfEstwald extends CardImpl { // At the beginning of each upkeep, if no spells were cast last turn, transform Villagers of Estwald. this.addAbility(new TransformAbility()); - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), Constants.TargetController.ANY, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), TargetController.ANY, false); this.addAbility(new ConditionalTriggeredAbility(ability, NoSpellsWereCastLastTurnCondition.getInstance(), TransformAbility.NO_SPELLS_TRANSFORM_RULE)); } diff --git a/Mage.Sets/src/mage/sets/innistrad/VoicelessSpirit.java b/Mage.Sets/src/mage/sets/innistrad/VoicelessSpirit.java index b7d14c44e3b..89b7ed164b2 100644 --- a/Mage.Sets/src/mage/sets/innistrad/VoicelessSpirit.java +++ b/Mage.Sets/src/mage/sets/innistrad/VoicelessSpirit.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/WalkingCorpse.java b/Mage.Sets/src/mage/sets/innistrad/WalkingCorpse.java index 71c82b53815..89ae63fd5fb 100644 --- a/Mage.Sets/src/mage/sets/innistrad/WalkingCorpse.java +++ b/Mage.Sets/src/mage/sets/innistrad/WalkingCorpse.java @@ -27,8 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/innistrad/WildbloodPack.java b/Mage.Sets/src/mage/sets/innistrad/WildbloodPack.java index d5a13b00747..1e3fc75648e 100644 --- a/Mage.Sets/src/mage/sets/innistrad/WildbloodPack.java +++ b/Mage.Sets/src/mage/sets/innistrad/WildbloodPack.java @@ -27,9 +27,7 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -66,10 +64,10 @@ public class WildbloodPack extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Attacking creatures you control get +3/+0. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(3, 0, Constants.Duration.WhileOnBattlefield, new FilterAttackingCreature(), false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(3, 0, Duration.WhileOnBattlefield, new FilterAttackingCreature(), false))); // At the beginning of each upkeep, if a player cast two or more spells last turn, transform Wildblood Pack. - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), Constants.TargetController.ANY, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), TargetController.ANY, false); this.addAbility(new ConditionalTriggeredAbility(ability, TwoOrMoreSpellsWereCastLastTurnCondition.getInstance(), TransformAbility.TWO_OR_MORE_SPELLS_TRANSFORM_RULE)); } diff --git a/Mage.Sets/src/mage/sets/innistrad/WitchbaneOrb.java b/Mage.Sets/src/mage/sets/innistrad/WitchbaneOrb.java index 3e2bf7d6baf..fd9d18346de 100644 --- a/Mage.Sets/src/mage/sets/innistrad/WitchbaneOrb.java +++ b/Mage.Sets/src/mage/sets/innistrad/WitchbaneOrb.java @@ -28,10 +28,10 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/WoodenStake.java b/Mage.Sets/src/mage/sets/innistrad/WoodenStake.java index 7f8408dba60..5553ed11b43 100644 --- a/Mage.Sets/src/mage/sets/innistrad/WoodenStake.java +++ b/Mage.Sets/src/mage/sets/innistrad/WoodenStake.java @@ -27,9 +27,8 @@ */ package mage.sets.innistrad; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -38,6 +37,8 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -56,10 +57,10 @@ public class WoodenStake extends CardImpl { this.subtype.add("Equipment"); // Equip {1} - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(1))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1))); // Equipped creature gets +1/+0. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0))); // Whenever equipped creature blocks or becomes blocked by a Vampire, destroy that creature. It can't be regenerated. this.addAbility(new WoodenStakeBlocksOrBecomesBlockedTriggeredAbility()); @@ -78,7 +79,7 @@ public class WoodenStake extends CardImpl { class WoodenStakeBlocksOrBecomesBlockedTriggeredAbility extends TriggeredAbilityImpl { public WoodenStakeBlocksOrBecomesBlockedTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(true), false); + super(Zone.BATTLEFIELD, new DestroyTargetEffect(true), false); } public WoodenStakeBlocksOrBecomesBlockedTriggeredAbility(final WoodenStakeBlocksOrBecomesBlockedTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/innistrad/WoodlandCemetery.java b/Mage.Sets/src/mage/sets/innistrad/WoodlandCemetery.java index 0c1f119eeb2..e43fcdb6e4a 100644 --- a/Mage.Sets/src/mage/sets/innistrad/WoodlandCemetery.java +++ b/Mage.Sets/src/mage/sets/innistrad/WoodlandCemetery.java @@ -28,8 +28,8 @@ package mage.sets.innistrad; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; diff --git a/Mage.Sets/src/mage/sets/innistrad/WoodlandSleuth.java b/Mage.Sets/src/mage/sets/innistrad/WoodlandSleuth.java index f1db0131c19..72824f2e531 100644 --- a/Mage.Sets/src/mage/sets/innistrad/WoodlandSleuth.java +++ b/Mage.Sets/src/mage/sets/innistrad/WoodlandSleuth.java @@ -29,10 +29,10 @@ package mage.sets.innistrad; import java.util.Random; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/WreathofGeists.java b/Mage.Sets/src/mage/sets/innistrad/WreathofGeists.java index aaa8221e3fd..35795ba7e73 100644 --- a/Mage.Sets/src/mage/sets/innistrad/WreathofGeists.java +++ b/Mage.Sets/src/mage/sets/innistrad/WreathofGeists.java @@ -27,10 +27,10 @@ */ package mage.sets.innistrad; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; diff --git a/Mage.Sets/src/mage/sets/invasion/Absorb.java b/Mage.Sets/src/mage/sets/invasion/Absorb.java index fd702507d87..e05050deeee 100644 --- a/Mage.Sets/src/mage/sets/invasion/Absorb.java +++ b/Mage.Sets/src/mage/sets/invasion/Absorb.java @@ -28,8 +28,8 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/invasion/ArtifactMutation.java b/Mage.Sets/src/mage/sets/invasion/ArtifactMutation.java index 68b4531dd2e..b186b541d4e 100644 --- a/Mage.Sets/src/mage/sets/invasion/ArtifactMutation.java +++ b/Mage.Sets/src/mage/sets/invasion/ArtifactMutation.java @@ -28,8 +28,8 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.TargetConvertedManaCost; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/invasion/AssaultBattery.java b/Mage.Sets/src/mage/sets/invasion/AssaultBattery.java index f7adce193f5..5614bedbcb0 100644 --- a/Mage.Sets/src/mage/sets/invasion/AssaultBattery.java +++ b/Mage.Sets/src/mage/sets/invasion/AssaultBattery.java @@ -29,8 +29,8 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DamageTargetEffect; diff --git a/Mage.Sets/src/mage/sets/invasion/AuraMutation.java b/Mage.Sets/src/mage/sets/invasion/AuraMutation.java index 1681fa1d3b1..7c1793ddb41 100644 --- a/Mage.Sets/src/mage/sets/invasion/AuraMutation.java +++ b/Mage.Sets/src/mage/sets/invasion/AuraMutation.java @@ -28,8 +28,8 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.TargetConvertedManaCost; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/invasion/BenalishHeralds.java b/Mage.Sets/src/mage/sets/invasion/BenalishHeralds.java index a1320d251ab..28d744d78ad 100644 --- a/Mage.Sets/src/mage/sets/invasion/BenalishHeralds.java +++ b/Mage.Sets/src/mage/sets/invasion/BenalishHeralds.java @@ -29,9 +29,8 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -57,7 +57,7 @@ public class BenalishHeralds extends CardImpl { this.toughness = new MageInt(4); // {3}{U}, {tap}: Draw a card. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new ManaCostsImpl("{3}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new ManaCostsImpl("{3}{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/invasion/BenalishTrapper.java b/Mage.Sets/src/mage/sets/invasion/BenalishTrapper.java index 42463c3889a..ce8695588f4 100644 --- a/Mage.Sets/src/mage/sets/invasion/BenalishTrapper.java +++ b/Mage.Sets/src/mage/sets/invasion/BenalishTrapper.java @@ -29,9 +29,8 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -58,7 +59,7 @@ public class BenalishTrapper extends CardImpl { this.toughness = new MageInt(2); // {W}, {tap}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/invasion/BlurredMongoose.java b/Mage.Sets/src/mage/sets/invasion/BlurredMongoose.java index 32702169f59..79a2062e3c8 100644 --- a/Mage.Sets/src/mage/sets/invasion/BlurredMongoose.java +++ b/Mage.Sets/src/mage/sets/invasion/BlurredMongoose.java @@ -28,8 +28,8 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.CantCounterAbility; import mage.abilities.keyword.ShroudAbility; diff --git a/Mage.Sets/src/mage/sets/invasion/ChromaticSphere.java b/Mage.Sets/src/mage/sets/invasion/ChromaticSphere.java index 71a28757442..6717001eb6a 100644 --- a/Mage.Sets/src/mage/sets/invasion/ChromaticSphere.java +++ b/Mage.Sets/src/mage/sets/invasion/ChromaticSphere.java @@ -28,7 +28,7 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/invasion/CoastalTower.java b/Mage.Sets/src/mage/sets/invasion/CoastalTower.java index d46927a8e47..8ac900af0eb 100644 --- a/Mage.Sets/src/mage/sets/invasion/CoastalTower.java +++ b/Mage.Sets/src/mage/sets/invasion/CoastalTower.java @@ -28,8 +28,8 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.WhiteManaAbility; diff --git a/Mage.Sets/src/mage/sets/invasion/Cremate.java b/Mage.Sets/src/mage/sets/invasion/Cremate.java index 3f8595407fc..b21bd012940 100644 --- a/Mage.Sets/src/mage/sets/invasion/Cremate.java +++ b/Mage.Sets/src/mage/sets/invasion/Cremate.java @@ -28,7 +28,7 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/invasion/ElfhamePalace.java b/Mage.Sets/src/mage/sets/invasion/ElfhamePalace.java index b04c938b131..0451d2538d7 100644 --- a/Mage.Sets/src/mage/sets/invasion/ElfhamePalace.java +++ b/Mage.Sets/src/mage/sets/invasion/ElfhamePalace.java @@ -28,8 +28,8 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.WhiteManaAbility; diff --git a/Mage.Sets/src/mage/sets/invasion/FactOrFiction.java b/Mage.Sets/src/mage/sets/invasion/FactOrFiction.java index 83816650e48..8ff65837cc3 100644 --- a/Mage.Sets/src/mage/sets/invasion/FactOrFiction.java +++ b/Mage.Sets/src/mage/sets/invasion/FactOrFiction.java @@ -30,10 +30,10 @@ package mage.sets.invasion; import java.util.List; import java.util.Set; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/invasion/FrenziedTilling.java b/Mage.Sets/src/mage/sets/invasion/FrenziedTilling.java index 4cb8054acc7..e46e76ea3a0 100644 --- a/Mage.Sets/src/mage/sets/invasion/FrenziedTilling.java +++ b/Mage.Sets/src/mage/sets/invasion/FrenziedTilling.java @@ -28,8 +28,8 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/invasion/GeothermalCrevice.java b/Mage.Sets/src/mage/sets/invasion/GeothermalCrevice.java index fe8f0cd4617..373360df318 100644 --- a/Mage.Sets/src/mage/sets/invasion/GeothermalCrevice.java +++ b/Mage.Sets/src/mage/sets/invasion/GeothermalCrevice.java @@ -28,9 +28,9 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; @@ -40,6 +40,7 @@ import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.mana.RedManaAbility; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -56,7 +57,7 @@ public class GeothermalCrevice extends CardImpl { // {tap}: Add {R} to your mana pool. this.addAbility(new RedManaAbility()); // {tap}, Sacrifice Geothermal Crevice: Add {B}{G} to your mana pool. - Ability ability = new SimpleManaAbility(Constants.Zone.BATTLEFIELD, new BasicManaEffect(new Mana(0, 1, 0, 0, 1, 0, 0)), new TapSourceCost()); + Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new BasicManaEffect(new Mana(0, 1, 0, 0, 1, 0, 0)), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/invasion/HeroesReunion.java b/Mage.Sets/src/mage/sets/invasion/HeroesReunion.java index af8015c97ce..7b0d598afb8 100644 --- a/Mage.Sets/src/mage/sets/invasion/HeroesReunion.java +++ b/Mage.Sets/src/mage/sets/invasion/HeroesReunion.java @@ -27,8 +27,8 @@ */ package mage.sets.invasion; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.GainLifeTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/invasion/HolyDay.java b/Mage.Sets/src/mage/sets/invasion/HolyDay.java index ca1ed5ab5c7..a0fa516b172 100644 --- a/Mage.Sets/src/mage/sets/invasion/HolyDay.java +++ b/Mage.Sets/src/mage/sets/invasion/HolyDay.java @@ -28,11 +28,12 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.PreventAllDamageEffect; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -47,7 +48,7 @@ public class HolyDay extends CardImpl { this.color.setWhite(true); // Prevent all combat damage that would be dealt this turn. - this.getSpellAbility().addEffect(new PreventAllDamageEffect(Constants.Duration.EndOfTurn, true)); + this.getSpellAbility().addEffect(new PreventAllDamageEffect(Duration.EndOfTurn, true)); } public HolyDay(final HolyDay card) { diff --git a/Mage.Sets/src/mage/sets/invasion/KavuScout.java b/Mage.Sets/src/mage/sets/invasion/KavuScout.java index dc875aee7be..d6f8b5d0d99 100644 --- a/Mage.Sets/src/mage/sets/invasion/KavuScout.java +++ b/Mage.Sets/src/mage/sets/invasion/KavuScout.java @@ -29,15 +29,16 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.DomainValue; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -56,7 +57,7 @@ public class KavuScout extends CardImpl { this.toughness = new MageInt(2); // Domain - Kavu Scout gets +1/+0 for each basic land type among lands you control. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(new DomainValue(), new StaticValue(0), Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new DomainValue(), new StaticValue(0), Duration.WhileOnBattlefield))); } public KavuScout(final KavuScout card) { diff --git a/Mage.Sets/src/mage/sets/invasion/MetathranZombie.java b/Mage.Sets/src/mage/sets/invasion/MetathranZombie.java index ed0c1def058..40d4716e69a 100644 --- a/Mage.Sets/src/mage/sets/invasion/MetathranZombie.java +++ b/Mage.Sets/src/mage/sets/invasion/MetathranZombie.java @@ -28,9 +28,9 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/invasion/Obliterate.java b/Mage.Sets/src/mage/sets/invasion/Obliterate.java index 1a7aac14721..1b526dd652d 100644 --- a/Mage.Sets/src/mage/sets/invasion/Obliterate.java +++ b/Mage.Sets/src/mage/sets/invasion/Obliterate.java @@ -28,8 +28,8 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.CantCounterAbility; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/invasion/PlanarPortal.java b/Mage.Sets/src/mage/sets/invasion/PlanarPortal.java index 42b21259e4a..01836f3c736 100644 --- a/Mage.Sets/src/mage/sets/invasion/PlanarPortal.java +++ b/Mage.Sets/src/mage/sets/invasion/PlanarPortal.java @@ -28,15 +28,16 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCardInLibrary; /** @@ -50,7 +51,7 @@ public class PlanarPortal extends CardImpl { this.expansionSetCode = "INV"; // {6}, {tap}: Search your library for a card and put that card into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false, true), new ManaCostsImpl("{6}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false, true), new ManaCostsImpl("{6}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/invasion/RagingKavu.java b/Mage.Sets/src/mage/sets/invasion/RagingKavu.java index f2ee14bf50c..20e56c43312 100644 --- a/Mage.Sets/src/mage/sets/invasion/RagingKavu.java +++ b/Mage.Sets/src/mage/sets/invasion/RagingKavu.java @@ -28,8 +28,8 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.HasteAbility; diff --git a/Mage.Sets/src/mage/sets/invasion/Repulse.java b/Mage.Sets/src/mage/sets/invasion/Repulse.java index 00a3c9495b1..3d8dd603b67 100644 --- a/Mage.Sets/src/mage/sets/invasion/Repulse.java +++ b/Mage.Sets/src/mage/sets/invasion/Repulse.java @@ -28,8 +28,8 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/invasion/SaltMarsh.java b/Mage.Sets/src/mage/sets/invasion/SaltMarsh.java index 96e4bd7b490..b4d8c8ce2d6 100644 --- a/Mage.Sets/src/mage/sets/invasion/SaltMarsh.java +++ b/Mage.Sets/src/mage/sets/invasion/SaltMarsh.java @@ -28,8 +28,8 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.BlueManaAbility; diff --git a/Mage.Sets/src/mage/sets/invasion/Shackles.java b/Mage.Sets/src/mage/sets/invasion/Shackles.java index c677328da04..70bfe7f3d30 100644 --- a/Mage.Sets/src/mage/sets/invasion/Shackles.java +++ b/Mage.Sets/src/mage/sets/invasion/Shackles.java @@ -28,9 +28,9 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +40,8 @@ import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.effects.common.SkipEnchantedUntapEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -60,15 +62,15 @@ public class Shackles extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Detriment)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); // Enchanted creature doesn't untap during its controller's untap step. Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new SkipEnchantedUntapEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipEnchantedUntapEffect())); // {W}: Return Shackles to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ManaCostsImpl("{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ManaCostsImpl("{W}"))); } public Shackles(final Shackles card) { diff --git a/Mage.Sets/src/mage/sets/invasion/SlinkingSerpent.java b/Mage.Sets/src/mage/sets/invasion/SlinkingSerpent.java index 946bbee3fc4..5650ea4f009 100644 --- a/Mage.Sets/src/mage/sets/invasion/SlinkingSerpent.java +++ b/Mage.Sets/src/mage/sets/invasion/SlinkingSerpent.java @@ -28,8 +28,8 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ForestwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/invasion/TaintedWell.java b/Mage.Sets/src/mage/sets/invasion/TaintedWell.java index eb3178b1aac..74740502b40 100644 --- a/Mage.Sets/src/mage/sets/invasion/TaintedWell.java +++ b/Mage.Sets/src/mage/sets/invasion/TaintedWell.java @@ -28,9 +28,9 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -39,6 +39,8 @@ import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.continious.BecomesBasicLandEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; @@ -58,13 +60,13 @@ public class TaintedWell extends CardImpl { // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Detriment)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // When Tainted Well enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardControllerEffect(1), false)); // Enchanted land is a Swamp. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BecomesBasicLandEnchantedEffect("Swamp"))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesBasicLandEnchantedEffect("Swamp"))); } public TaintedWell(final TaintedWell card) { diff --git a/Mage.Sets/src/mage/sets/invasion/ThunderscapeApprentice.java b/Mage.Sets/src/mage/sets/invasion/ThunderscapeApprentice.java index d1ba2a22113..473591430e6 100644 --- a/Mage.Sets/src/mage/sets/invasion/ThunderscapeApprentice.java +++ b/Mage.Sets/src/mage/sets/invasion/ThunderscapeApprentice.java @@ -29,9 +29,7 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -60,12 +58,12 @@ public class ThunderscapeApprentice extends CardImpl { this.toughness = new MageInt(1); // {B}, {tap}: Target player loses 1 life. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ColoredManaCost(Constants.ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); // {G}, {tap}: Target creature gets +1/+1 until end of turn. - ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.G)); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/invasion/ThunderscapeMaster.java b/Mage.Sets/src/mage/sets/invasion/ThunderscapeMaster.java index fd076ce1853..a3cad63c68f 100644 --- a/Mage.Sets/src/mage/sets/invasion/ThunderscapeMaster.java +++ b/Mage.Sets/src/mage/sets/invasion/ThunderscapeMaster.java @@ -29,9 +29,8 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.TargetPlayer; /** @@ -60,13 +61,13 @@ public class ThunderscapeMaster extends CardImpl { this.toughness = new MageInt(2); // {B}{B}, {tap}: Target player loses 2 life and you gain 2 life. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new LoseLifeTargetEffect(2), new ManaCostsImpl("{B}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2), new ManaCostsImpl("{B}{B}")); ability.addEffect(new GainLifeEffect(2)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); // {G}{G}, {tap}: Creatures you control get +2/+2 until end of turn. - ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Constants.Duration.EndOfTurn), new ManaCostsImpl("{G}{G}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("{G}{G}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/invasion/TribalFlames.java b/Mage.Sets/src/mage/sets/invasion/TribalFlames.java index 7c634c1f7ad..bb02ee45734 100644 --- a/Mage.Sets/src/mage/sets/invasion/TribalFlames.java +++ b/Mage.Sets/src/mage/sets/invasion/TribalFlames.java @@ -28,8 +28,8 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.DomainValue; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/invasion/UrborgSkeleton.java b/Mage.Sets/src/mage/sets/invasion/UrborgSkeleton.java index 2e601cec8be..967721dd703 100644 --- a/Mage.Sets/src/mage/sets/invasion/UrborgSkeleton.java +++ b/Mage.Sets/src/mage/sets/invasion/UrborgSkeleton.java @@ -28,9 +28,9 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; diff --git a/Mage.Sets/src/mage/sets/invasion/UrborgVolcano.java b/Mage.Sets/src/mage/sets/invasion/UrborgVolcano.java index c769dc44c37..64324bd2e64 100644 --- a/Mage.Sets/src/mage/sets/invasion/UrborgVolcano.java +++ b/Mage.Sets/src/mage/sets/invasion/UrborgVolcano.java @@ -28,8 +28,8 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.RedManaAbility; diff --git a/Mage.Sets/src/mage/sets/invasion/ViashinoGrappler.java b/Mage.Sets/src/mage/sets/invasion/ViashinoGrappler.java index 84a50abcc29..dfcc311d624 100644 --- a/Mage.Sets/src/mage/sets/invasion/ViashinoGrappler.java +++ b/Mage.Sets/src/mage/sets/invasion/ViashinoGrappler.java @@ -29,9 +29,7 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -55,7 +53,7 @@ public class ViashinoGrappler extends CardImpl { this.toughness = new MageInt(1); // {G}: Viashino Grappler gains trample until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(), Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.G))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.G))); } public ViashinoGrappler(final ViashinoGrappler card) { diff --git a/Mage.Sets/src/mage/sets/invasion/Void.java b/Mage.Sets/src/mage/sets/invasion/Void.java index 2742ab9191f..98e9c0bad45 100644 --- a/Mage.Sets/src/mage/sets/invasion/Void.java +++ b/Mage.Sets/src/mage/sets/invasion/Void.java @@ -29,16 +29,17 @@ package mage.sets.invasion; import java.util.HashSet; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.choices.Choice; import mage.choices.ChoiceImpl; +import mage.constants.Zone; import mage.filter.Filter; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; @@ -120,7 +121,7 @@ class VoidEffect extends OneShotEffect { targetPlayer.revealCards("Void", targetPlayer.getHand(), game); for (Card card : targetPlayer.getHand().getCards(game)) { if (filterCard.match(card, game)) { - card.moveToZone(Constants.Zone.GRAVEYARD, source.getId(), game, false); + card.moveToZone(Zone.GRAVEYARD, source.getId(), game, false); } } } else { diff --git a/Mage.Sets/src/mage/sets/invasion/Zap.java b/Mage.Sets/src/mage/sets/invasion/Zap.java index 53e4a1827f3..3ed6a940673 100644 --- a/Mage.Sets/src/mage/sets/invasion/Zap.java +++ b/Mage.Sets/src/mage/sets/invasion/Zap.java @@ -28,8 +28,8 @@ package mage.sets.invasion; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/judgment/ArcaneTeachings.java b/Mage.Sets/src/mage/sets/judgment/ArcaneTeachings.java index 305da7b1677..17598798e9b 100644 --- a/Mage.Sets/src/mage/sets/judgment/ArcaneTeachings.java +++ b/Mage.Sets/src/mage/sets/judgment/ArcaneTeachings.java @@ -28,7 +28,7 @@ package mage.sets.judgment; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/judgment/BorderPatrol.java b/Mage.Sets/src/mage/sets/judgment/BorderPatrol.java index 915dea52e82..8b353d1ef1d 100644 --- a/Mage.Sets/src/mage/sets/judgment/BorderPatrol.java +++ b/Mage.Sets/src/mage/sets/judgment/BorderPatrol.java @@ -28,8 +28,8 @@ package mage.sets.judgment; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/judgment/BurningWish.java b/Mage.Sets/src/mage/sets/judgment/BurningWish.java index b37603d5854..2f7959c2b76 100644 --- a/Mage.Sets/src/mage/sets/judgment/BurningWish.java +++ b/Mage.Sets/src/mage/sets/judgment/BurningWish.java @@ -29,15 +29,17 @@ package mage.sets.judgment; import java.util.Set; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; @@ -80,7 +82,7 @@ class BurningWishEffect extends OneShotEffect { } public BurningWishEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); this.staticText = "You may choose a sorcery card you own from outside the game, reveal that card, and put it into your hand. Exile Burning Wish"; } @@ -97,7 +99,7 @@ class BurningWishEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); if (player != null) { - while (player.chooseUse(Constants.Outcome.Benefit, choiceText, game)) { + while (player.chooseUse(Outcome.Benefit, choiceText, game)) { Cards cards = player.getSideboard(); if(cards.isEmpty()) { game.informPlayer(player, "You have no cards outside the game."); @@ -115,12 +117,12 @@ class BurningWishEffect extends OneShotEffect { filteredCards.add(card.getId()); } - TargetCard target = new TargetCard(Constants.Zone.PICK, filter); - if (player.choose(Constants.Outcome.Benefit, filteredCards, target, game)) { + TargetCard target = new TargetCard(Zone.PICK, filter); + if (player.choose(Outcome.Benefit, filteredCards, target, game)) { Card card = player.getSideboard().get(target.getFirstTarget(), game); if (card != null) { - card.moveToZone(Constants.Zone.HAND, source.getId(), game, false); + card.moveToZone(Zone.HAND, source.getId(), game, false); Cards revealCard = new CardsImpl(); revealCard.add(card); player.revealCards("Burning Wish", revealCard, game); diff --git a/Mage.Sets/src/mage/sets/judgment/CabalTherapy.java b/Mage.Sets/src/mage/sets/judgment/CabalTherapy.java index 8268bcd0d3a..3b691de60f2 100644 --- a/Mage.Sets/src/mage/sets/judgment/CabalTherapy.java +++ b/Mage.Sets/src/mage/sets/judgment/CabalTherapy.java @@ -28,11 +28,11 @@ package mage.sets.judgment; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TimingRule; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TimingRule; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/judgment/CunningWish.java b/Mage.Sets/src/mage/sets/judgment/CunningWish.java index 56eb1459181..cabdaf687b1 100644 --- a/Mage.Sets/src/mage/sets/judgment/CunningWish.java +++ b/Mage.Sets/src/mage/sets/judgment/CunningWish.java @@ -29,15 +29,17 @@ package mage.sets.judgment; import java.util.Set; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; @@ -80,7 +82,7 @@ class CunningWishEffect extends OneShotEffect { } public CunningWishEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); this.staticText = "You may choose an instant card you own from outside the game, reveal that card, and put it into your hand. Exile Cunning Wish"; } @@ -97,7 +99,7 @@ class CunningWishEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); if (player != null) { - while (player.chooseUse(Constants.Outcome.Benefit, choiceText, game)) { + while (player.chooseUse(Outcome.Benefit, choiceText, game)) { Cards cards = player.getSideboard(); if(cards.isEmpty()) { game.informPlayer(player, "You have no cards outside the game."); @@ -115,12 +117,12 @@ class CunningWishEffect extends OneShotEffect { filteredCards.add(card.getId()); } - TargetCard target = new TargetCard(Constants.Zone.PICK, filter); - if (player.choose(Constants.Outcome.Benefit, filteredCards, target, game)) { + TargetCard target = new TargetCard(Zone.PICK, filter); + if (player.choose(Outcome.Benefit, filteredCards, target, game)) { Card card = player.getSideboard().get(target.getFirstTarget(), game); if (card != null) { - card.moveToZone(Constants.Zone.HAND, source.getId(), game, false); + card.moveToZone(Zone.HAND, source.getId(), game, false); Cards revealCard = new CardsImpl(); revealCard.add(card); player.revealCards("Cunning Wish", revealCard, game); diff --git a/Mage.Sets/src/mage/sets/judgment/DeathWish.java b/Mage.Sets/src/mage/sets/judgment/DeathWish.java index b8ec7c72a86..4dd0f17597c 100644 --- a/Mage.Sets/src/mage/sets/judgment/DeathWish.java +++ b/Mage.Sets/src/mage/sets/judgment/DeathWish.java @@ -29,15 +29,17 @@ package mage.sets.judgment; import java.util.Set; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.game.Game; import mage.players.Player; @@ -77,7 +79,7 @@ class DeathWishEffect extends OneShotEffect { public DeathWishEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); this.staticText = "You may choose a card you own from outside the game, reveal that card, and put it into your hand. Exile Death Wish"; } @@ -94,7 +96,7 @@ class DeathWishEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); if (player != null) { - while (player.chooseUse(Constants.Outcome.Benefit, choiceText, game)) { + while (player.chooseUse(Outcome.Benefit, choiceText, game)) { Cards cards = player.getSideboard(); if(cards.isEmpty()) { game.informPlayer(player, "You have no cards outside the game."); @@ -112,12 +114,12 @@ class DeathWishEffect extends OneShotEffect { filteredCards.add(card.getId()); } - TargetCard target = new TargetCard(Constants.Zone.PICK, filter); - if (player.choose(Constants.Outcome.Benefit, filteredCards, target, game)) { + TargetCard target = new TargetCard(Zone.PICK, filter); + if (player.choose(Outcome.Benefit, filteredCards, target, game)) { Card card = player.getSideboard().get(target.getFirstTarget(), game); if (card != null) { - card.moveToZone(Constants.Zone.HAND, source.getId(), game, false); + card.moveToZone(Zone.HAND, source.getId(), game, false); } } } diff --git a/Mage.Sets/src/mage/sets/judgment/EarsplittingRats.java b/Mage.Sets/src/mage/sets/judgment/EarsplittingRats.java index 9adb2b3c0f7..764cd1da1cd 100644 --- a/Mage.Sets/src/mage/sets/judgment/EarsplittingRats.java +++ b/Mage.Sets/src/mage/sets/judgment/EarsplittingRats.java @@ -28,9 +28,9 @@ package mage.sets.judgment; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +38,7 @@ import mage.abilities.costs.common.DiscardCardCost; import mage.abilities.effects.common.DiscardEachPlayerEffect; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -57,7 +58,7 @@ public class EarsplittingRats extends CardImpl { // When Earsplitting Rats enters the battlefield, each player discards a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DiscardEachPlayerEffect())); // Discard a card: Regenerate Earsplitting Rats. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new DiscardCardCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new DiscardCardCost())); } public EarsplittingRats(final EarsplittingRats card) { diff --git a/Mage.Sets/src/mage/sets/judgment/GiantWarthog.java b/Mage.Sets/src/mage/sets/judgment/GiantWarthog.java index 591c26ad993..798dfc7122f 100644 --- a/Mage.Sets/src/mage/sets/judgment/GiantWarthog.java +++ b/Mage.Sets/src/mage/sets/judgment/GiantWarthog.java @@ -28,8 +28,8 @@ package mage.sets.judgment; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/judgment/GoldenWish.java b/Mage.Sets/src/mage/sets/judgment/GoldenWish.java index 54b6afb637c..b9a14757c81 100644 --- a/Mage.Sets/src/mage/sets/judgment/GoldenWish.java +++ b/Mage.Sets/src/mage/sets/judgment/GoldenWish.java @@ -29,15 +29,17 @@ package mage.sets.judgment; import java.util.Set; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -83,7 +85,7 @@ class GoldenWishEffect extends OneShotEffect { } public GoldenWishEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); this.staticText = "You may choose a artifact or enchantment card you own from outside the game, reveal that card, and put it into your hand. Exile Golden Wish"; } @@ -100,7 +102,7 @@ class GoldenWishEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); if (player != null) { - while (player.chooseUse(Constants.Outcome.Benefit, choiceText, game)) { + while (player.chooseUse(Outcome.Benefit, choiceText, game)) { Cards cards = player.getSideboard(); if(cards.isEmpty()) { game.informPlayer(player, "You have no cards outside the game."); @@ -118,12 +120,12 @@ class GoldenWishEffect extends OneShotEffect { filteredCards.add(card.getId()); } - TargetCard target = new TargetCard(Constants.Zone.PICK, filter); - if (player.choose(Constants.Outcome.Benefit, filteredCards, target, game)) { + TargetCard target = new TargetCard(Zone.PICK, filter); + if (player.choose(Outcome.Benefit, filteredCards, target, game)) { Card card = player.getSideboard().get(target.getFirstTarget(), game); if (card != null) { - card.moveToZone(Constants.Zone.HAND, source.getId(), game, false); + card.moveToZone(Zone.HAND, source.getId(), game, false); Cards revealCard = new CardsImpl(); revealCard.add(card); player.revealCards("Golden Wish", revealCard, game); diff --git a/Mage.Sets/src/mage/sets/judgment/GoretuskFirebeast.java b/Mage.Sets/src/mage/sets/judgment/GoretuskFirebeast.java index 8ee2eb09eec..1fc98a5ada4 100644 --- a/Mage.Sets/src/mage/sets/judgment/GoretuskFirebeast.java +++ b/Mage.Sets/src/mage/sets/judgment/GoretuskFirebeast.java @@ -28,8 +28,8 @@ package mage.sets.judgment; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/judgment/KeepWatch.java b/Mage.Sets/src/mage/sets/judgment/KeepWatch.java index 1e8a2d92539..daa2b040268 100644 --- a/Mage.Sets/src/mage/sets/judgment/KeepWatch.java +++ b/Mage.Sets/src/mage/sets/judgment/KeepWatch.java @@ -28,8 +28,8 @@ package mage.sets.judgment; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.AttackingCreatureCount; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/judgment/LivingWish.java b/Mage.Sets/src/mage/sets/judgment/LivingWish.java index 1d399526b68..b656a063f5b 100644 --- a/Mage.Sets/src/mage/sets/judgment/LivingWish.java +++ b/Mage.Sets/src/mage/sets/judgment/LivingWish.java @@ -29,15 +29,17 @@ package mage.sets.judgment; import java.util.Set; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -83,7 +85,7 @@ class LivingWishEffect extends OneShotEffect { } public LivingWishEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); this.staticText = "You may choose a creature or land card you own from outside the game, reveal that card, and put it into your hand. Exile Living Wish"; } @@ -100,7 +102,7 @@ class LivingWishEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); if (player != null) { - while (player.chooseUse(Constants.Outcome.Benefit, choiceText, game)) { + while (player.chooseUse(Outcome.Benefit, choiceText, game)) { Cards cards = player.getSideboard(); if(cards.isEmpty()) { game.informPlayer(player, "You have no cards outside the game."); @@ -118,12 +120,12 @@ class LivingWishEffect extends OneShotEffect { filteredCards.add(card.getId()); } - TargetCard target = new TargetCard(Constants.Zone.PICK, filter); - if (player.choose(Constants.Outcome.Benefit, filteredCards, target, game)) { + TargetCard target = new TargetCard(Zone.PICK, filter); + if (player.choose(Outcome.Benefit, filteredCards, target, game)) { Card card = player.getSideboard().get(target.getFirstTarget(), game); if (card != null) { - card.moveToZone(Constants.Zone.HAND, source.getId(), game, false); + card.moveToZone(Zone.HAND, source.getId(), game, false); Cards revealCard = new CardsImpl(); revealCard.add(card); player.revealCards("Living Wish", revealCard, game); diff --git a/Mage.Sets/src/mage/sets/judgment/QuietSpeculation.java b/Mage.Sets/src/mage/sets/judgment/QuietSpeculation.java index 8f94503077c..41d0e15f2ef 100644 --- a/Mage.Sets/src/mage/sets/judgment/QuietSpeculation.java +++ b/Mage.Sets/src/mage/sets/judgment/QuietSpeculation.java @@ -27,9 +27,8 @@ */ package mage.sets.judgment; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.SearchEffect; import mage.abilities.keyword.FlashbackAbility; @@ -37,6 +36,8 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.game.Game; @@ -84,7 +85,7 @@ public class QuietSpeculation extends CardImpl { class SearchLibraryPutInGraveEffect extends SearchEffect { public SearchLibraryPutInGraveEffect(TargetCardInLibrary target) { - super(target, Constants.Outcome.Neutral); + super(target, Outcome.Neutral); staticText = "Search target player's library for up to three cards with flashback and put them into that player's graveyard. Then the player shuffles his or her library."; } @@ -109,7 +110,7 @@ class SearchLibraryPutInGraveEffect extends SearchEffect)target.getTargets()) { Card card = player.getLibrary().remove(cardId, game); if (card != null){ - card.moveToZone(Constants.Zone.GRAVEYARD, source.getId(), game, false); + card.moveToZone(Zone.GRAVEYARD, source.getId(), game, false); cards.add(card); } } diff --git a/Mage.Sets/src/mage/sets/judgment/ThrissNantukoPrimus.java b/Mage.Sets/src/mage/sets/judgment/ThrissNantukoPrimus.java index 8a73379e8c0..71e70c58b63 100644 --- a/Mage.Sets/src/mage/sets/judgment/ThrissNantukoPrimus.java +++ b/Mage.Sets/src/mage/sets/judgment/ThrissNantukoPrimus.java @@ -28,10 +28,10 @@ package mage.sets.judgment; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/judgment/Wonder.java b/Mage.Sets/src/mage/sets/judgment/Wonder.java index c9899963f86..b801525fd4f 100644 --- a/Mage.Sets/src/mage/sets/judgment/Wonder.java +++ b/Mage.Sets/src/mage/sets/judgment/Wonder.java @@ -27,9 +27,8 @@ */ package mage.sets.judgment; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.ControlsPermanentCondition; @@ -38,6 +37,8 @@ import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -74,10 +75,10 @@ public class Wonder extends CardImpl { // As long as Wonder is in your graveyard and you control an Island, creatures you control have flying. ContinuousEffect effect = new GainAbilityControlledEffect(FlyingAbility.getInstance(), - Constants.Duration.WhileOnBattlefield, new FilterCreaturePermanent()); + Duration.WhileOnBattlefield, new FilterCreaturePermanent()); ConditionalContinousEffect wonderEffect = new ConditionalContinousEffect(effect, new ControlsPermanentCondition(filter), ruleText); - this.addAbility(new SimpleStaticAbility(Constants.Zone.GRAVEYARD, wonderEffect)); + this.addAbility(new SimpleStaticAbility(Zone.GRAVEYARD, wonderEffect)); } public Wonder(final Wonder card) { diff --git a/Mage.Sets/src/mage/sets/legends/Abomination.java b/Mage.Sets/src/mage/sets/legends/Abomination.java index 335a71b46e9..5a62c20b378 100644 --- a/Mage.Sets/src/mage/sets/legends/Abomination.java +++ b/Mage.Sets/src/mage/sets/legends/Abomination.java @@ -28,10 +28,10 @@ package mage.sets.legends; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage.Sets/src/mage/sets/legends/AzureDrake.java b/Mage.Sets/src/mage/sets/legends/AzureDrake.java index c3d7ea13710..e13a6e4a92b 100644 --- a/Mage.Sets/src/mage/sets/legends/AzureDrake.java +++ b/Mage.Sets/src/mage/sets/legends/AzureDrake.java @@ -28,7 +28,7 @@ package mage.sets.legends; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/legends/BarbaryApes.java b/Mage.Sets/src/mage/sets/legends/BarbaryApes.java index 047979c6edb..b4d4ec2c056 100644 --- a/Mage.Sets/src/mage/sets/legends/BarbaryApes.java +++ b/Mage.Sets/src/mage/sets/legends/BarbaryApes.java @@ -28,8 +28,8 @@ package mage.sets.legends; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/legends/BarktoothWarbeard.java b/Mage.Sets/src/mage/sets/legends/BarktoothWarbeard.java index 1d92ff10dd5..020cab14e4f 100644 --- a/Mage.Sets/src/mage/sets/legends/BarktoothWarbeard.java +++ b/Mage.Sets/src/mage/sets/legends/BarktoothWarbeard.java @@ -28,8 +28,8 @@ package mage.sets.legends; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/legends/CrimsonKobolds.java b/Mage.Sets/src/mage/sets/legends/CrimsonKobolds.java index da2db905d37..be36f247d43 100644 --- a/Mage.Sets/src/mage/sets/legends/CrimsonKobolds.java +++ b/Mage.Sets/src/mage/sets/legends/CrimsonKobolds.java @@ -28,8 +28,8 @@ package mage.sets.legends; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/legends/CrookshankKobolds.java b/Mage.Sets/src/mage/sets/legends/CrookshankKobolds.java index dcfd5d4c5e6..d4ee7118673 100644 --- a/Mage.Sets/src/mage/sets/legends/CrookshankKobolds.java +++ b/Mage.Sets/src/mage/sets/legends/CrookshankKobolds.java @@ -28,8 +28,8 @@ package mage.sets.legends; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/legends/Darkness.java b/Mage.Sets/src/mage/sets/legends/Darkness.java index ca944dc6b76..957ad2a98b2 100644 --- a/Mage.Sets/src/mage/sets/legends/Darkness.java +++ b/Mage.Sets/src/mage/sets/legends/Darkness.java @@ -28,7 +28,7 @@ package mage.sets.legends; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/legends/DevouringDeep.java b/Mage.Sets/src/mage/sets/legends/DevouringDeep.java index 5939c0c62a5..2af36035806 100644 --- a/Mage.Sets/src/mage/sets/legends/DevouringDeep.java +++ b/Mage.Sets/src/mage/sets/legends/DevouringDeep.java @@ -28,8 +28,8 @@ package mage.sets.legends; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.IslandwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/legends/FallenAngel.java b/Mage.Sets/src/mage/sets/legends/FallenAngel.java index 51be9ddb26f..9e9a930b499 100644 --- a/Mage.Sets/src/mage/sets/legends/FallenAngel.java +++ b/Mage.Sets/src/mage/sets/legends/FallenAngel.java @@ -28,7 +28,7 @@ package mage.sets.legends; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/legends/HeadlessHorseman.java b/Mage.Sets/src/mage/sets/legends/HeadlessHorseman.java index 6566f8893b4..22fd3fa0e21 100644 --- a/Mage.Sets/src/mage/sets/legends/HeadlessHorseman.java +++ b/Mage.Sets/src/mage/sets/legends/HeadlessHorseman.java @@ -28,8 +28,8 @@ package mage.sets.legends; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/legends/HornetCobra.java b/Mage.Sets/src/mage/sets/legends/HornetCobra.java index baa2e3abfe4..1c83dfb0676 100644 --- a/Mage.Sets/src/mage/sets/legends/HornetCobra.java +++ b/Mage.Sets/src/mage/sets/legends/HornetCobra.java @@ -28,8 +28,8 @@ package mage.sets.legends; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/legends/JasmineBoreal.java b/Mage.Sets/src/mage/sets/legends/JasmineBoreal.java index f4f228ccbf6..f80b1b19acb 100644 --- a/Mage.Sets/src/mage/sets/legends/JasmineBoreal.java +++ b/Mage.Sets/src/mage/sets/legends/JasmineBoreal.java @@ -28,7 +28,7 @@ package mage.sets.legends; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/legends/JeditOjanen.java b/Mage.Sets/src/mage/sets/legends/JeditOjanen.java index 91ec48cd320..84101c621eb 100644 --- a/Mage.Sets/src/mage/sets/legends/JeditOjanen.java +++ b/Mage.Sets/src/mage/sets/legends/JeditOjanen.java @@ -28,8 +28,8 @@ package mage.sets.legends; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/legends/JerrardOfTheClosedFist.java b/Mage.Sets/src/mage/sets/legends/JerrardOfTheClosedFist.java index 07daebe2947..9c6ddfe4670 100644 --- a/Mage.Sets/src/mage/sets/legends/JerrardOfTheClosedFist.java +++ b/Mage.Sets/src/mage/sets/legends/JerrardOfTheClosedFist.java @@ -28,8 +28,8 @@ package mage.sets.legends; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/legends/Karakas.java b/Mage.Sets/src/mage/sets/legends/Karakas.java index 4f585c6d05b..0457c123d47 100644 --- a/Mage.Sets/src/mage/sets/legends/Karakas.java +++ b/Mage.Sets/src/mage/sets/legends/Karakas.java @@ -28,15 +28,16 @@ package mage.sets.legends; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCreaturePermanent; @@ -60,7 +61,7 @@ public class Karakas extends CardImpl { // {tap}: Add {W} to your mana pool. this.addAbility(new WhiteManaAbility()); // {tap}: Return target legendary creature to its owner's hand. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/legends/KasimirTheLoneWolf.java b/Mage.Sets/src/mage/sets/legends/KasimirTheLoneWolf.java index 344124bb516..0c0d75614f4 100644 --- a/Mage.Sets/src/mage/sets/legends/KasimirTheLoneWolf.java +++ b/Mage.Sets/src/mage/sets/legends/KasimirTheLoneWolf.java @@ -28,8 +28,8 @@ package mage.sets.legends; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/legends/KeepersOfTheFaith.java b/Mage.Sets/src/mage/sets/legends/KeepersOfTheFaith.java index 68742e4b3e2..99d8fb58f1e 100644 --- a/Mage.Sets/src/mage/sets/legends/KeepersOfTheFaith.java +++ b/Mage.Sets/src/mage/sets/legends/KeepersOfTheFaith.java @@ -28,8 +28,8 @@ package mage.sets.legends; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/legends/KoboldsOfKherKeep.java b/Mage.Sets/src/mage/sets/legends/KoboldsOfKherKeep.java index a0a242998d5..66d4dd7978c 100644 --- a/Mage.Sets/src/mage/sets/legends/KoboldsOfKherKeep.java +++ b/Mage.Sets/src/mage/sets/legends/KoboldsOfKherKeep.java @@ -28,8 +28,8 @@ package mage.sets.legends; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/legends/LadyOrca.java b/Mage.Sets/src/mage/sets/legends/LadyOrca.java index dd6bd120af3..f99d0062d45 100644 --- a/Mage.Sets/src/mage/sets/legends/LadyOrca.java +++ b/Mage.Sets/src/mage/sets/legends/LadyOrca.java @@ -28,8 +28,8 @@ package mage.sets.legends; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/legends/Pendelhaven.java b/Mage.Sets/src/mage/sets/legends/Pendelhaven.java index d22052e544e..128f3cce299 100644 --- a/Mage.Sets/src/mage/sets/legends/Pendelhaven.java +++ b/Mage.Sets/src/mage/sets/legends/Pendelhaven.java @@ -28,7 +28,7 @@ package mage.sets.legends; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/legends/RagingBull.java b/Mage.Sets/src/mage/sets/legends/RagingBull.java index 51bee99ea05..9719d456694 100644 --- a/Mage.Sets/src/mage/sets/legends/RagingBull.java +++ b/Mage.Sets/src/mage/sets/legends/RagingBull.java @@ -28,8 +28,8 @@ package mage.sets.legends; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/legends/RamirezDePietro.java b/Mage.Sets/src/mage/sets/legends/RamirezDePietro.java index bb3b29394a3..5773934c140 100644 --- a/Mage.Sets/src/mage/sets/legends/RamirezDePietro.java +++ b/Mage.Sets/src/mage/sets/legends/RamirezDePietro.java @@ -28,8 +28,8 @@ package mage.sets.legends; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/legends/RighteousAvengers.java b/Mage.Sets/src/mage/sets/legends/RighteousAvengers.java index 001a3167e58..3da9cac3cbf 100644 --- a/Mage.Sets/src/mage/sets/legends/RighteousAvengers.java +++ b/Mage.Sets/src/mage/sets/legends/RighteousAvengers.java @@ -28,8 +28,8 @@ package mage.sets.legends; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.PlainswalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/legends/SirShandlarOfEberyn.java b/Mage.Sets/src/mage/sets/legends/SirShandlarOfEberyn.java index 9505c0e9c21..0fe655b0983 100644 --- a/Mage.Sets/src/mage/sets/legends/SirShandlarOfEberyn.java +++ b/Mage.Sets/src/mage/sets/legends/SirShandlarOfEberyn.java @@ -28,8 +28,8 @@ package mage.sets.legends; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/legends/SivitriScarzam.java b/Mage.Sets/src/mage/sets/legends/SivitriScarzam.java index 32d92458473..701d61fca51 100644 --- a/Mage.Sets/src/mage/sets/legends/SivitriScarzam.java +++ b/Mage.Sets/src/mage/sets/legends/SivitriScarzam.java @@ -28,8 +28,8 @@ package mage.sets.legends; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/legends/SolkanarTheSwampKing.java b/Mage.Sets/src/mage/sets/legends/SolkanarTheSwampKing.java index b9bf53490d3..082914bfb05 100644 --- a/Mage.Sets/src/mage/sets/legends/SolkanarTheSwampKing.java +++ b/Mage.Sets/src/mage/sets/legends/SolkanarTheSwampKing.java @@ -28,7 +28,7 @@ package mage.sets.legends; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/legends/TheLadyOfTheMountain.java b/Mage.Sets/src/mage/sets/legends/TheLadyOfTheMountain.java index e159cd821c9..9aea57ebd83 100644 --- a/Mage.Sets/src/mage/sets/legends/TheLadyOfTheMountain.java +++ b/Mage.Sets/src/mage/sets/legends/TheLadyOfTheMountain.java @@ -28,8 +28,8 @@ package mage.sets.legends; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/legends/TheTabernacleAtPendrellVale.java b/Mage.Sets/src/mage/sets/legends/TheTabernacleAtPendrellVale.java index cd0ee255220..7cb831d863b 100644 --- a/Mage.Sets/src/mage/sets/legends/TheTabernacleAtPendrellVale.java +++ b/Mage.Sets/src/mage/sets/legends/TheTabernacleAtPendrellVale.java @@ -28,10 +28,8 @@ package mage.sets.legends; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -58,8 +56,8 @@ public class TheTabernacleAtPendrellVale extends CardImpl { this.toughness = new MageInt(1); // {tap}, Sacrifice three Clerics: Search your graveyard, hand, and/or library for a card named Scion of Darkness and put it onto the battlefield. If you search your library this way, shuffle it. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DarkSupplicantEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DarkSupplicantEffect(), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(3, 3, filter, true))); this.addAbility(ability); } @@ -91,7 +93,7 @@ public class DarkSupplicant extends CardImpl { class DarkSupplicantEffect extends OneShotEffect { public DarkSupplicantEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); this.staticText = "Search your graveyard, hand, and/or library for a card named Scion of Darkness and put it onto the battlefield. If you search your library this way, shuffle it"; } @@ -114,13 +116,13 @@ class DarkSupplicantEffect extends OneShotEffect { return false; } // Library check - if (player.chooseUse(Constants.Outcome.Benefit, "Do you want to search your library for Scion of Darkness?", game)) { + if (player.chooseUse(Outcome.Benefit, "Do you want to search your library for Scion of Darkness?", game)) { if (player.searchLibrary(target, game)) { if (target.getTargets().size() > 0) { for (UUID cardId : (List) target.getTargets()) { Card card = player.getLibrary().getCard(cardId, game); if (card != null) { - if (card.putOntoBattlefield(game, Constants.Zone.LIBRARY, source.getId(), source.getControllerId())) { + if (card.putOntoBattlefield(game, Zone.LIBRARY, source.getId(), source.getControllerId())) { return true; } } @@ -130,23 +132,23 @@ class DarkSupplicantEffect extends OneShotEffect { player.shuffleLibrary(game); } // Graveyard check - if (player.chooseUse(Constants.Outcome.Benefit, "Do you want to search your graveyard for Scion of Darkness?", game)) { + if (player.chooseUse(Outcome.Benefit, "Do you want to search your graveyard for Scion of Darkness?", game)) { Cards graveyard = player.getGraveyard().copy(); for (UUID card : graveyard) { Card checkCard = game.getCard(card); if (checkCard.getName().equals("Scion of Darkness")) { - checkCard.putOntoBattlefield(game, Constants.Zone.GRAVEYARD, source.getId(), source.getControllerId()); + checkCard.putOntoBattlefield(game, Zone.GRAVEYARD, source.getId(), source.getControllerId()); return true; } } } // Hand check - if (player.chooseUse(Constants.Outcome.Benefit, "Do you want to search your hand for Scion of Darkness?", game)) { + if (player.chooseUse(Outcome.Benefit, "Do you want to search your hand for Scion of Darkness?", game)) { Cards hand = player.getHand().copy(); for (UUID card : hand) { Card checkCard = game.getCard(card); if (checkCard.getName().equals("Scion of Darkness")) { - checkCard.putOntoBattlefield(game, Constants.Zone.HAND, source.getId(), source.getControllerId()); + checkCard.putOntoBattlefield(game, Zone.HAND, source.getId(), source.getControllerId()); return true; } } diff --git a/Mage.Sets/src/mage/sets/legions/DefiantElf.java b/Mage.Sets/src/mage/sets/legions/DefiantElf.java index 1f3d71d58ff..6c949bb41ea 100644 --- a/Mage.Sets/src/mage/sets/legions/DefiantElf.java +++ b/Mage.Sets/src/mage/sets/legions/DefiantElf.java @@ -28,8 +28,8 @@ package mage.sets.legions; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/legions/FlamewaveInvoker.java b/Mage.Sets/src/mage/sets/legions/FlamewaveInvoker.java index eaac6b52563..774b65f5d4d 100644 --- a/Mage.Sets/src/mage/sets/legions/FlamewaveInvoker.java +++ b/Mage.Sets/src/mage/sets/legions/FlamewaveInvoker.java @@ -28,7 +28,7 @@ package mage.sets.legions; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/legions/GempalmIncinerator.java b/Mage.Sets/src/mage/sets/legions/GempalmIncinerator.java index c8b63c324f5..e75faf12d6e 100644 --- a/Mage.Sets/src/mage/sets/legions/GempalmIncinerator.java +++ b/Mage.Sets/src/mage/sets/legions/GempalmIncinerator.java @@ -28,8 +28,8 @@ package mage.sets.legions; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.CycleTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/legions/GoblinTurncoat.java b/Mage.Sets/src/mage/sets/legions/GoblinTurncoat.java index c8a9e7a1e82..f38a49c0808 100644 --- a/Mage.Sets/src/mage/sets/legions/GoblinTurncoat.java +++ b/Mage.Sets/src/mage/sets/legions/GoblinTurncoat.java @@ -28,15 +28,16 @@ package mage.sets.legions; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -63,7 +64,7 @@ public class GoblinTurncoat extends CardImpl { this.toughness = new MageInt(1); // Sacrifice a Goblin: Regenerate Goblin Turncoat. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/legions/Hundroog.java b/Mage.Sets/src/mage/sets/legions/Hundroog.java index b67b602533d..b6f64e5a221 100644 --- a/Mage.Sets/src/mage/sets/legions/Hundroog.java +++ b/Mage.Sets/src/mage/sets/legions/Hundroog.java @@ -28,8 +28,8 @@ package mage.sets.legions; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.CyclingAbility; diff --git a/Mage.Sets/src/mage/sets/legions/KeeneyeAven.java b/Mage.Sets/src/mage/sets/legions/KeeneyeAven.java index 08cac71c647..5dacc8a2c5c 100644 --- a/Mage.Sets/src/mage/sets/legions/KeeneyeAven.java +++ b/Mage.Sets/src/mage/sets/legions/KeeneyeAven.java @@ -28,8 +28,8 @@ package mage.sets.legions; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/legions/MacetailHystrodon.java b/Mage.Sets/src/mage/sets/legions/MacetailHystrodon.java index 973493ef5e7..da7cd26d6e7 100644 --- a/Mage.Sets/src/mage/sets/legions/MacetailHystrodon.java +++ b/Mage.Sets/src/mage/sets/legions/MacetailHystrodon.java @@ -28,8 +28,8 @@ package mage.sets.legions; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.HasteAbility; diff --git a/Mage.Sets/src/mage/sets/legions/MerchantOfSecrets.java b/Mage.Sets/src/mage/sets/legions/MerchantOfSecrets.java index 46a5aa981f8..d470b38e951 100644 --- a/Mage.Sets/src/mage/sets/legions/MerchantOfSecrets.java +++ b/Mage.Sets/src/mage/sets/legions/MerchantOfSecrets.java @@ -28,8 +28,8 @@ package mage.sets.legions; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/legions/NeedleshotGourna.java b/Mage.Sets/src/mage/sets/legions/NeedleshotGourna.java index 1d2e314a89d..b7393afe38e 100644 --- a/Mage.Sets/src/mage/sets/legions/NeedleshotGourna.java +++ b/Mage.Sets/src/mage/sets/legions/NeedleshotGourna.java @@ -28,8 +28,8 @@ package mage.sets.legions; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/legions/PrimocEscapee.java b/Mage.Sets/src/mage/sets/legions/PrimocEscapee.java index fb8fb6379a0..167c933467b 100644 --- a/Mage.Sets/src/mage/sets/legions/PrimocEscapee.java +++ b/Mage.Sets/src/mage/sets/legions/PrimocEscapee.java @@ -28,8 +28,8 @@ package mage.sets.legions; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/legions/RidgetopRaptor.java b/Mage.Sets/src/mage/sets/legions/RidgetopRaptor.java index a88d74969b6..fffa5635cc8 100644 --- a/Mage.Sets/src/mage/sets/legions/RidgetopRaptor.java +++ b/Mage.Sets/src/mage/sets/legions/RidgetopRaptor.java @@ -28,8 +28,8 @@ package mage.sets.legions; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DoubleStrikeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/legions/ScionOfDarkness.java b/Mage.Sets/src/mage/sets/legions/ScionOfDarkness.java index f55bfbb47da..91f1bd9ab4b 100644 --- a/Mage.Sets/src/mage/sets/legions/ScionOfDarkness.java +++ b/Mage.Sets/src/mage/sets/legions/ScionOfDarkness.java @@ -28,10 +28,10 @@ package mage.sets.legions; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -41,6 +41,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.CyclingAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.other.OwnerIdPredicate; @@ -87,7 +88,7 @@ public class ScionOfDarkness extends CardImpl { class ScionOfDarknessEffect extends OneShotEffect { public ScionOfDarknessEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); this.staticText = "you may put target creature card from that player's graveyard onto the battlefield under your control"; } @@ -112,7 +113,7 @@ class ScionOfDarknessEffect extends OneShotEffect { if (you.chooseTarget(Outcome.PutCreatureInPlay, target, source, game)) { Card card = game.getCard(target.getFirstTarget()); if (card != null) { - card.putOntoBattlefield(game, Constants.Zone.GRAVEYARD, id, you.getId()); + card.putOntoBattlefield(game, Zone.GRAVEYARD, id, you.getId()); return true; } } diff --git a/Mage.Sets/src/mage/sets/legions/StarlightInvoker.java b/Mage.Sets/src/mage/sets/legions/StarlightInvoker.java index 7a7b42def3f..520cd3fda50 100644 --- a/Mage.Sets/src/mage/sets/legions/StarlightInvoker.java +++ b/Mage.Sets/src/mage/sets/legions/StarlightInvoker.java @@ -28,7 +28,7 @@ package mage.sets.legions; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Badlands.java b/Mage.Sets/src/mage/sets/limitedalpha/Badlands.java index 7ff7da6c47c..4e0ce202284 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Badlands.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Badlands.java @@ -28,8 +28,8 @@ package mage.sets.limitedalpha; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Bayou.java b/Mage.Sets/src/mage/sets/limitedalpha/Bayou.java index 0e08935ad4d..cf7e12ef215 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Bayou.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Bayou.java @@ -28,8 +28,8 @@ package mage.sets.limitedalpha; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/limitedalpha/BlueElementalBlast.java b/Mage.Sets/src/mage/sets/limitedalpha/BlueElementalBlast.java index 23ef2786423..a9655fb6436 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/BlueElementalBlast.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/BlueElementalBlast.java @@ -28,8 +28,8 @@ package mage.sets.limitedalpha; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.Mode; import mage.abilities.effects.common.CounterTargetEffect; diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Clone.java b/Mage.Sets/src/mage/sets/limitedalpha/Clone.java index 8fad34b4c96..b66480f102e 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Clone.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Clone.java @@ -28,7 +28,7 @@ package mage.sets.limitedalpha; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Counterspell.java b/Mage.Sets/src/mage/sets/limitedalpha/Counterspell.java index b4858204cdb..c0a5ec86804 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Counterspell.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Counterspell.java @@ -28,7 +28,7 @@ package mage.sets.limitedalpha; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/limitedalpha/EvilPresence.java b/Mage.Sets/src/mage/sets/limitedalpha/EvilPresence.java index f0617cec572..4b39b3a0176 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/EvilPresence.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/EvilPresence.java @@ -28,7 +28,7 @@ package mage.sets.limitedalpha; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/limitedalpha/FireElemental.java b/Mage.Sets/src/mage/sets/limitedalpha/FireElemental.java index 90a3b9cd1a2..e683ba837a4 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/FireElemental.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/FireElemental.java @@ -28,7 +28,7 @@ package mage.sets.limitedalpha; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Fireball.java b/Mage.Sets/src/mage/sets/limitedalpha/Fireball.java index eed05086f60..0b4777d8dda 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Fireball.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Fireball.java @@ -28,7 +28,7 @@ package mage.sets.limitedalpha; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Fungusaur.java b/Mage.Sets/src/mage/sets/limitedalpha/Fungusaur.java index 6b0d43a6d32..beb710d2750 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Fungusaur.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Fungusaur.java @@ -28,13 +28,14 @@ package mage.sets.limitedalpha; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealtDamageToSourceTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; /** @@ -54,7 +55,7 @@ public class Fungusaur extends CardImpl { this.toughness = new MageInt(2); // Whenever Fungusaur is dealt damage, put a +1/+1 counter on it. - this.addAbility(new DealtDamageToSourceTriggeredAbility(Constants.Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), false)); + this.addAbility(new DealtDamageToSourceTriggeredAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), false)); } public Fungusaur(final Fungusaur card) { diff --git a/Mage.Sets/src/mage/sets/limitedalpha/GoblinBalloonBrigade.java b/Mage.Sets/src/mage/sets/limitedalpha/GoblinBalloonBrigade.java index 0903b6d2522..612112c7a8a 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/GoblinBalloonBrigade.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/GoblinBalloonBrigade.java @@ -28,7 +28,7 @@ package mage.sets.limitedalpha; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/limitedalpha/HypnoticSpecter.java b/Mage.Sets/src/mage/sets/limitedalpha/HypnoticSpecter.java index e1ae3c7c606..31f9ffe46e0 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/HypnoticSpecter.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/HypnoticSpecter.java @@ -28,7 +28,7 @@ package mage.sets.limitedalpha; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/limitedalpha/NorthernPaladin.java b/Mage.Sets/src/mage/sets/limitedalpha/NorthernPaladin.java index 055c608dd16..e952d4e8446 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/NorthernPaladin.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/NorthernPaladin.java @@ -29,9 +29,8 @@ package mage.sets.limitedalpha; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -40,6 +39,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetPermanent; @@ -66,7 +66,7 @@ public class NorthernPaladin extends CardImpl { this.toughness = new MageInt(3); // {W}{W}, {tap}: Destroy target black permanent. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{W}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{W}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Plateau.java b/Mage.Sets/src/mage/sets/limitedalpha/Plateau.java index 7ed2259c664..32db1104a05 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Plateau.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Plateau.java @@ -28,8 +28,8 @@ package mage.sets.limitedalpha; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.mana.RedManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/limitedalpha/ProdigalSorcerer.java b/Mage.Sets/src/mage/sets/limitedalpha/ProdigalSorcerer.java index b8b4555de65..fea74f0c12a 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/ProdigalSorcerer.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/ProdigalSorcerer.java @@ -28,7 +28,7 @@ package mage.sets.limitedalpha; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/limitedalpha/PsionicBlast.java b/Mage.Sets/src/mage/sets/limitedalpha/PsionicBlast.java index 13e7bda1fc2..39b678fc2c1 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/PsionicBlast.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/PsionicBlast.java @@ -28,7 +28,7 @@ package mage.sets.limitedalpha; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/limitedalpha/RedElementalBlast.java b/Mage.Sets/src/mage/sets/limitedalpha/RedElementalBlast.java index 0498aef5661..223c5ec0b21 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/RedElementalBlast.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/RedElementalBlast.java @@ -28,8 +28,8 @@ package mage.sets.limitedalpha; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.Mode; import mage.abilities.effects.common.CounterTargetEffect; diff --git a/Mage.Sets/src/mage/sets/limitedalpha/RocOfKherRidges.java b/Mage.Sets/src/mage/sets/limitedalpha/RocOfKherRidges.java index 542832ddb1b..8cbe96d41c1 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/RocOfKherRidges.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/RocOfKherRidges.java @@ -28,8 +28,8 @@ package mage.sets.limitedalpha; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Savannah.java b/Mage.Sets/src/mage/sets/limitedalpha/Savannah.java index a64be98a1af..557e2978f75 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Savannah.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Savannah.java @@ -28,8 +28,8 @@ package mage.sets.limitedalpha; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Scrubland.java b/Mage.Sets/src/mage/sets/limitedalpha/Scrubland.java index db0914d5e88..fd9945461ec 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Scrubland.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Scrubland.java @@ -28,8 +28,8 @@ package mage.sets.limitedalpha; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/limitedalpha/SengirVampire.java b/Mage.Sets/src/mage/sets/limitedalpha/SengirVampire.java index 7ecfd7e4089..8d74efef8e9 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/SengirVampire.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/SengirVampire.java @@ -28,7 +28,7 @@ package mage.sets.limitedalpha; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/limitedalpha/SerraAngel.java b/Mage.Sets/src/mage/sets/limitedalpha/SerraAngel.java index 549adf11d4f..7dfaacf35c6 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/SerraAngel.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/SerraAngel.java @@ -28,7 +28,7 @@ package mage.sets.limitedalpha; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Sinkhole.java b/Mage.Sets/src/mage/sets/limitedalpha/Sinkhole.java index 5fd91597aa3..f5f239d83bc 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Sinkhole.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Sinkhole.java @@ -28,8 +28,8 @@ package mage.sets.limitedalpha; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetLandPermanent; diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Taiga.java b/Mage.Sets/src/mage/sets/limitedalpha/Taiga.java index 1415c0436ed..1e16256be95 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Taiga.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Taiga.java @@ -28,8 +28,8 @@ package mage.sets.limitedalpha; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/limitedalpha/TropicalIsland.java b/Mage.Sets/src/mage/sets/limitedalpha/TropicalIsland.java index 0474a6a7086..2577e89bc05 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/TropicalIsland.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/TropicalIsland.java @@ -28,8 +28,8 @@ package mage.sets.limitedalpha; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Tundra.java b/Mage.Sets/src/mage/sets/limitedalpha/Tundra.java index c175f3eb695..b361e2d56e5 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Tundra.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Tundra.java @@ -28,8 +28,8 @@ package mage.sets.limitedalpha; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/limitedalpha/UndergroundSea.java b/Mage.Sets/src/mage/sets/limitedalpha/UndergroundSea.java index 7fbc30d4d65..bf16718e4eb 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/UndergroundSea.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/UndergroundSea.java @@ -28,8 +28,8 @@ package mage.sets.limitedalpha; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Clone.java b/Mage.Sets/src/mage/sets/limitedbeta/Clone.java index 5fb9a4e1cbf..bbd2d9b8e51 100644 --- a/Mage.Sets/src/mage/sets/limitedbeta/Clone.java +++ b/Mage.Sets/src/mage/sets/limitedbeta/Clone.java @@ -28,7 +28,7 @@ package mage.sets.limitedbeta; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Counterspell.java b/Mage.Sets/src/mage/sets/limitedbeta/Counterspell.java index b7efff6e0c0..a428832469d 100644 --- a/Mage.Sets/src/mage/sets/limitedbeta/Counterspell.java +++ b/Mage.Sets/src/mage/sets/limitedbeta/Counterspell.java @@ -28,7 +28,7 @@ package mage.sets.limitedbeta; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/limitedbeta/EvilPresence.java b/Mage.Sets/src/mage/sets/limitedbeta/EvilPresence.java index 0a7303b1523..0ff1878e865 100644 --- a/Mage.Sets/src/mage/sets/limitedbeta/EvilPresence.java +++ b/Mage.Sets/src/mage/sets/limitedbeta/EvilPresence.java @@ -28,7 +28,7 @@ package mage.sets.limitedbeta; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/limitedbeta/FireElemental.java b/Mage.Sets/src/mage/sets/limitedbeta/FireElemental.java index 29ca65d935a..a66cfc16d43 100644 --- a/Mage.Sets/src/mage/sets/limitedbeta/FireElemental.java +++ b/Mage.Sets/src/mage/sets/limitedbeta/FireElemental.java @@ -28,7 +28,7 @@ package mage.sets.limitedbeta; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Fireball.java b/Mage.Sets/src/mage/sets/limitedbeta/Fireball.java index 7a2869e78e7..66054951570 100644 --- a/Mage.Sets/src/mage/sets/limitedbeta/Fireball.java +++ b/Mage.Sets/src/mage/sets/limitedbeta/Fireball.java @@ -28,7 +28,7 @@ package mage.sets.limitedbeta; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/limitedbeta/GoblinBalloonBrigade.java b/Mage.Sets/src/mage/sets/limitedbeta/GoblinBalloonBrigade.java index bc66ee93b90..a47b2d67080 100644 --- a/Mage.Sets/src/mage/sets/limitedbeta/GoblinBalloonBrigade.java +++ b/Mage.Sets/src/mage/sets/limitedbeta/GoblinBalloonBrigade.java @@ -28,7 +28,7 @@ package mage.sets.limitedbeta; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/limitedbeta/HypnoticSpecter.java b/Mage.Sets/src/mage/sets/limitedbeta/HypnoticSpecter.java index 61e5e5084ac..5cc9290cc3a 100644 --- a/Mage.Sets/src/mage/sets/limitedbeta/HypnoticSpecter.java +++ b/Mage.Sets/src/mage/sets/limitedbeta/HypnoticSpecter.java @@ -28,7 +28,7 @@ package mage.sets.limitedbeta; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/limitedbeta/ProdigalSorcerer.java b/Mage.Sets/src/mage/sets/limitedbeta/ProdigalSorcerer.java index 5751346bddc..0c54d0346f9 100644 --- a/Mage.Sets/src/mage/sets/limitedbeta/ProdigalSorcerer.java +++ b/Mage.Sets/src/mage/sets/limitedbeta/ProdigalSorcerer.java @@ -28,7 +28,7 @@ package mage.sets.limitedbeta; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/limitedbeta/PsionicBlast.java b/Mage.Sets/src/mage/sets/limitedbeta/PsionicBlast.java index d55205df9e5..d9625cc2886 100644 --- a/Mage.Sets/src/mage/sets/limitedbeta/PsionicBlast.java +++ b/Mage.Sets/src/mage/sets/limitedbeta/PsionicBlast.java @@ -28,7 +28,7 @@ package mage.sets.limitedbeta; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/limitedbeta/SengirVampire.java b/Mage.Sets/src/mage/sets/limitedbeta/SengirVampire.java index 35f26aa1113..ca8e182e212 100644 --- a/Mage.Sets/src/mage/sets/limitedbeta/SengirVampire.java +++ b/Mage.Sets/src/mage/sets/limitedbeta/SengirVampire.java @@ -28,7 +28,7 @@ package mage.sets.limitedbeta; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/limitedbeta/SerraAngel.java b/Mage.Sets/src/mage/sets/limitedbeta/SerraAngel.java index 49d801f75e9..b058f9e0334 100644 --- a/Mage.Sets/src/mage/sets/limitedbeta/SerraAngel.java +++ b/Mage.Sets/src/mage/sets/limitedbeta/SerraAngel.java @@ -28,7 +28,7 @@ package mage.sets.limitedbeta; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/lorwyn/AjaniGoldmane.java b/Mage.Sets/src/mage/sets/lorwyn/AjaniGoldmane.java index f464e3961f7..2356de696aa 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/AjaniGoldmane.java +++ b/Mage.Sets/src/mage/sets/lorwyn/AjaniGoldmane.java @@ -27,7 +27,7 @@ */ package mage.sets.lorwyn; -import mage.Constants.Rarity; +import mage.constants.Rarity; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/lorwyn/AncientAmphitheater.java b/Mage.Sets/src/mage/sets/lorwyn/AncientAmphitheater.java index dc095287ceb..05156324aad 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/AncientAmphitheater.java +++ b/Mage.Sets/src/mage/sets/lorwyn/AncientAmphitheater.java @@ -28,8 +28,8 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.costs.common.RevealTargetFromHandCost; import mage.abilities.effects.common.TapSourceUnlessPaysEffect; diff --git a/Mage.Sets/src/mage/sets/lorwyn/ArbiterOfKnollridge.java b/Mage.Sets/src/mage/sets/lorwyn/ArbiterOfKnollridge.java index 343373017e7..bebbdc7e611 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ArbiterOfKnollridge.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ArbiterOfKnollridge.java @@ -29,15 +29,15 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; @@ -75,7 +75,7 @@ public class ArbiterOfKnollridge extends CardImpl { class ArbiterOfKnollridgeEffect extends OneShotEffect { ArbiterOfKnollridgeEffect() { - super(Constants.Outcome.GainLife); + super(Outcome.GainLife); staticText = "each player's life total becomes the highest life total among all players"; } diff --git a/Mage.Sets/src/mage/sets/lorwyn/AuntiesHovel.java b/Mage.Sets/src/mage/sets/lorwyn/AuntiesHovel.java index 78154176dda..065ffdeed5a 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/AuntiesHovel.java +++ b/Mage.Sets/src/mage/sets/lorwyn/AuntiesHovel.java @@ -28,8 +28,8 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.costs.common.RevealTargetFromHandCost; import mage.abilities.effects.common.TapSourceUnlessPaysEffect; diff --git a/Mage.Sets/src/mage/sets/lorwyn/AvianChangeling.java b/Mage.Sets/src/mage/sets/lorwyn/AvianChangeling.java index f07dfcf3a15..3d99e81cecc 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/AvianChangeling.java +++ b/Mage.Sets/src/mage/sets/lorwyn/AvianChangeling.java @@ -27,8 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ChangelingAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/lorwyn/AxegrinderGiant.java b/Mage.Sets/src/mage/sets/lorwyn/AxegrinderGiant.java index 3d8c2c9aab6..8cda9bf9a1f 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/AxegrinderGiant.java +++ b/Mage.Sets/src/mage/sets/lorwyn/AxegrinderGiant.java @@ -27,8 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/lorwyn/BattleMastery.java b/Mage.Sets/src/mage/sets/lorwyn/BattleMastery.java index 16c7437ae5a..a1337b5da46 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/BattleMastery.java +++ b/Mage.Sets/src/mage/sets/lorwyn/BattleMastery.java @@ -27,9 +27,7 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -55,10 +53,10 @@ public class BattleMastery extends CardImpl { this.color.setWhite(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.AURA))); } public BattleMastery(final BattleMastery card) { diff --git a/Mage.Sets/src/mage/sets/lorwyn/Benthicore.java b/Mage.Sets/src/mage/sets/lorwyn/Benthicore.java index 02b5aaea99d..100ff76f42d 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Benthicore.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Benthicore.java @@ -27,9 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -40,6 +39,8 @@ import mage.abilities.effects.common.UntapSourceEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -70,8 +71,8 @@ public class Benthicore extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new MerfolkToken(), 2), false)); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new UntapSourceEffect(), new TapTargetCost(new TargetControlledPermanent(2, 2, filter, false))); - ability.addEffect(new GainAbilitySourceEffect(ShroudAbility.getInstance(), Constants.Duration.EndOfTurn)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new TapTargetCost(new TargetControlledPermanent(2, 2, filter, false))); + ability.addEffect(new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/BlackPoplarShaman.java b/Mage.Sets/src/mage/sets/lorwyn/BlackPoplarShaman.java index 15e8a72b56f..e89e5c8ffb8 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/BlackPoplarShaman.java +++ b/Mage.Sets/src/mage/sets/lorwyn/BlackPoplarShaman.java @@ -27,15 +27,15 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; @@ -62,7 +62,7 @@ public class BlackPoplarShaman extends CardImpl { this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{2}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{2}{B}")); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/BoggartBirthRite.java b/Mage.Sets/src/mage/sets/lorwyn/BoggartBirthRite.java index c6883f6ccc6..610e14913dd 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/BoggartBirthRite.java +++ b/Mage.Sets/src/mage/sets/lorwyn/BoggartBirthRite.java @@ -27,8 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterCard; diff --git a/Mage.Sets/src/mage/sets/lorwyn/BrigidHeroOfKinsbaile.java b/Mage.Sets/src/mage/sets/lorwyn/BrigidHeroOfKinsbaile.java index c9cf03238a8..274b3857957 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/BrigidHeroOfKinsbaile.java +++ b/Mage.Sets/src/mage/sets/lorwyn/BrigidHeroOfKinsbaile.java @@ -28,9 +28,9 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +38,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -69,7 +71,7 @@ public class BrigidHeroOfKinsbaile extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // {tap}: Brigid, Hero of Kinsbaile deals 2 damage to each attacking or blocking creature target player controls. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BrigidHeroOfKinsbaileEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BrigidHeroOfKinsbaileEffect(), new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); @@ -98,7 +100,7 @@ class BrigidHeroOfKinsbaileEffect extends OneShotEffect { this.toughness = new MageInt(2); // Each Goblin you control can't be blocked except by two or more creatures. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAllEffect( - new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(2)), + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(2)), Duration.WhileOnBattlefield, filterGoblin, "Each Goblin you control can't be blocked except by two or more creatures"))); // Each Elemental you control can't be blocked except by two or more creatures. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAllEffect( - new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(2)), + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(2)), Duration.WhileOnBattlefield, filterGoblin, "Each Elemental you control can't be blocked except by two or more creatures"))); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/ChandraNalaar.java b/Mage.Sets/src/mage/sets/lorwyn/ChandraNalaar.java index f6f22de8dbe..86e67170782 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ChandraNalaar.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ChandraNalaar.java @@ -27,7 +27,7 @@ */ package mage.sets.lorwyn; -import mage.Constants.Rarity; +import mage.constants.Rarity; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/lorwyn/CloudcrownOak.java b/Mage.Sets/src/mage/sets/lorwyn/CloudcrownOak.java index 8fd2528bbfa..07dbe3ce6a9 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/CloudcrownOak.java +++ b/Mage.Sets/src/mage/sets/lorwyn/CloudcrownOak.java @@ -27,8 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/lorwyn/CloudgoatRanger.java b/Mage.Sets/src/mage/sets/lorwyn/CloudgoatRanger.java index 8dfde313b8c..eb8efd609fb 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/CloudgoatRanger.java +++ b/Mage.Sets/src/mage/sets/lorwyn/CloudgoatRanger.java @@ -27,9 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -40,6 +39,8 @@ import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -71,8 +72,8 @@ public class CloudgoatRanger extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new KithkinToken(), 3), false)); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Constants.Duration.EndOfTurn), new TapTargetCost(new TargetControlledPermanent(3, 3, filter, false))); - ability.addEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new TapTargetCost(new TargetControlledPermanent(3, 3, filter, false))); + ability.addEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/Cloudthresher.java b/Mage.Sets/src/mage/sets/lorwyn/Cloudthresher.java index 848a762945d..ae5acdb882d 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Cloudthresher.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Cloudthresher.java @@ -28,8 +28,8 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/lorwyn/CrypticCommand.java b/Mage.Sets/src/mage/sets/lorwyn/CrypticCommand.java index 15b1de21b3c..eee8f86cacf 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/CrypticCommand.java +++ b/Mage.Sets/src/mage/sets/lorwyn/CrypticCommand.java @@ -28,10 +28,10 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; @@ -39,6 +39,7 @@ import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; @@ -111,7 +112,7 @@ class CrypticCommandEffect extends OneShotEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(Constants.TargetController.NOT_YOU)); + filter.add(new ControllerPredicate(TargetController.NOT_YOU)); } public CrypticCommandEffect() { diff --git a/Mage.Sets/src/mage/sets/lorwyn/Dawnfluke.java b/Mage.Sets/src/mage/sets/lorwyn/Dawnfluke.java index 29b6f2c83c4..2501d2a4232 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Dawnfluke.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Dawnfluke.java @@ -28,9 +28,9 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/lorwyn/DeeptreadMerrow.java b/Mage.Sets/src/mage/sets/lorwyn/DeeptreadMerrow.java index 29ee6763987..003bd7d6db2 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/DeeptreadMerrow.java +++ b/Mage.Sets/src/mage/sets/lorwyn/DeeptreadMerrow.java @@ -27,9 +27,7 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -53,7 +51,7 @@ public class DeeptreadMerrow extends CardImpl { this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(new IslandwalkAbility(), Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.U))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(new IslandwalkAbility(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U))); } public DeeptreadMerrow(final DeeptreadMerrow card) { diff --git a/Mage.Sets/src/mage/sets/lorwyn/DoranTheSiegeTower.java b/Mage.Sets/src/mage/sets/lorwyn/DoranTheSiegeTower.java index 6d316fe7f29..a94882dfb71 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/DoranTheSiegeTower.java +++ b/Mage.Sets/src/mage/sets/lorwyn/DoranTheSiegeTower.java @@ -28,22 +28,22 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.game.Game; import mage.game.events.DamageCreatureEvent; import mage.game.events.DamagePlaneswalkerEvent; import mage.game.events.DamagePlayerEvent; import mage.game.events.GameEvent; -import static mage.game.events.GameEvent.EventType.DAMAGE_PLANESWALKER; import mage.game.permanent.Permanent; /** @@ -82,7 +82,7 @@ public class DoranTheSiegeTower extends CardImpl { class DoranTheSiegeTowerEffect extends ReplacementEffectImpl { public DoranTheSiegeTowerEffect() { - super(Constants.Duration.WhileOnBattlefield, Outcome.Damage); + super(Duration.WhileOnBattlefield, Outcome.Damage); staticText = "Each creature assigns combat damage equal to its toughness rather than its power"; } diff --git a/Mage.Sets/src/mage/sets/lorwyn/DrownerOfSecrets.java b/Mage.Sets/src/mage/sets/lorwyn/DrownerOfSecrets.java index c65bc441c36..6523c80da57 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/DrownerOfSecrets.java +++ b/Mage.Sets/src/mage/sets/lorwyn/DrownerOfSecrets.java @@ -28,15 +28,16 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -68,7 +69,7 @@ public class DrownerOfSecrets extends CardImpl { this.toughness = new MageInt(3); // Tap an untapped Merfolk you control: Target player puts the top card of his or her library into his or her graveyard. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(1), new TapTargetCost(new TargetControlledPermanent(filter))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(1), new TapTargetCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/ElvishEulogist.java b/Mage.Sets/src/mage/sets/lorwyn/ElvishEulogist.java index 0926c6b23e5..0c6648266fa 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ElvishEulogist.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ElvishEulogist.java @@ -27,15 +27,15 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -61,7 +61,7 @@ public class ElvishEulogist extends CardImpl { this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainLifeEffect(new CardsInControllerGraveyardCount(filter, 1)), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(new CardsInControllerGraveyardCount(filter, 1)), new SacrificeSourceCost())); } public ElvishEulogist(final ElvishEulogist card) { diff --git a/Mage.Sets/src/mage/sets/lorwyn/ElvishHandservant.java b/Mage.Sets/src/mage/sets/lorwyn/ElvishHandservant.java index e50096c2641..2b96ca797c3 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ElvishHandservant.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ElvishHandservant.java @@ -28,8 +28,8 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/lorwyn/ElvishPromenade.java b/Mage.Sets/src/mage/sets/lorwyn/ElvishPromenade.java index 724ac0c24b7..80652d31afb 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ElvishPromenade.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ElvishPromenade.java @@ -27,8 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/lorwyn/EpicProportions.java b/Mage.Sets/src/mage/sets/lorwyn/EpicProportions.java index 5e511206932..a93dea571f4 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/EpicProportions.java +++ b/Mage.Sets/src/mage/sets/lorwyn/EpicProportions.java @@ -27,9 +27,7 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -58,11 +56,11 @@ public class EpicProportions extends CardImpl { this.addAbility(FlashAbility.getInstance()); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(5, 5, Constants.Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(5, 5, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA))); } public EpicProportions(final EpicProportions card) { diff --git a/Mage.Sets/src/mage/sets/lorwyn/EyeblightsEnding.java b/Mage.Sets/src/mage/sets/lorwyn/EyeblightsEnding.java index d57490cb96c..224bccae079 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/EyeblightsEnding.java +++ b/Mage.Sets/src/mage/sets/lorwyn/EyeblightsEnding.java @@ -27,8 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/lorwyn/Facevaulter.java b/Mage.Sets/src/mage/sets/lorwyn/Facevaulter.java index 6e4170dbd17..27f155d73be 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Facevaulter.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Facevaulter.java @@ -27,9 +27,7 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -63,7 +61,7 @@ public class Facevaulter extends CardImpl { this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/FaerieTrickery.java b/Mage.Sets/src/mage/sets/lorwyn/FaerieTrickery.java index 5d1a46b33be..ab4b270e08a 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/FaerieTrickery.java +++ b/Mage.Sets/src/mage/sets/lorwyn/FaerieTrickery.java @@ -28,9 +28,9 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.effects.common.CounterTargetWithReplacementEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; diff --git a/Mage.Sets/src/mage/sets/lorwyn/Fallowsage.java b/Mage.Sets/src/mage/sets/lorwyn/Fallowsage.java index d518c4c8114..20fc0e65d6d 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Fallowsage.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Fallowsage.java @@ -28,8 +28,8 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BecomesTappedTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/lorwyn/FamiliarsRuse.java b/Mage.Sets/src/mage/sets/lorwyn/FamiliarsRuse.java index f2825fcfef4..472aa452e0e 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/FamiliarsRuse.java +++ b/Mage.Sets/src/mage/sets/lorwyn/FamiliarsRuse.java @@ -27,8 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.common.ReturnToHandTargetCost; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/lorwyn/FinalRevels.java b/Mage.Sets/src/mage/sets/lorwyn/FinalRevels.java index 41d3907eafd..086937269af 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/FinalRevels.java +++ b/Mage.Sets/src/mage/sets/lorwyn/FinalRevels.java @@ -27,12 +27,12 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Mode; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import java.util.UUID; @@ -47,9 +47,9 @@ public class FinalRevels extends CardImpl { super(ownerId, 113, "Final Revels", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{B}"); this.expansionSetCode = "LRW"; this.color.setBlack(true); - this.getSpellAbility().addEffect(new BoostAllEffect(2, 0, Constants.Duration.EndOfTurn, new FilterCreaturePermanent(), false)); + this.getSpellAbility().addEffect(new BoostAllEffect(2, 0, Duration.EndOfTurn, new FilterCreaturePermanent(), false)); Mode mode = new Mode(); - mode.getEffects().add(new BoostAllEffect(0, -2, Constants.Duration.EndOfTurn, new FilterCreaturePermanent(), false)); + mode.getEffects().add(new BoostAllEffect(0, -2, Duration.EndOfTurn, new FilterCreaturePermanent(), false)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/FlamekinBladewhirl.java b/Mage.Sets/src/mage/sets/lorwyn/FlamekinBladewhirl.java index 7a980e80ea7..7a78d551af5 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/FlamekinBladewhirl.java +++ b/Mage.Sets/src/mage/sets/lorwyn/FlamekinBladewhirl.java @@ -28,8 +28,8 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.OrCost; import mage.abilities.costs.common.RevealTargetFromHandCost; diff --git a/Mage.Sets/src/mage/sets/lorwyn/FlamekinBrawler.java b/Mage.Sets/src/mage/sets/lorwyn/FlamekinBrawler.java index 12e3db99e7a..afd3d0fe9fa 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/FlamekinBrawler.java +++ b/Mage.Sets/src/mage/sets/lorwyn/FlamekinBrawler.java @@ -27,9 +27,7 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -52,7 +50,7 @@ public class FlamekinBrawler extends CardImpl { this.color.setRed(true); this.power = new MageInt(0); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); } public FlamekinBrawler(final FlamekinBrawler card) { diff --git a/Mage.Sets/src/mage/sets/lorwyn/FlamekinSpitfire.java b/Mage.Sets/src/mage/sets/lorwyn/FlamekinSpitfire.java index ba85a966544..9979d58116f 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/FlamekinSpitfire.java +++ b/Mage.Sets/src/mage/sets/lorwyn/FlamekinSpitfire.java @@ -27,15 +27,15 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; import java.util.UUID; @@ -54,7 +54,7 @@ public class FlamekinSpitfire extends CardImpl { this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{3}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{3}{R}")); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/GaddockTeeg.java b/Mage.Sets/src/mage/sets/lorwyn/GaddockTeeg.java index 5b5d793b260..a5720c46d72 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/GaddockTeeg.java +++ b/Mage.Sets/src/mage/sets/lorwyn/GaddockTeeg.java @@ -28,9 +28,8 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -59,9 +58,9 @@ public class GaddockTeeg extends CardImpl { this.toughness = new MageInt(2); // Noncreature spells with converted mana cost 4 or greater can't be cast. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GaddockTeegReplacementEffect4())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GaddockTeegReplacementEffect4())); // Noncreature spells with {X} in their mana costs can't be cast. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GaddockTeegReplacementEffectX())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GaddockTeegReplacementEffectX())); } public GaddockTeeg(final GaddockTeeg card) { @@ -77,7 +76,7 @@ public class GaddockTeeg extends CardImpl { class GaddockTeegReplacementEffect4 extends ReplacementEffectImpl { public GaddockTeegReplacementEffect4() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Detriment); + super(Duration.WhileOnBattlefield, Outcome.Detriment); staticText = "Noncreature spells with converted mana cost 4 or greater can't be cast. Noncreature spells with {X} in their mana costs can't be cast."; } @@ -116,7 +115,7 @@ class GaddockTeegReplacementEffect4 extends ReplacementEffectImpl { public GaddockTeegReplacementEffectX() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Detriment); + super(Duration.WhileOnBattlefield, Outcome.Detriment); staticText = "Noncreature spells with {X} in their mana costs can't be cast."; } diff --git a/Mage.Sets/src/mage/sets/lorwyn/GarrukWildspeaker.java b/Mage.Sets/src/mage/sets/lorwyn/GarrukWildspeaker.java index 517f05c379a..a7483416556 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/GarrukWildspeaker.java +++ b/Mage.Sets/src/mage/sets/lorwyn/GarrukWildspeaker.java @@ -27,7 +27,7 @@ */ package mage.sets.lorwyn; -import mage.Constants.Rarity; +import mage.constants.Rarity; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/lorwyn/GhostlyChangeling.java b/Mage.Sets/src/mage/sets/lorwyn/GhostlyChangeling.java index 799b6c66b11..dab5807d6e6 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/GhostlyChangeling.java +++ b/Mage.Sets/src/mage/sets/lorwyn/GhostlyChangeling.java @@ -27,15 +27,16 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.ChangelingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import java.util.UUID; @@ -53,7 +54,7 @@ public class GhostlyChangeling extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(ChangelingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Constants.Duration.EndOfTurn), new ManaCostsImpl("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{1}{B}"))); } public GhostlyChangeling(final GhostlyChangeling card) { diff --git a/Mage.Sets/src/mage/sets/lorwyn/GiltLeafPalace.java b/Mage.Sets/src/mage/sets/lorwyn/GiltLeafPalace.java index a48fd1a5992..9da083ac9b3 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/GiltLeafPalace.java +++ b/Mage.Sets/src/mage/sets/lorwyn/GiltLeafPalace.java @@ -28,8 +28,8 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.costs.common.RevealTargetFromHandCost; import mage.abilities.effects.common.TapSourceUnlessPaysEffect; diff --git a/Mage.Sets/src/mage/sets/lorwyn/GiltLeafSeer.java b/Mage.Sets/src/mage/sets/lorwyn/GiltLeafSeer.java index e616c298f0a..f89b77b1769 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/GiltLeafSeer.java +++ b/Mage.Sets/src/mage/sets/lorwyn/GiltLeafSeer.java @@ -27,9 +27,9 @@ */ package mage.sets.lorwyn; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/lorwyn/Glarewielder.java b/Mage.Sets/src/mage/sets/lorwyn/Glarewielder.java index 5b8a0a85409..e056a2faf43 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Glarewielder.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Glarewielder.java @@ -28,9 +28,9 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,6 +38,7 @@ import mage.abilities.effects.common.CantBlockTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.EvokeAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -59,7 +60,7 @@ public class Glarewielder extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // When Glarewielder enters the battlefield, up to two target creatures can't block this turn. - Ability ability = new EntersBattlefieldTriggeredAbility(new CantBlockTargetEffect(Constants.Duration.EndOfTurn)); + Ability ability = new EntersBattlefieldTriggeredAbility(new CantBlockTargetEffect(Duration.EndOfTurn)); ability.addTarget(new TargetCreaturePermanent(0, 2)); this.addAbility(ability); // Evoke {1}{R} diff --git a/Mage.Sets/src/mage/sets/lorwyn/GlimmerdustNap.java b/Mage.Sets/src/mage/sets/lorwyn/GlimmerdustNap.java index 9fc37eaace7..bb5e31b8761 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/GlimmerdustNap.java +++ b/Mage.Sets/src/mage/sets/lorwyn/GlimmerdustNap.java @@ -28,10 +28,10 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.SkipEnchantedUntapEffect; diff --git a/Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java b/Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java index 0cc27a77b09..e07733fac63 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java @@ -27,9 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,6 +37,7 @@ import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.effects.common.continious.GainControlTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; @@ -66,8 +66,8 @@ public class Goatnapper extends CardImpl { this.toughness = new MageInt(2); Ability ability = new EntersBattlefieldTriggeredAbility(new UntapTargetEffect(), false); ability.addTarget(new TargetPermanent(filter)); - ability.addEffect(new GainControlTargetEffect(Constants.Duration.EndOfTurn)); - ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Constants.Duration.EndOfTurn)); + ability.addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); + ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/GoldmeadowStalwart.java b/Mage.Sets/src/mage/sets/lorwyn/GoldmeadowStalwart.java index ce35f13f3ab..a5449d6444a 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/GoldmeadowStalwart.java +++ b/Mage.Sets/src/mage/sets/lorwyn/GoldmeadowStalwart.java @@ -28,8 +28,8 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.OrCost; import mage.abilities.costs.common.RevealTargetFromHandCost; diff --git a/Mage.Sets/src/mage/sets/lorwyn/GuardianOfCloverdell.java b/Mage.Sets/src/mage/sets/lorwyn/GuardianOfCloverdell.java index a2fa9963292..efe7d43644a 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/GuardianOfCloverdell.java +++ b/Mage.Sets/src/mage/sets/lorwyn/GuardianOfCloverdell.java @@ -27,9 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.KithkinToken; @@ -67,7 +68,7 @@ public class GuardianOfCloverdell extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(5); this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new KithkinToken(), 3), false)); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainLifeEffect(1), new ColoredManaCost(Constants.ColoredManaSymbol.G)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/HarpoonSniper.java b/Mage.Sets/src/mage/sets/lorwyn/HarpoonSniper.java index 3a79afec6f7..e3e077aee03 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/HarpoonSniper.java +++ b/Mage.Sets/src/mage/sets/lorwyn/HarpoonSniper.java @@ -27,9 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +37,8 @@ import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetAttackingOrBlockingCreature; @@ -64,7 +65,7 @@ public class HarpoonSniper extends CardImpl { this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)), new ColoredManaCost(Constants.ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/lorwyn/HearthcageGiant.java b/Mage.Sets/src/mage/sets/lorwyn/HearthcageGiant.java index 9b64d023202..4fb088a293e 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/HearthcageGiant.java +++ b/Mage.Sets/src/mage/sets/lorwyn/HearthcageGiant.java @@ -27,9 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,6 +37,8 @@ import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -70,7 +71,7 @@ public class HearthcageGiant extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new RedElementalToken(), 2), false)); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(3, 1, Constants.Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(filterElemental))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(3, 1, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(filterElemental))); ability.addTarget(new TargetCreaturePermanent(filterGiant)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/HerbalPoultice.java b/Mage.Sets/src/mage/sets/lorwyn/HerbalPoultice.java index 31c9775a6e7..8579216c01e 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/HerbalPoultice.java +++ b/Mage.Sets/src/mage/sets/lorwyn/HerbalPoultice.java @@ -27,15 +27,15 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.RegenerateTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -49,7 +49,7 @@ public class HerbalPoultice extends CardImpl { public HerbalPoultice(UUID ownerId) { super(ownerId, 257, "Herbal Poultice", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{0}"); this.expansionSetCode = "LRW"; - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateTargetEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new GenericManaCost(3)); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/lorwyn/HillcomberGiant.java b/Mage.Sets/src/mage/sets/lorwyn/HillcomberGiant.java index 2117c1a4646..04081aa810a 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/HillcomberGiant.java +++ b/Mage.Sets/src/mage/sets/lorwyn/HillcomberGiant.java @@ -27,8 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.MountainwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/lorwyn/HoofprintsOfTheStag.java b/Mage.Sets/src/mage/sets/lorwyn/HoofprintsOfTheStag.java index 56d70d8c6d2..f06991d3ece 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/HoofprintsOfTheStag.java +++ b/Mage.Sets/src/mage/sets/lorwyn/HoofprintsOfTheStag.java @@ -27,9 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DrawCardTriggeredAbility; @@ -41,6 +40,7 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.permanent.token.Token; @@ -59,7 +59,7 @@ public class HoofprintsOfTheStag extends CardImpl { this.subtype.add("Elemental"); this.color.setWhite(true); this.addAbility(new DrawCardTriggeredAbility(new AddCountersSourceEffect(CounterType.HOOFPRINT.createInstance(1)), true)); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new WhiteElementalToken(), 1), new ManaCostsImpl("{2}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new WhiteElementalToken(), 1), new ManaCostsImpl("{2}{W}")); ability.addCost(new RemoveCountersSourceCost(CounterType.HOOFPRINT.createInstance(4))); ability.addCost(new OnlyDuringYourTurnCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/lorwyn/HornetHarasser.java b/Mage.Sets/src/mage/sets/lorwyn/HornetHarasser.java index 23087b0dcaf..969fce908ad 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/HornetHarasser.java +++ b/Mage.Sets/src/mage/sets/lorwyn/HornetHarasser.java @@ -27,14 +27,14 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -53,7 +53,7 @@ public class HornetHarasser extends CardImpl { this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new DiesTriggeredAbility(new BoostTargetEffect(-2, -2, Constants.Duration.EndOfTurn), false); + Ability ability = new DiesTriggeredAbility(new BoostTargetEffect(-2, -2, Duration.EndOfTurn), false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/HurlyBurly.java b/Mage.Sets/src/mage/sets/lorwyn/HurlyBurly.java index b8de881e4d7..613537eba03 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/HurlyBurly.java +++ b/Mage.Sets/src/mage/sets/lorwyn/HurlyBurly.java @@ -27,8 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Mode; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/lorwyn/ImmaculateMagistrate.java b/Mage.Sets/src/mage/sets/lorwyn/ImmaculateMagistrate.java index 3b557606303..655ffac0e78 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ImmaculateMagistrate.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ImmaculateMagistrate.java @@ -27,10 +27,10 @@ */ package mage.sets.lorwyn; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/lorwyn/ImperiousPerfect.java b/Mage.Sets/src/mage/sets/lorwyn/ImperiousPerfect.java index 8255af74ea4..fa3d2947f45 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ImperiousPerfect.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ImperiousPerfect.java @@ -27,9 +27,7 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -65,8 +63,8 @@ public class ImperiousPerfect extends CardImpl { this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Constants.Duration.WhileOnBattlefield, filter, true))); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new ElfToken(), 1), new ColoredManaCost(Constants.ColoredManaSymbol.G)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ElfToken(), 1), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/IngotChewer.java b/Mage.Sets/src/mage/sets/lorwyn/IngotChewer.java index c3f9f60dd7e..285fdda3eaf 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/IngotChewer.java +++ b/Mage.Sets/src/mage/sets/lorwyn/IngotChewer.java @@ -28,8 +28,8 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/lorwyn/InkfathomDivers.java b/Mage.Sets/src/mage/sets/lorwyn/InkfathomDivers.java index 32fc1dd3544..9e44e0a18db 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/InkfathomDivers.java +++ b/Mage.Sets/src/mage/sets/lorwyn/InkfathomDivers.java @@ -29,8 +29,8 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryControllerEffect; diff --git a/Mage.Sets/src/mage/sets/lorwyn/InnerFlameAcolyte.java b/Mage.Sets/src/mage/sets/lorwyn/InnerFlameAcolyte.java index 55b4a7e98dc..9b34dafabe3 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/InnerFlameAcolyte.java +++ b/Mage.Sets/src/mage/sets/lorwyn/InnerFlameAcolyte.java @@ -28,9 +28,9 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/lorwyn/JaceBeleren.java b/Mage.Sets/src/mage/sets/lorwyn/JaceBeleren.java index b9c6ea323a7..def8e14d0b3 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/JaceBeleren.java +++ b/Mage.Sets/src/mage/sets/lorwyn/JaceBeleren.java @@ -27,7 +27,7 @@ */ package mage.sets.lorwyn; -import mage.Constants.Rarity; +import mage.constants.Rarity; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/lorwyn/KinsbaileBalloonist.java b/Mage.Sets/src/mage/sets/lorwyn/KinsbaileBalloonist.java index 99c65b154be..b7a469a063d 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/KinsbaileBalloonist.java +++ b/Mage.Sets/src/mage/sets/lorwyn/KinsbaileBalloonist.java @@ -27,15 +27,15 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -55,7 +55,7 @@ public class KinsbaileBalloonist extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new AttacksTriggeredAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn), true); + Ability ability = new AttacksTriggeredAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), true); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/KinsbaileSkirmisher.java b/Mage.Sets/src/mage/sets/lorwyn/KinsbaileSkirmisher.java index 58551fa139b..b73454050df 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/KinsbaileSkirmisher.java +++ b/Mage.Sets/src/mage/sets/lorwyn/KinsbaileSkirmisher.java @@ -27,14 +27,14 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -53,7 +53,7 @@ public class KinsbaileSkirmisher extends CardImpl { this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(1, 1, Constants.Duration.EndOfTurn), false); + Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/KithkinDaggerdare.java b/Mage.Sets/src/mage/sets/lorwyn/KithkinDaggerdare.java index 76dee4f972a..589ea9215b8 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/KithkinDaggerdare.java +++ b/Mage.Sets/src/mage/sets/lorwyn/KithkinDaggerdare.java @@ -27,9 +27,7 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -55,7 +53,7 @@ public class KithkinDaggerdare extends CardImpl { this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.G)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAttackingCreature()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/lorwyn/KithkinHealer.java b/Mage.Sets/src/mage/sets/lorwyn/KithkinHealer.java index 46085cbdf9d..604b475414a 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/KithkinHealer.java +++ b/Mage.Sets/src/mage/sets/lorwyn/KithkinHealer.java @@ -27,15 +27,16 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.PreventDamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; import java.util.UUID; @@ -54,7 +55,7 @@ public class KithkinHealer extends CardImpl { this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PreventDamageTargetEffect(Constants.Duration.EndOfTurn, 1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/KnightOfMeadowgrain.java b/Mage.Sets/src/mage/sets/lorwyn/KnightOfMeadowgrain.java index 2a4d2d3c3c6..2e465739bcc 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/KnightOfMeadowgrain.java +++ b/Mage.Sets/src/mage/sets/lorwyn/KnightOfMeadowgrain.java @@ -27,8 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.LifelinkAbility; diff --git a/Mage.Sets/src/mage/sets/lorwyn/LaceWithMoonglove.java b/Mage.Sets/src/mage/sets/lorwyn/LaceWithMoonglove.java index b575ddf4780..dbc09cd7a58 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/LaceWithMoonglove.java +++ b/Mage.Sets/src/mage/sets/lorwyn/LaceWithMoonglove.java @@ -27,13 +27,13 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -48,7 +48,7 @@ public class LaceWithMoonglove extends CardImpl { super(ownerId, 225, "Lace with Moonglove", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{G}"); this.expansionSetCode = "LRW"; this.color.setGreen(true); - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/LeafGilder.java b/Mage.Sets/src/mage/sets/lorwyn/LeafGilder.java index cdb8ba30627..47178171d4f 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/LeafGilder.java +++ b/Mage.Sets/src/mage/sets/lorwyn/LeafGilder.java @@ -27,8 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/lorwyn/LilianaVess.java b/Mage.Sets/src/mage/sets/lorwyn/LilianaVess.java index 72d7d1a3b6b..8013a6f2b04 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/LilianaVess.java +++ b/Mage.Sets/src/mage/sets/lorwyn/LilianaVess.java @@ -27,7 +27,7 @@ */ package mage.sets.lorwyn; -import mage.Constants.Rarity; +import mage.constants.Rarity; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/lorwyn/LysAlanaHuntmaster.java b/Mage.Sets/src/mage/sets/lorwyn/LysAlanaHuntmaster.java index 64d670c54ab..cde668d822b 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/LysAlanaHuntmaster.java +++ b/Mage.Sets/src/mage/sets/lorwyn/LysAlanaHuntmaster.java @@ -28,8 +28,8 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/lorwyn/MadAuntie.java b/Mage.Sets/src/mage/sets/lorwyn/MadAuntie.java index e729fdf97e5..673a986104c 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/MadAuntie.java +++ b/Mage.Sets/src/mage/sets/lorwyn/MadAuntie.java @@ -27,9 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +37,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.RegenerateTargetEffect; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -69,8 +70,8 @@ public class MadAuntie extends CardImpl { this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Constants.Duration.WhileOnBattlefield, filter2, true))); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateTargetEffect(), new TapSourceCost()); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter2, true))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent(1, 1, filter1, true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/MerrowReejerey.java b/Mage.Sets/src/mage/sets/lorwyn/MerrowReejerey.java index d515a0f8e2e..dc29d9aeed8 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/MerrowReejerey.java +++ b/Mage.Sets/src/mage/sets/lorwyn/MerrowReejerey.java @@ -28,11 +28,11 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/lorwyn/MirrorEntity.java b/Mage.Sets/src/mage/sets/lorwyn/MirrorEntity.java index 063ed6ad970..701d97296b1 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/MirrorEntity.java +++ b/Mage.Sets/src/mage/sets/lorwyn/MirrorEntity.java @@ -28,10 +28,10 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/lorwyn/MistbindClique.java b/Mage.Sets/src/mage/sets/lorwyn/MistbindClique.java index 8203abe7821..ebdd03b589f 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/MistbindClique.java +++ b/Mage.Sets/src/mage/sets/lorwyn/MistbindClique.java @@ -29,10 +29,10 @@ package mage.sets.lorwyn; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/lorwyn/MoongloveWinnower.java b/Mage.Sets/src/mage/sets/lorwyn/MoongloveWinnower.java index f2c2ddb07e0..29ef5f1b6ce 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/MoongloveWinnower.java +++ b/Mage.Sets/src/mage/sets/lorwyn/MoongloveWinnower.java @@ -27,8 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/lorwyn/Mournwhelk.java b/Mage.Sets/src/mage/sets/lorwyn/Mournwhelk.java index 342f9cb1a9e..b4e58caa225 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Mournwhelk.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Mournwhelk.java @@ -28,15 +28,14 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DiscardTargetEffect; import mage.abilities.keyword.EvokeAbility; import mage.cards.CardImpl; -import mage.target.Target; import mage.target.TargetPlayer; /** diff --git a/Mage.Sets/src/mage/sets/lorwyn/MudbuttonTorchrunner.java b/Mage.Sets/src/mage/sets/lorwyn/MudbuttonTorchrunner.java index 496e4c66447..b7f7cb7b5be 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/MudbuttonTorchrunner.java +++ b/Mage.Sets/src/mage/sets/lorwyn/MudbuttonTorchrunner.java @@ -27,8 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/lorwyn/NeckSnap.java b/Mage.Sets/src/mage/sets/lorwyn/NeckSnap.java index 2c060986c2a..4d66ce51788 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/NeckSnap.java +++ b/Mage.Sets/src/mage/sets/lorwyn/NeckSnap.java @@ -27,8 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetAttackingOrBlockingCreature; diff --git a/Mage.Sets/src/mage/sets/lorwyn/NectarFaerie.java b/Mage.Sets/src/mage/sets/lorwyn/NectarFaerie.java index 9c5b5cad791..3d736b1a5dd 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/NectarFaerie.java +++ b/Mage.Sets/src/mage/sets/lorwyn/NectarFaerie.java @@ -27,9 +27,7 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -68,7 +66,7 @@ public class NectarFaerie extends CardImpl { this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); // {B}, {tap}: Target Faerie or Elf gains lifelink until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/lorwyn/NightshadeStinger.java b/Mage.Sets/src/mage/sets/lorwyn/NightshadeStinger.java index 6e138c014f1..7173e5d92d6 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/NightshadeStinger.java +++ b/Mage.Sets/src/mage/sets/lorwyn/NightshadeStinger.java @@ -27,8 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/lorwyn/OakgnarlWarrior.java b/Mage.Sets/src/mage/sets/lorwyn/OakgnarlWarrior.java index ea3a2b3befd..fcb43d0eb29 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/OakgnarlWarrior.java +++ b/Mage.Sets/src/mage/sets/lorwyn/OakgnarlWarrior.java @@ -27,8 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.abilities.keyword.VigilanceAbility; diff --git a/Mage.Sets/src/mage/sets/lorwyn/Pestermite.java b/Mage.Sets/src/mage/sets/lorwyn/Pestermite.java index c144b91327d..db5c685274b 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Pestermite.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Pestermite.java @@ -28,8 +28,8 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/lorwyn/PloverKnights.java b/Mage.Sets/src/mage/sets/lorwyn/PloverKnights.java index 046b2a86bd1..5f181424bf8 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/PloverKnights.java +++ b/Mage.Sets/src/mage/sets/lorwyn/PloverKnights.java @@ -27,8 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/lorwyn/ProtectiveBubble.java b/Mage.Sets/src/mage/sets/lorwyn/ProtectiveBubble.java index 1eb6acbe529..1e82175a172 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ProtectiveBubble.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ProtectiveBubble.java @@ -28,11 +28,11 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.UnblockableAttachedEffect; diff --git a/Mage.Sets/src/mage/sets/lorwyn/ScarredVinebreeder.java b/Mage.Sets/src/mage/sets/lorwyn/ScarredVinebreeder.java index aaed199ac2a..bd666362e4d 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ScarredVinebreeder.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ScarredVinebreeder.java @@ -27,10 +27,10 @@ */ package mage.sets.lorwyn; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.ExileFromGraveCost; diff --git a/Mage.Sets/src/mage/sets/lorwyn/ScionOfOona.java b/Mage.Sets/src/mage/sets/lorwyn/ScionOfOona.java index 865d0c10848..3972050c5a0 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ScionOfOona.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ScionOfOona.java @@ -28,11 +28,11 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; diff --git a/Mage.Sets/src/mage/sets/lorwyn/SecludedGlen.java b/Mage.Sets/src/mage/sets/lorwyn/SecludedGlen.java index f06c65a8596..5c049e2befd 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SecludedGlen.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SecludedGlen.java @@ -28,8 +28,8 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.costs.common.RevealTargetFromHandCost; import mage.abilities.effects.common.TapSourceUnlessPaysEffect; diff --git a/Mage.Sets/src/mage/sets/lorwyn/SeedguideAsh.java b/Mage.Sets/src/mage/sets/lorwyn/SeedguideAsh.java index 3e66b5b07a9..150e8257f3e 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SeedguideAsh.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SeedguideAsh.java @@ -27,13 +27,13 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; @@ -61,7 +61,7 @@ public class SeedguideAsh extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); // When Seedguide Ash dies, you may search your library for up to three Forest cards and put them onto the battlefield tapped. If you do, shuffle your library. - this.addAbility(new DiesTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 3, filter), true, false, Constants.Outcome.PutLandInPlay), true)); + this.addAbility(new DiesTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 3, filter), true, false, Outcome.PutLandInPlay), true)); } public SeedguideAsh(final SeedguideAsh card) { diff --git a/Mage.Sets/src/mage/sets/lorwyn/SentinelsOfGlenElendra.java b/Mage.Sets/src/mage/sets/lorwyn/SentinelsOfGlenElendra.java index 6968ee193e1..719e8d8926b 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SentinelsOfGlenElendra.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SentinelsOfGlenElendra.java @@ -27,8 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/lorwyn/ShimmeringGrotto.java b/Mage.Sets/src/mage/sets/lorwyn/ShimmeringGrotto.java index ed86fa5be49..20b335875db 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ShimmeringGrotto.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ShimmeringGrotto.java @@ -27,8 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; diff --git a/Mage.Sets/src/mage/sets/lorwyn/SilvergillAdept.java b/Mage.Sets/src/mage/sets/lorwyn/SilvergillAdept.java index d5e4fef0456..46020ebc4cd 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SilvergillAdept.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SilvergillAdept.java @@ -27,9 +27,9 @@ */ package mage.sets.lorwyn; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/lorwyn/SkeletalChangeling.java b/Mage.Sets/src/mage/sets/lorwyn/SkeletalChangeling.java index 9a549315b34..037e4649efa 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SkeletalChangeling.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SkeletalChangeling.java @@ -27,15 +27,15 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.ChangelingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import java.util.UUID; @@ -55,7 +55,7 @@ public class SkeletalChangeling extends CardImpl { // Changeling this.addAbility(ChangelingAbility.getInstance()); // {1}{B}: Regenerate Skeletal Changeling. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}"))); } public SkeletalChangeling(final SkeletalChangeling card) { diff --git a/Mage.Sets/src/mage/sets/lorwyn/SowerOfTemptation.java b/Mage.Sets/src/mage/sets/lorwyn/SowerOfTemptation.java index f569aac18cb..96d617e9e68 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SowerOfTemptation.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SowerOfTemptation.java @@ -27,15 +27,15 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continious.GainControlTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -56,7 +56,7 @@ public class SowerOfTemptation extends CardImpl { this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); // When Sower of Temptation enters the battlefield, gain control of target creature for as long as Sower of Temptation remains on the battlefield. - Ability ability = new EntersBattlefieldTriggeredAbility(new GainControlTargetEffect(Constants.Duration.WhileOnBattlefield), false); + Ability ability = new EntersBattlefieldTriggeredAbility(new GainControlTargetEffect(Duration.WhileOnBattlefield), false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/SpellstutterSprite.java b/Mage.Sets/src/mage/sets/lorwyn/SpellstutterSprite.java index 801f223dd7a..1615aeb66ee 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SpellstutterSprite.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SpellstutterSprite.java @@ -28,10 +28,10 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -40,6 +40,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.Filter; import mage.filter.FilterSpell; import mage.filter.common.FilterCreaturePermanent; @@ -58,7 +59,7 @@ public class SpellstutterSprite extends CardImpl { public static final FilterCreaturePermanent filter = new FilterCreaturePermanent("number of Faeries you control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(new SubtypePredicate("Faerie")); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/SpiderwigBoggart.java b/Mage.Sets/src/mage/sets/lorwyn/SpiderwigBoggart.java index a18f8e7d3f3..8dde04f078e 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SpiderwigBoggart.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SpiderwigBoggart.java @@ -27,15 +27,15 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -55,7 +55,7 @@ public class SpiderwigBoggart extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); // When Spiderwig Boggart enters the battlefield, target creature gains fear until end of turn. - Ability ability = new EntersBattlefieldTriggeredAbility(new GainAbilityTargetEffect(FearAbility.getInstance(), Constants.Duration.EndOfTurn), false); + Ability ability = new EntersBattlefieldTriggeredAbility(new GainAbilityTargetEffect(FearAbility.getInstance(), Duration.EndOfTurn), false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/SpringleafDrum.java b/Mage.Sets/src/mage/sets/lorwyn/SpringleafDrum.java index be736f84136..3d8e6f62461 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SpringleafDrum.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SpringleafDrum.java @@ -27,8 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.mana.AnyColorManaAbility; diff --git a/Mage.Sets/src/mage/sets/lorwyn/SqueakingPieSneak.java b/Mage.Sets/src/mage/sets/lorwyn/SqueakingPieSneak.java index f8b9f447e64..09479ac837a 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SqueakingPieSneak.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SqueakingPieSneak.java @@ -28,8 +28,8 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.OrCost; import mage.abilities.costs.common.RevealTargetFromHandCost; diff --git a/Mage.Sets/src/mage/sets/lorwyn/StinkdrinkerDaredevil.java b/Mage.Sets/src/mage/sets/lorwyn/StinkdrinkerDaredevil.java index 052fb481dda..bdc8b58cca5 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/StinkdrinkerDaredevil.java +++ b/Mage.Sets/src/mage/sets/lorwyn/StinkdrinkerDaredevil.java @@ -28,9 +28,9 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.cost.SpellsCostReductionEffect; diff --git a/Mage.Sets/src/mage/sets/lorwyn/StonybrookAngler.java b/Mage.Sets/src/mage/sets/lorwyn/StonybrookAngler.java index 108e2f8f684..77e3522e6f8 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/StonybrookAngler.java +++ b/Mage.Sets/src/mage/sets/lorwyn/StonybrookAngler.java @@ -29,9 +29,8 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.MayTapOrUntapTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -58,7 +58,7 @@ public class StonybrookAngler extends CardImpl { this.toughness = new MageInt(2); // {1}{U}, {tap}: You may tap or untap target creature. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ManaCostsImpl("{1}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ManaCostsImpl("{1}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/lorwyn/SummonTheSchool.java b/Mage.Sets/src/mage/sets/lorwyn/SummonTheSchool.java index d9680aeefd8..8c8b9b9c3e1 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SummonTheSchool.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SummonTheSchool.java @@ -27,14 +27,14 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -66,7 +66,7 @@ public class SummonTheSchool extends CardImpl { // Put two 1/1 blue Merfolk Wizard creature tokens onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new MerfolkToken(), 2)); // Tap four untapped Merfolk you control: Return Summon the School from your graveyard to your hand. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.GRAVEYARD, new ReturnToHandSourceEffect(), new TapTargetCost(new TargetControlledPermanent(4, 4, filter, false)))); + this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnToHandSourceEffect(), new TapTargetCost(new TargetControlledPermanent(4, 4, filter, false)))); } public SummonTheSchool(final SummonTheSchool card) { diff --git a/Mage.Sets/src/mage/sets/lorwyn/SunriseSovereign.java b/Mage.Sets/src/mage/sets/lorwyn/SunriseSovereign.java index cb3390b73a5..6b3a3fac22f 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SunriseSovereign.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SunriseSovereign.java @@ -27,15 +27,16 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -62,8 +63,8 @@ public class SunriseSovereign extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); // Other Giant creatures you control get +2/+2 and have trample. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Constants.Duration.WhileOnBattlefield, filter, true))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityControlledEffect(TrampleAbility.getInstance(), Constants.Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter, true))); } public SunriseSovereign(final SunriseSovereign card) { diff --git a/Mage.Sets/src/mage/sets/lorwyn/Surgespanner.java b/Mage.Sets/src/mage/sets/lorwyn/Surgespanner.java index 4df809e835c..865f4e3b926 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Surgespanner.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Surgespanner.java @@ -28,8 +28,8 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BecomesTappedTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/lorwyn/SyggRiverGuide.java b/Mage.Sets/src/mage/sets/lorwyn/SyggRiverGuide.java index 23282d79f50..5b7ccb8e35c 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SyggRiverGuide.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SyggRiverGuide.java @@ -28,9 +28,9 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +39,8 @@ import mage.abilities.effects.common.continious.GainProtectionFromColorTargetEff import mage.abilities.keyword.IslandwalkAbility; import mage.cards.CardImpl; import mage.choices.ChoiceColor; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.Target; @@ -71,7 +73,7 @@ public class SyggRiverGuide extends CardImpl { // Islandwalk this.addAbility(new IslandwalkAbility()); // {1}{W}: Target Merfolk you control gains protection from the color of your choice until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainProtectionFromColorTargetEffect(Constants.Duration.EndOfTurn), new ManaCostsImpl("{1}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainProtectionFromColorTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{1}{W}")); ability.addChoice(new ChoiceColor()); Target target = new TargetControlledCreaturePermanent(1,1,filter, false); target.setRequired(true); diff --git a/Mage.Sets/src/mage/sets/lorwyn/TarPitcher.java b/Mage.Sets/src/mage/sets/lorwyn/TarPitcher.java index ee6d184e90c..eeee166ee99 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/TarPitcher.java +++ b/Mage.Sets/src/mage/sets/lorwyn/TarPitcher.java @@ -27,9 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,6 +36,7 @@ import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreatureOrPlayer; @@ -65,7 +65,7 @@ public class TarPitcher extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); // {tap}, Sacrifice a Goblin: Tar Pitcher deals 2 damage to target creature or player. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true))); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/lorwyn/Tarfire.java b/Mage.Sets/src/mage/sets/lorwyn/Tarfire.java index 99cb60a6151..bb780e7f70e 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Tarfire.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Tarfire.java @@ -27,8 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreatureOrPlayer; diff --git a/Mage.Sets/src/mage/sets/lorwyn/ThorntoothWitch.java b/Mage.Sets/src/mage/sets/lorwyn/ThorntoothWitch.java index 964a56abeb1..39c3e3ed89a 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ThorntoothWitch.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ThorntoothWitch.java @@ -28,14 +28,15 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; @@ -61,7 +62,7 @@ public class ThorntoothWitch extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(4); // Whenever you cast a Treefolk spell, you may have target creature get +3/-3 until end of turn. - Ability ability = new SpellCastTriggeredAbility(new BoostTargetEffect(3, -3, Constants.Duration.EndOfTurn), filter, true); + Ability ability = new SpellCastTriggeredAbility(new BoostTargetEffect(3, -3, Duration.EndOfTurn), filter, true); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/Thoughtseize.java b/Mage.Sets/src/mage/sets/lorwyn/Thoughtseize.java index 32c93e44588..b9e0d1e7b26 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Thoughtseize.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Thoughtseize.java @@ -28,10 +28,10 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.LoseLifeSourceEffect; diff --git a/Mage.Sets/src/mage/sets/lorwyn/TimberProtector.java b/Mage.Sets/src/mage/sets/lorwyn/TimberProtector.java index a0dc75c4099..9c875bf23d8 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/TimberProtector.java +++ b/Mage.Sets/src/mage/sets/lorwyn/TimberProtector.java @@ -28,10 +28,10 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; diff --git a/Mage.Sets/src/mage/sets/lorwyn/VividCrag.java b/Mage.Sets/src/mage/sets/lorwyn/VividCrag.java index bff67c94a25..27dfacf60a9 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/VividCrag.java +++ b/Mage.Sets/src/mage/sets/lorwyn/VividCrag.java @@ -27,9 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; @@ -39,6 +38,7 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.mana.AnyColorManaAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import java.util.UUID; @@ -55,7 +55,7 @@ public class VividCrag extends CardImpl { // Vivid Crag enters the battlefield tapped with two charge counters on it. EntersBattlefieldEffect effect = new EntersBattlefieldEffect(new TapSourceEffect(true), "tapped with two charge counters on it"); effect.addEffect(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); // {tap}: Add {R} to your mana pool. this.addAbility(new RedManaAbility()); // {tap}, Remove a charge counter from Vivid Crag: Add one mana of any color to your mana pool. diff --git a/Mage.Sets/src/mage/sets/lorwyn/VividCreek.java b/Mage.Sets/src/mage/sets/lorwyn/VividCreek.java index fde11a5aa5e..cd7d4edbcc8 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/VividCreek.java +++ b/Mage.Sets/src/mage/sets/lorwyn/VividCreek.java @@ -27,9 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; @@ -39,6 +38,7 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.mana.AnyColorManaAbility; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import java.util.UUID; @@ -55,7 +55,7 @@ public class VividCreek extends CardImpl { // Vivid Creek enters the battlefield tapped with two charge counters on it. EntersBattlefieldEffect effect = new EntersBattlefieldEffect(new TapSourceEffect(true), "tapped with two charge counters on it"); effect.addEffect(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); // {tap}: Add {U} to your mana pool. this.addAbility(new BlueManaAbility()); // {tap}, Remove a charge counter from Vivid Creek: Add one mana of any color to your mana pool. diff --git a/Mage.Sets/src/mage/sets/lorwyn/VividGrove.java b/Mage.Sets/src/mage/sets/lorwyn/VividGrove.java index e4514ec8143..b5d5b8e46ac 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/VividGrove.java +++ b/Mage.Sets/src/mage/sets/lorwyn/VividGrove.java @@ -27,9 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; @@ -39,6 +38,7 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.mana.AnyColorManaAbility; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import java.util.UUID; @@ -55,7 +55,7 @@ public class VividGrove extends CardImpl { // Vivid Grove enters the battlefield tapped with two charge counters on it. EntersBattlefieldEffect effect = new EntersBattlefieldEffect(new TapSourceEffect(true), "tapped with two charge counters on it"); effect.addEffect(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); // {tap}: Add {G} to your mana pool. this.addAbility(new GreenManaAbility()); // {tap}, Remove a charge counter from Vivid Grove: Add one mana of any color to your mana pool. diff --git a/Mage.Sets/src/mage/sets/lorwyn/VividMarsh.java b/Mage.Sets/src/mage/sets/lorwyn/VividMarsh.java index 11a8e2ffadf..f44eeca2360 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/VividMarsh.java +++ b/Mage.Sets/src/mage/sets/lorwyn/VividMarsh.java @@ -27,9 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; @@ -39,6 +38,7 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.mana.AnyColorManaAbility; import mage.abilities.mana.BlackManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import java.util.UUID; @@ -56,7 +56,7 @@ public class VividMarsh extends CardImpl { // Vivid Marsh enters the battlefield tapped with two charge counters on it. EntersBattlefieldEffect effect = new EntersBattlefieldEffect(new TapSourceEffect(true), "tapped with two charge counters on it"); effect.addEffect(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); // {tap}: Add {B} to your mana pool. this.addAbility(new BlackManaAbility()); // {tap}, Remove a charge counter from Vivid Marsh: Add one mana of any color to your mana pool. diff --git a/Mage.Sets/src/mage/sets/lorwyn/VividMeadow.java b/Mage.Sets/src/mage/sets/lorwyn/VividMeadow.java index 8af660bc366..006aacacab3 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/VividMeadow.java +++ b/Mage.Sets/src/mage/sets/lorwyn/VividMeadow.java @@ -27,9 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; @@ -39,6 +38,7 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.mana.AnyColorManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import java.util.UUID; @@ -55,7 +55,7 @@ public class VividMeadow extends CardImpl { // Vivid Meadow enters the battlefield tapped with two charge counters on it. EntersBattlefieldEffect effect = new EntersBattlefieldEffect(new TapSourceEffect(true), "tapped with two charge counters on it"); effect.addEffect(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); // {tap}: Add {W} to your mana pool. this.addAbility(new WhiteManaAbility()); // {tap}, Remove a charge counter from Vivid Meadow: Add one mana of any color to your mana pool. diff --git a/Mage.Sets/src/mage/sets/lorwyn/WanderersTwig.java b/Mage.Sets/src/mage/sets/lorwyn/WanderersTwig.java index d1456d7f3e1..10b7699c9cc 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/WanderersTwig.java +++ b/Mage.Sets/src/mage/sets/lorwyn/WanderersTwig.java @@ -27,9 +27,9 @@ */ package mage.sets.lorwyn; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/lorwyn/WanderwineHub.java b/Mage.Sets/src/mage/sets/lorwyn/WanderwineHub.java index b4d6f4ba3ef..3ab1fb878ba 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/WanderwineHub.java +++ b/Mage.Sets/src/mage/sets/lorwyn/WanderwineHub.java @@ -28,8 +28,8 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.costs.common.RevealTargetFromHandCost; import mage.abilities.effects.common.TapSourceUnlessPaysEffect; diff --git a/Mage.Sets/src/mage/sets/lorwyn/WarrenScourgeElf.java b/Mage.Sets/src/mage/sets/lorwyn/WarrenScourgeElf.java index b0265829892..76c5137df9d 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/WarrenScourgeElf.java +++ b/Mage.Sets/src/mage/sets/lorwyn/WarrenScourgeElf.java @@ -27,8 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/lorwyn/Wispmare.java b/Mage.Sets/src/mage/sets/lorwyn/Wispmare.java index cda7eb6f614..efeaf5c8edd 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Wispmare.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Wispmare.java @@ -28,8 +28,8 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/lorwyn/WizenedCenn.java b/Mage.Sets/src/mage/sets/lorwyn/WizenedCenn.java index 7c8b04048be..10b159ff523 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/WizenedCenn.java +++ b/Mage.Sets/src/mage/sets/lorwyn/WizenedCenn.java @@ -27,13 +27,14 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -60,7 +61,7 @@ public class WizenedCenn extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); // Other Kithkin creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Constants.Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); } public WizenedCenn(final WizenedCenn card) { diff --git a/Mage.Sets/src/mage/sets/lorwyn/WoodlandChangeling.java b/Mage.Sets/src/mage/sets/lorwyn/WoodlandChangeling.java index 5ce270c2495..98e996bec8d 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/WoodlandChangeling.java +++ b/Mage.Sets/src/mage/sets/lorwyn/WoodlandChangeling.java @@ -27,8 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ChangelingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/lorwyn/WortBoggartAuntie.java b/Mage.Sets/src/mage/sets/lorwyn/WortBoggartAuntie.java index 737e6226533..c2e1de1660b 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/WortBoggartAuntie.java +++ b/Mage.Sets/src/mage/sets/lorwyn/WortBoggartAuntie.java @@ -27,15 +27,15 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInYourGraveyard; @@ -66,7 +66,7 @@ public class WortBoggartAuntie extends CardImpl { this.toughness = new MageInt(3); this.addAbility(FearAbility.getInstance()); // At the beginning of your upkeep, you may return target Goblin card from your graveyard to your hand. - Ability ability = new BeginningOfUpkeepTriggeredAbility(new ReturnToHandTargetEffect(), Constants.TargetController.YOU, true); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new ReturnToHandTargetEffect(), TargetController.YOU, true); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/WrensRunVanquisher.java b/Mage.Sets/src/mage/sets/lorwyn/WrensRunVanquisher.java index 455b2360679..1bcaba37281 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/WrensRunVanquisher.java +++ b/Mage.Sets/src/mage/sets/lorwyn/WrensRunVanquisher.java @@ -28,8 +28,8 @@ package mage.sets.lorwyn; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.OrCost; import mage.abilities.costs.common.RevealTargetFromHandCost; diff --git a/Mage.Sets/src/mage/sets/lorwyn/WydwenTheBitingGale.java b/Mage.Sets/src/mage/sets/lorwyn/WydwenTheBitingGale.java index 369053ed9f0..29d93f99f74 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/WydwenTheBitingGale.java +++ b/Mage.Sets/src/mage/sets/lorwyn/WydwenTheBitingGale.java @@ -27,9 +27,8 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import java.util.UUID; @@ -61,7 +61,7 @@ public class WydwenTheBitingGale extends CardImpl { this.addAbility(FlashAbility.getInstance()); this.addAbility(FlyingAbility.getInstance()); // {U}{B}, Pay 1 life: Return Wydwen, the Biting Gale to its owner's hand. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ManaCostsImpl("{U}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ManaCostsImpl("{U}{B}")); ability.addCost(new PayLifeCost(1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/ZephyrNet.java b/Mage.Sets/src/mage/sets/lorwyn/ZephyrNet.java index 7c6c9619e95..580058c530d 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ZephyrNet.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ZephyrNet.java @@ -27,9 +27,7 @@ */ package mage.sets.lorwyn; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -57,12 +55,12 @@ public class ZephyrNet extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature has defender and flying. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DefenderAbility.getInstance(), Constants.AttachmentType.AURA))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DefenderAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); } public ZephyrNet(final ZephyrNet card) { diff --git a/Mage.Sets/src/mage/sets/magic2010/AcidicSlime.java b/Mage.Sets/src/mage/sets/magic2010/AcidicSlime.java index 1dc94fc89ed..57ff3d3a54a 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AcidicSlime.java +++ b/Mage.Sets/src/mage/sets/magic2010/AcidicSlime.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/AcolyteOfXathrid.java b/Mage.Sets/src/mage/sets/magic2010/AcolyteOfXathrid.java index 01e57c4de99..4e2b15ed440 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AcolyteOfXathrid.java +++ b/Mage.Sets/src/mage/sets/magic2010/AcolyteOfXathrid.java @@ -29,9 +29,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/ActOfTreason.java b/Mage.Sets/src/mage/sets/magic2010/ActOfTreason.java index f99066bcbda..842413a1af4 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ActOfTreason.java +++ b/Mage.Sets/src/mage/sets/magic2010/ActOfTreason.java @@ -29,9 +29,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.effects.common.continious.GainControlTargetEffect; import mage.abilities.effects.common.UntapTargetEffect; diff --git a/Mage.Sets/src/mage/sets/magic2010/AirElemental.java b/Mage.Sets/src/mage/sets/magic2010/AirElemental.java index 6bbaa5a53de..2ae87dbfb3d 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AirElemental.java +++ b/Mage.Sets/src/mage/sets/magic2010/AirElemental.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/AjaniGoldmane.java b/Mage.Sets/src/mage/sets/magic2010/AjaniGoldmane.java index 89c3d92d9ac..7a806ac9a92 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AjaniGoldmane.java +++ b/Mage.Sets/src/mage/sets/magic2010/AjaniGoldmane.java @@ -29,13 +29,13 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.EntersBattlefieldAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/AlluringSiren.java b/Mage.Sets/src/mage/sets/magic2010/AlluringSiren.java index 6cb24cdbb8d..0a19b05da45 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AlluringSiren.java +++ b/Mage.Sets/src/mage/sets/magic2010/AlluringSiren.java @@ -29,11 +29,11 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/AngelsMercy.java b/Mage.Sets/src/mage/sets/magic2010/AngelsMercy.java index e4b0191d0a4..a0586661598 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AngelsMercy.java +++ b/Mage.Sets/src/mage/sets/magic2010/AngelsMercy.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/AntQueen.java b/Mage.Sets/src/mage/sets/magic2010/AntQueen.java index 565267091ed..3a78c0cbf4c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AntQueen.java +++ b/Mage.Sets/src/mage/sets/magic2010/AntQueen.java @@ -29,9 +29,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/ArmoredAscension.java b/Mage.Sets/src/mage/sets/magic2010/ArmoredAscension.java index 7bf6c08f037..76670a243b5 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ArmoredAscension.java +++ b/Mage.Sets/src/mage/sets/magic2010/ArmoredAscension.java @@ -28,13 +28,13 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.AttachEffect; diff --git a/Mage.Sets/src/mage/sets/magic2010/AwakenerDruid.java b/Mage.Sets/src/mage/sets/magic2010/AwakenerDruid.java index c748afe5769..03c5bc1e2f5 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AwakenerDruid.java +++ b/Mage.Sets/src/mage/sets/magic2010/AwakenerDruid.java @@ -29,9 +29,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/BallLightning.java b/Mage.Sets/src/mage/sets/magic2010/BallLightning.java index 323da8c9764..220ea9c6841 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BallLightning.java +++ b/Mage.Sets/src/mage/sets/magic2010/BallLightning.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; diff --git a/Mage.Sets/src/mage/sets/magic2010/BaneslayerAngel.java b/Mage.Sets/src/mage/sets/magic2010/BaneslayerAngel.java index 851c2534eb1..f60ddc137e8 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BaneslayerAngel.java +++ b/Mage.Sets/src/mage/sets/magic2010/BaneslayerAngel.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/BerserkersOfBloodRidge.java b/Mage.Sets/src/mage/sets/magic2010/BerserkersOfBloodRidge.java index 620a29b7301..250e5d01731 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BerserkersOfBloodRidge.java +++ b/Mage.Sets/src/mage/sets/magic2010/BerserkersOfBloodRidge.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/BlackKnight.java b/Mage.Sets/src/mage/sets/magic2010/BlackKnight.java index a3a7c28418c..6c9382b9c49 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BlackKnight.java +++ b/Mage.Sets/src/mage/sets/magic2010/BlackKnight.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/BlindingMage.java b/Mage.Sets/src/mage/sets/magic2010/BlindingMage.java index 65638de63fb..700742a1623 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BlindingMage.java +++ b/Mage.Sets/src/mage/sets/magic2010/BlindingMage.java @@ -29,9 +29,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/BogWraith.java b/Mage.Sets/src/mage/sets/magic2010/BogWraith.java index ef887925227..6260abf45bb 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BogWraith.java +++ b/Mage.Sets/src/mage/sets/magic2010/BogWraith.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/BogardanHellkite.java b/Mage.Sets/src/mage/sets/magic2010/BogardanHellkite.java index 1399aacc1b0..aa818ffa1f3 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BogardanHellkite.java +++ b/Mage.Sets/src/mage/sets/magic2010/BogardanHellkite.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/BorderlandRanger.java b/Mage.Sets/src/mage/sets/magic2010/BorderlandRanger.java index dc0c73715a9..dfe16895f8a 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BorderlandRanger.java +++ b/Mage.Sets/src/mage/sets/magic2010/BorderlandRanger.java @@ -28,8 +28,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; diff --git a/Mage.Sets/src/mage/sets/magic2010/BrambleCreeper.java b/Mage.Sets/src/mage/sets/magic2010/BrambleCreeper.java index 31a120224c9..fe4eaf9c10e 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BrambleCreeper.java +++ b/Mage.Sets/src/mage/sets/magic2010/BrambleCreeper.java @@ -29,13 +29,13 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -50,7 +50,7 @@ public class BrambleCreeper extends CardImpl { this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(3); - this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(5, 0, Constants.Duration.EndOfTurn), false)); + this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(5, 0, Duration.EndOfTurn), false)); } public BrambleCreeper(final BrambleCreeper card) { diff --git a/Mage.Sets/src/mage/sets/magic2010/BurningInquiry.java b/Mage.Sets/src/mage/sets/magic2010/BurningInquiry.java index 1722233095f..ffe5a70d08b 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BurningInquiry.java +++ b/Mage.Sets/src/mage/sets/magic2010/BurningInquiry.java @@ -28,9 +28,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DrawCardAllEffect; diff --git a/Mage.Sets/src/mage/sets/magic2010/BurstOfSpeed.java b/Mage.Sets/src/mage/sets/magic2010/BurstOfSpeed.java index 92d9aa1b6a9..db7d4a6e617 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BurstOfSpeed.java +++ b/Mage.Sets/src/mage/sets/magic2010/BurstOfSpeed.java @@ -29,12 +29,12 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; /** @@ -47,7 +47,7 @@ public class BurstOfSpeed extends CardImpl { super(ownerId, 129, "Burst of Speed", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "M10"; this.color.setRed(true); - this.getSpellAbility().addEffect(new GainAbilityControlledEffect(HasteAbility.getInstance(), Constants.Duration.EndOfTurn, new FilterControlledCreaturePermanent(), false)); + this.getSpellAbility().addEffect(new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent(), false)); } public BurstOfSpeed(final BurstOfSpeed card) { diff --git a/Mage.Sets/src/mage/sets/magic2010/CapriciousEfreet.java b/Mage.Sets/src/mage/sets/magic2010/CapriciousEfreet.java index 24e4214d2e7..fd51982bb44 100644 --- a/Mage.Sets/src/mage/sets/magic2010/CapriciousEfreet.java +++ b/Mage.Sets/src/mage/sets/magic2010/CapriciousEfreet.java @@ -30,10 +30,10 @@ package mage.sets.magic2010; import java.util.ArrayList; import java.util.Random; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/CaptainOfTheWatch.java b/Mage.Sets/src/mage/sets/magic2010/CaptainOfTheWatch.java index 44590112466..553682f9829 100644 --- a/Mage.Sets/src/mage/sets/magic2010/CaptainOfTheWatch.java +++ b/Mage.Sets/src/mage/sets/magic2010/CaptainOfTheWatch.java @@ -29,9 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +40,8 @@ import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.SoldierToken; @@ -65,8 +66,8 @@ public class CaptainOfTheWatch extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(VigilanceAbility.getInstance()); - Ability ability = new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Constants.Duration.WhileOnBattlefield, filter, true)); - ability.addEffect(new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Constants.Duration.WhileOnBattlefield, filter, true)); + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true)); + ability.addEffect(new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filter, true)); this.addAbility(ability); this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new SoldierToken(), 3), false)); } diff --git a/Mage.Sets/src/mage/sets/magic2010/CentaurCourser.java b/Mage.Sets/src/mage/sets/magic2010/CentaurCourser.java index 9e94b2e44c7..f9415f711bb 100644 --- a/Mage.Sets/src/mage/sets/magic2010/CentaurCourser.java +++ b/Mage.Sets/src/mage/sets/magic2010/CentaurCourser.java @@ -28,8 +28,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java b/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java index 1966ed21d54..0cee647048b 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java +++ b/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java @@ -28,8 +28,8 @@ package mage.sets.magic2010; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.EntersBattlefieldAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/ChildOfNight.java b/Mage.Sets/src/mage/sets/magic2010/ChildOfNight.java index d57a0882966..4d5a4d43f0c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ChildOfNight.java +++ b/Mage.Sets/src/mage/sets/magic2010/ChildOfNight.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/CoatOfArms.java b/Mage.Sets/src/mage/sets/magic2010/CoatOfArms.java index 327e25a5fb6..9c6a0f6361f 100644 --- a/Mage.Sets/src/mage/sets/magic2010/CoatOfArms.java +++ b/Mage.Sets/src/mage/sets/magic2010/CoatOfArms.java @@ -29,13 +29,13 @@ package mage.sets.magic2010; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/ConsumeSpirit.java b/Mage.Sets/src/mage/sets/magic2010/ConsumeSpirit.java index a07b4b17ce0..6b92bf3785f 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ConsumeSpirit.java +++ b/Mage.Sets/src/mage/sets/magic2010/ConsumeSpirit.java @@ -28,9 +28,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/ConvincingMirage.java b/Mage.Sets/src/mage/sets/magic2010/ConvincingMirage.java index 120503506e7..0d2f1ad4ceb 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ConvincingMirage.java +++ b/Mage.Sets/src/mage/sets/magic2010/ConvincingMirage.java @@ -29,13 +29,13 @@ package mage.sets.magic2010; import java.util.Set; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/CoralMerfolk.java b/Mage.Sets/src/mage/sets/magic2010/CoralMerfolk.java index c7142dd95d0..2fe4250cc1a 100644 --- a/Mage.Sets/src/mage/sets/magic2010/CoralMerfolk.java +++ b/Mage.Sets/src/mage/sets/magic2010/CoralMerfolk.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/CudgelTroll.java b/Mage.Sets/src/mage/sets/magic2010/CudgelTroll.java index 2aa93b7b2e5..6475f27a17c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/CudgelTroll.java +++ b/Mage.Sets/src/mage/sets/magic2010/CudgelTroll.java @@ -29,9 +29,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/DarksteelColossus.java b/Mage.Sets/src/mage/sets/magic2010/DarksteelColossus.java index b0139d49d80..4675f48bfa1 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DarksteelColossus.java +++ b/Mage.Sets/src/mage/sets/magic2010/DarksteelColossus.java @@ -30,7 +30,7 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * @author Loki diff --git a/Mage.Sets/src/mage/sets/magic2010/DeadlyRecluse.java b/Mage.Sets/src/mage/sets/magic2010/DeadlyRecluse.java index c83dec96c7c..b33ad8c6732 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DeadlyRecluse.java +++ b/Mage.Sets/src/mage/sets/magic2010/DeadlyRecluse.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.ReachAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/Disentomb.java b/Mage.Sets/src/mage/sets/magic2010/Disentomb.java index 4b77a3f883a..c5b443c7aed 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Disentomb.java +++ b/Mage.Sets/src/mage/sets/magic2010/Disentomb.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreatureCard; diff --git a/Mage.Sets/src/mage/sets/magic2010/Disorient.java b/Mage.Sets/src/mage/sets/magic2010/Disorient.java index ff3802ce2c5..bee8586bb6c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Disorient.java +++ b/Mage.Sets/src/mage/sets/magic2010/Disorient.java @@ -29,9 +29,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/magic2010/DivineVerdict.java b/Mage.Sets/src/mage/sets/magic2010/DivineVerdict.java index 24cf4c90173..1fe8ddc3cfa 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DivineVerdict.java +++ b/Mage.Sets/src/mage/sets/magic2010/DivineVerdict.java @@ -28,8 +28,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterAttackingOrBlockingCreature; diff --git a/Mage.Sets/src/mage/sets/magic2010/DjinnOfWishes.java b/Mage.Sets/src/mage/sets/magic2010/DjinnOfWishes.java index 0f727779f28..f708dca534f 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DjinnOfWishes.java +++ b/Mage.Sets/src/mage/sets/magic2010/DjinnOfWishes.java @@ -29,10 +29,10 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/DoomBlade.java b/Mage.Sets/src/mage/sets/magic2010/DoomBlade.java index 1c2b7dbb701..d46c74bee62 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DoomBlade.java +++ b/Mage.Sets/src/mage/sets/magic2010/DoomBlade.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/DragonWhelp.java b/Mage.Sets/src/mage/sets/magic2010/DragonWhelp.java index 8cab3521e67..2767c670d75 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DragonWhelp.java +++ b/Mage.Sets/src/mage/sets/magic2010/DragonWhelp.java @@ -28,11 +28,11 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/DragonskullSummit.java b/Mage.Sets/src/mage/sets/magic2010/DragonskullSummit.java index d6f84418763..2dc36e338b7 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DragonskullSummit.java +++ b/Mage.Sets/src/mage/sets/magic2010/DragonskullSummit.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; diff --git a/Mage.Sets/src/mage/sets/magic2010/DreadWarlock.java b/Mage.Sets/src/mage/sets/magic2010/DreadWarlock.java index bff91523724..9a75c368877 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DreadWarlock.java +++ b/Mage.Sets/src/mage/sets/magic2010/DreadWarlock.java @@ -28,9 +28,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.EvasionAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/DrownedCatacomb.java b/Mage.Sets/src/mage/sets/magic2010/DrownedCatacomb.java index 9bb8f99c462..6e41eee6b61 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DrownedCatacomb.java +++ b/Mage.Sets/src/mage/sets/magic2010/DrownedCatacomb.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; diff --git a/Mage.Sets/src/mage/sets/magic2010/DrudgeSkeletons.java b/Mage.Sets/src/mage/sets/magic2010/DrudgeSkeletons.java index 9e9af2f7f8e..5566cf32bca 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DrudgeSkeletons.java +++ b/Mage.Sets/src/mage/sets/magic2010/DrudgeSkeletons.java @@ -29,9 +29,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/Duress.java b/Mage.Sets/src/mage/sets/magic2010/Duress.java index dd850b25604..8a9f76a2411 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Duress.java +++ b/Mage.Sets/src/mage/sets/magic2010/Duress.java @@ -29,10 +29,10 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/magic2010/Earthquake.java b/Mage.Sets/src/mage/sets/magic2010/Earthquake.java index 8718f19006f..6d50246860b 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Earthquake.java +++ b/Mage.Sets/src/mage/sets/magic2010/Earthquake.java @@ -29,9 +29,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/EliteVanguard.java b/Mage.Sets/src/mage/sets/magic2010/EliteVanguard.java index e5d53d2ec4b..f34e8a581a1 100644 --- a/Mage.Sets/src/mage/sets/magic2010/EliteVanguard.java +++ b/Mage.Sets/src/mage/sets/magic2010/EliteVanguard.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/ElvishArchdruid.java b/Mage.Sets/src/mage/sets/magic2010/ElvishArchdruid.java index fd847433645..50f180d519d 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ElvishArchdruid.java +++ b/Mage.Sets/src/mage/sets/magic2010/ElvishArchdruid.java @@ -29,10 +29,10 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.Mana; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/ElvishPiper.java b/Mage.Sets/src/mage/sets/magic2010/ElvishPiper.java index 2fc1cd25385..2fdbf0488c5 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ElvishPiper.java +++ b/Mage.Sets/src/mage/sets/magic2010/ElvishPiper.java @@ -27,9 +27,9 @@ */ package mage.sets.magic2010; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.effects.common.PutCreatureOnBattlefieldEffect; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/EmeraldOryx.java b/Mage.Sets/src/mage/sets/magic2010/EmeraldOryx.java index c0468666506..a2d8e1816c6 100644 --- a/Mage.Sets/src/mage/sets/magic2010/EmeraldOryx.java +++ b/Mage.Sets/src/mage/sets/magic2010/EmeraldOryx.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ForestwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/EnormousBaloth.java b/Mage.Sets/src/mage/sets/magic2010/EnormousBaloth.java index e88329e1400..b57182fd029 100644 --- a/Mage.Sets/src/mage/sets/magic2010/EnormousBaloth.java +++ b/Mage.Sets/src/mage/sets/magic2010/EnormousBaloth.java @@ -28,8 +28,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/EntanglingVines.java b/Mage.Sets/src/mage/sets/magic2010/EntanglingVines.java index b193f26be9e..01ffd99b003 100644 --- a/Mage.Sets/src/mage/sets/magic2010/EntanglingVines.java +++ b/Mage.Sets/src/mage/sets/magic2010/EntanglingVines.java @@ -28,10 +28,10 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.SkipEnchantedUntapEffect; diff --git a/Mage.Sets/src/mage/sets/magic2010/EssenceScatter.java b/Mage.Sets/src/mage/sets/magic2010/EssenceScatter.java index 0b56afe4fd0..bb08961d100 100644 --- a/Mage.Sets/src/mage/sets/magic2010/EssenceScatter.java +++ b/Mage.Sets/src/mage/sets/magic2010/EssenceScatter.java @@ -28,8 +28,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; diff --git a/Mage.Sets/src/mage/sets/magic2010/Fabricate.java b/Mage.Sets/src/mage/sets/magic2010/Fabricate.java index 47f0a8aea8c..e3eda955b65 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Fabricate.java +++ b/Mage.Sets/src/mage/sets/magic2010/Fabricate.java @@ -28,8 +28,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.filter.FilterCard; diff --git a/Mage.Sets/src/mage/sets/magic2010/FieryHellhound.java b/Mage.Sets/src/mage/sets/magic2010/FieryHellhound.java index 484ff91407f..c76ed96e9f4 100644 --- a/Mage.Sets/src/mage/sets/magic2010/FieryHellhound.java +++ b/Mage.Sets/src/mage/sets/magic2010/FieryHellhound.java @@ -29,10 +29,10 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/Fireball.java b/Mage.Sets/src/mage/sets/magic2010/Fireball.java index 828c194050c..595d69892eb 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Fireball.java +++ b/Mage.Sets/src/mage/sets/magic2010/Fireball.java @@ -33,9 +33,9 @@ import java.util.Iterator; import java.util.List; import java.util.Set; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/magic2010/Fog.java b/Mage.Sets/src/mage/sets/magic2010/Fog.java index ff2d01424cb..860aab54d70 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Fog.java +++ b/Mage.Sets/src/mage/sets/magic2010/Fog.java @@ -29,9 +29,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.PreventAllDamageEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/GargoyleCastle.java b/Mage.Sets/src/mage/sets/magic2010/GargoyleCastle.java index e3d58454203..85cdfc0b688 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GargoyleCastle.java +++ b/Mage.Sets/src/mage/sets/magic2010/GargoyleCastle.java @@ -29,9 +29,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/magic2010/GarrukWildspeaker.java b/Mage.Sets/src/mage/sets/magic2010/GarrukWildspeaker.java index ed8853b3d98..b5e7b0509d3 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GarrukWildspeaker.java +++ b/Mage.Sets/src/mage/sets/magic2010/GarrukWildspeaker.java @@ -29,9 +29,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.LoyaltyAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.Effects; diff --git a/Mage.Sets/src/mage/sets/magic2010/GlacialFortress.java b/Mage.Sets/src/mage/sets/magic2010/GlacialFortress.java index 1d9a2e52318..37d67634b71 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GlacialFortress.java +++ b/Mage.Sets/src/mage/sets/magic2010/GlacialFortress.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; diff --git a/Mage.Sets/src/mage/sets/magic2010/GloriousCharge.java b/Mage.Sets/src/mage/sets/magic2010/GloriousCharge.java index b67d302cda6..48984b9b309 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GloriousCharge.java +++ b/Mage.Sets/src/mage/sets/magic2010/GloriousCharge.java @@ -29,11 +29,11 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; /** @@ -48,7 +48,7 @@ public class GloriousCharge extends CardImpl { this.color.setWhite(true); // Creatures you control get +1/+1 until end of turn. - this.getSpellAbility().addEffect(new BoostControlledEffect(1, 1, Constants.Duration.EndOfTurn, new FilterCreaturePermanent(), false)); + this.getSpellAbility().addEffect(new BoostControlledEffect(1, 1, Duration.EndOfTurn, new FilterCreaturePermanent(), false)); } public GloriousCharge(final GloriousCharge card) { diff --git a/Mage.Sets/src/mage/sets/magic2010/GoblinArtillery.java b/Mage.Sets/src/mage/sets/magic2010/GoblinArtillery.java index 0ccf9af42a6..f4241aedf2d 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GoblinArtillery.java +++ b/Mage.Sets/src/mage/sets/magic2010/GoblinArtillery.java @@ -29,9 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; /** @@ -55,7 +55,7 @@ public class GoblinArtillery extends CardImpl { this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); ability.addEffect(new DamageControllerEffect(3)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/magic2010/GoblinChieftain.java b/Mage.Sets/src/mage/sets/magic2010/GoblinChieftain.java index ae6128b5b27..1f24e057e45 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GoblinChieftain.java +++ b/Mage.Sets/src/mage/sets/magic2010/GoblinChieftain.java @@ -29,10 +29,10 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; diff --git a/Mage.Sets/src/mage/sets/magic2010/GorgonFlail.java b/Mage.Sets/src/mage/sets/magic2010/GorgonFlail.java index 49c1111c3f2..7e12b95fdca 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GorgonFlail.java +++ b/Mage.Sets/src/mage/sets/magic2010/GorgonFlail.java @@ -28,11 +28,11 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostEquippedEffect; diff --git a/Mage.Sets/src/mage/sets/magic2010/GreatSableStag.java b/Mage.Sets/src/mage/sets/magic2010/GreatSableStag.java index ca32771f3b0..b593444ade8 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GreatSableStag.java +++ b/Mage.Sets/src/mage/sets/magic2010/GreatSableStag.java @@ -29,9 +29,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/GriffinSentinel.java b/Mage.Sets/src/mage/sets/magic2010/GriffinSentinel.java index 3ced5c988ef..c69cea0a1ea 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GriffinSentinel.java +++ b/Mage.Sets/src/mage/sets/magic2010/GriffinSentinel.java @@ -30,8 +30,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/GuardianSeraph.java b/Mage.Sets/src/mage/sets/magic2010/GuardianSeraph.java index 1ef3485e277..1677f1d4d85 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GuardianSeraph.java +++ b/Mage.Sets/src/mage/sets/magic2010/GuardianSeraph.java @@ -28,10 +28,10 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/HarmsWay.java b/Mage.Sets/src/mage/sets/magic2010/HarmsWay.java index 6c3715a4913..175458d92a0 100644 --- a/Mage.Sets/src/mage/sets/magic2010/HarmsWay.java +++ b/Mage.Sets/src/mage/sets/magic2010/HarmsWay.java @@ -27,13 +27,13 @@ */ package mage.sets.magic2010; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.PreventionEffectImpl; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -55,7 +55,7 @@ public class HarmsWay extends CardImpl { this.color.setWhite(true); // The next 2 damage that a source of your choice would deal to you and/or permanents you control this turn is dealt to target creature or player instead. - this.getSpellAbility().addEffect(new HarmsWayPreventDamageTargetEffect(Constants.Duration.EndOfTurn, 2)); + this.getSpellAbility().addEffect(new HarmsWayPreventDamageTargetEffect(Duration.EndOfTurn, 2)); this.getSpellAbility().addTarget(new TargetSource()); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); } @@ -74,7 +74,7 @@ class HarmsWayPreventDamageTargetEffect extends PreventionEffectImpl { super(ownerId, 59, "Jump", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "M10"; this.color.setBlue(true); - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/magic2010/KalonianBehemoth.java b/Mage.Sets/src/mage/sets/magic2010/KalonianBehemoth.java index 7c9712c74bd..a93ee57245f 100644 --- a/Mage.Sets/src/mage/sets/magic2010/KalonianBehemoth.java +++ b/Mage.Sets/src/mage/sets/magic2010/KalonianBehemoth.java @@ -28,8 +28,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/KelinoreBat.java b/Mage.Sets/src/mage/sets/magic2010/KelinoreBat.java index 84f2c5ba124..c0e59cc6076 100644 --- a/Mage.Sets/src/mage/sets/magic2010/KelinoreBat.java +++ b/Mage.Sets/src/mage/sets/magic2010/KelinoreBat.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/KindledFury.java b/Mage.Sets/src/mage/sets/magic2010/KindledFury.java index 0f8d72a866e..cb8a376d854 100644 --- a/Mage.Sets/src/mage/sets/magic2010/KindledFury.java +++ b/Mage.Sets/src/mage/sets/magic2010/KindledFury.java @@ -29,13 +29,13 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -48,8 +48,8 @@ public class KindledFury extends CardImpl { super(ownerId, 144, "Kindled Fury", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "M10"; this.color.setRed(true); - this.getSpellAbility().addEffect(new BoostTargetEffect(1, 0, Constants.Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(1, 0, Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/magic2010/LightningBolt.java b/Mage.Sets/src/mage/sets/magic2010/LightningBolt.java index 2e55951dc80..b388baaeb82 100644 --- a/Mage.Sets/src/mage/sets/magic2010/LightningBolt.java +++ b/Mage.Sets/src/mage/sets/magic2010/LightningBolt.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreatureOrPlayer; diff --git a/Mage.Sets/src/mage/sets/magic2010/LightwielderPaladin.java b/Mage.Sets/src/mage/sets/magic2010/LightwielderPaladin.java index ac250aba069..dd0c3a20757 100644 --- a/Mage.Sets/src/mage/sets/magic2010/LightwielderPaladin.java +++ b/Mage.Sets/src/mage/sets/magic2010/LightwielderPaladin.java @@ -28,9 +28,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/LilianaVess.java b/Mage.Sets/src/mage/sets/magic2010/LilianaVess.java index 83260e2fe1c..43b801a2edf 100644 --- a/Mage.Sets/src/mage/sets/magic2010/LilianaVess.java +++ b/Mage.Sets/src/mage/sets/magic2010/LilianaVess.java @@ -29,10 +29,10 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.EntersBattlefieldAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/LoomingShade.java b/Mage.Sets/src/mage/sets/magic2010/LoomingShade.java index 5d6a66c071d..b5be884cb12 100644 --- a/Mage.Sets/src/mage/sets/magic2010/LoomingShade.java +++ b/Mage.Sets/src/mage/sets/magic2010/LoomingShade.java @@ -29,10 +29,10 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/LurkingPredators.java b/Mage.Sets/src/mage/sets/magic2010/LurkingPredators.java index 88c3dd2cea6..61860196afb 100644 --- a/Mage.Sets/src/mage/sets/magic2010/LurkingPredators.java +++ b/Mage.Sets/src/mage/sets/magic2010/LurkingPredators.java @@ -28,10 +28,10 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.OpponentCastsSpellTriggeredAbility; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/magic2010/MagebaneArmor.java b/Mage.Sets/src/mage/sets/magic2010/MagebaneArmor.java index e67c316aabc..c966b82027d 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MagebaneArmor.java +++ b/Mage.Sets/src/mage/sets/magic2010/MagebaneArmor.java @@ -28,12 +28,12 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.StaticAbility; import mage.abilities.common.SimpleStaticAbility; @@ -44,6 +44,7 @@ import mage.abilities.effects.common.continious.LoseAbilityAttachedEffect; import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.AttachmentType; import mage.game.Game; import mage.game.events.DamageEvent; import mage.game.events.GameEvent; @@ -82,7 +83,7 @@ class MagebaneArmorAbility extends StaticAbility { public MagebaneArmorAbility() { super(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 4)); - this.addEffect(new LoseAbilityAttachedEffect(FlyingAbility.getInstance(), Constants.AttachmentType.EQUIPMENT)); + this.addEffect(new LoseAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.EQUIPMENT)); } public MagebaneArmorAbility(MagebaneArmorAbility ability) { diff --git a/Mage.Sets/src/mage/sets/magic2010/MagmaPhoenix.java b/Mage.Sets/src/mage/sets/magic2010/MagmaPhoenix.java index 808f67ea384..1aa892f900c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MagmaPhoenix.java +++ b/Mage.Sets/src/mage/sets/magic2010/MagmaPhoenix.java @@ -29,9 +29,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/MasterOfTheWildHunt.java b/Mage.Sets/src/mage/sets/magic2010/MasterOfTheWildHunt.java index 878f010a1c2..cac46678407 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MasterOfTheWildHunt.java +++ b/Mage.Sets/src/mage/sets/magic2010/MasterOfTheWildHunt.java @@ -28,10 +28,10 @@ package mage.sets.magic2010; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/MerfolkSovereign.java b/Mage.Sets/src/mage/sets/magic2010/MerfolkSovereign.java index ffb8d7b71eb..317024e3a2b 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MerfolkSovereign.java +++ b/Mage.Sets/src/mage/sets/magic2010/MerfolkSovereign.java @@ -29,10 +29,10 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/MesaEnchantress.java b/Mage.Sets/src/mage/sets/magic2010/MesaEnchantress.java index 8ce67b282f2..7ec5508ad0a 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MesaEnchantress.java +++ b/Mage.Sets/src/mage/sets/magic2010/MesaEnchantress.java @@ -28,8 +28,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/magic2010/MightOfOaks.java b/Mage.Sets/src/mage/sets/magic2010/MightOfOaks.java index e7b79dfda71..a58b9acb54c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MightOfOaks.java +++ b/Mage.Sets/src/mage/sets/magic2010/MightOfOaks.java @@ -29,9 +29,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/magic2010/MindControl.java b/Mage.Sets/src/mage/sets/magic2010/MindControl.java index 3a8252f1ca5..500458f6b3b 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MindControl.java +++ b/Mage.Sets/src/mage/sets/magic2010/MindControl.java @@ -29,10 +29,10 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; diff --git a/Mage.Sets/src/mage/sets/magic2010/MindShatter.java b/Mage.Sets/src/mage/sets/magic2010/MindShatter.java index 789c204d4e6..8c16fd0ee46 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MindShatter.java +++ b/Mage.Sets/src/mage/sets/magic2010/MindShatter.java @@ -28,9 +28,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/magic2010/MindSpring.java b/Mage.Sets/src/mage/sets/magic2010/MindSpring.java index fcf8b7e3028..5234f41d8d8 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MindSpring.java +++ b/Mage.Sets/src/mage/sets/magic2010/MindSpring.java @@ -29,9 +29,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/MirrorOfFate.java b/Mage.Sets/src/mage/sets/magic2010/MirrorOfFate.java index 626f6836b92..df8c161ba86 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MirrorOfFate.java +++ b/Mage.Sets/src/mage/sets/magic2010/MirrorOfFate.java @@ -28,10 +28,10 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/magic2010/MistLeopard.java b/Mage.Sets/src/mage/sets/magic2010/MistLeopard.java index 95bf6940b2e..769227a96f0 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MistLeopard.java +++ b/Mage.Sets/src/mage/sets/magic2010/MistLeopard.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/MoldAdder.java b/Mage.Sets/src/mage/sets/magic2010/MoldAdder.java index c3058f12b73..e06f1f873a6 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MoldAdder.java +++ b/Mage.Sets/src/mage/sets/magic2010/MoldAdder.java @@ -28,8 +28,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.OpponentCastsSpellTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/NaturesSpiral.java b/Mage.Sets/src/mage/sets/magic2010/NaturesSpiral.java index a81ea9f34a8..2a4c24e64e6 100644 --- a/Mage.Sets/src/mage/sets/magic2010/NaturesSpiral.java +++ b/Mage.Sets/src/mage/sets/magic2010/NaturesSpiral.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterCard; diff --git a/Mage.Sets/src/mage/sets/magic2010/Negate.java b/Mage.Sets/src/mage/sets/magic2010/Negate.java index 3b1f1ebe21e..e51cc15cc8f 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Negate.java +++ b/Mage.Sets/src/mage/sets/magic2010/Negate.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; diff --git a/Mage.Sets/src/mage/sets/magic2010/Oakenform.java b/Mage.Sets/src/mage/sets/magic2010/Oakenform.java index 9aede426e3a..6eb62b2009e 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Oakenform.java +++ b/Mage.Sets/src/mage/sets/magic2010/Oakenform.java @@ -29,13 +29,13 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/OpenTheVaults.java b/Mage.Sets/src/mage/sets/magic2010/OpenTheVaults.java index b565ff46fad..11853d419fc 100644 --- a/Mage.Sets/src/mage/sets/magic2010/OpenTheVaults.java +++ b/Mage.Sets/src/mage/sets/magic2010/OpenTheVaults.java @@ -30,10 +30,10 @@ package mage.sets.magic2010; import java.util.LinkedList; import java.util.Set; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/magic2010/Overrun.java b/Mage.Sets/src/mage/sets/magic2010/Overrun.java index 18d25c5fea4..f6101824ef2 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Overrun.java +++ b/Mage.Sets/src/mage/sets/magic2010/Overrun.java @@ -29,9 +29,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.TrampleAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/PalaceGuard.java b/Mage.Sets/src/mage/sets/magic2010/PalaceGuard.java index b91eea19341..ecdd8953a83 100644 --- a/Mage.Sets/src/mage/sets/magic2010/PalaceGuard.java +++ b/Mage.Sets/src/mage/sets/magic2010/PalaceGuard.java @@ -29,9 +29,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.CanBlockAdditionalCreatureEffect; diff --git a/Mage.Sets/src/mage/sets/magic2010/PanicAttack.java b/Mage.Sets/src/mage/sets/magic2010/PanicAttack.java index 419a390ed48..7cd95e5f4be 100644 --- a/Mage.Sets/src/mage/sets/magic2010/PanicAttack.java +++ b/Mage.Sets/src/mage/sets/magic2010/PanicAttack.java @@ -28,9 +28,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.CantBlockTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/magic2010/PhantomWarrior.java b/Mage.Sets/src/mage/sets/magic2010/PhantomWarrior.java index aa518c29b2b..5acb64b3c4c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/PhantomWarrior.java +++ b/Mage.Sets/src/mage/sets/magic2010/PhantomWarrior.java @@ -28,8 +28,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.UnblockableAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/PlanarCleansing.java b/Mage.Sets/src/mage/sets/magic2010/PlanarCleansing.java index 7d118d6b429..7c9a4f11067 100644 --- a/Mage.Sets/src/mage/sets/magic2010/PlanarCleansing.java +++ b/Mage.Sets/src/mage/sets/magic2010/PlanarCleansing.java @@ -29,12 +29,12 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.common.FilterNonlandPermanent; import mage.game.Game; @@ -70,7 +70,7 @@ class PlanarCleansingEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterNonlandPermanent(); public PlanarCleansingEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); staticText = "Destroy all nonland permanents"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/PlatinumAngel.java b/Mage.Sets/src/mage/sets/magic2010/PlatinumAngel.java index a59d0846fe5..ffaa313ea22 100644 --- a/Mage.Sets/src/mage/sets/magic2010/PlatinumAngel.java +++ b/Mage.Sets/src/mage/sets/magic2010/PlatinumAngel.java @@ -29,7 +29,7 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/magic2010/Polymorph.java b/Mage.Sets/src/mage/sets/magic2010/Polymorph.java index 3e6209958ac..3accd2114c2 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Polymorph.java +++ b/Mage.Sets/src/mage/sets/magic2010/Polymorph.java @@ -29,10 +29,10 @@ package mage.sets.magic2010; import java.util.Set; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/magic2010/Ponder.java b/Mage.Sets/src/mage/sets/magic2010/Ponder.java index d3e1a87fb14..fe0c54f3d6b 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Ponder.java +++ b/Mage.Sets/src/mage/sets/magic2010/Ponder.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/PrizedUnicorn.java b/Mage.Sets/src/mage/sets/magic2010/PrizedUnicorn.java index 935236a4c46..6b167ecfa00 100644 --- a/Mage.Sets/src/mage/sets/magic2010/PrizedUnicorn.java +++ b/Mage.Sets/src/mage/sets/magic2010/PrizedUnicorn.java @@ -29,9 +29,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.MustBlockSourceEffect; diff --git a/Mage.Sets/src/mage/sets/magic2010/ProdigalPyromancer.java b/Mage.Sets/src/mage/sets/magic2010/ProdigalPyromancer.java index fd4db05bab3..d6bf575b78b 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ProdigalPyromancer.java +++ b/Mage.Sets/src/mage/sets/magic2010/ProdigalPyromancer.java @@ -29,7 +29,7 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java b/Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java index f36caf596bf..3af17768c7e 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java +++ b/Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java @@ -28,7 +28,6 @@ package mage.sets.magic2010; -import mage.Constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -42,6 +41,7 @@ import mage.abilities.effects.PreventionEffectImpl; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.*; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage.Sets/src/mage/sets/magic2010/RampantGrowth.java b/Mage.Sets/src/mage/sets/magic2010/RampantGrowth.java index 30fcda5cf4a..31188a206e4 100644 --- a/Mage.Sets/src/mage/sets/magic2010/RampantGrowth.java +++ b/Mage.Sets/src/mage/sets/magic2010/RampantGrowth.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.filter.common.FilterBasicLandCard; diff --git a/Mage.Sets/src/mage/sets/magic2010/RazorfootGriffin.java b/Mage.Sets/src/mage/sets/magic2010/RazorfootGriffin.java index 81649de36b3..2833174dfa5 100644 --- a/Mage.Sets/src/mage/sets/magic2010/RazorfootGriffin.java +++ b/Mage.Sets/src/mage/sets/magic2010/RazorfootGriffin.java @@ -28,8 +28,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/Regenerate.java b/Mage.Sets/src/mage/sets/magic2010/Regenerate.java index 933c709fe8d..1d6b2dd248c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Regenerate.java +++ b/Mage.Sets/src/mage/sets/magic2010/Regenerate.java @@ -28,8 +28,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.RegenerateTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/magic2010/RhoxPikemaster.java b/Mage.Sets/src/mage/sets/magic2010/RhoxPikemaster.java index 08967cbe673..c23a7922d40 100644 --- a/Mage.Sets/src/mage/sets/magic2010/RhoxPikemaster.java +++ b/Mage.Sets/src/mage/sets/magic2010/RhoxPikemaster.java @@ -29,10 +29,10 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; diff --git a/Mage.Sets/src/mage/sets/magic2010/Righteousness.java b/Mage.Sets/src/mage/sets/magic2010/Righteousness.java index f82c531fc4d..576bdbf1ec3 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Righteousness.java +++ b/Mage.Sets/src/mage/sets/magic2010/Righteousness.java @@ -28,7 +28,7 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/magic2010/RiseFromTheGrave.java b/Mage.Sets/src/mage/sets/magic2010/RiseFromTheGrave.java index ac1a6cb6683..eea52909733 100644 --- a/Mage.Sets/src/mage/sets/magic2010/RiseFromTheGrave.java +++ b/Mage.Sets/src/mage/sets/magic2010/RiseFromTheGrave.java @@ -29,12 +29,12 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; diff --git a/Mage.Sets/src/mage/sets/magic2010/RootboundCrag.java b/Mage.Sets/src/mage/sets/magic2010/RootboundCrag.java index d256f8b9a43..e2bfc5e33da 100644 --- a/Mage.Sets/src/mage/sets/magic2010/RootboundCrag.java +++ b/Mage.Sets/src/mage/sets/magic2010/RootboundCrag.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; diff --git a/Mage.Sets/src/mage/sets/magic2010/RuneclawBear.java b/Mage.Sets/src/mage/sets/magic2010/RuneclawBear.java index c93e4f455a7..023e610b8e1 100644 --- a/Mage.Sets/src/mage/sets/magic2010/RuneclawBear.java +++ b/Mage.Sets/src/mage/sets/magic2010/RuneclawBear.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/SafePassage.java b/Mage.Sets/src/mage/sets/magic2010/SafePassage.java index 75ed4f27103..6fcbe12f534 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SafePassage.java +++ b/Mage.Sets/src/mage/sets/magic2010/SafePassage.java @@ -29,10 +29,10 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.abilities.effects.common.PreventAllDamageToEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreatureOrPlayer; diff --git a/Mage.Sets/src/mage/sets/magic2010/SageOwl.java b/Mage.Sets/src/mage/sets/magic2010/SageOwl.java index a96f7207d22..ea5fbfc918c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SageOwl.java +++ b/Mage.Sets/src/mage/sets/magic2010/SageOwl.java @@ -28,8 +28,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryControllerEffect; diff --git a/Mage.Sets/src/mage/sets/magic2010/SanguineBond.java b/Mage.Sets/src/mage/sets/magic2010/SanguineBond.java index 59cb78358c0..f96b7eff434 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SanguineBond.java +++ b/Mage.Sets/src/mage/sets/magic2010/SanguineBond.java @@ -28,9 +28,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/SeismicStrike.java b/Mage.Sets/src/mage/sets/magic2010/SeismicStrike.java index 7459097b7ee..c8db51f3230 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SeismicStrike.java +++ b/Mage.Sets/src/mage/sets/magic2010/SeismicStrike.java @@ -28,8 +28,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/SerpentOfTheEndlessSea.java b/Mage.Sets/src/mage/sets/magic2010/SerpentOfTheEndlessSea.java index 127815a8355..6710c1d315a 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SerpentOfTheEndlessSea.java +++ b/Mage.Sets/src/mage/sets/magic2010/SerpentOfTheEndlessSea.java @@ -28,11 +28,11 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/SerraAngel.java b/Mage.Sets/src/mage/sets/magic2010/SerraAngel.java index 4b27e76e01b..e540e38d317 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SerraAngel.java +++ b/Mage.Sets/src/mage/sets/magic2010/SerraAngel.java @@ -29,7 +29,7 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/magic2010/SiegeGangCommander.java b/Mage.Sets/src/mage/sets/magic2010/SiegeGangCommander.java index 50bb25979f0..2204241687e 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SiegeGangCommander.java +++ b/Mage.Sets/src/mage/sets/magic2010/SiegeGangCommander.java @@ -29,9 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +40,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.GoblinToken; @@ -67,7 +67,7 @@ public class SiegeGangCommander extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new GoblinToken(), 3), false)); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{1}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{1}{R}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false))); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/magic2010/SiegeMastodon.java b/Mage.Sets/src/mage/sets/magic2010/SiegeMastodon.java index 76a404007e3..f32fa4ad79f 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SiegeMastodon.java +++ b/Mage.Sets/src/mage/sets/magic2010/SiegeMastodon.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/SignInBlood.java b/Mage.Sets/src/mage/sets/magic2010/SignInBlood.java index b2ee16badd1..094410d3e7d 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SignInBlood.java +++ b/Mage.Sets/src/mage/sets/magic2010/SignInBlood.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/Silence.java b/Mage.Sets/src/mage/sets/magic2010/Silence.java index 20359ed9539..2e9974da5f4 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Silence.java +++ b/Mage.Sets/src/mage/sets/magic2010/Silence.java @@ -29,10 +29,10 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/SilvercoatLion.java b/Mage.Sets/src/mage/sets/magic2010/SilvercoatLion.java index af16d01e21d..964314ae6cb 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SilvercoatLion.java +++ b/Mage.Sets/src/mage/sets/magic2010/SilvercoatLion.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/Sleep.java b/Mage.Sets/src/mage/sets/magic2010/Sleep.java index a3860f96302..805e439795f 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Sleep.java +++ b/Mage.Sets/src/mage/sets/magic2010/Sleep.java @@ -29,11 +29,11 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.PhaseStep; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.PhaseStep; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.ReplacementEffectImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/SnappingDrake.java b/Mage.Sets/src/mage/sets/magic2010/SnappingDrake.java index f062578ef4e..1d84bcac902 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SnappingDrake.java +++ b/Mage.Sets/src/mage/sets/magic2010/SnappingDrake.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/SolemnOffering.java b/Mage.Sets/src/mage/sets/magic2010/SolemnOffering.java index 1ceea3516e5..9f1f03ae44c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SolemnOffering.java +++ b/Mage.Sets/src/mage/sets/magic2010/SolemnOffering.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/SoulBleed.java b/Mage.Sets/src/mage/sets/magic2010/SoulBleed.java index 750ae331006..33e16e582e8 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SoulBleed.java +++ b/Mage.Sets/src/mage/sets/magic2010/SoulBleed.java @@ -28,16 +28,17 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -60,7 +61,7 @@ public class SoulBleed extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); // At the beginning of the upkeep of enchanted creature's controller, that player loses 1 life. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), Constants.TargetController.CONTROLLER_ATTACHED_TO, false, true)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), TargetController.CONTROLLER_ATTACHED_TO, false, true)); } public SoulBleed(final SoulBleed card) { diff --git a/Mage.Sets/src/mage/sets/magic2010/SoulWarden.java b/Mage.Sets/src/mage/sets/magic2010/SoulWarden.java index 5714d95b153..a1feba65c07 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SoulWarden.java +++ b/Mage.Sets/src/mage/sets/magic2010/SoulWarden.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/magic2010/SparkmageApprentice.java b/Mage.Sets/src/mage/sets/magic2010/SparkmageApprentice.java index 3b2be328497..9213d8a4738 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SparkmageApprentice.java +++ b/Mage.Sets/src/mage/sets/magic2010/SparkmageApprentice.java @@ -28,8 +28,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/Spellbook.java b/Mage.Sets/src/mage/sets/magic2010/Spellbook.java index f847358918a..3cb45cc3a08 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Spellbook.java +++ b/Mage.Sets/src/mage/sets/magic2010/Spellbook.java @@ -28,14 +28,16 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continious.MaximumHandSizeControllerEffect; import mage.abilities.effects.common.continious.MaximumHandSizeControllerEffect.HandSizeModification; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -48,8 +50,8 @@ public class Spellbook extends CardImpl { this.expansionSetCode = "M10"; // You have no maximum hand size. - Effect effect = new MaximumHandSizeControllerEffect(Integer.MAX_VALUE, Constants.Duration.WhileOnBattlefield, HandSizeModification.SET); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect)); + Effect effect = new MaximumHandSizeControllerEffect(Integer.MAX_VALUE, Duration.WhileOnBattlefield, HandSizeModification.SET); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } public Spellbook(final Spellbook card) { diff --git a/Mage.Sets/src/mage/sets/magic2010/SphinxAmbassador.java b/Mage.Sets/src/mage/sets/magic2010/SphinxAmbassador.java index 66f401af179..6df2c784ee0 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SphinxAmbassador.java +++ b/Mage.Sets/src/mage/sets/magic2010/SphinxAmbassador.java @@ -30,10 +30,10 @@ package mage.sets.magic2010; import java.util.Collection; import java.util.TreeSet; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/StoneGiant.java b/Mage.Sets/src/mage/sets/magic2010/StoneGiant.java index 456d4fef973..de1fbd14a44 100644 --- a/Mage.Sets/src/mage/sets/magic2010/StoneGiant.java +++ b/Mage.Sets/src/mage/sets/magic2010/StoneGiant.java @@ -28,11 +28,11 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/StormfrontPegasus.java b/Mage.Sets/src/mage/sets/magic2010/StormfrontPegasus.java index 4cec85e6cd5..6bbce7ef7c5 100644 --- a/Mage.Sets/src/mage/sets/magic2010/StormfrontPegasus.java +++ b/Mage.Sets/src/mage/sets/magic2010/StormfrontPegasus.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/SunpetalGrove.java b/Mage.Sets/src/mage/sets/magic2010/SunpetalGrove.java index 34da2ec2ac4..6e00d8c4f3b 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SunpetalGrove.java +++ b/Mage.Sets/src/mage/sets/magic2010/SunpetalGrove.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; diff --git a/Mage.Sets/src/mage/sets/magic2010/TempestOfLight.java b/Mage.Sets/src/mage/sets/magic2010/TempestOfLight.java index 498b25d1fd1..f87be01f34b 100644 --- a/Mage.Sets/src/mage/sets/magic2010/TempestOfLight.java +++ b/Mage.Sets/src/mage/sets/magic2010/TempestOfLight.java @@ -29,12 +29,12 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; @@ -72,7 +72,7 @@ class TempestOfLightEffect extends OneShotEffect { } public TempestOfLightEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); staticText = "Destroy all enchantments"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/TendrilsOfCorruption.java b/Mage.Sets/src/mage/sets/magic2010/TendrilsOfCorruption.java index 2b744220d1d..4b38ff8e9df 100644 --- a/Mage.Sets/src/mage/sets/magic2010/TendrilsOfCorruption.java +++ b/Mage.Sets/src/mage/sets/magic2010/TendrilsOfCorruption.java @@ -28,8 +28,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/magic2010/TimeWarp.java b/Mage.Sets/src/mage/sets/magic2010/TimeWarp.java index 7b97261d481..9873ed4ab87 100644 --- a/Mage.Sets/src/mage/sets/magic2010/TimeWarp.java +++ b/Mage.Sets/src/mage/sets/magic2010/TimeWarp.java @@ -29,9 +29,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/TomeScour.java b/Mage.Sets/src/mage/sets/magic2010/TomeScour.java index 0de939e8600..c6916099271 100644 --- a/Mage.Sets/src/mage/sets/magic2010/TomeScour.java +++ b/Mage.Sets/src/mage/sets/magic2010/TomeScour.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/magic2010/TrumpetBlast.java b/Mage.Sets/src/mage/sets/magic2010/TrumpetBlast.java index dc456eb72ab..cf214badf9b 100644 --- a/Mage.Sets/src/mage/sets/magic2010/TrumpetBlast.java +++ b/Mage.Sets/src/mage/sets/magic2010/TrumpetBlast.java @@ -28,9 +28,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.cards.CardImpl; import mage.filter.common.FilterAttackingCreature; diff --git a/Mage.Sets/src/mage/sets/magic2010/Twincast.java b/Mage.Sets/src/mage/sets/magic2010/Twincast.java index 61216528922..537546820a4 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Twincast.java +++ b/Mage.Sets/src/mage/sets/magic2010/Twincast.java @@ -28,8 +28,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CopyTargetSpellEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; diff --git a/Mage.Sets/src/mage/sets/magic2010/UndeadSlayer.java b/Mage.Sets/src/mage/sets/magic2010/UndeadSlayer.java index e92a8bf2489..145f41ef3e9 100644 --- a/Mage.Sets/src/mage/sets/magic2010/UndeadSlayer.java +++ b/Mage.Sets/src/mage/sets/magic2010/UndeadSlayer.java @@ -29,9 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -67,7 +68,7 @@ public class UndeadSlayer extends CardImpl { this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ExileTargetEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/magic2010/UnderworldDreams.java b/Mage.Sets/src/mage/sets/magic2010/UnderworldDreams.java index 51a939c9c1f..13c6c393052 100644 --- a/Mage.Sets/src/mage/sets/magic2010/UnderworldDreams.java +++ b/Mage.Sets/src/mage/sets/magic2010/UnderworldDreams.java @@ -28,9 +28,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/VampireAristocrat.java b/Mage.Sets/src/mage/sets/magic2010/VampireAristocrat.java index 45c912ec3b9..9d17697296a 100644 --- a/Mage.Sets/src/mage/sets/magic2010/VampireAristocrat.java +++ b/Mage.Sets/src/mage/sets/magic2010/VampireAristocrat.java @@ -29,10 +29,10 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/VampireNocturnus.java b/Mage.Sets/src/mage/sets/magic2010/VampireNocturnus.java index e79534cd1e3..675ab75b09a 100644 --- a/Mage.Sets/src/mage/sets/magic2010/VampireNocturnus.java +++ b/Mage.Sets/src/mage/sets/magic2010/VampireNocturnus.java @@ -28,10 +28,10 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.StaticAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/VeteranArmorsmith.java b/Mage.Sets/src/mage/sets/magic2010/VeteranArmorsmith.java index a8c8356cf16..cdfd2877fe5 100644 --- a/Mage.Sets/src/mage/sets/magic2010/VeteranArmorsmith.java +++ b/Mage.Sets/src/mage/sets/magic2010/VeteranArmorsmith.java @@ -29,13 +29,14 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -59,7 +60,7 @@ public class VeteranArmorsmith extends CardImpl { this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(3); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Constants.Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, filter, true))); } public VeteranArmorsmith(final VeteranArmorsmith card) { diff --git a/Mage.Sets/src/mage/sets/magic2010/VeteranSwordsmith.java b/Mage.Sets/src/mage/sets/magic2010/VeteranSwordsmith.java index ab5f068cd4d..614b3021e03 100644 --- a/Mage.Sets/src/mage/sets/magic2010/VeteranSwordsmith.java +++ b/Mage.Sets/src/mage/sets/magic2010/VeteranSwordsmith.java @@ -29,13 +29,14 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -58,7 +59,7 @@ public class VeteranSwordsmith extends CardImpl { this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Constants.Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, filter, true))); } public VeteranSwordsmith(final VeteranSwordsmith card) { diff --git a/Mage.Sets/src/mage/sets/magic2010/ViashinoSpearhunter.java b/Mage.Sets/src/mage/sets/magic2010/ViashinoSpearhunter.java index b46d86a62eb..a57c16bc546 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ViashinoSpearhunter.java +++ b/Mage.Sets/src/mage/sets/magic2010/ViashinoSpearhunter.java @@ -28,8 +28,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/WallOfBone.java b/Mage.Sets/src/mage/sets/magic2010/WallOfBone.java index a1a65422471..2b4106ce32d 100644 --- a/Mage.Sets/src/mage/sets/magic2010/WallOfBone.java +++ b/Mage.Sets/src/mage/sets/magic2010/WallOfBone.java @@ -29,9 +29,9 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/WallOfFaith.java b/Mage.Sets/src/mage/sets/magic2010/WallOfFaith.java index 1aa890dacdb..f21f9f44901 100644 --- a/Mage.Sets/src/mage/sets/magic2010/WallOfFaith.java +++ b/Mage.Sets/src/mage/sets/magic2010/WallOfFaith.java @@ -29,10 +29,10 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/WallOfFrost.java b/Mage.Sets/src/mage/sets/magic2010/WallOfFrost.java index e2df7c304f9..a0c1900d403 100644 --- a/Mage.Sets/src/mage/sets/magic2010/WallOfFrost.java +++ b/Mage.Sets/src/mage/sets/magic2010/WallOfFrost.java @@ -28,8 +28,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.effects.common.SkipNextUntapTargetEffect; diff --git a/Mage.Sets/src/mage/sets/magic2010/WarpWorld.java b/Mage.Sets/src/mage/sets/magic2010/WarpWorld.java index fa30cb88145..e06103b2cc5 100644 --- a/Mage.Sets/src/mage/sets/magic2010/WarpWorld.java +++ b/Mage.Sets/src/mage/sets/magic2010/WarpWorld.java @@ -33,10 +33,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/magic2010/WarpathGhoul.java b/Mage.Sets/src/mage/sets/magic2010/WarpathGhoul.java index b8e17a97412..29c28b5579b 100644 --- a/Mage.Sets/src/mage/sets/magic2010/WarpathGhoul.java +++ b/Mage.Sets/src/mage/sets/magic2010/WarpathGhoul.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/Weakness.java b/Mage.Sets/src/mage/sets/magic2010/Weakness.java index f868cce0f84..43a9ca5af3f 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Weakness.java +++ b/Mage.Sets/src/mage/sets/magic2010/Weakness.java @@ -29,13 +29,13 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/WhiteKnight.java b/Mage.Sets/src/mage/sets/magic2010/WhiteKnight.java index 1285a51abfc..c655a68be1c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/WhiteKnight.java +++ b/Mage.Sets/src/mage/sets/magic2010/WhiteKnight.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/WindDrake.java b/Mage.Sets/src/mage/sets/magic2010/WindDrake.java index f4d86f986f2..483625db3a6 100644 --- a/Mage.Sets/src/mage/sets/magic2010/WindDrake.java +++ b/Mage.Sets/src/mage/sets/magic2010/WindDrake.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/Windstorm.java b/Mage.Sets/src/mage/sets/magic2010/Windstorm.java index 6665af70644..7633bffb93c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Windstorm.java +++ b/Mage.Sets/src/mage/sets/magic2010/Windstorm.java @@ -28,8 +28,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/XathridDemon.java b/Mage.Sets/src/mage/sets/magic2010/XathridDemon.java index edcfd4d1435..ad649f52b44 100644 --- a/Mage.Sets/src/mage/sets/magic2010/XathridDemon.java +++ b/Mage.Sets/src/mage/sets/magic2010/XathridDemon.java @@ -29,11 +29,11 @@ package mage.sets.magic2010; import java.util.Set; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/YawningFissure.java b/Mage.Sets/src/mage/sets/magic2010/YawningFissure.java index 1c7994992c7..0b2d88e550f 100644 --- a/Mage.Sets/src/mage/sets/magic2010/YawningFissure.java +++ b/Mage.Sets/src/mage/sets/magic2010/YawningFissure.java @@ -29,9 +29,9 @@ package mage.sets.magic2010; import java.util.Set; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/ZephyrSprite.java b/Mage.Sets/src/mage/sets/magic2010/ZephyrSprite.java index 5d57620300c..3b3c67d7637 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ZephyrSprite.java +++ b/Mage.Sets/src/mage/sets/magic2010/ZephyrSprite.java @@ -29,8 +29,8 @@ package mage.sets.magic2010; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/ActOfTreason.java b/Mage.Sets/src/mage/sets/magic2011/ActOfTreason.java index f5a4c758d9f..c41f2ab649a 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ActOfTreason.java +++ b/Mage.Sets/src/mage/sets/magic2011/ActOfTreason.java @@ -29,7 +29,7 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java b/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java index 0b834fadb16..f4fd22289ec 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java +++ b/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java @@ -28,8 +28,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/AirServant.java b/Mage.Sets/src/mage/sets/magic2011/AirServant.java index 9ab5e6caa18..7ba2e912424 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AirServant.java +++ b/Mage.Sets/src/mage/sets/magic2011/AirServant.java @@ -29,9 +29,9 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/AjanisMantra.java b/Mage.Sets/src/mage/sets/magic2011/AjanisMantra.java index 0ea9ffa2630..7c233f315b9 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AjanisMantra.java +++ b/Mage.Sets/src/mage/sets/magic2011/AjanisMantra.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/AjanisPridemate.java b/Mage.Sets/src/mage/sets/magic2011/AjanisPridemate.java index ab998ebe3da..352bc51a9a0 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AjanisPridemate.java +++ b/Mage.Sets/src/mage/sets/magic2011/AjanisPridemate.java @@ -29,9 +29,9 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java b/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java index 3d6b8aed90d..0baccc9a444 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java +++ b/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java @@ -29,10 +29,10 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.ColoredManaSymbol; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.ActivatedAbilityImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java b/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java index 60c4001d682..f6f80ef431c 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java +++ b/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java @@ -29,12 +29,12 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.WatcherScope; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.WatcherScope; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/ArcRunner.java b/Mage.Sets/src/mage/sets/magic2011/ArcRunner.java index 02cac4ae0ae..e51bc2b2a5b 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ArcRunner.java +++ b/Mage.Sets/src/mage/sets/magic2011/ArcRunner.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; diff --git a/Mage.Sets/src/mage/sets/magic2011/ArmoredCancrix.java b/Mage.Sets/src/mage/sets/magic2011/ArmoredCancrix.java index fdef1e7f1f2..c9bb2b5d511 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ArmoredCancrix.java +++ b/Mage.Sets/src/mage/sets/magic2011/ArmoredCancrix.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/AssaultGriffin.java b/Mage.Sets/src/mage/sets/magic2011/AssaultGriffin.java index 64cdb6f1b2e..3abe48cb30b 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AssaultGriffin.java +++ b/Mage.Sets/src/mage/sets/magic2011/AssaultGriffin.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/AuguryOwl.java b/Mage.Sets/src/mage/sets/magic2011/AuguryOwl.java index baf0d33e0c9..c3100dc291e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AuguryOwl.java +++ b/Mage.Sets/src/mage/sets/magic2011/AuguryOwl.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.ScryEffect; diff --git a/Mage.Sets/src/mage/sets/magic2011/AutumnsVeil.java b/Mage.Sets/src/mage/sets/magic2011/AutumnsVeil.java index 558982ab811..d60007dcd24 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AutumnsVeil.java +++ b/Mage.Sets/src/mage/sets/magic2011/AutumnsVeil.java @@ -29,9 +29,9 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.CantCounterControlledEffect; import mage.abilities.effects.common.CantTargetControlledEffect; diff --git a/Mage.Sets/src/mage/sets/magic2011/AzureDrake.java b/Mage.Sets/src/mage/sets/magic2011/AzureDrake.java index 3c5cb6ed1ab..4078ec3f288 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AzureDrake.java +++ b/Mage.Sets/src/mage/sets/magic2011/AzureDrake.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/BackToNature.java b/Mage.Sets/src/mage/sets/magic2011/BackToNature.java index 57e592b2673..5970dbe9510 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BackToNature.java +++ b/Mage.Sets/src/mage/sets/magic2011/BackToNature.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/magic2011/BaronyVampire.java b/Mage.Sets/src/mage/sets/magic2011/BaronyVampire.java index 1a51ecaf062..9e6cb05ed30 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BaronyVampire.java +++ b/Mage.Sets/src/mage/sets/magic2011/BaronyVampire.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/BloodTithe.java b/Mage.Sets/src/mage/sets/magic2011/BloodTithe.java index d98c0b19538..2f309192b5d 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BloodTithe.java +++ b/Mage.Sets/src/mage/sets/magic2011/BloodTithe.java @@ -29,9 +29,9 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/BloodcrazedGoblin.java b/Mage.Sets/src/mage/sets/magic2011/BloodcrazedGoblin.java index fd623342b1f..434b51047ad 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BloodcrazedGoblin.java +++ b/Mage.Sets/src/mage/sets/magic2011/BloodcrazedGoblin.java @@ -29,10 +29,10 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/BogRaiders.java b/Mage.Sets/src/mage/sets/magic2011/BogRaiders.java index e51ab73ec29..e7e78ccf899 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BogRaiders.java +++ b/Mage.Sets/src/mage/sets/magic2011/BogRaiders.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/BrindleBoar.java b/Mage.Sets/src/mage/sets/magic2011/BrindleBoar.java index 818e44597dc..cec96257acf 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BrindleBoar.java +++ b/Mage.Sets/src/mage/sets/magic2011/BrindleBoar.java @@ -29,9 +29,9 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/magic2011/BrittleEffigy.java b/Mage.Sets/src/mage/sets/magic2011/BrittleEffigy.java index b33ffb33db7..4011938ae23 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BrittleEffigy.java +++ b/Mage.Sets/src/mage/sets/magic2011/BrittleEffigy.java @@ -29,9 +29,9 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.Costs; diff --git a/Mage.Sets/src/mage/sets/magic2011/CallToMind.java b/Mage.Sets/src/mage/sets/magic2011/CallToMind.java index 414ff4b242e..43072e4035b 100644 --- a/Mage.Sets/src/mage/sets/magic2011/CallToMind.java +++ b/Mage.Sets/src/mage/sets/magic2011/CallToMind.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterCard; diff --git a/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java b/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java index 879e2438cf2..bb364e0b0f9 100644 --- a/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java +++ b/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java @@ -29,13 +29,13 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/ChandrasOutrage.java b/Mage.Sets/src/mage/sets/magic2011/ChandrasOutrage.java index 200cfcbd072..34553fcf27e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ChandrasOutrage.java +++ b/Mage.Sets/src/mage/sets/magic2011/ChandrasOutrage.java @@ -29,9 +29,9 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/ChandrasSpitfire.java b/Mage.Sets/src/mage/sets/magic2011/ChandrasSpitfire.java index fa17e84da9c..f86140bb482 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ChandrasSpitfire.java +++ b/Mage.Sets/src/mage/sets/magic2011/ChandrasSpitfire.java @@ -29,10 +29,10 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; diff --git a/Mage.Sets/src/mage/sets/magic2011/CloudCrusader.java b/Mage.Sets/src/mage/sets/magic2011/CloudCrusader.java index 01ff0d9b23b..342c1779d3c 100644 --- a/Mage.Sets/src/mage/sets/magic2011/CloudCrusader.java +++ b/Mage.Sets/src/mage/sets/magic2011/CloudCrusader.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/Combust.java b/Mage.Sets/src/mage/sets/magic2011/Combust.java index 55aba73dba4..17dfd5841cf 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Combust.java +++ b/Mage.Sets/src/mage/sets/magic2011/Combust.java @@ -29,9 +29,9 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.CantCounterSourceEffect; diff --git a/Mage.Sets/src/mage/sets/magic2011/ConundrumSphinx.java b/Mage.Sets/src/mage/sets/magic2011/ConundrumSphinx.java index 3327f03529f..619dfb434b8 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ConundrumSphinx.java +++ b/Mage.Sets/src/mage/sets/magic2011/ConundrumSphinx.java @@ -29,10 +29,10 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/Corrupt.java b/Mage.Sets/src/mage/sets/magic2011/Corrupt.java index ed02fbffb5e..5e088aa8c99 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Corrupt.java +++ b/Mage.Sets/src/mage/sets/magic2011/Corrupt.java @@ -29,10 +29,10 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/CrystalBall.java b/Mage.Sets/src/mage/sets/magic2011/CrystalBall.java index ac2f4eb6771..e710c5db9e5 100644 --- a/Mage.Sets/src/mage/sets/magic2011/CrystalBall.java +++ b/Mage.Sets/src/mage/sets/magic2011/CrystalBall.java @@ -29,9 +29,9 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/magic2011/Cultivate.java b/Mage.Sets/src/mage/sets/magic2011/Cultivate.java index 492c99664a6..a021ffb2e54 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Cultivate.java +++ b/Mage.Sets/src/mage/sets/magic2011/Cultivate.java @@ -30,10 +30,10 @@ package mage.sets.magic2011; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java b/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java index 172bec5bde0..3dd267cac11 100644 --- a/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java +++ b/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java @@ -29,9 +29,9 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/DarkTutelage.java b/Mage.Sets/src/mage/sets/magic2011/DarkTutelage.java index aef56e4b9a0..f4ef915280a 100644 --- a/Mage.Sets/src/mage/sets/magic2011/DarkTutelage.java +++ b/Mage.Sets/src/mage/sets/magic2011/DarkTutelage.java @@ -29,10 +29,10 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/magic2011/DemonOfDeathsGate.java b/Mage.Sets/src/mage/sets/magic2011/DemonOfDeathsGate.java index db30158ff20..1211d2f5ae6 100644 --- a/Mage.Sets/src/mage/sets/magic2011/DemonOfDeathsGate.java +++ b/Mage.Sets/src/mage/sets/magic2011/DemonOfDeathsGate.java @@ -28,8 +28,8 @@ package mage.sets.magic2011; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.costs.AlternativeCostImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/DestructiveForce.java b/Mage.Sets/src/mage/sets/magic2011/DestructiveForce.java index 961530eb196..9dbc3fcb042 100644 --- a/Mage.Sets/src/mage/sets/magic2011/DestructiveForce.java +++ b/Mage.Sets/src/mage/sets/magic2011/DestructiveForce.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.effects.common.SacrificeAllEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/Diminish.java b/Mage.Sets/src/mage/sets/magic2011/Diminish.java index 1250971c3ac..0b5dad28fd0 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Diminish.java +++ b/Mage.Sets/src/mage/sets/magic2011/Diminish.java @@ -29,9 +29,9 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.SetPowerToughnessTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/magic2011/DryadsFavor.java b/Mage.Sets/src/mage/sets/magic2011/DryadsFavor.java index 2359405b0b8..776867cf687 100644 --- a/Mage.Sets/src/mage/sets/magic2011/DryadsFavor.java +++ b/Mage.Sets/src/mage/sets/magic2011/DryadsFavor.java @@ -29,13 +29,13 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/DuskdaleWurm.java b/Mage.Sets/src/mage/sets/magic2011/DuskdaleWurm.java index 2f5ce518c01..c9b361d13f9 100644 --- a/Mage.Sets/src/mage/sets/magic2011/DuskdaleWurm.java +++ b/Mage.Sets/src/mage/sets/magic2011/DuskdaleWurm.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/EarthServant.java b/Mage.Sets/src/mage/sets/magic2011/EarthServant.java index 7693b422ddd..54d7ed79953 100644 --- a/Mage.Sets/src/mage/sets/magic2011/EarthServant.java +++ b/Mage.Sets/src/mage/sets/magic2011/EarthServant.java @@ -29,11 +29,11 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; diff --git a/Mage.Sets/src/mage/sets/magic2011/ElixirOfImmortality.java b/Mage.Sets/src/mage/sets/magic2011/ElixirOfImmortality.java index b751b58e0c3..a1fb8960716 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ElixirOfImmortality.java +++ b/Mage.Sets/src/mage/sets/magic2011/ElixirOfImmortality.java @@ -29,10 +29,10 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/magic2011/EmberHauler.java b/Mage.Sets/src/mage/sets/magic2011/EmberHauler.java index 633e0d711db..240d5bc9fc9 100644 --- a/Mage.Sets/src/mage/sets/magic2011/EmberHauler.java +++ b/Mage.Sets/src/mage/sets/magic2011/EmberHauler.java @@ -29,9 +29,9 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/FaunaShaman.java b/Mage.Sets/src/mage/sets/magic2011/FaunaShaman.java index 80fb8c5f464..1851ed51ed5 100644 --- a/Mage.Sets/src/mage/sets/magic2011/FaunaShaman.java +++ b/Mage.Sets/src/mage/sets/magic2011/FaunaShaman.java @@ -29,10 +29,10 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.ColoredManaSymbol; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/FireServant.java b/Mage.Sets/src/mage/sets/magic2011/FireServant.java index 5e50ba5b708..495fd0c79e9 100644 --- a/Mage.Sets/src/mage/sets/magic2011/FireServant.java +++ b/Mage.Sets/src/mage/sets/magic2011/FireServant.java @@ -29,11 +29,11 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/Fling.java b/Mage.Sets/src/mage/sets/magic2011/Fling.java index 332cecc8892..eb24ba6b36f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Fling.java +++ b/Mage.Sets/src/mage/sets/magic2011/Fling.java @@ -29,9 +29,9 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.common.SacrificeTargetCost; diff --git a/Mage.Sets/src/mage/sets/magic2011/Foresee.java b/Mage.Sets/src/mage/sets/magic2011/Foresee.java index 0de14fbafd0..dbeb751bb06 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Foresee.java +++ b/Mage.Sets/src/mage/sets/magic2011/Foresee.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.ScryEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java b/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java index 3dc5153e9c0..0ee77e7febe 100644 --- a/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java +++ b/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java @@ -29,9 +29,9 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.GenericManaCost; diff --git a/Mage.Sets/src/mage/sets/magic2011/GaeasRevenge.java b/Mage.Sets/src/mage/sets/magic2011/GaeasRevenge.java index 88b1effa23c..bae1aa82fd1 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GaeasRevenge.java +++ b/Mage.Sets/src/mage/sets/magic2011/GaeasRevenge.java @@ -29,10 +29,10 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/GargoyleSentinel.java b/Mage.Sets/src/mage/sets/magic2011/GargoyleSentinel.java index 2fdbfba0a0f..faafe3a6ae7 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GargoyleSentinel.java +++ b/Mage.Sets/src/mage/sets/magic2011/GargoyleSentinel.java @@ -30,13 +30,13 @@ package mage.sets.magic2011; import java.util.Iterator; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/GarruksCompanion.java b/Mage.Sets/src/mage/sets/magic2011/GarruksCompanion.java index b9eabc05957..2d06e8ca3b5 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GarruksCompanion.java +++ b/Mage.Sets/src/mage/sets/magic2011/GarruksCompanion.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/GarruksPackleader.java b/Mage.Sets/src/mage/sets/magic2011/GarruksPackleader.java index 0991592693b..8e7dde4ebcb 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GarruksPackleader.java +++ b/Mage.Sets/src/mage/sets/magic2011/GarruksPackleader.java @@ -29,9 +29,9 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/magic2011/GoblinBalloonBrigade.java b/Mage.Sets/src/mage/sets/magic2011/GoblinBalloonBrigade.java index eb8b6280630..cc4ffaa6972 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GoblinBalloonBrigade.java +++ b/Mage.Sets/src/mage/sets/magic2011/GoblinBalloonBrigade.java @@ -29,10 +29,10 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/GoldenglowMoth.java b/Mage.Sets/src/mage/sets/magic2011/GoldenglowMoth.java index c0992e3f386..62c47d48581 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GoldenglowMoth.java +++ b/Mage.Sets/src/mage/sets/magic2011/GoldenglowMoth.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/magic2011/GraveTitan.java b/Mage.Sets/src/mage/sets/magic2011/GraveTitan.java index 2cbea517bea..ad4dc203c7d 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GraveTitan.java +++ b/Mage.Sets/src/mage/sets/magic2011/GraveTitan.java @@ -29,9 +29,9 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/magic2011/GreaterBasilisk.java b/Mage.Sets/src/mage/sets/magic2011/GreaterBasilisk.java index 6f2ca005e6d..a5d0ab0ace5 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GreaterBasilisk.java +++ b/Mage.Sets/src/mage/sets/magic2011/GreaterBasilisk.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/HarborSerpent.java b/Mage.Sets/src/mage/sets/magic2011/HarborSerpent.java index 79e6b768919..2f1f7463303 100644 --- a/Mage.Sets/src/mage/sets/magic2011/HarborSerpent.java +++ b/Mage.Sets/src/mage/sets/magic2011/HarborSerpent.java @@ -28,10 +28,10 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/HoardingDragon.java b/Mage.Sets/src/mage/sets/magic2011/HoardingDragon.java index 3d650780f62..5f005f25d44 100644 --- a/Mage.Sets/src/mage/sets/magic2011/HoardingDragon.java +++ b/Mage.Sets/src/mage/sets/magic2011/HoardingDragon.java @@ -29,10 +29,10 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/HornetSting.java b/Mage.Sets/src/mage/sets/magic2011/HornetSting.java index 8a4254a58a9..1a90c0751d9 100644 --- a/Mage.Sets/src/mage/sets/magic2011/HornetSting.java +++ b/Mage.Sets/src/mage/sets/magic2011/HornetSting.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreatureOrPlayer; diff --git a/Mage.Sets/src/mage/sets/magic2011/HuntersFeast.java b/Mage.Sets/src/mage/sets/magic2011/HuntersFeast.java index 068616763d8..20ef5b6dd60 100644 --- a/Mage.Sets/src/mage/sets/magic2011/HuntersFeast.java +++ b/Mage.Sets/src/mage/sets/magic2011/HuntersFeast.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.GainLifeTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/magic2011/Incite.java b/Mage.Sets/src/mage/sets/magic2011/Incite.java index c627bc8edca..1a370bd6f2e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Incite.java +++ b/Mage.Sets/src/mage/sets/magic2011/Incite.java @@ -29,10 +29,10 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.AttacksIfAbleTargetEffect; import mage.abilities.effects.common.continious.SetCardColorTargetEffect; @@ -52,7 +52,7 @@ public class Incite extends CardImpl { // Target creature becomes red until end of turn and attacks this turn if able. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - this.getSpellAbility().addEffect(new SetCardColorTargetEffect(ObjectColor.RED, Constants.Duration.EndOfTurn, "Target creature becomes red until end of turn")); + this.getSpellAbility().addEffect(new SetCardColorTargetEffect(ObjectColor.RED, Duration.EndOfTurn, "Target creature becomes red until end of turn")); this.getSpellAbility().addEffect(new AttacksIfAbleTargetEffect(Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/magic2011/InfantryVeteran.java b/Mage.Sets/src/mage/sets/magic2011/InfantryVeteran.java index e8e86b74f98..ea255baeb50 100644 --- a/Mage.Sets/src/mage/sets/magic2011/InfantryVeteran.java +++ b/Mage.Sets/src/mage/sets/magic2011/InfantryVeteran.java @@ -29,10 +29,10 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java b/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java index fd9373acf1d..3c232e53f2b 100644 --- a/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java +++ b/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java @@ -29,10 +29,10 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/InspiredCharge.java b/Mage.Sets/src/mage/sets/magic2011/InspiredCharge.java index 27d1ebc647c..ec531d75110 100644 --- a/Mage.Sets/src/mage/sets/magic2011/InspiredCharge.java +++ b/Mage.Sets/src/mage/sets/magic2011/InspiredCharge.java @@ -29,9 +29,9 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/JacesErasure.java b/Mage.Sets/src/mage/sets/magic2011/JacesErasure.java index f809be585c7..8b82f8a7408 100644 --- a/Mage.Sets/src/mage/sets/magic2011/JacesErasure.java +++ b/Mage.Sets/src/mage/sets/magic2011/JacesErasure.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.DrawCardTriggeredAbility; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/JacesIngenuity.java b/Mage.Sets/src/mage/sets/magic2011/JacesIngenuity.java index 7e920fd70e6..3f5eaf4e454 100644 --- a/Mage.Sets/src/mage/sets/magic2011/JacesIngenuity.java +++ b/Mage.Sets/src/mage/sets/magic2011/JacesIngenuity.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/JinxedIdol.java b/Mage.Sets/src/mage/sets/magic2011/JinxedIdol.java index ff5b4c38f70..57cf12c255e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/JinxedIdol.java +++ b/Mage.Sets/src/mage/sets/magic2011/JinxedIdol.java @@ -28,7 +28,6 @@ package mage.sets.magic2011; -import mage.Constants.*; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -36,6 +35,7 @@ import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.DamageControllerEffect; import mage.cards.CardImpl; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/sets/magic2011/KnightExemplar.java b/Mage.Sets/src/mage/sets/magic2011/KnightExemplar.java index 9c70fef1c3d..86a4941f0dc 100644 --- a/Mage.Sets/src/mage/sets/magic2011/KnightExemplar.java +++ b/Mage.Sets/src/mage/sets/magic2011/KnightExemplar.java @@ -29,11 +29,11 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; diff --git a/Mage.Sets/src/mage/sets/magic2011/LeylineOfAnticipation.java b/Mage.Sets/src/mage/sets/magic2011/LeylineOfAnticipation.java index ba4fbace247..75ecfe1f261 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LeylineOfAnticipation.java +++ b/Mage.Sets/src/mage/sets/magic2011/LeylineOfAnticipation.java @@ -29,12 +29,12 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.AsThoughEffectType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AsThoughEffectType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.AsThoughEffectImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/LeylineOfPunishment.java b/Mage.Sets/src/mage/sets/magic2011/LeylineOfPunishment.java index c3c37410824..568e39f37a1 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LeylineOfPunishment.java +++ b/Mage.Sets/src/mage/sets/magic2011/LeylineOfPunishment.java @@ -29,13 +29,13 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/LeylineOfSanctity.java b/Mage.Sets/src/mage/sets/magic2011/LeylineOfSanctity.java index 4c905828f9a..f143c472ca2 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LeylineOfSanctity.java +++ b/Mage.Sets/src/mage/sets/magic2011/LeylineOfSanctity.java @@ -29,10 +29,10 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityControllerEffect; import mage.abilities.keyword.HexproofAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/LeylineOfTheVoid.java b/Mage.Sets/src/mage/sets/magic2011/LeylineOfTheVoid.java index 086c41c224e..29923f2e0a1 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LeylineOfTheVoid.java +++ b/Mage.Sets/src/mage/sets/magic2011/LeylineOfTheVoid.java @@ -29,11 +29,11 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/LeylineOfVitality.java b/Mage.Sets/src/mage/sets/magic2011/LeylineOfVitality.java index e596b39b3c1..b1c36587b81 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LeylineOfVitality.java +++ b/Mage.Sets/src/mage/sets/magic2011/LeylineOfVitality.java @@ -29,10 +29,10 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.CreatureEntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; diff --git a/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java b/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java index 8bed1e41dbd..58fe1010eb0 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java +++ b/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java @@ -29,9 +29,9 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/LilianasSpecter.java b/Mage.Sets/src/mage/sets/magic2011/LilianasSpecter.java index 8d0fa22b9e3..b5c78d2f134 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LilianasSpecter.java +++ b/Mage.Sets/src/mage/sets/magic2011/LilianasSpecter.java @@ -29,9 +29,9 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/ManaLeak.java b/Mage.Sets/src/mage/sets/magic2011/ManaLeak.java index ee2a9b32645..3156023a1f4 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ManaLeak.java +++ b/Mage.Sets/src/mage/sets/magic2011/ManaLeak.java @@ -33,8 +33,8 @@ package mage.sets.magic2011; * @author BetaSteward_at_googlemail.com */ import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/ManicVandal.java b/Mage.Sets/src/mage/sets/magic2011/ManicVandal.java index 3ef2d35ae03..762850335a7 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ManicVandal.java +++ b/Mage.Sets/src/mage/sets/magic2011/ManicVandal.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/MaritimeGuard.java b/Mage.Sets/src/mage/sets/magic2011/MaritimeGuard.java index 0d59747d850..40ef1de2613 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MaritimeGuard.java +++ b/Mage.Sets/src/mage/sets/magic2011/MaritimeGuard.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/MassPolymorph.java b/Mage.Sets/src/mage/sets/magic2011/MassPolymorph.java index 7b751d310e1..ac252064e7b 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MassPolymorph.java +++ b/Mage.Sets/src/mage/sets/magic2011/MassPolymorph.java @@ -28,10 +28,10 @@ package mage.sets.magic2011; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/magic2011/MerfolkSpy.java b/Mage.Sets/src/mage/sets/magic2011/MerfolkSpy.java index 00eea2ca7c0..c526288bf2d 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MerfolkSpy.java +++ b/Mage.Sets/src/mage/sets/magic2011/MerfolkSpy.java @@ -28,9 +28,9 @@ package mage.sets.magic2011; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/MightyLeap.java b/Mage.Sets/src/mage/sets/magic2011/MightyLeap.java index f0daacbc431..24173acffe0 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MightyLeap.java +++ b/Mage.Sets/src/mage/sets/magic2011/MightyLeap.java @@ -29,9 +29,9 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/MitoticSlime.java b/Mage.Sets/src/mage/sets/magic2011/MitoticSlime.java index 2ce0a401cbf..980ebd5847b 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MitoticSlime.java +++ b/Mage.Sets/src/mage/sets/magic2011/MitoticSlime.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/magic2011/MystifyingMaze.java b/Mage.Sets/src/mage/sets/magic2011/MystifyingMaze.java index f9706646c78..d68ccd7d164 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MystifyingMaze.java +++ b/Mage.Sets/src/mage/sets/magic2011/MystifyingMaze.java @@ -29,11 +29,11 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.delayed.AtEndOfTurnDelayedTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/NantukoShade.java b/Mage.Sets/src/mage/sets/magic2011/NantukoShade.java index 51210ca5198..30cff93bf7a 100644 --- a/Mage.Sets/src/mage/sets/magic2011/NantukoShade.java +++ b/Mage.Sets/src/mage/sets/magic2011/NantukoShade.java @@ -29,10 +29,10 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java b/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java index df68fb38ea2..dc682b246ef 100644 --- a/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java +++ b/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java @@ -29,14 +29,14 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.common.OnEventTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/NetherHorror.java b/Mage.Sets/src/mage/sets/magic2011/NetherHorror.java index 720cb92a394..c14000fda8f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/NetherHorror.java +++ b/Mage.Sets/src/mage/sets/magic2011/NetherHorror.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/NightwingShade.java b/Mage.Sets/src/mage/sets/magic2011/NightwingShade.java index e2b19ea02e4..1b81c0cafb2 100644 --- a/Mage.Sets/src/mage/sets/magic2011/NightwingShade.java +++ b/Mage.Sets/src/mage/sets/magic2011/NightwingShade.java @@ -29,10 +29,10 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/ObstinateBaloth.java b/Mage.Sets/src/mage/sets/magic2011/ObstinateBaloth.java index d368c57e409..88d90700a32 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ObstinateBaloth.java +++ b/Mage.Sets/src/mage/sets/magic2011/ObstinateBaloth.java @@ -29,11 +29,11 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/OverwhelmingStampede.java b/Mage.Sets/src/mage/sets/magic2011/OverwhelmingStampede.java index 565acd7d620..ef4ff1bf864 100644 --- a/Mage.Sets/src/mage/sets/magic2011/OverwhelmingStampede.java +++ b/Mage.Sets/src/mage/sets/magic2011/OverwhelmingStampede.java @@ -28,11 +28,11 @@ package mage.sets.magic2011; -import mage.Constants.*; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/sets/magic2011/PhantomBeast.java b/Mage.Sets/src/mage/sets/magic2011/PhantomBeast.java index c170bc47e07..6ace6a2e45d 100644 --- a/Mage.Sets/src/mage/sets/magic2011/PhantomBeast.java +++ b/Mage.Sets/src/mage/sets/magic2011/PhantomBeast.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BecomesTargetTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; diff --git a/Mage.Sets/src/mage/sets/magic2011/PhylacteryLich.java b/Mage.Sets/src/mage/sets/magic2011/PhylacteryLich.java index 9cc45f56256..f767d4c9064 100644 --- a/Mage.Sets/src/mage/sets/magic2011/PhylacteryLich.java +++ b/Mage.Sets/src/mage/sets/magic2011/PhylacteryLich.java @@ -29,10 +29,10 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.StateTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/PlatinumAngel.java b/Mage.Sets/src/mage/sets/magic2011/PlatinumAngel.java index c4e325b1f72..4ababf238d5 100644 --- a/Mage.Sets/src/mage/sets/magic2011/PlatinumAngel.java +++ b/Mage.Sets/src/mage/sets/magic2011/PlatinumAngel.java @@ -29,7 +29,7 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/magic2011/Plummet.java b/Mage.Sets/src/mage/sets/magic2011/Plummet.java index e2a99a8e4aa..f599333b6cd 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Plummet.java +++ b/Mage.Sets/src/mage/sets/magic2011/Plummet.java @@ -30,8 +30,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/Preordain.java b/Mage.Sets/src/mage/sets/magic2011/Preordain.java index 5575e4eaf6f..c20104681dc 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Preordain.java +++ b/Mage.Sets/src/mage/sets/magic2011/Preordain.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.ScryEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java b/Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java index f1e0eeea941..87a5aae0280 100644 --- a/Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java +++ b/Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java @@ -29,10 +29,10 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.counter.AddPlusOneCountersAttachedEffect; diff --git a/Mage.Sets/src/mage/sets/magic2011/PrimevalTitan.java b/Mage.Sets/src/mage/sets/magic2011/PrimevalTitan.java index ec579aa8b39..8f846e00908 100644 --- a/Mage.Sets/src/mage/sets/magic2011/PrimevalTitan.java +++ b/Mage.Sets/src/mage/sets/magic2011/PrimevalTitan.java @@ -29,10 +29,10 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; diff --git a/Mage.Sets/src/mage/sets/magic2011/ProdigalPyromancer.java b/Mage.Sets/src/mage/sets/magic2011/ProdigalPyromancer.java index 3f5b2865cb2..1bb18696648 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ProdigalPyromancer.java +++ b/Mage.Sets/src/mage/sets/magic2011/ProdigalPyromancer.java @@ -29,7 +29,7 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/magic2011/ProteanHydra.java b/Mage.Sets/src/mage/sets/magic2011/ProteanHydra.java index d766da4cd41..1048015bdc0 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ProteanHydra.java +++ b/Mage.Sets/src/mage/sets/magic2011/ProteanHydra.java @@ -29,7 +29,7 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/magic2011/PyreticRitual.java b/Mage.Sets/src/mage/sets/magic2011/PyreticRitual.java index 7de85ac91d2..caef64d1c9b 100644 --- a/Mage.Sets/src/mage/sets/magic2011/PyreticRitual.java +++ b/Mage.Sets/src/mage/sets/magic2011/PyreticRitual.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.effects.common.BasicManaEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/QuagSickness.java b/Mage.Sets/src/mage/sets/magic2011/QuagSickness.java index cf9bf7cfecd..8c75d58bbe4 100644 --- a/Mage.Sets/src/mage/sets/magic2011/QuagSickness.java +++ b/Mage.Sets/src/mage/sets/magic2011/QuagSickness.java @@ -29,12 +29,12 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.AttachEffect; diff --git a/Mage.Sets/src/mage/sets/magic2011/ReassemblingSkeleton.java b/Mage.Sets/src/mage/sets/magic2011/ReassemblingSkeleton.java index 0de1be7fee9..7f607051b42 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ReassemblingSkeleton.java +++ b/Mage.Sets/src/mage/sets/magic2011/ReassemblingSkeleton.java @@ -29,9 +29,9 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/Redirect.java b/Mage.Sets/src/mage/sets/magic2011/Redirect.java index e40d242cbab..4aaca918676 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Redirect.java +++ b/Mage.Sets/src/mage/sets/magic2011/Redirect.java @@ -28,8 +28,8 @@ package mage.sets.magic2011; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ChooseNewTargetsTargetEffect; import mage.cards.CardImpl; import mage.target.TargetSpell; diff --git a/Mage.Sets/src/mage/sets/magic2011/Reverberate.java b/Mage.Sets/src/mage/sets/magic2011/Reverberate.java index 79ff2463872..0e2b1ce479b 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Reverberate.java +++ b/Mage.Sets/src/mage/sets/magic2011/Reverberate.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CopyTargetSpellEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; diff --git a/Mage.Sets/src/mage/sets/magic2011/RocEgg.java b/Mage.Sets/src/mage/sets/magic2011/RocEgg.java index 5bb2478d860..b837b500607 100644 --- a/Mage.Sets/src/mage/sets/magic2011/RocEgg.java +++ b/Mage.Sets/src/mage/sets/magic2011/RocEgg.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/magic2011/RottingLegion.java b/Mage.Sets/src/mage/sets/magic2011/RottingLegion.java index 833c60e719b..f9e8c4e39a5 100644 --- a/Mage.Sets/src/mage/sets/magic2011/RottingLegion.java +++ b/Mage.Sets/src/mage/sets/magic2011/RottingLegion.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/SacredWolf.java b/Mage.Sets/src/mage/sets/magic2011/SacredWolf.java index c6f3d17e68c..a577f7ad6e8 100644 --- a/Mage.Sets/src/mage/sets/magic2011/SacredWolf.java +++ b/Mage.Sets/src/mage/sets/magic2011/SacredWolf.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/ScrollThief.java b/Mage.Sets/src/mage/sets/magic2011/ScrollThief.java index c0d4598e017..29d250fbfe6 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ScrollThief.java +++ b/Mage.Sets/src/mage/sets/magic2011/ScrollThief.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/magic2011/SerraAngel.java b/Mage.Sets/src/mage/sets/magic2011/SerraAngel.java index db53146f712..72d4b0e22fc 100644 --- a/Mage.Sets/src/mage/sets/magic2011/SerraAngel.java +++ b/Mage.Sets/src/mage/sets/magic2011/SerraAngel.java @@ -28,7 +28,7 @@ package mage.sets.magic2011; -import mage.Constants; +import mage.constants.Rarity; import java.util.UUID; @@ -40,7 +40,7 @@ public class SerraAngel extends mage.sets.tenth.SerraAngel { public SerraAngel(UUID ownerId) { super(ownerId); - this.rarity = Constants.Rarity.UNCOMMON; + this.rarity = Rarity.UNCOMMON; this.cardNumber = 27; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/SerraAscendant.java b/Mage.Sets/src/mage/sets/magic2011/SerraAscendant.java index 5b0c03b048d..29682e363ff 100644 --- a/Mage.Sets/src/mage/sets/magic2011/SerraAscendant.java +++ b/Mage.Sets/src/mage/sets/magic2011/SerraAscendant.java @@ -29,13 +29,13 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/ShivsEmbrace.java b/Mage.Sets/src/mage/sets/magic2011/ShivsEmbrace.java index ee18570549e..d3a5fe712e7 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ShivsEmbrace.java +++ b/Mage.Sets/src/mage/sets/magic2011/ShivsEmbrace.java @@ -29,13 +29,13 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/SorcerersStrongbox.java b/Mage.Sets/src/mage/sets/magic2011/SorcerersStrongbox.java index 6b786b44784..6ac53ec06dd 100644 --- a/Mage.Sets/src/mage/sets/magic2011/SorcerersStrongbox.java +++ b/Mage.Sets/src/mage/sets/magic2011/SorcerersStrongbox.java @@ -29,10 +29,10 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/magic2011/SquadronHawk.java b/Mage.Sets/src/mage/sets/magic2011/SquadronHawk.java index 002ab917673..20875a16a54 100644 --- a/Mage.Sets/src/mage/sets/magic2011/SquadronHawk.java +++ b/Mage.Sets/src/mage/sets/magic2011/SquadronHawk.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; diff --git a/Mage.Sets/src/mage/sets/magic2011/StabbingPain.java b/Mage.Sets/src/mage/sets/magic2011/StabbingPain.java index da40738e661..983800a3a05 100644 --- a/Mage.Sets/src/mage/sets/magic2011/StabbingPain.java +++ b/Mage.Sets/src/mage/sets/magic2011/StabbingPain.java @@ -29,9 +29,9 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/SteelOverseer.java b/Mage.Sets/src/mage/sets/magic2011/SteelOverseer.java index 3adbb432c98..4ab5908da3a 100644 --- a/Mage.Sets/src/mage/sets/magic2011/SteelOverseer.java +++ b/Mage.Sets/src/mage/sets/magic2011/SteelOverseer.java @@ -29,10 +29,10 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/magic2011/StoneGolem.java b/Mage.Sets/src/mage/sets/magic2011/StoneGolem.java index cead9c1789e..2ea5bb4635f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/StoneGolem.java +++ b/Mage.Sets/src/mage/sets/magic2011/StoneGolem.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/StormtideLeviathan.java b/Mage.Sets/src/mage/sets/magic2011/StormtideLeviathan.java index 980edd1e8f1..8765517810f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/StormtideLeviathan.java +++ b/Mage.Sets/src/mage/sets/magic2011/StormtideLeviathan.java @@ -29,13 +29,13 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/SunTitan.java b/Mage.Sets/src/mage/sets/magic2011/SunTitan.java index ceceee88243..169a10e0aee 100644 --- a/Mage.Sets/src/mage/sets/magic2011/SunTitan.java +++ b/Mage.Sets/src/mage/sets/magic2011/SunTitan.java @@ -29,9 +29,9 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; diff --git a/Mage.Sets/src/mage/sets/magic2011/SwordOfVengeance.java b/Mage.Sets/src/mage/sets/magic2011/SwordOfVengeance.java index 5980be634cb..034ceca6a2b 100644 --- a/Mage.Sets/src/mage/sets/magic2011/SwordOfVengeance.java +++ b/Mage.Sets/src/mage/sets/magic2011/SwordOfVengeance.java @@ -30,11 +30,11 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; diff --git a/Mage.Sets/src/mage/sets/magic2011/SylvanRanger.java b/Mage.Sets/src/mage/sets/magic2011/SylvanRanger.java index b53df651fff..fabf50ce7fe 100644 --- a/Mage.Sets/src/mage/sets/magic2011/SylvanRanger.java +++ b/Mage.Sets/src/mage/sets/magic2011/SylvanRanger.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; diff --git a/Mage.Sets/src/mage/sets/magic2011/TempleBell.java b/Mage.Sets/src/mage/sets/magic2011/TempleBell.java index 74e57411715..420d42e3de8 100644 --- a/Mage.Sets/src/mage/sets/magic2011/TempleBell.java +++ b/Mage.Sets/src/mage/sets/magic2011/TempleBell.java @@ -29,9 +29,9 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DrawCardAllEffect; diff --git a/Mage.Sets/src/mage/sets/magic2011/ThunderStrike.java b/Mage.Sets/src/mage/sets/magic2011/ThunderStrike.java index eebc2dcfffb..d714b41e62a 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ThunderStrike.java +++ b/Mage.Sets/src/mage/sets/magic2011/ThunderStrike.java @@ -29,9 +29,9 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/TimeReversal.java b/Mage.Sets/src/mage/sets/magic2011/TimeReversal.java index 47cea3e4c11..877a59342f9 100644 --- a/Mage.Sets/src/mage/sets/magic2011/TimeReversal.java +++ b/Mage.Sets/src/mage/sets/magic2011/TimeReversal.java @@ -29,9 +29,9 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileSpellEffect; diff --git a/Mage.Sets/src/mage/sets/magic2011/TirelessMissionaries.java b/Mage.Sets/src/mage/sets/magic2011/TirelessMissionaries.java index 231b4e7f5e6..8361f31fa7d 100644 --- a/Mage.Sets/src/mage/sets/magic2011/TirelessMissionaries.java +++ b/Mage.Sets/src/mage/sets/magic2011/TirelessMissionaries.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/magic2011/Triskelion.java b/Mage.Sets/src/mage/sets/magic2011/Triskelion.java index faac17f54e2..37a2475eb7e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Triskelion.java +++ b/Mage.Sets/src/mage/sets/magic2011/Triskelion.java @@ -29,9 +29,9 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/VengefulArchon.java b/Mage.Sets/src/mage/sets/magic2011/VengefulArchon.java index 6a57006575b..f9f5f056f51 100644 --- a/Mage.Sets/src/mage/sets/magic2011/VengefulArchon.java +++ b/Mage.Sets/src/mage/sets/magic2011/VengefulArchon.java @@ -29,10 +29,10 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/VisceraSeer.java b/Mage.Sets/src/mage/sets/magic2011/VisceraSeer.java index f55f04be5c8..ad91edfbadb 100644 --- a/Mage.Sets/src/mage/sets/magic2011/VisceraSeer.java +++ b/Mage.Sets/src/mage/sets/magic2011/VisceraSeer.java @@ -29,9 +29,9 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; diff --git a/Mage.Sets/src/mage/sets/magic2011/VolcanicStrength.java b/Mage.Sets/src/mage/sets/magic2011/VolcanicStrength.java index 42a95b76286..e555d8fbfe9 100644 --- a/Mage.Sets/src/mage/sets/magic2011/VolcanicStrength.java +++ b/Mage.Sets/src/mage/sets/magic2011/VolcanicStrength.java @@ -29,13 +29,13 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/VoltaicKey.java b/Mage.Sets/src/mage/sets/magic2011/VoltaicKey.java index 0d4c5a1bacc..4e357fc58ad 100644 --- a/Mage.Sets/src/mage/sets/magic2011/VoltaicKey.java +++ b/Mage.Sets/src/mage/sets/magic2011/VoltaicKey.java @@ -29,9 +29,9 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/magic2011/VulshokBerserker.java b/Mage.Sets/src/mage/sets/magic2011/VulshokBerserker.java index decd31ed301..4a8af40f25b 100644 --- a/Mage.Sets/src/mage/sets/magic2011/VulshokBerserker.java +++ b/Mage.Sets/src/mage/sets/magic2011/VulshokBerserker.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/WallOfVines.java b/Mage.Sets/src/mage/sets/magic2011/WallOfVines.java index e56d35e67a4..ca5e5b882bc 100644 --- a/Mage.Sets/src/mage/sets/magic2011/WallOfVines.java +++ b/Mage.Sets/src/mage/sets/magic2011/WallOfVines.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.ReachAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/WarPriestOfThune.java b/Mage.Sets/src/mage/sets/magic2011/WarPriestOfThune.java index 0598ab9b4c5..ca11dec4668 100644 --- a/Mage.Sets/src/mage/sets/magic2011/WarPriestOfThune.java +++ b/Mage.Sets/src/mage/sets/magic2011/WarPriestOfThune.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/WarlordsAxe.java b/Mage.Sets/src/mage/sets/magic2011/WarlordsAxe.java index 4e8844c0c76..0dcc5eb9f16 100644 --- a/Mage.Sets/src/mage/sets/magic2011/WarlordsAxe.java +++ b/Mage.Sets/src/mage/sets/magic2011/WarlordsAxe.java @@ -29,10 +29,10 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; diff --git a/Mage.Sets/src/mage/sets/magic2011/WaterServant.java b/Mage.Sets/src/mage/sets/magic2011/WaterServant.java index 1cec097f3c3..88472596d99 100644 --- a/Mage.Sets/src/mage/sets/magic2011/WaterServant.java +++ b/Mage.Sets/src/mage/sets/magic2011/WaterServant.java @@ -29,10 +29,10 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/WildEvocation.java b/Mage.Sets/src/mage/sets/magic2011/WildEvocation.java index 34cf1fea84a..b2cc0e5d82f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/WildEvocation.java +++ b/Mage.Sets/src/mage/sets/magic2011/WildEvocation.java @@ -29,11 +29,11 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -41,6 +41,7 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.TargetController; import mage.game.Game; import mage.players.Player; @@ -56,7 +57,7 @@ public class WildEvocation extends CardImpl { this.color.setRed(true); //At the beginning of each player's upkeep, that player reveals a card at random from his or her hand. If it's a land card, the player puts it onto the battlefield. Otherwise, the player casts it without paying its mana cost if able. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(Constants.Zone.BATTLEFIELD, new WildEvocationEffect(), Constants.TargetController.ANY, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new WildEvocationEffect(), TargetController.ANY, false)); } public WildEvocation(final WildEvocation card) { diff --git a/Mage.Sets/src/mage/sets/magic2011/YavimayaWurm.java b/Mage.Sets/src/mage/sets/magic2011/YavimayaWurm.java index ea2ab6b8728..1f715cb64e3 100644 --- a/Mage.Sets/src/mage/sets/magic2011/YavimayaWurm.java +++ b/Mage.Sets/src/mage/sets/magic2011/YavimayaWurm.java @@ -29,8 +29,8 @@ package mage.sets.magic2011; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2012/ActOfTreason.java b/Mage.Sets/src/mage/sets/magic2012/ActOfTreason.java index 8d4023850c3..02569f9a5d9 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ActOfTreason.java +++ b/Mage.Sets/src/mage/sets/magic2012/ActOfTreason.java @@ -28,7 +28,7 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/magic2012/AdaptiveAutomaton.java b/Mage.Sets/src/mage/sets/magic2012/AdaptiveAutomaton.java index c1dbff32c54..94e421db45a 100644 --- a/Mage.Sets/src/mage/sets/magic2012/AdaptiveAutomaton.java +++ b/Mage.Sets/src/mage/sets/magic2012/AdaptiveAutomaton.java @@ -27,10 +27,7 @@ */ package mage.sets.magic2012; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; @@ -64,9 +61,9 @@ public class AdaptiveAutomaton extends CardImpl { // As Adaptive Automaton enters the battlefield, choose a creature type. this.addAbility(new AsEntersBattlefieldAbility(new AdaptiveAutomatonEffect())); // Adaptive Automaton is the chosen type in addition to its other types. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new AdaptiveAutomatonAddSubtypeEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AdaptiveAutomatonAddSubtypeEffect())); // Other creatures you control of the chosen type get +1/+1. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new AdaptiveAutomatonBoostControlledEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AdaptiveAutomatonBoostControlledEffect())); } public AdaptiveAutomaton(final AdaptiveAutomaton card) { @@ -82,7 +79,7 @@ public class AdaptiveAutomaton extends CardImpl { class AdaptiveAutomatonEffect extends OneShotEffect { public AdaptiveAutomatonEffect() { - super(Constants.Outcome.BoostCreature); + super(Outcome.BoostCreature); staticText = "choose a creature type"; } @@ -98,7 +95,7 @@ class AdaptiveAutomatonEffect extends OneShotEffect { Choice typeChoice = new ChoiceImpl(true); typeChoice.setMessage("Choose creature type"); typeChoice.setChoices(CardRepository.instance.getCreatureTypes()); - while (!player.choose(Constants.Outcome.BoostCreature, typeChoice, game)) { + while (!player.choose(Outcome.BoostCreature, typeChoice, game)) { game.debugMessage("player canceled choosing type. retrying."); } game.informPlayers(permanent.getName() + ": " + player.getName() + " has chosen " + typeChoice.getChoice()); @@ -116,7 +113,7 @@ class AdaptiveAutomatonEffect extends OneShotEffect { class AdaptiveAutomatonAddSubtypeEffect extends ContinuousEffectImpl { public AdaptiveAutomatonAddSubtypeEffect() { - super(Duration.WhileOnBattlefield, Constants.Layer.TypeChangingEffects_4, Constants.SubLayer.NA, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Benefit); staticText = "{this} is the chosen type in addition to its other types"; } @@ -147,7 +144,7 @@ class AdaptiveAutomatonBoostControlledEffect extends ContinuousEffectImpl { this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Constants.Duration.EndOfTurn), new ManaCostsImpl("{1}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{W}")); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2012/AmphinCutthroat.java b/Mage.Sets/src/mage/sets/magic2012/AmphinCutthroat.java index b69a35129fe..2f26d8a8979 100644 --- a/Mage.Sets/src/mage/sets/magic2012/AmphinCutthroat.java +++ b/Mage.Sets/src/mage/sets/magic2012/AmphinCutthroat.java @@ -28,8 +28,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2012/AngelicDestiny.java b/Mage.Sets/src/mage/sets/magic2012/AngelicDestiny.java index c1fbf918871..28fda0c4d24 100644 --- a/Mage.Sets/src/mage/sets/magic2012/AngelicDestiny.java +++ b/Mage.Sets/src/mage/sets/magic2012/AngelicDestiny.java @@ -29,9 +29,7 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -62,14 +60,14 @@ public class AngelicDestiny extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(4, 4, Constants.Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), Constants.AttachmentType.AURA))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), Constants.AttachmentType.AURA))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new AddCardSubtypeAttachedEffect("Angel", Constants.Duration.WhileOnBattlefield, Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(4, 4, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AddCardSubtypeAttachedEffect("Angel", Duration.WhileOnBattlefield, AttachmentType.AURA))); this.addAbility(new DiesAttachedTriggeredAbility(new ReturnToHandSourceEffect(), "enchanted creature")); } diff --git a/Mage.Sets/src/mage/sets/magic2012/ArachnusSpinner.java b/Mage.Sets/src/mage/sets/magic2012/ArachnusSpinner.java index b8ad26dd5bf..763d8c6b581 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ArachnusSpinner.java +++ b/Mage.Sets/src/mage/sets/magic2012/ArachnusSpinner.java @@ -28,10 +28,10 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/magic2012/ArachnusWeb.java b/Mage.Sets/src/mage/sets/magic2012/ArachnusWeb.java index 0e2504ee52f..9aacb16ffe3 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ArachnusWeb.java +++ b/Mage.Sets/src/mage/sets/magic2012/ArachnusWeb.java @@ -28,10 +28,10 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/magic2012/ArbalestElite.java b/Mage.Sets/src/mage/sets/magic2012/ArbalestElite.java index 3879e4f69bf..46ea3b7f36f 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ArbalestElite.java +++ b/Mage.Sets/src/mage/sets/magic2012/ArbalestElite.java @@ -29,9 +29,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.SkipNextUntapSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetAttackingOrBlockingCreature; /** @@ -59,7 +59,7 @@ public class ArbalestElite extends CardImpl { this.toughness = new MageInt(3); // {2}{W}, {tap}: Arbalest Elite deals 3 damage to target attacking or blocking creature. Arbalest Elite doesn't untap during your next untap step. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(3), new ManaCostsImpl("{2}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new ManaCostsImpl("{2}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); ability.addEffect(new SkipNextUntapSourceEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2012/ArmoredWarhorse.java b/Mage.Sets/src/mage/sets/magic2012/ArmoredWarhorse.java index 8ab70612d77..f5d6387b49f 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ArmoredWarhorse.java +++ b/Mage.Sets/src/mage/sets/magic2012/ArmoredWarhorse.java @@ -30,8 +30,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2012/Auramancer.java b/Mage.Sets/src/mage/sets/magic2012/Auramancer.java index de4664f7657..e9c84201171 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Auramancer.java +++ b/Mage.Sets/src/mage/sets/magic2012/Auramancer.java @@ -30,8 +30,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2012/AvenFleetwing.java b/Mage.Sets/src/mage/sets/magic2012/AvenFleetwing.java index 10a267b7c82..c1fad782557 100644 --- a/Mage.Sets/src/mage/sets/magic2012/AvenFleetwing.java +++ b/Mage.Sets/src/mage/sets/magic2012/AvenFleetwing.java @@ -30,8 +30,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HexproofAbility; diff --git a/Mage.Sets/src/mage/sets/magic2012/AzureMage.java b/Mage.Sets/src/mage/sets/magic2012/AzureMage.java index 6e2e7182c73..c6d6aac42ef 100644 --- a/Mage.Sets/src/mage/sets/magic2012/AzureMage.java +++ b/Mage.Sets/src/mage/sets/magic2012/AzureMage.java @@ -30,14 +30,14 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @author Loki @@ -52,7 +52,7 @@ public class AzureMage extends CardImpl { this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new ManaCostsImpl("{3}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new ManaCostsImpl("{3}{U}"))); } public AzureMage(final AzureMage card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/BenalishVeteran.java b/Mage.Sets/src/mage/sets/magic2012/BenalishVeteran.java index 911a9cd7a38..09068da8781 100644 --- a/Mage.Sets/src/mage/sets/magic2012/BenalishVeteran.java +++ b/Mage.Sets/src/mage/sets/magic2012/BenalishVeteran.java @@ -30,13 +30,13 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @author Loki @@ -51,7 +51,7 @@ public class BenalishVeteran extends CardImpl { this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(1, 1, Constants.Duration.EndOfTurn), false)); + this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), false)); } public BenalishVeteran(final BenalishVeteran card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/BloodOgre.java b/Mage.Sets/src/mage/sets/magic2012/BloodOgre.java index ef468a88079..be86a2bc17c 100644 --- a/Mage.Sets/src/mage/sets/magic2012/BloodOgre.java +++ b/Mage.Sets/src/mage/sets/magic2012/BloodOgre.java @@ -28,8 +28,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.BloodthirstAbility; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/magic2012/BloodlordOfVaasgoth.java b/Mage.Sets/src/mage/sets/magic2012/BloodlordOfVaasgoth.java index 383fc30ca00..7780fcd421c 100644 --- a/Mage.Sets/src/mage/sets/magic2012/BloodlordOfVaasgoth.java +++ b/Mage.Sets/src/mage/sets/magic2012/BloodlordOfVaasgoth.java @@ -28,9 +28,9 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastTriggeredAbility; @@ -38,6 +38,10 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.keyword.BloodthirstAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -91,7 +95,7 @@ class BloodlordOfVaasgothEffect extends ContinuousEffectImpl { private Ability ability = new BloodthirstAbility(3); public BloodlordOfVaasgothEffect() { - super(Constants.Duration.OneUse, Constants.Layer.AbilityAddingRemovingEffects_6, Constants.SubLayer.NA, Constants.Outcome.AddAbility); + super(Duration.OneUse, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility); staticText = "it gains bloodthirst 3"; } diff --git a/Mage.Sets/src/mage/sets/magic2012/BloodrageVampire.java b/Mage.Sets/src/mage/sets/magic2012/BloodrageVampire.java index a1379eabd54..2abbeb1c25c 100644 --- a/Mage.Sets/src/mage/sets/magic2012/BloodrageVampire.java +++ b/Mage.Sets/src/mage/sets/magic2012/BloodrageVampire.java @@ -28,8 +28,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.BloodthirstAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2012/BonebreakerGiant.java b/Mage.Sets/src/mage/sets/magic2012/BonebreakerGiant.java index 2e759f1c9a8..b8d6374ef6b 100644 --- a/Mage.Sets/src/mage/sets/magic2012/BonebreakerGiant.java +++ b/Mage.Sets/src/mage/sets/magic2012/BonebreakerGiant.java @@ -30,8 +30,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2012/BountifulHarvest.java b/Mage.Sets/src/mage/sets/magic2012/BountifulHarvest.java index 5112a5da7eb..8e4ecaa1290 100644 --- a/Mage.Sets/src/mage/sets/magic2012/BountifulHarvest.java +++ b/Mage.Sets/src/mage/sets/magic2012/BountifulHarvest.java @@ -29,8 +29,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2012/BuriedRuin.java b/Mage.Sets/src/mage/sets/magic2012/BuriedRuin.java index 58b5ae004e6..fd57c32ea2c 100644 --- a/Mage.Sets/src/mage/sets/magic2012/BuriedRuin.java +++ b/Mage.Sets/src/mage/sets/magic2012/BuriedRuin.java @@ -30,9 +30,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -41,6 +40,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterArtifactCard; import mage.target.common.TargetCardInYourGraveyard; @@ -53,7 +53,7 @@ public class BuriedRuin extends CardImpl { super(ownerId, 224, "Buried Ruin", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, ""); this.expansionSetCode = "M12"; this.addAbility(new ColorlessManaAbility()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(new FilterArtifactCard("artifact card from your graveyard"))); diff --git a/Mage.Sets/src/mage/sets/magic2012/CallToTheGrave.java b/Mage.Sets/src/mage/sets/magic2012/CallToTheGrave.java index 9a3755b7181..6e9bfd4fcf4 100644 --- a/Mage.Sets/src/mage/sets/magic2012/CallToTheGrave.java +++ b/Mage.Sets/src/mage/sets/magic2012/CallToTheGrave.java @@ -29,9 +29,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -41,6 +40,7 @@ import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.SacrificeEffect; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -66,7 +66,7 @@ public class CallToTheGrave extends CardImpl { this.color.setBlack(true); // At the beginning of each player's upkeep, that player sacrifices a non-Zombie creature. - Ability ability = new BeginningOfUpkeepTriggeredAbility(new SacrificeEffect(filter, 1, "that player "), Constants.TargetController.ANY, false); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new SacrificeEffect(filter, 1, "that player "), TargetController.ANY, false); this.addAbility(ability); // At the beginning of the end step, if no creatures are on the battlefield, sacrifice Call to the Grave. TriggeredAbility triggered = new OnEventTriggeredAbility(GameEvent.EventType.END_TURN_STEP_PRE, "beginning of the end step", true, new SacrificeSourceEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2012/CarnageWurm.java b/Mage.Sets/src/mage/sets/magic2012/CarnageWurm.java index 96d1b0fb8f4..bc5c25e8922 100644 --- a/Mage.Sets/src/mage/sets/magic2012/CarnageWurm.java +++ b/Mage.Sets/src/mage/sets/magic2012/CarnageWurm.java @@ -28,8 +28,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.BloodthirstAbility; import mage.abilities.keyword.TrampleAbility; diff --git a/Mage.Sets/src/mage/sets/magic2012/CemeteryReaper.java b/Mage.Sets/src/mage/sets/magic2012/CemeteryReaper.java index b6c094b251a..be7d59c217b 100644 --- a/Mage.Sets/src/mage/sets/magic2012/CemeteryReaper.java +++ b/Mage.Sets/src/mage/sets/magic2012/CemeteryReaper.java @@ -30,9 +30,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -66,8 +67,8 @@ public class CemeteryReaper extends CardImpl { this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Constants.Duration.WhileOnBattlefield, filter, true))); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl("{2}{B}")); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl("{2}{B}")); ability.addCost(new TapSourceCost()); ability.addEffect(new CreateTokenEffect(new ZombieToken())); ability.addTarget(new TargetCardInGraveyard(new FilterCreatureCard("creature card from a graveyard"))); diff --git a/Mage.Sets/src/mage/sets/magic2012/ChandraTheFirebrand.java b/Mage.Sets/src/mage/sets/magic2012/ChandraTheFirebrand.java index 8dc8985f5de..c20de813592 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ChandraTheFirebrand.java +++ b/Mage.Sets/src/mage/sets/magic2012/ChandraTheFirebrand.java @@ -29,9 +29,9 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.LoyaltyAbility; import mage.abilities.common.EntersBattlefieldAbility; @@ -45,7 +45,6 @@ import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.stack.Spell; -import mage.target.Target; import mage.target.common.TargetCreatureOrPlayer; import mage.target.targetpointer.FixedTarget; diff --git a/Mage.Sets/src/mage/sets/magic2012/ChandrasPhoenix.java b/Mage.Sets/src/mage/sets/magic2012/ChandrasPhoenix.java index c6dddf0386a..d24885b5f0c 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ChandrasPhoenix.java +++ b/Mage.Sets/src/mage/sets/magic2012/ChandrasPhoenix.java @@ -29,9 +29,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.ReturnToHandSourceEffect; @@ -39,6 +38,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -74,7 +74,7 @@ public class ChandrasPhoenix extends CardImpl { class ChandrasPhoenixTriggeredAbility extends TriggeredAbilityImpl { ChandrasPhoenixTriggeredAbility() { - super(Constants.Zone.GRAVEYARD, new ReturnToHandSourceEffect()); + super(Zone.GRAVEYARD, new ReturnToHandSourceEffect()); } ChandrasPhoenixTriggeredAbility(final ChandrasPhoenixTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/magic2012/ChasmDrake.java b/Mage.Sets/src/mage/sets/magic2012/ChasmDrake.java index 3e807e451e2..66d319e411f 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ChasmDrake.java +++ b/Mage.Sets/src/mage/sets/magic2012/ChasmDrake.java @@ -30,15 +30,15 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -54,7 +54,7 @@ public class ChasmDrake extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new AttacksTriggeredAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn), false); + Ability ability = new AttacksTriggeredAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), false); ability.addTarget(new TargetControlledCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2012/CircleOfFlame.java b/Mage.Sets/src/mage/sets/magic2012/CircleOfFlame.java index 14c161ad331..0c0eb28af1e 100644 --- a/Mage.Sets/src/mage/sets/magic2012/CircleOfFlame.java +++ b/Mage.Sets/src/mage/sets/magic2012/CircleOfFlame.java @@ -29,14 +29,14 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -71,7 +71,7 @@ public class CircleOfFlame extends CardImpl { class CircleOfFlameTriggeredAbility extends TriggeredAbilityImpl { public CircleOfFlameTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1)); + super(Zone.BATTLEFIELD, new DamageTargetEffect(1)); } public CircleOfFlameTriggeredAbility(final CircleOfFlameTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/magic2012/CrimsonMage.java b/Mage.Sets/src/mage/sets/magic2012/CrimsonMage.java index 96298e03470..7c2b7de902f 100644 --- a/Mage.Sets/src/mage/sets/magic2012/CrimsonMage.java +++ b/Mage.Sets/src/mage/sets/magic2012/CrimsonMage.java @@ -30,9 +30,7 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -55,7 +53,7 @@ public class CrimsonMage extends CardImpl { this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2012/CrownOfEmpires.java b/Mage.Sets/src/mage/sets/magic2012/CrownOfEmpires.java index 45fbd16f649..2654c83b520 100644 --- a/Mage.Sets/src/mage/sets/magic2012/CrownOfEmpires.java +++ b/Mage.Sets/src/mage/sets/magic2012/CrownOfEmpires.java @@ -27,9 +27,7 @@ */ package mage.sets.magic2012; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.SimpleActivatedAbility; @@ -56,7 +54,7 @@ public class CrownOfEmpires extends CardImpl { this.expansionSetCode = "M12"; // {3}, {tap}: Tap target creature. Gain control of that creature instead if you control artifacts named Scepter of Empires and Throne of Empires. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CrownOfEmpiresEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CrownOfEmpiresEffect(), new GenericManaCost(3)); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); this.addAbility(ability); @@ -75,7 +73,7 @@ public class CrownOfEmpires extends CardImpl { class CrownOfEmpiresEffect extends OneShotEffect { public CrownOfEmpiresEffect() { - super(Constants.Outcome.Tap); + super(Outcome.Tap); staticText = "Tap target creature. Gain control of that creature instead if you control artifacts named Scepter of Empires and Throne of Empires"; } @@ -116,7 +114,7 @@ class CrownOfEmpiresEffect extends OneShotEffect { class CrownOfEmpiresControlEffect extends ContinuousEffectImpl { public CrownOfEmpiresControlEffect() { - super(Constants.Duration.EndOfGame, Constants.Layer.ControlChangingEffects_2, Constants.SubLayer.NA, Constants.Outcome.GainControl); + super(Duration.EndOfGame, Layer.ControlChangingEffects_2, SubLayer.NA, Outcome.GainControl); } public CrownOfEmpiresControlEffect(final CrownOfEmpiresControlEffect effect) { diff --git a/Mage.Sets/src/mage/sets/magic2012/CrumblingColossus.java b/Mage.Sets/src/mage/sets/magic2012/CrumblingColossus.java index ac1d18561e1..7eea4a1c30c 100644 --- a/Mage.Sets/src/mage/sets/magic2012/CrumblingColossus.java +++ b/Mage.Sets/src/mage/sets/magic2012/CrumblingColossus.java @@ -27,8 +27,8 @@ */ package mage.sets.magic2012; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2012/DarkFavor.java b/Mage.Sets/src/mage/sets/magic2012/DarkFavor.java index b124eabd007..3f3ed14a027 100644 --- a/Mage.Sets/src/mage/sets/magic2012/DarkFavor.java +++ b/Mage.Sets/src/mage/sets/magic2012/DarkFavor.java @@ -30,9 +30,7 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -56,11 +54,11 @@ public class DarkFavor extends CardImpl { this.color.setBlack(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); this.addAbility(new EntersBattlefieldTriggeredAbility(new LoseLifeSourceEffect(1), false)); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 1, Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 1, Duration.WhileOnBattlefield))); } public DarkFavor(final DarkFavor card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/DevouringSwarm.java b/Mage.Sets/src/mage/sets/magic2012/DevouringSwarm.java index 99e20de511f..03d13331a62 100644 --- a/Mage.Sets/src/mage/sets/magic2012/DevouringSwarm.java +++ b/Mage.Sets/src/mage/sets/magic2012/DevouringSwarm.java @@ -30,15 +30,16 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -54,7 +55,7 @@ public class DevouringSwarm extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Constants.Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); } public DevouringSwarm(final DevouringSwarm card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/Divination.java b/Mage.Sets/src/mage/sets/magic2012/Divination.java index 862c2468ac2..0c062235948 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Divination.java +++ b/Mage.Sets/src/mage/sets/magic2012/Divination.java @@ -29,8 +29,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2012/DivineFavor.java b/Mage.Sets/src/mage/sets/magic2012/DivineFavor.java index c9c30735c04..cd6aaeb51e4 100644 --- a/Mage.Sets/src/mage/sets/magic2012/DivineFavor.java +++ b/Mage.Sets/src/mage/sets/magic2012/DivineFavor.java @@ -30,9 +30,7 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -56,11 +54,11 @@ public class DivineFavor extends CardImpl { this.color.setWhite(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(3), false)); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 3, Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 3, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/sets/magic2012/DoublingChant.java b/Mage.Sets/src/mage/sets/magic2012/DoublingChant.java index ae0bd649d2f..e5be04ad328 100644 --- a/Mage.Sets/src/mage/sets/magic2012/DoublingChant.java +++ b/Mage.Sets/src/mage/sets/magic2012/DoublingChant.java @@ -27,10 +27,10 @@ */ package mage.sets.magic2012; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/magic2012/DriftingShade.java b/Mage.Sets/src/mage/sets/magic2012/DriftingShade.java index d7cb99ee958..3851bb0c5ae 100644 --- a/Mage.Sets/src/mage/sets/magic2012/DriftingShade.java +++ b/Mage.Sets/src/mage/sets/magic2012/DriftingShade.java @@ -30,9 +30,7 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -53,7 +51,7 @@ public class DriftingShade extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.B))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B))); } public DriftingShade(final DriftingShade card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/DruidicSatchel.java b/Mage.Sets/src/mage/sets/magic2012/DruidicSatchel.java index a7131751764..9d003092e8a 100644 --- a/Mage.Sets/src/mage/sets/magic2012/DruidicSatchel.java +++ b/Mage.Sets/src/mage/sets/magic2012/DruidicSatchel.java @@ -28,10 +28,10 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/magic2012/DungroveElder.java b/Mage.Sets/src/mage/sets/magic2012/DungroveElder.java index c2dc0f75456..8a554c051f1 100644 --- a/Mage.Sets/src/mage/sets/magic2012/DungroveElder.java +++ b/Mage.Sets/src/mage/sets/magic2012/DungroveElder.java @@ -30,10 +30,10 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; diff --git a/Mage.Sets/src/mage/sets/magic2012/DuskhunterBat.java b/Mage.Sets/src/mage/sets/magic2012/DuskhunterBat.java index da0534ec77e..e5ffb8d1280 100644 --- a/Mage.Sets/src/mage/sets/magic2012/DuskhunterBat.java +++ b/Mage.Sets/src/mage/sets/magic2012/DuskhunterBat.java @@ -28,8 +28,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.BloodthirstAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/magic2012/Firebreathing.java b/Mage.Sets/src/mage/sets/magic2012/Firebreathing.java index c74385a3b85..a95cb3e3a80 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Firebreathing.java +++ b/Mage.Sets/src/mage/sets/magic2012/Firebreathing.java @@ -30,9 +30,7 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -56,10 +54,10 @@ public class Firebreathing extends CardImpl { this.color.setRed(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); } public Firebreathing (final Firebreathing card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/Flight.java b/Mage.Sets/src/mage/sets/magic2012/Flight.java index 38458e7cb49..f9f627d4254 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Flight.java +++ b/Mage.Sets/src/mage/sets/magic2012/Flight.java @@ -30,9 +30,7 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -56,10 +54,10 @@ public class Flight extends CardImpl { this.color.setBlue(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); } public Flight (final Flight card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/FrostBreath.java b/Mage.Sets/src/mage/sets/magic2012/FrostBreath.java index e415cd0e79c..25f24d12d4b 100644 --- a/Mage.Sets/src/mage/sets/magic2012/FrostBreath.java +++ b/Mage.Sets/src/mage/sets/magic2012/FrostBreath.java @@ -28,8 +28,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.SkipNextUntapTargetEffect; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2012/FurybornHellkite.java b/Mage.Sets/src/mage/sets/magic2012/FurybornHellkite.java index 89b038e4328..92408eab056 100644 --- a/Mage.Sets/src/mage/sets/magic2012/FurybornHellkite.java +++ b/Mage.Sets/src/mage/sets/magic2012/FurybornHellkite.java @@ -28,8 +28,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.BloodthirstAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/magic2012/GarrukPrimalHunter.java b/Mage.Sets/src/mage/sets/magic2012/GarrukPrimalHunter.java index d28b30894e1..8794f50c92f 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GarrukPrimalHunter.java +++ b/Mage.Sets/src/mage/sets/magic2012/GarrukPrimalHunter.java @@ -30,9 +30,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.EntersBattlefieldAbility; @@ -41,6 +40,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledLandPermanent; @@ -90,7 +90,7 @@ public class GarrukPrimalHunter extends CardImpl { class GarrukPrimalHunterEffect extends OneShotEffect { GarrukPrimalHunterEffect() { - super(Constants.Outcome.DrawCard); + super(Outcome.DrawCard); staticText = "Draw cards equal to the greatest power among creatures you control"; } diff --git a/Mage.Sets/src/mage/sets/magic2012/GarruksHorde.java b/Mage.Sets/src/mage/sets/magic2012/GarruksHorde.java index c1806bdce25..5a51ae03a8e 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GarruksHorde.java +++ b/Mage.Sets/src/mage/sets/magic2012/GarruksHorde.java @@ -27,15 +27,15 @@ */ package mage.sets.magic2012; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.PlayTheTopCardEffect; import mage.abilities.effects.common.continious.PlayWithTheTopCardRevealedEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import java.util.UUID; @@ -56,9 +56,9 @@ public class GarruksHorde extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Play with the top card of your library revealed. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new PlayWithTheTopCardRevealedEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithTheTopCardRevealedEffect())); // You may cast the top card of your library if it's a creature card. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new PlayTheTopCardEffect(new FilterCreatureCard()))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayTheTopCardEffect(new FilterCreatureCard()))); } public GarruksHorde(final GarruksHorde card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/GideonsAvenger.java b/Mage.Sets/src/mage/sets/magic2012/GideonsAvenger.java index d953b14916e..a5de836b851 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GideonsAvenger.java +++ b/Mage.Sets/src/mage/sets/magic2012/GideonsAvenger.java @@ -29,13 +29,13 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; @@ -71,7 +71,7 @@ public class GideonsAvenger extends CardImpl { class GideonsAvengerTriggeredAbility extends TriggeredAbilityImpl { GideonsAvengerTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance())); + super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance())); } GideonsAvengerTriggeredAbility(final GideonsAvengerTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/magic2012/GideonsLawkeeper.java b/Mage.Sets/src/mage/sets/magic2012/GideonsLawkeeper.java index 44d270102af..8a971f4f3b1 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GideonsLawkeeper.java +++ b/Mage.Sets/src/mage/sets/magic2012/GideonsLawkeeper.java @@ -30,9 +30,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -55,7 +56,7 @@ public class GideonsLawkeeper extends CardImpl { this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/magic2012/GladecoverScout.java b/Mage.Sets/src/mage/sets/magic2012/GladecoverScout.java index bd20bde10c4..45c84ca8830 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GladecoverScout.java +++ b/Mage.Sets/src/mage/sets/magic2012/GladecoverScout.java @@ -30,8 +30,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2012/GoblinBangchuckers.java b/Mage.Sets/src/mage/sets/magic2012/GoblinBangchuckers.java index d7dd3d96ccc..18dc0dd7ac8 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GoblinBangchuckers.java +++ b/Mage.Sets/src/mage/sets/magic2012/GoblinBangchuckers.java @@ -29,15 +29,16 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -60,7 +61,7 @@ public class GoblinBangchuckers extends CardImpl { this.toughness = new MageInt(2); // {tap}: Flip a coin. If you win the flip, Goblin Bangchuckers deals 2 damage to target creature or player. If you lose the flip, Goblin Bangchuckers deals 2 damage to itself. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GoblinBangchuckersEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GoblinBangchuckersEffect(), new TapSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } @@ -78,7 +79,7 @@ public class GoblinBangchuckers extends CardImpl { class GoblinBangchuckersEffect extends OneShotEffect { public GoblinBangchuckersEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "{tap}: Flip a coin. If you win the flip, Goblin Bangchuckers deals 2 damage to target creature or player. If you lose the flip, Goblin Bangchuckers deals 2 damage to itself"; } diff --git a/Mage.Sets/src/mage/sets/magic2012/GoblinFireslinger.java b/Mage.Sets/src/mage/sets/magic2012/GoblinFireslinger.java index 60bf667a562..84b9525555a 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GoblinFireslinger.java +++ b/Mage.Sets/src/mage/sets/magic2012/GoblinFireslinger.java @@ -30,15 +30,15 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetPlayer; /** @@ -54,7 +54,7 @@ public class GoblinFireslinger extends CardImpl { this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2012/GoblinGrenade.java b/Mage.Sets/src/mage/sets/magic2012/GoblinGrenade.java index 08c94dc3acd..4e613d3d688 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GoblinGrenade.java +++ b/Mage.Sets/src/mage/sets/magic2012/GoblinGrenade.java @@ -30,8 +30,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2012/GorehornMinotaurs.java b/Mage.Sets/src/mage/sets/magic2012/GorehornMinotaurs.java index 62697f8879a..5058cf9abf1 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GorehornMinotaurs.java +++ b/Mage.Sets/src/mage/sets/magic2012/GorehornMinotaurs.java @@ -28,8 +28,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.BloodthirstAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2012/GrandAbolisher.java b/Mage.Sets/src/mage/sets/magic2012/GrandAbolisher.java index 5fcbc67f367..9ac7b4a8968 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GrandAbolisher.java +++ b/Mage.Sets/src/mage/sets/magic2012/GrandAbolisher.java @@ -27,16 +27,17 @@ */ package mage.sets.magic2012; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Outcome; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -75,7 +76,7 @@ public class GrandAbolisher extends CardImpl { class GrandAbolisherEffect extends ReplacementEffectImpl { public GrandAbolisherEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); } public GrandAbolisherEffect(final GrandAbolisherEffect effect) { diff --git a/Mage.Sets/src/mage/sets/magic2012/Greatsword.java b/Mage.Sets/src/mage/sets/magic2012/Greatsword.java index 827a8bdf29b..f66ea30317e 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Greatsword.java +++ b/Mage.Sets/src/mage/sets/magic2012/Greatsword.java @@ -30,14 +30,15 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; /** * @author Loki @@ -48,8 +49,8 @@ public class Greatsword extends CardImpl { super(ownerId, 209, "Greatsword", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "M12"; this.subtype.add("Equipment"); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(3, 0))); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(3))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 0))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3))); } public Greatsword(final Greatsword card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/GriffinRider.java b/Mage.Sets/src/mage/sets/magic2012/GriffinRider.java index 1fb6b719bf0..6eea7de8045 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GriffinRider.java +++ b/Mage.Sets/src/mage/sets/magic2012/GriffinRider.java @@ -28,10 +28,10 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.ControlsPermanentCondition; @@ -40,6 +40,7 @@ import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -70,9 +71,9 @@ public class GriffinRider extends CardImpl { // As long as you control a Griffin creature, Griffin Rider gets +3/+3 and has flying. ConditionalContinousEffect effect1 = new ConditionalContinousEffect(new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), new ControlsPermanentCondition(filterGriffinCard), rule1); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect1)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect1)); ConditionalContinousEffect effect2 = new ConditionalContinousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), new ControlsPermanentCondition(filterGriffinCard), rule2); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect2)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect2)); } public GriffinRider(final GriffinRider card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/GrimLavamancer.java b/Mage.Sets/src/mage/sets/magic2012/GrimLavamancer.java index 8b114ae9fb6..0855d805f9d 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GrimLavamancer.java +++ b/Mage.Sets/src/mage/sets/magic2012/GrimLavamancer.java @@ -29,9 +29,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetCreatureOrPlayer; @@ -60,7 +61,7 @@ public class GrimLavamancer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(2), new ColoredManaCost(Constants.ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new TapSourceCost()); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(2, new FilterCard("cards from your graveyard")))); ability.addTarget(new TargetCreatureOrPlayer()); diff --git a/Mage.Sets/src/mage/sets/magic2012/GuardiansPledge.java b/Mage.Sets/src/mage/sets/magic2012/GuardiansPledge.java index 0ac22907ac7..ee6603ad030 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GuardiansPledge.java +++ b/Mage.Sets/src/mage/sets/magic2012/GuardiansPledge.java @@ -30,12 +30,12 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; @@ -55,7 +55,7 @@ public class GuardiansPledge extends CardImpl { super(ownerId, 22, "Guardians' Pledge", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}{W}"); this.expansionSetCode = "M12"; this.color.setWhite(true); - this.getSpellAbility().addEffect(new BoostControlledEffect(2, 2, Constants.Duration.EndOfTurn, filter, false)); + this.getSpellAbility().addEffect(new BoostControlledEffect(2, 2, Duration.EndOfTurn, filter, false)); } public GuardiansPledge (final GuardiansPledge card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/HideousVisage.java b/Mage.Sets/src/mage/sets/magic2012/HideousVisage.java index 5bb58fb5e0a..d50ca6b9197 100644 --- a/Mage.Sets/src/mage/sets/magic2012/HideousVisage.java +++ b/Mage.Sets/src/mage/sets/magic2012/HideousVisage.java @@ -27,12 +27,12 @@ */ package mage.sets.magic2012; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.IntimidateAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; import java.util.UUID; @@ -49,7 +49,7 @@ public class HideousVisage extends CardImpl { this.color.setBlack(true); - this.getSpellAbility().addEffect(new GainAbilityControlledEffect(IntimidateAbility.getInstance(), Constants.Duration.EndOfTurn, new FilterControlledCreaturePermanent("Creatures"))); + this.getSpellAbility().addEffect(new GainAbilityControlledEffect(IntimidateAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent("Creatures"))); } public HideousVisage(final HideousVisage card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/HuntersInsight.java b/Mage.Sets/src/mage/sets/magic2012/HuntersInsight.java index 1ea533907cb..81ea1c152ab 100644 --- a/Mage.Sets/src/mage/sets/magic2012/HuntersInsight.java +++ b/Mage.Sets/src/mage/sets/magic2012/HuntersInsight.java @@ -28,10 +28,10 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; diff --git a/Mage.Sets/src/mage/sets/magic2012/JaceMemoryAdept.java b/Mage.Sets/src/mage/sets/magic2012/JaceMemoryAdept.java index 4397d474c37..2c471b695a3 100644 --- a/Mage.Sets/src/mage/sets/magic2012/JaceMemoryAdept.java +++ b/Mage.Sets/src/mage/sets/magic2012/JaceMemoryAdept.java @@ -27,8 +27,8 @@ */ package mage.sets.magic2012; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.Mode; diff --git a/Mage.Sets/src/mage/sets/magic2012/JacesArchivist.java b/Mage.Sets/src/mage/sets/magic2012/JacesArchivist.java index 5cff013c110..5c8c50e0be7 100644 --- a/Mage.Sets/src/mage/sets/magic2012/JacesArchivist.java +++ b/Mage.Sets/src/mage/sets/magic2012/JacesArchivist.java @@ -27,9 +27,7 @@ */ package mage.sets.magic2012; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -58,7 +56,7 @@ public class JacesArchivist extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new JacesArchivistEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.U)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new JacesArchivistEffect(), new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } @@ -75,7 +73,7 @@ public class JacesArchivist extends CardImpl { class JacesArchivistEffect extends OneShotEffect { JacesArchivistEffect() { - super(Constants.Outcome.Discard); + super(Outcome.Discard); staticText = "Each player discards his or her hand, then draws cards equal to the greatest number of cards a player discarded this way"; } diff --git a/Mage.Sets/src/mage/sets/magic2012/JadeMage.java b/Mage.Sets/src/mage/sets/magic2012/JadeMage.java index 19471a08e9c..918a0b1fd38 100644 --- a/Mage.Sets/src/mage/sets/magic2012/JadeMage.java +++ b/Mage.Sets/src/mage/sets/magic2012/JadeMage.java @@ -30,14 +30,14 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.permanent.token.SaprolingToken; /** @@ -53,7 +53,7 @@ public class JadeMage extends CardImpl { this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl("{2}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl("{2}{G}"))); } public JadeMage(final JadeMage card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/KiteShield.java b/Mage.Sets/src/mage/sets/magic2012/KiteShield.java index c91a103dee1..5f14eb91a53 100644 --- a/Mage.Sets/src/mage/sets/magic2012/KiteShield.java +++ b/Mage.Sets/src/mage/sets/magic2012/KiteShield.java @@ -30,14 +30,15 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; /** * @@ -49,8 +50,8 @@ public class KiteShield extends CardImpl { super(ownerId, 210, "Kite Shield", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{0}"); this.expansionSetCode = "M12"; this.subtype.add("Equipment"); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(0, 3))); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(3))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(0, 3))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3))); } diff --git a/Mage.Sets/src/mage/sets/magic2012/Levitation.java b/Mage.Sets/src/mage/sets/magic2012/Levitation.java index 4dcdb7dfd3e..6d4241621c0 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Levitation.java +++ b/Mage.Sets/src/mage/sets/magic2012/Levitation.java @@ -30,13 +30,14 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -56,7 +57,7 @@ public class Levitation extends CardImpl { super(ownerId, 61, "Levitation", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}{U}"); this.expansionSetCode = "M12"; this.color.setBlue(true); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityControlledEffect(FlyingAbility.getInstance(), Constants.Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); } public Levitation (final Levitation card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/Lifelink.java b/Mage.Sets/src/mage/sets/magic2012/Lifelink.java index 5a1c3788a90..e40521b6554 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Lifelink.java +++ b/Mage.Sets/src/mage/sets/magic2012/Lifelink.java @@ -30,9 +30,7 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -56,10 +54,10 @@ public class Lifelink extends CardImpl { this.color.setWhite(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA))); } public Lifelink (final Lifelink card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/LordOfTheUnreal.java b/Mage.Sets/src/mage/sets/magic2012/LordOfTheUnreal.java index 63af9bb939e..85fd7e77cef 100644 --- a/Mage.Sets/src/mage/sets/magic2012/LordOfTheUnreal.java +++ b/Mage.Sets/src/mage/sets/magic2012/LordOfTheUnreal.java @@ -30,9 +30,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +39,8 @@ import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -62,8 +63,8 @@ public class LordOfTheUnreal extends CardImpl { this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Constants.Duration.WhileOnBattlefield, filter, false)); - ability.addEffect(new GainAbilityControlledEffect(HexproofAbility.getInstance(), Constants.Duration.WhileOnBattlefield, filter, false)); + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false)); + ability.addEffect(new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, filter, false)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2012/LurkingCrocodile.java b/Mage.Sets/src/mage/sets/magic2012/LurkingCrocodile.java index 2d7bb87d2eb..1fdffa9d13b 100644 --- a/Mage.Sets/src/mage/sets/magic2012/LurkingCrocodile.java +++ b/Mage.Sets/src/mage/sets/magic2012/LurkingCrocodile.java @@ -28,8 +28,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.BloodthirstAbility; import mage.abilities.keyword.IslandwalkAbility; diff --git a/Mage.Sets/src/mage/sets/magic2012/Manalith.java b/Mage.Sets/src/mage/sets/magic2012/Manalith.java index 27bcba10b1a..fa9061c38bd 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Manalith.java +++ b/Mage.Sets/src/mage/sets/magic2012/Manalith.java @@ -30,8 +30,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2012/MasterThief.java b/Mage.Sets/src/mage/sets/magic2012/MasterThief.java index 18b5d90496d..9507d191811 100644 --- a/Mage.Sets/src/mage/sets/magic2012/MasterThief.java +++ b/Mage.Sets/src/mage/sets/magic2012/MasterThief.java @@ -30,14 +30,14 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continious.GainControlTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; @@ -61,7 +61,7 @@ public class MasterThief extends CardImpl { this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new EntersBattlefieldTriggeredAbility(new GainControlTargetEffect(Constants.Duration.WhileOnBattlefield), false); + Ability ability = new EntersBattlefieldTriggeredAbility(new GainControlTargetEffect(Duration.WhileOnBattlefield), false); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2012/MerfolkLooter.java b/Mage.Sets/src/mage/sets/magic2012/MerfolkLooter.java index d2380cd7cc1..d61a9ce3be8 100644 --- a/Mage.Sets/src/mage/sets/magic2012/MerfolkLooter.java +++ b/Mage.Sets/src/mage/sets/magic2012/MerfolkLooter.java @@ -30,14 +30,14 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DrawDiscardControllerEffect; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @author Loki @@ -52,7 +52,7 @@ public class MerfolkLooter extends CardImpl { this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new TapSourceCost())); } public MerfolkLooter(final MerfolkLooter card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/MerfolkMesmerist.java b/Mage.Sets/src/mage/sets/magic2012/MerfolkMesmerist.java index fe35e3b1de0..e81970877fe 100644 --- a/Mage.Sets/src/mage/sets/magic2012/MerfolkMesmerist.java +++ b/Mage.Sets/src/mage/sets/magic2012/MerfolkMesmerist.java @@ -30,9 +30,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.target.TargetPlayer; /** @@ -55,7 +56,7 @@ public class MerfolkMesmerist extends CardImpl { this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(2), new ColoredManaCost(Constants.ColoredManaSymbol.U)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(2), new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/magic2012/MindUnbound.java b/Mage.Sets/src/mage/sets/magic2012/MindUnbound.java index 5474267d8c4..5701a747d7a 100644 --- a/Mage.Sets/src/mage/sets/magic2012/MindUnbound.java +++ b/Mage.Sets/src/mage/sets/magic2012/MindUnbound.java @@ -29,15 +29,15 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.dynamicvalue.common.CountersCount; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.counters.CounterType; /** @@ -53,7 +53,7 @@ public class MindUnbound extends CardImpl { this.color.setBlue(true); // At the beginning of your upkeep, put a lore counter on Mind Unbound, then draw a card for each lore counter on Mind Unbound. - Ability ability = new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.LORE.createInstance()), Constants.TargetController.YOU, false); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.LORE.createInstance()), TargetController.YOU, false); ability.addEffect(new DrawCardControllerEffect(new CountersCount(CounterType.LORE))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2012/Monomania.java b/Mage.Sets/src/mage/sets/magic2012/Monomania.java index 2fc78148750..39ae92e7830 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Monomania.java +++ b/Mage.Sets/src/mage/sets/magic2012/Monomania.java @@ -27,13 +27,14 @@ */ package mage.sets.magic2012; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.game.Game; import mage.players.Player; @@ -74,7 +75,7 @@ class MonomaniaEffect extends OneShotEffect { private static final FilterCard filter = new FilterCard("a card"); public MonomaniaEffect() { - super(Constants.Outcome.Discard); + super(Outcome.Discard); staticText = "Target player chooses a card in his or her hand and discards the rest"; } @@ -86,9 +87,9 @@ class MonomaniaEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getFirstTarget()); if (player != null) { - TargetCard target = new TargetCard(Constants.Zone.PICK, filter); + TargetCard target = new TargetCard(Zone.PICK, filter); target.setRequired(true); - if (player.choose(Constants.Outcome.Detriment, player.getHand(), target, game)) { + if (player.choose(Outcome.Detriment, player.getHand(), target, game)) { while (player.getHand().size() > 1) { for (UUID uuid : player.getHand()) { if (!uuid.equals(target.getFirstTarget())) { diff --git a/Mage.Sets/src/mage/sets/magic2012/OblivionRing.java b/Mage.Sets/src/mage/sets/magic2012/OblivionRing.java index f2d5094b57f..4803cd84c82 100644 --- a/Mage.Sets/src/mage/sets/magic2012/OblivionRing.java +++ b/Mage.Sets/src/mage/sets/magic2012/OblivionRing.java @@ -28,7 +28,7 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/magic2012/OnyxMage.java b/Mage.Sets/src/mage/sets/magic2012/OnyxMage.java index cd776ec4a86..bc69eeccf39 100644 --- a/Mage.Sets/src/mage/sets/magic2012/OnyxMage.java +++ b/Mage.Sets/src/mage/sets/magic2012/OnyxMage.java @@ -30,9 +30,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -55,7 +56,7 @@ public class OnyxMage extends CardImpl { this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Constants.Duration.EndOfTurn), new ManaCostsImpl("{1}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{B}")); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2012/PeregrineGriffin.java b/Mage.Sets/src/mage/sets/magic2012/PeregrineGriffin.java index 70c1c782874..86db2a81ee1 100644 --- a/Mage.Sets/src/mage/sets/magic2012/PeregrineGriffin.java +++ b/Mage.Sets/src/mage/sets/magic2012/PeregrineGriffin.java @@ -30,8 +30,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/magic2012/PersonalSanctuary.java b/Mage.Sets/src/mage/sets/magic2012/PersonalSanctuary.java index e9232b61202..db06acdd9be 100644 --- a/Mage.Sets/src/mage/sets/magic2012/PersonalSanctuary.java +++ b/Mage.Sets/src/mage/sets/magic2012/PersonalSanctuary.java @@ -29,13 +29,14 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.PreventionEffectImpl; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -52,7 +53,7 @@ public class PersonalSanctuary extends CardImpl { this.color.setWhite(true); // During your turn, prevent all damage that would be dealt to you. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new PersonalSanctuaryEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PersonalSanctuaryEffect())); } public PersonalSanctuary(final PersonalSanctuary card) { @@ -68,7 +69,7 @@ public class PersonalSanctuary extends CardImpl { class PersonalSanctuaryEffect extends PreventionEffectImpl { public PersonalSanctuaryEffect() { - super(Constants.Duration.WhileOnBattlefield); + super(Duration.WhileOnBattlefield); staticText = "During your turn, prevent all damage that would be dealt to you"; } diff --git a/Mage.Sets/src/mage/sets/magic2012/PhantasmalBear.java b/Mage.Sets/src/mage/sets/magic2012/PhantasmalBear.java index d6783d34720..0816cc3663a 100644 --- a/Mage.Sets/src/mage/sets/magic2012/PhantasmalBear.java +++ b/Mage.Sets/src/mage/sets/magic2012/PhantasmalBear.java @@ -28,8 +28,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BecomesTargetTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; diff --git a/Mage.Sets/src/mage/sets/magic2012/PhantasmalDragon.java b/Mage.Sets/src/mage/sets/magic2012/PhantasmalDragon.java index a0e09c0d190..a0e438d584d 100644 --- a/Mage.Sets/src/mage/sets/magic2012/PhantasmalDragon.java +++ b/Mage.Sets/src/mage/sets/magic2012/PhantasmalDragon.java @@ -28,8 +28,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BecomesTargetTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; diff --git a/Mage.Sets/src/mage/sets/magic2012/PhantasmalImage.java b/Mage.Sets/src/mage/sets/magic2012/PhantasmalImage.java index 332a23446e4..e42dacb782c 100644 --- a/Mage.Sets/src/mage/sets/magic2012/PhantasmalImage.java +++ b/Mage.Sets/src/mage/sets/magic2012/PhantasmalImage.java @@ -28,10 +28,10 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BecomesTargetTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2012/PrideGuardian.java b/Mage.Sets/src/mage/sets/magic2012/PrideGuardian.java index 451dbe6c135..ec90b127abd 100644 --- a/Mage.Sets/src/mage/sets/magic2012/PrideGuardian.java +++ b/Mage.Sets/src/mage/sets/magic2012/PrideGuardian.java @@ -30,8 +30,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/magic2012/PrimordialHydra.java b/Mage.Sets/src/mage/sets/magic2012/PrimordialHydra.java index bd0a51bbcad..22462438b37 100644 --- a/Mage.Sets/src/mage/sets/magic2012/PrimordialHydra.java +++ b/Mage.Sets/src/mage/sets/magic2012/PrimordialHydra.java @@ -28,9 +28,7 @@ package mage.sets.magic2012; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -68,9 +66,9 @@ public class PrimordialHydra extends CardImpl { this.toughness = new MageInt(0); this.addAbility(new EntersBattlefieldAbility(new PrimordialHydraEntersEffect(), "{this} enters the battlefield with X +1/+1 counters on it")); - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new PrimordialHydraDoubleEffect(), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new PrimordialHydraDoubleEffect(), TargetController.YOU, false)); ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance()), new HasCounterCondition(CounterType.P1P1, 10), staticText); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } @@ -86,7 +84,7 @@ public class PrimordialHydra extends CardImpl { class PrimordialHydraEntersEffect extends OneShotEffect { public PrimordialHydraEntersEffect() { - super(Constants.Outcome.BoostCreature); + super(Outcome.BoostCreature); } public PrimordialHydraEntersEffect(final PrimordialHydraEntersEffect effect) { @@ -116,7 +114,7 @@ class PrimordialHydraEntersEffect extends OneShotEffect { PrimordialHydraDoubleEffect() { - super(Constants.Outcome.BoostCreature); + super(Outcome.BoostCreature); staticText = "double the number of +1/+1 counters on {this}"; } diff --git a/Mage.Sets/src/mage/sets/magic2012/QuicksilverAmulet.java b/Mage.Sets/src/mage/sets/magic2012/QuicksilverAmulet.java index 475881e58e1..9638d319ba7 100644 --- a/Mage.Sets/src/mage/sets/magic2012/QuicksilverAmulet.java +++ b/Mage.Sets/src/mage/sets/magic2012/QuicksilverAmulet.java @@ -27,9 +27,9 @@ */ package mage.sets.magic2012; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.effects.common.PutCreatureOnBattlefieldEffect; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/magic2012/Reclaim.java b/Mage.Sets/src/mage/sets/magic2012/Reclaim.java index 2bb8c71b2bc..4163c37116e 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Reclaim.java +++ b/Mage.Sets/src/mage/sets/magic2012/Reclaim.java @@ -30,8 +30,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCardInYourGraveyard; diff --git a/Mage.Sets/src/mage/sets/magic2012/RitesOfFlourishing.java b/Mage.Sets/src/mage/sets/magic2012/RitesOfFlourishing.java index 1f31fe0d56c..2423d40a4b1 100644 --- a/Mage.Sets/src/mage/sets/magic2012/RitesOfFlourishing.java +++ b/Mage.Sets/src/mage/sets/magic2012/RitesOfFlourishing.java @@ -28,9 +28,9 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.DrawCardTargetEffect; diff --git a/Mage.Sets/src/mage/sets/magic2012/RuneScarredDemon.java b/Mage.Sets/src/mage/sets/magic2012/RuneScarredDemon.java index 341a4f5a010..e8dc0f7ac39 100644 --- a/Mage.Sets/src/mage/sets/magic2012/RuneScarredDemon.java +++ b/Mage.Sets/src/mage/sets/magic2012/RuneScarredDemon.java @@ -29,8 +29,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2012/RustedSentinel.java b/Mage.Sets/src/mage/sets/magic2012/RustedSentinel.java index 5ee8adc3770..8f953af1b88 100644 --- a/Mage.Sets/src/mage/sets/magic2012/RustedSentinel.java +++ b/Mage.Sets/src/mage/sets/magic2012/RustedSentinel.java @@ -30,8 +30,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2012/ScepterOfEmpires.java b/Mage.Sets/src/mage/sets/magic2012/ScepterOfEmpires.java index 7549cb2cf57..8d9dfa98fc4 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ScepterOfEmpires.java +++ b/Mage.Sets/src/mage/sets/magic2012/ScepterOfEmpires.java @@ -27,15 +27,16 @@ */ package mage.sets.magic2012; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -53,7 +54,7 @@ public class ScepterOfEmpires extends CardImpl { this.expansionSetCode = "M12"; // {tap}: Scepter of Empires deals 1 damage to target player. It deals 3 damage to that player instead if you control artifacts named Crown of Empires and Throne of Empires. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ScepterOfEmpiresEffect(), new GenericManaCost(0)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScepterOfEmpiresEffect(), new GenericManaCost(0)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); @@ -72,7 +73,7 @@ public class ScepterOfEmpires extends CardImpl { class ScepterOfEmpiresEffect extends OneShotEffect { public ScepterOfEmpiresEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); staticText = "Scepter of Empires deals 1 damage to target player. It deals 3 damage to that player instead if you control artifacts named Crown of Empires and Throne of Empires"; } diff --git a/Mage.Sets/src/mage/sets/magic2012/Scrambleverse.java b/Mage.Sets/src/mage/sets/magic2012/Scrambleverse.java index 5a992066a9c..f86588ee645 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Scrambleverse.java +++ b/Mage.Sets/src/mage/sets/magic2012/Scrambleverse.java @@ -27,15 +27,18 @@ */ package mage.sets.magic2012; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.filter.common.FilterNonlandPermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -74,7 +77,7 @@ public class Scrambleverse extends CardImpl { class ScrambleverseEffect extends OneShotEffect { public ScrambleverseEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "For each nonland permanent, choose a player at random. Then each player gains control of each permanent for which he or she was chosen. Untap those permanents"; } @@ -109,7 +112,7 @@ class ScrambleverseControlEffect extends ContinuousEffectImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature gets +1/+1 and has protection from creatures. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Constants.Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new ProtectionAbility(new FilterCreatureCard("creatures")), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new ProtectionAbility(new FilterCreatureCard("creatures")), AttachmentType.AURA))); } public SpiritMantle(final SpiritMantle card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/StampedingRhino.java b/Mage.Sets/src/mage/sets/magic2012/StampedingRhino.java index 6bc7a8a7f5d..f82f9d78cac 100644 --- a/Mage.Sets/src/mage/sets/magic2012/StampedingRhino.java +++ b/Mage.Sets/src/mage/sets/magic2012/StampedingRhino.java @@ -30,8 +30,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2012/StaveOff.java b/Mage.Sets/src/mage/sets/magic2012/StaveOff.java index e755fb95a7b..71e733e3152 100644 --- a/Mage.Sets/src/mage/sets/magic2012/StaveOff.java +++ b/Mage.Sets/src/mage/sets/magic2012/StaveOff.java @@ -29,12 +29,12 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.GainProtectionFromColorTargetEffect; import mage.cards.CardImpl; import mage.choices.ChoiceColor; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -50,7 +50,7 @@ public class StaveOff extends CardImpl { this.color.setWhite(true); // Target creature gains protection from the color of your choice until end of turn. - this.getSpellAbility().addEffect(new GainProtectionFromColorTargetEffect(Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainProtectionFromColorTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addChoice(new ChoiceColor()); } diff --git a/Mage.Sets/src/mage/sets/magic2012/StingerflingSpider.java b/Mage.Sets/src/mage/sets/magic2012/StingerflingSpider.java index d1ff75b20cd..a9f5e490f9b 100644 --- a/Mage.Sets/src/mage/sets/magic2012/StingerflingSpider.java +++ b/Mage.Sets/src/mage/sets/magic2012/StingerflingSpider.java @@ -30,8 +30,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2012/StonehornDignitary.java b/Mage.Sets/src/mage/sets/magic2012/StonehornDignitary.java index 55767c38786..9ab2db78cba 100644 --- a/Mage.Sets/src/mage/sets/magic2012/StonehornDignitary.java +++ b/Mage.Sets/src/mage/sets/magic2012/StonehornDignitary.java @@ -29,14 +29,15 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.TurnPhase; import mage.game.Game; import mage.game.turn.TurnMod; import mage.target.Target; @@ -79,7 +80,7 @@ public class StonehornDignitary extends CardImpl { class SkipNextCombatEffect extends OneShotEffect { public SkipNextCombatEffect() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); staticText = "target opponent skips his or her next combat phase"; } @@ -91,7 +92,7 @@ class SkipNextCombatEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { UUID targetId = source.getFirstTarget(); if (targetId != null) { - game.getState().getTurnMods().add(new TurnMod(targetId, Constants.TurnPhase.COMBAT, null, true)); + game.getState().getTurnMods().add(new TurnMod(targetId, TurnPhase.COMBAT, null, true)); return true; } return false; diff --git a/Mage.Sets/src/mage/sets/magic2012/StormbloodBerserker.java b/Mage.Sets/src/mage/sets/magic2012/StormbloodBerserker.java index 52541235ba9..d5c644b962e 100644 --- a/Mage.Sets/src/mage/sets/magic2012/StormbloodBerserker.java +++ b/Mage.Sets/src/mage/sets/magic2012/StormbloodBerserker.java @@ -28,9 +28,9 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.CantBeBlockedByOneEffect; diff --git a/Mage.Sets/src/mage/sets/magic2012/SundialOfTheInfinite.java b/Mage.Sets/src/mage/sets/magic2012/SundialOfTheInfinite.java index 0f715fa5950..d3ac1d9242c 100644 --- a/Mage.Sets/src/mage/sets/magic2012/SundialOfTheInfinite.java +++ b/Mage.Sets/src/mage/sets/magic2012/SundialOfTheInfinite.java @@ -29,10 +29,10 @@ package mage.sets.magic2012; import java.util.UUID; -import static mage.Constants.Zone; +import mage.constants.Zone; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.OnlyDuringYourTurnCost; diff --git a/Mage.Sets/src/mage/sets/magic2012/SuturedGhoul.java b/Mage.Sets/src/mage/sets/magic2012/SuturedGhoul.java index 8bb4b1b9ae6..65ca11de5c3 100644 --- a/Mage.Sets/src/mage/sets/magic2012/SuturedGhoul.java +++ b/Mage.Sets/src/mage/sets/magic2012/SuturedGhoul.java @@ -27,9 +27,7 @@ */ package mage.sets.magic2012; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; @@ -71,9 +69,9 @@ public class SuturedGhoul extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new SuturedGhoulEffect(), staticText)); // Sutured Ghoul's power is equal to the total power of the exiled cards and its toughness is equal to their total toughness. - BoostSourceEffect effect = new BoostSourceEffect(new SuturedGhoulPowerCount(), new SuturedGhoulToughnessCount(), Constants.Duration.WhileOnBattlefield); + BoostSourceEffect effect = new BoostSourceEffect(new SuturedGhoulPowerCount(), new SuturedGhoulToughnessCount(), Duration.WhileOnBattlefield); effect.setRule(staticText2); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } public SuturedGhoul(final SuturedGhoul card) { @@ -89,7 +87,7 @@ public class SuturedGhoul extends CardImpl { class SuturedGhoulEffect extends OneShotEffect { public SuturedGhoulEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "exile any number of creature cards from your graveyard"; } @@ -104,7 +102,7 @@ class SuturedGhoulEffect extends OneShotEffect { if (player.getGraveyard().size() > 0) { TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(0, Integer.MAX_VALUE, new FilterCreatureCard("creature cards from your graveyard")); - if (player.chooseTarget(Constants.Outcome.Benefit, target, source, game)) { + if (player.chooseTarget(Outcome.Benefit, target, source, game)) { int count = 0; for (UUID uuid : target.getTargets()) { Card card = player.getGraveyard().get(uuid, game); diff --git a/Mage.Sets/src/mage/sets/magic2012/SwiftfootBoots.java b/Mage.Sets/src/mage/sets/magic2012/SwiftfootBoots.java index eca4cd17b2e..360b99e69db 100644 --- a/Mage.Sets/src/mage/sets/magic2012/SwiftfootBoots.java +++ b/Mage.Sets/src/mage/sets/magic2012/SwiftfootBoots.java @@ -30,9 +30,7 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; @@ -51,9 +49,9 @@ public class SwiftfootBoots extends CardImpl { super(ownerId, 219, "Swiftfoot Boots", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "M12"; this.subtype.add("Equipment"); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HexproofAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HasteAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(1))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HexproofAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1))); } diff --git a/Mage.Sets/src/mage/sets/magic2012/TasteOfBlood.java b/Mage.Sets/src/mage/sets/magic2012/TasteOfBlood.java index 40f10015052..619895417a5 100644 --- a/Mage.Sets/src/mage/sets/magic2012/TasteOfBlood.java +++ b/Mage.Sets/src/mage/sets/magic2012/TasteOfBlood.java @@ -29,8 +29,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2012/TectonicRift.java b/Mage.Sets/src/mage/sets/magic2012/TectonicRift.java index a0642f6c54e..2bf249c2d0f 100644 --- a/Mage.Sets/src/mage/sets/magic2012/TectonicRift.java +++ b/Mage.Sets/src/mage/sets/magic2012/TectonicRift.java @@ -28,9 +28,9 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.RestrictionEffect; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/magic2012/ThranGolem.java b/Mage.Sets/src/mage/sets/magic2012/ThranGolem.java index bbaf1d9a414..00be327069a 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ThranGolem.java +++ b/Mage.Sets/src/mage/sets/magic2012/ThranGolem.java @@ -28,10 +28,10 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; diff --git a/Mage.Sets/src/mage/sets/magic2012/ThroneOfEmpires.java b/Mage.Sets/src/mage/sets/magic2012/ThroneOfEmpires.java index 5ec7b7f59d9..185e2942976 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ThroneOfEmpires.java +++ b/Mage.Sets/src/mage/sets/magic2012/ThroneOfEmpires.java @@ -27,15 +27,16 @@ */ package mage.sets.magic2012; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.SoldierToken; @@ -53,7 +54,7 @@ public class ThroneOfEmpires extends CardImpl { this.expansionSetCode = "M12"; // {1}, {tap}: Put a 1/1 white Soldier creature token onto the battlefield. Put five of those tokens onto the battlefield instead if you control artifacts named Crown of Empires and Scepter of Empires. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ThroneOfEmpiresEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ThroneOfEmpiresEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } @@ -71,7 +72,7 @@ public class ThroneOfEmpires extends CardImpl { class ThroneOfEmpiresEffect extends OneShotEffect { public ThroneOfEmpiresEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); staticText = "Put a 1/1 white Soldier creature token onto the battlefield. Put five of those tokens onto the battlefield instead if you control artifacts named Crown of Empires and Scepter of Empires"; } diff --git a/Mage.Sets/src/mage/sets/magic2012/TimelyReinforcements.java b/Mage.Sets/src/mage/sets/magic2012/TimelyReinforcements.java index ff4ab88807f..0b2e445d610 100644 --- a/Mage.Sets/src/mage/sets/magic2012/TimelyReinforcements.java +++ b/Mage.Sets/src/mage/sets/magic2012/TimelyReinforcements.java @@ -27,14 +27,14 @@ */ package mage.sets.magic2012; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -70,7 +70,7 @@ public class TimelyReinforcements extends CardImpl { class TimelyReinforcementsEffect extends OneShotEffect { public TimelyReinforcementsEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "If you have less life than an opponent, you gain 6 life. If you control fewer creatures than an opponent, put three 1/1 white Soldier creature tokens onto the battlefield"; } diff --git a/Mage.Sets/src/mage/sets/magic2012/TitanicGrowth.java b/Mage.Sets/src/mage/sets/magic2012/TitanicGrowth.java index 6bde53922de..1c1697e7251 100644 --- a/Mage.Sets/src/mage/sets/magic2012/TitanicGrowth.java +++ b/Mage.Sets/src/mage/sets/magic2012/TitanicGrowth.java @@ -30,11 +30,11 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -46,7 +46,7 @@ public class TitanicGrowth extends CardImpl { super(ownerId, 198, "Titanic Growth", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "M12"; this.color.setGreen(true); - this.getSpellAbility().addEffect(new BoostTargetEffect(4, 4, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(4, 4, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/magic2012/TormentedSoul.java b/Mage.Sets/src/mage/sets/magic2012/TormentedSoul.java index 0a85b630cb8..a11566f5358 100644 --- a/Mage.Sets/src/mage/sets/magic2012/TormentedSoul.java +++ b/Mage.Sets/src/mage/sets/magic2012/TormentedSoul.java @@ -30,8 +30,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.abilities.keyword.UnblockableAbility; diff --git a/Mage.Sets/src/mage/sets/magic2012/Trollhide.java b/Mage.Sets/src/mage/sets/magic2012/Trollhide.java index 42ddab608d0..636e15d1757 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Trollhide.java +++ b/Mage.Sets/src/mage/sets/magic2012/Trollhide.java @@ -30,9 +30,7 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -59,11 +57,11 @@ public class Trollhide extends CardImpl { this.color.setGreen(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Constants.Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{G}")), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{G}")), AttachmentType.AURA))); } public Trollhide (final Trollhide card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/TurnToFrog.java b/Mage.Sets/src/mage/sets/magic2012/TurnToFrog.java index 7a3319c7c85..6a420ef1953 100644 --- a/Mage.Sets/src/mage/sets/magic2012/TurnToFrog.java +++ b/Mage.Sets/src/mage/sets/magic2012/TurnToFrog.java @@ -28,9 +28,9 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BecomesCreatureTargetEffect; import mage.abilities.effects.common.continious.LoseAllAbilitiesTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2012/VampireOutcasts.java b/Mage.Sets/src/mage/sets/magic2012/VampireOutcasts.java index 00474ae8d01..c6007c62cc2 100644 --- a/Mage.Sets/src/mage/sets/magic2012/VampireOutcasts.java +++ b/Mage.Sets/src/mage/sets/magic2012/VampireOutcasts.java @@ -28,8 +28,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.BloodthirstAbility; import mage.abilities.keyword.LifelinkAbility; diff --git a/Mage.Sets/src/mage/sets/magic2012/VengefulPharaoh.java b/Mage.Sets/src/mage/sets/magic2012/VengefulPharaoh.java index c4475f8df2a..c3e4f1cf57d 100644 --- a/Mage.Sets/src/mage/sets/magic2012/VengefulPharaoh.java +++ b/Mage.Sets/src/mage/sets/magic2012/VengefulPharaoh.java @@ -28,10 +28,10 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage.Sets/src/mage/sets/magic2012/VisionsOfBeyond.java b/Mage.Sets/src/mage/sets/magic2012/VisionsOfBeyond.java index aabb665d512..246a907c9a8 100644 --- a/Mage.Sets/src/mage/sets/magic2012/VisionsOfBeyond.java +++ b/Mage.Sets/src/mage/sets/magic2012/VisionsOfBeyond.java @@ -29,12 +29,12 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; @@ -67,7 +67,7 @@ public class VisionsOfBeyond extends CardImpl { class VisionsOfBeyondEffect extends OneShotEffect { public VisionsOfBeyondEffect() { - super(Constants.Outcome.DrawCard); + super(Outcome.DrawCard); staticText = "Draw a card. If a graveyard has twenty or more cards in it, draw three cards instead"; } diff --git a/Mage.Sets/src/mage/sets/magic2012/VolcanicDragon.java b/Mage.Sets/src/mage/sets/magic2012/VolcanicDragon.java index 8f786c26cf6..51ab982853f 100644 --- a/Mage.Sets/src/mage/sets/magic2012/VolcanicDragon.java +++ b/Mage.Sets/src/mage/sets/magic2012/VolcanicDragon.java @@ -30,8 +30,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; diff --git a/Mage.Sets/src/mage/sets/magic2012/WallOfTorches.java b/Mage.Sets/src/mage/sets/magic2012/WallOfTorches.java index 7ae90256ef8..5e16287d13c 100644 --- a/Mage.Sets/src/mage/sets/magic2012/WallOfTorches.java +++ b/Mage.Sets/src/mage/sets/magic2012/WallOfTorches.java @@ -30,8 +30,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2012/WarstormSurge.java b/Mage.Sets/src/mage/sets/magic2012/WarstormSurge.java index 8d0d4c70fc9..0bdd0405fd6 100644 --- a/Mage.Sets/src/mage/sets/magic2012/WarstormSurge.java +++ b/Mage.Sets/src/mage/sets/magic2012/WarstormSurge.java @@ -28,10 +28,10 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; diff --git a/Mage.Sets/src/mage/sets/magic2012/Worldslayer.java b/Mage.Sets/src/mage/sets/magic2012/Worldslayer.java index 43c8837bdc5..13bb1edf5ab 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Worldslayer.java +++ b/Mage.Sets/src/mage/sets/magic2012/Worldslayer.java @@ -29,10 +29,10 @@ package mage.sets.magic2012; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.GenericManaCost; diff --git a/Mage.Sets/src/mage/sets/magic2012/WringFlesh.java b/Mage.Sets/src/mage/sets/magic2012/WringFlesh.java index e9d9fc51d42..0fa366af4e3 100644 --- a/Mage.Sets/src/mage/sets/magic2012/WringFlesh.java +++ b/Mage.Sets/src/mage/sets/magic2012/WringFlesh.java @@ -30,11 +30,11 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -46,7 +46,7 @@ public class WringFlesh extends CardImpl { super(ownerId, 118, "Wring Flesh", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "M12"; this.color.setBlack(true); - this.getSpellAbility().addEffect(new BoostTargetEffect(-3, -1, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(-3, -1, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/magic2012/ZombieGoliath.java b/Mage.Sets/src/mage/sets/magic2012/ZombieGoliath.java index 191ff01e5e7..f54fef5933d 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ZombieGoliath.java +++ b/Mage.Sets/src/mage/sets/magic2012/ZombieGoliath.java @@ -30,8 +30,8 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2012/ZombieInfestation.java b/Mage.Sets/src/mage/sets/magic2012/ZombieInfestation.java index 873eff957f5..73d11c59648 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ZombieInfestation.java +++ b/Mage.Sets/src/mage/sets/magic2012/ZombieInfestation.java @@ -28,9 +28,9 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.DiscardTargetCost; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/magic2013/AjaniCallerOfThePride.java b/Mage.Sets/src/mage/sets/magic2013/AjaniCallerOfThePride.java index 3a68a75ca11..775a2c0195f 100644 --- a/Mage.Sets/src/mage/sets/magic2013/AjaniCallerOfThePride.java +++ b/Mage.Sets/src/mage/sets/magic2013/AjaniCallerOfThePride.java @@ -29,9 +29,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -46,6 +45,7 @@ import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.keyword.DoubleStrikeAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.counters.CounterType; import mage.game.permanent.token.Token; import mage.target.common.TargetCreaturePermanent; @@ -73,8 +73,8 @@ public class AjaniCallerOfThePride extends CardImpl { this.addAbility(ability); // -3: Target creature gains flying and double strike until end of turn. Effects effects = new Effects(); - effects.add(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn)); - effects.add(new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Constants.Duration.EndOfTurn)); + effects.add(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); + effects.add(new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn)); ability = new LoyaltyAbility(effects, -3); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/magic2013/AjanisSunstriker.java b/Mage.Sets/src/mage/sets/magic2013/AjanisSunstriker.java index 2c61c4e5a62..b797d0dd8bb 100644 --- a/Mage.Sets/src/mage/sets/magic2013/AjanisSunstriker.java +++ b/Mage.Sets/src/mage/sets/magic2013/AjanisSunstriker.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2013/AkromasMemorial.java b/Mage.Sets/src/mage/sets/magic2013/AkromasMemorial.java index 7d30bde7f16..bcb3a6ccc20 100644 --- a/Mage.Sets/src/mage/sets/magic2013/AkromasMemorial.java +++ b/Mage.Sets/src/mage/sets/magic2013/AkromasMemorial.java @@ -27,15 +27,16 @@ */ package mage.sets.magic2013; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.CompoundAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.*; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; @@ -64,7 +65,7 @@ public class AkromasMemorial extends CardImpl { public void build() { // Creatures you control have flying, first strike, vigilance, trample, haste, and protection from black and from red. CompoundAbility abilities = new CompoundAbility(FlyingAbility.getInstance(), FirstStrikeAbility.getInstance(), VigilanceAbility.getInstance(), TrampleAbility.getInstance(), HasteAbility.getInstance(), new ProtectionAbility(filterBlack), new ProtectionAbility(filterRed)); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityControlledEffect(abilities, Constants.Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Creatures you control")))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(abilities, Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Creatures you control")))); } public AkromasMemorial(final AkromasMemorial card) { diff --git a/Mage.Sets/src/mage/sets/magic2013/Archaeomancer.java b/Mage.Sets/src/mage/sets/magic2013/Archaeomancer.java index 45add4d45b7..febad7e710a 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Archaeomancer.java +++ b/Mage.Sets/src/mage/sets/magic2013/Archaeomancer.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.ReturnToHandTargetEffect; diff --git a/Mage.Sets/src/mage/sets/magic2013/ArcticAven.java b/Mage.Sets/src/mage/sets/magic2013/ArcticAven.java index a36287308aa..66c6fdf2247 100644 --- a/Mage.Sets/src/mage/sets/magic2013/ArcticAven.java +++ b/Mage.Sets/src/mage/sets/magic2013/ArcticAven.java @@ -28,10 +28,10 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/magic2013/ArmsDealer.java b/Mage.Sets/src/mage/sets/magic2013/ArmsDealer.java index fea029c16c5..3f3783c4dca 100644 --- a/Mage.Sets/src/mage/sets/magic2013/ArmsDealer.java +++ b/Mage.Sets/src/mage/sets/magic2013/ArmsDealer.java @@ -28,9 +28,9 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; diff --git a/Mage.Sets/src/mage/sets/magic2013/AttendedKnight.java b/Mage.Sets/src/mage/sets/magic2013/AttendedKnight.java index 06b9de1ea59..981663892de 100644 --- a/Mage.Sets/src/mage/sets/magic2013/AttendedKnight.java +++ b/Mage.Sets/src/mage/sets/magic2013/AttendedKnight.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/magic2013/AugurOfBolas.java b/Mage.Sets/src/mage/sets/magic2013/AugurOfBolas.java index 78196ba3ed1..a97cd810b20 100644 --- a/Mage.Sets/src/mage/sets/magic2013/AugurOfBolas.java +++ b/Mage.Sets/src/mage/sets/magic2013/AugurOfBolas.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.StaticValue; diff --git a/Mage.Sets/src/mage/sets/magic2013/BattleflightEagle.java b/Mage.Sets/src/mage/sets/magic2013/BattleflightEagle.java index 9892879f8ed..12353fefd07 100644 --- a/Mage.Sets/src/mage/sets/magic2013/BattleflightEagle.java +++ b/Mage.Sets/src/mage/sets/magic2013/BattleflightEagle.java @@ -29,9 +29,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -39,6 +38,7 @@ import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -62,8 +62,8 @@ public class BattleflightEagle extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // When Battleflight Eagle enters the battlefield, target creature gets +2/+2 and gains flying until end of turn. - Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(2, 2, Constants.Duration.EndOfTurn)); - ability.addEffect(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn)); + Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); + ability.addEffect(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2013/BloodReckoning.java b/Mage.Sets/src/mage/sets/magic2013/BloodReckoning.java index 88520738bf1..e1bd2ef6f60 100644 --- a/Mage.Sets/src/mage/sets/magic2013/BloodReckoning.java +++ b/Mage.Sets/src/mage/sets/magic2013/BloodReckoning.java @@ -28,12 +28,13 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -69,7 +70,7 @@ public class BloodReckoning extends CardImpl { class BloodReckoningTriggeredAbility extends TriggeredAbilityImpl { public BloodReckoningTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new LoseLifeTargetEffect(1)); + super(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1)); } public BloodReckoningTriggeredAbility(final BloodReckoningTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/magic2013/BloodhunterBat.java b/Mage.Sets/src/mage/sets/magic2013/BloodhunterBat.java index 1e227d13b0d..b7bc9c6c29a 100644 --- a/Mage.Sets/src/mage/sets/magic2013/BloodhunterBat.java +++ b/Mage.Sets/src/mage/sets/magic2013/BloodhunterBat.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2013/BondBeetle.java b/Mage.Sets/src/mage/sets/magic2013/BondBeetle.java index 3e1d039b8b8..11c9c929eee 100644 --- a/Mage.Sets/src/mage/sets/magic2013/BondBeetle.java +++ b/Mage.Sets/src/mage/sets/magic2013/BondBeetle.java @@ -27,8 +27,8 @@ */ package mage.sets.magic2013; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2013/BoundlessRealms.java b/Mage.Sets/src/mage/sets/magic2013/BoundlessRealms.java index c428d62a489..d5263a4e001 100644 --- a/Mage.Sets/src/mage/sets/magic2013/BoundlessRealms.java +++ b/Mage.Sets/src/mage/sets/magic2013/BoundlessRealms.java @@ -28,11 +28,11 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/magic2013/CaptainsCall.java b/Mage.Sets/src/mage/sets/magic2013/CaptainsCall.java index a589e95c008..35df1fa7e39 100644 --- a/Mage.Sets/src/mage/sets/magic2013/CaptainsCall.java +++ b/Mage.Sets/src/mage/sets/magic2013/CaptainsCall.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.game.permanent.token.SoldierToken; diff --git a/Mage.Sets/src/mage/sets/magic2013/CathedralOfWar.java b/Mage.Sets/src/mage/sets/magic2013/CathedralOfWar.java index f712942e13f..642f6196e37 100644 --- a/Mage.Sets/src/mage/sets/magic2013/CathedralOfWar.java +++ b/Mage.Sets/src/mage/sets/magic2013/CathedralOfWar.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.keyword.ExaltedAbility; import mage.abilities.mana.ColorlessManaAbility; diff --git a/Mage.Sets/src/mage/sets/magic2013/ChandrasFury.java b/Mage.Sets/src/mage/sets/magic2013/ChandrasFury.java index e3f700e2fe2..429532e1d61 100644 --- a/Mage.Sets/src/mage/sets/magic2013/ChandrasFury.java +++ b/Mage.Sets/src/mage/sets/magic2013/ChandrasFury.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageAllControlledTargetEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2013/Chronomaton.java b/Mage.Sets/src/mage/sets/magic2013/Chronomaton.java index c9abcd59d4e..0ba9b38d6b1 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Chronomaton.java +++ b/Mage.Sets/src/mage/sets/magic2013/Chronomaton.java @@ -29,9 +29,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; /** @@ -59,7 +59,7 @@ public class Chronomaton extends CardImpl { @Override public void build() { // {1}, {tap}: Put a +1/+1 counter on Chronomaton. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2013/CleaverRiot.java b/Mage.Sets/src/mage/sets/magic2013/CleaverRiot.java index d46a351ff99..b8787b58a07 100644 --- a/Mage.Sets/src/mage/sets/magic2013/CleaverRiot.java +++ b/Mage.Sets/src/mage/sets/magic2013/CleaverRiot.java @@ -28,9 +28,9 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.DoubleStrikeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2013/ClockOfOmens.java b/Mage.Sets/src/mage/sets/magic2013/ClockOfOmens.java index 8d0d0d9e96a..a2af163952f 100644 --- a/Mage.Sets/src/mage/sets/magic2013/ClockOfOmens.java +++ b/Mage.Sets/src/mage/sets/magic2013/ClockOfOmens.java @@ -28,9 +28,9 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.UntapTargetEffect; diff --git a/Mage.Sets/src/mage/sets/magic2013/CourtlyProvocateur.java b/Mage.Sets/src/mage/sets/magic2013/CourtlyProvocateur.java index cba19a6a258..78dbea0ab69 100644 --- a/Mage.Sets/src/mage/sets/magic2013/CourtlyProvocateur.java +++ b/Mage.Sets/src/mage/sets/magic2013/CourtlyProvocateur.java @@ -27,9 +27,8 @@ */ package mage.sets.magic2013; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.AttacksThisTurnMarkerAbility; import mage.abilities.keyword.BlocksThisTurnMarkerAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -60,14 +61,14 @@ public class CourtlyProvocateur extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target creature attacks this turn if able. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AttacksIfAbleTargetEffect(Constants.Duration.EndOfTurn), new TapSourceCost()); - ability.addEffect(new GainAbilityTargetEffect(AttacksThisTurnMarkerAbility.getInstance(), Constants.Duration.EndOfTurn, null)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttacksIfAbleTargetEffect(Duration.EndOfTurn), new TapSourceCost()); + ability.addEffect(new GainAbilityTargetEffect(AttacksThisTurnMarkerAbility.getInstance(), Duration.EndOfTurn, null)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {tap}: Target creature blocks this turn if able. - Ability ability2 = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BlocksIfAbleTargetEffect(Constants.Duration.EndOfTurn), new TapSourceCost()); - ability2.addEffect(new GainAbilityTargetEffect(BlocksThisTurnMarkerAbility.getInstance(), Constants.Duration.EndOfTurn, null)); + Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BlocksIfAbleTargetEffect(Duration.EndOfTurn), new TapSourceCost()); + ability2.addEffect(new GainAbilityTargetEffect(BlocksThisTurnMarkerAbility.getInstance(), Duration.EndOfTurn, null)); ability2.addTarget(new TargetCreaturePermanent()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/magic2013/CowerInFear.java b/Mage.Sets/src/mage/sets/magic2013/CowerInFear.java index 906e9115eab..0c934380ebf 100644 --- a/Mage.Sets/src/mage/sets/magic2013/CowerInFear.java +++ b/Mage.Sets/src/mage/sets/magic2013/CowerInFear.java @@ -28,12 +28,13 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; @@ -46,7 +47,7 @@ public class CowerInFear extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT)); + filter.add(new ControllerPredicate(TargetController.OPPONENT)); } public CowerInFear(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/magic2013/Craterize.java b/Mage.Sets/src/mage/sets/magic2013/Craterize.java index 8a55a3476d2..4ac943fcb86 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Craterize.java +++ b/Mage.Sets/src/mage/sets/magic2013/Craterize.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetLandPermanent; diff --git a/Mage.Sets/src/mage/sets/magic2013/CrimsonMuckwader.java b/Mage.Sets/src/mage/sets/magic2013/CrimsonMuckwader.java index ab6d1d5ca54..c1933b9f024 100644 --- a/Mage.Sets/src/mage/sets/magic2013/CrimsonMuckwader.java +++ b/Mage.Sets/src/mage/sets/magic2013/CrimsonMuckwader.java @@ -28,9 +28,9 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/magic2013/CripplingBlight.java b/Mage.Sets/src/mage/sets/magic2013/CripplingBlight.java index 5283ea247b1..4a4de60c8b7 100644 --- a/Mage.Sets/src/mage/sets/magic2013/CripplingBlight.java +++ b/Mage.Sets/src/mage/sets/magic2013/CripplingBlight.java @@ -28,12 +28,12 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.CantBlockAttachedEffect; diff --git a/Mage.Sets/src/mage/sets/magic2013/CrusaderOfOdric.java b/Mage.Sets/src/mage/sets/magic2013/CrusaderOfOdric.java index 6571e1c3e26..3cd5444689c 100644 --- a/Mage.Sets/src/mage/sets/magic2013/CrusaderOfOdric.java +++ b/Mage.Sets/src/mage/sets/magic2013/CrusaderOfOdric.java @@ -29,14 +29,15 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; /** @@ -59,7 +60,7 @@ public class CrusaderOfOdric extends CardImpl { @Override public void build() { // Crusader of Odric's power and toughness are each equal to the number of creatures you control. - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()), Constants.Duration.EndOfGame))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()), Duration.EndOfGame))); } public CrusaderOfOdric(final CrusaderOfOdric card) { diff --git a/Mage.Sets/src/mage/sets/magic2013/DiabolicRevelation.java b/Mage.Sets/src/mage/sets/magic2013/DiabolicRevelation.java index eb9edc2faeb..693e1f2040a 100644 --- a/Mage.Sets/src/mage/sets/magic2013/DiabolicRevelation.java +++ b/Mage.Sets/src/mage/sets/magic2013/DiabolicRevelation.java @@ -28,15 +28,16 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.game.Game; import mage.players.Player; @@ -98,7 +99,7 @@ class DiabolicRevelationEffect extends OneShotEffect { for (UUID cardId : target.getTargets()) { Card card = player.getLibrary().remove(cardId, game); if (card != null) { - card.moveToZone(Constants.Zone.HAND, source.getId(), game, false); + card.moveToZone(Zone.HAND, source.getId(), game, false); } } } diff --git a/Mage.Sets/src/mage/sets/magic2013/DiscipleOfBolas.java b/Mage.Sets/src/mage/sets/magic2013/DiscipleOfBolas.java index be0e2340443..682beca34cf 100644 --- a/Mage.Sets/src/mage/sets/magic2013/DiscipleOfBolas.java +++ b/Mage.Sets/src/mage/sets/magic2013/DiscipleOfBolas.java @@ -28,9 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -54,7 +53,7 @@ public class DiscipleOfBolas extends CardImpl { static { filter.add(new AnotherPredicate()); - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public DiscipleOfBolas(UUID ownerId) { @@ -86,7 +85,7 @@ public class DiscipleOfBolas extends CardImpl { class DiscipleOfBolasEffect extends OneShotEffect { public DiscipleOfBolasEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); this.staticText = "sacrifice another creature. You gain X life and draw X cards, where X is that creature's power"; } @@ -106,7 +105,7 @@ class DiscipleOfBolasEffect extends OneShotEffect { Player player = game.getPlayer(source.getControllerId()); if (sacrificed != null && player != null) { sacrificed.sacrifice(source.getSourceId(), game); - Permanent lastKnownState = (Permanent) game.getLastKnownInformation(sacrificed.getId(), Constants.Zone.BATTLEFIELD); + Permanent lastKnownState = (Permanent) game.getLastKnownInformation(sacrificed.getId(), Zone.BATTLEFIELD); int power = lastKnownState.getPower().getValue(); player.gainLife(power, game); player.drawCards(power, game); diff --git a/Mage.Sets/src/mage/sets/magic2013/Downpour.java b/Mage.Sets/src/mage/sets/magic2013/Downpour.java index f61d68afe83..9e3b502b684 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Downpour.java +++ b/Mage.Sets/src/mage/sets/magic2013/Downpour.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/magic2013/DragonHatchling.java b/Mage.Sets/src/mage/sets/magic2013/DragonHatchling.java index e85dd6799ef..d4f01108987 100644 --- a/Mage.Sets/src/mage/sets/magic2013/DragonHatchling.java +++ b/Mage.Sets/src/mage/sets/magic2013/DragonHatchling.java @@ -28,10 +28,10 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/magic2013/DuskmantleProwler.java b/Mage.Sets/src/mage/sets/magic2013/DuskmantleProwler.java index bacb0bcd56f..94019773658 100644 --- a/Mage.Sets/src/mage/sets/magic2013/DuskmantleProwler.java +++ b/Mage.Sets/src/mage/sets/magic2013/DuskmantleProwler.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.ExaltedAbility; diff --git a/Mage.Sets/src/mage/sets/magic2013/DutyBoundDead.java b/Mage.Sets/src/mage/sets/magic2013/DutyBoundDead.java index 4c42509959e..f011a448c2f 100644 --- a/Mage.Sets/src/mage/sets/magic2013/DutyBoundDead.java +++ b/Mage.Sets/src/mage/sets/magic2013/DutyBoundDead.java @@ -28,9 +28,9 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/magic2013/ElderscaleWurm.java b/Mage.Sets/src/mage/sets/magic2013/ElderscaleWurm.java index 4ade5d05631..0796ba5907f 100644 --- a/Mage.Sets/src/mage/sets/magic2013/ElderscaleWurm.java +++ b/Mage.Sets/src/mage/sets/magic2013/ElderscaleWurm.java @@ -27,9 +27,7 @@ */ package mage.sets.magic2013; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -66,7 +64,7 @@ public class ElderscaleWurm extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new ElderscaleWurmSetLifeEffect(), false)); // As long as you have 7 or more life, damage that would reduce your life total to less than 7 reduces it to 7 instead. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ElderscaleWurmReplacementEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ElderscaleWurmReplacementEffect())); } public ElderscaleWurm(final ElderscaleWurm card) { @@ -82,7 +80,7 @@ public class ElderscaleWurm extends CardImpl { class ElderscaleWurmSetLifeEffect extends OneShotEffect { public ElderscaleWurmSetLifeEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); this.staticText = "if your life total is less than 7, your life total becomes 7"; } @@ -111,7 +109,7 @@ class ElderscaleWurmSetLifeEffect extends OneShotEffect { public ElderscaleWurmReplacementEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "As long as you have 7 or more life, damage that would reduce your life total to less than 7 reduces it to 7 instead"; } @@ -129,7 +127,7 @@ class ElderscaleWurmReplacementEffect extends ReplacementEffectImpl { static { filter.add(Predicates.or( - new CardTypePredicate(Constants.CardType.CREATURE), - new CardTypePredicate(Constants.CardType.ARTIFACT))); + new CardTypePredicate(CardType.CREATURE), + new CardTypePredicate(CardType.ARTIFACT))); } public Encrust(UUID ownerId) { @@ -70,13 +69,13 @@ public class Encrust extends CardImpl { // Enchant artifact or creature TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Detriment)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted permanent doesn't untap during its controller's untap step and its activated abilities can't be activated. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new SkipEnchantedUntapEffect())); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new EncrustEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipEnchantedUntapEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EncrustEffect())); } public Encrust(final Encrust card) { @@ -92,7 +91,7 @@ public class Encrust extends CardImpl { class EncrustEffect extends ReplacementEffectImpl { public EncrustEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Detriment); + super(Duration.WhileOnBattlefield, Outcome.Detriment); staticText = "Its activated abilities can't be activated"; } diff --git a/Mage.Sets/src/mage/sets/magic2013/FaerieInvaders.java b/Mage.Sets/src/mage/sets/magic2013/FaerieInvaders.java index 3e4f5c91945..3fde3c266f0 100644 --- a/Mage.Sets/src/mage/sets/magic2013/FaerieInvaders.java +++ b/Mage.Sets/src/mage/sets/magic2013/FaerieInvaders.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/magic2013/FaithsReward.java b/Mage.Sets/src/mage/sets/magic2013/FaithsReward.java index a1d018c2a6b..2acc04dbcc4 100644 --- a/Mage.Sets/src/mage/sets/magic2013/FaithsReward.java +++ b/Mage.Sets/src/mage/sets/magic2013/FaithsReward.java @@ -27,9 +27,7 @@ */ package mage.sets.magic2013; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -72,7 +70,7 @@ public class FaithsReward extends CardImpl { class FaithsRewardEffect extends OneShotEffect { FaithsRewardEffect() { - super(Constants.Outcome.PutCardInPlay); + super(Outcome.PutCardInPlay); staticText = "Return to the battlefield all permanent cards in your graveyard that were put there from the battlefield this turn"; } @@ -86,8 +84,8 @@ class FaithsRewardEffect extends OneShotEffect { if (watcher != null) { for (UUID id : watcher.cards) { Card c = game.getCard(id); - if (c != null && c.getOwnerId().equals(source.getControllerId()) && game.getState().getZone(id) == Constants.Zone.GRAVEYARD) { - c.moveToZone(Constants.Zone.BATTLEFIELD, source.getSourceId(), game, false); + if (c != null && c.getOwnerId().equals(source.getControllerId()) && game.getState().getZone(id) == Zone.GRAVEYARD) { + c.moveToZone(Zone.BATTLEFIELD, source.getSourceId(), game, false); } } return true; @@ -105,7 +103,7 @@ class FaithsRewardWatcher extends WatcherImpl { ArrayList cards = new ArrayList(); public FaithsRewardWatcher() { - super("FaithsRewardWatcher", Constants.WatcherScope.GAME); + super("FaithsRewardWatcher", WatcherScope.GAME); } public FaithsRewardWatcher(final FaithsRewardWatcher watcher) { diff --git a/Mage.Sets/src/mage/sets/magic2013/Fervor.java b/Mage.Sets/src/mage/sets/magic2013/Fervor.java index e6eb5fe862d..bc079422ab8 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Fervor.java +++ b/Mage.Sets/src/mage/sets/magic2013/Fervor.java @@ -28,10 +28,10 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.HasteAbility; diff --git a/Mage.Sets/src/mage/sets/magic2013/FireElemental.java b/Mage.Sets/src/mage/sets/magic2013/FireElemental.java index 7a30d58b5be..998613ccd1a 100644 --- a/Mage.Sets/src/mage/sets/magic2013/FireElemental.java +++ b/Mage.Sets/src/mage/sets/magic2013/FireElemental.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2013/FirewingPhoenix.java b/Mage.Sets/src/mage/sets/magic2013/FirewingPhoenix.java index 8f776db556b..ac4c1245c69 100644 --- a/Mage.Sets/src/mage/sets/magic2013/FirewingPhoenix.java +++ b/Mage.Sets/src/mage/sets/magic2013/FirewingPhoenix.java @@ -28,9 +28,9 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/magic2013/FlamesOfTheFirebrand.java b/Mage.Sets/src/mage/sets/magic2013/FlamesOfTheFirebrand.java index e7b93500a6c..1ffa03a8caf 100644 --- a/Mage.Sets/src/mage/sets/magic2013/FlamesOfTheFirebrand.java +++ b/Mage.Sets/src/mage/sets/magic2013/FlamesOfTheFirebrand.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageMultiEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreatureOrPlayerAmount; diff --git a/Mage.Sets/src/mage/sets/magic2013/FlinthoofBoar.java b/Mage.Sets/src/mage/sets/magic2013/FlinthoofBoar.java index a7e8788f353..29bb5a2ab6f 100644 --- a/Mage.Sets/src/mage/sets/magic2013/FlinthoofBoar.java +++ b/Mage.Sets/src/mage/sets/magic2013/FlinthoofBoar.java @@ -28,10 +28,10 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/magic2013/FungalSprouting.java b/Mage.Sets/src/mage/sets/magic2013/FungalSprouting.java index c295ae8ac75..cd3d9eb9591 100644 --- a/Mage.Sets/src/mage/sets/magic2013/FungalSprouting.java +++ b/Mage.Sets/src/mage/sets/magic2013/FungalSprouting.java @@ -28,12 +28,14 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -75,11 +77,11 @@ class FungalSproutingEffect extends OneShotEffect { static { filter.add(new CardTypePredicate(CardType.CREATURE)); - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public FungalSproutingEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); this.staticText = "Put X 1/1 green Saproling creature tokens onto the battlefield, where X is the greatest power among creatures you control"; } diff --git a/Mage.Sets/src/mage/sets/magic2013/GemOfBecoming.java b/Mage.Sets/src/mage/sets/magic2013/GemOfBecoming.java index c3557294e76..3bc4db888bf 100644 --- a/Mage.Sets/src/mage/sets/magic2013/GemOfBecoming.java +++ b/Mage.Sets/src/mage/sets/magic2013/GemOfBecoming.java @@ -28,10 +28,10 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/magic2013/GildedLotus.java b/Mage.Sets/src/mage/sets/magic2013/GildedLotus.java index 6112abcdc34..6724c17bcd3 100644 --- a/Mage.Sets/src/mage/sets/magic2013/GildedLotus.java +++ b/Mage.Sets/src/mage/sets/magic2013/GildedLotus.java @@ -29,15 +29,15 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.AddManaOfAnyColorEffect; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.choices.ChoiceColor; +import mage.constants.Zone; /** * @@ -50,7 +50,7 @@ public class GildedLotus extends CardImpl { this.expansionSetCode = "M13"; // {tap}: Add three mana of any one color to your mana pool. - Ability ability = new SimpleManaAbility(Constants.Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(3), new TapSourceCost()); + Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(3), new TapSourceCost()); ability.addChoice(new ChoiceColor()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2013/GoblinBattleJester.java b/Mage.Sets/src/mage/sets/magic2013/GoblinBattleJester.java index 70976bc94bb..279351cbf9e 100644 --- a/Mage.Sets/src/mage/sets/magic2013/GoblinBattleJester.java +++ b/Mage.Sets/src/mage/sets/magic2013/GoblinBattleJester.java @@ -28,9 +28,9 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/magic2013/GriffinProtector.java b/Mage.Sets/src/mage/sets/magic2013/GriffinProtector.java index 01443736b1b..b7c0d5304f2 100644 --- a/Mage.Sets/src/mage/sets/magic2013/GriffinProtector.java +++ b/Mage.Sets/src/mage/sets/magic2013/GriffinProtector.java @@ -29,14 +29,14 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersAnotherCreatureYourControlTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -59,7 +59,7 @@ public class GriffinProtector extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Whenever another creature enters the battlefield under your control, Griffin Protector gets +1/+1 until end of turn. - this.addAbility(new EntersAnotherCreatureYourControlTriggeredAbility(new BoostSourceEffect(1, 1, Constants.Duration.EndOfTurn))); + this.addAbility(new EntersAnotherCreatureYourControlTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn))); } public GriffinProtector(final GriffinProtector card) { diff --git a/Mage.Sets/src/mage/sets/magic2013/GroundSeal.java b/Mage.Sets/src/mage/sets/magic2013/GroundSeal.java index 6eb00200127..02f9560f44d 100644 --- a/Mage.Sets/src/mage/sets/magic2013/GroundSeal.java +++ b/Mage.Sets/src/mage/sets/magic2013/GroundSeal.java @@ -28,9 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -58,7 +57,7 @@ public class GroundSeal extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardControllerEffect(1))); // Cards in graveyards can't be the targets of spells or abilities. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GroundSealEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GroundSealEffect())); } public GroundSeal(final GroundSeal card) { @@ -74,7 +73,7 @@ public class GroundSeal extends CardImpl { class GroundSealEffect extends ReplacementEffectImpl { public GroundSealEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "Cards in graveyards can't be the targets of spells or abilities"; } @@ -103,8 +102,8 @@ class GroundSealEffect extends ReplacementEffectImpl { Card targetCard = game.getCard(event.getTargetId()); StackObject stackObject = (StackObject) game.getStack().getStackObject(event.getSourceId()); if (targetCard != null && stackObject != null) { - Constants.Zone zone = game.getState().getZone(targetCard.getId()); - if (zone != null && (zone == Constants.Zone.GRAVEYARD)) { + Zone zone = game.getState().getZone(targetCard.getId()); + if (zone != null && (zone == Zone.GRAVEYARD)) { return true; } } diff --git a/Mage.Sets/src/mage/sets/magic2013/GuardianLions.java b/Mage.Sets/src/mage/sets/magic2013/GuardianLions.java index 4d3f62c9341..aadffa9cb19 100644 --- a/Mage.Sets/src/mage/sets/magic2013/GuardianLions.java +++ b/Mage.Sets/src/mage/sets/magic2013/GuardianLions.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2013/HamletbackGoliath.java b/Mage.Sets/src/mage/sets/magic2013/HamletbackGoliath.java index fdf243a894f..172e6fc2cdb 100644 --- a/Mage.Sets/src/mage/sets/magic2013/HamletbackGoliath.java +++ b/Mage.Sets/src/mage/sets/magic2013/HamletbackGoliath.java @@ -28,15 +28,17 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; @@ -75,7 +77,7 @@ public class HamletbackGoliath extends CardImpl { class HamletbackGoliathTriggeredAbility extends TriggeredAbilityImpl { HamletbackGoliathTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new HamletbackGoliathEffect(), true); + super(Zone.BATTLEFIELD, new HamletbackGoliathEffect(), true); } HamletbackGoliathTriggeredAbility(final HamletbackGoliathTriggeredAbility ability) { @@ -111,7 +113,7 @@ class HamletbackGoliathTriggeredAbility extends TriggeredAbilityImpl { HamletbackGoliathEffect() { - super(Constants.Outcome.BoostCreature); + super(Outcome.BoostCreature); } HamletbackGoliathEffect(final HamletbackGoliathEffect effect) { @@ -123,7 +125,7 @@ class HamletbackGoliathEffect extends OneShotEffect { Permanent creature = game.getPermanent(targetPointer.getFirst(game, source)); Permanent HamletbackGoliath = game.getPermanent(source.getSourceId()); if (creature == null) { - creature = (Permanent) game.getLastKnownInformation(targetPointer.getFirst(game, source), Constants.Zone.BATTLEFIELD); + creature = (Permanent) game.getLastKnownInformation(targetPointer.getFirst(game, source), Zone.BATTLEFIELD); } if (creature != null) { HamletbackGoliath.addCounters(CounterType.P1P1.createInstance(creature.getPower().getValue()), game); diff --git a/Mage.Sets/src/mage/sets/magic2013/HarborBandit.java b/Mage.Sets/src/mage/sets/magic2013/HarborBandit.java index b8aea47c6e2..b6b21bee61d 100644 --- a/Mage.Sets/src/mage/sets/magic2013/HarborBandit.java +++ b/Mage.Sets/src/mage/sets/magic2013/HarborBandit.java @@ -28,10 +28,10 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/magic2013/HealerOfThePride.java b/Mage.Sets/src/mage/sets/magic2013/HealerOfThePride.java index 1bb3c2a8cd6..18a468e6254 100644 --- a/Mage.Sets/src/mage/sets/magic2013/HealerOfThePride.java +++ b/Mage.Sets/src/mage/sets/magic2013/HealerOfThePride.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersAnotherCreatureYourControlTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/magic2013/HellionCrucible.java b/Mage.Sets/src/mage/sets/magic2013/HellionCrucible.java index 7987fa9c0b9..0eba31d86cf 100644 --- a/Mage.Sets/src/mage/sets/magic2013/HellionCrucible.java +++ b/Mage.Sets/src/mage/sets/magic2013/HellionCrucible.java @@ -27,9 +27,8 @@ */ package mage.sets.magic2013; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,7 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.HasteAbility; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.permanent.token.Token; @@ -61,12 +61,12 @@ public class HellionCrucible extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {1}{R}, {tap}: Put a pressure counter on Hellion Crucible. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.PRESSURE.createInstance()), new ManaCostsImpl("{1}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.PRESSURE.createInstance()), new ManaCostsImpl("{1}{R}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {1}{R}, {tap}, Remove two pressure counters from Hellion Crucible and sacrifice it: Put a 4/4 red Hellion creature token with haste onto the battlefield. - ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new HellionToken(), 1), new ManaCostsImpl("{1}{R}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HellionToken(), 1), new ManaCostsImpl("{1}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.PRESSURE.createInstance(2))); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/sets/magic2013/Hydrosurge.java b/Mage.Sets/src/mage/sets/magic2013/Hydrosurge.java index 1e1361df84a..4cf9b1ab031 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Hydrosurge.java +++ b/Mage.Sets/src/mage/sets/magic2013/Hydrosurge.java @@ -28,9 +28,9 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/magic2013/JacesPhantasm.java b/Mage.Sets/src/mage/sets/magic2013/JacesPhantasm.java index c2adba4ea9a..394188c09bb 100644 --- a/Mage.Sets/src/mage/sets/magic2013/JacesPhantasm.java +++ b/Mage.Sets/src/mage/sets/magic2013/JacesPhantasm.java @@ -29,9 +29,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInOpponentGraveCondition; @@ -39,6 +38,8 @@ import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -58,7 +59,7 @@ public class JacesPhantasm extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Jace's Phantasm gets +4/+4 as long as an opponent has ten or more cards in his or her graveyard. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostSourceEffect(4, 4, Constants.Duration.WhileOnBattlefield), new CardsInOpponentGraveCondition(10), "{this} gets +4/+4 as long as an opponent has ten or more cards in his or her graveyard"))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostSourceEffect(4, 4, Duration.WhileOnBattlefield), new CardsInOpponentGraveCondition(10), "{this} gets +4/+4 as long as an opponent has ten or more cards in his or her graveyard"))); } public JacesPhantasm(final JacesPhantasm card) { diff --git a/Mage.Sets/src/mage/sets/magic2013/JayemdaeTome.java b/Mage.Sets/src/mage/sets/magic2013/JayemdaeTome.java index 3e9a9a1bb5a..512c1b5977f 100644 --- a/Mage.Sets/src/mage/sets/magic2013/JayemdaeTome.java +++ b/Mage.Sets/src/mage/sets/magic2013/JayemdaeTome.java @@ -28,7 +28,7 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/magic2013/Kitesail.java b/Mage.Sets/src/mage/sets/magic2013/Kitesail.java index 1701153b010..f7583bb7ca9 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Kitesail.java +++ b/Mage.Sets/src/mage/sets/magic2013/Kitesail.java @@ -28,7 +28,7 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/magic2013/KnightOfGlory.java b/Mage.Sets/src/mage/sets/magic2013/KnightOfGlory.java index bf99203a8c1..b140f5708e6 100644 --- a/Mage.Sets/src/mage/sets/magic2013/KnightOfGlory.java +++ b/Mage.Sets/src/mage/sets/magic2013/KnightOfGlory.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.ExaltedAbility; diff --git a/Mage.Sets/src/mage/sets/magic2013/KnightOfInfamy.java b/Mage.Sets/src/mage/sets/magic2013/KnightOfInfamy.java index 16c71b2a5ec..cbaee9a2943 100644 --- a/Mage.Sets/src/mage/sets/magic2013/KnightOfInfamy.java +++ b/Mage.Sets/src/mage/sets/magic2013/KnightOfInfamy.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.ExaltedAbility; diff --git a/Mage.Sets/src/mage/sets/magic2013/KrenkoMobBoss.java b/Mage.Sets/src/mage/sets/magic2013/KrenkoMobBoss.java index 887e639d30f..195c3eaf4b9 100644 --- a/Mage.Sets/src/mage/sets/magic2013/KrenkoMobBoss.java +++ b/Mage.Sets/src/mage/sets/magic2013/KrenkoMobBoss.java @@ -28,9 +28,9 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/magic2013/KrenkosCommand.java b/Mage.Sets/src/mage/sets/magic2013/KrenkosCommand.java index 1847971a7f8..dad8515ff52 100644 --- a/Mage.Sets/src/mage/sets/magic2013/KrenkosCommand.java +++ b/Mage.Sets/src/mage/sets/magic2013/KrenkosCommand.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.game.permanent.token.GoblinToken; diff --git a/Mage.Sets/src/mage/sets/magic2013/LilianaOfTheDarkRealms.java b/Mage.Sets/src/mage/sets/magic2013/LilianaOfTheDarkRealms.java index a5b89e4d9a2..12d89373c7f 100644 --- a/Mage.Sets/src/mage/sets/magic2013/LilianaOfTheDarkRealms.java +++ b/Mage.Sets/src/mage/sets/magic2013/LilianaOfTheDarkRealms.java @@ -28,14 +28,14 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.Mana; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; diff --git a/Mage.Sets/src/mage/sets/magic2013/LilianasShade.java b/Mage.Sets/src/mage/sets/magic2013/LilianasShade.java index 44125f7d37b..f42dc091d98 100644 --- a/Mage.Sets/src/mage/sets/magic2013/LilianasShade.java +++ b/Mage.Sets/src/mage/sets/magic2013/LilianasShade.java @@ -28,10 +28,10 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/magic2013/Magmaquake.java b/Mage.Sets/src/mage/sets/magic2013/Magmaquake.java index d07f775ee2c..4daf9340350 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Magmaquake.java +++ b/Mage.Sets/src/mage/sets/magic2013/Magmaquake.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/magic2013/MarkOfTheVampire.java b/Mage.Sets/src/mage/sets/magic2013/MarkOfTheVampire.java index 07a3dee2952..ec35788a2ba 100644 --- a/Mage.Sets/src/mage/sets/magic2013/MarkOfTheVampire.java +++ b/Mage.Sets/src/mage/sets/magic2013/MarkOfTheVampire.java @@ -28,12 +28,12 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continious.BoostEnchantedEffect; diff --git a/Mage.Sets/src/mage/sets/magic2013/MasterOfThePearlTrident.java b/Mage.Sets/src/mage/sets/magic2013/MasterOfThePearlTrident.java index e8fdcdeeeaf..532a9ad3e58 100644 --- a/Mage.Sets/src/mage/sets/magic2013/MasterOfThePearlTrident.java +++ b/Mage.Sets/src/mage/sets/magic2013/MasterOfThePearlTrident.java @@ -28,10 +28,10 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; diff --git a/Mage.Sets/src/mage/sets/magic2013/MindSculpt.java b/Mage.Sets/src/mage/sets/magic2013/MindSculpt.java index 5cedb19488a..5ada88a2ec0 100644 --- a/Mage.Sets/src/mage/sets/magic2013/MindSculpt.java +++ b/Mage.Sets/src/mage/sets/magic2013/MindSculpt.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetOpponent; diff --git a/Mage.Sets/src/mage/sets/magic2013/MindclawShaman.java b/Mage.Sets/src/mage/sets/magic2013/MindclawShaman.java index 97b08a007c1..37185615304 100644 --- a/Mage.Sets/src/mage/sets/magic2013/MindclawShaman.java +++ b/Mage.Sets/src/mage/sets/magic2013/MindclawShaman.java @@ -28,15 +28,17 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -88,7 +90,7 @@ class MindclawShamanEffect extends OneShotEffect { } public MindclawShamanEffect() { - super(Constants.Outcome.Discard); + super(Outcome.Discard); this.staticText = "target opponent reveals his or her hand. You may cast an instant or sorcery card from it without paying its mana cost"; } @@ -109,14 +111,14 @@ class MindclawShamanEffect extends OneShotEffect { targetOpponent.revealCards("Mindclaw Shaman", targetOpponent.getHand(), game); Player you = game.getPlayer(source.getControllerId()); if (you != null) { - TargetCard target = new TargetCard(Constants.Zone.PICK, filter); + TargetCard target = new TargetCard(Zone.PICK, filter); target.setRequired(true); target.setNotTarget(true); - if (you.choose(Constants.Outcome.Benefit, targetOpponent.getHand(), target, game)) { + if (you.choose(Outcome.Benefit, targetOpponent.getHand(), target, game)) { Card chosenCard = targetOpponent.getHand().get(target.getFirstTarget(), game); if (chosenCard != null) { if (targetOpponent != null) { - if (you.chooseUse(Constants.Outcome.Benefit, "Cast the chosen card?", game)) { + if (you.chooseUse(Outcome.Benefit, "Cast the chosen card?", game)) { you.cast(chosenCard.getSpellAbility(), game, true); } else { game.informPlayers("Mindclaw Shaman: " + you.getName() + " canceled casting the card."); diff --git a/Mage.Sets/src/mage/sets/magic2013/MoggFlunkies.java b/Mage.Sets/src/mage/sets/magic2013/MoggFlunkies.java index 24353891c41..bf8e61d3ab4 100644 --- a/Mage.Sets/src/mage/sets/magic2013/MoggFlunkies.java +++ b/Mage.Sets/src/mage/sets/magic2013/MoggFlunkies.java @@ -27,8 +27,8 @@ */ package mage.sets.magic2013; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.CantAttackAloneAbility; import mage.abilities.keyword.CantBlockAloneAbility; diff --git a/Mage.Sets/src/mage/sets/magic2013/Murder.java b/Mage.Sets/src/mage/sets/magic2013/Murder.java index e7cc95d7041..c2bd6d86ec6 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Murder.java +++ b/Mage.Sets/src/mage/sets/magic2013/Murder.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/magic2013/Mutilate.java b/Mage.Sets/src/mage/sets/magic2013/Mutilate.java index 7b2341353b6..df277628809 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Mutilate.java +++ b/Mage.Sets/src/mage/sets/magic2013/Mutilate.java @@ -28,10 +28,10 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continious.BoostAllEffect; diff --git a/Mage.Sets/src/mage/sets/magic2013/MwonvuliBeastTracker.java b/Mage.Sets/src/mage/sets/magic2013/MwonvuliBeastTracker.java index 45a20a6e729..93dde8dee21 100644 --- a/Mage.Sets/src/mage/sets/magic2013/MwonvuliBeastTracker.java +++ b/Mage.Sets/src/mage/sets/magic2013/MwonvuliBeastTracker.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutOnLibraryEffect; diff --git a/Mage.Sets/src/mage/sets/magic2013/NefaroxOverlordOfGrixis.java b/Mage.Sets/src/mage/sets/magic2013/NefaroxOverlordOfGrixis.java index 34e56462484..35287863ca7 100644 --- a/Mage.Sets/src/mage/sets/magic2013/NefaroxOverlordOfGrixis.java +++ b/Mage.Sets/src/mage/sets/magic2013/NefaroxOverlordOfGrixis.java @@ -27,15 +27,15 @@ */ package mage.sets.magic2013; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.SacrificeEffect; import mage.abilities.keyword.ExaltedAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; @@ -88,7 +88,7 @@ class NefaroxOverlordOfGrixisTriggeredAbility extends TriggeredAbilityImpl { class OdricMasterTacticianTriggeredAbility extends TriggeredAbilityImpl { public OdricMasterTacticianTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new OdricMasterTacticianEffect()); + super(Zone.BATTLEFIELD, new OdricMasterTacticianEffect()); } public OdricMasterTacticianTriggeredAbility(final OdricMasterTacticianTriggeredAbility ability) { @@ -125,7 +123,7 @@ class OdricMasterTacticianTriggeredAbility extends TriggeredAbilityImpl { public OdricMasterTacticianEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); } public OdricMasterTacticianEffect(final OdricMasterTacticianEffect effect) { diff --git a/Mage.Sets/src/mage/sets/magic2013/Omniscience.java b/Mage.Sets/src/mage/sets/magic2013/Omniscience.java index de5676d0e39..d5cd0bb45db 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Omniscience.java +++ b/Mage.Sets/src/mage/sets/magic2013/Omniscience.java @@ -27,7 +27,6 @@ */ package mage.sets.magic2013; -import mage.Constants.*; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.common.SimpleStaticAbility; @@ -36,6 +35,7 @@ import mage.abilities.keyword.FlashbackAbility; import mage.abilities.keyword.RetraceAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.*; import mage.game.Game; import mage.game.stack.Spell; import mage.game.stack.StackObject; diff --git a/Mage.Sets/src/mage/sets/magic2013/PhyrexianHulk.java b/Mage.Sets/src/mage/sets/magic2013/PhyrexianHulk.java index 3542e93bfbd..86c9437e3cd 100644 --- a/Mage.Sets/src/mage/sets/magic2013/PhyrexianHulk.java +++ b/Mage.Sets/src/mage/sets/magic2013/PhyrexianHulk.java @@ -28,7 +28,7 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/magic2013/PredatoryRampage.java b/Mage.Sets/src/mage/sets/magic2013/PredatoryRampage.java index 5573c33e713..40a938ef997 100644 --- a/Mage.Sets/src/mage/sets/magic2013/PredatoryRampage.java +++ b/Mage.Sets/src/mage/sets/magic2013/PredatoryRampage.java @@ -27,10 +27,10 @@ */ package mage.sets.magic2013; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.abilities.Ability; import mage.abilities.effects.RequirementEffect; import mage.abilities.effects.common.AddContinuousEffectToGame; diff --git a/Mage.Sets/src/mage/sets/magic2013/PrimalClay.java b/Mage.Sets/src/mage/sets/magic2013/PrimalClay.java index b63e348be56..384d052aebf 100644 --- a/Mage.Sets/src/mage/sets/magic2013/PrimalClay.java +++ b/Mage.Sets/src/mage/sets/magic2013/PrimalClay.java @@ -28,7 +28,7 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/magic2013/PrimalHuntbeast.java b/Mage.Sets/src/mage/sets/magic2013/PrimalHuntbeast.java index 426d84909b5..209a1b1bfc5 100644 --- a/Mage.Sets/src/mage/sets/magic2013/PrimalHuntbeast.java +++ b/Mage.Sets/src/mage/sets/magic2013/PrimalHuntbeast.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2013/PrizedElephant.java b/Mage.Sets/src/mage/sets/magic2013/PrizedElephant.java index 46b5086cd96..cae3902b147 100644 --- a/Mage.Sets/src/mage/sets/magic2013/PrizedElephant.java +++ b/Mage.Sets/src/mage/sets/magic2013/PrizedElephant.java @@ -28,9 +28,9 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +42,8 @@ import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -68,12 +70,12 @@ public class PrizedElephant extends CardImpl { this.toughness = new MageInt(3); // Prized Elephant gets +1/+1 as long as you control a Forest. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, - new ConditionalContinousEffect(new BoostSourceEffect(1, 1, Constants.Duration.WhileOnBattlefield), + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + new ConditionalContinousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new ControlsPermanentCondition(filter), rule))); // {G}: Prized Elephant gains trample until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(), Constants.Duration.EndOfTurn), new ManaCostsImpl("{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{G}")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2013/PublicExecution.java b/Mage.Sets/src/mage/sets/magic2013/PublicExecution.java index 4b68b0904d5..4edc7d05d5b 100644 --- a/Mage.Sets/src/mage/sets/magic2013/PublicExecution.java +++ b/Mage.Sets/src/mage/sets/magic2013/PublicExecution.java @@ -28,10 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; @@ -84,7 +82,7 @@ public class PublicExecution extends CardImpl { class PublicExecutionEffect extends OneShotEffect { public PublicExecutionEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "Each other creature that player controls gets -2/-0 until end of turn"; } @@ -94,14 +92,14 @@ class PublicExecutionEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent target = (Permanent) game.getLastKnownInformation(source.getFirstTarget(), Constants.Zone.BATTLEFIELD); + Permanent target = (Permanent) game.getLastKnownInformation(source.getFirstTarget(), Zone.BATTLEFIELD); if (target != null) { UUID opponent = target.getControllerId(); if (opponent != null) { FilterCreaturePermanent filter = new FilterCreaturePermanent("each other creature that player controls"); filter.add(new ControllerIdPredicate(opponent)); filter.add(Predicates.not(new PermanentIdPredicate(target.getId()))); - ContinuousEffect effect = new BoostAllEffect(-2,0, Constants.Duration.EndOfTurn, filter, false); + ContinuousEffect effect = new BoostAllEffect(-2,0, Duration.EndOfTurn, filter, false); game.addEffect(effect, source); return true; } diff --git a/Mage.Sets/src/mage/sets/magic2013/RainOfBlades.java b/Mage.Sets/src/mage/sets/magic2013/RainOfBlades.java index ac6b57aa16d..d9db8179fe6 100644 --- a/Mage.Sets/src/mage/sets/magic2013/RainOfBlades.java +++ b/Mage.Sets/src/mage/sets/magic2013/RainOfBlades.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageAllEffect; import mage.cards.CardImpl; import mage.filter.common.FilterAttackingCreature; diff --git a/Mage.Sets/src/mage/sets/magic2013/Rancor.java b/Mage.Sets/src/mage/sets/magic2013/Rancor.java index ae3de2d5eda..5b2f438a51e 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Rancor.java +++ b/Mage.Sets/src/mage/sets/magic2013/Rancor.java @@ -28,7 +28,7 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/magic2013/RangersPath.java b/Mage.Sets/src/mage/sets/magic2013/RangersPath.java index 58097c6137e..8751182e3e5 100644 --- a/Mage.Sets/src/mage/sets/magic2013/RangersPath.java +++ b/Mage.Sets/src/mage/sets/magic2013/RangersPath.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.filter.common.FilterLandCard; diff --git a/Mage.Sets/src/mage/sets/magic2013/RecklessBrute.java b/Mage.Sets/src/mage/sets/magic2013/RecklessBrute.java index 9d347fadc43..7627d7b56c6 100644 --- a/Mage.Sets/src/mage/sets/magic2013/RecklessBrute.java +++ b/Mage.Sets/src/mage/sets/magic2013/RecklessBrute.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.keyword.HasteAbility; diff --git a/Mage.Sets/src/mage/sets/magic2013/Revive.java b/Mage.Sets/src/mage/sets/magic2013/Revive.java index 083c5ece5fa..2b1e24568cc 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Revive.java +++ b/Mage.Sets/src/mage/sets/magic2013/Revive.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2013/Rewind.java b/Mage.Sets/src/mage/sets/magic2013/Rewind.java index 5a7a95ce5af..cf3cb5d9a20 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Rewind.java +++ b/Mage.Sets/src/mage/sets/magic2013/Rewind.java @@ -28,7 +28,7 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/magic2013/RhoxFaithmender.java b/Mage.Sets/src/mage/sets/magic2013/RhoxFaithmender.java index f34edc1ebb7..52107590a48 100644 --- a/Mage.Sets/src/mage/sets/magic2013/RhoxFaithmender.java +++ b/Mage.Sets/src/mage/sets/magic2013/RhoxFaithmender.java @@ -28,9 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -60,7 +59,7 @@ public class RhoxFaithmender extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // If you would gain life, you gain twice that much life instead. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new RhoxFaithmenderEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new RhoxFaithmenderEffect())); } public RhoxFaithmender(final RhoxFaithmender card) { @@ -76,7 +75,7 @@ public class RhoxFaithmender extends CardImpl { class RhoxFaithmenderEffect extends ReplacementEffectImpl { public RhoxFaithmenderEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "If you would gain life, you gain twice that much life instead"; } diff --git a/Mage.Sets/src/mage/sets/magic2013/RingOfEvosIsle.java b/Mage.Sets/src/mage/sets/magic2013/RingOfEvosIsle.java index e39ecb45a78..6439644fc60 100644 --- a/Mage.Sets/src/mage/sets/magic2013/RingOfEvosIsle.java +++ b/Mage.Sets/src/mage/sets/magic2013/RingOfEvosIsle.java @@ -28,13 +28,13 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2013/RingOfKalonia.java b/Mage.Sets/src/mage/sets/magic2013/RingOfKalonia.java index 55095934528..5d7095b2520 100644 --- a/Mage.Sets/src/mage/sets/magic2013/RingOfKalonia.java +++ b/Mage.Sets/src/mage/sets/magic2013/RingOfKalonia.java @@ -28,9 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.ObjectColor; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -64,15 +63,15 @@ public class RingOfKalonia extends CardImpl { this.subtype.add("Equipment"); // Equipped creature has trample. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT))); // At the beginning of your upkeep, put a +1/+1 counter on equipped creature if it's green. - TriggeredAbility triggeredAbility = new BeginningOfUpkeepTriggeredAbility(Constants.Zone.BATTLEFIELD, new AddPlusOneCountersAttachedEffect(1), Constants.TargetController.YOU, false); + TriggeredAbility triggeredAbility = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new AddPlusOneCountersAttachedEffect(1), TargetController.YOU, false); ConditionalTriggeredAbility ability = new ConditionalTriggeredAbility(triggeredAbility, new EquippedMatchesFilterCondition(filter), "At the beginning of your upkeep, put a +1/+1 counter on equipped creature if it's green"); this.addAbility(ability); // Equip {1} - this.addAbility(new EquipAbility(Constants.Outcome.BoostCreature, new GenericManaCost(1))); + this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(1))); } public RingOfKalonia(final RingOfKalonia card) { diff --git a/Mage.Sets/src/mage/sets/magic2013/RingOfThune.java b/Mage.Sets/src/mage/sets/magic2013/RingOfThune.java index a8fa0fde488..6624eb7d807 100644 --- a/Mage.Sets/src/mage/sets/magic2013/RingOfThune.java +++ b/Mage.Sets/src/mage/sets/magic2013/RingOfThune.java @@ -28,9 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.ObjectColor; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -64,15 +63,15 @@ public class RingOfThune extends CardImpl { this.subtype.add("Equipment"); // Equipped creature has vigilance. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.EQUIPMENT))); // At the beginning of your upkeep, put a +1/+1 counter on equipped creature if it's white. - TriggeredAbility triggeredAbility = new BeginningOfUpkeepTriggeredAbility(Constants.Zone.BATTLEFIELD, new AddPlusOneCountersAttachedEffect(1), Constants.TargetController.YOU, false); + TriggeredAbility triggeredAbility = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new AddPlusOneCountersAttachedEffect(1), TargetController.YOU, false); ConditionalTriggeredAbility ability = new ConditionalTriggeredAbility(triggeredAbility, new EquippedMatchesFilterCondition(filter), "At the beginning of your upkeep, put a +1/+1 counter on equipped creature if it's white"); this.addAbility(ability); // Equip {1} - this.addAbility(new EquipAbility(Constants.Outcome.BoostCreature, new GenericManaCost(1))); + this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(1))); } public RingOfThune(final RingOfThune card) { diff --git a/Mage.Sets/src/mage/sets/magic2013/RingOfValkas.java b/Mage.Sets/src/mage/sets/magic2013/RingOfValkas.java index b5f4da5a6df..0ae4b132908 100644 --- a/Mage.Sets/src/mage/sets/magic2013/RingOfValkas.java +++ b/Mage.Sets/src/mage/sets/magic2013/RingOfValkas.java @@ -28,9 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.ObjectColor; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -64,15 +63,15 @@ public class RingOfValkas extends CardImpl { this.subtype.add("Equipment"); // Equipped creature has haste. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HasteAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.EQUIPMENT))); // At the beginning of your upkeep, put a +1/+1 counter on equipped creature if it's red. - TriggeredAbility triggeredAbility = new BeginningOfUpkeepTriggeredAbility(Constants.Zone.BATTLEFIELD, new AddPlusOneCountersAttachedEffect(1), Constants.TargetController.YOU, false); + TriggeredAbility triggeredAbility = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new AddPlusOneCountersAttachedEffect(1), TargetController.YOU, false); ConditionalTriggeredAbility ability = new ConditionalTriggeredAbility(triggeredAbility, new EquippedMatchesFilterCondition(filter), "At the beginning of your upkeep, put a +1/+1 counter on equipped creature if it's red"); this.addAbility(ability); // Equip {1} - this.addAbility(new EquipAbility(Constants.Outcome.BoostCreature, new GenericManaCost(1))); + this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(1))); } public RingOfValkas(final RingOfValkas card) { diff --git a/Mage.Sets/src/mage/sets/magic2013/RingOfXathrid.java b/Mage.Sets/src/mage/sets/magic2013/RingOfXathrid.java index 35cc2c13f67..69426663d4f 100644 --- a/Mage.Sets/src/mage/sets/magic2013/RingOfXathrid.java +++ b/Mage.Sets/src/mage/sets/magic2013/RingOfXathrid.java @@ -28,9 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.ObjectColor; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -63,15 +62,15 @@ public class RingOfXathrid extends CardImpl { this.subtype.add("Equipment"); // {2}: Regenerate equipped creature. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateAttachedEffect(Constants.AttachmentType.EQUIPMENT), new GenericManaCost(2))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.EQUIPMENT), new GenericManaCost(2))); // At the beginning of your upkeep, put a +1/+1 counter on equipped creature if it's black. - TriggeredAbility triggeredAbility = new BeginningOfUpkeepTriggeredAbility(Constants.Zone.BATTLEFIELD, new AddPlusOneCountersAttachedEffect(1), Constants.TargetController.YOU, false); + TriggeredAbility triggeredAbility = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new AddPlusOneCountersAttachedEffect(1), TargetController.YOU, false); ConditionalTriggeredAbility ability = new ConditionalTriggeredAbility(triggeredAbility, new EquippedMatchesFilterCondition(filter), "At the beginning of your upkeep, put a +1/+1 counter on equipped creature if it's black"); this.addAbility(ability); // Equip {1} - this.addAbility(new EquipAbility(Constants.Outcome.BoostCreature, new GenericManaCost(1))); + this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(1))); } public RingOfXathrid(final RingOfXathrid card) { diff --git a/Mage.Sets/src/mage/sets/magic2013/RoaringPrimadox.java b/Mage.Sets/src/mage/sets/magic2013/RoaringPrimadox.java index e2847b572fe..721451a585a 100644 --- a/Mage.Sets/src/mage/sets/magic2013/RoaringPrimadox.java +++ b/Mage.Sets/src/mage/sets/magic2013/RoaringPrimadox.java @@ -28,10 +28,10 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2013/RummagingGoblin.java b/Mage.Sets/src/mage/sets/magic2013/RummagingGoblin.java index 290415a30b0..623c10eab90 100644 --- a/Mage.Sets/src/mage/sets/magic2013/RummagingGoblin.java +++ b/Mage.Sets/src/mage/sets/magic2013/RummagingGoblin.java @@ -28,9 +28,9 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.DiscardTargetCost; diff --git a/Mage.Sets/src/mage/sets/magic2013/SandsOfDelirium.java b/Mage.Sets/src/mage/sets/magic2013/SandsOfDelirium.java index 4d4e6a0e76c..1b8344f7e0a 100644 --- a/Mage.Sets/src/mage/sets/magic2013/SandsOfDelirium.java +++ b/Mage.Sets/src/mage/sets/magic2013/SandsOfDelirium.java @@ -30,9 +30,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -40,6 +39,7 @@ import mage.abilities.costs.mana.VariableManaCost; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetPlayer; /** @@ -53,7 +53,7 @@ public class SandsOfDelirium extends CardImpl { this.expansionSetCode = "M13"; // {X}, {tap}: Target player puts the top X cards of his or her library into his or her graveyard. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(new ManacostVariableValue()), new VariableManaCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(new ManacostVariableValue()), new VariableManaCost()); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/magic2013/SearingSpear.java b/Mage.Sets/src/mage/sets/magic2013/SearingSpear.java index fe79bd19bd4..eb3837300b3 100644 --- a/Mage.Sets/src/mage/sets/magic2013/SearingSpear.java +++ b/Mage.Sets/src/mage/sets/magic2013/SearingSpear.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreatureOrPlayer; diff --git a/Mage.Sets/src/mage/sets/magic2013/SentinelSpider.java b/Mage.Sets/src/mage/sets/magic2013/SentinelSpider.java index 6957b71da9a..4b85fd5452e 100644 --- a/Mage.Sets/src/mage/sets/magic2013/SentinelSpider.java +++ b/Mage.Sets/src/mage/sets/magic2013/SentinelSpider.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; import mage.abilities.keyword.ReachAbility; diff --git a/Mage.Sets/src/mage/sets/magic2013/SerpentsGift.java b/Mage.Sets/src/mage/sets/magic2013/SerpentsGift.java index 7c31cfe481e..3d2fd3c7a14 100644 --- a/Mage.Sets/src/mage/sets/magic2013/SerpentsGift.java +++ b/Mage.Sets/src/mage/sets/magic2013/SerpentsGift.java @@ -28,9 +28,9 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2013/SerraAngel.java b/Mage.Sets/src/mage/sets/magic2013/SerraAngel.java index dfd15969264..fabbf026ebf 100644 --- a/Mage.Sets/src/mage/sets/magic2013/SerraAngel.java +++ b/Mage.Sets/src/mage/sets/magic2013/SerraAngel.java @@ -28,7 +28,7 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/magic2013/SerraAvatar.java b/Mage.Sets/src/mage/sets/magic2013/SerraAvatar.java index 34dfca27258..b98a0842993 100644 --- a/Mage.Sets/src/mage/sets/magic2013/SerraAvatar.java +++ b/Mage.Sets/src/mage/sets/magic2013/SerraAvatar.java @@ -28,7 +28,7 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/magic2013/ServantOfNefarox.java b/Mage.Sets/src/mage/sets/magic2013/ServantOfNefarox.java index 185ea7bd806..bab089e4c52 100644 --- a/Mage.Sets/src/mage/sets/magic2013/ServantOfNefarox.java +++ b/Mage.Sets/src/mage/sets/magic2013/ServantOfNefarox.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ExaltedAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2013/ShimianSpecter.java b/Mage.Sets/src/mage/sets/magic2013/ShimianSpecter.java index 2acece096ad..435ad2ac12e 100644 --- a/Mage.Sets/src/mage/sets/magic2013/ShimianSpecter.java +++ b/Mage.Sets/src/mage/sets/magic2013/ShimianSpecter.java @@ -28,9 +28,9 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -40,6 +40,8 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -88,7 +90,7 @@ class ShimianSpecterEffect extends OneShotEffect { } public ShimianSpecterEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "that player reveals his or her hand. You choose a nonland card from it. Search that player's graveyard, hand, and library for all cards with the same name as that card and exile them. Then that player shuffles his or her library"; } @@ -103,24 +105,24 @@ class ShimianSpecterEffect extends OneShotEffect { if (damagedPlayer != null && you != null) { damagedPlayer.revealCards("Shimian Specter", damagedPlayer.getHand(), game); - TargetCard target = new TargetCard(Constants.Zone.PICK, filter); + TargetCard target = new TargetCard(Zone.PICK, filter); target.setRequired(true); target.setNotTarget(true); - if (you.choose(Constants.Outcome.Benefit, damagedPlayer.getHand(), target, game)) { + if (you.choose(Outcome.Benefit, damagedPlayer.getHand(), target, game)) { Card chosenCard = damagedPlayer.getHand().get(target.getFirstTarget(), game); if (chosenCard != null && damagedPlayer != null) { //cards in Library - Cards cardsInLibrary = new CardsImpl(Constants.Zone.LIBRARY); + Cards cardsInLibrary = new CardsImpl(Zone.LIBRARY); cardsInLibrary.addAll(damagedPlayer.getLibrary().getCards(game)); you.lookAtCards(damagedPlayer.getName() + ": cards in library", cardsInLibrary, game); // cards in Graveyard - Cards cardsInGraveyard = new CardsImpl(Constants.Zone.GRAVEYARD); + Cards cardsInGraveyard = new CardsImpl(Zone.GRAVEYARD); cardsInGraveyard.addAll(damagedPlayer.getGraveyard()); // cards in Hand - Cards cardsInHand = new CardsImpl(Constants.Zone.HAND); + Cards cardsInHand = new CardsImpl(Zone.HAND); cardsInHand.addAll(damagedPlayer.getHand()); you.lookAtCards(damagedPlayer.getName() + ": cards in hand", cardsInHand, game); diff --git a/Mage.Sets/src/mage/sets/magic2013/ShowOfValor.java b/Mage.Sets/src/mage/sets/magic2013/ShowOfValor.java index b340b0c5763..90d06163b15 100644 --- a/Mage.Sets/src/mage/sets/magic2013/ShowOfValor.java +++ b/Mage.Sets/src/mage/sets/magic2013/ShowOfValor.java @@ -28,9 +28,9 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/magic2013/SlumberingDragon.java b/Mage.Sets/src/mage/sets/magic2013/SlumberingDragon.java index 59ec945cb01..0c7b4e08253 100644 --- a/Mage.Sets/src/mage/sets/magic2013/SlumberingDragon.java +++ b/Mage.Sets/src/mage/sets/magic2013/SlumberingDragon.java @@ -28,9 +28,9 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -39,6 +39,8 @@ import mage.abilities.effects.RestrictionEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; @@ -64,7 +66,7 @@ public class SlumberingDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Slumbering Dragon can't attack or block unless it has five or more +1/+1 counters on it. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new SlumberingDragonEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SlumberingDragonEffect())); // Whenever a creature attacks you or a planeswalker you control, put a +1/+1 counter on Slumbering Dragon. this.addAbility(new SlumberingDragonTriggeredAbility()); @@ -84,7 +86,7 @@ public class SlumberingDragon extends CardImpl { class SlumberingDragonEffect extends RestrictionEffect { public SlumberingDragonEffect() { - super(Constants.Duration.WhileOnBattlefield); + super(Duration.WhileOnBattlefield); staticText = "{this} can't attack or block unless it has five or more +1/+1 counters on it"; } @@ -123,7 +125,7 @@ class SlumberingDragonEffect extends RestrictionEffect { class SlumberingDragonTriggeredAbility extends TriggeredAbilityImpl { public SlumberingDragonTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false); + super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false); } public SlumberingDragonTriggeredAbility(final SlumberingDragonTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/magic2013/Smelt.java b/Mage.Sets/src/mage/sets/magic2013/Smelt.java index 25405eab748..c5488e6ed7a 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Smelt.java +++ b/Mage.Sets/src/mage/sets/magic2013/Smelt.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetArtifactPermanent; diff --git a/Mage.Sets/src/mage/sets/magic2013/Spelltwine.java b/Mage.Sets/src/mage/sets/magic2013/Spelltwine.java index d442c180976..09222baeb8d 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Spelltwine.java +++ b/Mage.Sets/src/mage/sets/magic2013/Spelltwine.java @@ -28,9 +28,9 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileSpellEffect; diff --git a/Mage.Sets/src/mage/sets/magic2013/SpikedBaloth.java b/Mage.Sets/src/mage/sets/magic2013/SpikedBaloth.java index e2130e8052f..5ca6f628a7f 100644 --- a/Mage.Sets/src/mage/sets/magic2013/SpikedBaloth.java +++ b/Mage.Sets/src/mage/sets/magic2013/SpikedBaloth.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2013/StaffOfNin.java b/Mage.Sets/src/mage/sets/magic2013/StaffOfNin.java index 8b28ceb4c9c..ba887612a72 100644 --- a/Mage.Sets/src/mage/sets/magic2013/StaffOfNin.java +++ b/Mage.Sets/src/mage/sets/magic2013/StaffOfNin.java @@ -29,9 +29,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; /** @@ -52,9 +53,9 @@ public class StaffOfNin extends CardImpl { this.expansionSetCode = "M13"; // At the beginning of your upkeep, draw a card. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DrawCardControllerEffect(1), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DrawCardControllerEffect(1), TargetController.YOU, false)); // {tap}: Staff of Nin deals 1 damage to target creature or player. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2013/SublimeArchangel.java b/Mage.Sets/src/mage/sets/magic2013/SublimeArchangel.java index 0b83a19639c..96a46a29c08 100644 --- a/Mage.Sets/src/mage/sets/magic2013/SublimeArchangel.java +++ b/Mage.Sets/src/mage/sets/magic2013/SublimeArchangel.java @@ -28,10 +28,10 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; diff --git a/Mage.Sets/src/mage/sets/magic2013/Switcheroo.java b/Mage.Sets/src/mage/sets/magic2013/Switcheroo.java index 9a4410890d7..12da6591a66 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Switcheroo.java +++ b/Mage.Sets/src/mage/sets/magic2013/Switcheroo.java @@ -27,11 +27,11 @@ */ package mage.sets.magic2013; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.ExchangeControlTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -50,7 +50,7 @@ public class Switcheroo extends CardImpl { this.color.setBlue(true); // Exchange control of two target creatures. - this.getSpellAbility().addEffect(new ExchangeControlTargetEffect(Constants.Duration.EndOfGame, rule)); + this.getSpellAbility().addEffect(new ExchangeControlTargetEffect(Duration.EndOfGame, rule)); this.getSpellAbility().addTarget(new TargetCreaturePermanent(2)); } diff --git a/Mage.Sets/src/mage/sets/magic2013/TalrandSkySummoner.java b/Mage.Sets/src/mage/sets/magic2013/TalrandSkySummoner.java index 65aecbea26d..401a57ed3c9 100644 --- a/Mage.Sets/src/mage/sets/magic2013/TalrandSkySummoner.java +++ b/Mage.Sets/src/mage/sets/magic2013/TalrandSkySummoner.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/magic2013/TalrandsInvocation.java b/Mage.Sets/src/mage/sets/magic2013/TalrandsInvocation.java index 1f507629acb..c22e69b8e7e 100644 --- a/Mage.Sets/src/mage/sets/magic2013/TalrandsInvocation.java +++ b/Mage.Sets/src/mage/sets/magic2013/TalrandsInvocation.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.game.permanent.token.DrakeToken; diff --git a/Mage.Sets/src/mage/sets/magic2013/Thragtusk.java b/Mage.Sets/src/mage/sets/magic2013/Thragtusk.java index a2bba59adb4..647a5e20827 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Thragtusk.java +++ b/Mage.Sets/src/mage/sets/magic2013/Thragtusk.java @@ -27,8 +27,8 @@ */ package mage.sets.magic2013; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.LeavesBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2013/ThundermawHellkite.java b/Mage.Sets/src/mage/sets/magic2013/ThundermawHellkite.java index 7e3f02236df..d49c05e7a4b 100644 --- a/Mage.Sets/src/mage/sets/magic2013/ThundermawHellkite.java +++ b/Mage.Sets/src/mage/sets/magic2013/ThundermawHellkite.java @@ -28,9 +28,9 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -39,6 +39,8 @@ import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -55,7 +57,7 @@ public class ThundermawHellkite extends CardImpl { static { filter.add(new AbilityPredicate(FlyingAbility.class)); - filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT)); + filter.add(new ControllerPredicate(TargetController.OPPONENT)); } public ThundermawHellkite(UUID ownerId) { @@ -94,7 +96,7 @@ class TapAllEffect extends OneShotEffect { private FilterCreaturePermanent filter; public TapAllEffect(FilterCreaturePermanent filter) { - super(Constants.Outcome.Tap); + super(Outcome.Tap); this.filter = filter; staticText = "Tap those creatures"; } diff --git a/Mage.Sets/src/mage/sets/magic2013/TimberpackWolf.java b/Mage.Sets/src/mage/sets/magic2013/TimberpackWolf.java index d7b26e6b14b..df315bd6231 100644 --- a/Mage.Sets/src/mage/sets/magic2013/TimberpackWolf.java +++ b/Mage.Sets/src/mage/sets/magic2013/TimberpackWolf.java @@ -28,14 +28,15 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.CardImpl; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.NamePredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -52,7 +53,7 @@ public class TimberpackWolf extends CardImpl { static { filter.add(new NamePredicate("Timberpack Wolf")); - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public TimberpackWolf(UUID ownerId) { @@ -65,7 +66,7 @@ public class TimberpackWolf extends CardImpl { this.toughness = new MageInt(2); // Timberpack Wolf gets +1/+1 for each other creature you control named Timberpack Wolf. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new TimberpackWolfEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TimberpackWolfEffect())); } public TimberpackWolf(final TimberpackWolf card) { @@ -81,7 +82,7 @@ public class TimberpackWolf extends CardImpl { class TimberpackWolfEffect extends ContinuousEffectImpl { public TimberpackWolfEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Layer.PTChangingEffects_7, Constants.SubLayer.ModifyPT_7c, Constants.Outcome.BoostCreature); + super(Duration.WhileOnBattlefield, Layer.PTChangingEffects_7, SubLayer.ModifyPT_7c, Outcome.BoostCreature); staticText = "{this} gets +1/+1 for each other creature you control named Timberpack Wolf"; } diff --git a/Mage.Sets/src/mage/sets/magic2013/TorchFiend.java b/Mage.Sets/src/mage/sets/magic2013/TorchFiend.java index 4113ec60a63..aaea6d18e72 100644 --- a/Mage.Sets/src/mage/sets/magic2013/TorchFiend.java +++ b/Mage.Sets/src/mage/sets/magic2013/TorchFiend.java @@ -28,7 +28,7 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/magic2013/TormodsCrypt.java b/Mage.Sets/src/mage/sets/magic2013/TormodsCrypt.java index a493425898c..8f624137c96 100644 --- a/Mage.Sets/src/mage/sets/magic2013/TormodsCrypt.java +++ b/Mage.Sets/src/mage/sets/magic2013/TormodsCrypt.java @@ -28,7 +28,7 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/magic2013/TouchOfTheEternal.java b/Mage.Sets/src/mage/sets/magic2013/TouchOfTheEternal.java index 2c7a4702db2..4520db5d304 100644 --- a/Mage.Sets/src/mage/sets/magic2013/TouchOfTheEternal.java +++ b/Mage.Sets/src/mage/sets/magic2013/TouchOfTheEternal.java @@ -28,9 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -52,7 +51,7 @@ public class TouchOfTheEternal extends CardImpl { this.color.setWhite(true); // At the beginning of your upkeep, count the number of permanents you control. Your life total becomes that number. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(Constants.Zone.BATTLEFIELD, new TouchOfTheEternalEffect(), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new TouchOfTheEternalEffect(), TargetController.YOU, false)); } public TouchOfTheEternal(final TouchOfTheEternal card) { @@ -68,7 +67,7 @@ public class TouchOfTheEternal extends CardImpl { class TouchOfTheEternalEffect extends OneShotEffect { public TouchOfTheEternalEffect() { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); this.staticText = "count the number of permanents you control. Your life total becomes that number"; } diff --git a/Mage.Sets/src/mage/sets/magic2013/TradingPost.java b/Mage.Sets/src/mage/sets/magic2013/TradingPost.java index 35499210606..202c2248414 100644 --- a/Mage.Sets/src/mage/sets/magic2013/TradingPost.java +++ b/Mage.Sets/src/mage/sets/magic2013/TradingPost.java @@ -28,9 +28,9 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -45,6 +45,7 @@ import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterArtifactCard; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -72,26 +73,26 @@ public class TradingPost extends CardImpl { this.expansionSetCode = "M13"; // {1}, {tap}, Discard a card: You gain 4 life. - Ability ability1 = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainLifeEffect(4), new GenericManaCost(1)); + Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(4), new GenericManaCost(1)); ability1.addCost(new TapSourceCost()); ability1.addCost(new DiscardTargetCost(new TargetCardInHand())); this.addAbility(ability1); // {1}, {tap}, Pay 1 life: Put a 0/1 white Goat creature token onto the battlefield. - Ability ability2 = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new GoatToken()), new GenericManaCost(1)); + Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GoatToken()), new GenericManaCost(1)); ability2.addCost(new TapSourceCost()); ability2.addCost(new PayLifeCost(1)); this.addAbility(ability2); // {1}, {tap}, Sacrifice a creature: Return target artifact card from your graveyard to your hand. - Ability ability3 = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), new GenericManaCost(1)); + Ability ability3 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), new GenericManaCost(1)); ability3.addTarget(new TargetCardInGraveyard(new FilterArtifactCard("artifact card in your graveyard"))); ability3.addCost(new TapSourceCost()); ability3.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); this.addAbility(ability3); // {1}, {tap}, Sacrifice an artifact: Draw a card. - Ability ability4 = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(1)); + Ability ability4 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(1)); ability4.addCost(new TapSourceCost()); ability4.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter2))); this.addAbility(ability4); @@ -111,7 +112,7 @@ public class TradingPost extends CardImpl { class GoatToken extends Token { public GoatToken() { super("Goat", "a 0/1 white Goat creature token"); - cardType.add(Constants.CardType.CREATURE); + cardType.add(CardType.CREATURE); color = ObjectColor.WHITE; subtype.add("Goat"); power = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/magic2013/TricksOfTheTrade.java b/Mage.Sets/src/mage/sets/magic2013/TricksOfTheTrade.java index 927a7a7fec2..95ec5fa0d6a 100644 --- a/Mage.Sets/src/mage/sets/magic2013/TricksOfTheTrade.java +++ b/Mage.Sets/src/mage/sets/magic2013/TricksOfTheTrade.java @@ -28,12 +28,12 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.UnblockableAttachedEffect; diff --git a/Mage.Sets/src/mage/sets/magic2013/VeilbornGhoul.java b/Mage.Sets/src/mage/sets/magic2013/VeilbornGhoul.java index fbba78052e9..32f4b2b72b2 100644 --- a/Mage.Sets/src/mage/sets/magic2013/VeilbornGhoul.java +++ b/Mage.Sets/src/mage/sets/magic2013/VeilbornGhoul.java @@ -28,9 +28,9 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/magic2013/VileRebirth.java b/Mage.Sets/src/mage/sets/magic2013/VileRebirth.java index 3d76159e636..2021db16668 100644 --- a/Mage.Sets/src/mage/sets/magic2013/VileRebirth.java +++ b/Mage.Sets/src/mage/sets/magic2013/VileRebirth.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2013/VoidStalker.java b/Mage.Sets/src/mage/sets/magic2013/VoidStalker.java index d6843af59ba..c19598fb695 100644 --- a/Mage.Sets/src/mage/sets/magic2013/VoidStalker.java +++ b/Mage.Sets/src/mage/sets/magic2013/VoidStalker.java @@ -29,9 +29,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -60,7 +61,7 @@ public class VoidStalker extends CardImpl { this.toughness = new MageInt(1); // {2}{U}, {tap}: Put Void Stalker and target creature on top of their owners' libraries, then those players shuffle their libraries. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new VoidStalkerEffect(), new ManaCostsImpl("{2}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VoidStalkerEffect(), new ManaCostsImpl("{2}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); @@ -78,7 +79,7 @@ public class VoidStalker extends CardImpl { class VoidStalkerEffect extends OneShotEffect { VoidStalkerEffect() { - super(Constants.Outcome.ReturnToHand); + super(Outcome.ReturnToHand); staticText = "Put {this} and target creature on top of their owners' libraries, then those players shuffle their libraries"; } @@ -91,13 +92,13 @@ class VoidStalkerEffect extends OneShotEffect { Permanent p = game.getPermanent(targetPointer.getFirst(game, source)); Permanent s = game.getPermanent(source.getSourceId()); if (p != null) { - p.moveToZone(Constants.Zone.LIBRARY, source.getSourceId(), game, true); + p.moveToZone(Zone.LIBRARY, source.getSourceId(), game, true); Player pl = game.getPlayer(p.getControllerId()); if (pl != null) pl.shuffleLibrary(game); } if (s != null) { - s.moveToZone(Constants.Zone.LIBRARY, source.getSourceId(), game, true); + s.moveToZone(Zone.LIBRARY, source.getSourceId(), game, true); Player pl = game.getPlayer(s.getControllerId()); if (pl != null) pl.shuffleLibrary(game); diff --git a/Mage.Sets/src/mage/sets/magic2013/VolcanicGeyser.java b/Mage.Sets/src/mage/sets/magic2013/VolcanicGeyser.java index bbb039ecf53..332a0247839 100644 --- a/Mage.Sets/src/mage/sets/magic2013/VolcanicGeyser.java +++ b/Mage.Sets/src/mage/sets/magic2013/VolcanicGeyser.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2013/WallOfFire.java b/Mage.Sets/src/mage/sets/magic2013/WallOfFire.java index 9fa63a11f65..0d3302acdb5 100644 --- a/Mage.Sets/src/mage/sets/magic2013/WallOfFire.java +++ b/Mage.Sets/src/mage/sets/magic2013/WallOfFire.java @@ -28,7 +28,7 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/magic2013/WarFalcon.java b/Mage.Sets/src/mage/sets/magic2013/WarFalcon.java index 57019056373..ce46dd0a520 100644 --- a/Mage.Sets/src/mage/sets/magic2013/WarFalcon.java +++ b/Mage.Sets/src/mage/sets/magic2013/WarFalcon.java @@ -28,15 +28,17 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.RestrictionEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -62,7 +64,7 @@ public class WarFalcon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // War Falcon can't attack unless you control a Knight or a Soldier. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new WarFalconEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WarFalconEffect())); } public WarFalcon(final WarFalcon card) { @@ -86,7 +88,7 @@ class WarFalconEffect extends RestrictionEffect { } public WarFalconEffect() { - super(Constants.Duration.WhileOnBattlefield); + super(Duration.WhileOnBattlefield); staticText = "{this} can't attack unless you control a Knight or a Soldier"; } diff --git a/Mage.Sets/src/mage/sets/magic2013/WarclampMastiff.java b/Mage.Sets/src/mage/sets/magic2013/WarclampMastiff.java index 5f89e1ba6fc..9ded5db2d4b 100644 --- a/Mage.Sets/src/mage/sets/magic2013/WarclampMastiff.java +++ b/Mage.Sets/src/mage/sets/magic2013/WarclampMastiff.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2013/Watercourser.java b/Mage.Sets/src/mage/sets/magic2013/Watercourser.java index ff183b4efb3..72d07c59ada 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Watercourser.java +++ b/Mage.Sets/src/mage/sets/magic2013/Watercourser.java @@ -28,10 +28,10 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/magic2013/WildGuess.java b/Mage.Sets/src/mage/sets/magic2013/WildGuess.java index bf8450be8eb..cda2bcea42d 100644 --- a/Mage.Sets/src/mage/sets/magic2013/WildGuess.java +++ b/Mage.Sets/src/mage/sets/magic2013/WildGuess.java @@ -28,8 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.common.DiscardTargetCost; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2013/WitsEnd.java b/Mage.Sets/src/mage/sets/magic2013/WitsEnd.java index 0345d164c06..289a7f4babd 100644 --- a/Mage.Sets/src/mage/sets/magic2013/WitsEnd.java +++ b/Mage.Sets/src/mage/sets/magic2013/WitsEnd.java @@ -29,9 +29,9 @@ package mage.sets.magic2013; import java.util.Set; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/magic2013/Worldfire.java b/Mage.Sets/src/mage/sets/magic2013/Worldfire.java index fe3c3de4b71..64cfcf3484e 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Worldfire.java +++ b/Mage.Sets/src/mage/sets/magic2013/Worldfire.java @@ -28,13 +28,14 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -71,7 +72,7 @@ class WorldfireEffect extends OneShotEffect { private static FilterPermanent filter = new FilterPermanent(); public WorldfireEffect() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); staticText = "Exile all permanents. Exile all cards from all hands and graveyards. Each player's life total becomes 1"; } diff --git a/Mage.Sets/src/mage/sets/magic2013/XathridGorgon.java b/Mage.Sets/src/mage/sets/magic2013/XathridGorgon.java index ccd6e7f1105..725ac376ade 100644 --- a/Mage.Sets/src/mage/sets/magic2013/XathridGorgon.java +++ b/Mage.Sets/src/mage/sets/magic2013/XathridGorgon.java @@ -28,9 +28,8 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -68,11 +67,11 @@ public class XathridGorgon extends CardImpl { this.addAbility(DeathtouchAbility.getInstance()); // {2}{B}, {tap}: Put a petrification counter on target creature. It gains defender and becomes a colorless artifact in addition to its other types. Its activated abilities can't be activated. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.PETRIFICATION.createInstance()), new ManaCostsImpl("{2}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.PETRIFICATION.createInstance()), new ManaCostsImpl("{2}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); - ability.addEffect(new GainAbilityTargetEffect(DefenderAbility.getInstance(), Constants.Duration.EndOfGame)); - ability.addEffect(new AddCardTypeTargetEffect(CardType.ARTIFACT, Constants.Duration.EndOfGame)); + ability.addEffect(new GainAbilityTargetEffect(DefenderAbility.getInstance(), Duration.EndOfGame)); + ability.addEffect(new AddCardTypeTargetEffect(CardType.ARTIFACT, Duration.EndOfGame)); ability.addEffect(new XathridGorgonEffect()); this.addAbility(ability); @@ -91,7 +90,7 @@ public class XathridGorgon extends CardImpl { class XathridGorgonEffect extends ReplacementEffectImpl { public XathridGorgonEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Detriment); + super(Duration.WhileOnBattlefield, Outcome.Detriment); staticText = "Its activated abilities can't be activated"; } diff --git a/Mage.Sets/src/mage/sets/magic2013/YevaNaturesHerald.java b/Mage.Sets/src/mage/sets/magic2013/YevaNaturesHerald.java index 4d3b2c2338f..028fdd32810 100644 --- a/Mage.Sets/src/mage/sets/magic2013/YevaNaturesHerald.java +++ b/Mage.Sets/src/mage/sets/magic2013/YevaNaturesHerald.java @@ -28,12 +28,12 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.AsThoughEffectType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AsThoughEffectType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/magic2013/YevasForcemage.java b/Mage.Sets/src/mage/sets/magic2013/YevasForcemage.java index 377015fd727..c5881b1e236 100644 --- a/Mage.Sets/src/mage/sets/magic2013/YevasForcemage.java +++ b/Mage.Sets/src/mage/sets/magic2013/YevasForcemage.java @@ -28,9 +28,9 @@ package mage.sets.magic2013; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Arrest.java b/Mage.Sets/src/mage/sets/mercadianmasques/Arrest.java index 9738c1628a3..baa0c96848b 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/Arrest.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/Arrest.java @@ -28,7 +28,7 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/BallistaSquad.java b/Mage.Sets/src/mage/sets/mercadianmasques/BallistaSquad.java index 7fb3a672f33..3614baeec5d 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/BallistaSquad.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/BallistaSquad.java @@ -28,9 +28,9 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +39,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetAttackingOrBlockingCreature; /** @@ -57,7 +58,7 @@ public class BallistaSquad extends CardImpl { this.toughness = new MageInt(2); // {X}{W}, {T}: Ballista Squad deals X damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(new ManacostVariableValue()), new ManaCostsImpl("{X}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new ManacostVariableValue()), new ManaCostsImpl("{X}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/BogSmugglers.java b/Mage.Sets/src/mage/sets/mercadianmasques/BogSmugglers.java index d07c35fdbe2..27446c0ee6e 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/BogSmugglers.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/BogSmugglers.java @@ -28,8 +28,8 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/CateranBrute.java b/Mage.Sets/src/mage/sets/mercadianmasques/CateranBrute.java index 5bdcf19341e..b35038d7af5 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/CateranBrute.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/CateranBrute.java @@ -29,9 +29,9 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/CateranEnforcer.java b/Mage.Sets/src/mage/sets/mercadianmasques/CateranEnforcer.java index 065ea97f009..f66673df282 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/CateranEnforcer.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/CateranEnforcer.java @@ -29,9 +29,9 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/CateranKidnappers.java b/Mage.Sets/src/mage/sets/mercadianmasques/CateranKidnappers.java index 0c89a9274a9..24c5d3c963f 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/CateranKidnappers.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/CateranKidnappers.java @@ -29,9 +29,9 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/CateranOverlord.java b/Mage.Sets/src/mage/sets/mercadianmasques/CateranOverlord.java index bce54df1e22..2977c90f679 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/CateranOverlord.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/CateranOverlord.java @@ -29,10 +29,10 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -72,7 +72,7 @@ public class CateranOverlord extends CardImpl { this.toughness = new MageInt(5); // Sacrifice a creature: Regenerate Cateran Overlord. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); // {6}, {T}: Search your library for a Mercenary permanent card with converted mana cost 6 or less and put it onto the battlefield. Then shuffle your library. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); ability.addManaCost(new GenericManaCost(6)); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/CateranPersuader.java b/Mage.Sets/src/mage/sets/mercadianmasques/CateranPersuader.java index 7047451da76..dcee3662ec2 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/CateranPersuader.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/CateranPersuader.java @@ -29,9 +29,9 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/CateranSlaver.java b/Mage.Sets/src/mage/sets/mercadianmasques/CateranSlaver.java index 71fa6eac24e..dd02039ae62 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/CateranSlaver.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/CateranSlaver.java @@ -29,9 +29,9 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/CateranSummons.java b/Mage.Sets/src/mage/sets/mercadianmasques/CateranSummons.java index a5c0e1c0e72..eaebcd57032 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/CateranSummons.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/CateranSummons.java @@ -29,8 +29,8 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreatureCard; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/ChoArrimBruiser.java b/Mage.Sets/src/mage/sets/mercadianmasques/ChoArrimBruiser.java index 3faee3e27ab..e8acd889b13 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/ChoArrimBruiser.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/ChoArrimBruiser.java @@ -28,8 +28,8 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/CollectiveUnconscious.java b/Mage.Sets/src/mage/sets/mercadianmasques/CollectiveUnconscious.java index d677a706a10..c6df2d70344 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/CollectiveUnconscious.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/CollectiveUnconscious.java @@ -28,8 +28,8 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/DartingMerfolk.java b/Mage.Sets/src/mage/sets/mercadianmasques/DartingMerfolk.java index 5c6844fa127..50299456186 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/DartingMerfolk.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/DartingMerfolk.java @@ -28,9 +28,9 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Dawnstrider.java b/Mage.Sets/src/mage/sets/mercadianmasques/Dawnstrider.java index bb60315b6b0..a643aa91ba5 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/Dawnstrider.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/Dawnstrider.java @@ -28,10 +28,10 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/DeadlyInsect.java b/Mage.Sets/src/mage/sets/mercadianmasques/DeadlyInsect.java index 77deda38dbf..c25b82289b2 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/DeadlyInsect.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/DeadlyInsect.java @@ -28,8 +28,8 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/DeepwoodGhoul.java b/Mage.Sets/src/mage/sets/mercadianmasques/DeepwoodGhoul.java index de278fd0061..131f92a4048 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/DeepwoodGhoul.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/DeepwoodGhoul.java @@ -28,14 +28,15 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -53,7 +54,7 @@ public class DeepwoodGhoul extends CardImpl { this.toughness = new MageInt(1); // Pay 2 life: Regenerate Deepwood Ghoul. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new PayLifeCost(2))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new PayLifeCost(2))); } public DeepwoodGhoul(final DeepwoodGhoul card) { diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/FreshVolunteers.java b/Mage.Sets/src/mage/sets/mercadianmasques/FreshVolunteers.java index a2aee7ef53c..5a1e8dc9b48 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/FreshVolunteers.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/FreshVolunteers.java @@ -28,8 +28,8 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/GerrardsIrregulars.java b/Mage.Sets/src/mage/sets/mercadianmasques/GerrardsIrregulars.java index c851f4a3b8e..2eeac1aaf7e 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/GerrardsIrregulars.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/GerrardsIrregulars.java @@ -28,8 +28,8 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.abilities.keyword.HasteAbility; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/HornedTroll.java b/Mage.Sets/src/mage/sets/mercadianmasques/HornedTroll.java index da86537bead..a14d497a166 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/HornedTroll.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/HornedTroll.java @@ -28,14 +28,15 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -53,7 +54,7 @@ public class HornedTroll extends CardImpl { this.toughness = new MageInt(2); // {G}: Regenerate Horned Troll. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{G}"))); } public HornedTroll(final HornedTroll card) { diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/JhovallQueen.java b/Mage.Sets/src/mage/sets/mercadianmasques/JhovallQueen.java index 15b79faabe0..ae4791a036f 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/JhovallQueen.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/JhovallQueen.java @@ -28,8 +28,8 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/JhovallRider.java b/Mage.Sets/src/mage/sets/mercadianmasques/JhovallRider.java index 850ec6f1b3e..d794717ce86 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/JhovallRider.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/JhovallRider.java @@ -28,8 +28,8 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/KyrenToy.java b/Mage.Sets/src/mage/sets/mercadianmasques/KyrenToy.java index 883afdada59..95c19aa6e6b 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/KyrenToy.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/KyrenToy.java @@ -28,9 +28,9 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +42,7 @@ import mage.abilities.effects.common.ManaEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.mana.BasicManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.players.Player; @@ -57,7 +58,7 @@ public class KyrenToy extends CardImpl { this.expansionSetCode = "MMQ"; // {1}, {T}: Put a charge counter on Kyren Toy. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance(1)), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance(1)), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/LandGrant.java b/Mage.Sets/src/mage/sets/mercadianmasques/LandGrant.java index dde23f10692..b467d2e65d8 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/LandGrant.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/LandGrant.java @@ -28,8 +28,8 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.CompositeCost; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Larceny.java b/Mage.Sets/src/mage/sets/mercadianmasques/Larceny.java index 853767d837c..e3a9279b7d3 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/Larceny.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/Larceny.java @@ -28,13 +28,14 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DiscardTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; @@ -70,7 +71,7 @@ public class Larceny extends CardImpl { class LarcenyTriggeredAbility extends TriggeredAbilityImpl { public LarcenyTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new DiscardTargetEffect(1), false); + super(Zone.BATTLEFIELD, new DiscardTargetEffect(1), false); } public LarcenyTriggeredAbility(final LarcenyTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/LightningHounds.java b/Mage.Sets/src/mage/sets/mercadianmasques/LightningHounds.java index 07255f44a1a..66ac42c56e5 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/LightningHounds.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/LightningHounds.java @@ -28,8 +28,8 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Misdirection.java b/Mage.Sets/src/mage/sets/mercadianmasques/Misdirection.java index 6cc7200aad0..cbb43fa1145 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/Misdirection.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/Misdirection.java @@ -28,9 +28,9 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.costs.AlternativeCostImpl; @@ -39,6 +39,7 @@ import mage.abilities.costs.CostsImpl; import mage.abilities.costs.common.ExileFromHandCost; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterSpell; import mage.filter.common.FilterOwnedCard; import mage.filter.predicate.Predicates; @@ -94,7 +95,7 @@ public class Misdirection extends CardImpl { class MisdirectionEffect extends OneShotEffect { public MisdirectionEffect() { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); staticText = "Change the target of target spell with a single target"; } diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/MisshapenFiend.java b/Mage.Sets/src/mage/sets/mercadianmasques/MisshapenFiend.java index 950fd3ef138..3ce621deed3 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/MisshapenFiend.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/MisshapenFiend.java @@ -28,8 +28,8 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/MoltingHarpy.java b/Mage.Sets/src/mage/sets/mercadianmasques/MoltingHarpy.java index 479a09f209c..e7498b405cf 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/MoltingHarpy.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/MoltingHarpy.java @@ -29,9 +29,9 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/NightwindGlider.java b/Mage.Sets/src/mage/sets/mercadianmasques/NightwindGlider.java index 7fe6a4e1ced..ebbf79e9131 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/NightwindGlider.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/NightwindGlider.java @@ -29,8 +29,8 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/PiousWarrior.java b/Mage.Sets/src/mage/sets/mercadianmasques/PiousWarrior.java index f9f7df20e61..02ee6c08b7b 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/PiousWarrior.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/PiousWarrior.java @@ -28,15 +28,16 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.DamagedCreatureEvent; import mage.game.events.GameEvent; @@ -75,7 +76,7 @@ public class PiousWarrior extends CardImpl { class PiousWarriorTriggeredAbility extends TriggeredAbilityImpl { public PiousWarriorTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new PiousWarriorGainLifeEffect()); + super(Zone.BATTLEFIELD, new PiousWarriorGainLifeEffect()); } public PiousWarriorTriggeredAbility(final PiousWarriorTriggeredAbility effect) { diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/PrimevalShambler.java b/Mage.Sets/src/mage/sets/mercadianmasques/PrimevalShambler.java index f6249e68cba..448b8c58004 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/PrimevalShambler.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/PrimevalShambler.java @@ -29,10 +29,10 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/RamosianCaptain.java b/Mage.Sets/src/mage/sets/mercadianmasques/RamosianCaptain.java index 2c50796fe35..bd12672806e 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/RamosianCaptain.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/RamosianCaptain.java @@ -29,9 +29,9 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/RamosianCommander.java b/Mage.Sets/src/mage/sets/mercadianmasques/RamosianCommander.java index dcd699f373d..d8e059a6d45 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/RamosianCommander.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/RamosianCommander.java @@ -29,9 +29,9 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/RamosianLieutenant.java b/Mage.Sets/src/mage/sets/mercadianmasques/RamosianLieutenant.java index d342a22dea6..060bd44b51a 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/RamosianLieutenant.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/RamosianLieutenant.java @@ -29,9 +29,9 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/RamosianSergeant.java b/Mage.Sets/src/mage/sets/mercadianmasques/RamosianSergeant.java index b5e79a0f856..5ad2e32f066 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/RamosianSergeant.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/RamosianSergeant.java @@ -29,9 +29,9 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/RamosianSkyMarshal.java b/Mage.Sets/src/mage/sets/mercadianmasques/RamosianSkyMarshal.java index 54a7c106998..dff1dc66491 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/RamosianSkyMarshal.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/RamosianSkyMarshal.java @@ -29,9 +29,9 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/RampartCrawler.java b/Mage.Sets/src/mage/sets/mercadianmasques/RampartCrawler.java index 1e566f792ed..5da62dcd20d 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/RampartCrawler.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/RampartCrawler.java @@ -29,9 +29,9 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.EvasionAbility; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/RishadanPort.java b/Mage.Sets/src/mage/sets/mercadianmasques/RishadanPort.java index 46124fe21bb..0755646c28f 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/RishadanPort.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/RishadanPort.java @@ -28,9 +28,9 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -38,6 +38,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.TapTargetEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetLandPermanent; /** @@ -53,7 +54,7 @@ public class RishadanPort extends CardImpl { // {tap}: Add {1} to your mana pool. this.addAbility(new ColorlessManaAbility()); // {1}, {tap}: Tap target land. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/RockBadger.java b/Mage.Sets/src/mage/sets/mercadianmasques/RockBadger.java index 99345849fa9..b0ad4e97dc8 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/RockBadger.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/RockBadger.java @@ -28,7 +28,7 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/ShockTroops.java b/Mage.Sets/src/mage/sets/mercadianmasques/ShockTroops.java index 70d13ed0e55..74abeb96e82 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/ShockTroops.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/ShockTroops.java @@ -28,15 +28,16 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; /** @@ -56,7 +57,7 @@ public class ShockTroops extends CardImpl { this.toughness = new MageInt(2); // Sacrifice Shock Troops: Shock Troops deals 2 damage to target creature or player. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(2), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new SacrificeSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/SkulkingFugitive.java b/Mage.Sets/src/mage/sets/mercadianmasques/SkulkingFugitive.java index 8ae09dfb56e..ee3ef9faae7 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/SkulkingFugitive.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/SkulkingFugitive.java @@ -29,8 +29,8 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BecomesTargetTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/StrongarmThug.java b/Mage.Sets/src/mage/sets/mercadianmasques/StrongarmThug.java index ac6e7fa4008..bbf35e89b51 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/StrongarmThug.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/StrongarmThug.java @@ -29,8 +29,8 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/TaskForce.java b/Mage.Sets/src/mage/sets/mercadianmasques/TaskForce.java index 37922f57841..6ecdbb79247 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/TaskForce.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/TaskForce.java @@ -29,9 +29,9 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BecomesTargetTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/ThermalGlider.java b/Mage.Sets/src/mage/sets/mercadianmasques/ThermalGlider.java index 5eeb7a2eaaf..e6fa7104fe3 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/ThermalGlider.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/ThermalGlider.java @@ -29,8 +29,8 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/TwoHeadedDragon.java b/Mage.Sets/src/mage/sets/mercadianmasques/TwoHeadedDragon.java index df23d9cfa89..ba56f3cf2f0 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/TwoHeadedDragon.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/TwoHeadedDragon.java @@ -28,10 +28,10 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/VineTrellis.java b/Mage.Sets/src/mage/sets/mercadianmasques/VineTrellis.java index 1a4e5c8e05a..a05d6119eff 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/VineTrellis.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/VineTrellis.java @@ -28,8 +28,8 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.mana.GreenManaAbility; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/WaterfrontBouncer.java b/Mage.Sets/src/mage/sets/mercadianmasques/WaterfrontBouncer.java index 5bdbe6f1dd2..8b96078ead2 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/WaterfrontBouncer.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/WaterfrontBouncer.java @@ -29,9 +29,8 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.target.common.TargetCardInHand; import mage.target.common.TargetCreaturePermanent; @@ -60,7 +61,7 @@ public class WaterfrontBouncer extends CardImpl { this.toughness = new MageInt(1); // {U}, {tap}, Discard a card: Return target creature to its owner's hand. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.U)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardTargetCost(new TargetCardInHand())); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/WildJhovall.java b/Mage.Sets/src/mage/sets/mercadianmasques/WildJhovall.java index a1a476db4d7..a363a4061e5 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/WildJhovall.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/WildJhovall.java @@ -28,8 +28,8 @@ package mage.sets.mercadianmasques; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirage/Afterlife.java b/Mage.Sets/src/mage/sets/mirage/Afterlife.java index 1667b7236ea..48bdab6782b 100644 --- a/Mage.Sets/src/mage/sets/mirage/Afterlife.java +++ b/Mage.Sets/src/mage/sets/mirage/Afterlife.java @@ -28,14 +28,15 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.SpiritWhiteToken; @@ -88,7 +89,7 @@ class AfterlifeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = (Permanent) game.getLastKnownInformation(targetPointer.getFirst(game, source), Constants.Zone.BATTLEFIELD); + Permanent permanent = (Permanent) game.getLastKnownInformation(targetPointer.getFirst(game, source), Zone.BATTLEFIELD); if (permanent != null) { SpiritWhiteToken token = new SpiritWhiteToken(); token.putOntoBattlefield(1, game, source.getId(), permanent.getControllerId()); diff --git a/Mage.Sets/src/mage/sets/mirage/Agility.java b/Mage.Sets/src/mage/sets/mirage/Agility.java index d92e65282b2..da578b51603 100644 --- a/Mage.Sets/src/mage/sets/mirage/Agility.java +++ b/Mage.Sets/src/mage/sets/mirage/Agility.java @@ -28,9 +28,8 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -58,12 +57,12 @@ public class Agility extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature gets +1/+1 and has flanking. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new FlankingAbility(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new FlankingAbility(), AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/sets/mirage/BayFalcon.java b/Mage.Sets/src/mage/sets/mirage/BayFalcon.java index df073c249ce..01250f123ff 100644 --- a/Mage.Sets/src/mage/sets/mirage/BayFalcon.java +++ b/Mage.Sets/src/mage/sets/mirage/BayFalcon.java @@ -28,8 +28,8 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; diff --git a/Mage.Sets/src/mage/sets/mirage/BlisteringBarrier.java b/Mage.Sets/src/mage/sets/mirage/BlisteringBarrier.java index f803b602228..6336a76ba93 100644 --- a/Mage.Sets/src/mage/sets/mirage/BlisteringBarrier.java +++ b/Mage.Sets/src/mage/sets/mirage/BlisteringBarrier.java @@ -28,8 +28,8 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirage/BurningShieldAskari.java b/Mage.Sets/src/mage/sets/mirage/BurningShieldAskari.java index 8003d016a35..b23618a2417 100644 --- a/Mage.Sets/src/mage/sets/mirage/BurningShieldAskari.java +++ b/Mage.Sets/src/mage/sets/mirage/BurningShieldAskari.java @@ -28,9 +28,9 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +38,8 @@ import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.FlankingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -58,7 +60,7 @@ public class BurningShieldAskari extends CardImpl { // Flanking this.addAbility(new FlankingAbility()); // {R}{R}: Burning Shield Askari gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Constants.Duration.EndOfTurn), new ManaCostsImpl("{R}{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{R}{R}"))); } public BurningShieldAskari(final BurningShieldAskari card) { diff --git a/Mage.Sets/src/mage/sets/mirage/CrashOfRhinos.java b/Mage.Sets/src/mage/sets/mirage/CrashOfRhinos.java index 4602c9bc9bb..8e5c19a945c 100644 --- a/Mage.Sets/src/mage/sets/mirage/CrashOfRhinos.java +++ b/Mage.Sets/src/mage/sets/mirage/CrashOfRhinos.java @@ -28,8 +28,8 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirage/CursedTotem.java b/Mage.Sets/src/mage/sets/mirage/CursedTotem.java index 57b7a26b0c9..45168a6736f 100644 --- a/Mage.Sets/src/mage/sets/mirage/CursedTotem.java +++ b/Mage.Sets/src/mage/sets/mirage/CursedTotem.java @@ -28,11 +28,11 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; diff --git a/Mage.Sets/src/mage/sets/mirage/EkunduGriffin.java b/Mage.Sets/src/mage/sets/mirage/EkunduGriffin.java index 3d59afa2af3..5c6bf21422f 100644 --- a/Mage.Sets/src/mage/sets/mirage/EkunduGriffin.java +++ b/Mage.Sets/src/mage/sets/mirage/EkunduGriffin.java @@ -28,8 +28,8 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/mirage/EnlightenedTutor.java b/Mage.Sets/src/mage/sets/mirage/EnlightenedTutor.java index 60fb9860198..d969fee9d81 100644 --- a/Mage.Sets/src/mage/sets/mirage/EnlightenedTutor.java +++ b/Mage.Sets/src/mage/sets/mirage/EnlightenedTutor.java @@ -28,8 +28,8 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.search.SearchLibraryPutOnLibraryEffect; import mage.cards.CardImpl; import mage.filter.FilterCard; diff --git a/Mage.Sets/src/mage/sets/mirage/FemerefKnight.java b/Mage.Sets/src/mage/sets/mirage/FemerefKnight.java index 99034e6401f..82b40aeedaf 100644 --- a/Mage.Sets/src/mage/sets/mirage/FemerefKnight.java +++ b/Mage.Sets/src/mage/sets/mirage/FemerefKnight.java @@ -28,9 +28,9 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +38,8 @@ import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FlankingAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -58,7 +60,7 @@ public class FemerefKnight extends CardImpl { // Flanking this.addAbility(new FlankingAbility()); // {W}: Femeref Knight gains vigilance until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Constants.Duration.EndOfTurn), new ManaCostsImpl("{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{W}"))); } public FemerefKnight(final FemerefKnight card) { diff --git a/Mage.Sets/src/mage/sets/mirage/FemerefScouts.java b/Mage.Sets/src/mage/sets/mirage/FemerefScouts.java index 2b4ddae5cd6..7b8a253e7fb 100644 --- a/Mage.Sets/src/mage/sets/mirage/FemerefScouts.java +++ b/Mage.Sets/src/mage/sets/mirage/FemerefScouts.java @@ -28,8 +28,8 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirage/FeralShadow.java b/Mage.Sets/src/mage/sets/mirage/FeralShadow.java index e2c968d22be..4ce01fc9c6a 100644 --- a/Mage.Sets/src/mage/sets/mirage/FeralShadow.java +++ b/Mage.Sets/src/mage/sets/mirage/FeralShadow.java @@ -28,8 +28,8 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirage/Foratog.java b/Mage.Sets/src/mage/sets/mirage/Foratog.java index e753e71e5dc..fea510c005e 100644 --- a/Mage.Sets/src/mage/sets/mirage/Foratog.java +++ b/Mage.Sets/src/mage/sets/mirage/Foratog.java @@ -28,9 +28,9 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +38,8 @@ import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; @@ -62,7 +64,7 @@ public class Foratog extends CardImpl { this.toughness = new MageInt(2); // {G}, Sacrifice a Forest: Foratog gets +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Constants.Duration.EndOfTurn), new ManaCostsImpl("{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("{G}")); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirage/GiantMantis.java b/Mage.Sets/src/mage/sets/mirage/GiantMantis.java index be954e94589..3a7b064a8f0 100644 --- a/Mage.Sets/src/mage/sets/mirage/GiantMantis.java +++ b/Mage.Sets/src/mage/sets/mirage/GiantMantis.java @@ -28,8 +28,8 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirage/HammerOfBogardan.java b/Mage.Sets/src/mage/sets/mirage/HammerOfBogardan.java index bbf170358d4..fb2a6bc5056 100644 --- a/Mage.Sets/src/mage/sets/mirage/HammerOfBogardan.java +++ b/Mage.Sets/src/mage/sets/mirage/HammerOfBogardan.java @@ -28,9 +28,9 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.OnlyDuringUpkeepCost; @@ -38,6 +38,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.ReturnSourceFromGraveyardToHandEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; /** @@ -58,7 +59,7 @@ public class HammerOfBogardan extends CardImpl { this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); // {2}{R}{R}{R}: Return Hammer of Bogardan from your graveyard to your hand. Activate this ability only during your upkeep. - Ability ability = new SimpleActivatedAbility(Constants.Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ManaCostsImpl("{2}{R}{R}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ManaCostsImpl("{2}{R}{R}{R}")); ability.addCost(new OnlyDuringUpkeepCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirage/IronTuskElephant.java b/Mage.Sets/src/mage/sets/mirage/IronTuskElephant.java index 0de82d4b220..10bfe06243a 100644 --- a/Mage.Sets/src/mage/sets/mirage/IronTuskElephant.java +++ b/Mage.Sets/src/mage/sets/mirage/IronTuskElephant.java @@ -28,8 +28,8 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirage/JolraelsCentaur.java b/Mage.Sets/src/mage/sets/mirage/JolraelsCentaur.java index 46d1f8887b7..c3eb2c21c88 100644 --- a/Mage.Sets/src/mage/sets/mirage/JolraelsCentaur.java +++ b/Mage.Sets/src/mage/sets/mirage/JolraelsCentaur.java @@ -28,8 +28,8 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ShroudAbility; import mage.abilities.keyword.FlankingAbility; diff --git a/Mage.Sets/src/mage/sets/mirage/LionsEyeDiamond.java b/Mage.Sets/src/mage/sets/mirage/LionsEyeDiamond.java index 1f3a25b0744..850025b1aec 100644 --- a/Mage.Sets/src/mage/sets/mirage/LionsEyeDiamond.java +++ b/Mage.Sets/src/mage/sets/mirage/LionsEyeDiamond.java @@ -28,10 +28,10 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TimingRule; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TimingRule; +import mage.constants.Zone; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.Cost; diff --git a/Mage.Sets/src/mage/sets/mirage/MerfolkRaiders.java b/Mage.Sets/src/mage/sets/mirage/MerfolkRaiders.java index ec9da9213e9..e8cc2e24336 100644 --- a/Mage.Sets/src/mage/sets/mirage/MerfolkRaiders.java +++ b/Mage.Sets/src/mage/sets/mirage/MerfolkRaiders.java @@ -28,8 +28,8 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.IslandwalkAbility; import mage.abilities.keyword.PhasingAbility; diff --git a/Mage.Sets/src/mage/sets/mirage/MtendaHerder.java b/Mage.Sets/src/mage/sets/mirage/MtendaHerder.java index 80619326356..97c47c56436 100644 --- a/Mage.Sets/src/mage/sets/mirage/MtendaHerder.java +++ b/Mage.Sets/src/mage/sets/mirage/MtendaHerder.java @@ -28,8 +28,8 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlankingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirage/MysticalTutor.java b/Mage.Sets/src/mage/sets/mirage/MysticalTutor.java index c08fa7051d3..034c2317556 100644 --- a/Mage.Sets/src/mage/sets/mirage/MysticalTutor.java +++ b/Mage.Sets/src/mage/sets/mirage/MysticalTutor.java @@ -28,8 +28,8 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.search.SearchLibraryPutOnLibraryEffect; import mage.cards.CardImpl; import mage.filter.FilterCard; diff --git a/Mage.Sets/src/mage/sets/mirage/SandbarCrocodile.java b/Mage.Sets/src/mage/sets/mirage/SandbarCrocodile.java index 40141327d20..4002dadde6f 100644 --- a/Mage.Sets/src/mage/sets/mirage/SandbarCrocodile.java +++ b/Mage.Sets/src/mage/sets/mirage/SandbarCrocodile.java @@ -28,8 +28,8 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.PhasingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirage/SearingSpearAskari.java b/Mage.Sets/src/mage/sets/mirage/SearingSpearAskari.java index 1bc22857c07..2ec5dbf08a2 100644 --- a/Mage.Sets/src/mage/sets/mirage/SearingSpearAskari.java +++ b/Mage.Sets/src/mage/sets/mirage/SearingSpearAskari.java @@ -28,9 +28,9 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -39,6 +39,8 @@ import mage.abilities.effects.common.continious.CantBeBlockedByOneEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FlankingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -59,7 +61,7 @@ public class SearingSpearAskari extends CardImpl { // Flanking this.addAbility(new FlankingAbility()); // {1}{R}: Searing Spear Askari can't be blocked except by two or more creatures this turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(2)), Constants.Duration.EndOfTurn), new ManaCostsImpl("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(2)), Duration.EndOfTurn), new ManaCostsImpl("{1}{R}"))); } public SearingSpearAskari(final SearingSpearAskari card) { diff --git a/Mage.Sets/src/mage/sets/mirage/SpiritOfTheNight.java b/Mage.Sets/src/mage/sets/mirage/SpiritOfTheNight.java index 42e53cef835..0b313b67c80 100644 --- a/Mage.Sets/src/mage/sets/mirage/SpiritOfTheNight.java +++ b/Mage.Sets/src/mage/sets/mirage/SpiritOfTheNight.java @@ -27,9 +27,8 @@ */ package mage.sets.mirage; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -38,6 +37,7 @@ import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.*; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterAttackingCreature; import mage.filter.predicate.mageobject.ColorPredicate; @@ -83,7 +83,7 @@ public class SpiritOfTheNight extends CardImpl { // Spirit of the Night has first strike as long as it's attacking. ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), new SourceMatchesFilterCondition(new FilterAttackingCreature()), rule); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } public SpiritOfTheNight(final SpiritOfTheNight card) { diff --git a/Mage.Sets/src/mage/sets/mirage/Stupor.java b/Mage.Sets/src/mage/sets/mirage/Stupor.java index f2956b5ce1e..e22a3536655 100644 --- a/Mage.Sets/src/mage/sets/mirage/Stupor.java +++ b/Mage.Sets/src/mage/sets/mirage/Stupor.java @@ -28,7 +28,7 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/mirage/TalruumMinotaur.java b/Mage.Sets/src/mage/sets/mirage/TalruumMinotaur.java index 6d675dbd564..f407a86ea81 100644 --- a/Mage.Sets/src/mage/sets/mirage/TalruumMinotaur.java +++ b/Mage.Sets/src/mage/sets/mirage/TalruumMinotaur.java @@ -28,8 +28,8 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirage/TeferisDrake.java b/Mage.Sets/src/mage/sets/mirage/TeferisDrake.java index ae54b652ff1..a5bf1defd12 100644 --- a/Mage.Sets/src/mage/sets/mirage/TeferisDrake.java +++ b/Mage.Sets/src/mage/sets/mirage/TeferisDrake.java @@ -28,8 +28,8 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.PhasingAbility; diff --git a/Mage.Sets/src/mage/sets/mirage/ViashinoWarrior.java b/Mage.Sets/src/mage/sets/mirage/ViashinoWarrior.java index 56ae1b49f22..2e8f000c62a 100644 --- a/Mage.Sets/src/mage/sets/mirage/ViashinoWarrior.java +++ b/Mage.Sets/src/mage/sets/mirage/ViashinoWarrior.java @@ -28,8 +28,8 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirage/VolcanicDragon.java b/Mage.Sets/src/mage/sets/mirage/VolcanicDragon.java index d8342c795a6..a49974dd5cb 100644 --- a/Mage.Sets/src/mage/sets/mirage/VolcanicDragon.java +++ b/Mage.Sets/src/mage/sets/mirage/VolcanicDragon.java @@ -28,7 +28,7 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/mirage/WallOfRoots.java b/Mage.Sets/src/mage/sets/mirage/WallOfRoots.java index fe9dfa1cacb..94aa07df9a6 100644 --- a/Mage.Sets/src/mage/sets/mirage/WallOfRoots.java +++ b/Mage.Sets/src/mage/sets/mirage/WallOfRoots.java @@ -28,7 +28,7 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/mirage/WildElephant.java b/Mage.Sets/src/mage/sets/mirage/WildElephant.java index e55e2069dbe..2c30063e7fd 100644 --- a/Mage.Sets/src/mage/sets/mirage/WildElephant.java +++ b/Mage.Sets/src/mage/sets/mirage/WildElephant.java @@ -28,8 +28,8 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirage/WorldlyTutor.java b/Mage.Sets/src/mage/sets/mirage/WorldlyTutor.java index 17dc9889d77..dec7bd03ec7 100644 --- a/Mage.Sets/src/mage/sets/mirage/WorldlyTutor.java +++ b/Mage.Sets/src/mage/sets/mirage/WorldlyTutor.java @@ -28,8 +28,8 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.search.SearchLibraryPutOnLibraryEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreatureCard; diff --git a/Mage.Sets/src/mage/sets/mirage/ZhalfirinCommander.java b/Mage.Sets/src/mage/sets/mirage/ZhalfirinCommander.java index 1bc05d3ad38..ec699f9caef 100644 --- a/Mage.Sets/src/mage/sets/mirage/ZhalfirinCommander.java +++ b/Mage.Sets/src/mage/sets/mirage/ZhalfirinCommander.java @@ -28,7 +28,7 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/mirage/ZhalfirinKnight.java b/Mage.Sets/src/mage/sets/mirage/ZhalfirinKnight.java index 4d2b6edf085..5219a203f80 100644 --- a/Mage.Sets/src/mage/sets/mirage/ZhalfirinKnight.java +++ b/Mage.Sets/src/mage/sets/mirage/ZhalfirinKnight.java @@ -28,9 +28,9 @@ package mage.sets.mirage; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +38,8 @@ import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.FlankingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -58,7 +60,7 @@ public class ZhalfirinKnight extends CardImpl { // Flanking this.addAbility(new FlankingAbility()); // {W}{W}: Zhalfirin Knight gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Constants.Duration.EndOfTurn), new ManaCostsImpl("{W}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{W}{W}"))); } public ZhalfirinKnight(final ZhalfirinKnight card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/AlphaMyr.java b/Mage.Sets/src/mage/sets/mirrodin/AlphaMyr.java index 0edb47f99de..2f6c345850c 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/AlphaMyr.java +++ b/Mage.Sets/src/mage/sets/mirrodin/AlphaMyr.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodin/AltarsLight.java b/Mage.Sets/src/mage/sets/mirrodin/AltarsLight.java index 9c9c07c1c23..75ce2febcf8 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/AltarsLight.java +++ b/Mage.Sets/src/mage/sets/mirrodin/AltarsLight.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/mirrodin/AncientDen.java b/Mage.Sets/src/mage/sets/mirrodin/AncientDen.java index 1d062261ba8..61b19b1fba1 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/AncientDen.java +++ b/Mage.Sets/src/mage/sets/mirrodin/AncientDen.java @@ -29,8 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodin/Annul.java b/Mage.Sets/src/mage/sets/mirrodin/Annul.java index d21818f8465..723a81c3c01 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Annul.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Annul.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; diff --git a/Mage.Sets/src/mage/sets/mirrodin/Arrest.java b/Mage.Sets/src/mage/sets/mirrodin/Arrest.java index 852e821ed77..fa5155e11a7 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Arrest.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Arrest.java @@ -29,16 +29,17 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.CantBlockAttackActivateAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -57,7 +58,7 @@ public class Arrest extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Detriment)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/mirrodin/AssertAuthority.java b/Mage.Sets/src/mage/sets/mirrodin/AssertAuthority.java index c53649d30ca..4fab4f4e5a2 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/AssertAuthority.java +++ b/Mage.Sets/src/mage/sets/mirrodin/AssertAuthority.java @@ -28,9 +28,9 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.effects.common.CounterTargetWithReplacementEffect; import mage.abilities.keyword.AffinityForArtifactsAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodin/Atog.java b/Mage.Sets/src/mage/sets/mirrodin/Atog.java index c0b2a6f2ac1..b9f1598d875 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Atog.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Atog.java @@ -29,14 +29,15 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledPermanent; @@ -60,7 +61,7 @@ public class Atog extends CardImpl { this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Constants.Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(filter)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(filter)))); } public Atog(final Atog card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/AuriokBladewarden.java b/Mage.Sets/src/mage/sets/mirrodin/AuriokBladewarden.java index 7a9289cd619..9031c67beaa 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/AuriokBladewarden.java +++ b/Mage.Sets/src/mage/sets/mirrodin/AuriokBladewarden.java @@ -29,9 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.dynamicvalue.common.SourcePermanentPowerCount; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -58,7 +59,7 @@ public class AuriokBladewarden extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target creature gets +X/+X until end of turn, where X is Auriok Bladewarden's power. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(new SourcePermanentPowerCount(), new SourcePermanentPowerCount(), Constants.Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(new SourcePermanentPowerCount(), new SourcePermanentPowerCount(), Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/AuriokTransfixer.java b/Mage.Sets/src/mage/sets/mirrodin/AuriokTransfixer.java index 4009d9334fe..6085537498a 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/AuriokTransfixer.java +++ b/Mage.Sets/src/mage/sets/mirrodin/AuriokTransfixer.java @@ -29,9 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; @@ -62,7 +63,7 @@ public class AuriokTransfixer extends CardImpl { this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/mirrodin/Battlegrowth.java b/Mage.Sets/src/mage/sets/mirrodin/Battlegrowth.java index bd03cf397bc..b443062c4c8 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Battlegrowth.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Battlegrowth.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.counters.CounterType; diff --git a/Mage.Sets/src/mage/sets/mirrodin/Bloodscent.java b/Mage.Sets/src/mage/sets/mirrodin/Bloodscent.java index fc2476af74b..3a9ba6c3574 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Bloodscent.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Bloodscent.java @@ -29,13 +29,14 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.MustBlockSourceEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -48,7 +49,7 @@ public class Bloodscent extends CardImpl { super(ownerId, 114, "Bloodscent", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{G}"); this.expansionSetCode = "MRD"; this.color.setGreen(true); - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new MustBlockSourceEffect()), Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBlockSourceEffect()), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/Bonesplitter.java b/Mage.Sets/src/mage/sets/mirrodin/Bonesplitter.java index 9cd48ad299b..d22feb60f2b 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Bonesplitter.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Bonesplitter.java @@ -29,14 +29,15 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; /** * @author Loki @@ -47,8 +48,8 @@ public class Bonesplitter extends CardImpl { super(ownerId, 146, "Bonesplitter", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{1}"); this.expansionSetCode = "MRD"; this.subtype.add("Equipment"); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(1))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1))); } public Bonesplitter(final Bonesplitter card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/Cathodion.java b/Mage.Sets/src/mage/sets/mirrodin/Cathodion.java index d97fb91e128..4b6ec46f373 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Cathodion.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Cathodion.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodin/ChaliceOfTheVoid.java b/Mage.Sets/src/mage/sets/mirrodin/ChaliceOfTheVoid.java index 5447658bf3e..02c93dddc32 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/ChaliceOfTheVoid.java +++ b/Mage.Sets/src/mage/sets/mirrodin/ChaliceOfTheVoid.java @@ -28,10 +28,10 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.TriggeredAbilityImpl; @@ -40,6 +40,7 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.EntersBattlefieldEffect; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; @@ -109,7 +110,7 @@ class ChaliceOfTheVoidTriggeredAbility extends TriggeredAbilityImpl { // Imprint - When Chrome Mox enters the battlefield, you may exile a nonartifact, nonland card from your hand. this.addAbility(new EntersBattlefieldTriggeredAbility(new ChromeMoxEffect(), true)); // {tap}: Add one mana of any of the exiled card's colors to your mana pool. - this.addAbility(new SimpleManaAbility(Constants.Zone.BATTLEFIELD, new ChromeMoxManaEffect(), new TapSourceCost())); + this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new ChromeMoxManaEffect(), new TapSourceCost())); } public ChromeMox(final ChromeMox card) { @@ -85,7 +87,7 @@ class ChromeMoxEffect extends OneShotEffect { filter.add(Predicates.not(Predicates.or(new CardTypePredicate(CardType.LAND), new CardTypePredicate(CardType.ARTIFACT)))); } public ChromeMoxEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "exile a nonartifact, nonland card from your hand"; } @@ -97,8 +99,8 @@ class ChromeMoxEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); if (player.getHand().size() > 0) { - TargetCard target = new TargetCard(Constants.Zone.HAND, filter); - player.choose(Constants.Outcome.Benefit, player.getHand(), target, game); + TargetCard target = new TargetCard(Zone.HAND, filter); + player.choose(Outcome.Benefit, player.getHand(), target, game); Card card = player.getHand().get(target.getFirstTarget(), game); if (card != null) { card.moveToExile(getId(), "Chrome Mox (Imprint)", source.getSourceId(), game); diff --git a/Mage.Sets/src/mage/sets/mirrodin/ClockworkBeetle.java b/Mage.Sets/src/mage/sets/mirrodin/ClockworkBeetle.java index 73778208c2e..9d099c506ce 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/ClockworkBeetle.java +++ b/Mage.Sets/src/mage/sets/mirrodin/ClockworkBeetle.java @@ -29,9 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksOrBlocksTriggeredAbility; @@ -41,6 +40,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.effects.common.counter.RemoveCounterSourceEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -73,7 +73,7 @@ public class ClockworkBeetle extends CardImpl { class ClockworkBeetleEffect extends OneShotEffect { ClockworkBeetleEffect() { - super(Constants.Outcome.UnboostCreature); + super(Outcome.UnboostCreature); staticText = "remove a +1/+1 counter from {this} at end of combat"; } diff --git a/Mage.Sets/src/mage/sets/mirrodin/ClockworkCondor.java b/Mage.Sets/src/mage/sets/mirrodin/ClockworkCondor.java index ffe66f221c9..eb5e47897c6 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/ClockworkCondor.java +++ b/Mage.Sets/src/mage/sets/mirrodin/ClockworkCondor.java @@ -30,9 +30,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksOrBlocksTriggeredAbility; @@ -43,6 +42,7 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.effects.common.counter.RemoveCounterSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -76,7 +76,7 @@ public class ClockworkCondor extends CardImpl { class ClockworkCondorEffect extends OneShotEffect { ClockworkCondorEffect() { - super(Constants.Outcome.UnboostCreature); + super(Outcome.UnboostCreature); staticText = "remove a +1/+1 counter from {this} at end of combat"; } diff --git a/Mage.Sets/src/mage/sets/mirrodin/ClockworkDragon.java b/Mage.Sets/src/mage/sets/mirrodin/ClockworkDragon.java index 85a79de50d5..e027ba19028 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/ClockworkDragon.java +++ b/Mage.Sets/src/mage/sets/mirrodin/ClockworkDragon.java @@ -30,10 +30,9 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksOrBlocksTriggeredAbility; @@ -46,6 +45,7 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.effects.common.counter.RemoveCounterSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -80,7 +80,7 @@ public class ClockworkDragon extends CardImpl { class ClockworkDragonEffect extends OneShotEffect { ClockworkDragonEffect() { - super(Constants.Outcome.UnboostCreature); + super(Outcome.UnboostCreature); staticText = "remove a +1/+1 counter from {this} at end of combat"; } diff --git a/Mage.Sets/src/mage/sets/mirrodin/ClockworkVorrac.java b/Mage.Sets/src/mage/sets/mirrodin/ClockworkVorrac.java index 3fcac22b85e..b39c8e2faba 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/ClockworkVorrac.java +++ b/Mage.Sets/src/mage/sets/mirrodin/ClockworkVorrac.java @@ -29,9 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksOrBlocksTriggeredAbility; @@ -44,6 +43,8 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.effects.common.counter.RemoveCounterSourceEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -64,7 +65,7 @@ public class ClockworkVorrac extends CardImpl { this.addAbility(TrampleAbility.getInstance()); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(4)), "{this} enters the battlefield with four +1/+1 counters on it")); this.addAbility(new AttacksOrBlocksTriggeredAbility(new ClockworkVorracEffect(), false)); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new TapSourceCost())); } public ClockworkVorrac(final ClockworkVorrac card) { @@ -79,7 +80,7 @@ public class ClockworkVorrac extends CardImpl { class ClockworkVorracEffect extends OneShotEffect { ClockworkVorracEffect() { - super(Constants.Outcome.UnboostCreature); + super(Outcome.UnboostCreature); staticText = "remove a +1/+1 counter from {this} at end of combat"; } diff --git a/Mage.Sets/src/mage/sets/mirrodin/Cloudpost.java b/Mage.Sets/src/mage/sets/mirrodin/Cloudpost.java index 6a38c9187b0..52df94ebd43 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Cloudpost.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Cloudpost.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; diff --git a/Mage.Sets/src/mage/sets/mirrodin/CobaltGolem.java b/Mage.Sets/src/mage/sets/mirrodin/CobaltGolem.java index 0b47e008434..8aac35e540a 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/CobaltGolem.java +++ b/Mage.Sets/src/mage/sets/mirrodin/CobaltGolem.java @@ -29,15 +29,16 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -51,7 +52,7 @@ public class CobaltGolem extends CardImpl { this.subtype.add("Golem"); this.power = new MageInt(2); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn), new ManaCostsImpl("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{U}"))); } public CobaltGolem(final CobaltGolem card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/ConsumeSpirit.java b/Mage.Sets/src/mage/sets/mirrodin/ConsumeSpirit.java index d35362cab3c..c0bea16de08 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/ConsumeSpirit.java +++ b/Mage.Sets/src/mage/sets/mirrodin/ConsumeSpirit.java @@ -28,7 +28,7 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/mirrodin/CopperMyr.java b/Mage.Sets/src/mage/sets/mirrodin/CopperMyr.java index 02d6f7bdd0e..7d77b055ac3 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/CopperMyr.java +++ b/Mage.Sets/src/mage/sets/mirrodin/CopperMyr.java @@ -29,8 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodin/DampingMatrix.java b/Mage.Sets/src/mage/sets/mirrodin/DampingMatrix.java index 6de21df450a..220336bb889 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/DampingMatrix.java +++ b/Mage.Sets/src/mage/sets/mirrodin/DampingMatrix.java @@ -28,11 +28,11 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -46,7 +46,6 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; -import mage.game.permanent.PermanentCard; /** * diff --git a/Mage.Sets/src/mage/sets/mirrodin/Deconstruct.java b/Mage.Sets/src/mage/sets/mirrodin/Deconstruct.java index 09be75de8ee..6706928fce5 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Deconstruct.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Deconstruct.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodin/DragonBlood.java b/Mage.Sets/src/mage/sets/mirrodin/DragonBlood.java index 7ef036385ed..474deab646e 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/DragonBlood.java +++ b/Mage.Sets/src/mage/sets/mirrodin/DragonBlood.java @@ -29,15 +29,15 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; @@ -50,7 +50,7 @@ public class DragonBlood extends CardImpl { public DragonBlood(UUID ownerId) { super(ownerId, 163, "Dragon Blood", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "MRD"; - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/mirrodin/DrossProwler.java b/Mage.Sets/src/mage/sets/mirrodin/DrossProwler.java index 71601c88d58..a015931df3d 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/DrossProwler.java +++ b/Mage.Sets/src/mage/sets/mirrodin/DrossProwler.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodin/Duskworker.java b/Mage.Sets/src/mage/sets/mirrodin/Duskworker.java index 61210d9d131..3e4be3f7e4c 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Duskworker.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Duskworker.java @@ -29,9 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BecomesBlockedTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -53,7 +54,7 @@ public class Duskworker extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new BecomesBlockedTriggeredAbility(new RegenerateSourceEffect(), false)); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Constants.Duration.EndOfTurn), new GenericManaCost(3))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(3))); } public Duskworker(final Duskworker card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/ElfReplica.java b/Mage.Sets/src/mage/sets/mirrodin/ElfReplica.java index 9e669247814..685fc6486a9 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/ElfReplica.java +++ b/Mage.Sets/src/mage/sets/mirrodin/ElfReplica.java @@ -29,9 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; @@ -61,7 +61,7 @@ public class ElfReplica extends CardImpl { this.subtype.add("Elf"); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{G}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/mirrodin/FangrenHunter.java b/Mage.Sets/src/mage/sets/mirrodin/FangrenHunter.java index 6128cdce073..a9ca21e400f 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/FangrenHunter.java +++ b/Mage.Sets/src/mage/sets/mirrodin/FangrenHunter.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodin/FarsightMask.java b/Mage.Sets/src/mage/sets/mirrodin/FarsightMask.java index aef8adc8814..ead13d3b972 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/FarsightMask.java +++ b/Mage.Sets/src/mage/sets/mirrodin/FarsightMask.java @@ -28,10 +28,10 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.condition.Condition; diff --git a/Mage.Sets/src/mage/sets/mirrodin/FieryGambit.java b/Mage.Sets/src/mage/sets/mirrodin/FieryGambit.java index acf6f8c2637..f2df102482e 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/FieryGambit.java +++ b/Mage.Sets/src/mage/sets/mirrodin/FieryGambit.java @@ -28,16 +28,16 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.effects.common.DamagePlayersEffect; import mage.abilities.effects.common.UntapAllLandsControllerEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -107,7 +107,7 @@ class FieryGambitEffect extends OneShotEffect { creature.damage(3, source.getSourceId(), game, true, false); } if (flipsWon > 1) { - new DamagePlayersEffect(6, Constants.TargetController.OPPONENT).apply(game, source); + new DamagePlayersEffect(6, TargetController.OPPONENT).apply(game, source); } if (flipsWon > 2) { controller.drawCards(9, game); diff --git a/Mage.Sets/src/mage/sets/mirrodin/GalvanicKey.java b/Mage.Sets/src/mage/sets/mirrodin/GalvanicKey.java index 17b8fb44f49..063f83562f0 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/GalvanicKey.java +++ b/Mage.Sets/src/mage/sets/mirrodin/GalvanicKey.java @@ -29,9 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -39,6 +38,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; @@ -59,7 +59,7 @@ public class GalvanicKey extends CardImpl { super(ownerId, 173, "Galvanic Key", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "MRD"; this.addAbility(FlashAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new UntapTargetEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/mirrodin/Glimmervoid.java b/Mage.Sets/src/mage/sets/mirrodin/Glimmervoid.java index c4a536be350..1ea555d7e8b 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Glimmervoid.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Glimmervoid.java @@ -28,13 +28,14 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterArtifactPermanent; import mage.game.Game; import mage.game.events.GameEvent; @@ -68,7 +69,7 @@ public class Glimmervoid extends CardImpl { class GlimmervoidTriggeredAbility extends TriggeredAbilityImpl { GlimmervoidTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new SacrificeSourceEffect()); + super(Zone.BATTLEFIELD, new SacrificeSourceEffect()); } GlimmervoidTriggeredAbility(final GlimmervoidTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/GoblinCharbelcher.java b/Mage.Sets/src/mage/sets/mirrodin/GoblinCharbelcher.java index 43cda00b81c..aeddaee7402 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/GoblinCharbelcher.java +++ b/Mage.Sets/src/mage/sets/mirrodin/GoblinCharbelcher.java @@ -28,10 +28,10 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -41,6 +41,7 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.game.Game; import mage.game.permanent.Permanent; @@ -59,7 +60,7 @@ public class GoblinCharbelcher extends CardImpl { this.expansionSetCode = "MRD"; // {3}, {tap}: Reveal cards from the top of your library until you reveal a land card. Goblin Charbelcher deals damage equal to the number of nonland cards revealed this way to target creature or player. If the revealed land card was a Mountain, Goblin Charbelcher deals double that damage instead. Put the revealed cards on the bottom of your library in any order. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GoblinCharbelcherEffect(), new ManaCostsImpl("{3}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GoblinCharbelcherEffect(), new ManaCostsImpl("{3}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); @@ -100,7 +101,7 @@ class GoblinCharbelcherEffect extends OneShotEffect { if (player == null || sourceCard == null) { return false; } - Cards cards = new CardsImpl(Constants.Zone.PICK); + Cards cards = new CardsImpl(Zone.PICK); while (player.getLibrary().size() > 0) { Card card = player.getLibrary().removeFromTop(game); if (card != null) { @@ -133,14 +134,14 @@ class GoblinCharbelcherEffect extends OneShotEffect { } } - TargetCard target = new TargetCard(Constants.Zone.PICK, new FilterCard("card to put on the bottom of your library")); + TargetCard target = new TargetCard(Zone.PICK, new FilterCard("card to put on the bottom of your library")); target.setRequired(true); while (cards.size() > 1) { player.choose(Outcome.Neutral, cards, target, game); Card card = cards.get(target.getFirstTarget(), game); if (card != null) { cards.remove(card); - card.moveToZone(Constants.Zone.PICK, source.getId(), game, false); + card.moveToZone(Zone.PICK, source.getId(), game, false); } target.clearChosen(); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/GoblinReplica.java b/Mage.Sets/src/mage/sets/mirrodin/GoblinReplica.java index f91588a5b10..119ff9542f0 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/GoblinReplica.java +++ b/Mage.Sets/src/mage/sets/mirrodin/GoblinReplica.java @@ -29,9 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; @@ -61,7 +61,7 @@ public class GoblinReplica extends CardImpl { this.subtype.add("Goblin"); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{3}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{3}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/mirrodin/GoblinStriker.java b/Mage.Sets/src/mage/sets/mirrodin/GoblinStriker.java index 2ebfcd6bdc3..10079cefa84 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/GoblinStriker.java +++ b/Mage.Sets/src/mage/sets/mirrodin/GoblinStriker.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.HasteAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodin/GoldMyr.java b/Mage.Sets/src/mage/sets/mirrodin/GoldMyr.java index 615c4b40ec3..2c424720ab0 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/GoldMyr.java +++ b/Mage.Sets/src/mage/sets/mirrodin/GoldMyr.java @@ -29,8 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodin/GolemSkinGauntlets.java b/Mage.Sets/src/mage/sets/mirrodin/GolemSkinGauntlets.java index f782fb46068..a8248fdb986 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/GolemSkinGauntlets.java +++ b/Mage.Sets/src/mage/sets/mirrodin/GolemSkinGauntlets.java @@ -27,7 +27,6 @@ */ package mage.sets.mirrodin; -import mage.Constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -36,6 +35,7 @@ import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/sets/mirrodin/GreatFurnace.java b/Mage.Sets/src/mage/sets/mirrodin/GreatFurnace.java index 1f1a55eef1e..5ed4e29eef9 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/GreatFurnace.java +++ b/Mage.Sets/src/mage/sets/mirrodin/GreatFurnace.java @@ -29,8 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodin/HematiteGolem.java b/Mage.Sets/src/mage/sets/mirrodin/HematiteGolem.java index 85a232b6ff0..6449047ed0f 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/HematiteGolem.java +++ b/Mage.Sets/src/mage/sets/mirrodin/HematiteGolem.java @@ -29,14 +29,15 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -50,7 +51,7 @@ public class HematiteGolem extends CardImpl { this.subtype.add("Golem"); this.power = new MageInt(1); this.toughness = new MageInt(4); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Constants.Duration.EndOfTurn), new ManaCostsImpl("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{R}"))); } public HematiteGolem(final HematiteGolem card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/IronMyr.java b/Mage.Sets/src/mage/sets/mirrodin/IronMyr.java index 00aa4bbf417..5909db0ffad 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/IronMyr.java +++ b/Mage.Sets/src/mage/sets/mirrodin/IronMyr.java @@ -29,8 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodin/IsochronScepter.java b/Mage.Sets/src/mage/sets/mirrodin/IsochronScepter.java index e93c1534866..378afb7f770 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/IsochronScepter.java +++ b/Mage.Sets/src/mage/sets/mirrodin/IsochronScepter.java @@ -27,14 +27,12 @@ */ package mage.sets.mirrodin; -import java.util.ArrayList; -import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -91,7 +89,7 @@ class IsochronScepterImprintEffect extends OneShotEffect { this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Constants.Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(filter))); - ability.addEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Constants.Duration.EndOfTurn)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(filter))); + ability.addEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/KrarkClanShaman.java b/Mage.Sets/src/mage/sets/mirrodin/KrarkClanShaman.java index 3e9f6177e83..40757266bf7 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/KrarkClanShaman.java +++ b/Mage.Sets/src/mage/sets/mirrodin/KrarkClanShaman.java @@ -29,15 +29,15 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -67,7 +67,7 @@ public class KrarkClanShaman extends CardImpl { this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageAllEffect(1, filterTargetedCreatures), new SacrificeTargetCost(new TargetControlledPermanent(filterSacrificed)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(1, filterTargetedCreatures), new SacrificeTargetCost(new TargetControlledPermanent(filterSacrificed)))); } public KrarkClanShaman(final KrarkClanShaman card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/KrarksThumb.java b/Mage.Sets/src/mage/sets/mirrodin/KrarksThumb.java index 379aecbc753..adf4c2f5b4c 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/KrarksThumb.java +++ b/Mage.Sets/src/mage/sets/mirrodin/KrarksThumb.java @@ -28,11 +28,11 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodin/LeadenMyr.java b/Mage.Sets/src/mage/sets/mirrodin/LeadenMyr.java index 44088a6e289..5420d4f334d 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/LeadenMyr.java +++ b/Mage.Sets/src/mage/sets/mirrodin/LeadenMyr.java @@ -29,8 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.mana.BlackManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodin/LeoninAbunas.java b/Mage.Sets/src/mage/sets/mirrodin/LeoninAbunas.java index 0c1e68c6a32..e50aa98b84b 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/LeoninAbunas.java +++ b/Mage.Sets/src/mage/sets/mirrodin/LeoninAbunas.java @@ -29,14 +29,15 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -59,7 +60,7 @@ public class LeoninAbunas extends CardImpl { this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(5); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityControlledEffect(HexproofAbility.getInstance(), Constants.Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); } public LeoninAbunas(final LeoninAbunas card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/LeoninDenGuard.java b/Mage.Sets/src/mage/sets/mirrodin/LeoninDenGuard.java index e7a5fcf9d72..17fc0c11da0 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/LeoninDenGuard.java +++ b/Mage.Sets/src/mage/sets/mirrodin/LeoninDenGuard.java @@ -28,9 +28,9 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EquippedCondition; @@ -39,6 +39,8 @@ import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -60,10 +62,10 @@ public class LeoninDenGuard extends CardImpl { this.toughness = new MageInt(3); // As long as Leonin Den-Guard is equipped, it gets +1/+1 and has vigilance. - ConditionalContinousEffect effect1 = new ConditionalContinousEffect(new BoostSourceEffect(1, 1, Constants.Duration.WhileOnBattlefield), EquippedCondition.getInstance(), rule1); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect1)); + ConditionalContinousEffect effect1 = new ConditionalContinousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), EquippedCondition.getInstance(), rule1); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect1)); ConditionalContinousEffect effect2 = new ConditionalContinousEffect(new GainAbilitySourceEffect(VigilanceAbility.getInstance()), EquippedCondition.getInstance(), rule2); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect2)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect2)); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/LeoninScimitar.java b/Mage.Sets/src/mage/sets/mirrodin/LeoninScimitar.java index 4e4e9081047..54704af687c 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/LeoninScimitar.java +++ b/Mage.Sets/src/mage/sets/mirrodin/LeoninScimitar.java @@ -28,7 +28,7 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/mirrodin/LeoninSkyhunter.java b/Mage.Sets/src/mage/sets/mirrodin/LeoninSkyhunter.java index e234ce726b6..a9874a807ef 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/LeoninSkyhunter.java +++ b/Mage.Sets/src/mage/sets/mirrodin/LeoninSkyhunter.java @@ -29,8 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodin/LeoninSunStandard.java b/Mage.Sets/src/mage/sets/mirrodin/LeoninSunStandard.java index 2828bc03e9d..01b2f5b4e92 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/LeoninSunStandard.java +++ b/Mage.Sets/src/mage/sets/mirrodin/LeoninSunStandard.java @@ -29,13 +29,14 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; /** @@ -47,7 +48,7 @@ public class LeoninSunStandard extends CardImpl { public LeoninSunStandard(UUID ownerId) { super(ownerId, 194, "Leonin Sun Standard", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "MRD"; - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Constants.Duration.EndOfTurn, new FilterCreaturePermanent(), false), new ManaCostsImpl("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.EndOfTurn, new FilterCreaturePermanent(), false), new ManaCostsImpl("{1}{W}"))); } public LeoninSunStandard(final LeoninSunStandard card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/LifesparkSpellbomb.java b/Mage.Sets/src/mage/sets/mirrodin/LifesparkSpellbomb.java index fbc0cf877b0..3a69de723fa 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/LifesparkSpellbomb.java +++ b/Mage.Sets/src/mage/sets/mirrodin/LifesparkSpellbomb.java @@ -29,10 +29,7 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -54,11 +51,11 @@ public class LifesparkSpellbomb extends CardImpl { public LifesparkSpellbomb(UUID ownerId) { super(ownerId, 197, "Lifespark Spellbomb", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{1}"); this.expansionSetCode = "MRD"; - Ability firstAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BecomesCreatureTargetEffect(new LifesparkSpellbombToken(), "land", Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.G)); + Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureTargetEffect(new LifesparkSpellbombToken(), "land", Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.G)); firstAbility.addCost(new SacrificeSourceCost()); firstAbility.addTarget(new TargetLandPermanent()); this.addAbility(firstAbility); - Ability secondAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(1)); + Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(1)); secondAbility.addCost(new SacrificeSourceCost()); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/LightningGreaves.java b/Mage.Sets/src/mage/sets/mirrodin/LightningGreaves.java index 73b0aa3f53e..40eedc8085b 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/LightningGreaves.java +++ b/Mage.Sets/src/mage/sets/mirrodin/LightningGreaves.java @@ -28,11 +28,11 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EquipAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodin/LoomingHoverguard.java b/Mage.Sets/src/mage/sets/mirrodin/LoomingHoverguard.java index c53f23aa6e8..2eaaaf318f6 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/LoomingHoverguard.java +++ b/Mage.Sets/src/mage/sets/mirrodin/LoomingHoverguard.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodin/LoxodonMender.java b/Mage.Sets/src/mage/sets/mirrodin/LoxodonMender.java index 88819ef2a38..82c0e4f0ca8 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/LoxodonMender.java +++ b/Mage.Sets/src/mage/sets/mirrodin/LoxodonMender.java @@ -29,9 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.RegenerateTargetEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; @@ -62,7 +63,7 @@ public class LoxodonMender extends CardImpl { this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/mirrodin/LoxodonPunisher.java b/Mage.Sets/src/mage/sets/mirrodin/LoxodonPunisher.java index 5d0018f75dc..b42bbefea28 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/LoxodonPunisher.java +++ b/Mage.Sets/src/mage/sets/mirrodin/LoxodonPunisher.java @@ -27,10 +27,10 @@ */ package mage.sets.mirrodin; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.EquipmentAttachedCount; diff --git a/Mage.Sets/src/mage/sets/mirrodin/LoxodonWarhammer.java b/Mage.Sets/src/mage/sets/mirrodin/LoxodonWarhammer.java index b3e6995f031..9c48fc6395e 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/LoxodonWarhammer.java +++ b/Mage.Sets/src/mage/sets/mirrodin/LoxodonWarhammer.java @@ -28,7 +28,7 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/mirrodin/LuminousAngel.java b/Mage.Sets/src/mage/sets/mirrodin/LuminousAngel.java index e773d84cd1a..67f7f5cce36 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/LuminousAngel.java +++ b/Mage.Sets/src/mage/sets/mirrodin/LuminousAngel.java @@ -29,14 +29,14 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.game.permanent.token.SpiritWhiteToken; /** @@ -53,7 +53,7 @@ public class LuminousAngel extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new SpiritWhiteToken(), 1), Constants.TargetController.YOU, true)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new SpiritWhiteToken(), 1), TargetController.YOU, true)); } public LuminousAngel(final LuminousAngel card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/MalachiteGolem.java b/Mage.Sets/src/mage/sets/mirrodin/MalachiteGolem.java index a8acee6f66e..8a6e80dcb8c 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/MalachiteGolem.java +++ b/Mage.Sets/src/mage/sets/mirrodin/MalachiteGolem.java @@ -29,15 +29,16 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -51,7 +52,7 @@ public class MalachiteGolem extends CardImpl { this.subtype.add("Golem"); this.power = new MageInt(5); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(), Constants.Duration.EndOfTurn), new ManaCostsImpl("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{G}"))); } public MalachiteGolem(final MalachiteGolem card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/MassHysteria.java b/Mage.Sets/src/mage/sets/mirrodin/MassHysteria.java index 9f2c02e6f7e..a79d493d1fa 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/MassHysteria.java +++ b/Mage.Sets/src/mage/sets/mirrodin/MassHysteria.java @@ -29,13 +29,14 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; /** @@ -48,7 +49,7 @@ public class MassHysteria extends CardImpl { super(ownerId, 99, "Mass Hysteria", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{R}"); this.expansionSetCode = "MRD"; this.color.setRed(true); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Constants.Duration.WhileOnBattlefield, new FilterCreaturePermanent(), false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent(), false))); } public MassHysteria(final MassHysteria card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/Megatog.java b/Mage.Sets/src/mage/sets/mirrodin/Megatog.java index e68678b7c1d..f7c660c126e 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Megatog.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Megatog.java @@ -29,9 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledPermanent; @@ -62,8 +63,8 @@ public class Megatog extends CardImpl { this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(4); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(3, 3, Constants.Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(filter))); - ability.addEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Constants.Duration.EndOfTurn)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3, 3, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(filter))); + ability.addEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/MindsEye.java b/Mage.Sets/src/mage/sets/mirrodin/MindsEye.java index 537f8643c54..a47a0ec763e 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/MindsEye.java +++ b/Mage.Sets/src/mage/sets/mirrodin/MindsEye.java @@ -29,14 +29,14 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -67,7 +67,7 @@ public class MindsEye extends CardImpl { class MindsEyeTriggeredAbility extends TriggeredAbilityImpl { MindsEyeTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new DoIfCostPaid(new DrawCardControllerEffect(1), new GenericManaCost(1)), false); + super(Zone.BATTLEFIELD, new DoIfCostPaid(new DrawCardControllerEffect(1), new GenericManaCost(1)), false); } MindsEyeTriggeredAbility(final MindsEyeTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/Mindslaver.java b/Mage.Sets/src/mage/sets/mirrodin/Mindslaver.java index df2e97674cc..10de4e8ae62 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Mindslaver.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Mindslaver.java @@ -28,7 +28,7 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/mirrodin/MolderSlug.java b/Mage.Sets/src/mage/sets/mirrodin/MolderSlug.java index 40230f39e1d..e51167d3206 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/MolderSlug.java +++ b/Mage.Sets/src/mage/sets/mirrodin/MolderSlug.java @@ -29,14 +29,14 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.SacrificeEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -59,7 +59,7 @@ public class MolderSlug extends CardImpl { this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(6); - Ability ability = new BeginningOfUpkeepTriggeredAbility(new SacrificeEffect(filter, 1, "that player"), Constants.TargetController.ANY, false); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new SacrificeEffect(filter, 1, "that player"), TargetController.ANY, false); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/MoltenRain.java b/Mage.Sets/src/mage/sets/mirrodin/MoltenRain.java index 835d4ea90d8..5f7bd9faf97 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/MoltenRain.java +++ b/Mage.Sets/src/mage/sets/mirrodin/MoltenRain.java @@ -28,10 +28,10 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodin/MyrAdapter.java b/Mage.Sets/src/mage/sets/mirrodin/MyrAdapter.java index 16556321e1b..5a7fe726364 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/MyrAdapter.java +++ b/Mage.Sets/src/mage/sets/mirrodin/MyrAdapter.java @@ -27,10 +27,10 @@ */ package mage.sets.mirrodin; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.EquipmentAttachedCount; diff --git a/Mage.Sets/src/mage/sets/mirrodin/NecrogenSpellbomb.java b/Mage.Sets/src/mage/sets/mirrodin/NecrogenSpellbomb.java index f5f25a38aa3..79b52a0ab35 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/NecrogenSpellbomb.java +++ b/Mage.Sets/src/mage/sets/mirrodin/NecrogenSpellbomb.java @@ -29,9 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -40,6 +39,8 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DiscardTargetEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.target.TargetPlayer; /** @@ -51,11 +52,11 @@ public class NecrogenSpellbomb extends CardImpl { public NecrogenSpellbomb(UUID ownerId) { super(ownerId, 216, "Necrogen Spellbomb", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{1}"); this.expansionSetCode = "MRD"; - Ability firstAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ColoredManaCost(Constants.ColoredManaSymbol.B)); + Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.B)); firstAbility.addCost(new SacrificeSourceCost()); firstAbility.addTarget(new TargetPlayer()); this.addAbility(firstAbility); - Ability secondAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(1)); + Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(1)); secondAbility.addCost(new SacrificeSourceCost()); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/Needlebug.java b/Mage.Sets/src/mage/sets/mirrodin/Needlebug.java index 638f70921db..09b47c3d017 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Needlebug.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Needlebug.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.ProtectionAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodin/NeurokHoversail.java b/Mage.Sets/src/mage/sets/mirrodin/NeurokHoversail.java index 289e4b587e9..49166684056 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/NeurokHoversail.java +++ b/Mage.Sets/src/mage/sets/mirrodin/NeurokHoversail.java @@ -29,9 +29,7 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; @@ -51,9 +49,9 @@ public class NeurokHoversail extends CardImpl { this.subtype.add("Equipment"); // Equipped creature has flying. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.EQUIPMENT))); // Equip {2} - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(2))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); } public NeurokHoversail(final NeurokHoversail card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/NeurokSpy.java b/Mage.Sets/src/mage/sets/mirrodin/NeurokSpy.java index 9610320b21c..b896d09371a 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/NeurokSpy.java +++ b/Mage.Sets/src/mage/sets/mirrodin/NeurokSpy.java @@ -29,9 +29,9 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.DefendingPlayerControlsCondition; diff --git a/Mage.Sets/src/mage/sets/mirrodin/NightmareLash.java b/Mage.Sets/src/mage/sets/mirrodin/NightmareLash.java index a950019ce17..3dd6d188f7d 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/NightmareLash.java +++ b/Mage.Sets/src/mage/sets/mirrodin/NightmareLash.java @@ -29,9 +29,7 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -51,7 +49,7 @@ public class NightmareLash extends CardImpl { static { filter.add(new SubtypePredicate("Swamp")); - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public NightmareLash(UUID ownerId) { @@ -61,9 +59,9 @@ public class NightmareLash extends CardImpl { // Equipped creature gets +1/+1 for each Swamp you control. PermanentsOnBattlefieldCount value = new PermanentsOnBattlefieldCount(filter); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(value, value))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(value, value))); // Equip-Pay 3 life. - this.addAbility(new EquipAbility(Constants.Outcome.BoostCreature, new PayLifeCost(3))); + this.addAbility(new EquipAbility(Outcome.BoostCreature, new PayLifeCost(3))); } public NightmareLash(final NightmareLash card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/NimLasher.java b/Mage.Sets/src/mage/sets/mirrodin/NimLasher.java index 2e384e789f3..2f251bc7eda 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/NimLasher.java +++ b/Mage.Sets/src/mage/sets/mirrodin/NimLasher.java @@ -29,15 +29,16 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -59,7 +60,7 @@ public class NimLasher extends CardImpl { this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), new StaticValue(0), Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), new StaticValue(0), Duration.WhileOnBattlefield))); } public NimLasher(final NimLasher card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/NimReplica.java b/Mage.Sets/src/mage/sets/mirrodin/NimReplica.java index dc1c521780f..e5a2712383f 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/NimReplica.java +++ b/Mage.Sets/src/mage/sets/mirrodin/NimReplica.java @@ -29,9 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -53,7 +54,7 @@ public class NimReplica extends CardImpl { this.subtype.add("Zombie"); this.power = new MageInt(3); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Constants.Duration.EndOfTurn), new ManaCostsImpl("{2}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ManaCostsImpl("{2}{B}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/mirrodin/NimShambler.java b/Mage.Sets/src/mage/sets/mirrodin/NimShambler.java index 81bd9d56653..3c9a4e56d01 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/NimShambler.java +++ b/Mage.Sets/src/mage/sets/mirrodin/NimShambler.java @@ -29,9 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,6 +40,8 @@ import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -64,8 +65,8 @@ public class NimShambler extends CardImpl { this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), new StaticValue(0), Constants.Duration.WhileOnBattlefield))); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), new StaticValue(0), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); } public NimShambler(final NimShambler card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/NimShrieker.java b/Mage.Sets/src/mage/sets/mirrodin/NimShrieker.java index 96df87c0d4c..3f402d0b403 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/NimShrieker.java +++ b/Mage.Sets/src/mage/sets/mirrodin/NimShrieker.java @@ -29,9 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -39,6 +38,8 @@ import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -61,7 +62,7 @@ public class NimShrieker extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), new StaticValue(0), Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), new StaticValue(0), Duration.WhileOnBattlefield))); } public NimShrieker(final NimShrieker card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/OblivionStone.java b/Mage.Sets/src/mage/sets/mirrodin/OblivionStone.java index e52acf6c2ab..6fa48d660ec 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/OblivionStone.java +++ b/Mage.Sets/src/mage/sets/mirrodin/OblivionStone.java @@ -29,9 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -40,6 +39,8 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -55,12 +56,12 @@ public class OblivionStone extends CardImpl { this.expansionSetCode = "MRD"; // {4}, {tap}: Put a fate counter on target permanent. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.FATE.createInstance()), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.FATE.createInstance()), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent()); this.addAbility(ability); // {5}, {tap}, Sacrifice Oblivion Stone: Destroy each nonland permanent without a fate counter on it, then remove all fate counters from all permanents. - ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new OblivionStoneEffect(), new GenericManaCost(5)); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OblivionStoneEffect(), new GenericManaCost(5)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); @@ -78,7 +79,7 @@ public class OblivionStone extends CardImpl { class OblivionStoneEffect extends OneShotEffect { OblivionStoneEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); staticText = "Destroy each nonland permanent without a fate counter on it, then remove all fate counters from all permanents"; } diff --git a/Mage.Sets/src/mage/sets/mirrodin/OmegaMyr.java b/Mage.Sets/src/mage/sets/mirrodin/OmegaMyr.java index fb87709afae..21dfd263593 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/OmegaMyr.java +++ b/Mage.Sets/src/mage/sets/mirrodin/OmegaMyr.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodin/PewterGolem.java b/Mage.Sets/src/mage/sets/mirrodin/PewterGolem.java index abcd13a96d6..5eda90f26cf 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/PewterGolem.java +++ b/Mage.Sets/src/mage/sets/mirrodin/PewterGolem.java @@ -29,14 +29,14 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -50,7 +50,7 @@ public class PewterGolem extends CardImpl { this.subtype.add("Golem"); this.power = new MageInt(4); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}"))); } public PewterGolem(final PewterGolem card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/PlatedSlagwurm.java b/Mage.Sets/src/mage/sets/mirrodin/PlatedSlagwurm.java index 38d6929af9c..4ae17f2ec63 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/PlatedSlagwurm.java +++ b/Mage.Sets/src/mage/sets/mirrodin/PlatedSlagwurm.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodin/PredatorsStrike.java b/Mage.Sets/src/mage/sets/mirrodin/PredatorsStrike.java index d21664e5248..f17cb0fda83 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/PredatorsStrike.java +++ b/Mage.Sets/src/mage/sets/mirrodin/PredatorsStrike.java @@ -29,13 +29,13 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -48,8 +48,8 @@ public class PredatorsStrike extends CardImpl { super(ownerId, 128, "Predator's Strike", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "MRD"; this.color.setGreen(true); - this.getSpellAbility().addEffect(new BoostTargetEffect(3, 3, Constants.Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(3, 3, Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/PsychicMembrane.java b/Mage.Sets/src/mage/sets/mirrodin/PsychicMembrane.java index ca5e55e9bd9..7c37b49bf63 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/PsychicMembrane.java +++ b/Mage.Sets/src/mage/sets/mirrodin/PsychicMembrane.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodin/PyriteSpellbomb.java b/Mage.Sets/src/mage/sets/mirrodin/PyriteSpellbomb.java index 83f9ffea414..70563ed1cd8 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/PyriteSpellbomb.java +++ b/Mage.Sets/src/mage/sets/mirrodin/PyriteSpellbomb.java @@ -29,9 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -40,6 +39,8 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; /** @@ -51,11 +52,11 @@ public class PyriteSpellbomb extends CardImpl { public PyriteSpellbomb(UUID ownerId) { super(ownerId, 232, "Pyrite Spellbomb", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{1}"); this.expansionSetCode = "MRD"; - Ability firstAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(2), new ColoredManaCost(Constants.ColoredManaSymbol.R)); + Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ColoredManaCost(ColoredManaSymbol.R)); firstAbility.addCost(new SacrificeSourceCost()); firstAbility.addTarget(new TargetCreatureOrPlayer()); this.addAbility(firstAbility); - Ability secondAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(1)); + Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(1)); secondAbility.addCost(new SacrificeSourceCost()); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/RaiseTheAlarm.java b/Mage.Sets/src/mage/sets/mirrodin/RaiseTheAlarm.java index 1b4e4cffc03..6d959ff10c2 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/RaiseTheAlarm.java +++ b/Mage.Sets/src/mage/sets/mirrodin/RaiseTheAlarm.java @@ -29,8 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.game.permanent.token.SoldierToken; diff --git a/Mage.Sets/src/mage/sets/mirrodin/Regress.java b/Mage.Sets/src/mage/sets/mirrodin/Regress.java index 96ad10703cd..22cbdae866f 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Regress.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Regress.java @@ -29,8 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPermanent; diff --git a/Mage.Sets/src/mage/sets/mirrodin/RuleOfLaw.java b/Mage.Sets/src/mage/sets/mirrodin/RuleOfLaw.java index 80522e31ca9..cb2f98a8b4e 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/RuleOfLaw.java +++ b/Mage.Sets/src/mage/sets/mirrodin/RuleOfLaw.java @@ -28,7 +28,7 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/mirrodin/RustsporeRam.java b/Mage.Sets/src/mage/sets/mirrodin/RustsporeRam.java index 0c596f8cb36..76c6ca1981c 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/RustsporeRam.java +++ b/Mage.Sets/src/mage/sets/mirrodin/RustsporeRam.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodin/ScaleOfChissGoria.java b/Mage.Sets/src/mage/sets/mirrodin/ScaleOfChissGoria.java index 40f89d6e050..bf4a2c7042a 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/ScaleOfChissGoria.java +++ b/Mage.Sets/src/mage/sets/mirrodin/ScaleOfChissGoria.java @@ -29,9 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -39,6 +38,8 @@ import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.AffinityForArtifactsAbility; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -55,7 +56,7 @@ public class ScaleOfChissGoria extends CardImpl { // Affinity for artifacts this.addAbility(new AffinityForArtifactsAbility()); // {tap}: Target creature gets +0/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(0, 1, Constants.Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(0, 1, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/SeatOfTheSynod.java b/Mage.Sets/src/mage/sets/mirrodin/SeatOfTheSynod.java index 089cc79f4b8..f0cd25de4c0 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SeatOfTheSynod.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SeatOfTheSynod.java @@ -29,8 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodin/SecondSunrise.java b/Mage.Sets/src/mage/sets/mirrodin/SecondSunrise.java index 1cefa52378e..e2dbb70d5d9 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SecondSunrise.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SecondSunrise.java @@ -29,9 +29,8 @@ package mage.sets.mirrodin; import java.util.ArrayList; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -71,7 +70,7 @@ public class SecondSunrise extends CardImpl { class SecondSunriseEffect extends OneShotEffect { SecondSunriseEffect() { - super(Constants.Outcome.PutCardInPlay); + super(Outcome.PutCardInPlay); staticText = "Each player returns to the battlefield all artifact, creature, enchantment, and land cards in his or her graveyard that were put there from the battlefield this turn"; } @@ -85,10 +84,10 @@ class SecondSunriseEffect extends OneShotEffect { if (watcher != null) { for (UUID id : watcher.cards) { Card c = game.getCard(id); - if (c != null && game.getState().getZone(id) == Constants.Zone.GRAVEYARD) { + if (c != null && game.getState().getZone(id) == Zone.GRAVEYARD) { if (c.getCardType().contains(CardType.ARTIFACT) || c.getCardType().contains(CardType.CREATURE) || c.getCardType().contains(CardType.ENCHANTMENT) || c.getCardType().contains(CardType.LAND)) - c.moveToZone(Constants.Zone.BATTLEFIELD, source.getSourceId(), game, false); + c.moveToZone(Zone.BATTLEFIELD, source.getSourceId(), game, false); } } return true; @@ -106,7 +105,7 @@ class SecondSunriseWatcher extends WatcherImpl { ArrayList cards = new ArrayList(); public SecondSunriseWatcher() { - super("SecondSunriseWatcher", Constants.WatcherScope.GAME); + super("SecondSunriseWatcher", WatcherScope.GAME); } public SecondSunriseWatcher(final SecondSunriseWatcher watcher) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/SeethingSong.java b/Mage.Sets/src/mage/sets/mirrodin/SeethingSong.java index 1f4e0ac5b39..ec64ff34eba 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SeethingSong.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SeethingSong.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.effects.common.BasicManaEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodin/Shatter.java b/Mage.Sets/src/mage/sets/mirrodin/Shatter.java index 5d1587d348e..70b6360858b 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Shatter.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Shatter.java @@ -29,8 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/mirrodin/ShrapnelBlast.java b/Mage.Sets/src/mage/sets/mirrodin/ShrapnelBlast.java index 3a44fc37070..1801390d051 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/ShrapnelBlast.java +++ b/Mage.Sets/src/mage/sets/mirrodin/ShrapnelBlast.java @@ -29,8 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodin/SilverMyr.java b/Mage.Sets/src/mage/sets/mirrodin/SilverMyr.java index f152dc62675..6c4dfb3443b 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SilverMyr.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SilverMyr.java @@ -29,8 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodin/SlagwurmArmor.java b/Mage.Sets/src/mage/sets/mirrodin/SlagwurmArmor.java index 802a8bd0b7f..68aa79b3739 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SlagwurmArmor.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SlagwurmArmor.java @@ -29,14 +29,15 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; /** * @author Loki @@ -47,8 +48,8 @@ public class SlagwurmArmor extends CardImpl { super(ownerId, 243, "Slagwurm Armor", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{1}"); this.expansionSetCode = "MRD"; this.subtype.add("Equipment"); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(0, 6))); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(3))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(0, 6))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3))); } public SlagwurmArmor(final SlagwurmArmor card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/SlithAscendant.java b/Mage.Sets/src/mage/sets/mirrodin/SlithAscendant.java index 99d68504f78..20df9888737 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SlithAscendant.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SlithAscendant.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodin/SlithBloodletter.java b/Mage.Sets/src/mage/sets/mirrodin/SlithBloodletter.java index 52329206c8f..25e6268a505 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SlithBloodletter.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SlithBloodletter.java @@ -29,9 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; /** @@ -55,7 +55,7 @@ public class SlithBloodletter extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), false)); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}"))); } public SlithBloodletter(final SlithBloodletter card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/SlithFirewalker.java b/Mage.Sets/src/mage/sets/mirrodin/SlithFirewalker.java index 31ec5ce413e..524a2ca824b 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SlithFirewalker.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SlithFirewalker.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodin/SlithPredator.java b/Mage.Sets/src/mage/sets/mirrodin/SlithPredator.java index 7ce08d98318..74f9faddfc5 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SlithPredator.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SlithPredator.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodin/SlithStrider.java b/Mage.Sets/src/mage/sets/mirrodin/SlithStrider.java index bbaf816aeba..341c702f1a7 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SlithStrider.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SlithStrider.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BecomesBlockedTriggeredAbility; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodin/SoldierReplica.java b/Mage.Sets/src/mage/sets/mirrodin/SoldierReplica.java index fc0d4c6751a..4b81d310810 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SoldierReplica.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SoldierReplica.java @@ -29,9 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterAttackingOrBlockingCreature; import mage.target.common.TargetCreaturePermanent; @@ -54,7 +54,7 @@ public class SoldierReplica extends CardImpl { this.subtype.add("Soldier"); this.power = new MageInt(1); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(3), new ManaCostsImpl("{1}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new ManaCostsImpl("{1}{W}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(new FilterAttackingOrBlockingCreature())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/mirrodin/SomberHoverguard.java b/Mage.Sets/src/mage/sets/mirrodin/SomberHoverguard.java index 4575d22e260..5715a248b25 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SomberHoverguard.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SomberHoverguard.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.AffinityForArtifactsAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodin/SpikeshotGoblin.java b/Mage.Sets/src/mage/sets/mirrodin/SpikeshotGoblin.java index 8e00449bca9..70849033511 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SpikeshotGoblin.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SpikeshotGoblin.java @@ -29,9 +29,7 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -61,7 +59,7 @@ public class SpikeshotGoblin extends CardImpl { this.toughness = new MageInt(2); // {R}, {tap}: Spikeshot Goblin deals damage equal to its power to target creature or player. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new SpikeshotGoblinEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SpikeshotGoblinEffect(), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); @@ -79,7 +77,7 @@ public class SpikeshotGoblin extends CardImpl { class SpikeshotGoblinEffect extends OneShotEffect { public SpikeshotGoblinEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "{this} deals damage equal to its power to target creature or player"; } @@ -91,7 +89,7 @@ class SpikeshotGoblinEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Permanent sourcePermanent = game.getPermanent(source.getSourceId()); if (sourcePermanent == null) { - sourcePermanent = (Permanent) game.getLastKnownInformation(source.getSourceId(), Constants.Zone.BATTLEFIELD); + sourcePermanent = (Permanent) game.getLastKnownInformation(source.getSourceId(), Zone.BATTLEFIELD); } if (sourcePermanent == null) { return false; diff --git a/Mage.Sets/src/mage/sets/mirrodin/SpoilsOfTheVault.java b/Mage.Sets/src/mage/sets/mirrodin/SpoilsOfTheVault.java index fecee6d5773..1a9019f17cd 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SpoilsOfTheVault.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SpoilsOfTheVault.java @@ -28,9 +28,9 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -40,6 +40,8 @@ import mage.cards.CardsImpl; import mage.cards.repository.CardRepository; import mage.choices.Choice; import mage.choices.ChoiceImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; @@ -73,7 +75,7 @@ public class SpoilsOfTheVault extends CardImpl { class SpoilsOfTheVaultEffect extends OneShotEffect { public SpoilsOfTheVaultEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); this.staticText = "Name a card. Reveal cards from the top of your library until you reveal the named card, then put that card into your hand. Exile all other cards revealed this way, and you lose 1 life for each of the exiled cards"; } @@ -97,7 +99,7 @@ class SpoilsOfTheVaultEffect extends OneShotEffect { Choice cardChoice = new ChoiceImpl(); cardChoice.setChoices(CardRepository.instance.getNames()); cardChoice.clearChoice(); - while (!controller.choose(Constants.Outcome.Detriment, cardChoice, game)) { + while (!controller.choose(Outcome.Detriment, cardChoice, game)) { game.debugMessage("player canceled choosing name. retrying."); } cardName = cardChoice.getChoice(); @@ -109,13 +111,13 @@ class SpoilsOfTheVaultEffect extends OneShotEffect { return false; } - Cards cards = new CardsImpl(Constants.Zone.PICK); + Cards cards = new CardsImpl(Zone.PICK); while (controller.getLibrary().size() > 0) { Card card = controller.getLibrary().removeFromTop(game); if (card != null) { cards.add(card); if(card.getName().equals(cardName)){ - card.moveToZone(Constants.Zone.HAND, source.getId(), game, false); + card.moveToZone(Zone.HAND, source.getId(), game, false); break; } else{ diff --git a/Mage.Sets/src/mage/sets/mirrodin/SteelWall.java b/Mage.Sets/src/mage/sets/mirrodin/SteelWall.java index 8d3646dfa70..9f0cbe3a3e1 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SteelWall.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SteelWall.java @@ -29,8 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodin/SunbeamSpellbomb.java b/Mage.Sets/src/mage/sets/mirrodin/SunbeamSpellbomb.java index 902df72fa03..0b0c1c12c9c 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SunbeamSpellbomb.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SunbeamSpellbomb.java @@ -29,9 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -40,6 +39,8 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; /** * @@ -50,10 +51,10 @@ public class SunbeamSpellbomb extends CardImpl { public SunbeamSpellbomb(UUID ownerId) { super(ownerId, 250, "Sunbeam Spellbomb", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{1}"); this.expansionSetCode = "MRD"; - Ability firstAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainLifeEffect(5), new ColoredManaCost(Constants.ColoredManaSymbol.W)); + Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(5), new ColoredManaCost(ColoredManaSymbol.W)); firstAbility.addCost(new SacrificeSourceCost()); this.addAbility(firstAbility); - Ability secondAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(1)); + Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(1)); secondAbility.addCost(new SacrificeSourceCost()); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/TalismanOfDominance.java b/Mage.Sets/src/mage/sets/mirrodin/TalismanOfDominance.java index c77d3bc5d68..9588194c424 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TalismanOfDominance.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TalismanOfDominance.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.mana.BlackManaAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodin/TalismanOfImpulse.java b/Mage.Sets/src/mage/sets/mirrodin/TalismanOfImpulse.java index af860e1744a..3a48d0ac4f0 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TalismanOfImpulse.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TalismanOfImpulse.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.mana.ColorlessManaAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodin/TalismanOfIndulgence.java b/Mage.Sets/src/mage/sets/mirrodin/TalismanOfIndulgence.java index 48b68811f9f..d79b99b24cf 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TalismanOfIndulgence.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TalismanOfIndulgence.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.mana.BlackManaAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodin/TalismanOfProgress.java b/Mage.Sets/src/mage/sets/mirrodin/TalismanOfProgress.java index 3b1f00e1483..29058314cc6 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TalismanOfProgress.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TalismanOfProgress.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.mana.BlueManaAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodin/TalismanOfUnity.java b/Mage.Sets/src/mage/sets/mirrodin/TalismanOfUnity.java index 444f36a1854..9f422c49e35 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TalismanOfUnity.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TalismanOfUnity.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.mana.ColorlessManaAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodin/Tanglebloom.java b/Mage.Sets/src/mage/sets/mirrodin/Tanglebloom.java index 48a156a8df2..47b804c2252 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Tanglebloom.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Tanglebloom.java @@ -29,15 +29,15 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -48,7 +48,7 @@ public class Tanglebloom extends CardImpl { public Tanglebloom(UUID ownerId) { super(ownerId, 258, "Tanglebloom", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{1}"); this.expansionSetCode = "MRD"; - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainLifeEffect(1), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {1}, {tap}: You gain 1 life. diff --git a/Mage.Sets/src/mage/sets/mirrodin/TelJiladExile.java b/Mage.Sets/src/mage/sets/mirrodin/TelJiladExile.java index 725d742ce49..7bb388402a5 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TelJiladExile.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TelJiladExile.java @@ -29,14 +29,14 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -52,7 +52,7 @@ public class TelJiladExile extends CardImpl { this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{G}"))); } public TelJiladExile(final TelJiladExile card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/TitaniumGolem.java b/Mage.Sets/src/mage/sets/mirrodin/TitaniumGolem.java index 462ea1de61d..e43250eafe3 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TitaniumGolem.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TitaniumGolem.java @@ -29,15 +29,16 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -51,7 +52,7 @@ public class TitaniumGolem extends CardImpl { this.subtype.add("Golem"); this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Constants.Duration.EndOfTurn), new ManaCostsImpl("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{W}"))); } public TitaniumGolem(final TitaniumGolem card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/ToothOfChissGoria.java b/Mage.Sets/src/mage/sets/mirrodin/ToothOfChissGoria.java index a1e6769f0cc..0118ff159be 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/ToothOfChissGoria.java +++ b/Mage.Sets/src/mage/sets/mirrodin/ToothOfChissGoria.java @@ -29,9 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -39,6 +38,8 @@ import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.AffinityForArtifactsAbility; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -55,7 +56,7 @@ public class ToothOfChissGoria extends CardImpl { // Affinity for artifacts this.addAbility(new AffinityForArtifactsAbility()); // {tap}: Target creature gets +1/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Constants.Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/TowerOfChampions.java b/Mage.Sets/src/mage/sets/mirrodin/TowerOfChampions.java index 7603673ec55..5b5b1fbc6a8 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TowerOfChampions.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TowerOfChampions.java @@ -30,15 +30,16 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -50,7 +51,7 @@ public class TowerOfChampions extends CardImpl { public TowerOfChampions (UUID ownerId) { super(ownerId, 265, "Tower of Champions", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{4}"); this.expansionSetCode = "MRD"; - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(6, 6, Constants.Duration.EndOfTurn), new GenericManaCost(8)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(6, 6, Duration.EndOfTurn), new GenericManaCost(8)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/mirrodin/TowerOfEons.java b/Mage.Sets/src/mage/sets/mirrodin/TowerOfEons.java index 4b781f26cc6..2a1e458e649 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TowerOfEons.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TowerOfEons.java @@ -30,15 +30,15 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -49,7 +49,7 @@ public class TowerOfEons extends CardImpl { public TowerOfEons (UUID ownerId) { super(ownerId, 266, "Tower of Eons", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{4}"); this.expansionSetCode = "MRD"; - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainLifeEffect(10), new GenericManaCost(8)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(10), new GenericManaCost(8)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/TowerOfFortunes.java b/Mage.Sets/src/mage/sets/mirrodin/TowerOfFortunes.java index 689ec12dba9..8014908a3f6 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TowerOfFortunes.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TowerOfFortunes.java @@ -30,15 +30,15 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -49,7 +49,7 @@ public class TowerOfFortunes extends CardImpl { public TowerOfFortunes (UUID ownerId) { super(ownerId, 267, "Tower of Fortunes", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{4}"); this.expansionSetCode = "MRD"; - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(4), new GenericManaCost(8)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(4), new GenericManaCost(8)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/TowerOfMurmurs.java b/Mage.Sets/src/mage/sets/mirrodin/TowerOfMurmurs.java index 83954ce47c7..51f148862f6 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TowerOfMurmurs.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TowerOfMurmurs.java @@ -30,15 +30,15 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetPlayer; /** @@ -50,7 +50,7 @@ public class TowerOfMurmurs extends CardImpl { public TowerOfMurmurs (UUID ownerId) { super(ownerId, 268, "Tower of Murmurs", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{4}"); this.expansionSetCode = "MRD"; - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(8), new GenericManaCost(8)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(8), new GenericManaCost(8)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/mirrodin/TrashForTreasure.java b/Mage.Sets/src/mage/sets/mirrodin/TrashForTreasure.java index 53f7ce07af8..67857ae353c 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TrashForTreasure.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TrashForTreasure.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodin/TreeOfTales.java b/Mage.Sets/src/mage/sets/mirrodin/TreeOfTales.java index 3f239b31556..9925f56ac9e 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TreeOfTales.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TreeOfTales.java @@ -29,8 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodin/TrollAscetic.java b/Mage.Sets/src/mage/sets/mirrodin/TrollAscetic.java index ce5c133f596..c7269f08a0d 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TrollAscetic.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TrollAscetic.java @@ -30,15 +30,15 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -54,7 +54,7 @@ public class TrollAscetic extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(2); this.addAbility(HexproofAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{G}"))); } public TrollAscetic (final TrollAscetic card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/TrollsOfTelJilad.java b/Mage.Sets/src/mage/sets/mirrodin/TrollsOfTelJilad.java index 257d6995995..9ad8fcce253 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TrollsOfTelJilad.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TrollsOfTelJilad.java @@ -29,9 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -39,6 +38,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; @@ -63,7 +63,7 @@ public class TrollsOfTelJilad extends CardImpl { this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(6); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{1}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{1}{G}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/TurnToDust.java b/Mage.Sets/src/mage/sets/mirrodin/TurnToDust.java index 337018c6925..8be26527a82 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TurnToDust.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TurnToDust.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodin/VaultOfWhispers.java b/Mage.Sets/src/mage/sets/mirrodin/VaultOfWhispers.java index 1b157af339a..b636636e9d9 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/VaultOfWhispers.java +++ b/Mage.Sets/src/mage/sets/mirrodin/VaultOfWhispers.java @@ -29,8 +29,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.mana.BlackManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodin/VulshokBattlegear.java b/Mage.Sets/src/mage/sets/mirrodin/VulshokBattlegear.java index 50966443b8a..ebfe193b6bf 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/VulshokBattlegear.java +++ b/Mage.Sets/src/mage/sets/mirrodin/VulshokBattlegear.java @@ -30,14 +30,15 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; /** * @@ -49,8 +50,8 @@ public class VulshokBattlegear extends CardImpl { super(ownerId, 272, "Vulshok Battlegear", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "MRD"; this.subtype.add("Equipment"); - this.addAbility(new EquipAbility(Constants.Outcome.BoostCreature, new GenericManaCost(3))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(3, 3))); + this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(3))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 3))); } public VulshokBattlegear (final VulshokBattlegear card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/WallOfBlood.java b/Mage.Sets/src/mage/sets/mirrodin/WallOfBlood.java index a7a502798ea..478cd58b0e7 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/WallOfBlood.java +++ b/Mage.Sets/src/mage/sets/mirrodin/WallOfBlood.java @@ -29,15 +29,16 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -53,7 +54,7 @@ public class WallOfBlood extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(2); this.addAbility(DefenderAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Constants.Duration.EndOfTurn), new PayLifeCost(1))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new PayLifeCost(1))); // Pay 1 life: Wall of Blood gets +1/+1 until end of turn. } diff --git a/Mage.Sets/src/mage/sets/mirrodin/WeldingJar.java b/Mage.Sets/src/mage/sets/mirrodin/WeldingJar.java index e1ae5bd607a..7c81e12639f 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/WeldingJar.java +++ b/Mage.Sets/src/mage/sets/mirrodin/WeldingJar.java @@ -30,14 +30,14 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.RegenerateTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetArtifactPermanent; /** @@ -49,7 +49,7 @@ public class WeldingJar extends CardImpl { public WeldingJar (UUID ownerId) { super(ownerId, 274, "Welding Jar", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{0}"); this.expansionSetCode = "MRD"; - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/YotianSoldier.java b/Mage.Sets/src/mage/sets/mirrodin/YotianSoldier.java index 96855628be2..9e3b453e52f 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/YotianSoldier.java +++ b/Mage.Sets/src/mage/sets/mirrodin/YotianSoldier.java @@ -28,8 +28,8 @@ package mage.sets.mirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/AccorderPaladin.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/AccorderPaladin.java index d0ea98e9206..c90150b06a8 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/AccorderPaladin.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/AccorderPaladin.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.BattleCryAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ArdentRecruit.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ArdentRecruit.java index fa11e8a9ce4..79814294230 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/ArdentRecruit.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/ArdentRecruit.java @@ -30,10 +30,10 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/BanishmentDecree.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/BanishmentDecree.java index 8c170024901..9f3a3e09b32 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/BanishmentDecree.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/BanishmentDecree.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/BlackSunsZenith.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/BlackSunsZenith.java index c9a2dcf9fe9..14d8d52bb05 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/BlackSunsZenith.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/BlackSunsZenith.java @@ -30,13 +30,13 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ShuffleSpellEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -68,7 +68,7 @@ public class BlackSunsZenith extends CardImpl { class BlackSunsZenithEffect extends OneShotEffect { BlackSunsZenithEffect() { - super(Constants.Outcome.UnboostCreature); + super(Outcome.UnboostCreature); staticText = "Put X -1/-1 counters on each creature"; } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/BladedSentinel.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/BladedSentinel.java index b4b5b19b972..843dd62e860 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/BladedSentinel.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/BladedSentinel.java @@ -29,10 +29,10 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/BlightsteelColossus.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/BlightsteelColossus.java index c47ab0745bb..71366306e11 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/BlightsteelColossus.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/BlightsteelColossus.java @@ -30,9 +30,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.PutIntoGraveFromAnywhereTriggeredAbility; @@ -44,6 +43,8 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; @@ -77,7 +78,7 @@ public class BlightsteelColossus extends CardImpl { class BlightsteelColossusEffect extends OneShotEffect { BlightsteelColossusEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "reveal {this} and shuffle it into its owner's library"; } @@ -94,7 +95,7 @@ class BlightsteelColossusEffect extends OneShotEffect Cards cards = new CardsImpl(); cards.add(c); player.revealCards("Blightsteel Colossus", cards, game); - c.moveToZone(Constants.Zone.LIBRARY, source.getSourceId(), game, true); + c.moveToZone(Zone.LIBRARY, source.getSourceId(), game, true); player.shuffleLibrary(game); return true; } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Blightwidow.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Blightwidow.java index f5bfd7ad58d..576c5f68cee 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Blightwidow.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Blightwidow.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.InfectAbility; import mage.abilities.keyword.ReachAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/BlisterstickShaman.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/BlisterstickShaman.java index e5dbaed59f3..dc8d18f65df 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/BlisterstickShaman.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/BlisterstickShaman.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/BlueSunsZenith.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/BlueSunsZenith.java index 5b81349d393..0d839b906b8 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/BlueSunsZenith.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/BlueSunsZenith.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.effects.common.ShuffleSpellEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Bonehoard.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Bonehoard.java index 3613e328810..a92fba0ce9f 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Bonehoard.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Bonehoard.java @@ -28,10 +28,10 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.dynamicvalue.common.CardsInAllGraveyardsCount; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/BrassSquire.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/BrassSquire.java index 03879d466d0..b38632266d7 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/BrassSquire.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/BrassSquire.java @@ -28,10 +28,10 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/BurntheImpure.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/BurntheImpure.java index 89d606de6d8..5039ca1c268 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/BurntheImpure.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/BurntheImpure.java @@ -30,13 +30,13 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -70,7 +70,7 @@ public class BurntheImpure extends CardImpl { protected int amount; public BurntheImpureEffect(int amount) { - super(Constants.Outcome.Damage); + super(Outcome.Damage); this.amount = amount; staticText = "{this} deals 3 damage to target creature. If that creature has infect, {this} deals 3 damage to that creature's controller."; } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/CausticHound.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/CausticHound.java index 29fd04738eb..fb5d9eda703 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/CausticHound.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/CausticHound.java @@ -30,8 +30,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.LoseLifePlayersEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ChokingFumes.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ChokingFumes.java index b3bea107697..cbc331dc90a 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/ChokingFumes.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/ChokingFumes.java @@ -28,8 +28,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.counter.AddCountersAllEffect; import mage.cards.CardImpl; import mage.counters.CounterType; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ConcussiveBolt.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ConcussiveBolt.java index fe15c71b499..3961be4e1ff 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/ConcussiveBolt.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/ConcussiveBolt.java @@ -28,10 +28,10 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.condition.common.MetalcraftCondition; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ConsecratedSphinx.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ConsecratedSphinx.java index d29a1a79523..34f2ce9d4f4 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/ConsecratedSphinx.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/ConsecratedSphinx.java @@ -30,14 +30,14 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -71,7 +71,7 @@ public class ConsecratedSphinx extends CardImpl { class ConsecratedSphinxTriggeredAbility extends TriggeredAbilityImpl { ConsecratedSphinxTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(2), true); + super(Zone.BATTLEFIELD, new DrawCardControllerEffect(2), true); } ConsecratedSphinxTriggeredAbility(final ConsecratedSphinxTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ContestedWarZone.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ContestedWarZone.java index ccacdfd2e97..603a415052d 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/ContestedWarZone.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/ContestedWarZone.java @@ -28,14 +28,14 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.TriggeredAbilityImpl; @@ -84,7 +84,7 @@ public class ContestedWarZone extends CardImpl { class ContestedWarZoneAbility extends TriggeredAbilityImpl { public ContestedWarZoneAbility() { - super(Constants.Zone.BATTLEFIELD, new ContestedWarZoneEffect()); + super(Zone.BATTLEFIELD, new ContestedWarZoneEffect()); } public ContestedWarZoneAbility(final ContestedWarZoneAbility ability) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/CopperCarapace.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/CopperCarapace.java index 76c6ed604d6..e500c3101f9 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/CopperCarapace.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/CopperCarapace.java @@ -28,11 +28,11 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CantBlockAttachedEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/CoreProwler.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/CoreProwler.java index ae43c565c62..d46af83a8aa 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/CoreProwler.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/CoreProwler.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.counter.ProliferateEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/CorruptedConscience.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/CorruptedConscience.java index d0c7d3b6bb0..798f97363eb 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/CorruptedConscience.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/CorruptedConscience.java @@ -30,9 +30,7 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -57,11 +55,11 @@ public class CorruptedConscience extends CardImpl { this.color.setBlue(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ControlEnchantedEffect())); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(InfectAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(InfectAbility.getInstance(), AttachmentType.AURA))); } public CorruptedConscience (final CorruptedConscience card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/CreepingCorrosion.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/CreepingCorrosion.java index 50300221aae..51e3fbdc97e 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/CreepingCorrosion.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/CreepingCorrosion.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.filter.common.FilterArtifactPermanent; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Crush.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Crush.java index 66b056df03d..f3c8e42c446 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Crush.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Crush.java @@ -28,8 +28,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterArtifactPermanent; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Cryptoplasm.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Cryptoplasm.java index 00a874162a5..e063ec7eeb8 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Cryptoplasm.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Cryptoplasm.java @@ -28,14 +28,14 @@ package mage.sets.mirrodinbesieged; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.CardImpl; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; @@ -64,7 +64,7 @@ public class Cryptoplasm extends CardImpl { this.toughness = new MageInt(2); // At the beginning of your upkeep, you may have Cryptoplasm become a copy of another target creature. If you do, Cryptoplasm gains this ability. - Ability ability = new BeginningOfUpkeepTriggeredAbility(new CryptoplasmTransformEffect(), Constants.TargetController.YOU, true); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new CryptoplasmTransformEffect(), TargetController.YOU, true); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } @@ -83,7 +83,7 @@ public class Cryptoplasm extends CardImpl { class CryptoplasmTransformEffect extends ContinuousEffectImpl { CryptoplasmTransformEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Layer.CopyEffects_1, Constants.SubLayer.NA, Constants.Outcome.Copy); + super(Duration.WhileOnBattlefield, Layer.CopyEffects_1, SubLayer.NA, Outcome.Copy); staticText = "you may have {this} become a copy of another target creature. If you do, {this} gains this ability"; } @@ -103,7 +103,7 @@ class CryptoplasmTransformEffect extends ContinuousEffectImpl { this.addAbility(IndestructibleAbility.getInstance()); // Equipped creature is indestructible. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new GainAbilityAttachedEffect(IndestructibleAbility.getInstance(), AttachmentType.EQUIPMENT, Constants.Duration.WhileOnBattlefield))); + new GainAbilityAttachedEffect(IndestructibleAbility.getInstance(), AttachmentType.EQUIPMENT, Duration.WhileOnBattlefield))); // Equip {2} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2))); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/DecimatorWeb.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/DecimatorWeb.java index 04987a7534e..498d43a7579 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/DecimatorWeb.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/DecimatorWeb.java @@ -30,9 +30,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -41,6 +40,7 @@ import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetOpponent; @@ -53,7 +53,7 @@ public class DecimatorWeb extends CardImpl { public DecimatorWeb (UUID ownerId) { super(ownerId, 105, "Decimator Web", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{4}"); this.expansionSetCode = "MBS"; - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new LoseLifeTargetEffect(2), new ManaCostsImpl("{4}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2), new ManaCostsImpl("{4}")); ability.addCost(new TapSourceCost()); ability.addEffect(new AddCountersTargetEffect(CounterType.POISON.createInstance())); ability.addEffect(new PutLibraryIntoGraveTargetEffect(6)); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/DistantMemories.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/DistantMemories.java index 339356f52c7..744106408f1 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/DistantMemories.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/DistantMemories.java @@ -29,10 +29,10 @@ package mage.sets.mirrodinbesieged; import java.util.Set; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/DivineOffering.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/DivineOffering.java index c4ad707b5e3..f8b47a9b214 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/DivineOffering.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/DivineOffering.java @@ -30,14 +30,15 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; @@ -77,7 +78,7 @@ public class DivineOffering extends CardImpl { private class DivineOfferingEffect extends OneShotEffect { public DivineOfferingEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); staticText = "You gain life equal to its converted mana cost"; } @@ -87,7 +88,7 @@ public class DivineOffering extends CardImpl { @Override public boolean apply(Game game, Ability source) { - MageObject card = game.getLastKnownInformation(source.getFirstTarget(), Constants.Zone.BATTLEFIELD); + MageObject card = game.getLastKnownInformation(source.getFirstTarget(), Zone.BATTLEFIELD); if (card != null) { int cost = card.getManaCost().get(0).convertedManaCost(); Player player = game.getPlayer(source.getControllerId()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/DrossRipper.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/DrossRipper.java index dbd684c6643..14fd3f9afff 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/DrossRipper.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/DrossRipper.java @@ -30,14 +30,15 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -51,7 +52,7 @@ public class DrossRipper extends CardImpl { this.subtype.add("Hound"); this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Constants.Duration.EndOfTurn), new ManaCostsImpl("{2}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{2}{B}"))); } public DrossRipper (final DrossRipper card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/FangrenMarauder.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/FangrenMarauder.java index 8ae18688ecf..48eb6e4ef9e 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/FangrenMarauder.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/FangrenMarauder.java @@ -28,9 +28,9 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/FlayerHusk.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/FlayerHusk.java index 21c6c5cbcd7..181ab242734 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/FlayerHusk.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/FlayerHusk.java @@ -28,10 +28,10 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Flensermite.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Flensermite.java index 8a8825afed4..ea1e529b014 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Flensermite.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Flensermite.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.InfectAbility; import mage.abilities.keyword.LifelinkAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/FleshEaterImp.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/FleshEaterImp.java index dcd046a9f91..261e6a1a398 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/FleshEaterImp.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/FleshEaterImp.java @@ -30,9 +30,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -40,6 +39,8 @@ import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -57,7 +58,7 @@ public class FleshEaterImp extends CardImpl { this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); this.addAbility(InfectAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Constants.Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); } public FleshEaterImp (final FleshEaterImp card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/FranticSalvage.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/FranticSalvage.java index c2e004c4f8a..4509b636f29 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/FranticSalvage.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/FranticSalvage.java @@ -27,8 +27,8 @@ */ package mage.sets.mirrodinbesieged; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/FuelForTheCause.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/FuelForTheCause.java index dd07020ab2f..b8ec37fbe72 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/FuelForTheCause.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/FuelForTheCause.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.counter.ProliferateEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Galvanoth.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Galvanoth.java index 506a77d0dac..6abbda56d2c 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Galvanoth.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Galvanoth.java @@ -28,10 +28,10 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/GlissaTheTraitor.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/GlissaTheTraitor.java index de15786fae2..ca5da15d8b7 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/GlissaTheTraitor.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/GlissaTheTraitor.java @@ -30,15 +30,15 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; @@ -89,7 +89,7 @@ class GlissaTheTraitorTriggeredAbility extends TriggeredAbilityImpl { this.toughness = new MageInt(4); this.addAbility(new SimpleActivatedAbility( - Constants.Zone.BATTLEFIELD, - new GainAbilitySourceEffect(TrampleAbility.getInstance(), Constants.Duration.EndOfTurn), + Zone.BATTLEFIELD, + new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(filter)))); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/GoForTheThroat.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/GoForTheThroat.java index c73f2bee18d..810d95f7914 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/GoForTheThroat.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/GoForTheThroat.java @@ -28,8 +28,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/GoblinWardriver.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/GoblinWardriver.java index 72634e91f50..5656fb35343 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/GoblinWardriver.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/GoblinWardriver.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.BattleCryAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/GoreVassal.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/GoreVassal.java index c9a3092f458..e8775bc72ba 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/GoreVassal.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/GoreVassal.java @@ -28,9 +28,9 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/GreenSunsZenith.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/GreenSunsZenith.java index fa981ab84ab..be50cdda420 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/GreenSunsZenith.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/GreenSunsZenith.java @@ -28,15 +28,16 @@ package mage.sets.mirrodinbesieged; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ShuffleSpellEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.Filter; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -74,7 +75,7 @@ public class GreenSunsZenith extends CardImpl { class GreenSunsZenithSearchEffect extends OneShotEffect { GreenSunsZenithSearchEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); staticText = "Search your library for a green creature card with converted mana cost X or less, put it onto the battlefield, then shuffle your library"; } @@ -97,7 +98,7 @@ class GreenSunsZenithSearchEffect extends OneShotEffect 0) { Card card = player.getLibrary().getCard(target.getFirstTarget(), game); if (card != null) - card.putOntoBattlefield(game, Constants.Zone.LIBRARY, source.getId(), source.getControllerId()); + card.putOntoBattlefield(game, Zone.LIBRARY, source.getId(), source.getControllerId()); } player.shuffleLibrary(game); return true; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/GruesomeEncore.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/GruesomeEncore.java index c78283424b0..f2b62e7a100 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/GruesomeEncore.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/GruesomeEncore.java @@ -28,11 +28,11 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.delayed.AtEndOfTurnDelayedTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/GustSkimmer.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/GustSkimmer.java index ed2e057b543..c7382821677 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/GustSkimmer.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/GustSkimmer.java @@ -29,10 +29,10 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/HellkiteIgniter.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/HellkiteIgniter.java index d3a10847786..e545d5724bd 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/HellkiteIgniter.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/HellkiteIgniter.java @@ -30,9 +30,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -42,6 +41,8 @@ import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterArtifactPermanent; /** @@ -59,11 +60,11 @@ public class HellkiteIgniter extends CardImpl { this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); this.addAbility(HasteAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect( new PermanentsOnBattlefieldCount(new FilterArtifactPermanent()), new StaticValue(0), - Constants.Duration.EndOfTurn), + Duration.EndOfTurn), new ManaCostsImpl("{1}{R}"))); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/HeroOfBladehold.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/HeroOfBladehold.java index 9f73110e266..16347b54188 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/HeroOfBladehold.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/HeroOfBladehold.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/HeroOfOxidRidge.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/HeroOfOxidRidge.java index 14ab0cd5132..0b05c1eb80c 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/HeroOfOxidRidge.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/HeroOfOxidRidge.java @@ -29,9 +29,9 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/HexplateGolem.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/HexplateGolem.java index 21818d64985..bf5a2cb6d23 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/HexplateGolem.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/HexplateGolem.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/HorrifyingRevelation.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/HorrifyingRevelation.java index 5b9b1aef6d3..762145e3782 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/HorrifyingRevelation.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/HorrifyingRevelation.java @@ -28,8 +28,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DiscardTargetEffect; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/IchorWellspring.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/IchorWellspring.java index 9a1b854cf3b..267f69df340 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/IchorWellspring.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/IchorWellspring.java @@ -28,8 +28,8 @@ package mage.sets.mirrodinbesieged; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/InkmothNexus.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/InkmothNexus.java index e66053d4272..7f187da4a88 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/InkmothNexus.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/InkmothNexus.java @@ -29,10 +29,10 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/IntoTheCore.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/IntoTheCore.java index 55fc9544255..eee4e76dda3 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/IntoTheCore.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/IntoTheCore.java @@ -28,8 +28,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/KembasLegion.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/KembasLegion.java index 2e2f63a0bfa..c56b564c12a 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/KembasLegion.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/KembasLegion.java @@ -29,13 +29,13 @@ package mage.sets.mirrodinbesieged; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/KnowledgePool.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/KnowledgePool.java index 78ee76ee243..043261b5ca4 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/KnowledgePool.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/KnowledgePool.java @@ -29,10 +29,10 @@ package mage.sets.mirrodinbesieged; import mage.target.common.TargetCardInExile; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/KothsCourier.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/KothsCourier.java index 440eb535009..b931b593568 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/KothsCourier.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/KothsCourier.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ForestwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/KuldothaFlamefiend.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/KuldothaFlamefiend.java index 55301bda4c6..2fb385105cb 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/KuldothaFlamefiend.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/KuldothaFlamefiend.java @@ -28,9 +28,9 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/KuldothaRingleader.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/KuldothaRingleader.java index 0dc847707b5..2f494e07517 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/KuldothaRingleader.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/KuldothaRingleader.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.keyword.BattleCryAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/LeadTheStampede.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/LeadTheStampede.java index 2319e941143..b8cf763647b 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/LeadTheStampede.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/LeadTheStampede.java @@ -28,8 +28,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; import mage.cards.CardImpl; import mage.filter.FilterCard; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/LeoninRelicWarder.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/LeoninRelicWarder.java index f15bacd017a..04733a83709 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/LeoninRelicWarder.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/LeoninRelicWarder.java @@ -30,9 +30,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -40,6 +39,7 @@ import mage.abilities.common.LeavesBattlefieldTriggeredAbility; import mage.abilities.effects.common.ExileTargetForSourceEffect; import mage.abilities.effects.common.ReturnFromExileForSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -74,7 +74,7 @@ public class LeoninRelicWarder extends CardImpl { ability.addTarget(target); this.addAbility(ability); - Ability ability2 = new LeavesBattlefieldTriggeredAbility(new ReturnFromExileForSourceEffect(Constants.Zone.BATTLEFIELD), false); + Ability ability2 = new LeavesBattlefieldTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.BATTLEFIELD), false); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/LeoninSkyhunter.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/LeoninSkyhunter.java index c3b1d2d7bf6..0c45e280464 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/LeoninSkyhunter.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/LeoninSkyhunter.java @@ -29,7 +29,7 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/LoxodonPartisan.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/LoxodonPartisan.java index 5da9ab583e5..cfe573d98a7 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/LoxodonPartisan.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/LoxodonPartisan.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.BattleCryAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/LumengridGargoyle.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/LumengridGargoyle.java index 9df70e86f97..dac4152c216 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/LumengridGargoyle.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/LumengridGargoyle.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/MagneticMine.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/MagneticMine.java index 0ab5403ab61..17aee65ea9d 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/MagneticMine.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/MagneticMine.java @@ -28,9 +28,9 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/MassacreWurm.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/MassacreWurm.java index e9e94fa0fbc..90488fd53f1 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/MassacreWurm.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/MassacreWurm.java @@ -30,9 +30,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -40,6 +39,8 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.abilities.effects.common.continious.BoostOpponentsEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -59,7 +60,7 @@ public class MassacreWurm extends CardImpl { this.color.setBlack(true); this.power = new MageInt(6); this.toughness = new MageInt(5); - this.addAbility(new EntersBattlefieldTriggeredAbility(new BoostOpponentsEffect(-2, -2, Constants.Duration.EndOfTurn))); + this.addAbility(new EntersBattlefieldTriggeredAbility(new BoostOpponentsEffect(-2, -2, Duration.EndOfTurn))); this.addAbility(new MassacreWurmTriggeredAbility()); } @@ -76,7 +77,7 @@ public class MassacreWurm extends CardImpl { class MassacreWurmTriggeredAbility extends TriggeredAbilityImpl { MassacreWurmTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new LoseLifeTargetEffect(2)); + super(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2)); } MassacreWurmTriggeredAbility(final MassacreWurmTriggeredAbility ability) { @@ -91,7 +92,7 @@ class MassacreWurmTriggeredAbility extends TriggeredAbilityImpl { class MyrWelderEffect extends OneShotEffect { public MyrWelderEffect() { - super(Constants.Outcome.Exile); + super(Outcome.Exile); staticText = "Exile target artifact card from a graveyard"; } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/NestedGhoul.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/NestedGhoul.java index a1d79f88370..e401a3a2a61 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/NestedGhoul.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/NestedGhoul.java @@ -30,13 +30,13 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.token.ZombieToken; @@ -71,7 +71,7 @@ public class NestedGhoul extends CardImpl { class NestedGhoulTriggeredAbility extends TriggeredAbilityImpl { NestedGhoulTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new ZombieToken())); + super(Zone.BATTLEFIELD, new CreateTokenEffect(new ZombieToken())); } NestedGhoulTriggeredAbility(final NestedGhoulTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/NeurokCommando.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/NeurokCommando.java index a84509a9456..7f38fa6a774 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/NeurokCommando.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/NeurokCommando.java @@ -28,8 +28,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Oculus.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Oculus.java index 89b7a7b9b33..26d548536db 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Oculus.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Oculus.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/OgreResister.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/OgreResister.java index a2610505570..52544066c13 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/OgreResister.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/OgreResister.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PeaceStrider.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PeaceStrider.java index a09aaa50529..99a36b5964b 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PeaceStrider.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PeaceStrider.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Phyresis.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Phyresis.java index 300907c2386..8e9c353f2c2 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Phyresis.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Phyresis.java @@ -30,10 +30,9 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -41,6 +40,8 @@ import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; +import mage.constants.AttachmentType; +import mage.constants.Outcome; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -58,11 +59,11 @@ public class Phyresis extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(InfectAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(InfectAbility.getInstance(), AttachmentType.AURA))); } public Phyresis (final Phyresis card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianCrusader.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianCrusader.java index 71c03cca125..deaffd2989e 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianCrusader.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianCrusader.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianDigester.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianDigester.java index 0618aca1368..34f7449a174 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianDigester.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianDigester.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianHydra.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianHydra.java index 2d3a5e590cb..039e58f3a39 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianHydra.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianHydra.java @@ -29,10 +29,10 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianJuggernaut.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianJuggernaut.java index 06f4251e22b..dab920d13a3 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianJuggernaut.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianJuggernaut.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.keyword.InfectAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianRebirth.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianRebirth.java index 46b887ec3c0..7d11af1a53c 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianRebirth.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianRebirth.java @@ -30,13 +30,13 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -67,7 +67,7 @@ public class PhyrexianRebirth extends CardImpl { class PhyrexianRebirthEffect extends OneShotEffect { public PhyrexianRebirthEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); staticText = "Destroy all creatures, then put an X/X colorless Horror artifact creature token onto the battlefield, where X is the number of creatures destroyed this way"; } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianRevoker.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianRevoker.java index ce6ae257033..2fc45692303 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianRevoker.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianRevoker.java @@ -29,11 +29,11 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianVatmother.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianVatmother.java index 253427a9856..508504894f9 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianVatmother.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianVatmother.java @@ -29,14 +29,14 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; import mage.game.events.GameEvent.EventType; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.counters.CounterType; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PierceStrider.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PierceStrider.java index 2fd2b24926a..afb49d24c8f 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PierceStrider.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PierceStrider.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PistonSledge.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PistonSledge.java index 639ff6dd90d..7bf8766a909 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PistonSledge.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PistonSledge.java @@ -30,11 +30,10 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -64,7 +63,7 @@ public class PistonSledge extends CardImpl { ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 1))); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new SacrificeTargetCost(new TargetControlledPermanent(filter)))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new SacrificeTargetCost(new TargetControlledPermanent(filter)))); } public PistonSledge (final PistonSledge card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PistusStrike.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PistusStrike.java index b4b4dbb8cff..baf9769653f 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PistusStrike.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PistusStrike.java @@ -29,10 +29,10 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PlagueMyr.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PlagueMyr.java index b93dcc3b0ca..77a435b8465 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PlagueMyr.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PlagueMyr.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.InfectAbility; import mage.abilities.mana.ColorlessManaAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PlaguemawBeast.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PlaguemawBeast.java index a3320a1dced..712cc057899 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PlaguemawBeast.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PlaguemawBeast.java @@ -30,9 +30,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,7 @@ import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.counter.ProliferateEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -55,7 +55,7 @@ public class PlaguemawBeast extends CardImpl { this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ProliferateEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ProliferateEffect(), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PraetorsCounsel.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PraetorsCounsel.java index 96627392b26..0a791910ef3 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PraetorsCounsel.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PraetorsCounsel.java @@ -28,10 +28,10 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileSpellEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PriestsOfNorn.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PriestsOfNorn.java index a9737f6f763..61f9995dd28 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PriestsOfNorn.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PriestsOfNorn.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.InfectAbility; import mage.abilities.keyword.VigilanceAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PsychosisCrawler.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PsychosisCrawler.java index 4ca910e27dd..896179394ac 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PsychosisCrawler.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PsychosisCrawler.java @@ -29,11 +29,11 @@ package mage.sets.mirrodinbesieged; import java.util.Set; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DrawCardTriggeredAbility; @@ -42,6 +42,7 @@ import mage.abilities.dynamicvalue.common.CardsInControllerHandCount; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.game.Game; import mage.players.Player; @@ -59,7 +60,7 @@ public class PsychosisCrawler extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(0); - this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new CardsInControllerHandCount(), Constants.Duration.EndOfGame))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new CardsInControllerHandCount(), Duration.EndOfGame))); this.addAbility(new DrawCardTriggeredAbility(new LoseLifeOpponentsEffect(), false)); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/QuicksilverGeyser.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/QuicksilverGeyser.java index 4b30e65ce7c..4f6020c839d 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/QuicksilverGeyser.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/QuicksilverGeyser.java @@ -28,8 +28,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetNonlandPermanent; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/QuilledSlagwurm.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/QuilledSlagwurm.java index 504536828fc..54ff7daddcc 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/QuilledSlagwurm.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/QuilledSlagwurm.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/RallyTheForces.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/RallyTheForces.java index 35f7dd8e489..c674fa11a17 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/RallyTheForces.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/RallyTheForces.java @@ -30,13 +30,13 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterAttackingCreature; /** @@ -50,8 +50,8 @@ public class RallyTheForces extends CardImpl { super(ownerId, 73, "Rally the Forces", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}"); this.expansionSetCode = "MBS"; this.color.setRed(true); - this.getSpellAbility().addEffect(new BoostAllEffect(1, 1, Constants.Duration.EndOfTurn, filter, false)); - this.getSpellAbility().addEffect(new GainAbilityAllEffect(FirstStrikeAbility.getInstance(), Constants.Duration.EndOfTurn, filter, false)); + this.getSpellAbility().addEffect(new BoostAllEffect(1, 1, Duration.EndOfTurn, filter, false)); + this.getSpellAbility().addEffect(new GainAbilityAllEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn, filter, false)); } public RallyTheForces (final RallyTheForces card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/RazorfieldRhino.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/RazorfieldRhino.java index ef65bc38b0d..37974f88b2d 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/RazorfieldRhino.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/RazorfieldRhino.java @@ -30,9 +30,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; @@ -40,6 +39,8 @@ import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -53,8 +54,8 @@ public class RazorfieldRhino extends CardImpl { this.subtype.add("Rhino"); this.power = new MageInt(4); this.toughness = new MageInt(4); - ContinuousEffect effect1 = new BoostSourceEffect(2, 2, Constants.Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ConditionalContinousEffect(effect1, MetalcraftCondition.getInstance(), "Metalcraft - Razorfield Rhino gets +2/+2 as long as you control three or more artifacts"))); + ContinuousEffect effect1 = new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(effect1, MetalcraftCondition.getInstance(), "Metalcraft - Razorfield Rhino gets +2/+2 as long as you control three or more artifacts"))); } public RazorfieldRhino (final RazorfieldRhino card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/RedSunsZenith.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/RedSunsZenith.java index 2960805985a..55f9d26adc6 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/RedSunsZenith.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/RedSunsZenith.java @@ -28,10 +28,10 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.ReplacementEffectImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/RotWolf.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/RotWolf.java index 6f4cd58d177..89f8981dfb3 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/RotWolf.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/RotWolf.java @@ -28,8 +28,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesAndDealtDamageThisTurnTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/RustedSlasher.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/RustedSlasher.java index 7cb9be64dcd..eeabac090c8 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/RustedSlasher.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/RustedSlasher.java @@ -30,14 +30,14 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledPermanent; @@ -59,7 +59,7 @@ public class RustedSlasher extends CardImpl { this.subtype.add("Horror"); this.power = new MageInt(4); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(new TargetControlledPermanent(filter)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(new TargetControlledPermanent(filter)))); } public RustedSlasher (final RustedSlasher card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Sangromancer.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Sangromancer.java index 5c0e5d1acc1..985c4ee258c 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Sangromancer.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Sangromancer.java @@ -30,14 +30,14 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -74,7 +74,7 @@ public class Sangromancer extends CardImpl { class SangromancerFirstTriggeredAbility extends TriggeredAbilityImpl { SangromancerFirstTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new GainLifeEffect(3), true); + super(Zone.BATTLEFIELD, new GainLifeEffect(3), true); } SangromancerFirstTriggeredAbility(final SangromancerFirstTriggeredAbility ability) { @@ -89,7 +89,7 @@ class SangromancerFirstTriggeredAbility extends TriggeredAbilityImpl { SangromancerSecondTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new GainLifeEffect(3), true); + super(Zone.BATTLEFIELD, new GainLifeEffect(3), true); } SangromancerSecondTriggeredAbility(final SangromancerSecondTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ScourgeServant.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ScourgeServant.java index 4a9b10f87eb..e6d7a634b00 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/ScourgeServant.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/ScourgeServant.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SepticRats.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SepticRats.java index bf65c771b7e..4cb8773d55c 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SepticRats.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SepticRats.java @@ -29,14 +29,15 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; @@ -73,7 +74,7 @@ public class SepticRats extends CardImpl { class SepticRatsTriggeredAbility extends TriggeredAbilityImpl { SepticRatsTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Constants.Duration.EndOfTurn)); + super(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn)); } SepticRatsTriggeredAbility(final SepticRatsTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SerumRaker.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SerumRaker.java index 642f648cd00..5bfc87ec563 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SerumRaker.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SerumRaker.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DiscardEachPlayerEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ShimmerMyr.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ShimmerMyr.java index 86f0b698943..a7109daafc6 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/ShimmerMyr.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/ShimmerMyr.java @@ -30,9 +30,7 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -55,7 +53,7 @@ public class ShimmerMyr extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlashAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ShimmerMyrEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ShimmerMyrEffect())); } public ShimmerMyr (final ShimmerMyr card) { @@ -72,7 +70,7 @@ public class ShimmerMyr extends CardImpl { class ShimmerMyrEffect extends AsThoughEffectImpl { public ShimmerMyrEffect() { - super(Constants.AsThoughEffectType.CAST, Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(AsThoughEffectType.CAST, Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "You may cast artifact cards as though they had flash"; } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Shriekhorn.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Shriekhorn.java index de64f8c360f..582f1c1fe8e 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Shriekhorn.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Shriekhorn.java @@ -30,9 +30,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.target.TargetPlayer; @@ -54,7 +54,7 @@ public class Shriekhorn extends CardImpl { super(ownerId, 130, "Shriekhorn", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{1}"); this.expansionSetCode = "MBS"; this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(3)), "Shriekhorn enters the battlefield with three charge counters on it")); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(2), new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance())); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SignalPest.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SignalPest.java index 0b073b54440..a45fd996491 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SignalPest.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SignalPest.java @@ -28,9 +28,9 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.EvasionAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SilverskinArmor.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SilverskinArmor.java index 8ae864f0462..3984af5313a 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SilverskinArmor.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SilverskinArmor.java @@ -29,9 +29,7 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.AddCardTypeAttachedEffect; @@ -50,9 +48,9 @@ public class SilverskinArmor extends CardImpl { this.expansionSetCode = "MBS"; this.subtype.add("Equipment"); - this.addAbility(new EquipAbility(Constants.Outcome.BoostCreature, new ManaCostsImpl("{2}"))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1, Constants.Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new AddCardTypeAttachedEffect(CardType.ARTIFACT, Constants.Duration.WhileOnBattlefield, Constants.AttachmentType.EQUIPMENT))); + this.addAbility(new EquipAbility(Outcome.BoostCreature, new ManaCostsImpl("{2}"))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AddCardTypeAttachedEffect(CardType.ARTIFACT, Duration.WhileOnBattlefield, AttachmentType.EQUIPMENT))); } public SilverskinArmor(final SilverskinArmor card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Skinwing.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Skinwing.java index 3c3395f01f6..1d9f3b394de 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Skinwing.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Skinwing.java @@ -28,11 +28,11 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Slagstorm.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Slagstorm.java index fbfe1f32c38..19e71d67778 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Slagstorm.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Slagstorm.java @@ -30,8 +30,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Mode; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.effects.common.DamagePlayersEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SphereOfTheSuns.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SphereOfTheSuns.java index fff4645a954..1c5b05ac381 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SphereOfTheSuns.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SphereOfTheSuns.java @@ -27,8 +27,8 @@ */ package mage.sets.mirrodinbesieged; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpinEngine.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpinEngine.java index 09e2a80331e..6fa8f715efb 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpinEngine.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpinEngine.java @@ -28,10 +28,10 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpineOfIshSah.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpineOfIshSah.java index 5028f6e9968..8233273886b 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpineOfIshSah.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpineOfIshSah.java @@ -28,8 +28,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpiralingDuelist.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpiralingDuelist.java index d70d0569584..1a679dcc37e 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpiralingDuelist.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpiralingDuelist.java @@ -28,10 +28,10 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpireSerpent.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpireSerpent.java index f67c26b0432..655553f614f 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpireSerpent.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpireSerpent.java @@ -28,11 +28,12 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.AsThoughEffectType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -42,6 +43,7 @@ import mage.abilities.effects.AsThoughEffectImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; /** @@ -81,7 +83,7 @@ public class SpireSerpent extends CardImpl { class SpireSerpentEffect extends AsThoughEffectImpl { public SpireSerpentEffect() { - super(Constants.AsThoughEffectType.ATTACK, Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(AsThoughEffectType.ATTACK, Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "{this} can attack as though it didn't have defender"; } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpreadTheSickness.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpreadTheSickness.java index 8bfe81e71df..3bf86f45a84 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpreadTheSickness.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpreadTheSickness.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.counter.ProliferateEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SteelSabotage.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SteelSabotage.java index 45611cba240..e366b30ecf0 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SteelSabotage.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SteelSabotage.java @@ -28,8 +28,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Mode; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Strandwalker.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Strandwalker.java index 6716266fb69..2e1e4683244 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Strandwalker.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Strandwalker.java @@ -28,11 +28,11 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SwordOfFeastAndFamine.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SwordOfFeastAndFamine.java index a721b98f43a..eb948643088 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SwordOfFeastAndFamine.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SwordOfFeastAndFamine.java @@ -30,10 +30,9 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; @@ -46,6 +45,8 @@ import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; +import mage.constants.AttachmentType; +import mage.constants.Outcome; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; @@ -73,9 +74,9 @@ public class SwordOfFeastAndFamine extends CardImpl { super(ownerId, 138, "Sword of Feast and Famine", Rarity.MYTHIC, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "MBS"; this.subtype.add("Equipment"); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(2))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new ProtectionAbility(filter), Constants.AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new ProtectionAbility(filter), AttachmentType.EQUIPMENT))); this.addAbility(new SwordOfFeastAndFamineAbility()); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/TangleHulk.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/TangleHulk.java index fe0f9be6709..2908a5bb94b 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/TangleHulk.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/TangleHulk.java @@ -30,14 +30,14 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -51,7 +51,7 @@ public class TangleHulk extends CardImpl { this.subtype.add("Beast"); this.power = new MageInt(5); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{2}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{2}{G}"))); } public TangleHulk (final TangleHulk card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/TangleMantis.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/TangleMantis.java index 585f88a8ba8..62229ad5899 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/TangleMantis.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/TangleMantis.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/TezzeretAgentOfBolas.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/TezzeretAgentOfBolas.java index 4bd1f25b214..2968a97861f 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/TezzeretAgentOfBolas.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/TezzeretAgentOfBolas.java @@ -28,10 +28,10 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ThopterAssembly.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ThopterAssembly.java index 26d4e72ba67..9a8f3026e07 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/ThopterAssembly.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/ThopterAssembly.java @@ -27,15 +27,15 @@ */ package mage.sets.mirrodinbesieged; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -75,7 +75,7 @@ public class ThopterAssembly extends CardImpl { class ThopterAssemblyTriggeredAbility extends TriggeredAbilityImpl { ThopterAssemblyTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new ReturnToHandSourceEffect()); + super(Zone.BATTLEFIELD, new ReturnToHandSourceEffect()); this.addEffect(new CreateTokenEffect(new ThopterToken(), 5)); } @@ -110,8 +110,8 @@ class ThopterAssemblyTriggeredAbility extends TriggeredAbilityImpl { public TitanForge (UUID ownerId) { super(ownerId, 141, "Titan Forge", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "MBS"; - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); this.addAbility(ability); - ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new GolemToken()), new TapSourceCost()); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GolemToken()), new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(3))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/TrainingDrone.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/TrainingDrone.java index 74f0baa8b4f..8dc955c2fce 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/TrainingDrone.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/TrainingDrone.java @@ -29,10 +29,10 @@ package mage.sets.mirrodinbesieged; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/TreasureMage.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/TreasureMage.java index 2ac4c07a732..592bca444de 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/TreasureMage.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/TreasureMage.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.SearchEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/TurnTheTide.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/TurnTheTide.java index 519a27626a9..53584ebfae1 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/TurnTheTide.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/TurnTheTide.java @@ -30,11 +30,11 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostOpponentsEffect; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -46,7 +46,7 @@ public class TurnTheTide extends CardImpl { super(ownerId, 35, "Turn the Tide", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "MBS"; this.color.setBlue(true); - this.getSpellAbility().addEffect(new BoostOpponentsEffect(-2, 0, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostOpponentsEffect(-2, 0, Duration.EndOfTurn)); } public TurnTheTide (final TurnTheTide card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/UnnaturalPredation.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/UnnaturalPredation.java index 284fde4ab2a..8cf844e398a 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/UnnaturalPredation.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/UnnaturalPredation.java @@ -30,13 +30,13 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -49,8 +49,8 @@ public class UnnaturalPredation extends CardImpl { super(ownerId, 93, "Unnatural Predation", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "MBS"; this.color.setGreen(true); - this.getSpellAbility().addEffect(new BoostTargetEffect(1, 1, Constants.Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(1, 1, Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/VedalkenAnatomist.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/VedalkenAnatomist.java index b8f01fcb5f0..d64d9cc0b3f 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/VedalkenAnatomist.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/VedalkenAnatomist.java @@ -29,9 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.MayTapOrUntapTargetEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; @@ -59,7 +59,7 @@ public class VedalkenAnatomist extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new ManaCostsImpl("{2}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new ManaCostsImpl("{2}{U}")); ability.addEffect(new MayTapOrUntapTargetEffect()); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/VedalkenInfuser.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/VedalkenInfuser.java index 06b115e3f9c..fb890eb1f7f 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/VedalkenInfuser.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/VedalkenInfuser.java @@ -30,14 +30,14 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.counters.CounterType; import mage.target.common.TargetArtifactPermanent; @@ -55,7 +55,7 @@ public class VedalkenInfuser extends CardImpl { this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(4); - Ability ability = new BeginningOfUpkeepTriggeredAbility(new AddCountersTargetEffect(CounterType.CHARGE.createInstance()), Constants.TargetController.YOU, true); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new AddCountersTargetEffect(CounterType.CHARGE.createInstance()), TargetController.YOU, true); ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/VictorysHerald.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/VictorysHerald.java index f28afa49ae0..948b06cf67e 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/VictorysHerald.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/VictorysHerald.java @@ -30,9 +30,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -40,6 +39,7 @@ import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterAttackingCreature; /** @@ -55,8 +55,8 @@ public class VictorysHerald extends CardImpl { this.color.setWhite(true); this.power = new MageInt(4); this.toughness = new MageInt(4); - Ability ability = new AttacksTriggeredAbility(new GainAbilityControlledEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn, new FilterAttackingCreature()), false); - ability.addEffect(new GainAbilityControlledEffect(LifelinkAbility.getInstance(), Constants.Duration.EndOfTurn, new FilterAttackingCreature())); + Ability ability = new AttacksTriggeredAbility(new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.EndOfTurn, new FilterAttackingCreature()), false); + ability.addEffect(new GainAbilityControlledEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn, new FilterAttackingCreature())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianClaw.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianClaw.java index 90f35ac181e..8e4f3c1595d 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianClaw.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianClaw.java @@ -29,10 +29,9 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; @@ -40,6 +39,8 @@ import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.AttachmentType; +import mage.constants.Outcome; /** * @@ -51,9 +52,9 @@ public class ViridianClaw extends CardImpl { super(ownerId, 143, "Viridian Claw", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "MBS"; this.subtype.add("Equipment"); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(1))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); } public ViridianClaw (final ViridianClaw card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianCorrupter.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianCorrupter.java index b0c2a67d8ba..9655478f661 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianCorrupter.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianCorrupter.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianEmissary.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianEmissary.java index 09b8ef163fe..9f1645628f5 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianEmissary.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianEmissary.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/VirulentWound.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/VirulentWound.java index c6e9d747b97..a22897c8bf5 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/VirulentWound.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/VirulentWound.java @@ -28,11 +28,11 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Vivisection.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Vivisection.java index efb3aa5dfc0..d165655d13d 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Vivisection.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Vivisection.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/WhiteSunsZenith.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/WhiteSunsZenith.java index c4b3692239e..92d58e0aa4e 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/WhiteSunsZenith.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/WhiteSunsZenith.java @@ -29,8 +29,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.dynamicvalue.common.ManacostVariableValue; diff --git a/Mage.Sets/src/mage/sets/modernmasters/AEtherVial.java b/Mage.Sets/src/mage/sets/modernmasters/AEtherVial.java index 640b7d3b2dc..f826718f828 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/AEtherVial.java +++ b/Mage.Sets/src/mage/sets/modernmasters/AEtherVial.java @@ -28,7 +28,7 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/modernmasters/AuriokSalvagers.java b/Mage.Sets/src/mage/sets/modernmasters/AuriokSalvagers.java index fea68a399c1..53a0c42853d 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/AuriokSalvagers.java +++ b/Mage.Sets/src/mage/sets/modernmasters/AuriokSalvagers.java @@ -28,9 +28,9 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/modernmasters/BoundInSilence.java b/Mage.Sets/src/mage/sets/modernmasters/BoundInSilence.java index b029204dd2a..d3ba2091587 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/BoundInSilence.java +++ b/Mage.Sets/src/mage/sets/modernmasters/BoundInSilence.java @@ -28,10 +28,8 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -59,11 +57,11 @@ public class BoundInSilence extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Removal)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Removal)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature can't attack or block. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new CantAttackBlockAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockAttachedEffect(AttachmentType.AURA))); } public BoundInSilence(final BoundInSilence card) { diff --git a/Mage.Sets/src/mage/sets/modernmasters/DarkConfidant.java b/Mage.Sets/src/mage/sets/modernmasters/DarkConfidant.java index 15514b2d261..1db701aee4f 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/DarkConfidant.java +++ b/Mage.Sets/src/mage/sets/modernmasters/DarkConfidant.java @@ -28,7 +28,7 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/modernmasters/DeathCloud.java b/Mage.Sets/src/mage/sets/modernmasters/DeathCloud.java index 3f40f83d263..a6219489684 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/DeathCloud.java +++ b/Mage.Sets/src/mage/sets/modernmasters/DeathCloud.java @@ -28,8 +28,8 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DiscardEachPlayerEffect; diff --git a/Mage.Sets/src/mage/sets/modernmasters/DoublingSeason.java b/Mage.Sets/src/mage/sets/modernmasters/DoublingSeason.java index ae3018691e8..ed1043d5483 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/DoublingSeason.java +++ b/Mage.Sets/src/mage/sets/modernmasters/DoublingSeason.java @@ -29,11 +29,11 @@ package mage.sets.modernmasters; import java.util.Locale; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; diff --git a/Mage.Sets/src/mage/sets/modernmasters/Dragonstorm.java b/Mage.Sets/src/mage/sets/modernmasters/Dragonstorm.java index 070e5794728..0bdd2b95fb3 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/Dragonstorm.java +++ b/Mage.Sets/src/mage/sets/modernmasters/Dragonstorm.java @@ -28,7 +28,7 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/modernmasters/EchoingCourage.java b/Mage.Sets/src/mage/sets/modernmasters/EchoingCourage.java index 53710b32d70..e4a349a3ff8 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/EchoingCourage.java +++ b/Mage.Sets/src/mage/sets/modernmasters/EchoingCourage.java @@ -28,15 +28,15 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.NamePredicate; import mage.game.Game; diff --git a/Mage.Sets/src/mage/sets/modernmasters/ExecutionersCapsule.java b/Mage.Sets/src/mage/sets/modernmasters/ExecutionersCapsule.java index 57645bfeeca..4ceecdadd55 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/ExecutionersCapsule.java +++ b/Mage.Sets/src/mage/sets/modernmasters/ExecutionersCapsule.java @@ -28,7 +28,7 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/modernmasters/FeudkillersVerdict.java b/Mage.Sets/src/mage/sets/modernmasters/FeudkillersVerdict.java index a30716e3160..f34fe16ab88 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/FeudkillersVerdict.java +++ b/Mage.Sets/src/mage/sets/modernmasters/FeudkillersVerdict.java @@ -28,9 +28,9 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/modernmasters/GrandArbiterAugustinIV.java b/Mage.Sets/src/mage/sets/modernmasters/GrandArbiterAugustinIV.java index a0af663b5fc..d0b6252ba20 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/GrandArbiterAugustinIV.java +++ b/Mage.Sets/src/mage/sets/modernmasters/GrandArbiterAugustinIV.java @@ -28,11 +28,11 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -41,6 +41,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.CostModificationEffectImpl; import mage.abilities.effects.common.cost.SpellsCostReductionEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; @@ -94,7 +95,7 @@ class GrandArbiterAugustinIVCostIncreaseEffect extends CostModificationEffectImp private static final String effectText = "Spells your opponents cast cost {1} more to cast"; GrandArbiterAugustinIVCostIncreaseEffect() { - super(Constants.Duration.WhileOnBattlefield, Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); staticText = effectText; } diff --git a/Mage.Sets/src/mage/sets/modernmasters/HanaKami.java b/Mage.Sets/src/mage/sets/modernmasters/HanaKami.java index e4e4064a181..36ea62ceb92 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/HanaKami.java +++ b/Mage.Sets/src/mage/sets/modernmasters/HanaKami.java @@ -28,7 +28,7 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/modernmasters/IncrementalGrowth.java b/Mage.Sets/src/mage/sets/modernmasters/IncrementalGrowth.java index b10fddd06d5..5546db3a6de 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/IncrementalGrowth.java +++ b/Mage.Sets/src/mage/sets/modernmasters/IncrementalGrowth.java @@ -28,12 +28,12 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/sets/modernmasters/JuganTheRisingStar.java b/Mage.Sets/src/mage/sets/modernmasters/JuganTheRisingStar.java index 139310bedca..5bd1c9ddc27 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/JuganTheRisingStar.java +++ b/Mage.Sets/src/mage/sets/modernmasters/JuganTheRisingStar.java @@ -28,7 +28,7 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/modernmasters/KeigaTheTideStar.java b/Mage.Sets/src/mage/sets/modernmasters/KeigaTheTideStar.java index 3d07e439367..d49577e099e 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/KeigaTheTideStar.java +++ b/Mage.Sets/src/mage/sets/modernmasters/KeigaTheTideStar.java @@ -28,7 +28,7 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/modernmasters/KikiJikiMirrorBreaker.java b/Mage.Sets/src/mage/sets/modernmasters/KikiJikiMirrorBreaker.java index a272a5d6a99..22f21ecec1b 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/KikiJikiMirrorBreaker.java +++ b/Mage.Sets/src/mage/sets/modernmasters/KikiJikiMirrorBreaker.java @@ -28,7 +28,7 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/modernmasters/KokushoTheEveningStar.java b/Mage.Sets/src/mage/sets/modernmasters/KokushoTheEveningStar.java index 7c1ac70bfb6..05a224c1de3 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/KokushoTheEveningStar.java +++ b/Mage.Sets/src/mage/sets/modernmasters/KokushoTheEveningStar.java @@ -28,7 +28,7 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/modernmasters/MadAuntie.java b/Mage.Sets/src/mage/sets/modernmasters/MadAuntie.java index d3c306251c1..e3b41e041a8 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/MadAuntie.java +++ b/Mage.Sets/src/mage/sets/modernmasters/MadAuntie.java @@ -28,7 +28,7 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/modernmasters/Manamorphose.java b/Mage.Sets/src/mage/sets/modernmasters/Manamorphose.java index 1defd89c684..b405f06fa43 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/Manamorphose.java +++ b/Mage.Sets/src/mage/sets/modernmasters/Manamorphose.java @@ -28,7 +28,7 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/modernmasters/MarshFlitter.java b/Mage.Sets/src/mage/sets/modernmasters/MarshFlitter.java index 22f0b8e695d..180dc0e1205 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/MarshFlitter.java +++ b/Mage.Sets/src/mage/sets/modernmasters/MarshFlitter.java @@ -28,10 +28,10 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/modernmasters/MoldervineCloak.java b/Mage.Sets/src/mage/sets/modernmasters/MoldervineCloak.java index 030cbd25cb7..b1a4d8c485e 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/MoldervineCloak.java +++ b/Mage.Sets/src/mage/sets/modernmasters/MoldervineCloak.java @@ -28,7 +28,7 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/modernmasters/Mulldrifter.java b/Mage.Sets/src/mage/sets/modernmasters/Mulldrifter.java index 21f743ec01e..1b061d241d8 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/Mulldrifter.java +++ b/Mage.Sets/src/mage/sets/modernmasters/Mulldrifter.java @@ -28,7 +28,7 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/modernmasters/MyrRetriever.java b/Mage.Sets/src/mage/sets/modernmasters/MyrRetriever.java index 42d09205ff5..839b0a965d0 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/MyrRetriever.java +++ b/Mage.Sets/src/mage/sets/modernmasters/MyrRetriever.java @@ -28,8 +28,8 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/modernmasters/OtherworldlyJourney.java b/Mage.Sets/src/mage/sets/modernmasters/OtherworldlyJourney.java index 76ff898eabc..4c0316f6803 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/OtherworldlyJourney.java +++ b/Mage.Sets/src/mage/sets/modernmasters/OtherworldlyJourney.java @@ -28,7 +28,7 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/modernmasters/Peppersmoke.java b/Mage.Sets/src/mage/sets/modernmasters/Peppersmoke.java index 7526c6d7672..b0fbbfba1bc 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/Peppersmoke.java +++ b/Mage.Sets/src/mage/sets/modernmasters/Peppersmoke.java @@ -28,9 +28,9 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.condition.common.ControlsPermanentCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/modernmasters/PerilousResearch.java b/Mage.Sets/src/mage/sets/modernmasters/PerilousResearch.java index 7574eac482a..c00436b0dfa 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/PerilousResearch.java +++ b/Mage.Sets/src/mage/sets/modernmasters/PerilousResearch.java @@ -28,7 +28,7 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/modernmasters/PetalsOfInsight.java b/Mage.Sets/src/mage/sets/modernmasters/PetalsOfInsight.java index 30d77f0f6c7..27c3974522a 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/PetalsOfInsight.java +++ b/Mage.Sets/src/mage/sets/modernmasters/PetalsOfInsight.java @@ -28,10 +28,10 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/modernmasters/ReachOfBranches.java b/Mage.Sets/src/mage/sets/modernmasters/ReachOfBranches.java index 69cb1cbe63c..8aad8591514 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/ReachOfBranches.java +++ b/Mage.Sets/src/mage/sets/modernmasters/ReachOfBranches.java @@ -28,13 +28,12 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; -import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; import mage.abilities.effects.common.ReturnSourceFromGraveyardToHandEffect; import mage.cards.CardImpl; import mage.filter.common.FilterLandPermanent; diff --git a/Mage.Sets/src/mage/sets/modernmasters/RelicOfProgenitus.java b/Mage.Sets/src/mage/sets/modernmasters/RelicOfProgenitus.java index 3df6b4b9543..f67ed03ea2e 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/RelicOfProgenitus.java +++ b/Mage.Sets/src/mage/sets/modernmasters/RelicOfProgenitus.java @@ -28,7 +28,7 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/modernmasters/RyuseiTheFallingStar.java b/Mage.Sets/src/mage/sets/modernmasters/RyuseiTheFallingStar.java index fc2b12d47a2..6e24ffde621 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/RyuseiTheFallingStar.java +++ b/Mage.Sets/src/mage/sets/modernmasters/RyuseiTheFallingStar.java @@ -28,7 +28,7 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/modernmasters/SporolothAncient.java b/Mage.Sets/src/mage/sets/modernmasters/SporolothAncient.java index 3adb0136fe8..43da6eb7138 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/SporolothAncient.java +++ b/Mage.Sets/src/mage/sets/modernmasters/SporolothAncient.java @@ -28,11 +28,6 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +38,11 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.permanent.token.SaprolingToken; @@ -62,7 +62,7 @@ public class SporolothAncient extends CardImpl { this.toughness = new MageInt(4); // At the beginning of your upkeep, put a spore counter on Sporoloth Ancient. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()), TargetController.YOU, false)); // Creatures you control have "Remove two spore counters from this creature: Put a 1/1 green Saproling creature token onto the battlefield." Effect effect = new GainAbilityControlledEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(2))), Duration.WhileOnBattlefield); diff --git a/Mage.Sets/src/mage/sets/modernmasters/StonehewerGiant.java b/Mage.Sets/src/mage/sets/modernmasters/StonehewerGiant.java index d868a6f77f1..0a6d103c749 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/StonehewerGiant.java +++ b/Mage.Sets/src/mage/sets/modernmasters/StonehewerGiant.java @@ -28,10 +28,10 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/modernmasters/StreetWraith.java b/Mage.Sets/src/mage/sets/modernmasters/StreetWraith.java index c79afca26fb..14d07b8bd8c 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/StreetWraith.java +++ b/Mage.Sets/src/mage/sets/modernmasters/StreetWraith.java @@ -28,7 +28,7 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/modernmasters/SwordOfFireAndIce.java b/Mage.Sets/src/mage/sets/modernmasters/SwordOfFireAndIce.java index 64e37dd54ea..f41a7e9027d 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/SwordOfFireAndIce.java +++ b/Mage.Sets/src/mage/sets/modernmasters/SwordOfFireAndIce.java @@ -28,7 +28,7 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/modernmasters/SwordOfLightAndShadow.java b/Mage.Sets/src/mage/sets/modernmasters/SwordOfLightAndShadow.java index d068a891355..9e5d36ab020 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/SwordOfLightAndShadow.java +++ b/Mage.Sets/src/mage/sets/modernmasters/SwordOfLightAndShadow.java @@ -28,7 +28,7 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/modernmasters/SyphonLife.java b/Mage.Sets/src/mage/sets/modernmasters/SyphonLife.java index b2a1c574721..3649e1f0153 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/SyphonLife.java +++ b/Mage.Sets/src/mage/sets/modernmasters/SyphonLife.java @@ -28,7 +28,7 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/modernmasters/Tarmogoyf.java b/Mage.Sets/src/mage/sets/modernmasters/Tarmogoyf.java index 44b247c1ffc..61574ebe4ad 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/Tarmogoyf.java +++ b/Mage.Sets/src/mage/sets/modernmasters/Tarmogoyf.java @@ -28,7 +28,7 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/modernmasters/TerashisGrasp.java b/Mage.Sets/src/mage/sets/modernmasters/TerashisGrasp.java index 2b86191e63e..d038855bc59 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/TerashisGrasp.java +++ b/Mage.Sets/src/mage/sets/modernmasters/TerashisGrasp.java @@ -28,7 +28,7 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/modernmasters/Thallid.java b/Mage.Sets/src/mage/sets/modernmasters/Thallid.java index e9e184b8034..a3f346c0600 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/Thallid.java +++ b/Mage.Sets/src/mage/sets/modernmasters/Thallid.java @@ -28,7 +28,7 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/modernmasters/ThunderingGiant.java b/Mage.Sets/src/mage/sets/modernmasters/ThunderingGiant.java index 04e64c11638..848ef4a1a6c 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/ThunderingGiant.java +++ b/Mage.Sets/src/mage/sets/modernmasters/ThunderingGiant.java @@ -28,7 +28,7 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/modernmasters/TribalFlames.java b/Mage.Sets/src/mage/sets/modernmasters/TribalFlames.java index 6be8641e52a..ea3c99ebb62 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/TribalFlames.java +++ b/Mage.Sets/src/mage/sets/modernmasters/TribalFlames.java @@ -28,7 +28,7 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/modernmasters/VendilionClique.java b/Mage.Sets/src/mage/sets/modernmasters/VendilionClique.java index d527b0c8265..8e608786e66 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/VendilionClique.java +++ b/Mage.Sets/src/mage/sets/modernmasters/VendilionClique.java @@ -28,7 +28,7 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/modernmasters/WalkerOfTheGrove.java b/Mage.Sets/src/mage/sets/modernmasters/WalkerOfTheGrove.java index eb52ebb2f4f..dbf27a20889 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/WalkerOfTheGrove.java +++ b/Mage.Sets/src/mage/sets/modernmasters/WalkerOfTheGrove.java @@ -28,7 +28,7 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/modernmasters/YoseiTheMorningStar.java b/Mage.Sets/src/mage/sets/modernmasters/YoseiTheMorningStar.java index bdbbb32acd2..b8cdd9bff2c 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/YoseiTheMorningStar.java +++ b/Mage.Sets/src/mage/sets/modernmasters/YoseiTheMorningStar.java @@ -28,7 +28,7 @@ package mage.sets.modernmasters; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/morningtide/AmbassadorOak.java b/Mage.Sets/src/mage/sets/morningtide/AmbassadorOak.java index 57804dea18c..910ac975c67 100644 --- a/Mage.Sets/src/mage/sets/morningtide/AmbassadorOak.java +++ b/Mage.Sets/src/mage/sets/morningtide/AmbassadorOak.java @@ -29,8 +29,8 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/morningtide/BallyrushBanneret.java b/Mage.Sets/src/mage/sets/morningtide/BallyrushBanneret.java index 7ea405962f4..d9001d30927 100644 --- a/Mage.Sets/src/mage/sets/morningtide/BallyrushBanneret.java +++ b/Mage.Sets/src/mage/sets/morningtide/BallyrushBanneret.java @@ -28,9 +28,9 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.cost.SpellsCostReductionEffect; diff --git a/Mage.Sets/src/mage/sets/morningtide/Bitterblossom.java b/Mage.Sets/src/mage/sets/morningtide/Bitterblossom.java index f790705649c..80352af9518 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Bitterblossom.java +++ b/Mage.Sets/src/mage/sets/morningtide/Bitterblossom.java @@ -29,9 +29,8 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -39,6 +38,7 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.LoseLifeSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.game.permanent.token.Token; /** @@ -53,7 +53,7 @@ public class Bitterblossom extends CardImpl { this.supertype.add("Tribal"); this.subtype.add("Faerie"); this.color.setBlack(true); - Ability ability = new BeginningOfUpkeepTriggeredAbility(new LoseLifeSourceEffect(1), Constants.TargetController.YOU, false); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new LoseLifeSourceEffect(1), TargetController.YOU, false); ability.addEffect(new CreateTokenEffect(new FaerieToken(), 1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/morningtide/BlightsoilDruid.java b/Mage.Sets/src/mage/sets/morningtide/BlightsoilDruid.java index 7fe227bd8df..8038a922e33 100644 --- a/Mage.Sets/src/mage/sets/morningtide/BlightsoilDruid.java +++ b/Mage.Sets/src/mage/sets/morningtide/BlightsoilDruid.java @@ -29,8 +29,8 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.costs.common.PayLifeCost; diff --git a/Mage.Sets/src/mage/sets/morningtide/BoskBanneret.java b/Mage.Sets/src/mage/sets/morningtide/BoskBanneret.java index a29c7454301..6150dbf5f01 100644 --- a/Mage.Sets/src/mage/sets/morningtide/BoskBanneret.java +++ b/Mage.Sets/src/mage/sets/morningtide/BoskBanneret.java @@ -28,9 +28,9 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.cost.SpellsCostReductionEffect; diff --git a/Mage.Sets/src/mage/sets/morningtide/BrighthearthBanneret.java b/Mage.Sets/src/mage/sets/morningtide/BrighthearthBanneret.java index b71d56c1979..eb0c436639a 100644 --- a/Mage.Sets/src/mage/sets/morningtide/BrighthearthBanneret.java +++ b/Mage.Sets/src/mage/sets/morningtide/BrighthearthBanneret.java @@ -28,9 +28,9 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/morningtide/BurrentonShieldBearers.java b/Mage.Sets/src/mage/sets/morningtide/BurrentonShieldBearers.java index 86ad687cbd5..00513a4831f 100644 --- a/Mage.Sets/src/mage/sets/morningtide/BurrentonShieldBearers.java +++ b/Mage.Sets/src/mage/sets/morningtide/BurrentonShieldBearers.java @@ -29,14 +29,14 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -53,7 +53,7 @@ public class BurrentonShieldBearers extends CardImpl { this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); - Ability ability = new AttacksTriggeredAbility(new BoostTargetEffect(0, 3, Constants.Duration.EndOfTurn), false); + Ability ability = new AttacksTriggeredAbility(new BoostTargetEffect(0, 3, Duration.EndOfTurn), false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/morningtide/ChameleonColossus.java b/Mage.Sets/src/mage/sets/morningtide/ChameleonColossus.java index 040a5973121..adc377d194c 100644 --- a/Mage.Sets/src/mage/sets/morningtide/ChameleonColossus.java +++ b/Mage.Sets/src/mage/sets/morningtide/ChameleonColossus.java @@ -28,13 +28,13 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/morningtide/ChangelingSentinel.java b/Mage.Sets/src/mage/sets/morningtide/ChangelingSentinel.java index 90170960980..587deb2c7b6 100644 --- a/Mage.Sets/src/mage/sets/morningtide/ChangelingSentinel.java +++ b/Mage.Sets/src/mage/sets/morningtide/ChangelingSentinel.java @@ -28,8 +28,8 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ChangelingAbility; import mage.abilities.keyword.VigilanceAbility; diff --git a/Mage.Sets/src/mage/sets/morningtide/CloakAndDagger.java b/Mage.Sets/src/mage/sets/morningtide/CloakAndDagger.java index c3bfe01ad99..db74e363533 100644 --- a/Mage.Sets/src/mage/sets/morningtide/CloakAndDagger.java +++ b/Mage.Sets/src/mage/sets/morningtide/CloakAndDagger.java @@ -28,11 +28,11 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/morningtide/CountrysideCrusher.java b/Mage.Sets/src/mage/sets/morningtide/CountrysideCrusher.java index 558c9aab6b0..0b0580501b2 100644 --- a/Mage.Sets/src/mage/sets/morningtide/CountrysideCrusher.java +++ b/Mage.Sets/src/mage/sets/morningtide/CountrysideCrusher.java @@ -28,10 +28,10 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -41,6 +41,8 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; @@ -65,7 +67,7 @@ public class CountrysideCrusher extends CardImpl { this.toughness = new MageInt(3); // At the beginning of your upkeep, reveal the top card of your library. If it's a land card, put it into your graveyard and repeat this process. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CountrysideCrusherEffect(), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CountrysideCrusherEffect(), TargetController.YOU, false)); // Whenever a land card is put into your graveyard from anywhere, put a +1/+1 counter on Countryside Crusher. this.addAbility(new CountrysideCrusherTriggeredAbility()); } @@ -83,7 +85,7 @@ public class CountrysideCrusher extends CardImpl { class CountrysideCrusherEffect extends OneShotEffect { public CountrysideCrusherEffect() { - super(Constants.Outcome.Discard); + super(Outcome.Discard); this.staticText = "reveal the top card of your library. If it's a land card, put it into your graveyard and repeat this process"; } diff --git a/Mage.Sets/src/mage/sets/morningtide/Deglamer.java b/Mage.Sets/src/mage/sets/morningtide/Deglamer.java index 9ea04cb4162..efd68682dd7 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Deglamer.java +++ b/Mage.Sets/src/mage/sets/morningtide/Deglamer.java @@ -28,10 +28,10 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/morningtide/DivinersWand.java b/Mage.Sets/src/mage/sets/morningtide/DivinersWand.java index 68888e48e59..2792fd23553 100644 --- a/Mage.Sets/src/mage/sets/morningtide/DivinersWand.java +++ b/Mage.Sets/src/mage/sets/morningtide/DivinersWand.java @@ -28,12 +28,12 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.DrawCardTriggeredAbility; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/morningtide/Earthbrawn.java b/Mage.Sets/src/mage/sets/morningtide/Earthbrawn.java index 00226e269f3..98bd49e73ed 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Earthbrawn.java +++ b/Mage.Sets/src/mage/sets/morningtide/Earthbrawn.java @@ -29,13 +29,13 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.ReinforceAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -48,7 +48,7 @@ public class Earthbrawn extends CardImpl { super(ownerId, 119, "Earthbrawn", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "MOR"; this.color.setGreen(true); - this.getSpellAbility().addEffect(new BoostTargetEffect(3, 3, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(3, 3, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.addAbility(new ReinforceAbility(1, new ManaCostsImpl("{1}{G}"))); } diff --git a/Mage.Sets/src/mage/sets/morningtide/ElvishWarrior.java b/Mage.Sets/src/mage/sets/morningtide/ElvishWarrior.java index 39259dbe5f2..6d6b195811f 100644 --- a/Mage.Sets/src/mage/sets/morningtide/ElvishWarrior.java +++ b/Mage.Sets/src/mage/sets/morningtide/ElvishWarrior.java @@ -28,8 +28,8 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/morningtide/EverbarkShaman.java b/Mage.Sets/src/mage/sets/morningtide/EverbarkShaman.java index 95f90fc42d8..81d2c49c1cb 100644 --- a/Mage.Sets/src/mage/sets/morningtide/EverbarkShaman.java +++ b/Mage.Sets/src/mage/sets/morningtide/EverbarkShaman.java @@ -29,9 +29,8 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.common.ExileFromGraveCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.NamePredicate; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -69,7 +70,7 @@ public class EverbarkShaman extends CardImpl { this.toughness = new MageInt(5); // {T}, Exile a Treefolk card from your graveyard: Search your library for up to two Forest cards and put them onto the battlefield tapped. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(2, filterForest), true, Constants.Outcome.PutLandInPlay), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(2, filterForest), true, Outcome.PutLandInPlay), new TapSourceCost()); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(filterTreefolk))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/morningtide/FendeepSummoner.java b/Mage.Sets/src/mage/sets/morningtide/FendeepSummoner.java index 957d00d58ab..b9988384c95 100644 --- a/Mage.Sets/src/mage/sets/morningtide/FendeepSummoner.java +++ b/Mage.Sets/src/mage/sets/morningtide/FendeepSummoner.java @@ -29,15 +29,16 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.continious.BecomesCreatureTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.Token; @@ -62,7 +63,7 @@ public class FendeepSummoner extends CardImpl { this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(5); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BecomesCreatureTargetEffect(new FendeepSummonerToken(), "land", Constants.Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureTargetEffect(new FendeepSummonerToken(), "land", Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetLandPermanent(0, 2, filter, false)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/morningtide/Festercreep.java b/Mage.Sets/src/mage/sets/morningtide/Festercreep.java index 05110b356c9..4e4d2ece8f9 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Festercreep.java +++ b/Mage.Sets/src/mage/sets/morningtide/Festercreep.java @@ -29,9 +29,8 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -41,6 +40,8 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; @@ -62,7 +63,7 @@ public class Festercreep extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)))); // {1}{B}, Remove a +1/+1 counter from Festercreep: All other creatures get -1/-1 until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostAllEffect(-1, -1, Constants.Duration.EndOfTurn, new FilterCreaturePermanent(), true), new ManaCostsImpl("{1}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostAllEffect(-1, -1, Duration.EndOfTurn, new FilterCreaturePermanent(), true), new ManaCostsImpl("{1}{B}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/morningtide/FeudkillersVerdict.java b/Mage.Sets/src/mage/sets/morningtide/FeudkillersVerdict.java index 0f66e76c298..877b4d1e0d6 100644 --- a/Mage.Sets/src/mage/sets/morningtide/FeudkillersVerdict.java +++ b/Mage.Sets/src/mage/sets/morningtide/FeudkillersVerdict.java @@ -28,7 +28,7 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/morningtide/FrogtosserBanneret.java b/Mage.Sets/src/mage/sets/morningtide/FrogtosserBanneret.java index 4fa3bd73727..1ebeb763adc 100644 --- a/Mage.Sets/src/mage/sets/morningtide/FrogtosserBanneret.java +++ b/Mage.Sets/src/mage/sets/morningtide/FrogtosserBanneret.java @@ -28,9 +28,9 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.cost.SpellsCostReductionEffect; diff --git a/Mage.Sets/src/mage/sets/morningtide/GameTrailChangeling.java b/Mage.Sets/src/mage/sets/morningtide/GameTrailChangeling.java index 1f4196053bc..f4dab6cc878 100644 --- a/Mage.Sets/src/mage/sets/morningtide/GameTrailChangeling.java +++ b/Mage.Sets/src/mage/sets/morningtide/GameTrailChangeling.java @@ -28,8 +28,8 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ChangelingAbility; import mage.abilities.keyword.TrampleAbility; diff --git a/Mage.Sets/src/mage/sets/morningtide/GreatbowDoyen.java b/Mage.Sets/src/mage/sets/morningtide/GreatbowDoyen.java index cbaf0d47da5..c2d80a54332 100644 --- a/Mage.Sets/src/mage/sets/morningtide/GreatbowDoyen.java +++ b/Mage.Sets/src/mage/sets/morningtide/GreatbowDoyen.java @@ -28,9 +28,8 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -55,7 +54,7 @@ public class GreatbowDoyen extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Archer creatures you control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(new SubtypePredicate("Archer")); } @@ -70,7 +69,7 @@ public class GreatbowDoyen extends CardImpl { this.toughness = new MageInt(4); // Other Archer creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Constants.Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); // Whenever an Archer you control deals damage to a creature, that Archer deals that much damage to that creature's controller. this.addAbility(new GreatbowDoyenTriggeredAbility()); @@ -89,7 +88,7 @@ public class GreatbowDoyen extends CardImpl { class GreatbowDoyenTriggeredAbility extends TriggeredAbilityImpl { public GreatbowDoyenTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new GreatbowDoyenEffect()); + super(Zone.BATTLEFIELD, new GreatbowDoyenEffect()); } public GreatbowDoyenTriggeredAbility(final GreatbowDoyenTriggeredAbility ability) { @@ -128,7 +127,7 @@ class GreatbowDoyenTriggeredAbility extends TriggeredAbilityImpl { public GreatbowDoyenEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); this.staticText = "that Archer deals that much damage to that creature's controller"; } @@ -149,7 +148,7 @@ class GreatbowDoyenEffect extends OneShotEffect { if (damageAmount != null && controllerId != null) { Permanent permanent = game.getPermanent(sourceOfDamage); if (permanent == null) { - permanent = (Permanent) game.getLastKnownInformation(sourceOfDamage, Constants.Zone.BATTLEFIELD); + permanent = (Permanent) game.getLastKnownInformation(sourceOfDamage, Zone.BATTLEFIELD); } if (permanent != null) { Player player = game.getPlayer(controllerId); diff --git a/Mage.Sets/src/mage/sets/morningtide/HeritageDruid.java b/Mage.Sets/src/mage/sets/morningtide/HeritageDruid.java index f45e958815f..e6347726ba2 100644 --- a/Mage.Sets/src/mage/sets/morningtide/HeritageDruid.java +++ b/Mage.Sets/src/mage/sets/morningtide/HeritageDruid.java @@ -29,14 +29,14 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -64,7 +64,7 @@ public class HeritageDruid extends CardImpl { this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleManaAbility(Constants.Zone.BATTLEFIELD, new Mana(0, 3, 0, 0, 0, 0, 0), new TapTargetCost(new TargetControlledCreaturePermanent(3, 3, filter, false)))); + this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(0, 3, 0, 0, 0, 0, 0), new TapTargetCost(new TargetControlledCreaturePermanent(3, 3, filter, false)))); } public HeritageDruid(final HeritageDruid card) { diff --git a/Mage.Sets/src/mage/sets/morningtide/HuntingTriad.java b/Mage.Sets/src/mage/sets/morningtide/HuntingTriad.java index 3d50b9fb888..7b41de3f726 100644 --- a/Mage.Sets/src/mage/sets/morningtide/HuntingTriad.java +++ b/Mage.Sets/src/mage/sets/morningtide/HuntingTriad.java @@ -28,8 +28,8 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.ReinforceAbility; diff --git a/Mage.Sets/src/mage/sets/morningtide/IdyllicTutor.java b/Mage.Sets/src/mage/sets/morningtide/IdyllicTutor.java index 2c66d1e50c4..ab47314eeec 100644 --- a/Mage.Sets/src/mage/sets/morningtide/IdyllicTutor.java +++ b/Mage.Sets/src/mage/sets/morningtide/IdyllicTutor.java @@ -29,8 +29,8 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.filter.FilterCard; diff --git a/Mage.Sets/src/mage/sets/morningtide/IndomitableAncients.java b/Mage.Sets/src/mage/sets/morningtide/IndomitableAncients.java index e7d75192a52..9681cc7ff2e 100644 --- a/Mage.Sets/src/mage/sets/morningtide/IndomitableAncients.java +++ b/Mage.Sets/src/mage/sets/morningtide/IndomitableAncients.java @@ -28,8 +28,8 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/morningtide/InspiredSprite.java b/Mage.Sets/src/mage/sets/morningtide/InspiredSprite.java index 498ec180e1b..8636b3e1e2e 100644 --- a/Mage.Sets/src/mage/sets/morningtide/InspiredSprite.java +++ b/Mage.Sets/src/mage/sets/morningtide/InspiredSprite.java @@ -28,9 +28,9 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SpellCastTriggeredAbility; @@ -40,6 +40,7 @@ import mage.abilities.effects.common.UntapSourceEffect; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -66,7 +67,7 @@ public class InspiredSprite extends CardImpl { this.addAbility(FlashAbility.getInstance()); this.addAbility(FlyingAbility.getInstance()); this.addAbility(new SpellCastTriggeredAbility(new UntapSourceEffect(), filter, true)); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new TapSourceCost())); } public InspiredSprite(final InspiredSprite card) { diff --git a/Mage.Sets/src/mage/sets/morningtide/KinsbaileCavalier.java b/Mage.Sets/src/mage/sets/morningtide/KinsbaileCavalier.java index ab057d80390..82c55844994 100644 --- a/Mage.Sets/src/mage/sets/morningtide/KinsbaileCavalier.java +++ b/Mage.Sets/src/mage/sets/morningtide/KinsbaileCavalier.java @@ -29,10 +29,10 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; diff --git a/Mage.Sets/src/mage/sets/morningtide/LysAlanaBowmaster.java b/Mage.Sets/src/mage/sets/morningtide/LysAlanaBowmaster.java index 6e2ffe0e263..c8a15ba3877 100644 --- a/Mage.Sets/src/mage/sets/morningtide/LysAlanaBowmaster.java +++ b/Mage.Sets/src/mage/sets/morningtide/LysAlanaBowmaster.java @@ -28,8 +28,8 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/morningtide/Meadowboon.java b/Mage.Sets/src/mage/sets/morningtide/Meadowboon.java index ff124a7fb48..abb7225e849 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Meadowboon.java +++ b/Mage.Sets/src/mage/sets/morningtide/Meadowboon.java @@ -28,15 +28,16 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LeavesBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.EvokeAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -79,7 +80,7 @@ public class Meadowboon extends CardImpl { class MeadowboonEffect extends OneShotEffect { MeadowboonEffect() { - super(Constants.Outcome.UnboostCreature); + super(Outcome.UnboostCreature); staticText = "put a +1/+1 counter on each creature target player controls"; } diff --git a/Mage.Sets/src/mage/sets/morningtide/MoongloveChangeling.java b/Mage.Sets/src/mage/sets/morningtide/MoongloveChangeling.java index 574a91d9582..2066286f905 100644 --- a/Mage.Sets/src/mage/sets/morningtide/MoongloveChangeling.java +++ b/Mage.Sets/src/mage/sets/morningtide/MoongloveChangeling.java @@ -29,9 +29,7 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -54,7 +52,7 @@ public class MoongloveChangeling extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(ChangelingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.B))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B))); } public MoongloveChangeling(final MoongloveChangeling card) { diff --git a/Mage.Sets/src/mage/sets/morningtide/MothdustChangeling.java b/Mage.Sets/src/mage/sets/morningtide/MothdustChangeling.java index 04a1e208f44..02d2b0bb4d8 100644 --- a/Mage.Sets/src/mage/sets/morningtide/MothdustChangeling.java +++ b/Mage.Sets/src/mage/sets/morningtide/MothdustChangeling.java @@ -29,9 +29,8 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; @@ -39,6 +38,8 @@ import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.ChangelingAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; @@ -63,7 +64,7 @@ public class MothdustChangeling extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(ChangelingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn), new TapTargetCost(new TargetControlledPermanent(filter)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapTargetCost(new TargetControlledPermanent(filter)))); } public MothdustChangeling(final MothdustChangeling card) { diff --git a/Mage.Sets/src/mage/sets/morningtide/Mutavault.java b/Mage.Sets/src/mage/sets/morningtide/Mutavault.java index 59dac3c108a..752e1e98e7c 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Mutavault.java +++ b/Mage.Sets/src/mage/sets/morningtide/Mutavault.java @@ -28,10 +28,10 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/morningtide/Nevermaker.java b/Mage.Sets/src/mage/sets/morningtide/Nevermaker.java index 8b188b62d20..396e3801c4e 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Nevermaker.java +++ b/Mage.Sets/src/mage/sets/morningtide/Nevermaker.java @@ -28,8 +28,8 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/morningtide/ObsidianBattleAxe.java b/Mage.Sets/src/mage/sets/morningtide/ObsidianBattleAxe.java index f41d463fabc..7fc563253c0 100644 --- a/Mage.Sets/src/mage/sets/morningtide/ObsidianBattleAxe.java +++ b/Mage.Sets/src/mage/sets/morningtide/ObsidianBattleAxe.java @@ -28,11 +28,11 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/morningtide/Offalsnout.java b/Mage.Sets/src/mage/sets/morningtide/Offalsnout.java index 35d586297f7..b640a62a31c 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Offalsnout.java +++ b/Mage.Sets/src/mage/sets/morningtide/Offalsnout.java @@ -28,8 +28,8 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/morningtide/PreeminentCaptain.java b/Mage.Sets/src/mage/sets/morningtide/PreeminentCaptain.java index 80435e31cb0..5bdb6255095 100644 --- a/Mage.Sets/src/mage/sets/morningtide/PreeminentCaptain.java +++ b/Mage.Sets/src/mage/sets/morningtide/PreeminentCaptain.java @@ -28,10 +28,10 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/morningtide/PricklyBoggart.java b/Mage.Sets/src/mage/sets/morningtide/PricklyBoggart.java index ba9ef777acc..f25257722a0 100644 --- a/Mage.Sets/src/mage/sets/morningtide/PricklyBoggart.java +++ b/Mage.Sets/src/mage/sets/morningtide/PricklyBoggart.java @@ -28,8 +28,8 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/morningtide/ReachOfBranches.java b/Mage.Sets/src/mage/sets/morningtide/ReachOfBranches.java index f3b2f798719..0a46bf5a05e 100644 --- a/Mage.Sets/src/mage/sets/morningtide/ReachOfBranches.java +++ b/Mage.Sets/src/mage/sets/morningtide/ReachOfBranches.java @@ -28,7 +28,7 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/morningtide/Reveillark.java b/Mage.Sets/src/mage/sets/morningtide/Reveillark.java index 6ac09d299b8..3fa5448ea89 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Reveillark.java +++ b/Mage.Sets/src/mage/sets/morningtide/Reveillark.java @@ -28,8 +28,8 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LeavesBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/morningtide/RhysTheExiled.java b/Mage.Sets/src/mage/sets/morningtide/RhysTheExiled.java index 384cf2125f7..ae8ba358174 100644 --- a/Mage.Sets/src/mage/sets/morningtide/RhysTheExiled.java +++ b/Mage.Sets/src/mage/sets/morningtide/RhysTheExiled.java @@ -29,9 +29,8 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -42,6 +41,8 @@ import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -73,7 +74,7 @@ public class RhysTheExiled extends CardImpl { this.addAbility(new AttacksTriggeredAbility(new GainLifeEffect(new PermanentsOnBattlefieldCount(filter2, 1)), false)); // {B}, Sacrifice an Elf: Regenerate Rhys the Exiled. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/morningtide/Scapeshift.java b/Mage.Sets/src/mage/sets/morningtide/Scapeshift.java index f3f84b84714..55a6db56258 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Scapeshift.java +++ b/Mage.Sets/src/mage/sets/morningtide/Scapeshift.java @@ -29,14 +29,15 @@ package mage.sets.morningtide; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterLandCard; import mage.game.Game; @@ -111,7 +112,7 @@ class ScapeshiftEffect extends OneShotEffect { for (UUID cardId: (List)target.getTargets()) { Card card = player.getLibrary().getCard(cardId, game); if (card != null) { - if (card.putOntoBattlefield(game, Constants.Zone.LIBRARY, source.getId(), source.getControllerId())) { + if (card.putOntoBattlefield(game, Zone.LIBRARY, source.getId(), source.getControllerId())) { Permanent permanent = game.getPermanent(card.getId()); if (permanent != null) permanent.setTapped(true); diff --git a/Mage.Sets/src/mage/sets/morningtide/ScarbladeElite.java b/Mage.Sets/src/mage/sets/morningtide/ScarbladeElite.java index b32137f0272..ce9bf97adf8 100644 --- a/Mage.Sets/src/mage/sets/morningtide/ScarbladeElite.java +++ b/Mage.Sets/src/mage/sets/morningtide/ScarbladeElite.java @@ -29,9 +29,8 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.ExileFromGraveCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInYourGraveyard; @@ -64,7 +64,7 @@ public class ScarbladeElite extends CardImpl { this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(filter))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/morningtide/SeethingPathblazer.java b/Mage.Sets/src/mage/sets/morningtide/SeethingPathblazer.java index 1d87b875d55..4572ca36534 100644 --- a/Mage.Sets/src/mage/sets/morningtide/SeethingPathblazer.java +++ b/Mage.Sets/src/mage/sets/morningtide/SeethingPathblazer.java @@ -29,9 +29,8 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -64,8 +65,8 @@ public class SeethingPathblazer extends CardImpl { this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Constants.Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false))); - ability.addEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Constants.Duration.EndOfTurn)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false))); + ability.addEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/morningtide/ShardVolley.java b/Mage.Sets/src/mage/sets/morningtide/ShardVolley.java index dc149df3983..6b77aa43781 100644 --- a/Mage.Sets/src/mage/sets/morningtide/ShardVolley.java +++ b/Mage.Sets/src/mage/sets/morningtide/ShardVolley.java @@ -28,8 +28,8 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/morningtide/SharedAnimosity.java b/Mage.Sets/src/mage/sets/morningtide/SharedAnimosity.java index 1ebf6b3c070..0e26ec6ef31 100644 --- a/Mage.Sets/src/mage/sets/morningtide/SharedAnimosity.java +++ b/Mage.Sets/src/mage/sets/morningtide/SharedAnimosity.java @@ -27,12 +27,11 @@ */ package mage.sets.morningtide; -import java.awt.List; import java.util.ArrayList; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.Mode; @@ -40,6 +39,10 @@ import mage.abilities.common.AttacksCreatureYourControlTriggeredAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.keyword.ChangelingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; @@ -80,7 +83,7 @@ class SharedAnimosityEffect extends ContinuousEffectImpl private int power; public SharedAnimosityEffect() { - super(Constants.Duration.EndOfTurn, Constants.Layer.PTChangingEffects_7, Constants.SubLayer.ModifyPT_7c, Constants.Outcome.BoostCreature); + super(Duration.EndOfTurn, Layer.PTChangingEffects_7, SubLayer.ModifyPT_7c, Outcome.BoostCreature); } diff --git a/Mage.Sets/src/mage/sets/morningtide/Shinewend.java b/Mage.Sets/src/mage/sets/morningtide/Shinewend.java index e8aa49586ee..479765423a0 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Shinewend.java +++ b/Mage.Sets/src/mage/sets/morningtide/Shinewend.java @@ -29,9 +29,8 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -42,6 +41,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -68,7 +68,7 @@ public class Shinewend extends CardImpl { this.toughness = new MageInt(0); this.addAbility(FlyingAbility.getInstance()); this.addAbility(new EntersBattlefieldTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), false)); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{W}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/morningtide/SigilTracer.java b/Mage.Sets/src/mage/sets/morningtide/SigilTracer.java index 79f0b5fbcfb..4824bb5f85a 100644 --- a/Mage.Sets/src/mage/sets/morningtide/SigilTracer.java +++ b/Mage.Sets/src/mage/sets/morningtide/SigilTracer.java @@ -29,9 +29,8 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.TapTargetCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CopyTargetSpellEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; @@ -72,7 +72,7 @@ public class SigilTracer extends CardImpl { this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CopyTargetSpellEffect(), new ManaCostsImpl("{1}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CopyTargetSpellEffect(), new ManaCostsImpl("{1}{U}")); ability.addTarget(new TargetSpell(filterInstorSorc)); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, false))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/morningtide/Slithermuse.java b/Mage.Sets/src/mage/sets/morningtide/Slithermuse.java index 6395f42b94b..9c7edfa924c 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Slithermuse.java +++ b/Mage.Sets/src/mage/sets/morningtide/Slithermuse.java @@ -28,9 +28,9 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LeavesBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/morningtide/Stingmoggie.java b/Mage.Sets/src/mage/sets/morningtide/Stingmoggie.java index 030c4df9f4f..045bff4dc20 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Stingmoggie.java +++ b/Mage.Sets/src/mage/sets/morningtide/Stingmoggie.java @@ -29,9 +29,8 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +40,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; @@ -69,7 +69,7 @@ public class Stingmoggie extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(0); this.addAbility(new EntersBattlefieldTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), false)); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{3}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{3}{R}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/morningtide/StonybrookBanneret.java b/Mage.Sets/src/mage/sets/morningtide/StonybrookBanneret.java index f30196d9f8b..5d499a08019 100644 --- a/Mage.Sets/src/mage/sets/morningtide/StonybrookBanneret.java +++ b/Mage.Sets/src/mage/sets/morningtide/StonybrookBanneret.java @@ -28,9 +28,9 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.cost.SpellsCostReductionEffect; diff --git a/Mage.Sets/src/mage/sets/morningtide/ThornbiteStaff.java b/Mage.Sets/src/mage/sets/morningtide/ThornbiteStaff.java index d633aededb9..8815eb1d8d4 100644 --- a/Mage.Sets/src/mage/sets/morningtide/ThornbiteStaff.java +++ b/Mage.Sets/src/mage/sets/morningtide/ThornbiteStaff.java @@ -28,11 +28,11 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/morningtide/VendilionClique.java b/Mage.Sets/src/mage/sets/morningtide/VendilionClique.java index 4762c301fd5..02046245746 100644 --- a/Mage.Sets/src/mage/sets/morningtide/VendilionClique.java +++ b/Mage.Sets/src/mage/sets/morningtide/VendilionClique.java @@ -29,9 +29,8 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +40,8 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterNonlandCard; import mage.game.Game; import mage.players.Player; @@ -86,7 +87,7 @@ public class VendilionClique extends CardImpl { class VendilionCliqueEffect extends OneShotEffect { VendilionCliqueEffect() { - super(Constants.Outcome.Discard); + super(Outcome.Discard); staticText = "look at target player's hand. You may choose a nonland card from it. If you do, that player reveals the chosen card, puts it on the bottom of his or her library, then draws a card"; } @@ -99,14 +100,14 @@ class VendilionCliqueEffect extends OneShotEffect { Player player = game.getPlayer(targetPointer.getFirst(game, source)); Player sourcePlayer = game.getPlayer(source.getControllerId()); if (player != null && sourcePlayer != null) { - TargetCard targetCard = new TargetCard(Constants.Zone.ALL, new FilterNonlandCard()); - if (sourcePlayer.choose(Constants.Outcome.Discard, player.getHand(), targetCard, game)) { + TargetCard targetCard = new TargetCard(Zone.ALL, new FilterNonlandCard()); + if (sourcePlayer.choose(Outcome.Discard, player.getHand(), targetCard, game)) { Card c = game.getCard(targetCard.getFirstTarget()); if (c != null) { CardsImpl cards = new CardsImpl(); cards.add(c); player.revealCards("Vendilion Clique effect", cards, game); - c.moveToZone(Constants.Zone.LIBRARY, source.getSourceId(), game, false); + c.moveToZone(Zone.LIBRARY, source.getSourceId(), game, false); player.drawCards(1, game); } } diff --git a/Mage.Sets/src/mage/sets/morningtide/VeteransArmaments.java b/Mage.Sets/src/mage/sets/morningtide/VeteransArmaments.java index f92e9929f35..9e2092e02e1 100644 --- a/Mage.Sets/src/mage/sets/morningtide/VeteransArmaments.java +++ b/Mage.Sets/src/mage/sets/morningtide/VeteransArmaments.java @@ -28,12 +28,12 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.AttacksOrBlocksTriggeredAbility; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/morningtide/VioletPall.java b/Mage.Sets/src/mage/sets/morningtide/VioletPall.java index d0478ff1406..1723b40b3d6 100644 --- a/Mage.Sets/src/mage/sets/morningtide/VioletPall.java +++ b/Mage.Sets/src/mage/sets/morningtide/VioletPall.java @@ -28,8 +28,8 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/morningtide/WalkerOfTheGrove.java b/Mage.Sets/src/mage/sets/morningtide/WalkerOfTheGrove.java index f696ee72293..4fb0692805e 100644 --- a/Mage.Sets/src/mage/sets/morningtide/WalkerOfTheGrove.java +++ b/Mage.Sets/src/mage/sets/morningtide/WalkerOfTheGrove.java @@ -28,8 +28,8 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/morningtide/WarSpikeChangeling.java b/Mage.Sets/src/mage/sets/morningtide/WarSpikeChangeling.java index 4411c5fb155..bfc594f5347 100644 --- a/Mage.Sets/src/mage/sets/morningtide/WarSpikeChangeling.java +++ b/Mage.Sets/src/mage/sets/morningtide/WarSpikeChangeling.java @@ -29,9 +29,7 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -54,7 +52,7 @@ public class WarSpikeChangeling extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(ChangelingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); } public WarSpikeChangeling(final WarSpikeChangeling card) { diff --git a/Mage.Sets/src/mage/sets/morningtide/WeirdingShaman.java b/Mage.Sets/src/mage/sets/morningtide/WeirdingShaman.java index d9fac55b19d..65eb8cb3094 100644 --- a/Mage.Sets/src/mage/sets/morningtide/WeirdingShaman.java +++ b/Mage.Sets/src/mage/sets/morningtide/WeirdingShaman.java @@ -29,9 +29,8 @@ package mage.sets.morningtide; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.Token; @@ -64,7 +64,7 @@ public class WeirdingShaman extends CardImpl { this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new goblinRogueToken(), 2), new ManaCostsImpl("{3}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new goblinRogueToken(), 2), new ManaCostsImpl("{3}{B}")); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/nemesis/BlindingAngel.java b/Mage.Sets/src/mage/sets/nemesis/BlindingAngel.java index d4b3afff10e..039550ef59b 100644 --- a/Mage.Sets/src/mage/sets/nemesis/BlindingAngel.java +++ b/Mage.Sets/src/mage/sets/nemesis/BlindingAngel.java @@ -28,16 +28,17 @@ package mage.sets.nemesis; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.TurnPhase; import mage.game.Game; import mage.game.turn.TurnMod; @@ -87,7 +88,7 @@ class SkipNextCombatEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { UUID targetId = source.getFirstTarget(); if (targetId != null) { - game.getState().getTurnMods().add(new TurnMod(targetId, Constants.TurnPhase.COMBAT, null, true)); + game.getState().getTurnMods().add(new TurnMod(targetId, TurnPhase.COMBAT, null, true)); return true; } return false; diff --git a/Mage.Sets/src/mage/sets/nemesis/CarrionWall.java b/Mage.Sets/src/mage/sets/nemesis/CarrionWall.java index 4ac526b6b2e..d0af4822385 100644 --- a/Mage.Sets/src/mage/sets/nemesis/CarrionWall.java +++ b/Mage.Sets/src/mage/sets/nemesis/CarrionWall.java @@ -28,15 +28,16 @@ package mage.sets.nemesis; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -56,7 +57,7 @@ public class CarrionWall extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // {1}{B}: Regenerate Carrion Wall. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}"))); } public CarrionWall(final CarrionWall card) { diff --git a/Mage.Sets/src/mage/sets/nemesis/Daze.java b/Mage.Sets/src/mage/sets/nemesis/Daze.java index 9ab220ed629..86de9fd2fdf 100644 --- a/Mage.Sets/src/mage/sets/nemesis/Daze.java +++ b/Mage.Sets/src/mage/sets/nemesis/Daze.java @@ -28,8 +28,8 @@ package mage.sets.nemesis; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.CompositeCost; import mage.abilities.costs.Cost; diff --git a/Mage.Sets/src/mage/sets/nemesis/DeathPitOffering.java b/Mage.Sets/src/mage/sets/nemesis/DeathPitOffering.java index 32ecbb76026..19587ddd74f 100644 --- a/Mage.Sets/src/mage/sets/nemesis/DeathPitOffering.java +++ b/Mage.Sets/src/mage/sets/nemesis/DeathPitOffering.java @@ -28,9 +28,8 @@ package mage.sets.nemesis; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.SacrificeAllEffect; @@ -49,7 +48,7 @@ public class DeathPitOffering extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static{ - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public DeathPitOffering(UUID ownerId) { @@ -61,7 +60,7 @@ public class DeathPitOffering extends CardImpl { // When Death Pit Offering enters the battlefield, sacrifice all creatures you control. this.addAbility(new EntersBattlefieldTriggeredAbility(new SacrificeAllEffect(new FilterControlledCreaturePermanent()))); // Creatures you control get +2/+2. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostAllEffect(2, 2, Constants.Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(2, 2, Duration.WhileOnBattlefield, filter, false))); } public DeathPitOffering(final DeathPitOffering card) { diff --git a/Mage.Sets/src/mage/sets/nemesis/Massacre.java b/Mage.Sets/src/mage/sets/nemesis/Massacre.java index 045c1dc0218..9302451fa0c 100644 --- a/Mage.Sets/src/mage/sets/nemesis/Massacre.java +++ b/Mage.Sets/src/mage/sets/nemesis/Massacre.java @@ -28,14 +28,15 @@ package mage.sets.nemesis; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.CostImpl; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -55,7 +56,7 @@ public class Massacre extends CardImpl { // If an opponent controls a Plains and you control a Swamp, you may cast Massacre without paying its mana cost. this.getSpellAbility().addAlternativeCost(new AlternativeCostImpl("If an opponent controls a Plains and you control a Swamp, you may cast Massacre without paying its mana cost", new MassacreCost())); // All creatures get -2/-2 until end of turn. - this.getSpellAbility().addEffect(new BoostAllEffect(-2, -2, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostAllEffect(-2, -2, Duration.EndOfTurn)); } public Massacre(final Massacre card) { diff --git a/Mage.Sets/src/mage/sets/nemesis/Moggcatcher.java b/Mage.Sets/src/mage/sets/nemesis/Moggcatcher.java index 79c9280c945..2081500c70c 100644 --- a/Mage.Sets/src/mage/sets/nemesis/Moggcatcher.java +++ b/Mage.Sets/src/mage/sets/nemesis/Moggcatcher.java @@ -29,9 +29,9 @@ package mage.sets.nemesis; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/nemesis/PhyrexianDriver.java b/Mage.Sets/src/mage/sets/nemesis/PhyrexianDriver.java index a9188069ff1..53062ca2a63 100644 --- a/Mage.Sets/src/mage/sets/nemesis/PhyrexianDriver.java +++ b/Mage.Sets/src/mage/sets/nemesis/PhyrexianDriver.java @@ -28,13 +28,14 @@ package mage.sets.nemesis; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -59,7 +60,7 @@ public class PhyrexianDriver extends CardImpl { this.toughness = new MageInt(1); //When Phyrexian Driver enters the battlefield, other Mercenary creatures get +1/+1 until end of turn. - this.addAbility(new EntersBattlefieldTriggeredAbility(new BoostAllEffect(1, 1, Constants.Duration.EndOfTurn, filter, true))); + this.addAbility(new EntersBattlefieldTriggeredAbility(new BoostAllEffect(1, 1, Duration.EndOfTurn, filter, true))); } public PhyrexianDriver(final PhyrexianDriver card) { diff --git a/Mage.Sets/src/mage/sets/nemesis/RathiAssassin.java b/Mage.Sets/src/mage/sets/nemesis/RathiAssassin.java index bec7eeda4b6..c167203c7b1 100644 --- a/Mage.Sets/src/mage/sets/nemesis/RathiAssassin.java +++ b/Mage.Sets/src/mage/sets/nemesis/RathiAssassin.java @@ -29,9 +29,9 @@ package mage.sets.nemesis; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/nemesis/RathiFiend.java b/Mage.Sets/src/mage/sets/nemesis/RathiFiend.java index c6e5c0953ed..4e1dbd345f1 100644 --- a/Mage.Sets/src/mage/sets/nemesis/RathiFiend.java +++ b/Mage.Sets/src/mage/sets/nemesis/RathiFiend.java @@ -29,9 +29,9 @@ package mage.sets.nemesis; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/nemesis/RathiIntimidator.java b/Mage.Sets/src/mage/sets/nemesis/RathiIntimidator.java index 78003f97132..3c0d26653f6 100644 --- a/Mage.Sets/src/mage/sets/nemesis/RathiIntimidator.java +++ b/Mage.Sets/src/mage/sets/nemesis/RathiIntimidator.java @@ -29,9 +29,9 @@ package mage.sets.nemesis; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/nemesis/Seahunter.java b/Mage.Sets/src/mage/sets/nemesis/Seahunter.java index 2087fc4a242..beaf334565d 100644 --- a/Mage.Sets/src/mage/sets/nemesis/Seahunter.java +++ b/Mage.Sets/src/mage/sets/nemesis/Seahunter.java @@ -29,9 +29,9 @@ package mage.sets.nemesis; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/nemesis/SealOfCleansing.java b/Mage.Sets/src/mage/sets/nemesis/SealOfCleansing.java index f743e0be1e8..487eea38f8c 100644 --- a/Mage.Sets/src/mage/sets/nemesis/SealOfCleansing.java +++ b/Mage.Sets/src/mage/sets/nemesis/SealOfCleansing.java @@ -28,14 +28,15 @@ package mage.sets.nemesis; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -62,7 +63,7 @@ public class SealOfCleansing extends CardImpl { this.color.setWhite(true); // Sacrifice Seal of Cleansing: Destroy target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/nemesis/SealOfFire.java b/Mage.Sets/src/mage/sets/nemesis/SealOfFire.java index 80107390f41..372c5244928 100644 --- a/Mage.Sets/src/mage/sets/nemesis/SealOfFire.java +++ b/Mage.Sets/src/mage/sets/nemesis/SealOfFire.java @@ -28,14 +28,15 @@ package mage.sets.nemesis; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; /** @@ -51,7 +52,7 @@ public class SealOfFire extends CardImpl { this.color.setRed(true); // Sacrifice Seal of Fire: Seal of Fire deals 2 damage to target creature or player. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(2), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new SacrificeSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/nemesis/SealOfRemoval.java b/Mage.Sets/src/mage/sets/nemesis/SealOfRemoval.java index 925915cd952..06050ff69ad 100644 --- a/Mage.Sets/src/mage/sets/nemesis/SealOfRemoval.java +++ b/Mage.Sets/src/mage/sets/nemesis/SealOfRemoval.java @@ -28,14 +28,15 @@ package mage.sets.nemesis; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -52,7 +53,7 @@ public class SealOfRemoval extends CardImpl { this.color.setBlue(true); // Sacrifice Seal of Removal: Return target creature to its owner's hand. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/nemesis/SealOfStrength.java b/Mage.Sets/src/mage/sets/nemesis/SealOfStrength.java index ea62c4a72e3..c354f9bba10 100644 --- a/Mage.Sets/src/mage/sets/nemesis/SealOfStrength.java +++ b/Mage.Sets/src/mage/sets/nemesis/SealOfStrength.java @@ -28,14 +28,16 @@ package mage.sets.nemesis; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -51,7 +53,7 @@ public class SealOfStrength extends CardImpl { this.color.setGreen(true); // Sacrifice Seal of Strength: Target creature gets +3/+3 until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(3, 3, Constants.Duration.EndOfTurn), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(3, 3, Duration.EndOfTurn), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/nemesis/ViciousHunger.java b/Mage.Sets/src/mage/sets/nemesis/ViciousHunger.java index 3fa41a56fd4..ce97a5b548a 100644 --- a/Mage.Sets/src/mage/sets/nemesis/ViciousHunger.java +++ b/Mage.Sets/src/mage/sets/nemesis/ViciousHunger.java @@ -28,8 +28,8 @@ package mage.sets.nemesis; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ActOfAggression.java b/Mage.Sets/src/mage/sets/newphyrexia/ActOfAggression.java index 6a9fde5848c..0035ee7e37b 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ActOfAggression.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ActOfAggression.java @@ -28,9 +28,9 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.effects.common.continious.GainControlTargetEffect; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/AlloyMyr.java b/Mage.Sets/src/mage/sets/newphyrexia/AlloyMyr.java index d79f12b3094..5c5d66cba4d 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/AlloyMyr.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/AlloyMyr.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ApostlesBlessing.java b/Mage.Sets/src/mage/sets/newphyrexia/ApostlesBlessing.java index 6123ba82ce0..14016fd5654 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ApostlesBlessing.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ApostlesBlessing.java @@ -30,10 +30,9 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.ProtectionAbility; @@ -101,7 +100,7 @@ class ApostlesBlessingEffect extends GainAbilityTargetEffect { FilterCard protectionFilter = new FilterCard(); ChoiceColorOrArtifact choice = (ChoiceColorOrArtifact) source.getChoices().get(0); if (choice.isArtifactSelected()) { - protectionFilter.add(new CardTypePredicate(Constants.CardType.ARTIFACT)); + protectionFilter.add(new CardTypePredicate(CardType.ARTIFACT)); } else { protectionFilter.add(new ColorPredicate(choice.getColor())); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ArgentMutation.java b/Mage.Sets/src/mage/sets/newphyrexia/ArgentMutation.java index b890c6cc220..56c6c5c8ed9 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ArgentMutation.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ArgentMutation.java @@ -28,9 +28,9 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.continious.AddCardTypeTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java b/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java index 2d80cff5f81..16cd9acab08 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java @@ -28,10 +28,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Artillerize.java b/Mage.Sets/src/mage/sets/newphyrexia/Artillerize.java index e096a7224b1..5fa4e465e46 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Artillerize.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Artillerize.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/AuriokSurvivors.java b/Mage.Sets/src/mage/sets/newphyrexia/AuriokSurvivors.java index 1be8109269c..b8770cdaf6b 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/AuriokSurvivors.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/AuriokSurvivors.java @@ -29,15 +29,15 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -85,7 +85,7 @@ public class AuriokSurvivors extends CardImpl { class AuriokSurvivorsEffect extends OneShotEffect { AuriokSurvivorsEffect() { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); staticText = "If you do, you may attach it to {this}"; } @@ -99,7 +99,7 @@ class AuriokSurvivorsEffect extends OneShotEffect { Permanent sourcePermanent = game.getPermanent(source.getSourceId()); Player player = game.getPlayer(source.getControllerId()); if (p != null && player != null && sourcePermanent != null) { - if (player.chooseUse(Constants.Outcome.Benefit, "Attach " + p.getName() + " to " + sourcePermanent.getName() + "?", game)) { + if (player.chooseUse(Outcome.Benefit, "Attach " + p.getName() + " to " + sourcePermanent.getName() + "?", game)) { sourcePermanent.addAttachment(p.getId(), game); } return true; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Batterskull.java b/Mage.Sets/src/mage/sets/newphyrexia/Batterskull.java index 7807989da8d..656f64d5272 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Batterskull.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Batterskull.java @@ -30,9 +30,7 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -56,11 +54,11 @@ public class Batterskull extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Equipment"); this.addAbility(new LivingWeaponAbility()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(4, 4))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new GenericManaCost(3))); - this.addAbility(new EquipAbility(Constants.Outcome.BoostCreature, new GenericManaCost(5))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(4, 4))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new GenericManaCost(3))); + this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(5))); } public Batterskull (final Batterskull card) { diff --git a/Mage.Sets/src/mage/sets/newphyrexia/BeastWithin.java b/Mage.Sets/src/mage/sets/newphyrexia/BeastWithin.java index fbe8b29120f..d8b6cbe0822 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/BeastWithin.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/BeastWithin.java @@ -29,14 +29,14 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.BeastToken; @@ -87,7 +87,7 @@ class BeastWithinEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = (Permanent) game.getLastKnownInformation(targetPointer.getFirst(game, source), Constants.Zone.BATTLEFIELD); + Permanent permanent = (Permanent) game.getLastKnownInformation(targetPointer.getFirst(game, source), Zone.BATTLEFIELD); if (permanent != null) { BeastToken token = new BeastToken(); token.putOntoBattlefield(1, game, source.getId(), permanent.getControllerId()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/BirthingPod.java b/Mage.Sets/src/mage/sets/newphyrexia/BirthingPod.java index 042012fc261..f844cf5265a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/BirthingPod.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/BirthingPod.java @@ -29,9 +29,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; import mage.abilities.costs.Cost; @@ -41,6 +40,8 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.Filter; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -63,7 +64,7 @@ public class BirthingPod extends CardImpl { this.color.setGreen(true); // {1}{GP}, {tap}, Sacrifice a creature: Search your library for a creature card with converted mana cost equal to 1 plus the sacrificed creature's converted mana cost, put that card onto the battlefield, then shuffle your library. Activate this ability only any time you could cast a sorcery. - Ability ability = new ActivateAsSorceryActivatedAbility(Constants.Zone.BATTLEFIELD, new BirthingPodEffect(), new ManaCostsImpl("{1}{GP}")); + Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new BirthingPodEffect(), new ManaCostsImpl("{1}{GP}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.addAbility(ability); @@ -81,7 +82,7 @@ public class BirthingPod extends CardImpl { class BirthingPodEffect extends OneShotEffect { BirthingPodEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "Search your library for a creature card with converted mana cost equal to 1 plus the sacrificed creature's converted mana cost, put that card onto the battlefield, then shuffle your library"; } @@ -112,7 +113,7 @@ class BirthingPodEffect extends OneShotEffect { for (UUID cardId : target.getTargets()) { Card card = player.getLibrary().getCard(cardId, game); if (card != null) { - card.putOntoBattlefield(game, Constants.Zone.LIBRARY, source.getId(), source.getControllerId()); + card.putOntoBattlefield(game, Zone.LIBRARY, source.getId(), source.getControllerId()); } } } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/BladeSplicer.java b/Mage.Sets/src/mage/sets/newphyrexia/BladeSplicer.java index 6d461cbbe88..15705a260c3 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/BladeSplicer.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/BladeSplicer.java @@ -30,10 +30,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/BlightedAgent.java b/Mage.Sets/src/mage/sets/newphyrexia/BlightedAgent.java index c85409e01d3..a039653d163 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/BlightedAgent.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/BlightedAgent.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.InfectAbility; import mage.abilities.keyword.UnblockableAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/BlindZealot.java b/Mage.Sets/src/mage/sets/newphyrexia/BlindZealot.java index b724ead0f27..e229875c2fa 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/BlindZealot.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/BlindZealot.java @@ -28,10 +28,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/BlindingSouleater.java b/Mage.Sets/src/mage/sets/newphyrexia/BlindingSouleater.java index f3edda9774d..59ba1a54836 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/BlindingSouleater.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/BlindingSouleater.java @@ -28,10 +28,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.ColoredManaSymbol; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/BludgeonBrawl.java b/Mage.Sets/src/mage/sets/newphyrexia/BludgeonBrawl.java index aa553124464..db86f9b4604 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/BludgeonBrawl.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/BludgeonBrawl.java @@ -30,13 +30,13 @@ package mage.sets.newphyrexia; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.StaticAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/BrutalizerExarch.java b/Mage.Sets/src/mage/sets/newphyrexia/BrutalizerExarch.java index d600196185d..eebbab7845a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/BrutalizerExarch.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/BrutalizerExarch.java @@ -28,10 +28,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/CagedSun.java b/Mage.Sets/src/mage/sets/newphyrexia/CagedSun.java index 1869e480f32..20e58f6636f 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/CagedSun.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/CagedSun.java @@ -28,11 +28,11 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.Mana; import mage.ObjectColor; import mage.abilities.Ability; @@ -44,6 +44,9 @@ import mage.abilities.effects.common.ManaEffect; import mage.abilities.mana.TriggeredManaAbility; import mage.cards.CardImpl; import mage.choices.ChoiceColor; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.events.GameEvent; @@ -64,7 +67,7 @@ public class CagedSun extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new CagedSunEffect1())); // Creatures you control of the chosen color get +1/+1. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new CagedSunEffect2())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CagedSunEffect2())); // Whenever a land's ability adds one or more mana of the chosen color to your mana pool, add one additional mana of that color to your mana pool. this.addAbility(new CagedSunTriggeredAbility()); @@ -83,7 +86,7 @@ public class CagedSun extends CardImpl { class CagedSunEffect1 extends OneShotEffect { public CagedSunEffect1() { - super(Constants.Outcome.BoostCreature); + super(Outcome.BoostCreature); staticText = "choose a color"; } @@ -97,7 +100,7 @@ class CagedSunEffect1 extends OneShotEffect { Permanent permanent = game.getPermanent(source.getSourceId()); if (player != null && permanent != null) { ChoiceColor colorChoice = new ChoiceColor(); - if (player.choose(Constants.Outcome.BoostCreature, colorChoice, game)) { + if (player.choose(Outcome.BoostCreature, colorChoice, game)) { game.informPlayers(permanent.getName() + ": " + player.getName() + " has chosen " + colorChoice.getChoice()); game.getState().setValue(permanent.getId() + "_color", colorChoice.getColor()); } @@ -117,7 +120,7 @@ class CagedSunEffect2 extends ContinuousEffectImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); public CagedSunEffect2() { - super(Duration.WhileOnBattlefield, Constants.Layer.PTChangingEffects_7, Constants.SubLayer.ModifyPT_7c, Constants.Outcome.BoostCreature); + super(Duration.WhileOnBattlefield, Layer.PTChangingEffects_7, SubLayer.ModifyPT_7c, Outcome.BoostCreature); staticText = "Creatures you control of the chosen color get +1/+1"; } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/CaressOfPhyrexia.java b/Mage.Sets/src/mage/sets/newphyrexia/CaressOfPhyrexia.java index b39abebdd30..c6b0a14efa7 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/CaressOfPhyrexia.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/CaressOfPhyrexia.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.counter.AddPoisonCounterTargetEffect; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/CathedralMembrane.java b/Mage.Sets/src/mage/sets/newphyrexia/CathedralMembrane.java index e86e7868f71..54c34204d17 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/CathedralMembrane.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/CathedralMembrane.java @@ -27,14 +27,13 @@ */ package mage.sets.newphyrexia; -import mage.Constants; -import mage.Constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ZoneChangeTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -108,7 +107,7 @@ class CathedralMembraneAbility extends ZoneChangeTriggeredAbility { public CathedralMembraneEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "it deals 6 damage to each creature it blocked this combat"; } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ChainedThroatseeker.java b/Mage.Sets/src/mage/sets/newphyrexia/ChainedThroatseeker.java index 63557358969..37287416699 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ChainedThroatseeker.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ChainedThroatseeker.java @@ -29,11 +29,7 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -62,7 +58,7 @@ public class ChainedThroatseeker extends CardImpl { this.toughness = new MageInt(5); this.addAbility(InfectAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ChainedThroatseekerEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ChainedThroatseekerEffect())); } public ChainedThroatseeker(final ChainedThroatseeker card) { diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheAnnex.java b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheAnnex.java index f58be9d4435..5758dd6b6b0 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheAnnex.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheAnnex.java @@ -28,9 +28,9 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheDross.java b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheDross.java index 731406b16e5..dc24465988c 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheDross.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheDross.java @@ -28,9 +28,9 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheForge.java b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheForge.java index 48150f78b0f..38e35d2f125 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheForge.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheForge.java @@ -28,9 +28,9 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.ChancellorAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheSpires.java b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheSpires.java index e418fe61211..ded45bb311a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheSpires.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheSpires.java @@ -28,10 +28,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheTangle.java b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheTangle.java index 2c892ec18ae..2c1cebb2d76 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheTangle.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheTangle.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.DelayedTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ConversionChamber.java b/Mage.Sets/src/mage/sets/newphyrexia/ConversionChamber.java index 73c82f5a837..409145b31e0 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ConversionChamber.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ConversionChamber.java @@ -30,9 +30,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.ExileFromGraveCost; @@ -42,6 +41,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterArtifactCard; import mage.game.permanent.token.GolemToken; @@ -56,11 +56,11 @@ public class ConversionChamber extends CardImpl { public ConversionChamber (UUID ownerId) { super(ownerId, 133, "Conversion Chamber", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "NPH"; - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(new FilterArtifactCard("artifact card from a graveyard")))); this.addAbility(ability); - ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new GolemToken()), new GenericManaCost(2)); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GolemToken()), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/CorrosiveGale.java b/Mage.Sets/src/mage/sets/newphyrexia/CorrosiveGale.java index cdfd8f26624..b91b026ab48 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/CorrosiveGale.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/CorrosiveGale.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/CorruptedResolve.java b/Mage.Sets/src/mage/sets/newphyrexia/CorruptedResolve.java index d05fcf53c70..d28b1cb52c2 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/CorruptedResolve.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/CorruptedResolve.java @@ -29,12 +29,12 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.game.Game; import mage.game.stack.Spell; @@ -70,7 +70,7 @@ public class CorruptedResolve extends CardImpl { class CorruptedResolveEffect extends OneShotEffect { CorruptedResolveEffect() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); staticText = "Counter target spell if its controller is poisoned"; } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/DarksteelRelic.java b/Mage.Sets/src/mage/sets/newphyrexia/DarksteelRelic.java index ac0c124331f..6345cfd0c2d 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/DarksteelRelic.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/DarksteelRelic.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/DeathHoodCobra.java b/Mage.Sets/src/mage/sets/newphyrexia/DeathHoodCobra.java index 47769b2e532..7aac4de0ebb 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/DeathHoodCobra.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/DeathHoodCobra.java @@ -28,10 +28,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/DeceiverExarch.java b/Mage.Sets/src/mage/sets/newphyrexia/DeceiverExarch.java index d4d7eaa8760..7149ca3c554 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/DeceiverExarch.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/DeceiverExarch.java @@ -28,9 +28,9 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/DefensiveStance.java b/Mage.Sets/src/mage/sets/newphyrexia/DefensiveStance.java index ae9da2bff65..bab7fb8e149 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/DefensiveStance.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/DefensiveStance.java @@ -28,11 +28,11 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continious.BoostEnchantedEffect; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/DementiaBat.java b/Mage.Sets/src/mage/sets/newphyrexia/DementiaBat.java index b37d30b9329..fc9c388ba54 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/DementiaBat.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/DementiaBat.java @@ -28,9 +28,9 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Despise.java b/Mage.Sets/src/mage/sets/newphyrexia/Despise.java index c144c9820a5..7f1eac13698 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Despise.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Despise.java @@ -29,13 +29,14 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -82,7 +83,7 @@ class DespiseEffect extends OneShotEffect { } public DespiseEffect() { - super(Constants.Outcome.Discard); + super(Outcome.Discard); staticText = "Target opponent reveals his or her hand. You choose a creature or planeswalker card from it. That player discards that card"; } @@ -97,9 +98,9 @@ class DespiseEffect extends OneShotEffect { player.revealCards("Despise", player.getHand(), game); Player you = game.getPlayer(source.getControllerId()); if (you != null) { - TargetCard target = new TargetCard(Constants.Zone.PICK, filter); + TargetCard target = new TargetCard(Zone.PICK, filter); target.setRequired(true); - if (you.choose(Constants.Outcome.Benefit, player.getHand(), target, game)) { + if (you.choose(Outcome.Benefit, player.getHand(), target, game)) { Card card = player.getHand().get(target.getFirstTarget(), game); if (card != null) { return player.discard(card, source, game); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Dismember.java b/Mage.Sets/src/mage/sets/newphyrexia/Dismember.java index c8e364a1c8e..2f06b144d89 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Dismember.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Dismember.java @@ -30,9 +30,9 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Dispatch.java b/Mage.Sets/src/mage/sets/newphyrexia/Dispatch.java index 676fbd29c00..7c036c5ff76 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Dispatch.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Dispatch.java @@ -29,8 +29,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.condition.common.MetalcraftCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.ExileTargetEffect; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/DueRespect.java b/Mage.Sets/src/mage/sets/newphyrexia/DueRespect.java index 4a7235c9846..bba14b1f9b0 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/DueRespect.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/DueRespect.java @@ -28,10 +28,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/EleshNornGrandCenobite.java b/Mage.Sets/src/mage/sets/newphyrexia/EleshNornGrandCenobite.java index 496de6dea4d..52eab4ecb26 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/EleshNornGrandCenobite.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/EleshNornGrandCenobite.java @@ -30,15 +30,16 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.effects.common.continious.BoostOpponentsEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -54,8 +55,8 @@ public class EleshNornGrandCenobite extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(7); this.addAbility(VigilanceAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Constants.Duration.WhileOnBattlefield, true))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostOpponentsEffect(-2, -2, Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostOpponentsEffect(-2, -2, Duration.WhileOnBattlefield))); } public EleshNornGrandCenobite (final EleshNornGrandCenobite card) { diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Enslave.java b/Mage.Sets/src/mage/sets/newphyrexia/Enslave.java index ca6c2e0eb38..e66d48d5531 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Enslave.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Enslave.java @@ -30,9 +30,7 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -60,11 +58,11 @@ public class Enslave extends CardImpl { this.color.setBlack(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ControlEnchantedEffect())); - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new EnslaveEffect(), Constants.TargetController.YOU, false)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new EnslaveEffect(), TargetController.YOU, false)); } public Enslave (final Enslave card) { @@ -80,7 +78,7 @@ public class Enslave extends CardImpl { class EnslaveEffect extends OneShotEffect { EnslaveEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "enchanted creature deals 1 damage to its owner"; } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/EntomberExarch.java b/Mage.Sets/src/mage/sets/newphyrexia/EntomberExarch.java index 3c2e76f930a..3e817f71b39 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/EntomberExarch.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/EntomberExarch.java @@ -29,9 +29,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -40,6 +39,8 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.Predicates; @@ -93,7 +94,7 @@ class EntomberExarchEffect extends OneShotEffect { } EntomberExarchEffect() { - super(Constants.Outcome.Discard); + super(Outcome.Discard); staticText = "target opponent reveals his or her hand, you choose a noncreature card from it, then that player discards that card"; } @@ -108,9 +109,9 @@ class EntomberExarchEffect extends OneShotEffect { player.revealCards("Entomber Exarch", player.getHand(), game); Player you = game.getPlayer(source.getControllerId()); if (you != null) { - TargetCard target = new TargetCard(Constants.Zone.PICK, filter); + TargetCard target = new TargetCard(Zone.PICK, filter); target.setRequired(true); - if (you.choose(Constants.Outcome.Benefit, player.getHand(), target, game)) { + if (you.choose(Outcome.Benefit, player.getHand(), target, game)) { Card card = player.getHand().get(target.getFirstTarget(), game); if (card != null) { return player.discard(card, source, game); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/EtchedMonstrosity.java b/Mage.Sets/src/mage/sets/newphyrexia/EtchedMonstrosity.java index 87149b22f2b..59022122d75 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/EtchedMonstrosity.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/EtchedMonstrosity.java @@ -30,9 +30,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -42,6 +41,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.target.TargetPlayer; @@ -58,7 +58,7 @@ public class EtchedMonstrosity extends CardImpl { this.power = new MageInt(10); this.toughness = new MageInt(10); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.M1M1.createInstance(5)), "{this} gets five -1/-1 counters")); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardTargetEffect(3), new ManaCostsImpl("{W}{U}{B}{R}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardTargetEffect(3), new ManaCostsImpl("{W}{U}{B}{R}{G}")); ability.addCost(new RemoveCountersSourceCost(CounterType.M1M1.createInstance(5))); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/EvilPresence.java b/Mage.Sets/src/mage/sets/newphyrexia/EvilPresence.java index c0713197af6..ba64b94b15d 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/EvilPresence.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/EvilPresence.java @@ -28,10 +28,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continious.BecomesBasicLandEnchantedEffect; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ExclusionRitual.java b/Mage.Sets/src/mage/sets/newphyrexia/ExclusionRitual.java index 88ecc4e53b3..0372d662245 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ExclusionRitual.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ExclusionRitual.java @@ -29,9 +29,7 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -68,7 +66,7 @@ public class ExclusionRitual extends CardImpl { ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); // Players can't cast spells with the same name as the exiled card. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ExclusionRitualReplacementEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ExclusionRitualReplacementEffect())); } public ExclusionRitual(final ExclusionRitual card) { @@ -83,7 +81,7 @@ public class ExclusionRitual extends CardImpl { class ExclusionRitualImprintEffect extends OneShotEffect { ExclusionRitualImprintEffect() { - super(Constants.Outcome.Exile); + super(Outcome.Exile); staticText = "exile target nonland permanent"; } @@ -110,7 +108,7 @@ class ExclusionRitualImprintEffect extends OneShotEffect { ExclusionRitualReplacementEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Detriment); + super(Duration.WhileOnBattlefield, Outcome.Detriment); staticText = "Players can't cast spells with the same name as the exiled card"; } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/FallenFerromancer.java b/Mage.Sets/src/mage/sets/newphyrexia/FallenFerromancer.java index 9d9b7986bd4..f781d54277e 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/FallenFerromancer.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/FallenFerromancer.java @@ -28,9 +28,9 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/FlamebornViron.java b/Mage.Sets/src/mage/sets/newphyrexia/FlamebornViron.java index 178112688b6..570b9944093 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/FlamebornViron.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/FlamebornViron.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ForcedWorship.java b/Mage.Sets/src/mage/sets/newphyrexia/ForcedWorship.java index db742312ccc..f5568b4f9c6 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ForcedWorship.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ForcedWorship.java @@ -30,9 +30,7 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -60,11 +58,11 @@ public class ForcedWorship extends CardImpl { this.color.setWhite(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Detriment)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ForcedWorshipEffect())); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ManaCostsImpl("{2}{W}"))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ForcedWorshipEffect())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ManaCostsImpl("{2}{W}"))); } public ForcedWorship (final ForcedWorship card) { @@ -81,7 +79,7 @@ public class ForcedWorship extends CardImpl { class ForcedWorshipEffect extends RestrictionEffect { public ForcedWorshipEffect() { - super(Constants.Duration.WhileOnBattlefield); + super(Duration.WhileOnBattlefield); staticText = "Enchanted creature can't attack"; } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/FreshMeat.java b/Mage.Sets/src/mage/sets/newphyrexia/FreshMeat.java index 6d0cf11b1be..517d4375b99 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/FreshMeat.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/FreshMeat.java @@ -28,10 +28,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.WatcherScope; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.WatcherScope; +import mage.constants.Zone; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/FurnaceScamp.java b/Mage.Sets/src/mage/sets/newphyrexia/FurnaceScamp.java index c07909027bb..70cdea8a56e 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/FurnaceScamp.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/FurnaceScamp.java @@ -27,8 +27,8 @@ */ package mage.sets.newphyrexia; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Geosurge.java b/Mage.Sets/src/mage/sets/newphyrexia/Geosurge.java index 6c6977f9858..c1cec9898d0 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Geosurge.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Geosurge.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import mage.ConditionalMana; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.Ability; import mage.abilities.SpellAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/GethsVerdict.java b/Mage.Sets/src/mage/sets/newphyrexia/GethsVerdict.java index e852c5c5a0e..8cbc28193dd 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/GethsVerdict.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/GethsVerdict.java @@ -29,8 +29,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.abilities.effects.common.SacrificeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/GitaxianProbe.java b/Mage.Sets/src/mage/sets/newphyrexia/GitaxianProbe.java index f57c43cd109..60e92bff5b0 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/GitaxianProbe.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/GitaxianProbe.java @@ -29,9 +29,9 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/GlissasScorn.java b/Mage.Sets/src/mage/sets/newphyrexia/GlissasScorn.java index 41509f674fd..d1b7c36ee5d 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/GlissasScorn.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/GlissasScorn.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.LoseLifeControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/GlistenerElf.java b/Mage.Sets/src/mage/sets/newphyrexia/GlistenerElf.java index 119902daf8a..6d1bf8bd4ea 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/GlistenerElf.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/GlistenerElf.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/GlisteningOil.java b/Mage.Sets/src/mage/sets/newphyrexia/GlisteningOil.java index 65eadce559d..c0175e193cb 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/GlisteningOil.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/GlisteningOil.java @@ -29,9 +29,7 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; @@ -62,11 +60,11 @@ public class GlisteningOil extends CardImpl { this.color.setBlack(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(InfectAbility.getInstance(), Constants.AttachmentType.AURA))); - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new GlisteningOilEffect(), Constants.TargetController.YOU, false)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(InfectAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new GlisteningOilEffect(), TargetController.YOU, false)); this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new ReturnToHandSourceEffect())); } @@ -82,7 +80,7 @@ public class GlisteningOil extends CardImpl { class GlisteningOilEffect extends OneShotEffect { GlisteningOilEffect() { - super(Constants.Outcome.UnboostCreature); + super(Outcome.UnboostCreature); staticText = "put a -1/-1 counter on enchanted creature"; } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/GreenhiltTrainee.java b/Mage.Sets/src/mage/sets/newphyrexia/GreenhiltTrainee.java index b6a31d683a4..a7571479239 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/GreenhiltTrainee.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/GreenhiltTrainee.java @@ -30,9 +30,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.abilities.costs.CostImpl; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; @@ -58,7 +59,7 @@ public class GreenhiltTrainee extends CardImpl { this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(4, 4, Constants.Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(4, 4, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new GreenhiltTraineeCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/GremlinMine.java b/Mage.Sets/src/mage/sets/newphyrexia/GremlinMine.java index aa15f353571..94e81c78e57 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/GremlinMine.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/GremlinMine.java @@ -28,10 +28,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/GrimAffliction.java b/Mage.Sets/src/mage/sets/newphyrexia/GrimAffliction.java index 9b79a4b50fe..f3ca20ff3d6 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/GrimAffliction.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/GrimAffliction.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.effects.common.counter.ProliferateEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/GutShot.java b/Mage.Sets/src/mage/sets/newphyrexia/GutShot.java index 541cf269f91..43ecb1b27e9 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/GutShot.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/GutShot.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreatureOrPlayer; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/HexParasite.java b/Mage.Sets/src/mage/sets/newphyrexia/HexParasite.java index b7c74b1caf3..fc059cba63e 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/HexParasite.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/HexParasite.java @@ -28,11 +28,11 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Hovermyr.java b/Mage.Sets/src/mage/sets/newphyrexia/Hovermyr.java index c13ed1c91d2..d90627bda16 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Hovermyr.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Hovermyr.java @@ -29,8 +29,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/IchorExplosion.java b/Mage.Sets/src/mage/sets/newphyrexia/IchorExplosion.java index d975b164f75..d0accd646f9 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/IchorExplosion.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/IchorExplosion.java @@ -28,10 +28,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.dynamicvalue.DynamicValue; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ImmolatingSouleater.java b/Mage.Sets/src/mage/sets/newphyrexia/ImmolatingSouleater.java index e81c16d377e..2b7b7436c3d 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ImmolatingSouleater.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ImmolatingSouleater.java @@ -28,11 +28,11 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.ColoredManaSymbol; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.PhyrexianManaCost; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ImpalerShrike.java b/Mage.Sets/src/mage/sets/newphyrexia/ImpalerShrike.java index 50200b1580f..775ec0e33a4 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ImpalerShrike.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ImpalerShrike.java @@ -27,8 +27,8 @@ */ package mage.sets.newphyrexia; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/InquisitorExarch.java b/Mage.Sets/src/mage/sets/newphyrexia/InquisitorExarch.java index 2d4a63d6af6..f3f39bd3f0f 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/InquisitorExarch.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/InquisitorExarch.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/InsatiableSouleater.java b/Mage.Sets/src/mage/sets/newphyrexia/InsatiableSouleater.java index d521484a32d..6fe77260b43 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/InsatiableSouleater.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/InsatiableSouleater.java @@ -28,11 +28,11 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.ColoredManaSymbol; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.PhyrexianManaCost; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/InvaderParasite.java b/Mage.Sets/src/mage/sets/newphyrexia/InvaderParasite.java index 46c88d5c302..3ac3c3f9f88 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/InvaderParasite.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/InvaderParasite.java @@ -29,9 +29,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -41,6 +40,8 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -79,7 +80,7 @@ public class InvaderParasite extends CardImpl { class InvaderParasiteImprintEffect extends OneShotEffect { InvaderParasiteImprintEffect() { - super(Constants.Outcome.Exile); + super(Outcome.Exile); staticText = "exile target land"; } @@ -106,7 +107,7 @@ class InvaderParasiteImprintEffect extends OneShotEffect { InvaderParasiteTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(2)); + super(Zone.BATTLEFIELD, new DamageTargetEffect(2)); } InvaderParasiteTriggeredAbility(final InvaderParasiteTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/newphyrexia/IsolationCell.java b/Mage.Sets/src/mage/sets/newphyrexia/IsolationCell.java index a9cc54fa417..17ad6bf24cc 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/IsolationCell.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/IsolationCell.java @@ -28,10 +28,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.GenericManaCost; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/JinGitaxiasCoreAugur.java b/Mage.Sets/src/mage/sets/newphyrexia/JinGitaxiasCoreAugur.java index ad6769134ca..4e228a5f8fa 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/JinGitaxiasCoreAugur.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/JinGitaxiasCoreAugur.java @@ -28,11 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.*; import mage.MageInt; import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -65,7 +62,7 @@ public class JinGitaxiasCoreAugur extends CardImpl { this.addAbility(new BeginningOfYourEndStepTriggeredAbility(new DrawCardControllerEffect(7), false)); // Each opponent's maximum hand size is reduced by seven. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MaximumHandSizeControllerEffect(7, Duration.WhileOnBattlefield, HandSizeModification.REDUCE, TargetController.OPPONENT))); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/JorKadeenThePrevailer.java b/Mage.Sets/src/mage/sets/newphyrexia/JorKadeenThePrevailer.java index b19f65b2310..a65070aea45 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/JorKadeenThePrevailer.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/JorKadeenThePrevailer.java @@ -28,10 +28,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/KarnLiberated.java b/Mage.Sets/src/mage/sets/newphyrexia/KarnLiberated.java index e0dab0b4461..ab9a6757009 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/KarnLiberated.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/KarnLiberated.java @@ -30,10 +30,10 @@ package mage.sets.newphyrexia; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.LoyaltyAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/KilnWalker.java b/Mage.Sets/src/mage/sets/newphyrexia/KilnWalker.java index ba0b7f130ba..f88d5c059a3 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/KilnWalker.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/KilnWalker.java @@ -28,9 +28,9 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Lashwrithe.java b/Mage.Sets/src/mage/sets/newphyrexia/Lashwrithe.java index 69d00942ad1..14b3eaddc43 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Lashwrithe.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Lashwrithe.java @@ -28,11 +28,11 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/LeechingBite.java b/Mage.Sets/src/mage/sets/newphyrexia/LeechingBite.java index 827bfb86b97..a3813d58449 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/LeechingBite.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/LeechingBite.java @@ -28,12 +28,12 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/LifesFinale.java b/Mage.Sets/src/mage/sets/newphyrexia/LifesFinale.java index e494ad5f3a4..7792c363caf 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/LifesFinale.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/LifesFinale.java @@ -29,10 +29,10 @@ package mage.sets.newphyrexia; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/LostLeonin.java b/Mage.Sets/src/mage/sets/newphyrexia/LostLeonin.java index 1203caac05a..94a185b4016 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/LostLeonin.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/LostLeonin.java @@ -29,8 +29,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/LoxodonConvert.java b/Mage.Sets/src/mage/sets/newphyrexia/LoxodonConvert.java index 285c55ac2db..a4ab8e6e08c 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/LoxodonConvert.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/LoxodonConvert.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/MarrowShards.java b/Mage.Sets/src/mage/sets/newphyrexia/MarrowShards.java index 31705f02dbc..dbb25aca6ab 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/MarrowShards.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/MarrowShards.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageAllEffect; import mage.cards.CardImpl; import mage.filter.common.FilterAttackingCreature; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/MasterSplicer.java b/Mage.Sets/src/mage/sets/newphyrexia/MasterSplicer.java index b96512b0619..be8f8469740 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/MasterSplicer.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/MasterSplicer.java @@ -28,10 +28,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/MaulSplicer.java b/Mage.Sets/src/mage/sets/newphyrexia/MaulSplicer.java index 206a3893326..7b661255e9b 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/MaulSplicer.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/MaulSplicer.java @@ -28,10 +28,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/MeliraSylvokOutcast.java b/Mage.Sets/src/mage/sets/newphyrexia/MeliraSylvokOutcast.java index 6a3ef8e349b..e1205112668 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/MeliraSylvokOutcast.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/MeliraSylvokOutcast.java @@ -29,13 +29,13 @@ package mage.sets.newphyrexia; import java.util.Set; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/MentalMisstep.java b/Mage.Sets/src/mage/sets/newphyrexia/MentalMisstep.java index eff214783d7..8d8ef276c52 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/MentalMisstep.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/MentalMisstep.java @@ -29,8 +29,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.filter.Filter; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Mindcrank.java b/Mage.Sets/src/mage/sets/newphyrexia/Mindcrank.java index c15a3b4ff58..8308a21b7fc 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Mindcrank.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Mindcrank.java @@ -29,10 +29,10 @@ package mage.sets.newphyrexia; import java.util.Set; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Mindculling.java b/Mage.Sets/src/mage/sets/newphyrexia/Mindculling.java index eac1a8cf083..c80c0b6f22a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Mindculling.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Mindculling.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DiscardTargetEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/MoltensteelDragon.java b/Mage.Sets/src/mage/sets/newphyrexia/MoltensteelDragon.java index 471d48dee2d..43f7087ec5a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/MoltensteelDragon.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/MoltensteelDragon.java @@ -28,11 +28,11 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.ColoredManaSymbol; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.PhyrexianManaCost; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/MortisDogs.java b/Mage.Sets/src/mage/sets/newphyrexia/MortisDogs.java index 4194e3a2312..7a2c2c7f8ba 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/MortisDogs.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/MortisDogs.java @@ -28,10 +28,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/MutagenicGrowth.java b/Mage.Sets/src/mage/sets/newphyrexia/MutagenicGrowth.java index d55ff4a3384..41b4f34a8ca 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/MutagenicGrowth.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/MutagenicGrowth.java @@ -29,9 +29,9 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/MycosynthFiend.java b/Mage.Sets/src/mage/sets/newphyrexia/MycosynthFiend.java index 22f80d371bf..678624020ec 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/MycosynthFiend.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/MycosynthFiend.java @@ -28,10 +28,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/MycosynthWellspring.java b/Mage.Sets/src/mage/sets/newphyrexia/MycosynthWellspring.java index a034602bfc8..504ac99ed91 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/MycosynthWellspring.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/MycosynthWellspring.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/MyrSuperion.java b/Mage.Sets/src/mage/sets/newphyrexia/MyrSuperion.java index ab302979703..31868181a05 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/MyrSuperion.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/MyrSuperion.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Necropouncer.java b/Mage.Sets/src/mage/sets/newphyrexia/Necropouncer.java index ae610f82653..63251049acf 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Necropouncer.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Necropouncer.java @@ -28,11 +28,11 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/NornsAnnex.java b/Mage.Sets/src/mage/sets/newphyrexia/NornsAnnex.java index b425a9bd065..f215cf89801 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/NornsAnnex.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/NornsAnnex.java @@ -30,9 +30,7 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -51,7 +49,7 @@ public class NornsAnnex extends CardImpl { super(ownerId, 17, "Norn's Annex", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{3}{WP}{WP}"); this.expansionSetCode = "NPH"; this.color.setWhite(true); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new NornsAnnexReplacementEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NornsAnnexReplacementEffect())); } public NornsAnnex(final NornsAnnex card) { @@ -70,7 +68,7 @@ class NornsAnnexReplacementEffect extends ReplacementEffectImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Sacrifice)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Sacrifice)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - ability = new BeginningOfUpkeepTriggeredAbility(new ParasiticImplantEffect(), Constants.TargetController.YOU, false); + ability = new BeginningOfUpkeepTriggeredAbility(new ParasiticImplantEffect(), TargetController.YOU, false); ability.addEffect(new CreateTokenEffect(new MyrToken())); this.addAbility(ability); } @@ -80,7 +81,7 @@ public class ParasiticImplant extends CardImpl { class ParasiticImplantEffect extends OneShotEffect { ParasiticImplantEffect() { - super(Constants.Outcome.Sacrifice); + super(Outcome.Sacrifice); staticText = "enchanted creature's controller sacrifices it"; } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PestilentSouleater.java b/Mage.Sets/src/mage/sets/newphyrexia/PestilentSouleater.java index 6ac848fa4a1..65a2d3e5784 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PestilentSouleater.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PestilentSouleater.java @@ -28,11 +28,11 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.ColoredManaSymbol; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.PhyrexianManaCost; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianHulk.java b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianHulk.java index 413a1105289..19223edd250 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianHulk.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianHulk.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianIngester.java b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianIngester.java index 78f77362b82..fe3fd2df4aa 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianIngester.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianIngester.java @@ -28,13 +28,13 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianMetamorph.java b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianMetamorph.java index 3bb96fe5767..4ffdd9eacf4 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianMetamorph.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianMetamorph.java @@ -29,10 +29,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianObliterator.java b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianObliterator.java index 19a83a988d2..d4bb406b527 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianObliterator.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianObliterator.java @@ -29,15 +29,15 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.SacrificeEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.events.GameEvent; @@ -75,7 +75,7 @@ public class PhyrexianObliterator extends CardImpl { class PhyrexianObliteratorTriggeredAbility extends TriggeredAbilityImpl { PhyrexianObliteratorTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new SacrificeEffect(new FilterPermanent(), 0, "")); + super(Zone.BATTLEFIELD, new SacrificeEffect(new FilterPermanent(), 0, "")); } PhyrexianObliteratorTriggeredAbility(final PhyrexianObliteratorTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianSwarmlord.java b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianSwarmlord.java index b72a9e29c0b..acf6ef3b6be 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianSwarmlord.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianSwarmlord.java @@ -29,8 +29,8 @@ package mage.sets.newphyrexia; import java.util.Set; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianUnlife.java b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianUnlife.java index 6ae9781e078..19ac2601d14 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianUnlife.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianUnlife.java @@ -28,11 +28,11 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexiasCore.java b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexiasCore.java index 23ea54543cf..93dc4a31c2d 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexiasCore.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexiasCore.java @@ -28,9 +28,9 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PithDriller.java b/Mage.Sets/src/mage/sets/newphyrexia/PithDriller.java index 64714f44a22..a57c9ee459d 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PithDriller.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PithDriller.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersTargetEffect; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PorcelainLegionnaire.java b/Mage.Sets/src/mage/sets/newphyrexia/PorcelainLegionnaire.java index 3814bd82f9a..ea6d51ca82f 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PorcelainLegionnaire.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PorcelainLegionnaire.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PostmortemLunge.java b/Mage.Sets/src/mage/sets/newphyrexia/PostmortemLunge.java index c954abb57fb..b324c72a2b2 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PostmortemLunge.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PostmortemLunge.java @@ -28,10 +28,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.delayed.AtEndOfTurnDelayedTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PraetorsGrasp.java b/Mage.Sets/src/mage/sets/newphyrexia/PraetorsGrasp.java index 7711ca6eb7b..78176ada257 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PraetorsGrasp.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PraetorsGrasp.java @@ -27,7 +27,6 @@ */ package mage.sets.newphyrexia; -import mage.Constants.*; import mage.abilities.Ability; import mage.abilities.effects.AsThoughEffectImpl; import mage.abilities.effects.OneShotEffect; @@ -35,6 +34,7 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.*; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PriestOfUrabrask.java b/Mage.Sets/src/mage/sets/newphyrexia/PriestOfUrabrask.java index b6b5804397e..23d9b70ac1f 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PriestOfUrabrask.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PriestOfUrabrask.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PristineTalisman.java b/Mage.Sets/src/mage/sets/newphyrexia/PristineTalisman.java index 1e150cbeddf..abc117d9bae 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PristineTalisman.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PristineTalisman.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PsychicBarrier.java b/Mage.Sets/src/mage/sets/newphyrexia/PsychicBarrier.java index 7edc5747482..741586a421a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PsychicBarrier.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PsychicBarrier.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.LoseLifeControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PsychicSurgery.java b/Mage.Sets/src/mage/sets/newphyrexia/PsychicSurgery.java index feba142df08..8c5695af6b7 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PsychicSurgery.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PsychicSurgery.java @@ -28,10 +28,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PuresteelPaladin.java b/Mage.Sets/src/mage/sets/newphyrexia/PuresteelPaladin.java index 7065b6ef342..4f7aa616d1a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PuresteelPaladin.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PuresteelPaladin.java @@ -29,11 +29,11 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/RageExtractor.java b/Mage.Sets/src/mage/sets/newphyrexia/RageExtractor.java index df216bbbf08..4834d26277b 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/RageExtractor.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/RageExtractor.java @@ -29,9 +29,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.ManaCost; import mage.abilities.costs.mana.PhyrexianManaCost; @@ -39,6 +38,7 @@ import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.common.TargetCreatureOrPlayer; @@ -69,7 +69,7 @@ public class RageExtractor extends CardImpl { class RageExtractorTriggeredAbility extends TriggeredAbilityImpl { RageExtractorTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(0)); + super(Zone.BATTLEFIELD, new DamageTargetEffect(0)); this.addTarget(new TargetCreatureOrPlayer()); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/RazorSwine.java b/Mage.Sets/src/mage/sets/newphyrexia/RazorSwine.java index d3973d63b49..b26d6d9f246 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/RazorSwine.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/RazorSwine.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.InfectAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ReaperOfSheoldred.java b/Mage.Sets/src/mage/sets/newphyrexia/ReaperOfSheoldred.java index d72ed17bd7d..21a1476227b 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ReaperOfSheoldred.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ReaperOfSheoldred.java @@ -29,15 +29,15 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; @@ -74,7 +74,7 @@ public class ReaperOfSheoldred extends CardImpl { class ReaperOfSheoldredTriggeredAbility extends TriggeredAbilityImpl { ReaperOfSheoldredTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.POISON.createInstance())); + super(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.POISON.createInstance())); } ReaperOfSheoldredTriggeredAbility(final ReaperOfSheoldredTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/newphyrexia/RememberTheFallen.java b/Mage.Sets/src/mage/sets/newphyrexia/RememberTheFallen.java index 5092aac561d..de01246bb6d 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/RememberTheFallen.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/RememberTheFallen.java @@ -29,10 +29,10 @@ package mage.sets.newphyrexia; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/RottedHystrix.java b/Mage.Sets/src/mage/sets/newphyrexia/RottedHystrix.java index 63607f01bb6..f70c39616c7 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/RottedHystrix.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/RottedHystrix.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/RuthlessInvasion.java b/Mage.Sets/src/mage/sets/newphyrexia/RuthlessInvasion.java index 78b95aa3011..ec3db878573 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/RuthlessInvasion.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/RuthlessInvasion.java @@ -30,12 +30,12 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.RestrictionEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.game.Game; import mage.game.permanent.Permanent; @@ -65,7 +65,7 @@ public class RuthlessInvasion extends CardImpl { class RuthlessInvasionEffect extends RestrictionEffect { RuthlessInvasionEffect() { - super(Constants.Duration.EndOfTurn); + super(Duration.EndOfTurn); staticText = "Nonartifact creatures can't block this turn"; } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ScrapyardSalvo.java b/Mage.Sets/src/mage/sets/newphyrexia/ScrapyardSalvo.java index 9f994f68f30..ec543c1b2db 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ScrapyardSalvo.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ScrapyardSalvo.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/SensorSplicer.java b/Mage.Sets/src/mage/sets/newphyrexia/SensorSplicer.java index 08969e60a22..53b7ae02f25 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/SensorSplicer.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/SensorSplicer.java @@ -28,10 +28,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ShatteredAngel.java b/Mage.Sets/src/mage/sets/newphyrexia/ShatteredAngel.java index 37ed307507c..f5ca498d698 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ShatteredAngel.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ShatteredAngel.java @@ -29,10 +29,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/SheoldredWhisperingOne.java b/Mage.Sets/src/mage/sets/newphyrexia/SheoldredWhisperingOne.java index 363074d5ddb..2252f2baf7a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/SheoldredWhisperingOne.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/SheoldredWhisperingOne.java @@ -30,9 +30,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -40,6 +39,7 @@ import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffec import mage.abilities.effects.common.SacrificeEffect; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; import mage.target.common.TargetCardInYourGraveyard; @@ -59,10 +59,10 @@ public class SheoldredWhisperingOne extends CardImpl { this.power = new MageInt(6); this.toughness = new MageInt(6); this.addAbility(new SwampwalkAbility()); - Ability ability = new BeginningOfUpkeepTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(false), Constants.TargetController.YOU, false); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(false), TargetController.YOU, false); ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard"))); this.addAbility(ability); - ability = new BeginningOfUpkeepTriggeredAbility(new SacrificeEffect(new FilterCreaturePermanent(), 1, "that player "), Constants.TargetController.OPPONENT, false); + ability = new BeginningOfUpkeepTriggeredAbility(new SacrificeEffect(new FilterCreaturePermanent(), 1, "that player "), TargetController.OPPONENT, false); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ShriekRaptor.java b/Mage.Sets/src/mage/sets/newphyrexia/ShriekRaptor.java index f9ead5f4e61..4a421f8f188 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ShriekRaptor.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ShriekRaptor.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.InfectAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfBoundlessGrowth.java b/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfBoundlessGrowth.java index 38cefe8ec06..72d36eb750e 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfBoundlessGrowth.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfBoundlessGrowth.java @@ -29,10 +29,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.Mana; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfBurningRage.java b/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfBurningRage.java index b01f562cfc3..aca8c3427f9 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfBurningRage.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfBurningRage.java @@ -29,9 +29,9 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -44,6 +44,8 @@ import mage.abilities.dynamicvalue.common.CountersCount; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; @@ -63,9 +65,9 @@ public class ShrineOfBurningRage extends CardImpl { public ShrineOfBurningRage (UUID ownerId) { super(ownerId, 153, "Shrine of Burning Rage", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "NPH"; - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), TargetController.YOU, false)); this.addAbility(new SpellCastTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), filter, false)); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(new CountersCount(CounterType.CHARGE)), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new CountersCount(CounterType.CHARGE)), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfLimitlessPower.java b/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfLimitlessPower.java index 9029b4a277d..c350c6bb53e 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfLimitlessPower.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfLimitlessPower.java @@ -28,10 +28,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfLoyalLegions.java b/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfLoyalLegions.java index ad0825f50ef..2cf142da4a3 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfLoyalLegions.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfLoyalLegions.java @@ -28,10 +28,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfPiercingVision.java b/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfPiercingVision.java index 25be90ac34f..7be9213907e 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfPiercingVision.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfPiercingVision.java @@ -28,11 +28,11 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Sickleslicer.java b/Mage.Sets/src/mage/sets/newphyrexia/Sickleslicer.java index 82eff9cbf9c..3746f8de1a2 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Sickleslicer.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Sickleslicer.java @@ -30,15 +30,16 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.LivingWeaponAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; /** * @@ -50,8 +51,8 @@ public class Sickleslicer extends CardImpl { super(ownerId, 157, "Sickleslicer", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "NPH"; this.subtype.add("Equipment"); - this.addAbility(new EquipAbility(Constants.Outcome.BoostCreature, new GenericManaCost(4))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); + this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(4))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); this.addAbility(new LivingWeaponAbility()); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/SlagFiend.java b/Mage.Sets/src/mage/sets/newphyrexia/SlagFiend.java index 64d9ad30ed8..0613cdffc9a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/SlagFiend.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/SlagFiend.java @@ -28,15 +28,16 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.CardsInAllGraveyardsCount; import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterArtifactCard; /** @@ -54,7 +55,7 @@ public class SlagFiend extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(0); - this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new CardsInAllGraveyardsCount(new FilterArtifactCard("artifacts")), Constants.Duration.EndOfGame))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new CardsInAllGraveyardsCount(new FilterArtifactCard("artifacts")), Duration.EndOfGame))); } public SlagFiend(final SlagFiend card) { diff --git a/Mage.Sets/src/mage/sets/newphyrexia/SlashPanther.java b/Mage.Sets/src/mage/sets/newphyrexia/SlashPanther.java index 6c50df055f6..823db1cf341 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/SlashPanther.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/SlashPanther.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/SoulConduit.java b/Mage.Sets/src/mage/sets/newphyrexia/SoulConduit.java index a5ff44fa6ec..3a7e51f1a23 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/SoulConduit.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/SoulConduit.java @@ -28,10 +28,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Spellskite.java b/Mage.Sets/src/mage/sets/newphyrexia/Spellskite.java index fb7181ab722..f18bacaf0a3 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Spellskite.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Spellskite.java @@ -28,10 +28,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Spinebiter.java b/Mage.Sets/src/mage/sets/newphyrexia/Spinebiter.java index 53c4f472d16..38c2b3186bf 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Spinebiter.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Spinebiter.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DamageAsThoughNotBlockedAbility; import mage.abilities.keyword.InfectAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/SpinedThopter.java b/Mage.Sets/src/mage/sets/newphyrexia/SpinedThopter.java index 70f8e5e716a..6817da51db1 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/SpinedThopter.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/SpinedThopter.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/SpireMonitor.java b/Mage.Sets/src/mage/sets/newphyrexia/SpireMonitor.java index f8556ab32af..bfbe0ffca7b 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/SpireMonitor.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/SpireMonitor.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/SurgeNode.java b/Mage.Sets/src/mage/sets/newphyrexia/SurgeNode.java index 73810272744..72824e7605b 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/SurgeNode.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/SurgeNode.java @@ -30,9 +30,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetArtifactPermanent; @@ -55,7 +55,7 @@ public class SurgeNode extends CardImpl { super(ownerId, 160, "Surge Node", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{1}"); this.expansionSetCode = "NPH"; this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(6))), "{this} gets six charge counters")); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.CHARGE.createInstance()), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.CHARGE.createInstance()), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance())); ability.addTarget(new TargetArtifactPermanent()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/SurgicalExtraction.java b/Mage.Sets/src/mage/sets/newphyrexia/SurgicalExtraction.java index b285f874d4a..16370d4d308 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/SurgicalExtraction.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/SurgicalExtraction.java @@ -29,10 +29,10 @@ package mage.sets.newphyrexia; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/SuturePriest.java b/Mage.Sets/src/mage/sets/newphyrexia/SuturePriest.java index 0fb044f1426..bc026942a70 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/SuturePriest.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/SuturePriest.java @@ -30,9 +30,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; @@ -41,6 +40,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; @@ -88,7 +88,7 @@ public class SuturePriest extends CardImpl { class SuturePriestSecondTriggeredAbility extends TriggeredAbilityImpl { SuturePriestSecondTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), true); + super(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), true); } SuturePriestSecondTriggeredAbility(final SuturePriestSecondTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/newphyrexia/SwordOfWarAndPeace.java b/Mage.Sets/src/mage/sets/newphyrexia/SwordOfWarAndPeace.java index eb2733d6da9..3a2917377d6 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/SwordOfWarAndPeace.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/SwordOfWarAndPeace.java @@ -30,11 +30,11 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/TezzeretsGambit.java b/Mage.Sets/src/mage/sets/newphyrexia/TezzeretsGambit.java index 22b2fe3a8bc..bf3ad243498 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/TezzeretsGambit.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/TezzeretsGambit.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.counter.ProliferateEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ThunderingTanadon.java b/Mage.Sets/src/mage/sets/newphyrexia/ThunderingTanadon.java index 737fe71b99a..865dd247058 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ThunderingTanadon.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ThunderingTanadon.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/TormentorExarch.java b/Mage.Sets/src/mage/sets/newphyrexia/TormentorExarch.java index d092a566703..02d4653bc14 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/TormentorExarch.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/TormentorExarch.java @@ -29,15 +29,15 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -54,10 +54,10 @@ public class TormentorExarch extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(2, 0, Constants.Duration.EndOfTurn), false); + Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(2, 0, Duration.EndOfTurn), false); ability.addTarget(new TargetCreaturePermanent()); Mode mode = new Mode(); - mode.getEffects().add(new BoostTargetEffect(0, -2, Constants.Duration.EndOfTurn)); + mode.getEffects().add(new BoostTargetEffect(0, -2, Duration.EndOfTurn)); mode.getTargets().add(new TargetCreaturePermanent()); ability.addMode(mode); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/TorporOrb.java b/Mage.Sets/src/mage/sets/newphyrexia/TorporOrb.java index b6cae658c0e..cf7c004c62e 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/TorporOrb.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/TorporOrb.java @@ -28,11 +28,11 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ToxicNim.java b/Mage.Sets/src/mage/sets/newphyrexia/ToxicNim.java index 58f68a54097..3f4cc41bec8 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ToxicNim.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ToxicNim.java @@ -28,9 +28,9 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/TrespassingSouleater.java b/Mage.Sets/src/mage/sets/newphyrexia/TrespassingSouleater.java index ea6905ba553..653948fc929 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/TrespassingSouleater.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/TrespassingSouleater.java @@ -28,11 +28,11 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.ColoredManaSymbol; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.PhyrexianManaCost; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/TriumphOfTheHordes.java b/Mage.Sets/src/mage/sets/newphyrexia/TriumphOfTheHordes.java index 08be8cf6fec..6ec1ced048e 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/TriumphOfTheHordes.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/TriumphOfTheHordes.java @@ -28,9 +28,9 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.InfectAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/UnwindingClock.java b/Mage.Sets/src/mage/sets/newphyrexia/UnwindingClock.java index 3cd5f5631ec..d4649e35bbe 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/UnwindingClock.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/UnwindingClock.java @@ -28,14 +28,14 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.PhaseStep; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.PhaseStep; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/UrabraskTheHidden.java b/Mage.Sets/src/mage/sets/newphyrexia/UrabraskTheHidden.java index 313b226544f..285fe375d73 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/UrabraskTheHidden.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/UrabraskTheHidden.java @@ -29,9 +29,7 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -61,8 +59,8 @@ public class UrabraskTheHidden extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityControlledEffect(HasteAbility.getInstance(), Constants.Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Creatures")))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new UrabraskTheHiddenEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Creatures")))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new UrabraskTheHiddenEffect())); } public UrabraskTheHidden(final UrabraskTheHidden card) { @@ -77,7 +75,7 @@ public class UrabraskTheHidden extends CardImpl { class UrabraskTheHiddenEffect extends ReplacementEffectImpl { UrabraskTheHiddenEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Tap); + super(Duration.WhileOnBattlefield, Outcome.Tap); staticText = "Creatures your opponents control enter the battlefield tapped"; } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/VaporSnag.java b/Mage.Sets/src/mage/sets/newphyrexia/VaporSnag.java index fb62fc3c000..a31093704d9 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/VaporSnag.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/VaporSnag.java @@ -30,8 +30,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.LoseLifeControllerEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/VaultSkirge.java b/Mage.Sets/src/mage/sets/newphyrexia/VaultSkirge.java index 78d996dd097..87dc6839718 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/VaultSkirge.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/VaultSkirge.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.LifelinkAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/VictoriousDestruction.java b/Mage.Sets/src/mage/sets/newphyrexia/VictoriousDestruction.java index cf968c53bb2..4883543eb99 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/VictoriousDestruction.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/VictoriousDestruction.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.LoseLifeControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ViralDrake.java b/Mage.Sets/src/mage/sets/newphyrexia/ViralDrake.java index 318559e1e70..8389b79429f 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ViralDrake.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ViralDrake.java @@ -28,9 +28,9 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ViridianBetrayers.java b/Mage.Sets/src/mage/sets/newphyrexia/ViridianBetrayers.java index 00a27e705f5..80cfe3d26d5 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ViridianBetrayers.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ViridianBetrayers.java @@ -29,9 +29,9 @@ package mage.sets.newphyrexia; import java.util.Set; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +40,7 @@ import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.players.Player; @@ -64,7 +65,7 @@ public class ViridianBetrayers extends CardImpl { // Viridian Betrayers has infect as long as an opponent is poisoned. ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainAbilitySourceEffect(InfectAbility.getInstance()), PoisonedCondition.getInstance(), rule); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } public ViridianBetrayers(final ViridianBetrayers card) { diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ViridianHarvest.java b/Mage.Sets/src/mage/sets/newphyrexia/ViridianHarvest.java index adff24c7df8..a0d9c0bc50c 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ViridianHarvest.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ViridianHarvest.java @@ -29,15 +29,15 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.target.TargetPermanent; import mage.target.common.TargetArtifactPermanent; @@ -56,7 +56,7 @@ public class ViridianHarvest extends CardImpl { TargetPermanent auraTarget = new TargetArtifactPermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Benefit)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/VitalSplicer.java b/Mage.Sets/src/mage/sets/newphyrexia/VitalSplicer.java index 9b29d0da831..c667a7ccd54 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/VitalSplicer.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/VitalSplicer.java @@ -28,10 +28,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/VoltCharge.java b/Mage.Sets/src/mage/sets/newphyrexia/VoltCharge.java index 1e0758e07b1..a7411ecd6a8 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/VoltCharge.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/VoltCharge.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.counter.ProliferateEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/VorinclexVoiceOfHunger.java b/Mage.Sets/src/mage/sets/newphyrexia/VorinclexVoiceOfHunger.java index 7f94ae8a8a4..71c55cc867a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/VorinclexVoiceOfHunger.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/VorinclexVoiceOfHunger.java @@ -28,9 +28,9 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.Mana; import mage.abilities.Abilities; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/VulshokRefugee.java b/Mage.Sets/src/mage/sets/newphyrexia/VulshokRefugee.java index 86cae6ddd25..a36d8dd4fba 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/VulshokRefugee.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/VulshokRefugee.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.ProtectionAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/WarReport.java b/Mage.Sets/src/mage/sets/newphyrexia/WarReport.java index f111ec2c82e..5be483fb463 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/WarReport.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/WarReport.java @@ -27,9 +27,9 @@ */ package mage.sets.newphyrexia; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Whipflare.java b/Mage.Sets/src/mage/sets/newphyrexia/Whipflare.java index 92ef12f0a15..b8d060b4b0f 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Whipflare.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Whipflare.java @@ -28,8 +28,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageAllEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/WhisperingSpecter.java b/Mage.Sets/src/mage/sets/newphyrexia/WhisperingSpecter.java index 667935f4c20..fd15bfd84ef 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/WhisperingSpecter.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/WhisperingSpecter.java @@ -29,9 +29,8 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -40,6 +39,7 @@ import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.game.Game; import mage.players.Player; @@ -78,7 +78,7 @@ public class WhisperingSpecter extends CardImpl { class WhisperingSpecterEffect extends OneShotEffect { WhisperingSpecterEffect() { - super(Constants.Outcome.Discard); + super(Outcome.Discard); staticText = "If you do, that player discards a card for each poison counter he or she has"; } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/WingSplicer.java b/Mage.Sets/src/mage/sets/newphyrexia/WingSplicer.java index e4f500fac8e..c596718f140 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/WingSplicer.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/WingSplicer.java @@ -28,10 +28,10 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Xenograft.java b/Mage.Sets/src/mage/sets/newphyrexia/Xenograft.java index 08327bd9c1f..279463c6abd 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Xenograft.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Xenograft.java @@ -29,13 +29,13 @@ package mage.sets.newphyrexia; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/ninthedition/AnabaShaman.java b/Mage.Sets/src/mage/sets/ninthedition/AnabaShaman.java index 9626dc7eb17..fee5eb390e9 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/AnabaShaman.java +++ b/Mage.Sets/src/mage/sets/ninthedition/AnabaShaman.java @@ -28,9 +28,9 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamagePlayersEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; /** @@ -57,7 +58,7 @@ public class AnabaShaman extends CardImpl { this.toughness = new MageInt(2); // {R}, {tap}: Anaba Shaman deals 1 damage to target creature or player. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamagePlayersEffect(1), new ManaCostsImpl("{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamagePlayersEffect(1), new ManaCostsImpl("{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/ninthedition/AvenFlock.java b/Mage.Sets/src/mage/sets/ninthedition/AvenFlock.java index f1995796d7a..6eb8b8549f8 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/AvenFlock.java +++ b/Mage.Sets/src/mage/sets/ninthedition/AvenFlock.java @@ -28,15 +28,17 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -57,7 +59,7 @@ public class AvenFlock extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {W}: Aven Flock gets +0/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Constants.Duration.EndOfTurn), new ManaCostsImpl("{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl("{W}"))); } public AvenFlock(final AvenFlock card) { diff --git a/Mage.Sets/src/mage/sets/ninthedition/AzureDrake.java b/Mage.Sets/src/mage/sets/ninthedition/AzureDrake.java index 6dc7a3f9cfe..26925620792 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/AzureDrake.java +++ b/Mage.Sets/src/mage/sets/ninthedition/AzureDrake.java @@ -28,7 +28,7 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/ninthedition/BalduvianBarbarians.java b/Mage.Sets/src/mage/sets/ninthedition/BalduvianBarbarians.java index a2446b3c69c..6ae3b84cc15 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/BalduvianBarbarians.java +++ b/Mage.Sets/src/mage/sets/ninthedition/BalduvianBarbarians.java @@ -28,8 +28,8 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ninthedition/BattleOfWits.java b/Mage.Sets/src/mage/sets/ninthedition/BattleOfWits.java index 87c04181e8b..4a5491d990a 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/BattleOfWits.java +++ b/Mage.Sets/src/mage/sets/ninthedition/BattleOfWits.java @@ -28,9 +28,9 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/ninthedition/BeastOfBurden.java b/Mage.Sets/src/mage/sets/ninthedition/BeastOfBurden.java index 9cbefb4c306..666ec4747f3 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/BeastOfBurden.java +++ b/Mage.Sets/src/mage/sets/ninthedition/BeastOfBurden.java @@ -28,14 +28,16 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; /** @@ -53,7 +55,7 @@ public class BeastOfBurden extends CardImpl { this.toughness = new MageInt(0); // Beast of Burden's power and toughness are each equal to the number of creatures on the battlefield. - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(new FilterCreaturePermanent("creatures on the battlefield")), Constants.Duration.EndOfGame))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(new FilterCreaturePermanent("creatures on the battlefield")), Duration.EndOfGame))); } diff --git a/Mage.Sets/src/mage/sets/ninthedition/BlinkingSpirit.java b/Mage.Sets/src/mage/sets/ninthedition/BlinkingSpirit.java index 4d3629bf3a4..7996de945a4 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/BlinkingSpirit.java +++ b/Mage.Sets/src/mage/sets/ninthedition/BlinkingSpirit.java @@ -28,14 +28,15 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -53,7 +54,7 @@ public class BlinkingSpirit extends CardImpl { this.toughness = new MageInt(2); // {0}: Return Blinking Spirit to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new GenericManaCost(0))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new GenericManaCost(0))); } public BlinkingSpirit(final BlinkingSpirit card) { diff --git a/Mage.Sets/src/mage/sets/ninthedition/BloodMoon.java b/Mage.Sets/src/mage/sets/ninthedition/BloodMoon.java index 5d60e81a5f7..c7439c53f9c 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/BloodMoon.java +++ b/Mage.Sets/src/mage/sets/ninthedition/BloodMoon.java @@ -28,13 +28,13 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; diff --git a/Mage.Sets/src/mage/sets/ninthedition/Chastise.java b/Mage.Sets/src/mage/sets/ninthedition/Chastise.java index f528ca69e38..df30881c444 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Chastise.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Chastise.java @@ -28,13 +28,14 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -71,7 +72,7 @@ class ChastiseEffect extends OneShotEffect { public ChastiseEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); } diff --git a/Mage.Sets/src/mage/sets/ninthedition/CircleOfProtectionBlack.java b/Mage.Sets/src/mage/sets/ninthedition/CircleOfProtectionBlack.java index 1df730b33f9..6972532a579 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/CircleOfProtectionBlack.java +++ b/Mage.Sets/src/mage/sets/ninthedition/CircleOfProtectionBlack.java @@ -28,7 +28,7 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/ninthedition/CircleOfProtectionRed.java b/Mage.Sets/src/mage/sets/ninthedition/CircleOfProtectionRed.java index 9b143ac08f9..bf83b4e7f67 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/CircleOfProtectionRed.java +++ b/Mage.Sets/src/mage/sets/ninthedition/CircleOfProtectionRed.java @@ -28,7 +28,7 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/ninthedition/ContaminatedBond.java b/Mage.Sets/src/mage/sets/ninthedition/ContaminatedBond.java index 2dc00910e46..6b6ce323ee3 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/ContaminatedBond.java +++ b/Mage.Sets/src/mage/sets/ninthedition/ContaminatedBond.java @@ -29,16 +29,16 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.AttacksOrBlocksEnchantedTriggeredAbility; import mage.abilities.effects.common.AttachEffect; -import mage.abilities.effects.common.LoseLifeControllerEffect; import mage.abilities.effects.common.LoseLifeSourceEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -58,11 +58,11 @@ public class ContaminatedBond extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Whenever enchanted creature attacks or blocks, its controller loses 3 life. - this.addAbility(new AttacksOrBlocksEnchantedTriggeredAbility(Constants.Zone.BATTLEFIELD, new LoseLifeSourceEffect(3))); + this.addAbility(new AttacksOrBlocksEnchantedTriggeredAbility(Zone.BATTLEFIELD, new LoseLifeSourceEffect(3))); } public ContaminatedBond(final ContaminatedBond card) { diff --git a/Mage.Sets/src/mage/sets/ninthedition/CrossbowInfantry.java b/Mage.Sets/src/mage/sets/ninthedition/CrossbowInfantry.java index fd75577ef27..1098fdd2006 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/CrossbowInfantry.java +++ b/Mage.Sets/src/mage/sets/ninthedition/CrossbowInfantry.java @@ -28,15 +28,16 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetAttackingOrBlockingCreature; /** @@ -57,7 +58,7 @@ public class CrossbowInfantry extends CardImpl { this.toughness = new MageInt(1); // {tap}: Crossbow Infantry deals 1 damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ninthedition/DancingScimitar.java b/Mage.Sets/src/mage/sets/ninthedition/DancingScimitar.java index b2b4f1a9506..cd775a09244 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/DancingScimitar.java +++ b/Mage.Sets/src/mage/sets/ninthedition/DancingScimitar.java @@ -28,8 +28,8 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ninthedition/DaringApprentice.java b/Mage.Sets/src/mage/sets/ninthedition/DaringApprentice.java index c313f796597..faa4bd9c34a 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/DaringApprentice.java +++ b/Mage.Sets/src/mage/sets/ninthedition/DaringApprentice.java @@ -28,9 +28,9 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +38,7 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetSpell; /** @@ -57,7 +58,7 @@ public class DaringApprentice extends CardImpl { this.toughness = new MageInt(1); // {tap}, Sacrifice Daring Apprentice: Counter target spell. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CounterTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetSpell()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/ninthedition/Deathgazer.java b/Mage.Sets/src/mage/sets/ninthedition/Deathgazer.java index 72bf0450568..ff88cb062b7 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Deathgazer.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Deathgazer.java @@ -28,14 +28,15 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -75,7 +76,7 @@ class DeathgazerTriggeredAbility extends TriggeredAbilityImpl { this.expansionSetCode = "9ED"; // Each spell costs {3} more to cast except during its controller's turn. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new DefenseGridCostModificationEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DefenseGridCostModificationEffect())); } @@ -70,7 +68,7 @@ public class DefenseGrid extends CardImpl { class DefenseGridCostModificationEffect extends CostModificationEffectImpl { DefenseGridCostModificationEffect ( ) { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "Each spell costs {3} more to cast except during its controller's turn"; } diff --git a/Mage.Sets/src/mage/sets/ninthedition/Demolish.java b/Mage.Sets/src/mage/sets/ninthedition/Demolish.java index bb0271528ba..c82321a5e07 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Demolish.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Demolish.java @@ -28,7 +28,7 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/ninthedition/DrudgeSkeletons.java b/Mage.Sets/src/mage/sets/ninthedition/DrudgeSkeletons.java index fcdfc09b97a..9fecd08baff 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/DrudgeSkeletons.java +++ b/Mage.Sets/src/mage/sets/ninthedition/DrudgeSkeletons.java @@ -28,7 +28,7 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/ninthedition/Enrage.java b/Mage.Sets/src/mage/sets/ninthedition/Enrage.java index a1d16810621..afae07178c1 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Enrage.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Enrage.java @@ -28,13 +28,14 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -50,7 +51,7 @@ public class Enrage extends CardImpl { this.color.setRed(true); // Target creature gets +X/+0 until end of turn. - this.getSpellAbility().addEffect(new BoostTargetEffect(new ManacostVariableValue(), new StaticValue(0), Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(new ManacostVariableValue(), new StaticValue(0), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/ninthedition/Execute.java b/Mage.Sets/src/mage/sets/ninthedition/Execute.java index 19098e35e25..690f8ef4101 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Execute.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Execute.java @@ -28,8 +28,8 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/ninthedition/FleetingImage.java b/Mage.Sets/src/mage/sets/ninthedition/FleetingImage.java index e3d03d33e54..f43eed9f9f5 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/FleetingImage.java +++ b/Mage.Sets/src/mage/sets/ninthedition/FleetingImage.java @@ -28,9 +28,9 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/ninthedition/FootSoldiers.java b/Mage.Sets/src/mage/sets/ninthedition/FootSoldiers.java index 2569e2ab535..96727851c15 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/FootSoldiers.java +++ b/Mage.Sets/src/mage/sets/ninthedition/FootSoldiers.java @@ -28,8 +28,8 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ninthedition/GiantCockroach.java b/Mage.Sets/src/mage/sets/ninthedition/GiantCockroach.java index 75767adf2d3..c54f7a9c6f8 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/GiantCockroach.java +++ b/Mage.Sets/src/mage/sets/ninthedition/GiantCockroach.java @@ -28,8 +28,8 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ninthedition/GoblinBalloonBrigade.java b/Mage.Sets/src/mage/sets/ninthedition/GoblinBalloonBrigade.java index a5d9c543ee9..c5517f54891 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/GoblinBalloonBrigade.java +++ b/Mage.Sets/src/mage/sets/ninthedition/GoblinBalloonBrigade.java @@ -28,7 +28,7 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/ninthedition/GoblinChariot.java b/Mage.Sets/src/mage/sets/ninthedition/GoblinChariot.java index a884856a1aa..43a9271f0a4 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/GoblinChariot.java +++ b/Mage.Sets/src/mage/sets/ninthedition/GoblinChariot.java @@ -28,8 +28,8 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ninthedition/GravePact.java b/Mage.Sets/src/mage/sets/ninthedition/GravePact.java index 2aa6455e0ed..31f78f77ee2 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/GravePact.java +++ b/Mage.Sets/src/mage/sets/ninthedition/GravePact.java @@ -28,10 +28,10 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/ninthedition/IvoryMask.java b/Mage.Sets/src/mage/sets/ninthedition/IvoryMask.java index 92c2305a3f4..62b4da862c3 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/IvoryMask.java +++ b/Mage.Sets/src/mage/sets/ninthedition/IvoryMask.java @@ -28,13 +28,14 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityControllerEffect; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -49,7 +50,7 @@ public class IvoryMask extends CardImpl { this.color.setWhite(true); // You have shroud. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityControllerEffect(ShroudAbility.getInstance()))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControllerEffect(ShroudAbility.getInstance()))); } public IvoryMask(final IvoryMask card) { diff --git a/Mage.Sets/src/mage/sets/ninthedition/KingCheetah.java b/Mage.Sets/src/mage/sets/ninthedition/KingCheetah.java index a385a8f7faf..6f2914a8e94 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/KingCheetah.java +++ b/Mage.Sets/src/mage/sets/ninthedition/KingCheetah.java @@ -28,8 +28,8 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ninthedition/KirdApe.java b/Mage.Sets/src/mage/sets/ninthedition/KirdApe.java index df0a6850791..4426372da33 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/KirdApe.java +++ b/Mage.Sets/src/mage/sets/ninthedition/KirdApe.java @@ -28,15 +28,17 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.ControlsPermanentCondition; import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -63,8 +65,8 @@ public class KirdApe extends CardImpl { this.toughness = new MageInt(1); // Kird Ape gets +1/+2 as long as you control a Forest. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, - new ConditionalContinousEffect(new BoostSourceEffect(1, 2, Constants.Duration.WhileOnBattlefield), + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + new ConditionalContinousEffect(new BoostSourceEffect(1, 2, Duration.WhileOnBattlefield), new ControlsPermanentCondition(filter), rule))); } diff --git a/Mage.Sets/src/mage/sets/ninthedition/LlanowarBehemoth.java b/Mage.Sets/src/mage/sets/ninthedition/LlanowarBehemoth.java index 1091e6f28b2..be169c1d461 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/LlanowarBehemoth.java +++ b/Mage.Sets/src/mage/sets/ninthedition/LlanowarBehemoth.java @@ -28,14 +28,16 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; @@ -62,7 +64,7 @@ public class LlanowarBehemoth extends CardImpl { this.toughness = new MageInt(4); // Tap an untapped creature you control: Llanowar Behemoth gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Constants.Duration.EndOfTurn), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false)))); } public LlanowarBehemoth(final LlanowarBehemoth card) { diff --git a/Mage.Sets/src/mage/sets/ninthedition/Maro.java b/Mage.Sets/src/mage/sets/ninthedition/Maro.java index ffc66ef2668..860713dcb00 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Maro.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Maro.java @@ -28,14 +28,16 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.CardsInControllerHandCount; import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -53,7 +55,7 @@ public class Maro extends CardImpl { this.toughness = new MageInt(0); // Maro's power and toughness are each equal to the number of cards in your hand. - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new CardsInControllerHandCount(), Constants.Duration.EndOfGame))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new CardsInControllerHandCount(), Duration.EndOfGame))); } public Maro(final Maro card) { diff --git a/Mage.Sets/src/mage/sets/ninthedition/MasterHealer.java b/Mage.Sets/src/mage/sets/ninthedition/MasterHealer.java index 967225ba738..0d10324c425 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/MasterHealer.java +++ b/Mage.Sets/src/mage/sets/ninthedition/MasterHealer.java @@ -28,15 +28,17 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.PreventDamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; /** @@ -56,7 +58,7 @@ public class MasterHealer extends CardImpl { this.toughness = new MageInt(4); // {tap}: Prevent the next 4 damage that would be dealt to target creature or player this turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PreventDamageTargetEffect(Constants.Duration.EndOfTurn, 4), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageTargetEffect(Duration.EndOfTurn, 4), new TapSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ninthedition/NaturalAffinity.java b/Mage.Sets/src/mage/sets/ninthedition/NaturalAffinity.java index 5ec53cf130f..02b5cb0761a 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/NaturalAffinity.java +++ b/Mage.Sets/src/mage/sets/ninthedition/NaturalAffinity.java @@ -28,12 +28,16 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.filter.common.FilterLandPermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -68,7 +72,7 @@ class BecomesCreatureAllEffect extends ContinuousEffectImpl { this.color.setWhite(true); // {W}, Discard a card: You gain 3 life. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainLifeEffect(3), new ManaCostsImpl("{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(3), new ManaCostsImpl("{W}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ninthedition/PhyrexianHulk.java b/Mage.Sets/src/mage/sets/ninthedition/PhyrexianHulk.java index 86684adf33c..b05a7075d7a 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/PhyrexianHulk.java +++ b/Mage.Sets/src/mage/sets/ninthedition/PhyrexianHulk.java @@ -28,7 +28,7 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/ninthedition/RazortoothRats.java b/Mage.Sets/src/mage/sets/ninthedition/RazortoothRats.java index cfd6aba90e7..7094d60ef14 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/RazortoothRats.java +++ b/Mage.Sets/src/mage/sets/ninthedition/RazortoothRats.java @@ -28,8 +28,8 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ninthedition/Regeneration.java b/Mage.Sets/src/mage/sets/ninthedition/Regeneration.java index 63e55876e47..3d23fd9eae1 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Regeneration.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Regeneration.java @@ -28,7 +28,7 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/ninthedition/Rewind.java b/Mage.Sets/src/mage/sets/ninthedition/Rewind.java index 7d69fa61dd5..a3bd5f13ed3 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Rewind.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Rewind.java @@ -28,7 +28,7 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/ninthedition/RiverBear.java b/Mage.Sets/src/mage/sets/ninthedition/RiverBear.java index a3a2498d242..a076449e26c 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/RiverBear.java +++ b/Mage.Sets/src/mage/sets/ninthedition/RiverBear.java @@ -28,8 +28,8 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.IslandwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ninthedition/RootbreakerWurm.java b/Mage.Sets/src/mage/sets/ninthedition/RootbreakerWurm.java index ea29503a4c6..7f2d312cccd 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/RootbreakerWurm.java +++ b/Mage.Sets/src/mage/sets/ninthedition/RootbreakerWurm.java @@ -28,7 +28,7 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/ninthedition/SacredNectar.java b/Mage.Sets/src/mage/sets/ninthedition/SacredNectar.java index 8989c4742de..8a151b74c0d 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/SacredNectar.java +++ b/Mage.Sets/src/mage/sets/ninthedition/SacredNectar.java @@ -28,8 +28,8 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ninthedition/ScaledWurm.java b/Mage.Sets/src/mage/sets/ninthedition/ScaledWurm.java index bce76460c9d..7647ba886d4 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/ScaledWurm.java +++ b/Mage.Sets/src/mage/sets/ninthedition/ScaledWurm.java @@ -28,8 +28,8 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ninthedition/Slay.java b/Mage.Sets/src/mage/sets/ninthedition/Slay.java index 0b0f178d449..315b8261a80 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Slay.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Slay.java @@ -28,8 +28,8 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/ninthedition/SleightOfHand.java b/Mage.Sets/src/mage/sets/ninthedition/SleightOfHand.java index 96e01842ac3..672c8822538 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/SleightOfHand.java +++ b/Mage.Sets/src/mage/sets/ninthedition/SleightOfHand.java @@ -28,9 +28,9 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ninthedition/SoulWarden.java b/Mage.Sets/src/mage/sets/ninthedition/SoulWarden.java index 58696919420..8eed45a05aa 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/SoulWarden.java +++ b/Mage.Sets/src/mage/sets/ninthedition/SoulWarden.java @@ -28,7 +28,7 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/ninthedition/StorageMatrix.java b/Mage.Sets/src/mage/sets/ninthedition/StorageMatrix.java index 6a5a650b683..06df82aca65 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/StorageMatrix.java +++ b/Mage.Sets/src/mage/sets/ninthedition/StorageMatrix.java @@ -29,11 +29,11 @@ package mage.sets.ninthedition; import java.util.HashSet; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.PhaseStep; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.PhaseStep; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.RestrictionEffect; diff --git a/Mage.Sets/src/mage/sets/ninthedition/StormCrow.java b/Mage.Sets/src/mage/sets/ninthedition/StormCrow.java index 6f04c4c200b..85ccfb860e5 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/StormCrow.java +++ b/Mage.Sets/src/mage/sets/ninthedition/StormCrow.java @@ -28,8 +28,8 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ninthedition/StreamOfLife.java b/Mage.Sets/src/mage/sets/ninthedition/StreamOfLife.java index f5b374dc302..abe355d6846 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/StreamOfLife.java +++ b/Mage.Sets/src/mage/sets/ninthedition/StreamOfLife.java @@ -28,7 +28,7 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/ninthedition/SummerBloom.java b/Mage.Sets/src/mage/sets/ninthedition/SummerBloom.java index 28b7bb07a4c..41f46328ed9 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/SummerBloom.java +++ b/Mage.Sets/src/mage/sets/ninthedition/SummerBloom.java @@ -28,11 +28,12 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.PlayAdditionalLandsControllerEffect; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -47,7 +48,7 @@ public class SummerBloom extends CardImpl { this.color.setGreen(true); // You may play up to three additional lands this turn. - this.getSpellAbility().addEffect(new PlayAdditionalLandsControllerEffect(3, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new PlayAdditionalLandsControllerEffect(3, Duration.EndOfTurn)); } public SummerBloom(final SummerBloom card) { diff --git a/Mage.Sets/src/mage/sets/ninthedition/SwarmOfRats.java b/Mage.Sets/src/mage/sets/ninthedition/SwarmOfRats.java index b36312517bc..003a79c2c75 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/SwarmOfRats.java +++ b/Mage.Sets/src/mage/sets/ninthedition/SwarmOfRats.java @@ -28,13 +28,13 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/ninthedition/Tanglebloom.java b/Mage.Sets/src/mage/sets/ninthedition/Tanglebloom.java index b0f04f56c72..2c532e1c009 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Tanglebloom.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Tanglebloom.java @@ -28,7 +28,7 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/ninthedition/TeferisPuzzleBox.java b/Mage.Sets/src/mage/sets/ninthedition/TeferisPuzzleBox.java index 70f9d7454b4..e7084ddb7b5 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/TeferisPuzzleBox.java +++ b/Mage.Sets/src/mage/sets/ninthedition/TeferisPuzzleBox.java @@ -27,9 +27,7 @@ */ package mage.sets.ninthedition; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.BeginningOfDrawTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -59,7 +57,7 @@ public class TeferisPuzzleBox extends CardImpl { @Override public void build() { // At the beginning of each player's draw step, that player puts the cards in his or her hand on the bottom of his or her library in any order, then draws that many cards. - Ability ability = new BeginningOfDrawTriggeredAbility(new TeferisPuzzleBoxEffect(), Constants.TargetController.ANY, false); + Ability ability = new BeginningOfDrawTriggeredAbility(new TeferisPuzzleBoxEffect(), TargetController.ANY, false); this.addAbility(ability); } @@ -76,7 +74,7 @@ public class TeferisPuzzleBox extends CardImpl { class TeferisPuzzleBoxEffect extends OneShotEffect { public TeferisPuzzleBoxEffect() { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); staticText = "At the beginning of each player's draw step, that player puts the cards in his or her hand on the bottom of his or her library in any order, then draws that many cards"; } @@ -96,20 +94,20 @@ class TeferisPuzzleBoxEffect extends OneShotEffect { cards.add(card.getId()); } - TargetCard target = new TargetCard(Constants.Zone.PICK, new FilterCard("card to put on the bottom of your library")); + TargetCard target = new TargetCard(Zone.PICK, new FilterCard("card to put on the bottom of your library")); target.setRequired(true); while (cards.size() > 1) { - player.choose(Constants.Outcome.Neutral, cards, target, game); + player.choose(Outcome.Neutral, cards, target, game); Card card = cards.get(target.getFirstTarget(), game); if (card != null) { cards.remove(card); - card.moveToZone(Constants.Zone.LIBRARY, source.getId(), game, false); + card.moveToZone(Zone.LIBRARY, source.getId(), game, false); } target.clearChosen(); } if (cards.size() == 1) { Card card = cards.get(cards.iterator().next(), game); - card.moveToZone(Constants.Zone.LIBRARY, source.getId(), game, false); + card.moveToZone(Zone.LIBRARY, source.getId(), game, false); } player.getHand().clear(); diff --git a/Mage.Sets/src/mage/sets/ninthedition/TemporalAdept.java b/Mage.Sets/src/mage/sets/ninthedition/TemporalAdept.java index 830cc740d39..e1d007c195f 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/TemporalAdept.java +++ b/Mage.Sets/src/mage/sets/ninthedition/TemporalAdept.java @@ -28,9 +28,9 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetPermanent; /** @@ -57,7 +58,7 @@ public class TemporalAdept extends CardImpl { this.toughness = new MageInt(1); // {U}{U}{U}, {tap}: Return target permanent to its owner's hand. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{U}{U}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{U}{U}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/ninthedition/ThievingMagpie.java b/Mage.Sets/src/mage/sets/ninthedition/ThievingMagpie.java index 2e83e6692f6..54c8f9e5fff 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/ThievingMagpie.java +++ b/Mage.Sets/src/mage/sets/ninthedition/ThievingMagpie.java @@ -28,8 +28,8 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.DealsDamageToOpponentTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/ninthedition/ThranGolem.java b/Mage.Sets/src/mage/sets/ninthedition/ThranGolem.java index 899ae6c5e7f..327b04157db 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/ThranGolem.java +++ b/Mage.Sets/src/mage/sets/ninthedition/ThranGolem.java @@ -28,7 +28,7 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/ninthedition/TidalKraken.java b/Mage.Sets/src/mage/sets/ninthedition/TidalKraken.java index 9f9ecd821e0..b850c987ea4 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/TidalKraken.java +++ b/Mage.Sets/src/mage/sets/ninthedition/TidalKraken.java @@ -28,8 +28,8 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.UnblockableAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ninthedition/TreasureTrove.java b/Mage.Sets/src/mage/sets/ninthedition/TreasureTrove.java index caf6d5b9c83..733933e09e6 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/TreasureTrove.java +++ b/Mage.Sets/src/mage/sets/ninthedition/TreasureTrove.java @@ -28,13 +28,14 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -49,7 +50,7 @@ public class TreasureTrove extends CardImpl { this.color.setBlue(true); // {2}{U}{U}: Draw a card. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new ManaCostsImpl("{2}{U}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new ManaCostsImpl("{2}{U}{U}"))); } public TreasureTrove(final TreasureTrove card) { diff --git a/Mage.Sets/src/mage/sets/ninthedition/TreeMonkey.java b/Mage.Sets/src/mage/sets/ninthedition/TreeMonkey.java index e1c99e37ae7..4ceabf2d71d 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/TreeMonkey.java +++ b/Mage.Sets/src/mage/sets/ninthedition/TreeMonkey.java @@ -28,8 +28,8 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ninthedition/UrGolemsEye.java b/Mage.Sets/src/mage/sets/ninthedition/UrGolemsEye.java index 7ce55f820be..932b1f23b38 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/UrGolemsEye.java +++ b/Mage.Sets/src/mage/sets/ninthedition/UrGolemsEye.java @@ -28,7 +28,7 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/ninthedition/VeteranCavalier.java b/Mage.Sets/src/mage/sets/ninthedition/VeteranCavalier.java index 313c1ceb5b7..66389ce6f2a 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/VeteranCavalier.java +++ b/Mage.Sets/src/mage/sets/ninthedition/VeteranCavalier.java @@ -28,8 +28,8 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ninthedition/ViashinoSandstalker.java b/Mage.Sets/src/mage/sets/ninthedition/ViashinoSandstalker.java index 9258992ff22..b2bd30a4066 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/ViashinoSandstalker.java +++ b/Mage.Sets/src/mage/sets/ninthedition/ViashinoSandstalker.java @@ -28,15 +28,16 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -78,7 +79,7 @@ public class ViashinoSandstalker extends CardImpl { class BeginningOfEndStepTriggeredAbility extends TriggeredAbilityImpl { public BeginningOfEndStepTriggeredAbility(Effect effect, boolean optional) { - super(Constants.Zone.BATTLEFIELD, effect, optional); + super(Zone.BATTLEFIELD, effect, optional); } public BeginningOfEndStepTriggeredAbility(final BeginningOfEndStepTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/ninthedition/VolcanicHammer.java b/Mage.Sets/src/mage/sets/ninthedition/VolcanicHammer.java index fcd2ff33126..a13437b0ed6 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/VolcanicHammer.java +++ b/Mage.Sets/src/mage/sets/ninthedition/VolcanicHammer.java @@ -27,8 +27,8 @@ */ package mage.sets.ninthedition; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreatureOrPlayer; diff --git a/Mage.Sets/src/mage/sets/ninthedition/VulshokMorningstar.java b/Mage.Sets/src/mage/sets/ninthedition/VulshokMorningstar.java index 8f0fb7c8717..498b2a46ff0 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/VulshokMorningstar.java +++ b/Mage.Sets/src/mage/sets/ninthedition/VulshokMorningstar.java @@ -28,7 +28,7 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/ninthedition/WoodElves.java b/Mage.Sets/src/mage/sets/ninthedition/WoodElves.java index 177575bff56..40e5f5d7e70 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/WoodElves.java +++ b/Mage.Sets/src/mage/sets/ninthedition/WoodElves.java @@ -28,8 +28,8 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; diff --git a/Mage.Sets/src/mage/sets/ninthedition/ZodiacMonkey.java b/Mage.Sets/src/mage/sets/ninthedition/ZodiacMonkey.java index b8ff617184c..013f9b11c35 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/ZodiacMonkey.java +++ b/Mage.Sets/src/mage/sets/ninthedition/ZodiacMonkey.java @@ -28,8 +28,8 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ForestwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ninthedition/Zombify.java b/Mage.Sets/src/mage/sets/ninthedition/Zombify.java index 6be1b637e3b..754b4f86d45 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Zombify.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Zombify.java @@ -28,8 +28,8 @@ package mage.sets.ninthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreatureCard; diff --git a/Mage.Sets/src/mage/sets/odyssey/AEtherBurst.java b/Mage.Sets/src/mage/sets/odyssey/AEtherBurst.java index 7a15053f5e1..40408c6fc78 100644 --- a/Mage.Sets/src/mage/sets/odyssey/AEtherBurst.java +++ b/Mage.Sets/src/mage/sets/odyssey/AEtherBurst.java @@ -27,8 +27,8 @@ */ package mage.sets.odyssey; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.common.ReturnToHandTargetEffect; diff --git a/Mage.Sets/src/mage/sets/odyssey/CallOfTheHerd.java b/Mage.Sets/src/mage/sets/odyssey/CallOfTheHerd.java index 083516ff2a5..d34619c15f0 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CallOfTheHerd.java +++ b/Mage.Sets/src/mage/sets/odyssey/CallOfTheHerd.java @@ -28,7 +28,7 @@ package mage.sets.odyssey; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/odyssey/CarefulStudy.java b/Mage.Sets/src/mage/sets/odyssey/CarefulStudy.java index d2640acac14..a4300e5440d 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CarefulStudy.java +++ b/Mage.Sets/src/mage/sets/odyssey/CarefulStudy.java @@ -27,8 +27,8 @@ */ package mage.sets.odyssey; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DiscardControllerEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/odyssey/Concentrate.java b/Mage.Sets/src/mage/sets/odyssey/Concentrate.java index 23fef9bb307..0a16fd3cfa3 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Concentrate.java +++ b/Mage.Sets/src/mage/sets/odyssey/Concentrate.java @@ -28,8 +28,8 @@ package mage.sets.odyssey; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/odyssey/Demolish.java b/Mage.Sets/src/mage/sets/odyssey/Demolish.java index 9ccc0fb1ef7..aa9bb597590 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Demolish.java +++ b/Mage.Sets/src/mage/sets/odyssey/Demolish.java @@ -28,7 +28,7 @@ package mage.sets.odyssey; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/odyssey/Demoralize.java b/Mage.Sets/src/mage/sets/odyssey/Demoralize.java index 50632ce4db4..b2bc7609f0a 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Demoralize.java +++ b/Mage.Sets/src/mage/sets/odyssey/Demoralize.java @@ -28,15 +28,16 @@ package mage.sets.odyssey; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.condition.common.CardsInControllerGraveCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.AddContinuousEffectToGame; import mage.abilities.effects.common.CantBlockAllEffect; import mage.abilities.effects.common.continious.CantBeBlockedByOneAllEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; @@ -53,12 +54,12 @@ public class Demoralize extends CardImpl { this.color.setRed(true); // Each creature can't be blocked this turn except by two or more creatures. - this.getSpellAbility().addEffect(new CantBeBlockedByOneAllEffect(2, new FilterCreaturePermanent(), Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new CantBeBlockedByOneAllEffect(2, new FilterCreaturePermanent(), Duration.EndOfTurn)); // Threshold — If seven or more cards are in your graveyard, creatures can't block this turn. this.getSpellAbility().addEffect( new ConditionalOneShotEffect( - new AddContinuousEffectToGame(new CantBlockAllEffect(new FilterCreaturePermanent(), Constants.Duration.EndOfTurn)), + new AddContinuousEffectToGame(new CantBlockAllEffect(new FilterCreaturePermanent(), Duration.EndOfTurn)), new CardsInControllerGraveCondition(7), "

Threshold - If seven or more cards are in your graveyard, creatures can't block this turn" )); diff --git a/Mage.Sets/src/mage/sets/odyssey/DwarvenGrunt.java b/Mage.Sets/src/mage/sets/odyssey/DwarvenGrunt.java index 82b383535ac..cb6f40b38cb 100644 --- a/Mage.Sets/src/mage/sets/odyssey/DwarvenGrunt.java +++ b/Mage.Sets/src/mage/sets/odyssey/DwarvenGrunt.java @@ -28,8 +28,8 @@ package mage.sets.odyssey; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.MountainwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/odyssey/EarthRift.java b/Mage.Sets/src/mage/sets/odyssey/EarthRift.java index 7e521f8cd8b..7848955503f 100644 --- a/Mage.Sets/src/mage/sets/odyssey/EarthRift.java +++ b/Mage.Sets/src/mage/sets/odyssey/EarthRift.java @@ -28,9 +28,9 @@ package mage.sets.odyssey; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TimingRule; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TimingRule; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.FlashbackAbility; diff --git a/Mage.Sets/src/mage/sets/odyssey/Entomb.java b/Mage.Sets/src/mage/sets/odyssey/Entomb.java index e63fa9020eb..5a61b057bc3 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Entomb.java +++ b/Mage.Sets/src/mage/sets/odyssey/Entomb.java @@ -29,15 +29,17 @@ package mage.sets.odyssey; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.SearchEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.players.Player; @@ -73,7 +75,7 @@ public class Entomb extends CardImpl { class SearchLibraryPutInGraveyard extends SearchEffect { public SearchLibraryPutInGraveyard() { - super(new TargetCardInLibrary(new FilterCreatureCard()), Constants.Outcome.Neutral); + super(new TargetCardInLibrary(new FilterCreatureCard()), Outcome.Neutral); staticText = "Search your library for a card and put that card into your graveyard. Then shuffle your library"; } @@ -98,7 +100,7 @@ class SearchLibraryPutInGraveyard extends SearchEffect)target.getTargets()) { Card card = player.getLibrary().remove(cardId, game); if (card != null){ - card.moveToZone(Constants.Zone.GRAVEYARD, source.getId(), game, false); + card.moveToZone(Zone.GRAVEYARD, source.getId(), game, false); } } } diff --git a/Mage.Sets/src/mage/sets/odyssey/Halberdier.java b/Mage.Sets/src/mage/sets/odyssey/Halberdier.java index fd215c3f24a..8a3f3704eda 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Halberdier.java +++ b/Mage.Sets/src/mage/sets/odyssey/Halberdier.java @@ -28,8 +28,8 @@ package mage.sets.odyssey; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/odyssey/LeafDancer.java b/Mage.Sets/src/mage/sets/odyssey/LeafDancer.java index 5bacc240cdf..a143cdca493 100644 --- a/Mage.Sets/src/mage/sets/odyssey/LeafDancer.java +++ b/Mage.Sets/src/mage/sets/odyssey/LeafDancer.java @@ -28,8 +28,8 @@ package mage.sets.odyssey; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ForestwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/odyssey/MomentsPeace.java b/Mage.Sets/src/mage/sets/odyssey/MomentsPeace.java index c2e859b2774..7dd31aadcd2 100644 --- a/Mage.Sets/src/mage/sets/odyssey/MomentsPeace.java +++ b/Mage.Sets/src/mage/sets/odyssey/MomentsPeace.java @@ -28,13 +28,15 @@ package mage.sets.odyssey; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.PreventAllDamageEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.TimingRule; /** * @@ -49,9 +51,9 @@ public class MomentsPeace extends CardImpl { this.color.setGreen(true); // Prevent all combat damage that would be dealt this turn. - this.getSpellAbility().addEffect(new PreventAllDamageEffect(Constants.Duration.EndOfTurn, true)); + this.getSpellAbility().addEffect(new PreventAllDamageEffect(Duration.EndOfTurn, true)); // Flashback {2}{G} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{2}{G}"), Constants.TimingRule.INSTANT)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{2}{G}"), TimingRule.INSTANT)); } public MomentsPeace(final MomentsPeace card) { diff --git a/Mage.Sets/src/mage/sets/odyssey/NantukoDisciple.java b/Mage.Sets/src/mage/sets/odyssey/NantukoDisciple.java index 7a811454710..28a94227e9d 100644 --- a/Mage.Sets/src/mage/sets/odyssey/NantukoDisciple.java +++ b/Mage.Sets/src/mage/sets/odyssey/NantukoDisciple.java @@ -28,9 +28,9 @@ package mage.sets.odyssey; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +38,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -57,7 +59,7 @@ public class NantukoDisciple extends CardImpl { this.toughness = new MageInt(2); // {G}, {tap}: Target creature gets +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Constants.Duration.EndOfTurn), new ManaCostsImpl("{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/odyssey/NimbleMongoose.java b/Mage.Sets/src/mage/sets/odyssey/NimbleMongoose.java index bddd5eab4eb..4b2f8dc5600 100644 --- a/Mage.Sets/src/mage/sets/odyssey/NimbleMongoose.java +++ b/Mage.Sets/src/mage/sets/odyssey/NimbleMongoose.java @@ -28,9 +28,9 @@ package mage.sets.odyssey; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInControllerGraveCondition; @@ -38,6 +38,8 @@ import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -57,7 +59,7 @@ public class NimbleMongoose extends CardImpl { // Shroud this.addAbility(ShroudAbility.getInstance()); // Threshold - Nimble Mongoose gets +2/+2 as long as seven or more cards are in your graveyard. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostSourceEffect(2, 2, Constants.Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), "{this} gets +2/+2 as long as seven or more cards are in your graveyard"))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), "{this} gets +2/+2 as long as seven or more cards are in your graveyard"))); } public NimbleMongoose(final NimbleMongoose card) { diff --git a/Mage.Sets/src/mage/sets/odyssey/PatronWizard.java b/Mage.Sets/src/mage/sets/odyssey/PatronWizard.java index f700008c325..3a1d650ef14 100644 --- a/Mage.Sets/src/mage/sets/odyssey/PatronWizard.java +++ b/Mage.Sets/src/mage/sets/odyssey/PatronWizard.java @@ -28,9 +28,9 @@ package mage.sets.odyssey; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +38,7 @@ import mage.abilities.costs.common.TapTargetCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -69,7 +70,7 @@ public class PatronWizard extends CardImpl { this.toughness = new MageInt(2); // Tap an untapped Wizard you control: Counter target spell unless its controller pays {1}. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(1)), new TapTargetCost(new TargetControlledPermanent(filter))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(1)), new TapTargetCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetSpell()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/odyssey/RoarOfTheWurm.java b/Mage.Sets/src/mage/sets/odyssey/RoarOfTheWurm.java index 9ece438988a..6ca192b2857 100644 --- a/Mage.Sets/src/mage/sets/odyssey/RoarOfTheWurm.java +++ b/Mage.Sets/src/mage/sets/odyssey/RoarOfTheWurm.java @@ -27,13 +27,13 @@ */ package mage.sets.odyssey; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; +import mage.constants.TimingRule; import mage.game.permanent.token.WurmToken; import java.util.UUID; @@ -54,7 +54,7 @@ public class RoarOfTheWurm extends CardImpl { this.getSpellAbility().addEffect(new CreateTokenEffect(new WurmToken())); // Flashback {3}{G} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{3}{G}"), Constants.TimingRule.SORCERY)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{3}{G}"), TimingRule.SORCERY)); } public RoarOfTheWurm(final RoarOfTheWurm card) { diff --git a/Mage.Sets/src/mage/sets/odyssey/ShadowmageInfiltrator.java b/Mage.Sets/src/mage/sets/odyssey/ShadowmageInfiltrator.java index f454a066935..c1ea53d6f69 100644 --- a/Mage.Sets/src/mage/sets/odyssey/ShadowmageInfiltrator.java +++ b/Mage.Sets/src/mage/sets/odyssey/ShadowmageInfiltrator.java @@ -28,7 +28,7 @@ package mage.sets.odyssey; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/odyssey/SkeletalScrying.java b/Mage.Sets/src/mage/sets/odyssey/SkeletalScrying.java index f3a47ac2918..c658124973b 100644 --- a/Mage.Sets/src/mage/sets/odyssey/SkeletalScrying.java +++ b/Mage.Sets/src/mage/sets/odyssey/SkeletalScrying.java @@ -28,9 +28,9 @@ package mage.sets.odyssey; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.CostImpl; import mage.abilities.costs.VariableCost; @@ -40,6 +40,7 @@ import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterMana; import mage.game.Game; import mage.players.Player; @@ -101,7 +102,7 @@ class ExileXFromGraveyardCost extends CostImpl implemen Player player = game.getPlayer(controllerId); while (true) { target.clearChosen(); - if (target.canChoose(controllerId, game) && target.choose(Constants.Outcome.Exile, controllerId, sourceId, game)) { + if (target.canChoose(controllerId, game) && target.choose(Outcome.Exile, controllerId, sourceId, game)) { Card card = player.getGraveyard().get(target.getFirstTarget(), game); if (card != null) { player.getGraveyard().remove(card); @@ -159,7 +160,7 @@ class SkeletalScryingEffect extends OneShotEffect { } public SkeletalScryingEffect(DynamicValue amount) { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); this.amount = amount.copy(); staticText = "You draw " + amount + " cards and you lose " + amount + " life"; } diff --git a/Mage.Sets/src/mage/sets/odyssey/Standstill.java b/Mage.Sets/src/mage/sets/odyssey/Standstill.java index bcf126bcea8..6f5fc307548 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Standstill.java +++ b/Mage.Sets/src/mage/sets/odyssey/Standstill.java @@ -28,13 +28,15 @@ package mage.sets.odyssey; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -72,7 +74,7 @@ class SpellCastTriggeredAbility extends TriggeredAbilityImpl { public StandstillEffect() { - super(Constants.Outcome.Sacrifice); + super(Outcome.Sacrifice); staticText = "sacrifice {this}"; } diff --git a/Mage.Sets/src/mage/sets/odyssey/ThoughtDevourer.java b/Mage.Sets/src/mage/sets/odyssey/ThoughtDevourer.java index 876a5d2d244..2802cca21dc 100644 --- a/Mage.Sets/src/mage/sets/odyssey/ThoughtDevourer.java +++ b/Mage.Sets/src/mage/sets/odyssey/ThoughtDevourer.java @@ -28,10 +28,10 @@ package mage.sets.odyssey; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.MaximumHandSizeControllerEffect; diff --git a/Mage.Sets/src/mage/sets/odyssey/ThoughtEater.java b/Mage.Sets/src/mage/sets/odyssey/ThoughtEater.java index 0473ae83b46..b9b8a69506c 100644 --- a/Mage.Sets/src/mage/sets/odyssey/ThoughtEater.java +++ b/Mage.Sets/src/mage/sets/odyssey/ThoughtEater.java @@ -28,10 +28,10 @@ package mage.sets.odyssey; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.MaximumHandSizeControllerEffect; diff --git a/Mage.Sets/src/mage/sets/odyssey/ThoughtNibbler.java b/Mage.Sets/src/mage/sets/odyssey/ThoughtNibbler.java index b6e984afa42..e1c3098a789 100644 --- a/Mage.Sets/src/mage/sets/odyssey/ThoughtNibbler.java +++ b/Mage.Sets/src/mage/sets/odyssey/ThoughtNibbler.java @@ -28,10 +28,10 @@ package mage.sets.odyssey; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.MaximumHandSizeControllerEffect; diff --git a/Mage.Sets/src/mage/sets/odyssey/WildMongrel.java b/Mage.Sets/src/mage/sets/odyssey/WildMongrel.java index 412e08e6ceb..4406f031864 100644 --- a/Mage.Sets/src/mage/sets/odyssey/WildMongrel.java +++ b/Mage.Sets/src/mage/sets/odyssey/WildMongrel.java @@ -27,9 +27,7 @@ */ package mage.sets.odyssey; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -63,7 +61,7 @@ public class WildMongrel extends CardImpl { this.toughness = new MageInt(2); // Discard a card: Wild Mongrel gets +1/+1 and becomes the color of your choice until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Constants.Duration.EndOfTurn), new DiscardTargetCost(new TargetCardInHand())); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new DiscardTargetCost(new TargetCardInHand())); ability.addEffect(new ChangeColorEffect()); this.addAbility(ability); } @@ -81,7 +79,7 @@ public class WildMongrel extends CardImpl { class ChangeColorEffect extends OneShotEffect { public ChangeColorEffect() { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); staticText = "becomes the color of your choice until end of turn"; } @@ -95,9 +93,9 @@ class ChangeColorEffect extends OneShotEffect { Permanent wildMongrel = game.getPermanent(source.getSourceId()); if (player != null && wildMongrel != null) { ChoiceColor colorChoice = new ChoiceColor(); - if (player.choose(Constants.Outcome.Neutral, colorChoice, game)) { + if (player.choose(Outcome.Neutral, colorChoice, game)) { game.informPlayers(wildMongrel.getName() + ": " + player.getName() + " has chosen " + colorChoice.getChoice()); - ContinuousEffect effect = new SetCardColorTargetEffect(colorChoice.getColor(), Constants.Duration.EndOfTurn, "is " + colorChoice.getChoice()); + ContinuousEffect effect = new SetCardColorTargetEffect(colorChoice.getColor(), Duration.EndOfTurn, "is " + colorChoice.getChoice()); effect.setTargetPointer(new FixedTarget(source.getSourceId())); game.addEffect(effect, source); return true; diff --git a/Mage.Sets/src/mage/sets/odyssey/WoodlandDruid.java b/Mage.Sets/src/mage/sets/odyssey/WoodlandDruid.java index 6630fc5ad58..a586dd03743 100644 --- a/Mage.Sets/src/mage/sets/odyssey/WoodlandDruid.java +++ b/Mage.Sets/src/mage/sets/odyssey/WoodlandDruid.java @@ -28,8 +28,8 @@ package mage.sets.odyssey; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/onslaught/AnuridMurkdiver.java b/Mage.Sets/src/mage/sets/onslaught/AnuridMurkdiver.java index eace9e92dd0..ca68c0983c1 100644 --- a/Mage.Sets/src/mage/sets/onslaught/AnuridMurkdiver.java +++ b/Mage.Sets/src/mage/sets/onslaught/AnuridMurkdiver.java @@ -28,8 +28,8 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/onslaught/AstralSlide.java b/Mage.Sets/src/mage/sets/onslaught/AstralSlide.java index bcf0751f130..ffc3fdc3187 100644 --- a/Mage.Sets/src/mage/sets/onslaught/AstralSlide.java +++ b/Mage.Sets/src/mage/sets/onslaught/AstralSlide.java @@ -28,11 +28,11 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -77,7 +77,7 @@ public class AstralSlide extends CardImpl { class AstralSlideTriggeredAbility extends TriggeredAbilityImpl { public AstralSlideTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new AstralSlideEffect(), true); + super(Zone.BATTLEFIELD, new AstralSlideEffect(), true); this.addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/onslaught/BarkhideMauler.java b/Mage.Sets/src/mage/sets/onslaught/BarkhideMauler.java index 3c1c9d99ee1..d74cc5f7f44 100644 --- a/Mage.Sets/src/mage/sets/onslaught/BarkhideMauler.java +++ b/Mage.Sets/src/mage/sets/onslaught/BarkhideMauler.java @@ -28,8 +28,8 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.CyclingAbility; diff --git a/Mage.Sets/src/mage/sets/onslaught/BarrenMoor.java b/Mage.Sets/src/mage/sets/onslaught/BarrenMoor.java index f8c82ab5f0a..39525196a08 100644 --- a/Mage.Sets/src/mage/sets/onslaught/BarrenMoor.java +++ b/Mage.Sets/src/mage/sets/onslaught/BarrenMoor.java @@ -28,8 +28,8 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.CyclingAbility; diff --git a/Mage.Sets/src/mage/sets/onslaught/BloodstainedMire.java b/Mage.Sets/src/mage/sets/onslaught/BloodstainedMire.java index 5fe48858fd8..5e06c7e5c89 100644 --- a/Mage.Sets/src/mage/sets/onslaught/BloodstainedMire.java +++ b/Mage.Sets/src/mage/sets/onslaught/BloodstainedMire.java @@ -28,8 +28,8 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.FetchLandActivatedAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/onslaught/CatapultMaster.java b/Mage.Sets/src/mage/sets/onslaught/CatapultMaster.java index 7dd4c5b2148..f7464c29e85 100644 --- a/Mage.Sets/src/mage/sets/onslaught/CatapultMaster.java +++ b/Mage.Sets/src/mage/sets/onslaught/CatapultMaster.java @@ -28,15 +28,16 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -67,7 +68,7 @@ public class CatapultMaster extends CardImpl { this.toughness = new MageInt(3); // Tap five untapped Soldiers you control: Exile target creature. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ExileTargetEffect(), new TapTargetCost(new TargetControlledPermanent(5,5,filter,false))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new TapTargetCost(new TargetControlledPermanent(5,5,filter,false))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/onslaught/ChainOfVapor.java b/Mage.Sets/src/mage/sets/onslaught/ChainOfVapor.java index 8eef9647b37..008e1171cbd 100644 --- a/Mage.Sets/src/mage/sets/onslaught/ChainOfVapor.java +++ b/Mage.Sets/src/mage/sets/onslaught/ChainOfVapor.java @@ -28,14 +28,15 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -74,7 +75,7 @@ public class ChainOfVapor extends CardImpl { class ChainOfVaporEffect extends OneShotEffect { public ChainOfVaporEffect() { - super(Constants.Outcome.ReturnToHand); + super(Outcome.ReturnToHand); } public ChainOfVaporEffect(final ChainOfVaporEffect effect) { @@ -90,7 +91,7 @@ class ChainOfVaporEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Permanent permanent = game.getPermanent(source.getFirstTarget()); if (permanent != null) { - if(!permanent.moveToZone(Constants.Zone.HAND, source.getId(), game, false)){ + if(!permanent.moveToZone(Zone.HAND, source.getId(), game, false)){ return false; } diff --git a/Mage.Sets/src/mage/sets/onslaught/CruelRevival.java b/Mage.Sets/src/mage/sets/onslaught/CruelRevival.java index 76e2224911c..608527bed7b 100644 --- a/Mage.Sets/src/mage/sets/onslaught/CruelRevival.java +++ b/Mage.Sets/src/mage/sets/onslaught/CruelRevival.java @@ -28,13 +28,15 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -85,7 +87,7 @@ public class CruelRevival extends CardImpl { class CruelRevivalEffect extends OneShotEffect { public CruelRevivalEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); staticText = "Destroy target non-Zombie creature. It can't be regenerated. Return up to one target Zombie card from your graveyard to your hand"; } @@ -101,7 +103,7 @@ class CruelRevivalEffect extends OneShotEffect { targetDestroy.destroy(source.getId(), game, true); } if (targetRetrieve != null) { - targetRetrieve.moveToZone(Constants.Zone.HAND, source.getId(), game, true); + targetRetrieve.moveToZone(Zone.HAND, source.getId(), game, true); } return true; } diff --git a/Mage.Sets/src/mage/sets/onslaught/DreamChisel.java b/Mage.Sets/src/mage/sets/onslaught/DreamChisel.java index 07b214f06fe..6ffd5eeafe4 100644 --- a/Mage.Sets/src/mage/sets/onslaught/DreamChisel.java +++ b/Mage.Sets/src/mage/sets/onslaught/DreamChisel.java @@ -28,9 +28,9 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.cost.SpellsCostReductionEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/onslaught/ElvishPioneer.java b/Mage.Sets/src/mage/sets/onslaught/ElvishPioneer.java index 66cdd88340f..b1cfd671f3c 100644 --- a/Mage.Sets/src/mage/sets/onslaught/ElvishPioneer.java +++ b/Mage.Sets/src/mage/sets/onslaught/ElvishPioneer.java @@ -28,15 +28,17 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterLandCard; import mage.game.Game; import mage.game.permanent.Permanent; @@ -78,7 +80,7 @@ class PutLandOnBattlefieldEffect extends OneShotEffect { this.toughness = new MageInt(1); // {G}, {tap}, Sacrifice Elvish Scrapper: Destroy target artifact. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(new FilterArtifactPermanent())); diff --git a/Mage.Sets/src/mage/sets/onslaught/EnchantresssPresence.java b/Mage.Sets/src/mage/sets/onslaught/EnchantresssPresence.java index 0f77deca0a3..1f002c1c122 100644 --- a/Mage.Sets/src/mage/sets/onslaught/EnchantresssPresence.java +++ b/Mage.Sets/src/mage/sets/onslaught/EnchantresssPresence.java @@ -28,8 +28,8 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/onslaught/FloodedStrand.java b/Mage.Sets/src/mage/sets/onslaught/FloodedStrand.java index 3ab7cd091dd..9cea934d741 100644 --- a/Mage.Sets/src/mage/sets/onslaught/FloodedStrand.java +++ b/Mage.Sets/src/mage/sets/onslaught/FloodedStrand.java @@ -28,8 +28,8 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.FetchLandActivatedAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/onslaught/ForgottenCave.java b/Mage.Sets/src/mage/sets/onslaught/ForgottenCave.java index da71d8ae7ff..2fed165e216 100644 --- a/Mage.Sets/src/mage/sets/onslaught/ForgottenCave.java +++ b/Mage.Sets/src/mage/sets/onslaught/ForgottenCave.java @@ -28,8 +28,8 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.CyclingAbility; diff --git a/Mage.Sets/src/mage/sets/onslaught/GluttonousZombie.java b/Mage.Sets/src/mage/sets/onslaught/GluttonousZombie.java index c6b05f7b71b..4c45a32963f 100644 --- a/Mage.Sets/src/mage/sets/onslaught/GluttonousZombie.java +++ b/Mage.Sets/src/mage/sets/onslaught/GluttonousZombie.java @@ -28,8 +28,8 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/onslaught/GoblinPiledriver.java b/Mage.Sets/src/mage/sets/onslaught/GoblinPiledriver.java index 2a6fb54fe5e..d08d16df651 100644 --- a/Mage.Sets/src/mage/sets/onslaught/GoblinPiledriver.java +++ b/Mage.Sets/src/mage/sets/onslaught/GoblinPiledriver.java @@ -28,9 +28,9 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.AttacksTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/onslaught/GoblinSharpshooter.java b/Mage.Sets/src/mage/sets/onslaught/GoblinSharpshooter.java index 4661c467f9e..45fa03903c2 100644 --- a/Mage.Sets/src/mage/sets/onslaught/GoblinSharpshooter.java +++ b/Mage.Sets/src/mage/sets/onslaught/GoblinSharpshooter.java @@ -28,9 +28,9 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesCreatureTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/onslaught/Insurrection.java b/Mage.Sets/src/mage/sets/onslaught/Insurrection.java index e9d4d39ce03..736de0bdc5f 100644 --- a/Mage.Sets/src/mage/sets/onslaught/Insurrection.java +++ b/Mage.Sets/src/mage/sets/onslaught/Insurrection.java @@ -28,10 +28,10 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; @@ -39,6 +39,7 @@ import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.effects.common.continious.GainControlTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; @@ -72,7 +73,7 @@ public class Insurrection extends CardImpl { class InsurrectionEffect extends OneShotEffect { public InsurrectionEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); this.staticText = "Untap all creatures and gain control of them until end of turn. They gain haste until end of turn"; } diff --git a/Mage.Sets/src/mage/sets/onslaught/LeeryFogbeast.java b/Mage.Sets/src/mage/sets/onslaught/LeeryFogbeast.java index aaed0c2b02e..73dad9f89ed 100644 --- a/Mage.Sets/src/mage/sets/onslaught/LeeryFogbeast.java +++ b/Mage.Sets/src/mage/sets/onslaught/LeeryFogbeast.java @@ -28,13 +28,14 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BecomesBlockedTriggeredAbility; import mage.abilities.effects.common.PreventAllDamageEffect; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -52,7 +53,7 @@ public class LeeryFogbeast extends CardImpl { this.toughness = new MageInt(2); // Whenever Leery Fogbeast becomes blocked, prevent all combat damage that would be dealt this turn. - this.addAbility(new BecomesBlockedTriggeredAbility(new PreventAllDamageEffect(Constants.Duration.EndOfTurn, true), false)); + this.addAbility(new BecomesBlockedTriggeredAbility(new PreventAllDamageEffect(Duration.EndOfTurn, true), false)); } public LeeryFogbeast(final LeeryFogbeast card) { diff --git a/Mage.Sets/src/mage/sets/onslaught/LonelySandbar.java b/Mage.Sets/src/mage/sets/onslaught/LonelySandbar.java index 0d6725ccbdd..efd81bef5bc 100644 --- a/Mage.Sets/src/mage/sets/onslaught/LonelySandbar.java +++ b/Mage.Sets/src/mage/sets/onslaught/LonelySandbar.java @@ -28,8 +28,8 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.CyclingAbility; diff --git a/Mage.Sets/src/mage/sets/onslaught/NantukoHusk.java b/Mage.Sets/src/mage/sets/onslaught/NantukoHusk.java index 0b933b65e9b..9d9629d1361 100644 --- a/Mage.Sets/src/mage/sets/onslaught/NantukoHusk.java +++ b/Mage.Sets/src/mage/sets/onslaught/NantukoHusk.java @@ -28,7 +28,7 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/onslaught/PollutedDelta.java b/Mage.Sets/src/mage/sets/onslaught/PollutedDelta.java index e60e1a94fc1..ff62711b5c1 100644 --- a/Mage.Sets/src/mage/sets/onslaught/PollutedDelta.java +++ b/Mage.Sets/src/mage/sets/onslaught/PollutedDelta.java @@ -28,8 +28,8 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.FetchLandActivatedAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/onslaught/SeasClaim.java b/Mage.Sets/src/mage/sets/onslaught/SeasClaim.java index 63780dd881b..ba36cd55e8e 100644 --- a/Mage.Sets/src/mage/sets/onslaught/SeasClaim.java +++ b/Mage.Sets/src/mage/sets/onslaught/SeasClaim.java @@ -28,15 +28,17 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continious.BecomesBasicLandEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; @@ -56,11 +58,11 @@ public class SeasClaim extends CardImpl { // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Detriment)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted land is an Island. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BecomesBasicLandEnchantedEffect("Island"))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesBasicLandEnchantedEffect("Island"))); } public SeasClaim(final SeasClaim card) { diff --git a/Mage.Sets/src/mage/sets/onslaught/SecludedSteppe.java b/Mage.Sets/src/mage/sets/onslaught/SecludedSteppe.java index 4086e65da8b..8654b70618b 100644 --- a/Mage.Sets/src/mage/sets/onslaught/SecludedSteppe.java +++ b/Mage.Sets/src/mage/sets/onslaught/SecludedSteppe.java @@ -28,8 +28,8 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.CyclingAbility; diff --git a/Mage.Sets/src/mage/sets/onslaught/ShepherdOfRot.java b/Mage.Sets/src/mage/sets/onslaught/ShepherdOfRot.java index e17517f0122..2861f11ad5a 100644 --- a/Mage.Sets/src/mage/sets/onslaught/ShepherdOfRot.java +++ b/Mage.Sets/src/mage/sets/onslaught/ShepherdOfRot.java @@ -28,15 +28,16 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.LoseLifePlayersEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -65,7 +66,7 @@ public class ShepherdOfRot extends CardImpl { this.toughness = new MageInt(1); // {tap}: Each player loses 1 life for each Zombie on the battlefield. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new LoseLifePlayersEffect(new PermanentsOnBattlefieldCount(filter), rule), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifePlayersEffect(new PermanentsOnBattlefieldCount(filter), rule), new TapSourceCost())); } public ShepherdOfRot(final ShepherdOfRot card) { diff --git a/Mage.Sets/src/mage/sets/onslaught/SilklashSpider.java b/Mage.Sets/src/mage/sets/onslaught/SilklashSpider.java index 516ae41f9e6..dfeb731c218 100644 --- a/Mage.Sets/src/mage/sets/onslaught/SilklashSpider.java +++ b/Mage.Sets/src/mage/sets/onslaught/SilklashSpider.java @@ -28,9 +28,9 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/onslaught/SkirkProspector.java b/Mage.Sets/src/mage/sets/onslaught/SkirkProspector.java index 68b4a4523c3..0ab2fc052ef 100644 --- a/Mage.Sets/src/mage/sets/onslaught/SkirkProspector.java +++ b/Mage.Sets/src/mage/sets/onslaught/SkirkProspector.java @@ -28,14 +28,15 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -53,7 +54,7 @@ public class SkirkProspector extends CardImpl { this.toughness = new MageInt(1); // Sacrifice a Goblin: Add {R} to your mana pool. - this.addAbility(new SimpleManaAbility(Constants.Zone.BATTLEFIELD, Mana.RedMana, new SacrificeSourceCost())); + this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana, new SacrificeSourceCost())); } public SkirkProspector(final SkirkProspector card) { diff --git a/Mage.Sets/src/mage/sets/onslaught/SoullessOne.java b/Mage.Sets/src/mage/sets/onslaught/SoullessOne.java index dafb7586fc2..95542804880 100644 --- a/Mage.Sets/src/mage/sets/onslaught/SoullessOne.java +++ b/Mage.Sets/src/mage/sets/onslaught/SoullessOne.java @@ -28,15 +28,17 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -60,7 +62,7 @@ public class SoullessOne extends CardImpl { this.toughness = new MageInt(0); // Soulless One's power and toughness are each equal to the number of Zombies on the battlefield plus the number of Zombie cards in all graveyards. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new SetPowerToughnessSourceEffect(new SoullessOneDynamicCount(), Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SetPowerToughnessSourceEffect(new SoullessOneDynamicCount(), Duration.WhileOnBattlefield))); } public SoullessOne(final SoullessOne card) { diff --git a/Mage.Sets/src/mage/sets/onslaught/Sparksmith.java b/Mage.Sets/src/mage/sets/onslaught/Sparksmith.java index 95f7f30f493..9d6a770b4f0 100644 --- a/Mage.Sets/src/mage/sets/onslaught/Sparksmith.java +++ b/Mage.Sets/src/mage/sets/onslaught/Sparksmith.java @@ -28,9 +28,9 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,9 +39,9 @@ import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.target.common.TargetCreatureOrPlayer; import mage.target.common.TargetCreaturePermanent; /** @@ -65,7 +65,7 @@ public class Sparksmith extends CardImpl { this.toughness = new MageInt(1); // {tap}: Sparksmith deals X damage to target creature and X damage to you, where X is the number of Goblins on the battlefield. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); ability.addEffect(new DamageControllerEffect(new PermanentsOnBattlefieldCount(filter))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/onslaught/SupremeInquisitor.java b/Mage.Sets/src/mage/sets/onslaught/SupremeInquisitor.java index b0e9c4a1a78..1151d192247 100644 --- a/Mage.Sets/src/mage/sets/onslaught/SupremeInquisitor.java +++ b/Mage.Sets/src/mage/sets/onslaught/SupremeInquisitor.java @@ -29,9 +29,9 @@ package mage.sets.onslaught; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +41,8 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; @@ -76,7 +78,7 @@ public class SupremeInquisitor extends CardImpl { this.toughness = new MageInt(3); // Tap five untapped Wizards you control: Search target player's library for up to five cards and exile them. Then that player shuffles his or her library. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new SupremeInquisitorEffect(), new TapTargetCost(new TargetControlledPermanent(5, 5, filter, true))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SupremeInquisitorEffect(), new TapTargetCost(new TargetControlledPermanent(5, 5, filter, true))); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } @@ -96,7 +98,7 @@ class SupremeInquisitorEffect extends OneShotEffect { private static final FilterCard filter = new FilterCard(); public SupremeInquisitorEffect() { - super(Constants.Outcome.Exile); + super(Outcome.Exile); staticText = "Search target player's library for up to five cards and exile them. Then that player shuffles his or her library"; } @@ -117,7 +119,7 @@ class SupremeInquisitorEffect extends OneShotEffect { Cards targetLibrary = new CardsImpl(); targetLibrary.addAll(targetPlayer.getLibrary().getCardList()); TargetCardInLibrary target = new TargetCardInLibrary(0, 5, filter); - if (player.choose(Constants.Outcome.Benefit, targetLibrary, target, game)) { + if (player.choose(Outcome.Benefit, targetLibrary, target, game)) { List targetId = target.getTargets(); for (UUID targetCard : targetId) { Card card = targetPlayer.getLibrary().remove(targetCard, game); diff --git a/Mage.Sets/src/mage/sets/onslaught/Swat.java b/Mage.Sets/src/mage/sets/onslaught/Swat.java index 4a974441850..1fa890a00c4 100644 --- a/Mage.Sets/src/mage/sets/onslaught/Swat.java +++ b/Mage.Sets/src/mage/sets/onslaught/Swat.java @@ -28,8 +28,8 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.CyclingAbility; diff --git a/Mage.Sets/src/mage/sets/onslaught/SyphonMind.java b/Mage.Sets/src/mage/sets/onslaught/SyphonMind.java index be150a900f4..08c63d6ad90 100644 --- a/Mage.Sets/src/mage/sets/onslaught/SyphonMind.java +++ b/Mage.Sets/src/mage/sets/onslaught/SyphonMind.java @@ -28,13 +28,14 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInHand; @@ -69,7 +70,7 @@ public class SyphonMind extends CardImpl { class SyphonMindEffect extends OneShotEffect { public SyphonMindEffect() { - super(Constants.Outcome.Discard); + super(Outcome.Discard); this.staticText = "Each other player discards a card. You draw a card for each card discarded this way"; } @@ -92,7 +93,7 @@ class SyphonMindEffect extends OneShotEffect { Player otherPlayer = game.getPlayer(playerId); if (otherPlayer != null && otherPlayer.getHand().size() > 0) { TargetCardInHand target = new TargetCardInHand(); - if (otherPlayer.choose(Constants.Outcome.Discard, target, source.getSourceId(), game)) { + if (otherPlayer.choose(Outcome.Discard, target, source.getSourceId(), game)) { Card card = game.getCard(target.getFirstTarget()); if (card != null) { if (otherPlayer.discard(card, source, game)) { diff --git a/Mage.Sets/src/mage/sets/onslaught/TranquilThicket.java b/Mage.Sets/src/mage/sets/onslaught/TranquilThicket.java index ed5e492c8ab..bf87c31b744 100644 --- a/Mage.Sets/src/mage/sets/onslaught/TranquilThicket.java +++ b/Mage.Sets/src/mage/sets/onslaught/TranquilThicket.java @@ -28,8 +28,8 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.CyclingAbility; diff --git a/Mage.Sets/src/mage/sets/onslaught/WeatheredWayfarer.java b/Mage.Sets/src/mage/sets/onslaught/WeatheredWayfarer.java index a1dfc2fa9e5..f1b8b512cdb 100644 --- a/Mage.Sets/src/mage/sets/onslaught/WeatheredWayfarer.java +++ b/Mage.Sets/src/mage/sets/onslaught/WeatheredWayfarer.java @@ -28,9 +28,9 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/onslaught/WindsweptHeath.java b/Mage.Sets/src/mage/sets/onslaught/WindsweptHeath.java index 847b8f67d66..d7889b26915 100644 --- a/Mage.Sets/src/mage/sets/onslaught/WindsweptHeath.java +++ b/Mage.Sets/src/mage/sets/onslaught/WindsweptHeath.java @@ -28,8 +28,8 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.FetchLandActivatedAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/onslaught/WirewoodElf.java b/Mage.Sets/src/mage/sets/onslaught/WirewoodElf.java index 93e66c08194..573897753d7 100644 --- a/Mage.Sets/src/mage/sets/onslaught/WirewoodElf.java +++ b/Mage.Sets/src/mage/sets/onslaught/WirewoodElf.java @@ -28,10 +28,12 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants; + import mage.MageInt; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; /** * @@ -39,7 +41,7 @@ import mage.cards.CardImpl; */ public class WirewoodElf extends CardImpl { public WirewoodElf(UUID ownerId) { - super(ownerId, 301, "Wirewood Elf", Constants.Rarity.COMMON, new Constants.CardType[]{Constants.CardType.CREATURE}, "{1}{G}"); + super(ownerId, 301, "Wirewood Elf", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{G}"); this.expansionSetCode = "ONS"; this.subtype.add("Elf"); this.subtype.add("Druid"); diff --git a/Mage.Sets/src/mage/sets/onslaught/WirewoodLodge.java b/Mage.Sets/src/mage/sets/onslaught/WirewoodLodge.java index 1a8de975485..35581b6b8c1 100644 --- a/Mage.Sets/src/mage/sets/onslaught/WirewoodLodge.java +++ b/Mage.Sets/src/mage/sets/onslaught/WirewoodLodge.java @@ -28,9 +28,9 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.Costs; @@ -40,6 +40,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; @@ -62,7 +63,7 @@ public class WirewoodLodge extends CardImpl { Costs costs = new CostsImpl(); costs.add(new TapSourceCost()); costs.add(new ManaCostsImpl("{G}")); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new UntapTargetEffect(), costs); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), costs); TargetCreaturePermanent target = new TargetCreaturePermanent(filter); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/onslaught/WoodedFoothills.java b/Mage.Sets/src/mage/sets/onslaught/WoodedFoothills.java index 3830e9d59c3..29b88472fd3 100644 --- a/Mage.Sets/src/mage/sets/onslaught/WoodedFoothills.java +++ b/Mage.Sets/src/mage/sets/onslaught/WoodedFoothills.java @@ -28,8 +28,8 @@ package mage.sets.onslaught; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.FetchLandActivatedAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/onslaught/WordsOfWind.java b/Mage.Sets/src/mage/sets/onslaught/WordsOfWind.java index 35eda304026..d1c2da66ea9 100644 --- a/Mage.Sets/src/mage/sets/onslaught/WordsOfWind.java +++ b/Mage.Sets/src/mage/sets/onslaught/WordsOfWind.java @@ -29,16 +29,17 @@ package mage.sets.onslaught; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterControlledPermanent; import mage.game.Game; import mage.game.events.GameEvent; @@ -76,7 +77,7 @@ public class WordsOfWind extends CardImpl { class WordsOfWindEffect extends ReplacementEffectImpl { public WordsOfWindEffect() { - super(Constants.Duration.EndOfTurn, Constants.Outcome.ReturnToHand); + super(Duration.EndOfTurn, Outcome.ReturnToHand); staticText = "The next time you would draw a card this turn, each player returns a permanent he or she controls to its owner's hand instead"; } diff --git a/Mage.Sets/src/mage/sets/planarchaos/Blightspeaker.java b/Mage.Sets/src/mage/sets/planarchaos/Blightspeaker.java index b650618e4fb..0f0d331864c 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/Blightspeaker.java +++ b/Mage.Sets/src/mage/sets/planarchaos/Blightspeaker.java @@ -28,10 +28,10 @@ package mage.sets.planarchaos; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -75,7 +75,7 @@ public class Blightspeaker extends CardImpl { ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); // {4}, {tap}: Search your library for a Rebel permanent card with converted mana cost 3 or less and put it onto the battlefield. Then shuffle your library. - SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, + SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false), new ManaCostsImpl("{4}")); ability2.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/planarchaos/BoomBust.java b/Mage.Sets/src/mage/sets/planarchaos/BoomBust.java index 9d29e7f40ee..751dd906a49 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/BoomBust.java +++ b/Mage.Sets/src/mage/sets/planarchaos/BoomBust.java @@ -29,13 +29,14 @@ package mage.sets.planarchaos; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DestroyAllEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.SplitCard; +import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; @@ -51,8 +52,8 @@ public class BoomBust extends SplitCard { private static final FilterLandPermanent filter1 = new FilterLandPermanent("land you control"); private static final FilterLandPermanent filter2 = new FilterLandPermanent("land you don't control"); static { - filter1.add(new ControllerPredicate(Constants.TargetController.YOU)); - filter2.add(new ControllerPredicate(Constants.TargetController.NOT_YOU)); + filter1.add(new ControllerPredicate(TargetController.YOU)); + filter2.add(new ControllerPredicate(TargetController.NOT_YOU)); } public BoomBust(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/planarchaos/BruteForce.java b/Mage.Sets/src/mage/sets/planarchaos/BruteForce.java index 0ffa508ce18..1cf0c7af116 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/BruteForce.java +++ b/Mage.Sets/src/mage/sets/planarchaos/BruteForce.java @@ -28,9 +28,9 @@ package mage.sets.planarchaos; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/planarchaos/Calciderm.java b/Mage.Sets/src/mage/sets/planarchaos/Calciderm.java index d6654b588a0..1a9e9161fa0 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/Calciderm.java +++ b/Mage.Sets/src/mage/sets/planarchaos/Calciderm.java @@ -28,8 +28,8 @@ package mage.sets.planarchaos; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/planarchaos/CitanulWoodreaders.java b/Mage.Sets/src/mage/sets/planarchaos/CitanulWoodreaders.java index d4ba95d1787..f4646528541 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/CitanulWoodreaders.java +++ b/Mage.Sets/src/mage/sets/planarchaos/CitanulWoodreaders.java @@ -28,8 +28,8 @@ package mage.sets.planarchaos; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; diff --git a/Mage.Sets/src/mage/sets/planarchaos/CrovaxAscendantHero.java b/Mage.Sets/src/mage/sets/planarchaos/CrovaxAscendantHero.java index b6d3bb0df8c..e88166d265b 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/CrovaxAscendantHero.java +++ b/Mage.Sets/src/mage/sets/planarchaos/CrovaxAscendantHero.java @@ -29,9 +29,8 @@ package mage.sets.planarchaos; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.abilities.costs.common.PayLifeCost; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; @@ -68,11 +69,11 @@ public class CrovaxAscendantHero extends CardImpl { this.toughness = new MageInt(4); // Other white creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Constants.Duration.WhileOnBattlefield, filter1, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter1, true))); // Nonwhite creatures get -1/-1. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostAllEffect(-1, -1, Constants.Duration.WhileOnBattlefield, filter2, false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(-1, -1, Duration.WhileOnBattlefield, filter2, false))); // Pay 2 life: Return Crovax, Ascendant Hero to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new PayLifeCost(2))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new PayLifeCost(2))); } public CrovaxAscendantHero(final CrovaxAscendantHero card) { diff --git a/Mage.Sets/src/mage/sets/planarchaos/Damnation.java b/Mage.Sets/src/mage/sets/planarchaos/Damnation.java index 077bc22b37b..45c72913580 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/Damnation.java +++ b/Mage.Sets/src/mage/sets/planarchaos/Damnation.java @@ -28,8 +28,8 @@ package mage.sets.planarchaos; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/planarchaos/DawnCharm.java b/Mage.Sets/src/mage/sets/planarchaos/DawnCharm.java index 8cb9642ed83..7987c282cb9 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/DawnCharm.java +++ b/Mage.Sets/src/mage/sets/planarchaos/DawnCharm.java @@ -28,9 +28,9 @@ package mage.sets.planarchaos; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.Mode; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.PreventAllDamageEffect; diff --git a/Mage.Sets/src/mage/sets/planarchaos/DuneriderOutlaw.java b/Mage.Sets/src/mage/sets/planarchaos/DuneriderOutlaw.java index 24a9a94d632..b742ff5c3eb 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/DuneriderOutlaw.java +++ b/Mage.Sets/src/mage/sets/planarchaos/DuneriderOutlaw.java @@ -28,8 +28,8 @@ package mage.sets.planarchaos; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.TriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/planarchaos/ErraticMutation.java b/Mage.Sets/src/mage/sets/planarchaos/ErraticMutation.java index 445bb078631..60c2c48700b 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/ErraticMutation.java +++ b/Mage.Sets/src/mage/sets/planarchaos/ErraticMutation.java @@ -28,10 +28,10 @@ package mage.sets.planarchaos; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/planarchaos/EssenceWarden.java b/Mage.Sets/src/mage/sets/planarchaos/EssenceWarden.java index 70f3939d2e6..464f6f14ba8 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/EssenceWarden.java +++ b/Mage.Sets/src/mage/sets/planarchaos/EssenceWarden.java @@ -28,9 +28,9 @@ package mage.sets.planarchaos; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/planarchaos/Extirpate.java b/Mage.Sets/src/mage/sets/planarchaos/Extirpate.java index 7c61f237685..18fb7450a33 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/Extirpate.java +++ b/Mage.Sets/src/mage/sets/planarchaos/Extirpate.java @@ -29,10 +29,10 @@ package mage.sets.planarchaos; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.SplitSecondAbility; diff --git a/Mage.Sets/src/mage/sets/planarchaos/FatalFrenzy.java b/Mage.Sets/src/mage/sets/planarchaos/FatalFrenzy.java index 4a8f0c4a08c..d5963997ead 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/FatalFrenzy.java +++ b/Mage.Sets/src/mage/sets/planarchaos/FatalFrenzy.java @@ -28,10 +28,10 @@ package mage.sets.planarchaos; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.delayed.AtEndOfTurnDelayedTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/planarchaos/GiantDustwasp.java b/Mage.Sets/src/mage/sets/planarchaos/GiantDustwasp.java index 43bc88b15ba..9f98c8408d3 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/GiantDustwasp.java +++ b/Mage.Sets/src/mage/sets/planarchaos/GiantDustwasp.java @@ -28,8 +28,8 @@ package mage.sets.planarchaos; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/planarchaos/Harmonize.java b/Mage.Sets/src/mage/sets/planarchaos/Harmonize.java index 71a703a07ea..a1c1d943491 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/Harmonize.java +++ b/Mage.Sets/src/mage/sets/planarchaos/Harmonize.java @@ -28,8 +28,8 @@ package mage.sets.planarchaos; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/planarchaos/KeldonMarauders.java b/Mage.Sets/src/mage/sets/planarchaos/KeldonMarauders.java index c8ff051c69f..e722a5a2f9d 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/KeldonMarauders.java +++ b/Mage.Sets/src/mage/sets/planarchaos/KeldonMarauders.java @@ -28,8 +28,8 @@ package mage.sets.planarchaos; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; diff --git a/Mage.Sets/src/mage/sets/planarchaos/MagusOfTheTabernacle.java b/Mage.Sets/src/mage/sets/planarchaos/MagusOfTheTabernacle.java index 5422942c841..7dac95556f4 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/MagusOfTheTabernacle.java +++ b/Mage.Sets/src/mage/sets/planarchaos/MagusOfTheTabernacle.java @@ -28,11 +28,11 @@ package mage.sets.planarchaos; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/planarchaos/ManaTithe.java b/Mage.Sets/src/mage/sets/planarchaos/ManaTithe.java index db5eff69548..3b7df7ed092 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/ManaTithe.java +++ b/Mage.Sets/src/mage/sets/planarchaos/ManaTithe.java @@ -28,8 +28,8 @@ package mage.sets.planarchaos; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/planarchaos/NeedlepeakSpider.java b/Mage.Sets/src/mage/sets/planarchaos/NeedlepeakSpider.java index 1dea05f5afc..5edd5c4bfe9 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/NeedlepeakSpider.java +++ b/Mage.Sets/src/mage/sets/planarchaos/NeedlepeakSpider.java @@ -28,8 +28,8 @@ package mage.sets.planarchaos; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/planarchaos/PallidMycoderm.java b/Mage.Sets/src/mage/sets/planarchaos/PallidMycoderm.java index ff03945524d..e095dc599cb 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/PallidMycoderm.java +++ b/Mage.Sets/src/mage/sets/planarchaos/PallidMycoderm.java @@ -28,12 +28,12 @@ package mage.sets.planarchaos; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -61,7 +61,7 @@ public class PallidMycoderm extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Each creature you control that's a Fungus or a Saproling"); private static final FilterControlledCreaturePermanent filterSaproling = new FilterControlledCreaturePermanent("Saproling"); static { - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(Predicates.or(new SubtypePredicate("Fungus"), new SubtypePredicate("Saproling"))); filterSaproling.add(new SubtypePredicate("Saproling")); } diff --git a/Mage.Sets/src/mage/sets/planarchaos/RathiTrapper.java b/Mage.Sets/src/mage/sets/planarchaos/RathiTrapper.java index 48acbd03932..7a55cb292ea 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/RathiTrapper.java +++ b/Mage.Sets/src/mage/sets/planarchaos/RathiTrapper.java @@ -28,9 +28,9 @@ package mage.sets.planarchaos; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/planarchaos/RecklessWurm.java b/Mage.Sets/src/mage/sets/planarchaos/RecklessWurm.java index faf4c7ac58a..94dbb6fd261 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/RecklessWurm.java +++ b/Mage.Sets/src/mage/sets/planarchaos/RecklessWurm.java @@ -27,8 +27,8 @@ */ package mage.sets.planarchaos; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.MadnessAbility; diff --git a/Mage.Sets/src/mage/sets/planarchaos/Saltblast.java b/Mage.Sets/src/mage/sets/planarchaos/Saltblast.java index 88800edcbac..28242a6425e 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/Saltblast.java +++ b/Mage.Sets/src/mage/sets/planarchaos/Saltblast.java @@ -28,8 +28,8 @@ package mage.sets.planarchaos; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/planarchaos/SaltfieldRecluse.java b/Mage.Sets/src/mage/sets/planarchaos/SaltfieldRecluse.java index decbad84ff7..09f41a34c96 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/SaltfieldRecluse.java +++ b/Mage.Sets/src/mage/sets/planarchaos/SaltfieldRecluse.java @@ -28,10 +28,10 @@ package mage.sets.planarchaos; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/planarchaos/SealOfPrimordium.java b/Mage.Sets/src/mage/sets/planarchaos/SealOfPrimordium.java index 3fc73099708..9fcf084a7c1 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/SealOfPrimordium.java +++ b/Mage.Sets/src/mage/sets/planarchaos/SealOfPrimordium.java @@ -28,14 +28,15 @@ package mage.sets.planarchaos; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -62,7 +63,7 @@ public class SealOfPrimordium extends CardImpl { this.color.setGreen(true); // Sacrifice Seal of Primordium: Destroy target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planarchaos/SerraSphinx.java b/Mage.Sets/src/mage/sets/planarchaos/SerraSphinx.java index 17b0168f1fc..400ccced27c 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/SerraSphinx.java +++ b/Mage.Sets/src/mage/sets/planarchaos/SerraSphinx.java @@ -28,8 +28,8 @@ package mage.sets.planarchaos; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; diff --git a/Mage.Sets/src/mage/sets/planarchaos/SimianSpiritGuide.java b/Mage.Sets/src/mage/sets/planarchaos/SimianSpiritGuide.java index c4fc6fe9326..63fe6a5bffa 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/SimianSpiritGuide.java +++ b/Mage.Sets/src/mage/sets/planarchaos/SimianSpiritGuide.java @@ -28,9 +28,9 @@ package mage.sets.planarchaos; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -39,6 +39,7 @@ import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.mana.SimpleManaAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; @@ -59,7 +60,7 @@ public class SimianSpiritGuide extends CardImpl { this.toughness = new MageInt(2); // Exile Simian Spirit Guide from your hand: Add {R} to your mana pool. - this.addAbility(new SimpleManaAbility(Constants.Zone.HAND, new BasicManaEffect(Mana.RedMana), new ExileSourceFromHandCost())); + this.addAbility(new SimpleManaAbility(Zone.HAND, new BasicManaEffect(Mana.RedMana), new ExileSourceFromHandCost())); } public SimianSpiritGuide(final SimianSpiritGuide card) { diff --git a/Mage.Sets/src/mage/sets/planarchaos/Stingscourger.java b/Mage.Sets/src/mage/sets/planarchaos/Stingscourger.java index 99e7dc60ee7..0897d010c3b 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/Stingscourger.java +++ b/Mage.Sets/src/mage/sets/planarchaos/Stingscourger.java @@ -28,9 +28,9 @@ package mage.sets.planarchaos; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/planarchaos/SulfurElemental.java b/Mage.Sets/src/mage/sets/planarchaos/SulfurElemental.java index e4182412747..4167a33c865 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/SulfurElemental.java +++ b/Mage.Sets/src/mage/sets/planarchaos/SulfurElemental.java @@ -28,10 +28,10 @@ package mage.sets.planarchaos; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/planarchaos/Sunlance.java b/Mage.Sets/src/mage/sets/planarchaos/Sunlance.java index 32d8422d3ca..21b2965c1f3 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/Sunlance.java +++ b/Mage.Sets/src/mage/sets/planarchaos/Sunlance.java @@ -28,8 +28,8 @@ package mage.sets.planarchaos; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/planarchaos/UrborgTombOfYawgmoth.java b/Mage.Sets/src/mage/sets/planarchaos/UrborgTombOfYawgmoth.java index e42649fc2b8..c6016ef299c 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/UrborgTombOfYawgmoth.java +++ b/Mage.Sets/src/mage/sets/planarchaos/UrborgTombOfYawgmoth.java @@ -28,9 +28,8 @@ package mage.sets.planarchaos; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; @@ -53,8 +52,8 @@ public class UrborgTombOfYawgmoth extends CardImpl { this.supertype.add("Legendary"); // Each land is a Swamp in addition to its other land types. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAllEffect(new BlackManaAbility(), Constants.Duration.WhileOnBattlefield, new FilterLandPermanent(),""))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new AddCardSubtypeAllEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new BlackManaAbility(), Duration.WhileOnBattlefield, new FilterLandPermanent(),""))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AddCardSubtypeAllEffect())); } @@ -74,7 +73,7 @@ class AddCardSubtypeAllEffect extends ContinuousEffectImpl { // As Voidstone Gargoyle enters the battlefield, name a nonland card. this.addAbility(new AsEntersBattlefieldAbility(new VoidstoneGargoyleChooseCardEffect())); // The named card can't be cast. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new VoidstoneGargoyleReplacementEffect1())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new VoidstoneGargoyleReplacementEffect1())); // Activated abilities of sources with the chosen name can't be activated. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new VoidstoneGargoyleReplacementEffect2())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new VoidstoneGargoyleReplacementEffect2())); } public VoidstoneGargoyle(final VoidstoneGargoyle card) { @@ -85,7 +84,7 @@ public class VoidstoneGargoyle extends CardImpl { class VoidstoneGargoyleChooseCardEffect extends OneShotEffect { public VoidstoneGargoyleChooseCardEffect() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); staticText = "name a nonland card"; } @@ -100,7 +99,7 @@ class VoidstoneGargoyleChooseCardEffect extends OneShotEffect { public VoidstoneGargoyleReplacementEffect1() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Detriment); + super(Duration.WhileOnBattlefield, Outcome.Detriment); staticText = "The named card can't be cast"; } @@ -159,7 +158,7 @@ class VoidstoneGargoyleReplacementEffect1 extends ReplacementEffectImpl { public VoidstoneGargoyleReplacementEffect2() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Detriment); + super(Duration.WhileOnBattlefield, Outcome.Detriment); staticText = "Activated abilities of sources with the chosen name can't be activated."; } diff --git a/Mage.Sets/src/mage/sets/planechase/AkromasVengeance.java b/Mage.Sets/src/mage/sets/planechase/AkromasVengeance.java index 5cb5ac756a9..f151f664821 100644 --- a/Mage.Sets/src/mage/sets/planechase/AkromasVengeance.java +++ b/Mage.Sets/src/mage/sets/planechase/AkromasVengeance.java @@ -29,14 +29,14 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.CyclingAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -79,7 +79,7 @@ class AkromasVengeanceEffect extends OneShotEffect { } public AkromasVengeanceEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); staticText = "Destroy all artifacts, creatures, and enchantments"; } diff --git a/Mage.Sets/src/mage/sets/planechase/AscendantEvincar.java b/Mage.Sets/src/mage/sets/planechase/AscendantEvincar.java index a57d48e7b6e..3c2ed6cd41c 100644 --- a/Mage.Sets/src/mage/sets/planechase/AscendantEvincar.java +++ b/Mage.Sets/src/mage/sets/planechase/AscendantEvincar.java @@ -29,15 +29,16 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; @@ -65,8 +66,8 @@ public class AscendantEvincar extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Constants.Duration.WhileOnBattlefield, filterBlack, true))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostAllEffect(-1, -1, Constants.Duration.WhileOnBattlefield, filterNonBlack, false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterBlack, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(-1, -1, Duration.WhileOnBattlefield, filterNonBlack, false))); } public AscendantEvincar(final AscendantEvincar card) { diff --git a/Mage.Sets/src/mage/sets/planechase/BeaconOfUnrest.java b/Mage.Sets/src/mage/sets/planechase/BeaconOfUnrest.java index b0f7588d177..ca6edc35254 100644 --- a/Mage.Sets/src/mage/sets/planechase/BeaconOfUnrest.java +++ b/Mage.Sets/src/mage/sets/planechase/BeaconOfUnrest.java @@ -28,8 +28,8 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.abilities.effects.common.ShuffleSpellEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/planechase/Blaze.java b/Mage.Sets/src/mage/sets/planechase/Blaze.java index f321f0187c1..6678e3a3b5d 100644 --- a/Mage.Sets/src/mage/sets/planechase/Blaze.java +++ b/Mage.Sets/src/mage/sets/planechase/Blaze.java @@ -28,8 +28,8 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/planechase/BogardanFirefiend.java b/Mage.Sets/src/mage/sets/planechase/BogardanFirefiend.java index c00afaa1b0f..9e60ba227f7 100644 --- a/Mage.Sets/src/mage/sets/planechase/BogardanFirefiend.java +++ b/Mage.Sets/src/mage/sets/planechase/BogardanFirefiend.java @@ -28,8 +28,8 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/planechase/BogardanRager.java b/Mage.Sets/src/mage/sets/planechase/BogardanRager.java index b441e379971..c2b11ce8dae 100644 --- a/Mage.Sets/src/mage/sets/planechase/BogardanRager.java +++ b/Mage.Sets/src/mage/sets/planechase/BogardanRager.java @@ -29,15 +29,15 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -54,7 +54,7 @@ public class BogardanRager extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(4); this.addAbility(FlashAbility.getInstance()); - Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(4, 0, Constants.Duration.EndOfTurn), false); + Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(4, 0, Duration.EndOfTurn), false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planechase/BorosGarrison.java b/Mage.Sets/src/mage/sets/planechase/BorosGarrison.java index 03819d436e9..c34d6551e0f 100644 --- a/Mage.Sets/src/mage/sets/planechase/BorosGarrison.java +++ b/Mage.Sets/src/mage/sets/planechase/BorosGarrison.java @@ -28,9 +28,9 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; diff --git a/Mage.Sets/src/mage/sets/planechase/BorosSwiftblade.java b/Mage.Sets/src/mage/sets/planechase/BorosSwiftblade.java index 67f5cb16a32..fa96742ec77 100644 --- a/Mage.Sets/src/mage/sets/planechase/BorosSwiftblade.java +++ b/Mage.Sets/src/mage/sets/planechase/BorosSwiftblade.java @@ -28,8 +28,8 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DoubleStrikeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/planechase/BoshIronGolem.java b/Mage.Sets/src/mage/sets/planechase/BoshIronGolem.java index a6bca4e488d..f62c6aa3b14 100644 --- a/Mage.Sets/src/mage/sets/planechase/BoshIronGolem.java +++ b/Mage.Sets/src/mage/sets/planechase/BoshIronGolem.java @@ -28,9 +28,9 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +40,8 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; @@ -73,7 +75,7 @@ public class BoshIronGolem extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // {3}{R}, Sacrifice an artifact: Bosh, Iron Golem deals damage equal to the sacrificed artifact's converted mana cost to target creature or player. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoshIronGolemEffect(), new ManaCostsImpl("{3}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoshIronGolemEffect(), new ManaCostsImpl("{3}{R}")); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); @@ -92,7 +94,7 @@ public class BoshIronGolem extends CardImpl { class BoshIronGolemEffect extends OneShotEffect { public BoshIronGolemEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "{this} deals damage equal to the sacrificed artifact's converted mana cost to target creature or player"; } diff --git a/Mage.Sets/src/mage/sets/planechase/Briarhorn.java b/Mage.Sets/src/mage/sets/planechase/Briarhorn.java index b8e08e34969..7e7088142c2 100644 --- a/Mage.Sets/src/mage/sets/planechase/Briarhorn.java +++ b/Mage.Sets/src/mage/sets/planechase/Briarhorn.java @@ -28,9 +28,9 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/planechase/Broodstar.java b/Mage.Sets/src/mage/sets/planechase/Broodstar.java index 553fd7e4b22..dfd6436d83e 100644 --- a/Mage.Sets/src/mage/sets/planechase/Broodstar.java +++ b/Mage.Sets/src/mage/sets/planechase/Broodstar.java @@ -29,9 +29,8 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -39,6 +38,8 @@ import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect; import mage.abilities.keyword.AffinityForArtifactsAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -66,7 +67,7 @@ public class Broodstar extends CardImpl { this.addAbility(new AffinityForArtifactsAbility()); this.addAbility(FlyingAbility.getInstance()); // Broodstar's power and toughness are each equal to the number of artifacts you control. - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Constants.Duration.EndOfGame))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Duration.EndOfGame))); } public Broodstar(final Broodstar card) { diff --git a/Mage.Sets/src/mage/sets/planechase/CabalCoffers.java b/Mage.Sets/src/mage/sets/planechase/CabalCoffers.java index 9001e47b9d2..8409154ec12 100644 --- a/Mage.Sets/src/mage/sets/planechase/CabalCoffers.java +++ b/Mage.Sets/src/mage/sets/planechase/CabalCoffers.java @@ -28,9 +28,9 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/planechase/CadaverousKnight.java b/Mage.Sets/src/mage/sets/planechase/CadaverousKnight.java index 60a9f4e8cae..063e206000c 100644 --- a/Mage.Sets/src/mage/sets/planechase/CadaverousKnight.java +++ b/Mage.Sets/src/mage/sets/planechase/CadaverousKnight.java @@ -28,15 +28,16 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.FlankingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -57,7 +58,7 @@ public class CadaverousKnight extends CardImpl { // Flanking this.addAbility(new FlankingAbility()); // {1}{B}{B}: Regenerate Cadaverous Knight. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}{B}"))); } public CadaverousKnight(final CadaverousKnight card) { diff --git a/Mage.Sets/src/mage/sets/planechase/CorpseHarvester.java b/Mage.Sets/src/mage/sets/planechase/CorpseHarvester.java index 0768a5abba2..f265b2846fd 100644 --- a/Mage.Sets/src/mage/sets/planechase/CorpseHarvester.java +++ b/Mage.Sets/src/mage/sets/planechase/CorpseHarvester.java @@ -28,10 +28,10 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +43,7 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -94,7 +95,7 @@ public class CorpseHarvester extends CardImpl { class CorpseHarvesterEffect extends OneShotEffect { CorpseHarvesterEffect() { - super(Constants.Outcome.DrawCard); + super(Outcome.DrawCard); staticText = "Search your library for a Zombie card and a Swamp card, reveal them, and put them into your hand. Then shuffle your library"; } @@ -123,7 +124,7 @@ class CorpseHarvesterEffect extends OneShotEffect { if (player.searchLibrary(target, game)) { Card card = player.getLibrary().remove(target.getFirstTarget(), game); if (card != null) { - card.moveToZone(Constants.Zone.HAND, source.getId(), game, false); + card.moveToZone(Zone.HAND, source.getId(), game, false); cards.add(card); } } diff --git a/Mage.Sets/src/mage/sets/planechase/CranialPlating.java b/Mage.Sets/src/mage/sets/planechase/CranialPlating.java index b13e9a27ed3..b6a262dfeea 100644 --- a/Mage.Sets/src/mage/sets/planechase/CranialPlating.java +++ b/Mage.Sets/src/mage/sets/planechase/CranialPlating.java @@ -29,9 +29,8 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +42,8 @@ import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -64,13 +65,13 @@ public class CranialPlating extends CardImpl { this.subtype.add("Equipment"); // Equipped creature gets +1/+0 for each artifact you control. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(new PermanentsOnBattlefieldCount(filterCounted), new StaticValue(0)))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(new PermanentsOnBattlefieldCount(filterCounted), new StaticValue(0)))); // {B}{B}: Attach Cranial Plating to target creature you control. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AttachEffect(Constants.Outcome.BoostCreature, "Attach {this} to target creature you control"), new ManaCostsImpl("{B}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttachEffect(Outcome.BoostCreature, "Attach {this} to target creature you control"), new ManaCostsImpl("{B}{B}")); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); // Equip {1} - this.addAbility(new EquipAbility(Constants.Outcome.BoostCreature, new GenericManaCost(1))); + this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(1))); } public CranialPlating(final CranialPlating card) { diff --git a/Mage.Sets/src/mage/sets/planechase/DarkRitual.java b/Mage.Sets/src/mage/sets/planechase/DarkRitual.java index d88b382db72..177d9e3fcee 100644 --- a/Mage.Sets/src/mage/sets/planechase/DarkRitual.java +++ b/Mage.Sets/src/mage/sets/planechase/DarkRitual.java @@ -28,8 +28,8 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.effects.common.BasicManaEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/planechase/DoorToNothingness.java b/Mage.Sets/src/mage/sets/planechase/DoorToNothingness.java index 409494bb44f..f071bf9407a 100644 --- a/Mage.Sets/src/mage/sets/planechase/DoorToNothingness.java +++ b/Mage.Sets/src/mage/sets/planechase/DoorToNothingness.java @@ -28,9 +28,9 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +39,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; @@ -57,7 +59,7 @@ public class DoorToNothingness extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); // {W}{W}{U}{U}{B}{B}{R}{R}{G}{G}, {tap}, Sacrifice Door to Nothingness: Target player loses the game. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DoorToNothingnessEffect(), new ManaCostsImpl("{W}{W}{U}{U}{B}{B}{R}{R}{G}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DoorToNothingnessEffect(), new ManaCostsImpl("{W}{W}{U}{U}{B}{B}{R}{R}{G}{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPlayer()); @@ -77,7 +79,7 @@ public class DoorToNothingness extends CardImpl { class DoorToNothingnessEffect extends OneShotEffect { public DoorToNothingnessEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); this.staticText = "Target player loses the game"; } diff --git a/Mage.Sets/src/mage/sets/planechase/EtchedOracle.java b/Mage.Sets/src/mage/sets/planechase/EtchedOracle.java index 0ad7a156218..c8344b5bf98 100644 --- a/Mage.Sets/src/mage/sets/planechase/EtchedOracle.java +++ b/Mage.Sets/src/mage/sets/planechase/EtchedOracle.java @@ -28,9 +28,9 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +39,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.keyword.SunburstAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.target.TargetPlayer; @@ -58,7 +59,7 @@ public class EtchedOracle extends CardImpl { // Sunburst this.addAbility(new SunburstAbility()); // {1}, Remove four +1/+1 counters from Etched Oracle: Target player draws three cards. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardTargetEffect(3), new ManaCostsImpl("{1}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardTargetEffect(3), new ManaCostsImpl("{1}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(4))); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/planechase/ExplosiveVegetation.java b/Mage.Sets/src/mage/sets/planechase/ExplosiveVegetation.java index b7207a60992..681fa11d41e 100644 --- a/Mage.Sets/src/mage/sets/planechase/ExplosiveVegetation.java +++ b/Mage.Sets/src/mage/sets/planechase/ExplosiveVegetation.java @@ -28,8 +28,8 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.filter.common.FilterBasicLandCard; diff --git a/Mage.Sets/src/mage/sets/planechase/FesteringGoblin.java b/Mage.Sets/src/mage/sets/planechase/FesteringGoblin.java index b50b0559808..947b10d9152 100644 --- a/Mage.Sets/src/mage/sets/planechase/FesteringGoblin.java +++ b/Mage.Sets/src/mage/sets/planechase/FesteringGoblin.java @@ -29,14 +29,14 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -53,7 +53,7 @@ public class FesteringGoblin extends CardImpl { this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new DiesTriggeredAbility(new BoostTargetEffect(-1, -1, Constants.Duration.EndOfTurn), false); + Ability ability = new DiesTriggeredAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn), false); ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planechase/FiresOfYavimaya.java b/Mage.Sets/src/mage/sets/planechase/FiresOfYavimaya.java index 1604c0f603b..3532f807f9a 100644 --- a/Mage.Sets/src/mage/sets/planechase/FiresOfYavimaya.java +++ b/Mage.Sets/src/mage/sets/planechase/FiresOfYavimaya.java @@ -29,9 +29,7 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -53,7 +51,7 @@ public class FiresOfYavimaya extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Creatures you control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public FiresOfYavimaya(UUID ownerId) { @@ -61,8 +59,8 @@ public class FiresOfYavimaya extends CardImpl { this.expansionSetCode = "HOP"; this.color.setRed(true); this.color.setGreen(true); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Constants.Duration.WhileOnBattlefield, filter, false))); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Constants.Duration.EndOfTurn), new SacrificeSourceCost()); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planechase/FlamekinHarbinger.java b/Mage.Sets/src/mage/sets/planechase/FlamekinHarbinger.java index b918a3f3e1e..0e6fb730d70 100644 --- a/Mage.Sets/src/mage/sets/planechase/FlamekinHarbinger.java +++ b/Mage.Sets/src/mage/sets/planechase/FlamekinHarbinger.java @@ -28,8 +28,8 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutOnLibraryEffect; diff --git a/Mage.Sets/src/mage/sets/planechase/FlametongueKavu.java b/Mage.Sets/src/mage/sets/planechase/FlametongueKavu.java index 424e38318b8..dab1338685a 100644 --- a/Mage.Sets/src/mage/sets/planechase/FlametongueKavu.java +++ b/Mage.Sets/src/mage/sets/planechase/FlametongueKavu.java @@ -28,8 +28,8 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/planechase/GruulTurf.java b/Mage.Sets/src/mage/sets/planechase/GruulTurf.java index 94b8309a948..2f8a2a01cbc 100644 --- a/Mage.Sets/src/mage/sets/planechase/GruulTurf.java +++ b/Mage.Sets/src/mage/sets/planechase/GruulTurf.java @@ -28,9 +28,9 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; @@ -39,6 +39,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.target.Target; @@ -60,7 +61,7 @@ public class GruulTurf extends CardImpl { target.setRequired(true); ability.addTarget(target); this.addAbility(ability); - this.addAbility(new SimpleManaAbility(Constants.Zone.BATTLEFIELD, new Mana(1, 1, 0, 0, 0, 0, 0), new TapSourceCost())); + this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(1, 1, 0, 0, 0, 0, 0), new TapSourceCost())); } public GruulTurf(final GruulTurf card) { diff --git a/Mage.Sets/src/mage/sets/planechase/Helldozer.java b/Mage.Sets/src/mage/sets/planechase/Helldozer.java index f5c8cfd89cd..02016e3d3fb 100644 --- a/Mage.Sets/src/mage/sets/planechase/Helldozer.java +++ b/Mage.Sets/src/mage/sets/planechase/Helldozer.java @@ -28,10 +28,10 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +39,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetLandPermanent; @@ -60,7 +61,7 @@ public class Helldozer extends CardImpl { this.toughness = new MageInt(5); // {B}{B}{B}, {tap}: Destroy target land. If that land was nonbasic, untap Helldozer. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new HelldozerEffect(), new ManaCostsImpl("{B}{B}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HelldozerEffect(), new ManaCostsImpl("{B}{B}{B}")); ability.addTarget(new TargetLandPermanent()); ability.addCost(new TapSourceCost()); this.addAbility(ability); @@ -80,7 +81,7 @@ public class Helldozer extends CardImpl { class HelldozerEffect extends OneShotEffect { public HelldozerEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); this.staticText = "Destroy target land. If that land was nonbasic, untap Helldozer"; } diff --git a/Mage.Sets/src/mage/sets/planechase/InnocentBlood.java b/Mage.Sets/src/mage/sets/planechase/InnocentBlood.java index c0b6f8d0b2d..2ca99e8c50c 100644 --- a/Mage.Sets/src/mage/sets/planechase/InnocentBlood.java +++ b/Mage.Sets/src/mage/sets/planechase/InnocentBlood.java @@ -28,8 +28,8 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.SacrificeAllEffect; import mage.cards.CardImpl; import mage.filter.common.FilterControlledCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/planechase/KeldonChampion.java b/Mage.Sets/src/mage/sets/planechase/KeldonChampion.java index f9794272326..63b5307c4a3 100644 --- a/Mage.Sets/src/mage/sets/planechase/KeldonChampion.java +++ b/Mage.Sets/src/mage/sets/planechase/KeldonChampion.java @@ -28,8 +28,8 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/planechase/LodestoneMyr.java b/Mage.Sets/src/mage/sets/planechase/LodestoneMyr.java index 2de5d03c1c1..2fabed28f68 100644 --- a/Mage.Sets/src/mage/sets/planechase/LodestoneMyr.java +++ b/Mage.Sets/src/mage/sets/planechase/LodestoneMyr.java @@ -29,10 +29,10 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; @@ -41,7 +41,6 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.filter.common.FilterControlledArtifactPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; diff --git a/Mage.Sets/src/mage/sets/planechase/LoxodonWarhammer.java b/Mage.Sets/src/mage/sets/planechase/LoxodonWarhammer.java index d0846ffad12..082b6ff7f6c 100644 --- a/Mage.Sets/src/mage/sets/planechase/LoxodonWarhammer.java +++ b/Mage.Sets/src/mage/sets/planechase/LoxodonWarhammer.java @@ -29,9 +29,7 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; @@ -51,10 +49,10 @@ public class LoxodonWarhammer extends CardImpl { super(ownerId, 118, "Loxodon Warhammer", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "HOP"; this.subtype.add("Equipment"); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(3, 0))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); - this.addAbility(new EquipAbility(Constants.Outcome.BoostCreature, new GenericManaCost(3))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 0))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(3))); } public LoxodonWarhammer(final LoxodonWarhammer card) { diff --git a/Mage.Sets/src/mage/sets/planechase/MyrEnforcer.java b/Mage.Sets/src/mage/sets/planechase/MyrEnforcer.java index 6c56900ed33..c7382864b12 100644 --- a/Mage.Sets/src/mage/sets/planechase/MyrEnforcer.java +++ b/Mage.Sets/src/mage/sets/planechase/MyrEnforcer.java @@ -28,8 +28,8 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.AffinityForArtifactsAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/planechase/Nefashu.java b/Mage.Sets/src/mage/sets/planechase/Nefashu.java index 61d38ea4147..19b84de3877 100644 --- a/Mage.Sets/src/mage/sets/planechase/Nefashu.java +++ b/Mage.Sets/src/mage/sets/planechase/Nefashu.java @@ -28,14 +28,15 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -57,7 +58,7 @@ public class Nefashu extends CardImpl { this.toughness = new MageInt(3); // Whenever Nefashu attacks, up to five target creatures each get -1/-1 until end of turn. - Ability ability = new AttacksTriggeredAbility(new BoostTargetEffect(-1, -1, Constants.Duration.EndOfTurn), false, rule); + Ability ability = new AttacksTriggeredAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn), false, rule); ability.addTarget(new TargetCreaturePermanent(0, 5)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planechase/NoxiousGhoul.java b/Mage.Sets/src/mage/sets/planechase/NoxiousGhoul.java index 323c571b42f..a6f22268390 100644 --- a/Mage.Sets/src/mage/sets/planechase/NoxiousGhoul.java +++ b/Mage.Sets/src/mage/sets/planechase/NoxiousGhoul.java @@ -28,10 +28,10 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.effects.common.continious.BoostAllEffect; diff --git a/Mage.Sets/src/mage/sets/planechase/NuisanceEngine.java b/Mage.Sets/src/mage/sets/planechase/NuisanceEngine.java index 9dc1259a8bc..365d11403df 100644 --- a/Mage.Sets/src/mage/sets/planechase/NuisanceEngine.java +++ b/Mage.Sets/src/mage/sets/planechase/NuisanceEngine.java @@ -29,9 +29,8 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.permanent.token.Token; /** @@ -49,7 +49,7 @@ public class NuisanceEngine extends CardImpl { public NuisanceEngine(UUID ownerId) { super(ownerId, 121, "Nuisance Engine", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "HOP"; - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new PestToken(), 1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new PestToken(), 1), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } @@ -67,8 +67,8 @@ public class NuisanceEngine extends CardImpl { class PestToken extends Token { public PestToken() { super("Pest", "0/1 colorless Pest artifact creature token"); - cardType.add(Constants.CardType.ARTIFACT); - cardType.add(Constants.CardType.CREATURE); + cardType.add(CardType.ARTIFACT); + cardType.add(CardType.CREATURE); subtype.add("Pest"); power = new MageInt(0); toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/planechase/PentadPrism.java b/Mage.Sets/src/mage/sets/planechase/PentadPrism.java index 06bddf91559..2ec25226bcc 100644 --- a/Mage.Sets/src/mage/sets/planechase/PentadPrism.java +++ b/Mage.Sets/src/mage/sets/planechase/PentadPrism.java @@ -28,8 +28,8 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.common.RemoveCountersSourceCost; import mage.abilities.keyword.SunburstAbility; import mage.abilities.mana.AnyColorManaAbility; diff --git a/Mage.Sets/src/mage/sets/planechase/PhyrexianGhoul.java b/Mage.Sets/src/mage/sets/planechase/PhyrexianGhoul.java index 35c6d397cca..e13d7c8859b 100644 --- a/Mage.Sets/src/mage/sets/planechase/PhyrexianGhoul.java +++ b/Mage.Sets/src/mage/sets/planechase/PhyrexianGhoul.java @@ -29,14 +29,15 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -52,7 +53,7 @@ public class PhyrexianGhoul extends CardImpl { this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Constants.Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); } public PhyrexianGhoul(final PhyrexianGhoul card) { diff --git a/Mage.Sets/src/mage/sets/planechase/RecklessCharge.java b/Mage.Sets/src/mage/sets/planechase/RecklessCharge.java index a35246fb2fe..3a669e5cfac 100644 --- a/Mage.Sets/src/mage/sets/planechase/RecklessCharge.java +++ b/Mage.Sets/src/mage/sets/planechase/RecklessCharge.java @@ -28,15 +28,17 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.TimingRule; import mage.target.common.TargetCreaturePermanent; /** @@ -53,11 +55,11 @@ public class RecklessCharge extends CardImpl { // Target creature gets +3/+0 and gains haste until end of turn. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - this.getSpellAbility().addEffect(new BoostTargetEffect(3, 0, Constants.Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(3, 0, Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); // Flashback {2}{R} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{2}{R}"), Constants.TimingRule.INSTANT)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{2}{R}"), TimingRule.INSTANT)); } public RecklessCharge(final RecklessCharge card) { diff --git a/Mage.Sets/src/mage/sets/planechase/RorixBladewing.java b/Mage.Sets/src/mage/sets/planechase/RorixBladewing.java index a245f42f8e9..365bd564479 100644 --- a/Mage.Sets/src/mage/sets/planechase/RorixBladewing.java +++ b/Mage.Sets/src/mage/sets/planechase/RorixBladewing.java @@ -28,8 +28,8 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; diff --git a/Mage.Sets/src/mage/sets/planechase/SarcomiteMyr.java b/Mage.Sets/src/mage/sets/planechase/SarcomiteMyr.java index 4ff6239e0db..82f03210b72 100644 --- a/Mage.Sets/src/mage/sets/planechase/SarcomiteMyr.java +++ b/Mage.Sets/src/mage/sets/planechase/SarcomiteMyr.java @@ -29,9 +29,8 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -55,8 +56,8 @@ public class SarcomiteMyr extends CardImpl { this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn), new GenericManaCost(2))); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(2)); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(2)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planechase/ShivanOasis.java b/Mage.Sets/src/mage/sets/planechase/ShivanOasis.java index f3d3bd377a5..f4e18523fe1 100644 --- a/Mage.Sets/src/mage/sets/planechase/ShivanOasis.java +++ b/Mage.Sets/src/mage/sets/planechase/ShivanOasis.java @@ -28,8 +28,8 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.RedManaAbility; diff --git a/Mage.Sets/src/mage/sets/planechase/SilvergladeElemental.java b/Mage.Sets/src/mage/sets/planechase/SilvergladeElemental.java index 5ed4857639a..0a79ae69804 100644 --- a/Mage.Sets/src/mage/sets/planechase/SilvergladeElemental.java +++ b/Mage.Sets/src/mage/sets/planechase/SilvergladeElemental.java @@ -28,8 +28,8 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; diff --git a/Mage.Sets/src/mage/sets/planechase/Smokebraider.java b/Mage.Sets/src/mage/sets/planechase/Smokebraider.java index d77f5eacdcc..5c5cbc1cacf 100644 --- a/Mage.Sets/src/mage/sets/planechase/Smokebraider.java +++ b/Mage.Sets/src/mage/sets/planechase/Smokebraider.java @@ -29,8 +29,8 @@ package mage.sets.planechase; import java.util.UUID; import mage.ConditionalMana; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.MageObject; import mage.Mana; diff --git a/Mage.Sets/src/mage/sets/planechase/SunhomeFortressOfTheLegion.java b/Mage.Sets/src/mage/sets/planechase/SunhomeFortressOfTheLegion.java index fb6735290ee..9f2ea5de1d3 100644 --- a/Mage.Sets/src/mage/sets/planechase/SunhomeFortressOfTheLegion.java +++ b/Mage.Sets/src/mage/sets/planechase/SunhomeFortressOfTheLegion.java @@ -29,9 +29,8 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -40,6 +39,8 @@ import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.DoubleStrikeAbility; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -52,7 +53,7 @@ public class SunhomeFortressOfTheLegion extends CardImpl { class ThirstforKnowledgeEffect extends OneShotEffect { public ThirstforKnowledgeEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "Then discard two cards unless you discard an artifact card"; } @@ -93,7 +94,7 @@ class ThirstforKnowledgeEffect extends OneShotEffect { filter.add(new CardTypePredicate(CardType.ARTIFACT)); if (you != null && you.getHand().count(filter, game) > 0 - && you.chooseUse(Constants.Outcome.Discard, "Do you want to discard an artifact? If you do not, you must discard 2 cards", game)) { + && you.chooseUse(Outcome.Discard, "Do you want to discard an artifact? If you do not, you must discard 2 cards", game)) { Cost cost = new DiscardTargetCost(new TargetCardInHand(filter)); if (cost.canPay(you.getId(), you.getId(), game)) { if (!cost.pay(source, game, you.getId(), you.getId(), false)) { diff --git a/Mage.Sets/src/mage/sets/planechase/UndeadWarchief.java b/Mage.Sets/src/mage/sets/planechase/UndeadWarchief.java index 227c862ec69..be7a35c68b3 100644 --- a/Mage.Sets/src/mage/sets/planechase/UndeadWarchief.java +++ b/Mage.Sets/src/mage/sets/planechase/UndeadWarchief.java @@ -28,10 +28,10 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; diff --git a/Mage.Sets/src/mage/sets/planechase/VedalkenEngineer.java b/Mage.Sets/src/mage/sets/planechase/VedalkenEngineer.java index 5f8a17f544c..3c2342bbe6f 100644 --- a/Mage.Sets/src/mage/sets/planechase/VedalkenEngineer.java +++ b/Mage.Sets/src/mage/sets/planechase/VedalkenEngineer.java @@ -29,9 +29,8 @@ package mage.sets.planechase; import java.util.UUID; import mage.ConditionalMana; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.MageObject; import mage.Mana; @@ -44,6 +43,7 @@ import mage.abilities.mana.ManaAbility; import mage.abilities.mana.builder.ConditionalManaBuilder; import mage.cards.CardImpl; import mage.choices.ChoiceColor; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; @@ -113,7 +113,7 @@ class VedalkenEngineerManaCondition implements Condition { class VedalkenEngineerAbility extends ManaAbility { public VedalkenEngineerAbility(Cost cost, int amount, ConditionalManaBuilder manaBuilder) { - super(Constants.Zone.BATTLEFIELD, new VedalkenEngineerEffect(amount, manaBuilder), cost); + super(Zone.BATTLEFIELD, new VedalkenEngineerEffect(amount, manaBuilder), cost); this.addChoice(new ChoiceColor()); this.netMana.setAny(amount); } diff --git a/Mage.Sets/src/mage/sets/planechase/WitheredWretch.java b/Mage.Sets/src/mage/sets/planechase/WitheredWretch.java index 610ad2973bf..73581927575 100644 --- a/Mage.Sets/src/mage/sets/planechase/WitheredWretch.java +++ b/Mage.Sets/src/mage/sets/planechase/WitheredWretch.java @@ -28,15 +28,16 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCardInGraveyard; /** @@ -56,7 +57,7 @@ public class WitheredWretch extends CardImpl { this.toughness = new MageInt(2); // {1}: Exile target card from a graveyard. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ExileTargetEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new GenericManaCost(1)); ability.addTarget(new TargetCardInGraveyard()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planechase/WizardReplica.java b/Mage.Sets/src/mage/sets/planechase/WizardReplica.java index a9a4fae0748..2e1192d5c93 100644 --- a/Mage.Sets/src/mage/sets/planechase/WizardReplica.java +++ b/Mage.Sets/src/mage/sets/planechase/WizardReplica.java @@ -29,9 +29,8 @@ package mage.sets.planechase; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.target.TargetSpell; /** @@ -56,7 +57,7 @@ public class WizardReplica extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(2)), new ColoredManaCost(Constants.ColoredManaSymbol.U)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(2)), new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetSpell()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/planechase2012/ArmoredGriffin.java b/Mage.Sets/src/mage/sets/planechase2012/ArmoredGriffin.java index 01525f6f407..18e8f3e95dd 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/ArmoredGriffin.java +++ b/Mage.Sets/src/mage/sets/planechase2012/ArmoredGriffin.java @@ -28,8 +28,8 @@ package mage.sets.planechase2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; diff --git a/Mage.Sets/src/mage/sets/planechase2012/BalefulStrix.java b/Mage.Sets/src/mage/sets/planechase2012/BalefulStrix.java index 92adf3ce262..9730fd82889 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/BalefulStrix.java +++ b/Mage.Sets/src/mage/sets/planechase2012/BalefulStrix.java @@ -28,8 +28,8 @@ package mage.sets.planechase2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/planechase2012/BeetlebackChief.java b/Mage.Sets/src/mage/sets/planechase2012/BeetlebackChief.java index d00829622c4..b5ff3c64a1b 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/BeetlebackChief.java +++ b/Mage.Sets/src/mage/sets/planechase2012/BeetlebackChief.java @@ -28,8 +28,8 @@ package mage.sets.planechase2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/planechase2012/BrindleShoat.java b/Mage.Sets/src/mage/sets/planechase2012/BrindleShoat.java index 9b8be7d4f61..6f6f7103cc9 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/BrindleShoat.java +++ b/Mage.Sets/src/mage/sets/planechase2012/BrindleShoat.java @@ -28,8 +28,8 @@ package mage.sets.planechase2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/planechase2012/DragonlairSpider.java b/Mage.Sets/src/mage/sets/planechase2012/DragonlairSpider.java index 058c380e329..ea48a885280 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/DragonlairSpider.java +++ b/Mage.Sets/src/mage/sets/planechase2012/DragonlairSpider.java @@ -28,8 +28,8 @@ package mage.sets.planechase2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.OpponentCastsSpellTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/planechase2012/DreampodDruid.java b/Mage.Sets/src/mage/sets/planechase2012/DreampodDruid.java index 149dad9b28a..4a5b6c12dfa 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/DreampodDruid.java +++ b/Mage.Sets/src/mage/sets/planechase2012/DreampodDruid.java @@ -28,15 +28,17 @@ package mage.sets.planechase2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.condition.common.EnchantedCondition; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.game.permanent.token.SaprolingToken; /** @@ -56,7 +58,7 @@ public class DreampodDruid extends CardImpl { // At the beginning of each upkeep, if Dreampod Druid is enchanted, put a 1/1 green Saproling creature token onto the battlefield. this.addAbility(new ConditionalTriggeredAbility( - new BeginningOfUpkeepTriggeredAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken(),1), Constants.TargetController.ANY, false, false), + new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken(),1), TargetController.ANY, false, false), new EnchantedCondition(), "At the beginning of each upkeep, if Dreampod Druid is enchanted, put a 1/1 green Saproling creature token onto the battlefield.")); } diff --git a/Mage.Sets/src/mage/sets/planechase2012/ElderwoodScion.java b/Mage.Sets/src/mage/sets/planechase2012/ElderwoodScion.java index b1a7c04688c..7ad9a718940 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/ElderwoodScion.java +++ b/Mage.Sets/src/mage/sets/planechase2012/ElderwoodScion.java @@ -27,10 +27,9 @@ */ package mage.sets.planechase2012; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -41,6 +40,8 @@ import mage.abilities.keyword.LifelinkAbility; import mage.abilities.keyword.RetraceAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Outcome; import mage.game.Game; import mage.target.Target; import mage.util.CardUtil; @@ -88,7 +89,7 @@ class ElderwoodScionCostReductionEffect extends CostModificationEffectImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures you control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public MaelstromWanderer(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/planechase2012/MassMutiny.java b/Mage.Sets/src/mage/sets/planechase2012/MassMutiny.java index 290c4e3e13b..9d2f5baa8bf 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/MassMutiny.java +++ b/Mage.Sets/src/mage/sets/planechase2012/MassMutiny.java @@ -28,11 +28,11 @@ package mage.sets.planechase2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.effects.ContinuousEffect; @@ -119,7 +119,7 @@ class MassMutinyEffect extends OneShotEffect { effect1.setTargetPointer(new FixedTarget(targetCreature.getId())); game.addEffect(effect1, source); - ContinuousEffect effect2 = new GainAbilityTargetEffect(HasteAbility.getInstance(), Constants.Duration.EndOfTurn); + ContinuousEffect effect2 = new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn); effect2.setTargetPointer(new FixedTarget(targetCreature.getId())); game.addEffect(effect2, source); diff --git a/Mage.Sets/src/mage/sets/planechase2012/NoggleRansacker.java b/Mage.Sets/src/mage/sets/planechase2012/NoggleRansacker.java index c0902f64945..6347f52ebe9 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/NoggleRansacker.java +++ b/Mage.Sets/src/mage/sets/planechase2012/NoggleRansacker.java @@ -28,8 +28,8 @@ package mage.sets.planechase2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/planechase2012/NullmageAdvocate.java b/Mage.Sets/src/mage/sets/planechase2012/NullmageAdvocate.java index 1e1cccfff61..52132f11c86 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/NullmageAdvocate.java +++ b/Mage.Sets/src/mage/sets/planechase2012/NullmageAdvocate.java @@ -28,9 +28,9 @@ package mage.sets.planechase2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/planechase2012/PenumbraSpider.java b/Mage.Sets/src/mage/sets/planechase2012/PenumbraSpider.java index 10886292857..a842e77d9bf 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/PenumbraSpider.java +++ b/Mage.Sets/src/mage/sets/planechase2012/PenumbraSpider.java @@ -28,8 +28,8 @@ package mage.sets.planechase2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.LeavesBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/planechase2012/PollenbrightWings.java b/Mage.Sets/src/mage/sets/planechase2012/PollenbrightWings.java index e7b51e958a5..1282e6e568f 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/PollenbrightWings.java +++ b/Mage.Sets/src/mage/sets/planechase2012/PollenbrightWings.java @@ -28,13 +28,13 @@ package mage.sets.planechase2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; @@ -93,7 +93,7 @@ public class PollenbrightWings extends CardImpl { class PollenbrightWingsAbility extends TriggeredAbilityImpl { public PollenbrightWingsAbility() { - super(Constants.Zone.BATTLEFIELD, new PollenbrightWingsEffect()); + super(Zone.BATTLEFIELD, new PollenbrightWingsEffect()); this.addEffect(new UntapAllLandsControllerEffect()); } diff --git a/Mage.Sets/src/mage/sets/planechase2012/PreyseizerDragon.java b/Mage.Sets/src/mage/sets/planechase2012/PreyseizerDragon.java index 93fe843203b..dcaa0b09ce1 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/PreyseizerDragon.java +++ b/Mage.Sets/src/mage/sets/planechase2012/PreyseizerDragon.java @@ -28,8 +28,8 @@ package mage.sets.planechase2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/planechase2012/PrimalPlasma.java b/Mage.Sets/src/mage/sets/planechase2012/PrimalPlasma.java index 87a0b78c40b..b49ab892da4 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/PrimalPlasma.java +++ b/Mage.Sets/src/mage/sets/planechase2012/PrimalPlasma.java @@ -28,11 +28,8 @@ package mage.sets.planechase2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Layer; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -62,7 +59,7 @@ public class PrimalPlasma extends CardImpl { this.toughness = new MageInt(0); // As Primal Plasma enters the battlefield, it becomes your choice of a 3/3 creature, a 2/2 creature with flying, or a 1/6 creature with defender. - Ability ability = new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new EntersBattlefieldEffect(new PrimalPlasmaEffect(), "As {this} enters the battlefield, it becomes your choice of a 3/3 creature, a 2/2 creature with flying, or a 1/6 creature with defender")); + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new EntersBattlefieldEffect(new PrimalPlasmaEffect(), "As {this} enters the battlefield, it becomes your choice of a 3/3 creature, a 2/2 creature with flying, or a 1/6 creature with defender")); ability.addChoice(new PrimalPlasmaChoice()); this.addAbility(ability); } @@ -79,7 +76,7 @@ public class PrimalPlasma extends CardImpl { class PrimalPlasmaEffect extends ContinuousEffectImpl { PrimalPlasmaEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.BecomeCreature); + super(Duration.WhileOnBattlefield, Outcome.BecomeCreature); } PrimalPlasmaEffect(final PrimalPlasmaEffect effect) { diff --git a/Mage.Sets/src/mage/sets/planechase2012/QuietDisrepair.java b/Mage.Sets/src/mage/sets/planechase2012/QuietDisrepair.java index 6770b9d6108..cbc966a7c1c 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/QuietDisrepair.java +++ b/Mage.Sets/src/mage/sets/planechase2012/QuietDisrepair.java @@ -28,12 +28,12 @@ package mage.sets.planechase2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -72,7 +72,7 @@ public class QuietDisrepair extends CardImpl { // Enchant artifact or enchantment TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Detriment)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/planechase2012/RivalsDuel.java b/Mage.Sets/src/mage/sets/planechase2012/RivalsDuel.java index 8b9186f28c4..8ba4ba8367b 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/RivalsDuel.java +++ b/Mage.Sets/src/mage/sets/planechase2012/RivalsDuel.java @@ -28,9 +28,9 @@ package mage.sets.planechase2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/planechase2012/SaiOfTheShinobi.java b/Mage.Sets/src/mage/sets/planechase2012/SaiOfTheShinobi.java index d2f30eced0e..59fc60cd916 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/SaiOfTheShinobi.java +++ b/Mage.Sets/src/mage/sets/planechase2012/SaiOfTheShinobi.java @@ -28,11 +28,11 @@ package mage.sets.planechase2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; diff --git a/Mage.Sets/src/mage/sets/planechase2012/SakashimasStudent.java b/Mage.Sets/src/mage/sets/planechase2012/SakashimasStudent.java index 984394eef5d..3202b90b069 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/SakashimasStudent.java +++ b/Mage.Sets/src/mage/sets/planechase2012/SakashimasStudent.java @@ -28,9 +28,9 @@ package mage.sets.planechase2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/planechase2012/ShardlessAgent.java b/Mage.Sets/src/mage/sets/planechase2012/ShardlessAgent.java index 7cbd39d5b07..2ca0b708803 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/ShardlessAgent.java +++ b/Mage.Sets/src/mage/sets/planechase2012/ShardlessAgent.java @@ -28,8 +28,8 @@ package mage.sets.planechase2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.CascadeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/planechase2012/SilentBladeOni.java b/Mage.Sets/src/mage/sets/planechase2012/SilentBladeOni.java index 39a2c8f78b5..c1a94508fd2 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/SilentBladeOni.java +++ b/Mage.Sets/src/mage/sets/planechase2012/SilentBladeOni.java @@ -28,10 +28,10 @@ package mage.sets.planechase2012; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -42,6 +42,7 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Zone; import mage.filter.common.FilterNonlandCard; import mage.game.Game; import mage.players.Player; @@ -102,10 +103,10 @@ class SilentBladeOniEffect extends OneShotEffect { Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); Player controller = game.getPlayer(source.getControllerId()); if (opponent != null && controller != null) { - Cards cardsInHand = new CardsImpl(Constants.Zone.PICK); + Cards cardsInHand = new CardsImpl(Zone.PICK); cardsInHand.addAll(opponent.getHand()); if (cardsInHand.size() > 0) { - TargetCard target = new TargetCard(1, Constants.Zone.PICK, new FilterNonlandCard()); + TargetCard target = new TargetCard(1, Zone.PICK, new FilterNonlandCard()); if (controller.chooseTarget(outcome, cardsInHand, target, source, game)) { Card card = game.getCard(target.getFirstTarget()); if (card != null) { diff --git a/Mage.Sets/src/mage/sets/planechase2012/TaintedIsle.java b/Mage.Sets/src/mage/sets/planechase2012/TaintedIsle.java index 621122e553c..6d8df4cf660 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/TaintedIsle.java +++ b/Mage.Sets/src/mage/sets/planechase2012/TaintedIsle.java @@ -28,9 +28,9 @@ package mage.sets.planechase2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.Mana; import mage.abilities.condition.common.ControlsPermanentCondition; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/planechase2012/ThreeDreams.java b/Mage.Sets/src/mage/sets/planechase2012/ThreeDreams.java index ee8e3ffb3a6..f43e8e5b1b0 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/ThreeDreams.java +++ b/Mage.Sets/src/mage/sets/planechase2012/ThreeDreams.java @@ -28,8 +28,8 @@ package mage.sets.planechase2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.Card; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/planechase2012/ThromokTheInsatiable.java b/Mage.Sets/src/mage/sets/planechase2012/ThromokTheInsatiable.java index 79b1451225a..1f770654ae0 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/ThromokTheInsatiable.java +++ b/Mage.Sets/src/mage/sets/planechase2012/ThromokTheInsatiable.java @@ -28,8 +28,8 @@ package mage.sets.planechase2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.DevourEffect.DevourFactor; import mage.abilities.keyword.DevourAbility; diff --git a/Mage.Sets/src/mage/sets/planechase2012/VelaTheNightClad.java b/Mage.Sets/src/mage/sets/planechase2012/VelaTheNightClad.java index 74886c296ff..e4e6294015f 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/VelaTheNightClad.java +++ b/Mage.Sets/src/mage/sets/planechase2012/VelaTheNightClad.java @@ -28,11 +28,11 @@ package mage.sets.planechase2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/planechase2012/WhirlpoolWarrior.java b/Mage.Sets/src/mage/sets/planechase2012/WhirlpoolWarrior.java index 3763e23ffd7..a3d52f29f49 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/WhirlpoolWarrior.java +++ b/Mage.Sets/src/mage/sets/planechase2012/WhirlpoolWarrior.java @@ -28,10 +28,10 @@ package mage.sets.planechase2012; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/planeshift/ArcticMerfolk.java b/Mage.Sets/src/mage/sets/planeshift/ArcticMerfolk.java index 93c53510b00..b03d0d17c46 100644 --- a/Mage.Sets/src/mage/sets/planeshift/ArcticMerfolk.java +++ b/Mage.Sets/src/mage/sets/planeshift/ArcticMerfolk.java @@ -28,8 +28,8 @@ package mage.sets.planeshift; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.common.KickedCondition; diff --git a/Mage.Sets/src/mage/sets/planeshift/GaeasMight.java b/Mage.Sets/src/mage/sets/planeshift/GaeasMight.java index 90e9528964e..9dac0edc01c 100644 --- a/Mage.Sets/src/mage/sets/planeshift/GaeasMight.java +++ b/Mage.Sets/src/mage/sets/planeshift/GaeasMight.java @@ -29,12 +29,12 @@ package mage.sets.planeshift; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.DomainValue; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -50,7 +50,7 @@ public class GaeasMight extends CardImpl { this.color.setGreen(true); // Domain - Target creature gets +1/+1 until end of turn for each basic land type among lands you control. - this.getSpellAbility().addEffect(new BoostTargetEffect(new DomainValue(), new DomainValue(), Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(new DomainValue(), new DomainValue(), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/planeshift/ManaCylix.java b/Mage.Sets/src/mage/sets/planeshift/ManaCylix.java index 5a62323cb7f..19e608b9100 100644 --- a/Mage.Sets/src/mage/sets/planeshift/ManaCylix.java +++ b/Mage.Sets/src/mage/sets/planeshift/ManaCylix.java @@ -28,7 +28,7 @@ package mage.sets.planeshift; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/planeshift/NemataGroveGuardian.java b/Mage.Sets/src/mage/sets/planeshift/NemataGroveGuardian.java index 2698f519bfe..cf393a54b90 100644 --- a/Mage.Sets/src/mage/sets/planeshift/NemataGroveGuardian.java +++ b/Mage.Sets/src/mage/sets/planeshift/NemataGroveGuardian.java @@ -29,9 +29,8 @@ package mage.sets.planeshift; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -39,6 +38,8 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -69,9 +70,9 @@ public class NemataGroveGuardian extends CardImpl { this.toughness = new MageInt(5); // {2}{G}: Put a 1/1 green Saproling creature token onto the battlefield. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl("{2}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl("{2}{G}"))); // Sacrifice a Saproling: Saproling creatures get +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Constants.Duration.EndOfTurn, filter, false), new SacrificeTargetCost(new TargetControlledPermanent(filter1)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.EndOfTurn, filter, false), new SacrificeTargetCost(new TargetControlledPermanent(filter1)))); } public NemataGroveGuardian(final NemataGroveGuardian card) { diff --git a/Mage.Sets/src/mage/sets/planeshift/NightscapeFamiliar.java b/Mage.Sets/src/mage/sets/planeshift/NightscapeFamiliar.java index 3c277ac6100..91996845125 100644 --- a/Mage.Sets/src/mage/sets/planeshift/NightscapeFamiliar.java +++ b/Mage.Sets/src/mage/sets/planeshift/NightscapeFamiliar.java @@ -28,9 +28,9 @@ package mage.sets.planeshift; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/planeshift/OrimsChant.java b/Mage.Sets/src/mage/sets/planeshift/OrimsChant.java index bf69f6e2acf..f18ac3dce46 100644 --- a/Mage.Sets/src/mage/sets/planeshift/OrimsChant.java +++ b/Mage.Sets/src/mage/sets/planeshift/OrimsChant.java @@ -29,14 +29,16 @@ package mage.sets.planeshift; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.condition.common.KickedCondition; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.keyword.KickerAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Outcome; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; @@ -78,7 +80,7 @@ public class OrimsChant extends CardImpl { class OrimsChantCantCastEffect extends ReplacementEffectImpl { public OrimsChantCantCastEffect() { - super(Constants.Duration.EndOfTurn, Constants.Outcome.Benefit); + super(Duration.EndOfTurn, Outcome.Benefit); staticText = "Target player can't cast spells this turn"; } @@ -118,7 +120,7 @@ class OrimsChantCantAttackEffect extends ReplacementEffectImpl { this.color.setBlue(true); // At the beginning of each player's upkeep, that player returns a creature he or she controls to its owner's hand. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandEffect(), TargetController.ANY, false, true)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new ReturnToHandEffect(), TargetController.ANY, false, true)); } public SunkenHope(final SunkenHope card) { @@ -98,7 +98,7 @@ class ReturnToHandEffect extends OneShotEffect { } FilterCreaturePermanent filter = new FilterCreaturePermanent(); - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); Target target = new TargetControlledPermanent(1, 1, filter, true); target.setRequired(true); diff --git a/Mage.Sets/src/mage/sets/planeshift/SunscapeFamiliar.java b/Mage.Sets/src/mage/sets/planeshift/SunscapeFamiliar.java index 6effe9ceb5a..3067ee6afc1 100644 --- a/Mage.Sets/src/mage/sets/planeshift/SunscapeFamiliar.java +++ b/Mage.Sets/src/mage/sets/planeshift/SunscapeFamiliar.java @@ -28,9 +28,9 @@ package mage.sets.planeshift; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/planeshift/ThornscapeFamiliar.java b/Mage.Sets/src/mage/sets/planeshift/ThornscapeFamiliar.java index 5ce319da4cc..81d09d6793f 100644 --- a/Mage.Sets/src/mage/sets/planeshift/ThornscapeFamiliar.java +++ b/Mage.Sets/src/mage/sets/planeshift/ThornscapeFamiliar.java @@ -28,9 +28,9 @@ package mage.sets.planeshift; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/planeshift/ThunderscapeFamiliar.java b/Mage.Sets/src/mage/sets/planeshift/ThunderscapeFamiliar.java index 23fd1e2b90a..aa24bc3f944 100644 --- a/Mage.Sets/src/mage/sets/planeshift/ThunderscapeFamiliar.java +++ b/Mage.Sets/src/mage/sets/planeshift/ThunderscapeFamiliar.java @@ -28,9 +28,9 @@ package mage.sets.planeshift; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/planeshift/UrzasGuilt.java b/Mage.Sets/src/mage/sets/planeshift/UrzasGuilt.java index fe4f74edd99..a626e770dfa 100644 --- a/Mage.Sets/src/mage/sets/planeshift/UrzasGuilt.java +++ b/Mage.Sets/src/mage/sets/planeshift/UrzasGuilt.java @@ -28,8 +28,8 @@ package mage.sets.planeshift; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DiscardEachPlayerEffect; import mage.abilities.effects.common.DrawCardAllEffect; import mage.abilities.effects.common.LoseLifeAllEffect; diff --git a/Mage.Sets/src/mage/sets/prophecy/Abolish.java b/Mage.Sets/src/mage/sets/prophecy/Abolish.java index 4b4a18d1e05..cfd9ec8d6d5 100644 --- a/Mage.Sets/src/mage/sets/prophecy/Abolish.java +++ b/Mage.Sets/src/mage/sets/prophecy/Abolish.java @@ -28,8 +28,8 @@ package mage.sets.prophecy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.common.DiscardTargetCost; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/prophecy/AgentOfShauku.java b/Mage.Sets/src/mage/sets/prophecy/AgentOfShauku.java index 6482b3c4935..0da42644581 100644 --- a/Mage.Sets/src/mage/sets/prophecy/AgentOfShauku.java +++ b/Mage.Sets/src/mage/sets/prophecy/AgentOfShauku.java @@ -28,10 +28,10 @@ package mage.sets.prophecy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +39,7 @@ import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.target.common.TargetControlledPermanent; @@ -62,7 +63,7 @@ public class AgentOfShauku extends CardImpl { this.toughness = new MageInt(1); // {1}{B}, Sacrifice a land: Target creature gets +2/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{B}")); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/prophecy/AvatarOfHope.java b/Mage.Sets/src/mage/sets/prophecy/AvatarOfHope.java index 16364e6859f..7c185e5e14b 100644 --- a/Mage.Sets/src/mage/sets/prophecy/AvatarOfHope.java +++ b/Mage.Sets/src/mage/sets/prophecy/AvatarOfHope.java @@ -27,10 +27,9 @@ */ package mage.sets.prophecy; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -43,6 +42,8 @@ import mage.abilities.keyword.FlashbackAbility; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.RetraceAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; import mage.util.CardUtil; @@ -85,7 +86,7 @@ public class AvatarOfHope extends CardImpl { class AdjustingCostsAbility extends SimpleStaticAbility implements AdjustingSourceCosts { public AdjustingCostsAbility() { - super(Constants.Zone.OUTSIDE, new AdjustingCostsEffect()); + super(Zone.OUTSIDE, new AdjustingCostsEffect()); } public AdjustingCostsAbility(final AdjustingCostsAbility ability) { @@ -114,7 +115,7 @@ class AdjustingCostsAbility extends SimpleStaticAbility implements AdjustingSour class AdjustingCostsEffect extends CostModificationEffectImpl { public AdjustingCostsEffect() { - super(Constants.Duration.Custom, Constants.Outcome.Benefit); + super(Duration.Custom, Outcome.Benefit); } public AdjustingCostsEffect(final AdjustingCostsEffect effect) { diff --git a/Mage.Sets/src/mage/sets/prophecy/BogGlider.java b/Mage.Sets/src/mage/sets/prophecy/BogGlider.java index 151ab5cf276..a8f8fdf1f3a 100644 --- a/Mage.Sets/src/mage/sets/prophecy/BogGlider.java +++ b/Mage.Sets/src/mage/sets/prophecy/BogGlider.java @@ -28,9 +28,9 @@ package mage.sets.prophecy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/prophecy/CoastalHornclaw.java b/Mage.Sets/src/mage/sets/prophecy/CoastalHornclaw.java index 1b0c27f29eb..845926e7100 100644 --- a/Mage.Sets/src/mage/sets/prophecy/CoastalHornclaw.java +++ b/Mage.Sets/src/mage/sets/prophecy/CoastalHornclaw.java @@ -28,15 +28,17 @@ package mage.sets.prophecy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.target.common.TargetControlledPermanent; @@ -60,7 +62,7 @@ public class CoastalHornclaw extends CardImpl { this.toughness = new MageInt(3); // Sacrifice a land: Coastal Hornclaw gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(filter)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(filter)))); } public CoastalHornclaw(final CoastalHornclaw card) { diff --git a/Mage.Sets/src/mage/sets/prophecy/HazyHomunculus.java b/Mage.Sets/src/mage/sets/prophecy/HazyHomunculus.java index 99deab8c79c..c935d45b813 100644 --- a/Mage.Sets/src/mage/sets/prophecy/HazyHomunculus.java +++ b/Mage.Sets/src/mage/sets/prophecy/HazyHomunculus.java @@ -28,9 +28,9 @@ package mage.sets.prophecy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.DefendingPlayerControlsCondition; diff --git a/Mage.Sets/src/mage/sets/prophecy/InfernalGenesis.java b/Mage.Sets/src/mage/sets/prophecy/InfernalGenesis.java index 493f3c9e834..baec81dbca8 100644 --- a/Mage.Sets/src/mage/sets/prophecy/InfernalGenesis.java +++ b/Mage.Sets/src/mage/sets/prophecy/InfernalGenesis.java @@ -28,9 +28,8 @@ package mage.sets.prophecy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -55,7 +54,7 @@ public class InfernalGenesis extends CardImpl { this.color.setBlack(true); // At the beginning of each player's upkeep, that player puts the top card of his or her library into his or her graveyard. Then he or she puts X 1/1 black Minion creature tokens onto the battlefield, where X is that card's converted mana cost. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new InfernalGenesisEffect(), Constants.TargetController.ANY, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new InfernalGenesisEffect(), TargetController.ANY, false)); } public InfernalGenesis(final InfernalGenesis card) { @@ -71,7 +70,7 @@ public class InfernalGenesis extends CardImpl { class InfernalGenesisEffect extends OneShotEffect { InfernalGenesisEffect() { - super(Constants.Outcome.BoostCreature); + super(Outcome.BoostCreature); staticText = "that player puts the top card of his or her library into his or her graveyard. Then he or she puts X 1/1 black Minion creature tokens onto the battlefield, where X is that card's converted mana cost"; } @@ -85,7 +84,7 @@ class InfernalGenesisEffect extends OneShotEffect { if (player != null) { Card card = player.getLibrary().removeFromTop(game); if (card != null) { - if (card.moveToZone(Constants.Zone.GRAVEYARD, source.getId(), game, false)) { + if (card.moveToZone(Zone.GRAVEYARD, source.getId(), game, false)) { int cmc = card.getManaCost().convertedManaCost(); MinionToken token = new MinionToken(); token.putOntoBattlefield(cmc, game, id, player.getId()); diff --git a/Mage.Sets/src/mage/sets/prophecy/LesserGargadon.java b/Mage.Sets/src/mage/sets/prophecy/LesserGargadon.java index 2951027e876..ff5159e8072 100644 --- a/Mage.Sets/src/mage/sets/prophecy/LesserGargadon.java +++ b/Mage.Sets/src/mage/sets/prophecy/LesserGargadon.java @@ -28,8 +28,8 @@ package mage.sets.prophecy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksOrBlocksTriggeredAbility; import mage.abilities.effects.common.SacrificeControllerEffect; diff --git a/Mage.Sets/src/mage/sets/prophecy/LivingTerrain.java b/Mage.Sets/src/mage/sets/prophecy/LivingTerrain.java index fcea6e8243f..6d4c18be24d 100644 --- a/Mage.Sets/src/mage/sets/prophecy/LivingTerrain.java +++ b/Mage.Sets/src/mage/sets/prophecy/LivingTerrain.java @@ -28,10 +28,8 @@ package mage.sets.prophecy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -65,7 +63,7 @@ public class LivingTerrain extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted land is a 5/6 green Treefolk creature that's still a land. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new TreefolkToken(), "Enchanted land is a 5/6 green Treefolk creature that's still a land", Constants.Duration.EndOfTurn))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new TreefolkToken(), "Enchanted land is a 5/6 green Treefolk creature that's still a land", Duration.EndOfTurn))); } public LivingTerrain(final LivingTerrain card) { diff --git a/Mage.Sets/src/mage/sets/prophecy/MarshBoa.java b/Mage.Sets/src/mage/sets/prophecy/MarshBoa.java index 614772bdd2d..f2815bdc00c 100644 --- a/Mage.Sets/src/mage/sets/prophecy/MarshBoa.java +++ b/Mage.Sets/src/mage/sets/prophecy/MarshBoa.java @@ -28,8 +28,8 @@ package mage.sets.prophecy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/prophecy/PitRaptor.java b/Mage.Sets/src/mage/sets/prophecy/PitRaptor.java index 7958c474daa..89d8d5f5dd6 100644 --- a/Mage.Sets/src/mage/sets/prophecy/PitRaptor.java +++ b/Mage.Sets/src/mage/sets/prophecy/PitRaptor.java @@ -28,9 +28,9 @@ package mage.sets.prophecy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/prophecy/PlagueWind.java b/Mage.Sets/src/mage/sets/prophecy/PlagueWind.java index cc014dabafa..0278cb32d37 100644 --- a/Mage.Sets/src/mage/sets/prophecy/PlagueWind.java +++ b/Mage.Sets/src/mage/sets/prophecy/PlagueWind.java @@ -28,11 +28,12 @@ package mage.sets.prophecy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; @@ -44,7 +45,7 @@ public class PlagueWind extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you don't control"); static{ - filter.add(new ControllerPredicate(Constants.TargetController.NOT_YOU)); + filter.add(new ControllerPredicate(TargetController.NOT_YOU)); } public PlagueWind(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/prophecy/PygmyRazorback.java b/Mage.Sets/src/mage/sets/prophecy/PygmyRazorback.java index 40f46a7c510..55a55758902 100644 --- a/Mage.Sets/src/mage/sets/prophecy/PygmyRazorback.java +++ b/Mage.Sets/src/mage/sets/prophecy/PygmyRazorback.java @@ -28,8 +28,8 @@ package mage.sets.prophecy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/prophecy/RibCageSpider.java b/Mage.Sets/src/mage/sets/prophecy/RibCageSpider.java index 1be05922cd5..d5025deaeac 100644 --- a/Mage.Sets/src/mage/sets/prophecy/RibCageSpider.java +++ b/Mage.Sets/src/mage/sets/prophecy/RibCageSpider.java @@ -28,8 +28,8 @@ package mage.sets.prophecy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/prophecy/RidgelineRager.java b/Mage.Sets/src/mage/sets/prophecy/RidgelineRager.java index 7ea3c0abaf0..23e2f9008ce 100644 --- a/Mage.Sets/src/mage/sets/prophecy/RidgelineRager.java +++ b/Mage.Sets/src/mage/sets/prophecy/RidgelineRager.java @@ -28,14 +28,16 @@ package mage.sets.prophecy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -53,7 +55,7 @@ public class RidgelineRager extends CardImpl { this.toughness = new MageInt(2); // {R}: Ridgeline Rager gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Constants.Duration.EndOfTurn), new ManaCostsImpl("{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}"))); } public RidgelineRager(final RidgelineRager card) { diff --git a/Mage.Sets/src/mage/sets/prophecy/SearingWind.java b/Mage.Sets/src/mage/sets/prophecy/SearingWind.java index af954213206..eca87758bd0 100644 --- a/Mage.Sets/src/mage/sets/prophecy/SearingWind.java +++ b/Mage.Sets/src/mage/sets/prophecy/SearingWind.java @@ -28,8 +28,8 @@ package mage.sets.prophecy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreatureOrPlayer; diff --git a/Mage.Sets/src/mage/sets/prophecy/SpiketailHatchling.java b/Mage.Sets/src/mage/sets/prophecy/SpiketailHatchling.java index f980994ad97..dd8d2d4e0e1 100644 --- a/Mage.Sets/src/mage/sets/prophecy/SpiketailHatchling.java +++ b/Mage.Sets/src/mage/sets/prophecy/SpiketailHatchling.java @@ -28,7 +28,7 @@ package mage.sets.prophecy; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/prophecy/SpittingSpider.java b/Mage.Sets/src/mage/sets/prophecy/SpittingSpider.java index 97a543d23f0..2a1c3a8bff4 100644 --- a/Mage.Sets/src/mage/sets/prophecy/SpittingSpider.java +++ b/Mage.Sets/src/mage/sets/prophecy/SpittingSpider.java @@ -28,9 +28,9 @@ package mage.sets.prophecy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -38,6 +38,7 @@ import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; @@ -65,7 +66,7 @@ public class SpittingSpider extends CardImpl { // Reach this.addAbility(ReachAbility.getInstance()); // Sacrifice a land: Spitting Spider deals 1 damage to each creature with flying. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageAllEffect(1, filter), new SacrificeTargetCost(new TargetControlledPermanent(new FilterControlledLandPermanent())))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(1, filter), new SacrificeTargetCost(new TargetControlledPermanent(new FilterControlledLandPermanent())))); } public SpittingSpider(final SpittingSpider card) { diff --git a/Mage.Sets/src/mage/sets/prophecy/SporeFrog.java b/Mage.Sets/src/mage/sets/prophecy/SporeFrog.java index 825c78d1f06..2cb4feeb83a 100644 --- a/Mage.Sets/src/mage/sets/prophecy/SporeFrog.java +++ b/Mage.Sets/src/mage/sets/prophecy/SporeFrog.java @@ -28,15 +28,17 @@ package mage.sets.prophecy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.PreventAllDamageEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -54,7 +56,7 @@ public class SporeFrog extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Spore Frog: Prevent all combat damage that would be dealt this turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PreventAllDamageEffect(Constants.Duration.EndOfTurn, true), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventAllDamageEffect(Duration.EndOfTurn, true), new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/prophecy/SwordDancer.java b/Mage.Sets/src/mage/sets/prophecy/SwordDancer.java index 5a81c84f935..9c948c59c43 100644 --- a/Mage.Sets/src/mage/sets/prophecy/SwordDancer.java +++ b/Mage.Sets/src/mage/sets/prophecy/SwordDancer.java @@ -28,15 +28,17 @@ package mage.sets.prophecy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetAttackingCreature; /** @@ -56,7 +58,7 @@ public class SwordDancer extends CardImpl { this.toughness = new MageInt(2); // {W}{W}: Target attacking creature gets -1/-0 until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(-1, 0, Constants.Duration.EndOfTurn), new ManaCostsImpl("{W}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, 0, Duration.EndOfTurn), new ManaCostsImpl("{W}{W}")); ability.addTarget(new TargetAttackingCreature()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/AgrusKosWojekVeteran.java b/Mage.Sets/src/mage/sets/ravnika/AgrusKosWojekVeteran.java index 9a3a5e8397c..15912f1b842 100644 --- a/Mage.Sets/src/mage/sets/ravnika/AgrusKosWojekVeteran.java +++ b/Mage.Sets/src/mage/sets/ravnika/AgrusKosWojekVeteran.java @@ -29,14 +29,14 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterAttackingCreature; import mage.filter.predicate.mageobject.ColorPredicate; @@ -66,8 +66,8 @@ public class AgrusKosWojekVeteran extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); // Whenever Agrus Kos, Wojek Veteran attacks, attacking red creatures get +2/+0 and attacking white creatures get +0/+2 until end of turn. - this.addAbility(new AttacksTriggeredAbility(new BoostAllEffect(2, 0, Constants.Duration.EndOfTurn, filterRed, false), false)); - this.addAbility(new AttacksTriggeredAbility(new BoostAllEffect(0, 2, Constants.Duration.EndOfTurn, filterWhite, false), false)); + this.addAbility(new AttacksTriggeredAbility(new BoostAllEffect(2, 0, Duration.EndOfTurn, filterRed, false), false)); + this.addAbility(new AttacksTriggeredAbility(new BoostAllEffect(0, 2, Duration.EndOfTurn, filterWhite, false), false)); } public AgrusKosWojekVeteran(final AgrusKosWojekVeteran card) { diff --git a/Mage.Sets/src/mage/sets/ravnika/AutochthonWurm.java b/Mage.Sets/src/mage/sets/ravnika/AutochthonWurm.java index 9df2fbbea26..f7ecfacd065 100644 --- a/Mage.Sets/src/mage/sets/ravnika/AutochthonWurm.java +++ b/Mage.Sets/src/mage/sets/ravnika/AutochthonWurm.java @@ -29,8 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ConvokeAbility; import mage.abilities.keyword.TrampleAbility; diff --git a/Mage.Sets/src/mage/sets/ravnika/BarbarianRiftcutter.java b/Mage.Sets/src/mage/sets/ravnika/BarbarianRiftcutter.java index 65d17aea3d3..f47417297d3 100644 --- a/Mage.Sets/src/mage/sets/ravnika/BarbarianRiftcutter.java +++ b/Mage.Sets/src/mage/sets/ravnika/BarbarianRiftcutter.java @@ -29,9 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.target.common.TargetLandPermanent; /** @@ -56,7 +57,7 @@ public class BarbarianRiftcutter extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); // {R}, Sacrifice Barbarian Riftcutter: Destroy target land. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/ravnika/BelltowerSphinx.java b/Mage.Sets/src/mage/sets/ravnika/BelltowerSphinx.java index 000d36103d6..bf6938a6c91 100644 --- a/Mage.Sets/src/mage/sets/ravnika/BelltowerSphinx.java +++ b/Mage.Sets/src/mage/sets/ravnika/BelltowerSphinx.java @@ -27,15 +27,15 @@ */ package mage.sets.ravnika; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; @@ -75,7 +75,7 @@ public class BelltowerSphinx extends CardImpl { class BelltowerSphinxEffect extends TriggeredAbilityImpl { public BelltowerSphinxEffect() { - super(Constants.Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(0)); + super(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(0)); } public BelltowerSphinxEffect(BelltowerSphinxEffect effect) { diff --git a/Mage.Sets/src/mage/sets/ravnika/BenevolentAncestor.java b/Mage.Sets/src/mage/sets/ravnika/BenevolentAncestor.java index e95c5b219f3..e9591cd782c 100644 --- a/Mage.Sets/src/mage/sets/ravnika/BenevolentAncestor.java +++ b/Mage.Sets/src/mage/sets/ravnika/BenevolentAncestor.java @@ -29,9 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.PreventDamageTargetEffect; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; /** @@ -56,7 +57,7 @@ public class BenevolentAncestor extends CardImpl { this.toughness = new MageInt(4); this.addAbility(DefenderAbility.getInstance()); // {tap}: Prevent the next 1 damage that would be dealt to target creature or player this turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PreventDamageTargetEffect(Constants.Duration.EndOfTurn, 1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/BorosGuildmage.java b/Mage.Sets/src/mage/sets/ravnika/BorosGuildmage.java index 751558eaa6d..b26991a12c2 100644 --- a/Mage.Sets/src/mage/sets/ravnika/BorosGuildmage.java +++ b/Mage.Sets/src/mage/sets/ravnika/BorosGuildmage.java @@ -30,9 +30,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -58,10 +59,10 @@ public class BorosGuildmage extends CardImpl { this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Constants.Duration.EndOfTurn), new ManaCostsImpl("{1}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{R}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); - ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Constants.Duration.EndOfTurn), new ManaCostsImpl("{1}{W}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{W}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/BorosRecruit.java b/Mage.Sets/src/mage/sets/ravnika/BorosRecruit.java index e299e7ed9cb..457d67f93dd 100644 --- a/Mage.Sets/src/mage/sets/ravnika/BorosRecruit.java +++ b/Mage.Sets/src/mage/sets/ravnika/BorosRecruit.java @@ -28,8 +28,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ravnika/BorosSignet.java b/Mage.Sets/src/mage/sets/ravnika/BorosSignet.java index 4ddad62d50f..ab432fbb191 100644 --- a/Mage.Sets/src/mage/sets/ravnika/BorosSignet.java +++ b/Mage.Sets/src/mage/sets/ravnika/BorosSignet.java @@ -29,9 +29,9 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/ravnika/BrambleElemental.java b/Mage.Sets/src/mage/sets/ravnika/BrambleElemental.java index 6c70d562fd3..3f7864cdc44 100644 --- a/Mage.Sets/src/mage/sets/ravnika/BrambleElemental.java +++ b/Mage.Sets/src/mage/sets/ravnika/BrambleElemental.java @@ -28,9 +28,9 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; diff --git a/Mage.Sets/src/mage/sets/ravnika/Caregiver.java b/Mage.Sets/src/mage/sets/ravnika/Caregiver.java index 6ccee7876e0..b8c26ea1003 100644 --- a/Mage.Sets/src/mage/sets/ravnika/Caregiver.java +++ b/Mage.Sets/src/mage/sets/ravnika/Caregiver.java @@ -29,9 +29,7 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -59,7 +57,7 @@ public class Caregiver extends CardImpl { this.toughness = new MageInt(1); // {W}, Sacrifice a creature: Prevent the next 1 damage that would be dealt to target creature or player this turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PreventDamageTargetEffect(Constants.Duration.EndOfTurn, 1), new ColoredManaCost(Constants.ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageTargetEffect(Duration.EndOfTurn, 1), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/ravnika/CarrionHowler.java b/Mage.Sets/src/mage/sets/ravnika/CarrionHowler.java index 40ab890608b..052f3b4c4d6 100644 --- a/Mage.Sets/src/mage/sets/ravnika/CarrionHowler.java +++ b/Mage.Sets/src/mage/sets/ravnika/CarrionHowler.java @@ -29,14 +29,15 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -55,7 +56,7 @@ public class CarrionHowler extends CardImpl { this.toughness = new MageInt(2); // Pay 1 life: Carrion Howler gets +2/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(2, -1, Constants.Duration.EndOfTurn), new PayLifeCost(1))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, -1, Duration.EndOfTurn), new PayLifeCost(1))); } public CarrionHowler(final CarrionHowler card) { diff --git a/Mage.Sets/src/mage/sets/ravnika/CarvenCaryatid.java b/Mage.Sets/src/mage/sets/ravnika/CarvenCaryatid.java index 1e63b11a542..ae806bbb9ee 100644 --- a/Mage.Sets/src/mage/sets/ravnika/CarvenCaryatid.java +++ b/Mage.Sets/src/mage/sets/ravnika/CarvenCaryatid.java @@ -28,8 +28,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/ravnika/CentaurSafeguard.java b/Mage.Sets/src/mage/sets/ravnika/CentaurSafeguard.java index 0c8a1b7c637..9e00a81035d 100644 --- a/Mage.Sets/src/mage/sets/ravnika/CentaurSafeguard.java +++ b/Mage.Sets/src/mage/sets/ravnika/CentaurSafeguard.java @@ -28,8 +28,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/ravnika/ChordOfCalling.java b/Mage.Sets/src/mage/sets/ravnika/ChordOfCalling.java index ded7b6175e0..70b5e684060 100644 --- a/Mage.Sets/src/mage/sets/ravnika/ChordOfCalling.java +++ b/Mage.Sets/src/mage/sets/ravnika/ChordOfCalling.java @@ -28,14 +28,16 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.ConvokeAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.Filter; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -76,7 +78,7 @@ public class ChordOfCalling extends CardImpl { class ChordofCallingSearchEffect extends OneShotEffect { ChordofCallingSearchEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); staticText = "Search your library for a creature card with converted mana cost X or less, put it onto the battlefield, then shuffle your library"; } @@ -102,7 +104,7 @@ class ChordofCallingSearchEffect extends OneShotEffect { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.UnboostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature gets -4/-1. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(-4, -1, Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-4, -1, Duration.WhileOnBattlefield))); } public ClingingDarkness(final ClingingDarkness card) { diff --git a/Mage.Sets/src/mage/sets/ravnika/CloudstoneCurio.java b/Mage.Sets/src/mage/sets/ravnika/CloudstoneCurio.java index 25d9f8a1e37..8652f8277f5 100644 --- a/Mage.Sets/src/mage/sets/ravnika/CloudstoneCurio.java +++ b/Mage.Sets/src/mage/sets/ravnika/CloudstoneCurio.java @@ -30,11 +30,11 @@ package mage.sets.ravnika; import java.util.HashSet; import java.util.Set; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/ravnika/ClutchOfTheUndercity.java b/Mage.Sets/src/mage/sets/ravnika/ClutchOfTheUndercity.java index 2ba9661f0f2..eaae3c349fa 100644 --- a/Mage.Sets/src/mage/sets/ravnika/ClutchOfTheUndercity.java +++ b/Mage.Sets/src/mage/sets/ravnika/ClutchOfTheUndercity.java @@ -29,14 +29,15 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.TransmuteAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -74,7 +75,7 @@ public class ClutchOfTheUndercity extends CardImpl { class ClutchOfTheUndercityEffect extends OneShotEffect { ClutchOfTheUndercityEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "Its controller loses 3 life"; } @@ -84,7 +85,7 @@ class ClutchOfTheUndercityEffect extends OneShotEffect { // As long as the top card of your library is a creature card, creatures you control that share a color with that card get +1/+1. ConditionalContinousEffect effect = new ConditionalContinousEffect(new CrownOfConvergenceColorBoostEffect(), new TopLibraryCardTypeCondition(CREATURE), rule1); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); // {G}{W}: Put the top card of your library on the bottom of your library. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CrownOfConvergenceEffect(), new ManaCostsImpl("{G}{W}"))); @@ -90,7 +92,7 @@ class CrownOfConvergenceColorBoostEffect extends BoostAllEffect { private static final String effectText = "creatures you control that share a color with that card get +1/+1"; CrownOfConvergenceColorBoostEffect() { - super(1,1, Constants.Duration.WhileOnBattlefield, new FilterCreaturePermanent(), false); + super(1,1, Duration.WhileOnBattlefield, new FilterCreaturePermanent(), false); staticText = effectText; } @@ -125,7 +127,7 @@ class CrownOfConvergenceColorBoostEffect extends BoostAllEffect { class CrownOfConvergenceEffect extends OneShotEffect { public CrownOfConvergenceEffect() { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); staticText = "Put the top card of your library on the bottom of your library"; } @@ -144,7 +146,7 @@ class CrownOfConvergenceEffect extends OneShotEffect { if (you != null) { Card card = you.getLibrary().removeFromTop(game); if (card != null) { - card.moveToZone(Constants.Zone.LIBRARY, source.getId(), game, false); + card.moveToZone(Zone.LIBRARY, source.getId(), game, false); } return true; } diff --git a/Mage.Sets/src/mage/sets/ravnika/CyclopeanSnare.java b/Mage.Sets/src/mage/sets/ravnika/CyclopeanSnare.java index fce6b155cab..47f744b5bf4 100644 --- a/Mage.Sets/src/mage/sets/ravnika/CyclopeanSnare.java +++ b/Mage.Sets/src/mage/sets/ravnika/CyclopeanSnare.java @@ -29,9 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -39,6 +38,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -52,7 +52,7 @@ public class CyclopeanSnare extends CardImpl { this.expansionSetCode = "RAV"; // {3}, {tap}: Tap target creature, then return Cyclopean Snare to its owner's hand. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); ability.addEffect(new ReturnToHandSourceEffect()); diff --git a/Mage.Sets/src/mage/sets/ravnika/DarkConfidant.java b/Mage.Sets/src/mage/sets/ravnika/DarkConfidant.java index 0fd1a91852a..27676e9b4b1 100644 --- a/Mage.Sets/src/mage/sets/ravnika/DarkConfidant.java +++ b/Mage.Sets/src/mage/sets/ravnika/DarkConfidant.java @@ -28,10 +28,10 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -40,6 +40,8 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.game.Game; import mage.players.Player; @@ -60,7 +62,7 @@ public class DarkConfidant extends CardImpl { this.toughness = new MageInt(1); // At the beginning of your upkeep, reveal the top card of your library and put that card into your hand. You lose life equal to its converted mana cost. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DarkConfidantEffect(), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DarkConfidantEffect(), TargetController.YOU, false)); } public DarkConfidant(final DarkConfidant card) { @@ -75,7 +77,7 @@ public class DarkConfidant extends CardImpl { class DarkConfidantEffect extends OneShotEffect { DarkConfidantEffect() { - super(Constants.Outcome.DrawCard); + super(Outcome.DrawCard); this.staticText = "reveal the top card of your library and put that card into your hand. You lose life equal to its converted mana cost"; } diff --git a/Mage.Sets/src/mage/sets/ravnika/DarkHeartOfTheWood.java b/Mage.Sets/src/mage/sets/ravnika/DarkHeartOfTheWood.java index c6e487d756c..48ddc4a1242 100644 --- a/Mage.Sets/src/mage/sets/ravnika/DarkHeartOfTheWood.java +++ b/Mage.Sets/src/mage/sets/ravnika/DarkHeartOfTheWood.java @@ -29,13 +29,13 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; @@ -60,7 +60,7 @@ public class DarkHeartOfTheWood extends CardImpl { this.color.setBlack(true); // Sacrifice a Forest: You gain 3 life. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainLifeEffect(3), new SacrificeTargetCost(new TargetControlledPermanent(filter)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(3), new SacrificeTargetCost(new TargetControlledPermanent(filter)))); } public DarkHeartOfTheWood(final DarkHeartOfTheWood card) { diff --git a/Mage.Sets/src/mage/sets/ravnika/Darkblast.java b/Mage.Sets/src/mage/sets/ravnika/Darkblast.java index 1a5e7d29820..1743ce7a500 100644 --- a/Mage.Sets/src/mage/sets/ravnika/Darkblast.java +++ b/Mage.Sets/src/mage/sets/ravnika/Darkblast.java @@ -28,9 +28,9 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.DredgeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ravnika/DimirAqueduct.java b/Mage.Sets/src/mage/sets/ravnika/DimirAqueduct.java index fd5de0b25b0..934a79c480b 100644 --- a/Mage.Sets/src/mage/sets/ravnika/DimirAqueduct.java +++ b/Mage.Sets/src/mage/sets/ravnika/DimirAqueduct.java @@ -28,9 +28,9 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; diff --git a/Mage.Sets/src/mage/sets/ravnika/DimirGuildmage.java b/Mage.Sets/src/mage/sets/ravnika/DimirGuildmage.java index 81275bfdf78..338db201b65 100644 --- a/Mage.Sets/src/mage/sets/ravnika/DimirGuildmage.java +++ b/Mage.Sets/src/mage/sets/ravnika/DimirGuildmage.java @@ -29,9 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DiscardTargetEffect; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetPlayer; /** @@ -59,11 +59,11 @@ public class DimirGuildmage extends CardImpl { this.toughness = new MageInt(2); // {3}{U}: Target player draws a card. Activate this ability only any time you could cast a sorcery. - Ability firstAbility = new ActivateAsSorceryActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardTargetEffect(1), new ManaCostsImpl("{3}{U}")); + Ability firstAbility = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DrawCardTargetEffect(1), new ManaCostsImpl("{3}{U}")); firstAbility.addTarget(new TargetPlayer()); this.addAbility(firstAbility); // {3}{B}: Target player discards a card. Activate this ability only any time you could cast a sorcery. - Ability secondAbility = new ActivateAsSorceryActivatedAbility(Constants.Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl("{3}{B}")); + Ability secondAbility = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl("{3}{B}")); secondAbility.addTarget(new TargetPlayer()); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/sets/ravnika/DimirHouseGuard.java b/Mage.Sets/src/mage/sets/ravnika/DimirHouseGuard.java index 96b5213e01d..99771304b13 100644 --- a/Mage.Sets/src/mage/sets/ravnika/DimirHouseGuard.java +++ b/Mage.Sets/src/mage/sets/ravnika/DimirHouseGuard.java @@ -29,9 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -39,6 +38,7 @@ import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.FearAbility; import mage.abilities.keyword.TransmuteAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -58,7 +58,7 @@ public class DimirHouseGuard extends CardImpl { this.addAbility(FearAbility.getInstance()); // Sacrifice a creature: Regenerate Dimir House Guard. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); // Transmute {1}{B}{B} this.addAbility(new TransmuteAbility("{1}{B}{B}")); } diff --git a/Mage.Sets/src/mage/sets/ravnika/DimirInfiltrator.java b/Mage.Sets/src/mage/sets/ravnika/DimirInfiltrator.java index 17b3765bc69..b6cf2e9fc85 100644 --- a/Mage.Sets/src/mage/sets/ravnika/DimirInfiltrator.java +++ b/Mage.Sets/src/mage/sets/ravnika/DimirInfiltrator.java @@ -28,8 +28,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TransmuteAbility; import mage.abilities.keyword.UnblockableAbility; diff --git a/Mage.Sets/src/mage/sets/ravnika/DimirSignet.java b/Mage.Sets/src/mage/sets/ravnika/DimirSignet.java index 20bac0ede60..6ad00c6aead 100644 --- a/Mage.Sets/src/mage/sets/ravnika/DimirSignet.java +++ b/Mage.Sets/src/mage/sets/ravnika/DimirSignet.java @@ -29,9 +29,9 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/ravnika/DivebomberGriffin.java b/Mage.Sets/src/mage/sets/ravnika/DivebomberGriffin.java index d4d62f36852..c80a831cd62 100644 --- a/Mage.Sets/src/mage/sets/ravnika/DivebomberGriffin.java +++ b/Mage.Sets/src/mage/sets/ravnika/DivebomberGriffin.java @@ -29,9 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterAttackingOrBlockingCreature; import mage.target.common.TargetCreaturePermanent; @@ -60,7 +60,7 @@ public class DivebomberGriffin extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {tap}, Sacrifice Divebomber Griffin: Divebomber Griffin deals 3 damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(3), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(new FilterAttackingOrBlockingCreature())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/ravnika/DizzySpell.java b/Mage.Sets/src/mage/sets/ravnika/DizzySpell.java index efed10cea63..5251a225da4 100644 --- a/Mage.Sets/src/mage/sets/ravnika/DizzySpell.java +++ b/Mage.Sets/src/mage/sets/ravnika/DizzySpell.java @@ -29,12 +29,12 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.TransmuteAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -50,7 +50,7 @@ public class DizzySpell extends CardImpl { this.color.setBlue(true); // Target creature gets -3/-0 until end of turn. - this.getSpellAbility().addEffect(new BoostTargetEffect(-3, 0, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(-3, 0, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Transmute {1}{U}{U} this.addAbility(new TransmuteAbility("{1}{U}{U}")); diff --git a/Mage.Sets/src/mage/sets/ravnika/DowsingShaman.java b/Mage.Sets/src/mage/sets/ravnika/DowsingShaman.java index ad2db41fe8b..e3318d591e7 100644 --- a/Mage.Sets/src/mage/sets/ravnika/DowsingShaman.java +++ b/Mage.Sets/src/mage/sets/ravnika/DowsingShaman.java @@ -29,9 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCardInYourGraveyard; @@ -66,7 +66,7 @@ public class DowsingShaman extends CardImpl { this.toughness = new MageInt(4); // {2}{G}, {tap}: Return target enchantment card from your graveyard to your hand. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{2}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{2}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/ravnika/DriftOfPhantasms.java b/Mage.Sets/src/mage/sets/ravnika/DriftOfPhantasms.java index 1cb004e6b72..bda8813cba5 100644 --- a/Mage.Sets/src/mage/sets/ravnika/DriftOfPhantasms.java +++ b/Mage.Sets/src/mage/sets/ravnika/DriftOfPhantasms.java @@ -28,8 +28,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/ravnika/DuskmantleHouseOfShadow.java b/Mage.Sets/src/mage/sets/ravnika/DuskmantleHouseOfShadow.java index 5c958f1f4dd..51053d70e90 100644 --- a/Mage.Sets/src/mage/sets/ravnika/DuskmantleHouseOfShadow.java +++ b/Mage.Sets/src/mage/sets/ravnika/DuskmantleHouseOfShadow.java @@ -29,9 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -39,6 +38,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetPlayer; /** @@ -54,7 +54,7 @@ public class DuskmantleHouseOfShadow extends CardImpl { // {tap}: Add {1} to your mana pool. this.addAbility(new ColorlessManaAbility()); // {U}{B}, {tap}: Target player puts the top card of his or her library into his or her graveyard. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(1), new ManaCostsImpl("{U}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(1), new ManaCostsImpl("{U}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/ravnika/ElvesOfDeepShadow.java b/Mage.Sets/src/mage/sets/ravnika/ElvesOfDeepShadow.java index dad48c8926c..7af9bc4d1a3 100644 --- a/Mage.Sets/src/mage/sets/ravnika/ElvesOfDeepShadow.java +++ b/Mage.Sets/src/mage/sets/ravnika/ElvesOfDeepShadow.java @@ -29,9 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -57,7 +57,7 @@ public class ElvesOfDeepShadow extends CardImpl { this.toughness = new MageInt(1); // {tap}: Add {B} to your mana pool. Elves of Deep Shadow deals 1 damage to you. - Ability ability = new SimpleManaAbility(Constants.Zone.BATTLEFIELD, Mana.BlackMana, new TapSourceCost()); + Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana, new TapSourceCost()); ability.addEffect(new DamageControllerEffect(1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/ElvishSkysweeper.java b/Mage.Sets/src/mage/sets/ravnika/ElvishSkysweeper.java index bb6168114e5..4e4ffb862fa 100644 --- a/Mage.Sets/src/mage/sets/ravnika/ElvishSkysweeper.java +++ b/Mage.Sets/src/mage/sets/ravnika/ElvishSkysweeper.java @@ -29,9 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -68,7 +68,7 @@ public class ElvishSkysweeper extends CardImpl { this.toughness = new MageInt(1); // {4}{G}, Sacrifice a creature: Destroy target creature with flying. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{4}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{4}{G}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/ravnika/EtherealUsher.java b/Mage.Sets/src/mage/sets/ravnika/EtherealUsher.java index d2d25f60f89..b0efcdc45c8 100644 --- a/Mage.Sets/src/mage/sets/ravnika/EtherealUsher.java +++ b/Mage.Sets/src/mage/sets/ravnika/EtherealUsher.java @@ -28,9 +28,9 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/ravnika/Farseek.java b/Mage.Sets/src/mage/sets/ravnika/Farseek.java index 6b7faf55a59..042f07281db 100644 --- a/Mage.Sets/src/mage/sets/ravnika/Farseek.java +++ b/Mage.Sets/src/mage/sets/ravnika/Farseek.java @@ -29,11 +29,11 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -62,7 +62,7 @@ public class Farseek extends CardImpl { this.color.setGreen(true); // Search your library for a Plains, Island, Swamp, or Mountain card and put it onto the battlefield tapped. Then shuffle your library. - this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), true, Constants.Outcome.PutLandInPlay)); + this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), true, Outcome.PutLandInPlay)); } public Farseek(final Farseek card) { diff --git a/Mage.Sets/src/mage/sets/ravnika/FieryConclusion.java b/Mage.Sets/src/mage/sets/ravnika/FieryConclusion.java index 65a0090d273..d8ab8dc32d2 100644 --- a/Mage.Sets/src/mage/sets/ravnika/FieryConclusion.java +++ b/Mage.Sets/src/mage/sets/ravnika/FieryConclusion.java @@ -28,8 +28,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ravnika/FiremaneAngel.java b/Mage.Sets/src/mage/sets/ravnika/FiremaneAngel.java index e2552e34210..a5fe5cc493a 100644 --- a/Mage.Sets/src/mage/sets/ravnika/FiremaneAngel.java +++ b/Mage.Sets/src/mage/sets/ravnika/FiremaneAngel.java @@ -29,9 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -43,6 +42,8 @@ import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffec import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; +import mage.constants.Zone; /** * @@ -63,10 +64,10 @@ public class FiremaneAngel extends CardImpl { this.addAbility(FlyingAbility.getInstance()); this.addAbility(FirstStrikeAbility.getInstance()); // At the beginning of your upkeep, if Firemane Angel is in your graveyard or on the battlefield, you may gain 1 life. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new GainLifeEffect(1), Constants.TargetController.YOU, true)); - this.addAbility(new BeginningOfUpkeepTriggeredAbility(Constants.Zone.GRAVEYARD, new GainLifeEffect(1), Constants.TargetController.YOU, true)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new GainLifeEffect(1), TargetController.YOU, true)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.GRAVEYARD, new GainLifeEffect(1), TargetController.YOU, true)); // {6}{R}{R}{W}{W}: Return Firemane Angel from your graveyard to the battlefield. Activate this ability only during your upkeep. - Ability ability = new SimpleActivatedAbility(Constants.Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(), new ManaCostsImpl("{6}{R}{R}{W}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(), new ManaCostsImpl("{6}{R}{R}{W}{W}")); ability.addCost(new OnlyDuringUpkeepCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/FistsOfIronwood.java b/Mage.Sets/src/mage/sets/ravnika/FistsOfIronwood.java index 559f222d9ff..58bc365f685 100644 --- a/Mage.Sets/src/mage/sets/ravnika/FistsOfIronwood.java +++ b/Mage.Sets/src/mage/sets/ravnika/FistsOfIronwood.java @@ -29,9 +29,7 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -61,13 +59,13 @@ public class FistsOfIronwood extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // When Fists of Ironwood enters the battlefield, put two 1/1 green Saproling creature tokens onto the battlefield. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new SaprolingToken(), 2), false)); // Enchanted creature has trample. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA))); } public FistsOfIronwood(final FistsOfIronwood card) { diff --git a/Mage.Sets/src/mage/sets/ravnika/FlameFusillade.java b/Mage.Sets/src/mage/sets/ravnika/FlameFusillade.java index a1aa5837583..0ce963dd784 100644 --- a/Mage.Sets/src/mage/sets/ravnika/FlameFusillade.java +++ b/Mage.Sets/src/mage/sets/ravnika/FlameFusillade.java @@ -29,15 +29,16 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; /** @@ -53,9 +54,9 @@ public class FlameFusillade extends CardImpl { this.color.setRed(true); // Until end of turn, permanents you control gain "{tap}: This permanent deals 1 damage to target creature or player." - Ability gainedAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); gainedAbility.addTarget(new TargetCreatureOrPlayer()); - this.getSpellAbility().addEffect(new GainAbilityControlledEffect(gainedAbility, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainAbilityControlledEffect(gainedAbility, Duration.EndOfTurn)); } public FlameFusillade(final FlameFusillade card) { diff --git a/Mage.Sets/src/mage/sets/ravnika/FlameKinZealot.java b/Mage.Sets/src/mage/sets/ravnika/FlameKinZealot.java index f2f97bb2573..8dab462b408 100644 --- a/Mage.Sets/src/mage/sets/ravnika/FlameKinZealot.java +++ b/Mage.Sets/src/mage/sets/ravnika/FlameKinZealot.java @@ -29,9 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -39,6 +38,7 @@ import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; /** @@ -59,8 +59,8 @@ public class FlameKinZealot extends CardImpl { this.toughness = new MageInt(2); // When Flame-Kin Zealot enters the battlefield, creatures you control get +1/+1 and gain haste until end of turn. - Ability ability = new EntersBattlefieldTriggeredAbility(new BoostControlledEffect(1, 1, Constants.Duration.EndOfTurn)); - ability.addEffect(new GainAbilityControlledEffect(HasteAbility.getInstance(), Constants.Duration.EndOfTurn, new FilterCreaturePermanent())); + Ability ability = new EntersBattlefieldTriggeredAbility(new BoostControlledEffect(1, 1, Duration.EndOfTurn)); + ability.addEffect(new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.EndOfTurn, new FilterCreaturePermanent())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/FlightOfFancy.java b/Mage.Sets/src/mage/sets/ravnika/FlightOfFancy.java index 998b7f5e7d6..2a08a77baec 100644 --- a/Mage.Sets/src/mage/sets/ravnika/FlightOfFancy.java +++ b/Mage.Sets/src/mage/sets/ravnika/FlightOfFancy.java @@ -29,9 +29,7 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -60,13 +58,13 @@ public class FlightOfFancy extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // When Flight of Fancy enters the battlefield, draw two cards. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardControllerEffect(2), false)); // Enchanted creature has flying. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); } public FlightOfFancy(final FlightOfFancy card) { diff --git a/Mage.Sets/src/mage/sets/ravnika/GalvanicArc.java b/Mage.Sets/src/mage/sets/ravnika/GalvanicArc.java index 72d0366c608..065ea6e5a24 100644 --- a/Mage.Sets/src/mage/sets/ravnika/GalvanicArc.java +++ b/Mage.Sets/src/mage/sets/ravnika/GalvanicArc.java @@ -29,9 +29,7 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -61,7 +59,7 @@ public class GalvanicArc extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // When Galvanic Arc enters the battlefield, it deals 3 damage to target creature or player. @@ -69,7 +67,7 @@ public class GalvanicArc extends CardImpl { triggeredAbility.addTarget(new TargetCreatureOrPlayer()); this.addAbility(triggeredAbility); // Enchanted creature has first strike. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); } public GalvanicArc(final GalvanicArc card) { diff --git a/Mage.Sets/src/mage/sets/ravnika/GateHound.java b/Mage.Sets/src/mage/sets/ravnika/GateHound.java index 026b291135d..1a4a12efe1a 100644 --- a/Mage.Sets/src/mage/sets/ravnika/GateHound.java +++ b/Mage.Sets/src/mage/sets/ravnika/GateHound.java @@ -28,10 +28,10 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EnchantedCondition; diff --git a/Mage.Sets/src/mage/sets/ravnika/GatherCourage.java b/Mage.Sets/src/mage/sets/ravnika/GatherCourage.java index 0ebf3cf7732..1c4b3193de3 100644 --- a/Mage.Sets/src/mage/sets/ravnika/GatherCourage.java +++ b/Mage.Sets/src/mage/sets/ravnika/GatherCourage.java @@ -28,12 +28,13 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.ConvokeAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -51,7 +52,7 @@ public class GatherCourage extends CardImpl { // Convoke this.addAbility(new ConvokeAbility()); // Target creature gets +2/+2 until end of turn. - this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/ravnika/GlareOfSubdual.java b/Mage.Sets/src/mage/sets/ravnika/GlareOfSubdual.java index 7f79c349059..abb65886aea 100644 --- a/Mage.Sets/src/mage/sets/ravnika/GlareOfSubdual.java +++ b/Mage.Sets/src/mage/sets/ravnika/GlareOfSubdual.java @@ -29,14 +29,14 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; @@ -69,7 +69,7 @@ public class GlareOfSubdual extends CardImpl { this.color.setWhite(true); // Tap an untapped creature you control: Tap target artifact or creature. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new TapTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filterCost, true))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filterCost, true))); ability.addTarget(new TargetPermanent(filterTarget)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/GlassGolem.java b/Mage.Sets/src/mage/sets/ravnika/GlassGolem.java index c36391b3597..5dad27310da 100644 --- a/Mage.Sets/src/mage/sets/ravnika/GlassGolem.java +++ b/Mage.Sets/src/mage/sets/ravnika/GlassGolem.java @@ -29,8 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ravnika/GlimpseTheUnthinkable.java b/Mage.Sets/src/mage/sets/ravnika/GlimpseTheUnthinkable.java index 5054a5f9abd..25222b3d65a 100644 --- a/Mage.Sets/src/mage/sets/ravnika/GlimpseTheUnthinkable.java +++ b/Mage.Sets/src/mage/sets/ravnika/GlimpseTheUnthinkable.java @@ -28,8 +28,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/ravnika/GoblinSpelunkers.java b/Mage.Sets/src/mage/sets/ravnika/GoblinSpelunkers.java index 7a08fdfe496..2d1c2b1559f 100644 --- a/Mage.Sets/src/mage/sets/ravnika/GoblinSpelunkers.java +++ b/Mage.Sets/src/mage/sets/ravnika/GoblinSpelunkers.java @@ -28,8 +28,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.MountainwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ravnika/GolgariGraveTroll.java b/Mage.Sets/src/mage/sets/ravnika/GolgariGraveTroll.java index 759fd7eb358..4c9d63b9f72 100644 --- a/Mage.Sets/src/mage/sets/ravnika/GolgariGraveTroll.java +++ b/Mage.Sets/src/mage/sets/ravnika/GolgariGraveTroll.java @@ -28,10 +28,10 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; diff --git a/Mage.Sets/src/mage/sets/ravnika/GolgariGuildmage.java b/Mage.Sets/src/mage/sets/ravnika/GolgariGuildmage.java index 872988a5c28..8aba354de65 100644 --- a/Mage.Sets/src/mage/sets/ravnika/GolgariGuildmage.java +++ b/Mage.Sets/src/mage/sets/ravnika/GolgariGuildmage.java @@ -30,9 +30,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; @@ -62,11 +62,11 @@ public class GolgariGuildmage extends CardImpl { this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{4}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{4}{B}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard"))); this.addAbility(ability); - ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl("{4}{G}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl("{4}{G}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/GolgariRotFarm.java b/Mage.Sets/src/mage/sets/ravnika/GolgariRotFarm.java index 922ba64f260..5eecadafa95 100644 --- a/Mage.Sets/src/mage/sets/ravnika/GolgariRotFarm.java +++ b/Mage.Sets/src/mage/sets/ravnika/GolgariRotFarm.java @@ -27,9 +27,9 @@ */ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; diff --git a/Mage.Sets/src/mage/sets/ravnika/GolgariRotwurm.java b/Mage.Sets/src/mage/sets/ravnika/GolgariRotwurm.java index e76ed0f627b..4504aa7b844 100644 --- a/Mage.Sets/src/mage/sets/ravnika/GolgariRotwurm.java +++ b/Mage.Sets/src/mage/sets/ravnika/GolgariRotwurm.java @@ -29,9 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.target.TargetPlayer; import mage.target.common.TargetControlledCreaturePermanent; @@ -60,7 +61,7 @@ public class GolgariRotwurm extends CardImpl { this.toughness = new MageInt(4); // {B}, Sacrifice a creature: Target player loses 1 life. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ColoredManaCost(Constants.ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/ravnika/GolgariSignet.java b/Mage.Sets/src/mage/sets/ravnika/GolgariSignet.java index addbe6a5853..5056c54231d 100644 --- a/Mage.Sets/src/mage/sets/ravnika/GolgariSignet.java +++ b/Mage.Sets/src/mage/sets/ravnika/GolgariSignet.java @@ -30,15 +30,15 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -49,7 +49,7 @@ public class GolgariSignet extends CardImpl { public GolgariSignet (UUID ownerId) { super(ownerId, 262, "Golgari Signet", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "RAV"; - Ability ability = new SimpleManaAbility(Constants.Zone.BATTLEFIELD, new Mana(0, 1, 0, 0, 1, 0, 0), new GenericManaCost(1)); + Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(0, 1, 0, 0, 1, 0, 0), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/GolgariThug.java b/Mage.Sets/src/mage/sets/ravnika/GolgariThug.java index 00920383b49..268a0a26619 100644 --- a/Mage.Sets/src/mage/sets/ravnika/GolgariThug.java +++ b/Mage.Sets/src/mage/sets/ravnika/GolgariThug.java @@ -28,8 +28,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/ravnika/GoliathSpider.java b/Mage.Sets/src/mage/sets/ravnika/GoliathSpider.java index 5390f5a837b..5f374e08688 100644 --- a/Mage.Sets/src/mage/sets/ravnika/GoliathSpider.java +++ b/Mage.Sets/src/mage/sets/ravnika/GoliathSpider.java @@ -28,8 +28,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ravnika/GraveShellScarab.java b/Mage.Sets/src/mage/sets/ravnika/GraveShellScarab.java index 90c5031c576..93e72fc2210 100644 --- a/Mage.Sets/src/mage/sets/ravnika/GraveShellScarab.java +++ b/Mage.Sets/src/mage/sets/ravnika/GraveShellScarab.java @@ -28,9 +28,9 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +39,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.keyword.DredgeAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -57,7 +58,7 @@ public class GraveShellScarab extends CardImpl { this.toughness = new MageInt(4); // {1}, Sacrifice Grave-Shell Scarab: Draw a card. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); // Dredge 1 diff --git a/Mage.Sets/src/mage/sets/ravnika/GrayscaledGharial.java b/Mage.Sets/src/mage/sets/ravnika/GrayscaledGharial.java index 93ed460689b..5da1a71ac36 100644 --- a/Mage.Sets/src/mage/sets/ravnika/GrayscaledGharial.java +++ b/Mage.Sets/src/mage/sets/ravnika/GrayscaledGharial.java @@ -29,8 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.IslandwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ravnika/GreaterForgeling.java b/Mage.Sets/src/mage/sets/ravnika/GreaterForgeling.java index 761cf9a9410..4b48fd882ea 100644 --- a/Mage.Sets/src/mage/sets/ravnika/GreaterForgeling.java +++ b/Mage.Sets/src/mage/sets/ravnika/GreaterForgeling.java @@ -29,14 +29,15 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -54,7 +55,7 @@ public class GreaterForgeling extends CardImpl { this.toughness = new MageInt(4); // {1}{R}: Greater Forgeling gets +3/-3 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(3, -3, Constants.Duration.EndOfTurn), new ManaCostsImpl("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3, -3, Duration.EndOfTurn), new ManaCostsImpl("{1}{R}"))); } public GreaterForgeling(final GreaterForgeling card) { diff --git a/Mage.Sets/src/mage/sets/ravnika/GreaterMossdog.java b/Mage.Sets/src/mage/sets/ravnika/GreaterMossdog.java index 75a4266aad7..2dddb0058d4 100644 --- a/Mage.Sets/src/mage/sets/ravnika/GreaterMossdog.java +++ b/Mage.Sets/src/mage/sets/ravnika/GreaterMossdog.java @@ -28,8 +28,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DredgeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ravnika/GuardianOfVituGhazi.java b/Mage.Sets/src/mage/sets/ravnika/GuardianOfVituGhazi.java index 333182176dd..42155bb788d 100644 --- a/Mage.Sets/src/mage/sets/ravnika/GuardianOfVituGhazi.java +++ b/Mage.Sets/src/mage/sets/ravnika/GuardianOfVituGhazi.java @@ -28,8 +28,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ConvokeAbility; import mage.abilities.keyword.VigilanceAbility; diff --git a/Mage.Sets/src/mage/sets/ravnika/HalcyonGlaze.java b/Mage.Sets/src/mage/sets/ravnika/HalcyonGlaze.java index 5f766df1d8c..42a22fb36f3 100644 --- a/Mage.Sets/src/mage/sets/ravnika/HalcyonGlaze.java +++ b/Mage.Sets/src/mage/sets/ravnika/HalcyonGlaze.java @@ -28,14 +28,15 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.common.continious.BecomesCreatureSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.permanent.token.Token; @@ -59,7 +60,7 @@ public class HalcyonGlaze extends CardImpl { this.color.setBlue(true); // Whenever you cast a creature spell, Halcyon Glaze becomes a 4/4 Illusion creature with flying until end of turn. It's still an enchantment. - this.addAbility(new SpellCastTriggeredAbility(new BecomesCreatureSourceEffect(new HalcyonGlazeToken(), "enchantment", Constants.Duration.EndOfTurn), filter, false)); + this.addAbility(new SpellCastTriggeredAbility(new BecomesCreatureSourceEffect(new HalcyonGlazeToken(), "enchantment", Duration.EndOfTurn), filter, false)); } public HalcyonGlaze(final HalcyonGlaze card) { diff --git a/Mage.Sets/src/mage/sets/ravnika/Hex.java b/Mage.Sets/src/mage/sets/ravnika/Hex.java index a03bbfe73e4..80c120cd8b9 100644 --- a/Mage.Sets/src/mage/sets/ravnika/Hex.java +++ b/Mage.Sets/src/mage/sets/ravnika/Hex.java @@ -28,8 +28,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/ravnika/HuntedDragon.java b/Mage.Sets/src/mage/sets/ravnika/HuntedDragon.java index 6e05aaccab8..bdfa6343002 100644 --- a/Mage.Sets/src/mage/sets/ravnika/HuntedDragon.java +++ b/Mage.Sets/src/mage/sets/ravnika/HuntedDragon.java @@ -28,8 +28,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/ravnika/HuntedHorror.java b/Mage.Sets/src/mage/sets/ravnika/HuntedHorror.java index 01a8d02997b..eb96a24a026 100644 --- a/Mage.Sets/src/mage/sets/ravnika/HuntedHorror.java +++ b/Mage.Sets/src/mage/sets/ravnika/HuntedHorror.java @@ -29,8 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/ravnika/HuntedLammasu.java b/Mage.Sets/src/mage/sets/ravnika/HuntedLammasu.java index f63478f03de..9746f10df65 100644 --- a/Mage.Sets/src/mage/sets/ravnika/HuntedLammasu.java +++ b/Mage.Sets/src/mage/sets/ravnika/HuntedLammasu.java @@ -29,8 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/ravnika/HuntedPhantasm.java b/Mage.Sets/src/mage/sets/ravnika/HuntedPhantasm.java index db666226acd..f5c2ca66cc9 100644 --- a/Mage.Sets/src/mage/sets/ravnika/HuntedPhantasm.java +++ b/Mage.Sets/src/mage/sets/ravnika/HuntedPhantasm.java @@ -28,8 +28,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/ravnika/HuntedTroll.java b/Mage.Sets/src/mage/sets/ravnika/HuntedTroll.java index affc675d9eb..81fee6bff82 100644 --- a/Mage.Sets/src/mage/sets/ravnika/HuntedTroll.java +++ b/Mage.Sets/src/mage/sets/ravnika/HuntedTroll.java @@ -29,9 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -42,6 +41,8 @@ import mage.abilities.effects.common.CreateTokenTargetEffect; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.game.permanent.token.Token; import mage.target.Target; import mage.target.common.TargetOpponent; @@ -69,7 +70,7 @@ public class HuntedTroll extends CardImpl { ability.addTarget(target); this.addAbility(ability); // {G}: Regenerate Hunted Troll. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.G))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.G))); } public HuntedTroll(final HuntedTroll card) { diff --git a/Mage.Sets/src/mage/sets/ravnika/InfectiousHost.java b/Mage.Sets/src/mage/sets/ravnika/InfectiousHost.java index 416e11e4d4c..1a6374dc520 100644 --- a/Mage.Sets/src/mage/sets/ravnika/InfectiousHost.java +++ b/Mage.Sets/src/mage/sets/ravnika/InfectiousHost.java @@ -28,8 +28,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/ravnika/IvyDancer.java b/Mage.Sets/src/mage/sets/ravnika/IvyDancer.java index 682082ba6fb..7129d006fdb 100644 --- a/Mage.Sets/src/mage/sets/ravnika/IvyDancer.java +++ b/Mage.Sets/src/mage/sets/ravnika/IvyDancer.java @@ -29,9 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.ForestwalkAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -58,7 +59,7 @@ public class IvyDancer extends CardImpl { this.toughness = new MageInt(2); // {tap}: Target creature gains forestwalk until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityTargetEffect(new ForestwalkAbility(), Constants.Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new ForestwalkAbility(), Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/KeeningBanshee.java b/Mage.Sets/src/mage/sets/ravnika/KeeningBanshee.java index 9eb6f4fd762..e3136064506 100644 --- a/Mage.Sets/src/mage/sets/ravnika/KeeningBanshee.java +++ b/Mage.Sets/src/mage/sets/ravnika/KeeningBanshee.java @@ -29,15 +29,15 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -57,7 +57,7 @@ public class KeeningBanshee extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Keening Banshee enters the battlefield, target creature gets -2/-2 until end of turn. - Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(-2, -2, Constants.Duration.EndOfTurn), false); + Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(-2, -2, Duration.EndOfTurn), false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/LastGasp.java b/Mage.Sets/src/mage/sets/ravnika/LastGasp.java index 24b4eb67203..4066e05215c 100644 --- a/Mage.Sets/src/mage/sets/ravnika/LastGasp.java +++ b/Mage.Sets/src/mage/sets/ravnika/LastGasp.java @@ -29,11 +29,11 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -49,7 +49,7 @@ public class LastGasp extends CardImpl { this.color.setBlack(true); // Target creature gets -3/-3 until end of turn. - this.getSpellAbility().addEffect(new BoostTargetEffect(-3, -3, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(-3, -3, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/ravnika/LeaveNoTrace.java b/Mage.Sets/src/mage/sets/ravnika/LeaveNoTrace.java index a25304c8079..04ff2023868 100644 --- a/Mage.Sets/src/mage/sets/ravnika/LeaveNoTrace.java +++ b/Mage.Sets/src/mage/sets/ravnika/LeaveNoTrace.java @@ -29,13 +29,13 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; @@ -81,7 +81,7 @@ class LeaveNoTraceEffect extends OneShotEffect { } LeaveNoTraceEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); staticText = "Radiance - Destroy target enchantment and each other enchantment that shares a color with it"; } diff --git a/Mage.Sets/src/mage/sets/ravnika/LifeFromTheLoam.java b/Mage.Sets/src/mage/sets/ravnika/LifeFromTheLoam.java index 5dbd4f4c02a..8189dbcdf14 100644 --- a/Mage.Sets/src/mage/sets/ravnika/LifeFromTheLoam.java +++ b/Mage.Sets/src/mage/sets/ravnika/LifeFromTheLoam.java @@ -28,8 +28,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.DredgeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ravnika/LightningHelix.java b/Mage.Sets/src/mage/sets/ravnika/LightningHelix.java index 513bd94bfe0..b91a575c58b 100644 --- a/Mage.Sets/src/mage/sets/ravnika/LightningHelix.java +++ b/Mage.Sets/src/mage/sets/ravnika/LightningHelix.java @@ -29,8 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ravnika/LoreBroker.java b/Mage.Sets/src/mage/sets/ravnika/LoreBroker.java index 483ce792567..72db5a847ee 100644 --- a/Mage.Sets/src/mage/sets/ravnika/LoreBroker.java +++ b/Mage.Sets/src/mage/sets/ravnika/LoreBroker.java @@ -28,9 +28,9 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DiscardEachPlayerEffect; import mage.abilities.effects.common.DrawCardAllEffect; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -56,7 +57,7 @@ public class LoreBroker extends CardImpl { this.toughness = new MageInt(2); // {tap}: Each player draws a card, then discards a card. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardAllEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardAllEffect(1), new TapSourceCost()); ability.addEffect(new DiscardEachPlayerEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/Mindmoil.java b/Mage.Sets/src/mage/sets/ravnika/Mindmoil.java index 16a360488b3..722d148f5a9 100644 --- a/Mage.Sets/src/mage/sets/ravnika/Mindmoil.java +++ b/Mage.Sets/src/mage/sets/ravnika/Mindmoil.java @@ -28,9 +28,9 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -38,6 +38,8 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.game.Game; import mage.players.Player; @@ -72,7 +74,7 @@ public class Mindmoil extends CardImpl { class MindmoilEffect extends OneShotEffect { public MindmoilEffect() { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); staticText = "put the cards in your hand on the bottom of your library in any order, then draw that many cards"; } @@ -89,20 +91,20 @@ class MindmoilEffect extends OneShotEffect { for (Card card : you.getHand().getCards(game)) { cards.add(card.getId()); } - TargetCard target = new TargetCard(Constants.Zone.PICK, new FilterCard("card to put on the bottom of your library")); + TargetCard target = new TargetCard(Zone.PICK, new FilterCard("card to put on the bottom of your library")); target.setRequired(true); while (cards.size() > 1) { - you.choose(Constants.Outcome.Neutral, cards, target, game); + you.choose(Outcome.Neutral, cards, target, game); Card card = cards.get(target.getFirstTarget(), game); if (card != null) { cards.remove(card); - card.moveToZone(Constants.Zone.LIBRARY, source.getId(), game, false); + card.moveToZone(Zone.LIBRARY, source.getId(), game, false); } target.clearChosen(); } if (cards.size() == 1) { Card card = cards.get(cards.iterator().next(), game); - card.moveToZone(Constants.Zone.LIBRARY, source.getId(), game, false); + card.moveToZone(Zone.LIBRARY, source.getId(), game, false); } you.getHand().clear(); you.drawCards(count, game); diff --git a/Mage.Sets/src/mage/sets/ravnika/MoldervineCloak.java b/Mage.Sets/src/mage/sets/ravnika/MoldervineCloak.java index d10cacda03d..3ead49c5f99 100644 --- a/Mage.Sets/src/mage/sets/ravnika/MoldervineCloak.java +++ b/Mage.Sets/src/mage/sets/ravnika/MoldervineCloak.java @@ -28,11 +28,11 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continious.BoostEnchantedEffect; diff --git a/Mage.Sets/src/mage/sets/ravnika/Moroii.java b/Mage.Sets/src/mage/sets/ravnika/Moroii.java index 27c07c4849c..5e785cebfcd 100644 --- a/Mage.Sets/src/mage/sets/ravnika/Moroii.java +++ b/Mage.Sets/src/mage/sets/ravnika/Moroii.java @@ -29,14 +29,14 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.LoseLifeSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; /** * @@ -56,7 +56,7 @@ public class Moroii extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // At the beginning of your upkeep, you lose 1 life. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new LoseLifeSourceEffect(1), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new LoseLifeSourceEffect(1), TargetController.YOU, false)); } public Moroii(final Moroii card) { diff --git a/Mage.Sets/src/mage/sets/ravnika/MuddleTheMixture.java b/Mage.Sets/src/mage/sets/ravnika/MuddleTheMixture.java index 51fee86e60e..19f6d087456 100644 --- a/Mage.Sets/src/mage/sets/ravnika/MuddleTheMixture.java +++ b/Mage.Sets/src/mage/sets/ravnika/MuddleTheMixture.java @@ -28,8 +28,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.keyword.TransmuteAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ravnika/NightguardPatrol.java b/Mage.Sets/src/mage/sets/ravnika/NightguardPatrol.java index e6f8e8bcb1c..fd1e40fdfa9 100644 --- a/Mage.Sets/src/mage/sets/ravnika/NightguardPatrol.java +++ b/Mage.Sets/src/mage/sets/ravnika/NightguardPatrol.java @@ -29,8 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.VigilanceAbility; diff --git a/Mage.Sets/src/mage/sets/ravnika/NightmareVoid.java b/Mage.Sets/src/mage/sets/ravnika/NightmareVoid.java index 142e9daf24b..477805cbcc3 100644 --- a/Mage.Sets/src/mage/sets/ravnika/NightmareVoid.java +++ b/Mage.Sets/src/mage/sets/ravnika/NightmareVoid.java @@ -28,10 +28,10 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.DredgeAbility; diff --git a/Mage.Sets/src/mage/sets/ravnika/NullmageShepherd.java b/Mage.Sets/src/mage/sets/ravnika/NullmageShepherd.java index 15a76e069ae..48d66b6dbc2 100644 --- a/Mage.Sets/src/mage/sets/ravnika/NullmageShepherd.java +++ b/Mage.Sets/src/mage/sets/ravnika/NullmageShepherd.java @@ -29,15 +29,15 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; @@ -73,7 +73,7 @@ public class NullmageShepherd extends CardImpl { this.toughness = new MageInt(4); // Tap four untapped creatures you control: Destroy target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(4, 4, filterCost, true))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(4, 4, filterCost, true))); ability.addTarget(new TargetPermanent(filterTarget)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/OathswornGiant.java b/Mage.Sets/src/mage/sets/ravnika/OathswornGiant.java index f1de9de4717..3e1648c4c62 100644 --- a/Mage.Sets/src/mage/sets/ravnika/OathswornGiant.java +++ b/Mage.Sets/src/mage/sets/ravnika/OathswornGiant.java @@ -29,9 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -39,6 +38,8 @@ import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; /** @@ -59,8 +60,8 @@ public class OathswornGiant extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Other creatures you control get +0/+2 and have vigilance. - Ability ability = new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(0, 2, Constants.Duration.WhileOnBattlefield, new FilterCreaturePermanent(), true)); - ability.addEffect(new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Constants.Duration.WhileOnBattlefield, new FilterCreaturePermanent(), true)); + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 2, Duration.WhileOnBattlefield, new FilterCreaturePermanent(), true)); + ability.addEffect(new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent(), true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/OvergrownTomb.java b/Mage.Sets/src/mage/sets/ravnika/OvergrownTomb.java index 807f8d278d8..59a340a244a 100644 --- a/Mage.Sets/src/mage/sets/ravnika/OvergrownTomb.java +++ b/Mage.Sets/src/mage/sets/ravnika/OvergrownTomb.java @@ -29,8 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.effects.common.TapSourceUnlessPaysEffect; diff --git a/Mage.Sets/src/mage/sets/ravnika/Overwhelm.java b/Mage.Sets/src/mage/sets/ravnika/Overwhelm.java index 154be73e7cc..604b5be72da 100644 --- a/Mage.Sets/src/mage/sets/ravnika/Overwhelm.java +++ b/Mage.Sets/src/mage/sets/ravnika/Overwhelm.java @@ -28,9 +28,9 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.keyword.ConvokeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ravnika/PeregrineMask.java b/Mage.Sets/src/mage/sets/ravnika/PeregrineMask.java index 55b17ad94d3..e22fe1ab314 100644 --- a/Mage.Sets/src/mage/sets/ravnika/PeregrineMask.java +++ b/Mage.Sets/src/mage/sets/ravnika/PeregrineMask.java @@ -29,9 +29,7 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -53,12 +51,12 @@ public class PeregrineMask extends CardImpl { this.expansionSetCode = "RAV"; this.subtype.add("Equipment"); // Equipped creature has defender, flying, and first strike. - Ability ability = new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DefenderAbility.getInstance(), Constants.AttachmentType.EQUIPMENT)); - ability.addEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), Constants.AttachmentType.EQUIPMENT)); - ability.addEffect(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), Constants.AttachmentType.EQUIPMENT)); + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DefenderAbility.getInstance(), AttachmentType.EQUIPMENT)); + ability.addEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.EQUIPMENT)); + ability.addEffect(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT)); this.addAbility(ability); // Equip {2} - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(2))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); } public PeregrineMask(final PeregrineMask card) { diff --git a/Mage.Sets/src/mage/sets/ravnika/Phytohydra.java b/Mage.Sets/src/mage/sets/ravnika/Phytohydra.java index c3e2026d779..199b5550202 100644 --- a/Mage.Sets/src/mage/sets/ravnika/Phytohydra.java +++ b/Mage.Sets/src/mage/sets/ravnika/Phytohydra.java @@ -29,9 +29,7 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -61,7 +59,7 @@ public class Phytohydra extends CardImpl { this.toughness = new MageInt(1); // If damage would be dealt to Phytohydra, put that many +1/+1 counters on it instead. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new PhytohydraEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PhytohydraEffect())); } public Phytohydra(final Phytohydra card) { @@ -76,7 +74,7 @@ public class Phytohydra extends CardImpl { class PhytohydraEffect extends ReplacementEffectImpl { PhytohydraEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.BoostCreature); + super(Duration.WhileOnBattlefield, Outcome.BoostCreature); staticText = "If damage would be dealt to {this}, put that many +1/+1 counters on it instead"; } diff --git a/Mage.Sets/src/mage/sets/ravnika/PrimordialSage.java b/Mage.Sets/src/mage/sets/ravnika/PrimordialSage.java index a42a628410b..67e9db4aa5b 100644 --- a/Mage.Sets/src/mage/sets/ravnika/PrimordialSage.java +++ b/Mage.Sets/src/mage/sets/ravnika/PrimordialSage.java @@ -28,8 +28,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/ravnika/PrivilegedPosition.java b/Mage.Sets/src/mage/sets/ravnika/PrivilegedPosition.java index fa44214e2ff..127e70fd6e0 100644 --- a/Mage.Sets/src/mage/sets/ravnika/PrivilegedPosition.java +++ b/Mage.Sets/src/mage/sets/ravnika/PrivilegedPosition.java @@ -29,13 +29,14 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.FilterPermanent; /** @@ -52,7 +53,7 @@ public class PrivilegedPosition extends CardImpl { this.color.setWhite(true); // Other permanents you control have hexproof. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityControlledEffect(HexproofAbility.getInstance(), Constants.Duration.WhileOnBattlefield, new FilterPermanent(), true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, new FilterPermanent(), true))); } public PrivilegedPosition(final PrivilegedPosition card) { diff --git a/Mage.Sets/src/mage/sets/ravnika/Putrefy.java b/Mage.Sets/src/mage/sets/ravnika/Putrefy.java index f7dcb961d5a..743d3bd927f 100644 --- a/Mage.Sets/src/mage/sets/ravnika/Putrefy.java +++ b/Mage.Sets/src/mage/sets/ravnika/Putrefy.java @@ -29,8 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/ravnika/RainOfEmbers.java b/Mage.Sets/src/mage/sets/ravnika/RainOfEmbers.java index 940787efa33..7761fdfffa2 100644 --- a/Mage.Sets/src/mage/sets/ravnika/RainOfEmbers.java +++ b/Mage.Sets/src/mage/sets/ravnika/RainOfEmbers.java @@ -28,8 +28,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageEverythingEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ravnika/Remand.java b/Mage.Sets/src/mage/sets/ravnika/Remand.java index ff839b80742..07586090802 100644 --- a/Mage.Sets/src/mage/sets/ravnika/Remand.java +++ b/Mage.Sets/src/mage/sets/ravnika/Remand.java @@ -28,9 +28,9 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.effects.common.CounterTargetWithReplacementEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ravnika/RoofstalkerWight.java b/Mage.Sets/src/mage/sets/ravnika/RoofstalkerWight.java index 2010c1e0e14..2506824401e 100644 --- a/Mage.Sets/src/mage/sets/ravnika/RoofstalkerWight.java +++ b/Mage.Sets/src/mage/sets/ravnika/RoofstalkerWight.java @@ -29,10 +29,10 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/ravnika/SacredFoundry.java b/Mage.Sets/src/mage/sets/ravnika/SacredFoundry.java index b35be4c302d..177384cd41b 100644 --- a/Mage.Sets/src/mage/sets/ravnika/SacredFoundry.java +++ b/Mage.Sets/src/mage/sets/ravnika/SacredFoundry.java @@ -29,8 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.effects.common.TapSourceUnlessPaysEffect; diff --git a/Mage.Sets/src/mage/sets/ravnika/Sandsower.java b/Mage.Sets/src/mage/sets/ravnika/Sandsower.java index 48737d45ff1..234ebcab559 100644 --- a/Mage.Sets/src/mage/sets/ravnika/Sandsower.java +++ b/Mage.Sets/src/mage/sets/ravnika/Sandsower.java @@ -29,15 +29,15 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; @@ -66,7 +66,7 @@ public class Sandsower extends CardImpl { this.toughness = new MageInt(3); // Tap three untapped creatures you control: Tap target creature. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new TapTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(3, 3, filter, true))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(3, 3, filter, true))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/ScatterTheSeeds.java b/Mage.Sets/src/mage/sets/ravnika/ScatterTheSeeds.java index 883e321cdc9..9dc8e0d4dce 100644 --- a/Mage.Sets/src/mage/sets/ravnika/ScatterTheSeeds.java +++ b/Mage.Sets/src/mage/sets/ravnika/ScatterTheSeeds.java @@ -28,8 +28,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.ConvokeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ravnika/SearingMeditation.java b/Mage.Sets/src/mage/sets/ravnika/SearingMeditation.java index a727a7392b1..d0431fc9066 100644 --- a/Mage.Sets/src/mage/sets/ravnika/SearingMeditation.java +++ b/Mage.Sets/src/mage/sets/ravnika/SearingMeditation.java @@ -29,15 +29,15 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.DoIfCostPaid; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.events.GameEvent; import mage.target.common.TargetCreatureOrPlayer; @@ -55,7 +55,7 @@ public class SearingMeditation extends CardImpl { this.color.setWhite(true); // Whenever you gain life, you may pay {2}. If you do, Searing Meditation deals 2 damage to target creature or player. - Ability ability = new SimpleTriggeredAbility(Constants.Zone.BATTLEFIELD, GameEvent.EventType.GAINED_LIFE, new DoIfCostPaid(new DamageTargetEffect(2), new GenericManaCost(2)), "Whenever you gain life, ", true); + Ability ability = new SimpleTriggeredAbility(Zone.BATTLEFIELD, GameEvent.EventType.GAINED_LIFE, new DoIfCostPaid(new DamageTargetEffect(2), new GenericManaCost(2)), "Whenever you gain life, ", true); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/SeismicSpike.java b/Mage.Sets/src/mage/sets/ravnika/SeismicSpike.java index e69484c1393..008d767fd4a 100644 --- a/Mage.Sets/src/mage/sets/ravnika/SeismicSpike.java +++ b/Mage.Sets/src/mage/sets/ravnika/SeismicSpike.java @@ -28,8 +28,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/ravnika/SelesnyaEvangel.java b/Mage.Sets/src/mage/sets/ravnika/SelesnyaEvangel.java index cd47f2c84c4..7e3256e310a 100644 --- a/Mage.Sets/src/mage/sets/ravnika/SelesnyaEvangel.java +++ b/Mage.Sets/src/mage/sets/ravnika/SelesnyaEvangel.java @@ -29,9 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,7 @@ import mage.abilities.costs.common.TapTargetCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; @@ -70,7 +70,7 @@ public class SelesnyaEvangel extends CardImpl { this.toughness = new MageInt(2); // {1}, {tap}, Tap an untapped creature you control: Put a 1/1 green Saproling creature token onto the battlefield. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/ravnika/SelesnyaGuildmage.java b/Mage.Sets/src/mage/sets/ravnika/SelesnyaGuildmage.java index 803ef73c76a..66948a32c2d 100644 --- a/Mage.Sets/src/mage/sets/ravnika/SelesnyaGuildmage.java +++ b/Mage.Sets/src/mage/sets/ravnika/SelesnyaGuildmage.java @@ -30,15 +30,16 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.permanent.token.SaprolingToken; /** @@ -56,8 +57,8 @@ public class SelesnyaGuildmage extends CardImpl { this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl("{3}{G}"))); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Constants.Duration.EndOfTurn), new ManaCostsImpl("{3}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl("{3}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{3}{W}"))); } public SelesnyaGuildmage (final SelesnyaGuildmage card) { diff --git a/Mage.Sets/src/mage/sets/ravnika/SelesnyaSanctuary.java b/Mage.Sets/src/mage/sets/ravnika/SelesnyaSanctuary.java index 4b6b636fce2..06ef5ba5961 100644 --- a/Mage.Sets/src/mage/sets/ravnika/SelesnyaSanctuary.java +++ b/Mage.Sets/src/mage/sets/ravnika/SelesnyaSanctuary.java @@ -28,9 +28,9 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; diff --git a/Mage.Sets/src/mage/sets/ravnika/SelesnyaSignet.java b/Mage.Sets/src/mage/sets/ravnika/SelesnyaSignet.java index 77db94bb2e0..3b38d70db7f 100644 --- a/Mage.Sets/src/mage/sets/ravnika/SelesnyaSignet.java +++ b/Mage.Sets/src/mage/sets/ravnika/SelesnyaSignet.java @@ -30,15 +30,15 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -49,7 +49,7 @@ public class SelesnyaSignet extends CardImpl { public SelesnyaSignet (UUID ownerId) { super(ownerId, 270, "Selesnya Signet", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "RAV"; - Ability ability = new SimpleManaAbility(Constants.Zone.BATTLEFIELD, new Mana(0, 1, 0, 1, 0, 0, 0), new GenericManaCost(1)); + Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(0, 1, 0, 1, 0, 0, 0), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/SellSwordBrute.java b/Mage.Sets/src/mage/sets/ravnika/SellSwordBrute.java index 3b87304f4ae..278bad86eff 100644 --- a/Mage.Sets/src/mage/sets/ravnika/SellSwordBrute.java +++ b/Mage.Sets/src/mage/sets/ravnika/SellSwordBrute.java @@ -28,8 +28,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DamageControllerEffect; diff --git a/Mage.Sets/src/mage/sets/ravnika/ShadowOfDoubt.java b/Mage.Sets/src/mage/sets/ravnika/ShadowOfDoubt.java index d6a96eafbde..d0dd180b4f2 100644 --- a/Mage.Sets/src/mage/sets/ravnika/ShadowOfDoubt.java +++ b/Mage.Sets/src/mage/sets/ravnika/ShadowOfDoubt.java @@ -28,10 +28,10 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/ravnika/ShamblingShell.java b/Mage.Sets/src/mage/sets/ravnika/ShamblingShell.java index e002a7b85ff..71edc007380 100644 --- a/Mage.Sets/src/mage/sets/ravnika/ShamblingShell.java +++ b/Mage.Sets/src/mage/sets/ravnika/ShamblingShell.java @@ -28,9 +28,9 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/ravnika/SiegeWurm.java b/Mage.Sets/src/mage/sets/ravnika/SiegeWurm.java index e5d01571f45..fd5be70010d 100644 --- a/Mage.Sets/src/mage/sets/ravnika/SiegeWurm.java +++ b/Mage.Sets/src/mage/sets/ravnika/SiegeWurm.java @@ -28,8 +28,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ConvokeAbility; import mage.abilities.keyword.TrampleAbility; diff --git a/Mage.Sets/src/mage/sets/ravnika/SkyknightLegionnaire.java b/Mage.Sets/src/mage/sets/ravnika/SkyknightLegionnaire.java index 47d34c16194..91498800f4f 100644 --- a/Mage.Sets/src/mage/sets/ravnika/SkyknightLegionnaire.java +++ b/Mage.Sets/src/mage/sets/ravnika/SkyknightLegionnaire.java @@ -29,8 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; diff --git a/Mage.Sets/src/mage/sets/ravnika/SnappingDrake.java b/Mage.Sets/src/mage/sets/ravnika/SnappingDrake.java index f527352c487..3d91b2df2ae 100644 --- a/Mage.Sets/src/mage/sets/ravnika/SnappingDrake.java +++ b/Mage.Sets/src/mage/sets/ravnika/SnappingDrake.java @@ -29,8 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ravnika/StinkweedImp.java b/Mage.Sets/src/mage/sets/ravnika/StinkweedImp.java index 1c8ce8dc6ac..9af6c1155bf 100644 --- a/Mage.Sets/src/mage/sets/ravnika/StinkweedImp.java +++ b/Mage.Sets/src/mage/sets/ravnika/StinkweedImp.java @@ -28,8 +28,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToACreatureTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/ravnika/SunderingVitae.java b/Mage.Sets/src/mage/sets/ravnika/SunderingVitae.java index 6c8b99eaa9e..6c5dc2a38b5 100644 --- a/Mage.Sets/src/mage/sets/ravnika/SunderingVitae.java +++ b/Mage.Sets/src/mage/sets/ravnika/SunderingVitae.java @@ -28,8 +28,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.ConvokeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ravnika/SurveillingSprite.java b/Mage.Sets/src/mage/sets/ravnika/SurveillingSprite.java index f167a25e8f7..5a9831f86a0 100644 --- a/Mage.Sets/src/mage/sets/ravnika/SurveillingSprite.java +++ b/Mage.Sets/src/mage/sets/ravnika/SurveillingSprite.java @@ -28,8 +28,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/ravnika/TatteredDrake.java b/Mage.Sets/src/mage/sets/ravnika/TatteredDrake.java index 17629a2db6b..f29bd9fffa8 100644 --- a/Mage.Sets/src/mage/sets/ravnika/TatteredDrake.java +++ b/Mage.Sets/src/mage/sets/ravnika/TatteredDrake.java @@ -29,9 +29,9 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/ravnika/TempleGarden.java b/Mage.Sets/src/mage/sets/ravnika/TempleGarden.java index 5376b4fe8fd..26ebdd3be13 100644 --- a/Mage.Sets/src/mage/sets/ravnika/TempleGarden.java +++ b/Mage.Sets/src/mage/sets/ravnika/TempleGarden.java @@ -29,8 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.effects.common.TapSourceUnlessPaysEffect; diff --git a/Mage.Sets/src/mage/sets/ravnika/Terrarion.java b/Mage.Sets/src/mage/sets/ravnika/Terrarion.java index 6acdf04fb0f..743234de798 100644 --- a/Mage.Sets/src/mage/sets/ravnika/Terrarion.java +++ b/Mage.Sets/src/mage/sets/ravnika/Terrarion.java @@ -28,14 +28,13 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; -import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; diff --git a/Mage.Sets/src/mage/sets/ravnika/UndercityShade.java b/Mage.Sets/src/mage/sets/ravnika/UndercityShade.java index d6bd7238381..34a7e539058 100644 --- a/Mage.Sets/src/mage/sets/ravnika/UndercityShade.java +++ b/Mage.Sets/src/mage/sets/ravnika/UndercityShade.java @@ -29,9 +29,7 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -56,7 +54,7 @@ public class UndercityShade extends CardImpl { this.addAbility(FearAbility.getInstance()); // {B}: Undercity Shade gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.B))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B))); } public UndercityShade(final UndercityShade card) { diff --git a/Mage.Sets/src/mage/sets/ravnika/Ursapine.java b/Mage.Sets/src/mage/sets/ravnika/Ursapine.java index 59c4ce58d45..ff9371b2d54 100644 --- a/Mage.Sets/src/mage/sets/ravnika/Ursapine.java +++ b/Mage.Sets/src/mage/sets/ravnika/Ursapine.java @@ -29,9 +29,7 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -56,7 +54,7 @@ public class Ursapine extends CardImpl { this.toughness = new MageInt(3); // {G}: Target creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.G)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.G)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/VedalkenDismisser.java b/Mage.Sets/src/mage/sets/ravnika/VedalkenDismisser.java index eefaba85519..900219dddb6 100644 --- a/Mage.Sets/src/mage/sets/ravnika/VedalkenDismisser.java +++ b/Mage.Sets/src/mage/sets/ravnika/VedalkenDismisser.java @@ -28,8 +28,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/ravnika/VedalkenEntrancer.java b/Mage.Sets/src/mage/sets/ravnika/VedalkenEntrancer.java index eb4df5096cd..c3f653bdffd 100644 --- a/Mage.Sets/src/mage/sets/ravnika/VedalkenEntrancer.java +++ b/Mage.Sets/src/mage/sets/ravnika/VedalkenEntrancer.java @@ -29,9 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.target.TargetPlayer; /** @@ -58,7 +59,7 @@ public class VedalkenEntrancer extends CardImpl { this.toughness = new MageInt(4); // {U}, {tap}: Target player puts the top two cards of his or her library into his or her graveyard. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(2), new ColoredManaCost(Constants.ColoredManaSymbol.U)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(2), new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/ravnika/VeteranArmorer.java b/Mage.Sets/src/mage/sets/ravnika/VeteranArmorer.java index bdab7d2d509..db990ae45a1 100644 --- a/Mage.Sets/src/mage/sets/ravnika/VeteranArmorer.java +++ b/Mage.Sets/src/mage/sets/ravnika/VeteranArmorer.java @@ -29,13 +29,14 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -54,7 +55,7 @@ public class VeteranArmorer extends CardImpl { this.toughness = new MageInt(2); // Other creatures you control get +0/+1. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Constants.Duration.WhileOnBattlefield, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, true))); } public VeteranArmorer(final VeteranArmorer card) { diff --git a/Mage.Sets/src/mage/sets/ravnika/ViashinoFangtail.java b/Mage.Sets/src/mage/sets/ravnika/ViashinoFangtail.java index 81eb4d99d06..496f9d02ec7 100644 --- a/Mage.Sets/src/mage/sets/ravnika/ViashinoFangtail.java +++ b/Mage.Sets/src/mage/sets/ravnika/ViashinoFangtail.java @@ -29,15 +29,15 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; /** @@ -57,7 +57,7 @@ public class ViashinoFangtail extends CardImpl { this.toughness = new MageInt(3); // {tap}: Viashino Fangtail deals 1 damage to target creature or player. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/ViashinoSlasher.java b/Mage.Sets/src/mage/sets/ravnika/ViashinoSlasher.java index 876f1b29871..75057b04c31 100644 --- a/Mage.Sets/src/mage/sets/ravnika/ViashinoSlasher.java +++ b/Mage.Sets/src/mage/sets/ravnika/ViashinoSlasher.java @@ -29,9 +29,7 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -55,7 +53,7 @@ public class ViashinoSlasher extends CardImpl { this.toughness = new MageInt(2); // {R}: Viashino Slasher gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); } public ViashinoSlasher(final ViashinoSlasher card) { diff --git a/Mage.Sets/src/mage/sets/ravnika/VinelasherKudzu.java b/Mage.Sets/src/mage/sets/ravnika/VinelasherKudzu.java index ce67a2cab1b..40e011ccdb3 100644 --- a/Mage.Sets/src/mage/sets/ravnika/VinelasherKudzu.java +++ b/Mage.Sets/src/mage/sets/ravnika/VinelasherKudzu.java @@ -29,8 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/ravnika/VituGhaziTheCityTree.java b/Mage.Sets/src/mage/sets/ravnika/VituGhaziTheCityTree.java index f0b866548f6..200cb716b6a 100644 --- a/Mage.Sets/src/mage/sets/ravnika/VituGhaziTheCityTree.java +++ b/Mage.Sets/src/mage/sets/ravnika/VituGhaziTheCityTree.java @@ -29,9 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -39,6 +38,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.permanent.token.SaprolingToken; /** @@ -54,7 +54,7 @@ public class VituGhaziTheCityTree extends CardImpl { // {tap}: Add {1} to your mana pool. this.addAbility(new ColorlessManaAbility()); // {2}{G}{W}, {tap}: Put a 1/1 green Saproling creature token onto the battlefield. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl("{2}{G}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl("{2}{G}{W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/VotaryOfTheConclave.java b/Mage.Sets/src/mage/sets/ravnika/VotaryOfTheConclave.java index 0d60449a9d7..8381b06ba92 100644 --- a/Mage.Sets/src/mage/sets/ravnika/VotaryOfTheConclave.java +++ b/Mage.Sets/src/mage/sets/ravnika/VotaryOfTheConclave.java @@ -29,9 +29,9 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/ravnika/WarTorchGoblin.java b/Mage.Sets/src/mage/sets/ravnika/WarTorchGoblin.java index 34f68fa745f..e94c626c68f 100644 --- a/Mage.Sets/src/mage/sets/ravnika/WarTorchGoblin.java +++ b/Mage.Sets/src/mage/sets/ravnika/WarTorchGoblin.java @@ -29,9 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.filter.common.FilterBlockingCreature; import mage.target.common.TargetCreaturePermanent; @@ -59,7 +60,7 @@ public class WarTorchGoblin extends CardImpl { this.toughness = new MageInt(1); // {R}, Sacrifice War-Torch Goblin: War-Torch Goblin deals 2 damage to target blocking creature. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(2), new ColoredManaCost(Constants.ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(new FilterBlockingCreature())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/ravnika/Watchwolf.java b/Mage.Sets/src/mage/sets/ravnika/Watchwolf.java index 513bbe6b56c..e46fe793eba 100644 --- a/Mage.Sets/src/mage/sets/ravnika/Watchwolf.java +++ b/Mage.Sets/src/mage/sets/ravnika/Watchwolf.java @@ -29,8 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/ravnika/WateryGrave.java b/Mage.Sets/src/mage/sets/ravnika/WateryGrave.java index 907b6dad895..d18c3cec69c 100644 --- a/Mage.Sets/src/mage/sets/ravnika/WateryGrave.java +++ b/Mage.Sets/src/mage/sets/ravnika/WateryGrave.java @@ -29,8 +29,8 @@ package mage.sets.ravnika; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.effects.common.TapSourceUnlessPaysEffect; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AbruptDecay.java b/Mage.Sets/src/mage/sets/returntoravnica/AbruptDecay.java index 14b1220d043..15fa9008ceb 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AbruptDecay.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AbruptDecay.java @@ -29,9 +29,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AerialPredation.java b/Mage.Sets/src/mage/sets/returntoravnica/AerialPredation.java index 8c77aa32e3e..9600615bb68 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AerialPredation.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AerialPredation.java @@ -30,8 +30,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AngelOfSerenity.java b/Mage.Sets/src/mage/sets/returntoravnica/AngelOfSerenity.java index f218d71306e..0d65d73f69b 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AngelOfSerenity.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AngelOfSerenity.java @@ -28,11 +28,11 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LeavesBattlefieldTriggeredAbility; @@ -134,7 +134,7 @@ class AngelOfSerenityTriggeredAbility extends ZoneChangeTriggeredAbility { public AngelOfSerenityEnterEffect() { - super(Constants.Outcome.ReturnToHand); + super(Outcome.ReturnToHand); this.staticText = "you may exile up to three other target creatures from the battlefield and/or creature cards from graveyards"; } @@ -177,7 +177,7 @@ class AngelOfSerenityEnterEffect extends OneShotEffect { public AngelOfSerenityLeaveEffect() { - super(Constants.Outcome.ReturnToHand); + super(Outcome.ReturnToHand); this.staticText = "return the exiled cards to their owners' hands"; } @@ -196,7 +196,7 @@ class AngelOfSerenityLeaveEffect extends OneShotEffect { this.toughness = new MageInt(3); // {2}{U}, {T}: Target creature gets -2/-0 until end of turn. - Ability secondAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Constants.Duration.EndOfTurn), new ManaCostsImpl("{2}{U}")); + Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new ManaCostsImpl("{2}{U}")); secondAbility.addCost(new TapSourceCost()); secondAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(secondAbility); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ArchonOfTheTriumvirate.java b/Mage.Sets/src/mage/sets/returntoravnica/ArchonOfTheTriumvirate.java index 9fefa825149..ce2b9dabb91 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ArchonOfTheTriumvirate.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ArchonOfTheTriumvirate.java @@ -28,15 +28,16 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.DetainTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterNonlandPermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetNonlandPermanent; @@ -50,7 +51,7 @@ public class ArchonOfTheTriumvirate extends CardImpl { private static final FilterNonlandPermanent filter = new FilterNonlandPermanent("nonland permanents your opponents control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT)); + filter.add(new ControllerPredicate(TargetController.OPPONENT)); } public ArchonOfTheTriumvirate(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Archweaver.java b/Mage.Sets/src/mage/sets/returntoravnica/Archweaver.java index f7a4d341a78..824d8b18314 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Archweaver.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Archweaver.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.abilities.keyword.TrampleAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ArmadaWurm.java b/Mage.Sets/src/mage/sets/returntoravnica/ArmadaWurm.java index 871efcfa374..c2773ccaed6 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ArmadaWurm.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ArmadaWurm.java @@ -29,9 +29,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -76,7 +76,7 @@ public class ArmadaWurm extends CardImpl { private ArmadaWurmToken() { super("Wurm", "a 5/5 green Wurm creature token with trample"); - cardType.add(Constants.CardType.CREATURE); + cardType.add(CardType.CREATURE); color = ObjectColor.GREEN; subtype.add("Wurm"); power = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ArmoryGuard.java b/Mage.Sets/src/mage/sets/returntoravnica/ArmoryGuard.java index 833b087a9d7..94f3d8200cb 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ArmoryGuard.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ArmoryGuard.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.ControlsPermanentCondition; @@ -38,6 +38,7 @@ import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -67,7 +68,7 @@ public class ArmoryGuard extends CardImpl { // Armory Guard has vigilance as long as you control a Gate. ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainAbilitySourceEffect(VigilanceAbility.getInstance()), new ControlsPermanentCondition(filter), rule); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } public ArmoryGuard(final ArmoryGuard card) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Arrest.java b/Mage.Sets/src/mage/sets/returntoravnica/Arrest.java index f8fd8530cf4..b389882d9d4 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Arrest.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Arrest.java @@ -28,7 +28,7 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AshZealot.java b/Mage.Sets/src/mage/sets/returntoravnica/AshZealot.java index df4b28bfc8b..7bc5ec75764 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AshZealot.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AshZealot.java @@ -29,9 +29,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -39,6 +39,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.stack.Spell; @@ -83,7 +84,7 @@ public class AshZealot extends CardImpl { class AshZealotTriggeredAbility extends TriggeredAbilityImpl { public AshZealotTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(3), false); + super(Zone.BATTLEFIELD, new DamageTargetEffect(3), false); } public AshZealotTriggeredAbility(final AshZealotTriggeredAbility ability) { @@ -97,7 +98,7 @@ class AshZealotTriggeredAbility extends TriggeredAbilityImpl { class AssassinsStrikeEffect extends OneShotEffect { public AssassinsStrikeEffect() { - super(Constants.Outcome.DrawCard); + super(Outcome.DrawCard); this.staticText = "Its controller discards a card"; } @@ -86,7 +88,7 @@ class AssassinsStrikeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = (Permanent) game.getLastKnownInformation(source.getFirstTarget(), Constants.Zone.BATTLEFIELD); + Permanent permanent = (Permanent) game.getLastKnownInformation(source.getFirstTarget(), Zone.BATTLEFIELD); if (permanent != null) { Player player = game.getPlayer(permanent.getControllerId()); if (player != null) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AugerSpree.java b/Mage.Sets/src/mage/sets/returntoravnica/AugerSpree.java index 7b8d58c5a35..2241d39a6f2 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AugerSpree.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AugerSpree.java @@ -27,11 +27,11 @@ */ package mage.sets.returntoravnica; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -49,7 +49,7 @@ public class AugerSpree extends CardImpl { this.color.setBlack(true); // Target creature gets +4/-4 until end of turn. - this.getSpellAbility().addEffect(new BoostTargetEffect(4, -4, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(4, -4, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AvengingArrow.java b/Mage.Sets/src/mage/sets/returntoravnica/AvengingArrow.java index d45c8cb91b3..defa12d87cc 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AvengingArrow.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AvengingArrow.java @@ -30,8 +30,8 @@ package mage.sets.returntoravnica; import java.util.HashSet; import java.util.Set; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AxebaneGuardian.java b/Mage.Sets/src/mage/sets/returntoravnica/AxebaneGuardian.java index dc6ba7cf767..21ff2988db4 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AxebaneGuardian.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AxebaneGuardian.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -40,6 +40,8 @@ import mage.abilities.keyword.DefenderAbility; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.choices.ChoiceColor; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; @@ -65,7 +67,7 @@ public class AxebaneGuardian extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // {tap}: Add X mana in any combination of colors to your mana pool, where X is the number of creatures with defender you control. - this.addAbility(new SimpleManaAbility(Constants.Zone.BATTLEFIELD, new AxebaneGuardianManaEffect(), new TapSourceCost())); + this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new AxebaneGuardianManaEffect(), new TapSourceCost())); } public AxebaneGuardian(final AxebaneGuardian card) { @@ -109,7 +111,7 @@ class AxebaneGuardianManaEffect extends ManaEffect { Mana mana = new Mana(); for(int i = 0; i < x; i++){ ChoiceColor choiceColor = new ChoiceColor(); - while (!player.choose(Constants.Outcome.Benefit, choiceColor, game)) { + while (!player.choose(Outcome.Benefit, choiceColor, game)) { game.debugMessage("player canceled choosing color. retrying."); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AxebaneStag.java b/Mage.Sets/src/mage/sets/returntoravnica/AxebaneStag.java index 098335be060..167ccdd557a 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AxebaneStag.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AxebaneStag.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AzoriusArrester.java b/Mage.Sets/src/mage/sets/returntoravnica/AzoriusArrester.java index 7f8d363046d..a41234bc596 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AzoriusArrester.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AzoriusArrester.java @@ -28,14 +28,15 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DetainTargetEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; @@ -49,7 +50,7 @@ public class AzoriusArrester extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT)); + filter.add(new ControllerPredicate(TargetController.OPPONENT)); } public AzoriusArrester(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AzoriusCharm.java b/Mage.Sets/src/mage/sets/returntoravnica/AzoriusCharm.java index 7ec5c59fa3b..3adb62bf425 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AzoriusCharm.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AzoriusCharm.java @@ -28,15 +28,16 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Mode; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetAttackingOrBlockingCreature; @@ -54,7 +55,7 @@ public class AzoriusCharm extends CardImpl { this.color.setBlue(true); // Choose one — Creatures you control gain lifelink until end of turn; - this.getSpellAbility().addEffect(new GainAbilityControlledEffect(LifelinkAbility.getInstance(), Constants.Duration.EndOfTurn, new FilterControlledCreaturePermanent("Creatures"))); + this.getSpellAbility().addEffect(new GainAbilityControlledEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent("Creatures"))); // or draw a card; Mode mode = new Mode(); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AzoriusGuildgate.java b/Mage.Sets/src/mage/sets/returntoravnica/AzoriusGuildgate.java index 6954f6db671..e6a7be2dd2e 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AzoriusGuildgate.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AzoriusGuildgate.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.WhiteManaAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AzoriusJusticiar.java b/Mage.Sets/src/mage/sets/returntoravnica/AzoriusJusticiar.java index 4377566dc92..ef8203d0fdd 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AzoriusJusticiar.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AzoriusJusticiar.java @@ -28,14 +28,15 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DetainTargetEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; @@ -49,7 +50,7 @@ public class AzoriusJusticiar extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures your opponents control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT)); + filter.add(new ControllerPredicate(TargetController.OPPONENT)); } public AzoriusJusticiar(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AzoriusKeyrune.java b/Mage.Sets/src/mage/sets/returntoravnica/AzoriusKeyrune.java index 6afc35f149e..54ae0e60270 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AzoriusKeyrune.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AzoriusKeyrune.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +39,8 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.permanent.token.Token; /** @@ -55,7 +57,7 @@ public class AzoriusKeyrune extends CardImpl { this.addAbility(new BlueManaAbility()); // {W}{U}: Azorius Keyrune becomes a 2/2 white and blue Bird artifact creature with flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new AzoriusKeyruneToken(), "", Constants.Duration.EndOfTurn), new ManaCostsImpl("{W}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new AzoriusKeyruneToken(), "", Duration.EndOfTurn), new ManaCostsImpl("{W}{U}"))); } public AzoriusKeyrune(final AzoriusKeyrune card) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AzorsElocutors.java b/Mage.Sets/src/mage/sets/returntoravnica/AzorsElocutors.java index 7e87d60135b..8a5fe173111 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AzorsElocutors.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AzorsElocutors.java @@ -28,11 +28,12 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Outcome; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -83,7 +84,7 @@ public class AzorsElocutors extends CardImpl { class AzorsElocutorsTriggeredAbility extends TriggeredAbilityImpl { public AzorsElocutorsTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new RemoveCounterSourceEffect(new Counter("filibuster",1)), false); + super(Zone.BATTLEFIELD, new RemoveCounterSourceEffect(new Counter("filibuster",1)), false); } public AzorsElocutorsTriggeredAbility(final AzorsElocutorsTriggeredAbility ability) { @@ -113,7 +114,7 @@ class AzorsElocutorsTriggeredAbility extends TriggeredAbilityImpl { public AzorsElocutorsEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); } public AzorsElocutorsEffect(final AzorsElocutorsEffect effect) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Batterhorn.java b/Mage.Sets/src/mage/sets/returntoravnica/Batterhorn.java index f0c7a1babca..490f66cf483 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Batterhorn.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Batterhorn.java @@ -29,8 +29,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/BazaarKrovod.java b/Mage.Sets/src/mage/sets/returntoravnica/BazaarKrovod.java index 03f0f6b8a64..05efcd7907a 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/BazaarKrovod.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/BazaarKrovod.java @@ -28,15 +28,17 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Outcome; import mage.filter.common.FilterAttackingCreature; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; @@ -83,7 +85,7 @@ public class BazaarKrovod extends CardImpl { class BazaarKrovodEffect extends OneShotEffect { public BazaarKrovodEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "another target attacking creature gets +0/+2 until end of turn. Untap that creature"; } @@ -95,7 +97,7 @@ class BazaarKrovodEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Permanent permanent = game.getPermanent(source.getFirstTarget()); if (permanent != null) { - game.addEffect(new BoostTargetEffect(0, 2, Constants.Duration.EndOfTurn), source); + game.addEffect(new BoostTargetEffect(0, 2, Duration.EndOfTurn), source); permanent.untap(game); return true; } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/BellowsLizard.java b/Mage.Sets/src/mage/sets/returntoravnica/BellowsLizard.java index 3f87e4cc660..779b3a86d22 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/BellowsLizard.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/BellowsLizard.java @@ -29,14 +29,16 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -53,7 +55,7 @@ public class BellowsLizard extends CardImpl { this.toughness = new MageInt(1); // {1}{R}: Bellows Lizard gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Constants.Duration.EndOfTurn), new ManaCostsImpl("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{R}"))); } public BellowsLizard (final BellowsLizard card) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/BlistercoilWeird.java b/Mage.Sets/src/mage/sets/returntoravnica/BlistercoilWeird.java index 57c521100e1..9022df4030f 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/BlistercoilWeird.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/BlistercoilWeird.java @@ -28,15 +28,16 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.common.UntapSourceEffect; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -65,7 +66,7 @@ public class BlistercoilWeird extends CardImpl { this.toughness = new MageInt(1); // Whenever you cast an instant or sorcery spell, Blistercoil Weird gets +1/+1 until end of turn. Untap it. - Ability ability = new SpellCastTriggeredAbility(new BoostSourceEffect(1, 1, Constants.Duration.EndOfTurn), filter, false); + Ability ability = new SpellCastTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), filter, false); ability.addEffect(new UntapSourceEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/BloodfrayGiant.java b/Mage.Sets/src/mage/sets/returntoravnica/BloodfrayGiant.java index e01df2ac974..c9c0bb91843 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/BloodfrayGiant.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/BloodfrayGiant.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.abilities.keyword.UnleashAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Blustersquall.java b/Mage.Sets/src/mage/sets/returntoravnica/Blustersquall.java index 8f5d8e43e9c..24184ec48df 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Blustersquall.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Blustersquall.java @@ -28,15 +28,17 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.TapTargetEffect; import mage.abilities.keyword.OverloadAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; @@ -53,7 +55,7 @@ public class Blustersquall extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.NOT_YOU)); + filter.add(new ControllerPredicate(TargetController.NOT_YOU)); } public Blustersquall(UUID ownerId) { @@ -86,7 +88,7 @@ class BlustersqallTapAllEffect extends OneShotEffect { protected FilterCreaturePermanent filter; public BlustersqallTapAllEffect(FilterCreaturePermanent filter) { - super(Constants.Outcome.Tap); + super(Outcome.Tap); this.filter = filter; staticText = "Tap each creature you don't control"; } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Brushstrider.java b/Mage.Sets/src/mage/sets/returntoravnica/Brushstrider.java index 9e4bb76cdc4..1c19ae98ee5 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Brushstrider.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Brushstrider.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CallOfTheConclave.java b/Mage.Sets/src/mage/sets/returntoravnica/CallOfTheConclave.java index 6468b91ac99..e444f3a1487 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/CallOfTheConclave.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/CallOfTheConclave.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.game.permanent.token.CentaurToken; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CarnivalHellsteed.java b/Mage.Sets/src/mage/sets/returntoravnica/CarnivalHellsteed.java index a6b79106386..66a6c73a7d9 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/CarnivalHellsteed.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/CarnivalHellsteed.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.HasteAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CatacombSlug.java b/Mage.Sets/src/mage/sets/returntoravnica/CatacombSlug.java index 79ca81f7d8e..204c8d88281 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/CatacombSlug.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/CatacombSlug.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CentaurHealer.java b/Mage.Sets/src/mage/sets/returntoravnica/CentaurHealer.java index e34c6ab4329..93ecfaf0016 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/CentaurHealer.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/CentaurHealer.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CentaursHerald.java b/Mage.Sets/src/mage/sets/returntoravnica/CentaursHerald.java index f10187a7984..0d598e8c1ac 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/CentaursHerald.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/CentaursHerald.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -39,6 +39,7 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.permanent.token.Token; /** @@ -58,7 +59,7 @@ public class CentaursHerald extends CardImpl { this.toughness = new MageInt(1); // {2}{G}, Sacrifice Centaur's Herald: Put a 3/3 green Centaur creature token onto the battlefield. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new CentaursHeraldToken()), new ManaCostsImpl("{2}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CentaursHeraldToken()), new ManaCostsImpl("{2}{G}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ChaosImps.java b/Mage.Sets/src/mage/sets/returntoravnica/ChaosImps.java index bca2d4289b7..4d58901fd7c 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ChaosImps.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ChaosImps.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.HasCounterCondition; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ChemistersTrick.java b/Mage.Sets/src/mage/sets/returntoravnica/ChemistersTrick.java index 5465df9aff3..ae73d0d4ae2 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ChemistersTrick.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ChemistersTrick.java @@ -28,11 +28,12 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; @@ -94,7 +95,7 @@ class ChemistersTrickEffect extends OneShotEffect { private FilterCreaturePermanent filter; public ChemistersTrickEffect(FilterCreaturePermanent filter) { - super(Constants.Outcome.ReturnToHand); + super(Outcome.ReturnToHand); staticText = "each creature you don't control attacks this turn if able"; this.filter = filter; } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ChorusOfMight.java b/Mage.Sets/src/mage/sets/returntoravnica/ChorusOfMight.java index bbb505f7900..43776137f55 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ChorusOfMight.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ChorusOfMight.java @@ -29,14 +29,15 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -54,8 +55,8 @@ public class ChorusOfMight extends CardImpl { // Until end of turn, target creature gets +1/+1 for each creature you control and gains trample. PermanentsOnBattlefieldCount value = new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - this.getSpellAbility().addEffect(new BoostTargetEffect(value, value, Constants.Duration.EndOfTurn, true)); - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(),Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(value, value, Duration.EndOfTurn, true)); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); } public ChorusOfMight(final ChorusOfMight card) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ChromaticLantern.java b/Mage.Sets/src/mage/sets/returntoravnica/ChromaticLantern.java index e7449735441..e46000f9a5e 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ChromaticLantern.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ChromaticLantern.java @@ -28,13 +28,15 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; /** @@ -47,7 +49,7 @@ public class ChromaticLantern extends CardImpl { this.expansionSetCode = "RTR"; // Lands you control have "{T}: Add one mana of any color to your mana pool." - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityControlledEffect(new AnyColorManaAbility(), Constants.Duration.WhileOnBattlefield, new FilterLandPermanent("Lands"), false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(new AnyColorManaAbility(), Duration.WhileOnBattlefield, new FilterLandPermanent("Lands"), false))); // {T}: Add one mana of any color to your mana pool. diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ChronicFlooding.java b/Mage.Sets/src/mage/sets/returntoravnica/ChronicFlooding.java index 11316c4baf6..fb4e2e8dfc6 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ChronicFlooding.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ChronicFlooding.java @@ -29,9 +29,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -39,6 +39,8 @@ import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -61,7 +63,7 @@ public class ChronicFlooding extends CardImpl { // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.UnboostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); @@ -81,7 +83,7 @@ public class ChronicFlooding extends CardImpl { class ChronicFloodingAbility extends TriggeredAbilityImpl { ChronicFloodingAbility() { - super(Constants.Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(3)); + super(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(3)); } ChronicFloodingAbility(final ChronicFloodingAbility ability) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CivicSaber.java b/Mage.Sets/src/mage/sets/returntoravnica/CivicSaber.java index 2e98aa3f714..a99c52a74f5 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/CivicSaber.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/CivicSaber.java @@ -28,7 +28,7 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; + import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -37,6 +37,7 @@ import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; @@ -47,14 +48,14 @@ import mage.game.permanent.Permanent; public class CivicSaber extends CardImpl { public CivicSaber(UUID ownerId) { - super(ownerId, 227, "Civic Saber", Constants.Rarity.UNCOMMON, new Constants.CardType[]{Constants.CardType.ARTIFACT}, "{1}"); + super(ownerId, 227, "Civic Saber", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{1}"); this.expansionSetCode = "RTR"; this.subtype.add("Equipment"); // Equipped creature gets +1/+0 for each of its colors. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(new CivicSaberColorCount(), new StaticValue(0), Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(new CivicSaberColorCount(), new StaticValue(0), Duration.WhileOnBattlefield))); // Equip {1} - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(1))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1))); } public CivicSaber(final CivicSaber card) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Cobblebrute.java b/Mage.Sets/src/mage/sets/returntoravnica/Cobblebrute.java index 85cead54b3d..d8eaebd5d1f 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Cobblebrute.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Cobblebrute.java @@ -29,8 +29,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CodexShredder.java b/Mage.Sets/src/mage/sets/returntoravnica/CodexShredder.java index d0ef2c96c14..9217f1cf40a 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/CodexShredder.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/CodexShredder.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; @@ -38,6 +38,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetPlayer; import mage.target.common.TargetCardInYourGraveyard; @@ -51,12 +52,12 @@ public class CodexShredder extends CardImpl { this.expansionSetCode = "RTR"; // {T}: Target player puts the top card of his or her library into his or her graveyard. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(1), new TapSourceCost()); + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); // {5}, {T}, Sacrifice Codex Shredder: Return target card from your graveyard to your hand. - ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{5}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{5}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInYourGraveyard()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CollectiveBlessing.java b/Mage.Sets/src/mage/sets/returntoravnica/CollectiveBlessing.java index 83e67739f1f..9394432f8d5 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/CollectiveBlessing.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/CollectiveBlessing.java @@ -28,13 +28,14 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -50,7 +51,7 @@ public class CollectiveBlessing extends CardImpl { this.color.setWhite(true); // Creatures you control get +3/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(3,3, Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(3,3, Duration.WhileOnBattlefield))); } public CollectiveBlessing(final CollectiveBlessing card) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CommonBond.java b/Mage.Sets/src/mage/sets/returntoravnica/CommonBond.java index 288acc211fa..f5066c33b8f 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/CommonBond.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/CommonBond.java @@ -28,12 +28,13 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -73,7 +74,7 @@ public class CommonBond extends CardImpl { class CommonBondEffect extends OneShotEffect { public CommonBondEffect() { - super(Constants.Outcome.BoostCreature); + super(Outcome.BoostCreature); staticText = "Put a +1/+1 counter on target creature. Put a +1/+1 counter on target creature."; } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ConcordiaPegasus.java b/Mage.Sets/src/mage/sets/returntoravnica/ConcordiaPegasus.java index 58d93195e58..c9df899947c 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ConcordiaPegasus.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ConcordiaPegasus.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ConjuredCurrency.java b/Mage.Sets/src/mage/sets/returntoravnica/ConjuredCurrency.java index ad39442125e..88e431bd839 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ConjuredCurrency.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ConjuredCurrency.java @@ -28,13 +28,15 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.continious.ExchangeControlTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.other.OwnerPredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -48,8 +50,8 @@ public class ConjuredCurrency extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("permanent you neither own nor control"); static { - filter.add(new OwnerPredicate(Constants.TargetController.NOT_YOU)); - filter.add(new ControllerPredicate(Constants.TargetController.NOT_YOU)); + filter.add(new OwnerPredicate(TargetController.NOT_YOU)); + filter.add(new ControllerPredicate(TargetController.NOT_YOU)); } private static final String rule = "you may exchange control of {this} and target permanent you neither own nor control"; @@ -60,7 +62,7 @@ public class ConjuredCurrency extends CardImpl { this.color.setBlue(true); // At the beginning of your upkeep, you may exchange control of Conjured Currency and target permanent you neither own nor control. - Ability ability = new BeginningOfUpkeepTriggeredAbility(new ExchangeControlTargetEffect(Constants.Duration.EndOfGame, rule, true), Constants.TargetController.YOU, true); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new ExchangeControlTargetEffect(Duration.EndOfGame, rule, true), TargetController.YOU, true); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CorpsejackMenace.java b/Mage.Sets/src/mage/sets/returntoravnica/CorpsejackMenace.java index 4369ffc0ba5..834beee9deb 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/CorpsejackMenace.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/CorpsejackMenace.java @@ -28,11 +28,11 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Counterflux.java b/Mage.Sets/src/mage/sets/returntoravnica/Counterflux.java index 09abc814f0a..04fe67527bd 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Counterflux.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Counterflux.java @@ -30,8 +30,9 @@ package mage.sets.returntoravnica; import java.util.LinkedList; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.Outcome; + +import mage.constants.CardType; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; @@ -39,6 +40,8 @@ import mage.abilities.effects.common.CantCounterSourceEffect; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.keyword.OverloadAbility; import mage.cards.CardImpl; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.filter.FilterSpell; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; @@ -56,11 +59,11 @@ public class Counterflux extends CardImpl private static final FilterSpell filter = new FilterSpell("spell you don't control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.NOT_YOU)); + filter.add(new ControllerPredicate(TargetController.NOT_YOU)); } public Counterflux(UUID ownerId) { - super(ownerId, 153, "Counterflux", Constants.Rarity.RARE, new Constants.CardType[]{Constants.CardType.INSTANT}, "{U}{U}{R}"); + super(ownerId, 153, "Counterflux", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{U}{U}{R}"); this.expansionSetCode = "RTR"; this.color.setBlue(true); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CoursersAccord.java b/Mage.Sets/src/mage/sets/returntoravnica/CoursersAccord.java index 355edbe7952..ef298fbc941 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/CoursersAccord.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/CoursersAccord.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.PopulateEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CrosstownCourier.java b/Mage.Sets/src/mage/sets/returntoravnica/CrosstownCourier.java index 2c5fb5b423a..dfbb0aded9e 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/CrosstownCourier.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/CrosstownCourier.java @@ -28,15 +28,16 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; @@ -73,7 +74,7 @@ public class CrosstownCourier extends CardImpl { class CrosstownCourierTriggeredAbility extends TriggeredAbilityImpl { public CrosstownCourierTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(0), false); + super(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(0), false); } public CrosstownCourierTriggeredAbility(final CrosstownCourierTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CryptbornHorror.java b/Mage.Sets/src/mage/sets/returntoravnica/CryptbornHorror.java index 1d172ae77cc..fbfc84ecdf2 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/CryptbornHorror.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/CryptbornHorror.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -38,6 +38,7 @@ import mage.abilities.dynamicvalue.common.OpponentsLostLifeCount; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -77,7 +78,7 @@ public class CryptbornHorror extends CardImpl { } class CryptbornHorrorEffect extends OneShotEffect { CryptbornHorrorEffect() { - super(Constants.Outcome.BoostCreature); + super(Outcome.BoostCreature); } CryptbornHorrorEffect(final CryptbornHorrorEffect effect) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CyclonicRift.java b/Mage.Sets/src/mage/sets/returntoravnica/CyclonicRift.java index 16b39537655..0d94282eb28 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/CyclonicRift.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/CyclonicRift.java @@ -28,10 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; @@ -86,7 +84,7 @@ class CyclonicRiftEffect extends OneShotEffect { private static final FilterNonlandPermanent filter = new FilterNonlandPermanent(); public CyclonicRiftEffect() { - super(Constants.Outcome.ReturnToHand); + super(Outcome.ReturnToHand); staticText = "Return each nonland permanent you don't control to its owner's hand"; } @@ -98,7 +96,7 @@ class CyclonicRiftEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { for (Permanent creature : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { if (!creature.getControllerId().equals(source.getControllerId())) { - creature.moveToZone(Constants.Zone.HAND, source.getSourceId(), game, true); + creature.moveToZone(Zone.HAND, source.getSourceId(), game, true); } } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DaggerdromeImp.java b/Mage.Sets/src/mage/sets/returntoravnica/DaggerdromeImp.java index da347ce83cf..0b069a37015 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DaggerdromeImp.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DaggerdromeImp.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.LifelinkAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DarkRevenant.java b/Mage.Sets/src/mage/sets/returntoravnica/DarkRevenant.java index 9d0dcd88203..7a6d965d9c8 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DarkRevenant.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DarkRevenant.java @@ -28,10 +28,10 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -39,6 +39,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; @@ -77,7 +78,7 @@ public class DarkRevenant extends CardImpl { class DarkRevenantEffect extends OneShotEffect { public DarkRevenantEffect() { - super(Constants.Outcome.ReturnToHand); + super(Outcome.ReturnToHand); staticText = "put it on top of its owner's library"; } @@ -96,7 +97,7 @@ class DarkRevenantEffect extends OneShotEffect { if (card != null && game.getState().getZone(source.getSourceId()) == Zone.GRAVEYARD) { Player owner = game.getPlayer(card.getOwnerId()); owner.getGraveyard().remove(card); - return card.moveToZone(Constants.Zone.LIBRARY, source.getSourceId(), game, true); + return card.moveToZone(Zone.LIBRARY, source.getSourceId(), game, true); } return true; } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DeadReveler.java b/Mage.Sets/src/mage/sets/returntoravnica/DeadReveler.java index 4e095db1106..71d7aba07ad 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DeadReveler.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DeadReveler.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.UnleashAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DeadbridgeGoliath.java b/Mage.Sets/src/mage/sets/returntoravnica/DeadbridgeGoliath.java index 0372c26ac4f..b62bc708f92 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DeadbridgeGoliath.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DeadbridgeGoliath.java @@ -27,8 +27,8 @@ */ package mage.sets.returntoravnica; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.ScavengeAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DeathriteShaman.java b/Mage.Sets/src/mage/sets/returntoravnica/DeathriteShaman.java index 1472bac528c..1a6f12f7621 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DeathriteShaman.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DeathriteShaman.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +42,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeOpponentsEffect; import mage.cards.CardImpl; import mage.choices.ChoiceColor; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterLandCard; @@ -74,21 +75,21 @@ public class DeathriteShaman extends CardImpl { this.toughness = new MageInt(2); // {T}: Exile target land card from a graveyard. Add one mana of any color to your mana pool. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ExileTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new TapSourceCost()); ability.addEffect(new AddManaOfAnyColorEffect()); ability.addChoice(new ChoiceColor()); ability.addTarget(new TargetCardInGraveyard(new FilterLandCard("land card from a graveyard"))); this.addAbility(ability); // {B}, {T}: Exile target instant or sorcery card from a graveyard. Each opponent loses 2 life. - ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl("{B}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl("{B}")); ability.addCost(new TapSourceCost()); ability.addEffect(new LoseLifeOpponentsEffect(2)); ability.addTarget(new TargetCardInGraveyard(filter)); this.addAbility(ability); // {G}, {T}: Exile target creature card from a graveyard. You gain 2 life. - ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl("{G}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl("{G}")); ability.addCost(new TapSourceCost()); ability.addEffect(new GainLifeEffect(2)); ability.addTarget(new TargetCardInGraveyard(new FilterCreatureCard("creature card from a graveyard"))); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DeathsPresence.java b/Mage.Sets/src/mage/sets/returntoravnica/DeathsPresence.java index bdb4085cb06..cdc8f9cf90c 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DeathsPresence.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DeathsPresence.java @@ -29,12 +29,13 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; @@ -70,7 +71,7 @@ public class DeathsPresence extends CardImpl { class DeathsPresenceTriggeredAbility extends TriggeredAbilityImpl { public DeathsPresenceTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, null); + super(Zone.BATTLEFIELD, null); } public DeathsPresenceTriggeredAbility(final DeathsPresenceTriggeredAbility ability) { @@ -85,9 +86,9 @@ class DeathsPresenceTriggeredAbility extends TriggeredAbilityImpl { this.addAbility(FlyingAbility.getInstance()); // At the beginning of each combat, any opponent may sacrifice a creature. If a player does, tap Desecration Demon and put a +1/+1 counter on it. - this.addAbility(new BeginningOfCombatTriggeredAbility(new DesecrationDemonEffect(), Constants.TargetController.ANY, false)); + this.addAbility(new BeginningOfCombatTriggeredAbility(new DesecrationDemonEffect(), TargetController.ANY, false)); } public DesecrationDemon(final DesecrationDemon card) { @@ -81,7 +82,7 @@ public class DesecrationDemon extends CardImpl { class DesecrationDemonEffect extends OneShotEffect { DesecrationDemonEffect() { - super(Constants.Outcome.BoostCreature); + super(Outcome.BoostCreature); staticText = "any opponent may sacrifice a creature. If a player does, tap {this} and put a +1/+1 counter on it"; } @@ -99,7 +100,7 @@ class DesecrationDemonEffect extends OneShotEffect { if (opponent != null) { FilterControlledPermanent filter = new FilterControlledPermanent("creature to sacrifice"); filter.add(new CardTypePredicate(CardType.CREATURE)); - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); TargetControlledPermanent target = new TargetControlledPermanent(1, 1, filter, false); if (target.canChoose(opponent.getId(), game)) { if (opponent.chooseUse(Outcome.Detriment, new StringBuilder("Sacrifice a creature to tap ").append(descrationDemon.getName()).append("and put a +1/+1 counter on it?").toString(), game)) diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DestroyTheEvidence.java b/Mage.Sets/src/mage/sets/returntoravnica/DestroyTheEvidence.java index 189ca11a7c8..b65682a6d0d 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DestroyTheEvidence.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DestroyTheEvidence.java @@ -28,15 +28,16 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -76,7 +77,7 @@ public class DestroyTheEvidence extends CardImpl { class DestroyTheEvidenceEffect extends OneShotEffect { public DestroyTheEvidenceEffect() { - super(Constants.Outcome.Discard); + super(Outcome.Discard); this.staticText = "Its controller reveals cards from the top of his or her library until he or she reveals a land card, then puts those cards into his or her graveyard"; } @@ -104,7 +105,7 @@ class DestroyTheEvidenceEffect extends OneShotEffect { while (player.getLibrary().size() > 0 && !landFound) { Card card = player.getLibrary().removeFromTop(game); if (card != null) { - card.moveToZone(Constants.Zone.GRAVEYARD, source.getId(), game, false); + card.moveToZone(Zone.GRAVEYARD, source.getId(), game, false); if (card.getCardType().contains(CardType.LAND)) { landFound = true; } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DetentionSphere.java b/Mage.Sets/src/mage/sets/returntoravnica/DetentionSphere.java index 9f23638c2db..fae51254c05 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DetentionSphere.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DetentionSphere.java @@ -28,16 +28,17 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.LeavesBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterNonlandPermanent; import mage.filter.predicate.Predicates; @@ -127,7 +128,7 @@ class DetentionSphereEntersEffect extends OneShotEffect { public DetentionSphereLeavesEffect() { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); staticText = "return the exiled cards to the battlefield under their owner's control"; } @@ -143,7 +144,7 @@ class DetentionSphereLeavesEffect extends OneShotEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.NOT_YOU)); + filter.add(new ControllerPredicate(TargetController.NOT_YOU)); } public Downsize(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DrainpipeVermin.java b/Mage.Sets/src/mage/sets/returntoravnica/DrainpipeVermin.java index 4739a0f1cd8..20447e1860c 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DrainpipeVermin.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DrainpipeVermin.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.ColoredManaSymbol; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DramaticRescue.java b/Mage.Sets/src/mage/sets/returntoravnica/DramaticRescue.java index bb10e2c9578..956a8d64600 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DramaticRescue.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DramaticRescue.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Dreadbore.java b/Mage.Sets/src/mage/sets/returntoravnica/Dreadbore.java index 3b9af5d6bf6..918720afe59 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Dreadbore.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Dreadbore.java @@ -27,8 +27,8 @@ */ package mage.sets.returntoravnica; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DregMangler.java b/Mage.Sets/src/mage/sets/returntoravnica/DregMangler.java index bc18387253d..d99ae65baef 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DregMangler.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DregMangler.java @@ -27,8 +27,8 @@ */ package mage.sets.returntoravnica; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.HasteAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DrudgeBeetle.java b/Mage.Sets/src/mage/sets/returntoravnica/DrudgeBeetle.java index f1d8b776b08..c4c01d6c6b0 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DrudgeBeetle.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DrudgeBeetle.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.ScavengeAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DruidsDeliverance.java b/Mage.Sets/src/mage/sets/returntoravnica/DruidsDeliverance.java index 676c877fc32..4fafda1b8d2 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DruidsDeliverance.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DruidsDeliverance.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.PreventionEffectImpl; import mage.abilities.effects.common.PopulateEffect; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DryadMilitant.java b/Mage.Sets/src/mage/sets/returntoravnica/DryadMilitant.java index 78e6fb0cb83..0da81cb656c 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DryadMilitant.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DryadMilitant.java @@ -28,9 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -59,7 +58,7 @@ public class DryadMilitant extends CardImpl { this.toughness = new MageInt(1); // If an instant or sorcery card would be put into a graveyard from anywhere, exile it instead. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new DryadMilitantReplacementEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DryadMilitantReplacementEffect())); } public DryadMilitant(final DryadMilitant card) { @@ -75,7 +74,7 @@ public class DryadMilitant extends CardImpl { class DryadMilitantReplacementEffect extends ReplacementEffectImpl { public DryadMilitantReplacementEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Exile); + super(Duration.WhileOnBattlefield, Outcome.Exile); staticText = "If an instant or sorcery card would be put into a graveyard from anywhere, exile it instead"; } @@ -104,7 +103,7 @@ class DryadMilitantReplacementEffect extends ReplacementEffectImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.NOT_YOU)); + filter.add(new ControllerPredicate(TargetController.NOT_YOU)); } public Electrickery(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/EpicExperiment.java b/Mage.Sets/src/mage/sets/returntoravnica/EpicExperiment.java index 4aaf96a272b..b5d3e388f34 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/EpicExperiment.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/EpicExperiment.java @@ -28,11 +28,11 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -86,7 +86,7 @@ class EpicExperimentEffect extends OneShotEffect { } public EpicExperimentEffect() { - super(Constants.Outcome.PlayForFree); + super(Outcome.PlayForFree); staticText = "Exile the top X cards of your library. For each instant and sorcery card with converted mana cost X or less among them, you may cast that card without paying its mana cost. Then put all cards exiled this way that weren't cast into your graveyard"; } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/EssenceBacklash.java b/Mage.Sets/src/mage/sets/returntoravnica/EssenceBacklash.java index 9e669e89f73..7af0bcb3db2 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/EssenceBacklash.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/EssenceBacklash.java @@ -28,12 +28,13 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; @@ -78,7 +79,7 @@ public class EssenceBacklash extends CardImpl { class EssenceBacklashEffect extends OneShotEffect { public EssenceBacklashEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "Counter target creature spell. Essence Backlash deals damage equal to that spell's power to its controller"; } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/EtherealArmor.java b/Mage.Sets/src/mage/sets/returntoravnica/EtherealArmor.java index 0c361aae5ee..ab2f8934202 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/EtherealArmor.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/EtherealArmor.java @@ -29,13 +29,13 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -45,6 +45,7 @@ import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterEnchantment; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; @@ -59,7 +60,7 @@ public class EtherealArmor extends CardImpl { private static final FilterEnchantment filter = new FilterEnchantment("enchantment you control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public EtherealArmor (UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ExplosiveImpact.java b/Mage.Sets/src/mage/sets/returntoravnica/ExplosiveImpact.java index cd43263c95e..b866491290a 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ExplosiveImpact.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ExplosiveImpact.java @@ -29,8 +29,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreatureOrPlayer; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/EyesInTheSkies.java b/Mage.Sets/src/mage/sets/returntoravnica/EyesInTheSkies.java index 961af20ee2e..52cb369fcef 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/EyesInTheSkies.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/EyesInTheSkies.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.PopulateEffect; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/FaerieImpostor.java b/Mage.Sets/src/mage/sets/returntoravnica/FaerieImpostor.java index b5733afa788..27bf65c0ef6 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/FaerieImpostor.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/FaerieImpostor.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,6 +38,8 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; @@ -89,7 +91,7 @@ class FaerieImpostorEffect extends OneShotEffect { } FaerieImpostorEffect ( ) { - super(Constants.Outcome.ReturnToHand); + super(Outcome.ReturnToHand); staticText = effectText; } @@ -104,12 +106,12 @@ class FaerieImpostorEffect extends OneShotEffect { TargetPermanent target = new TargetPermanent(1, 1, filter, false); if (target.canChoose(player.getId(), game)) { - player.choose(Constants.Outcome.ReturnToHand, target, source.getSourceId(), game); + player.choose(Outcome.ReturnToHand, target, source.getSourceId(), game); Permanent permanent = game.getPermanent(target.getFirstTarget()); if ( permanent != null ) { targetChosen = true; - permanent.moveToZone(Constants.Zone.HAND, this.getId(), game, false); + permanent.moveToZone(Zone.HAND, this.getId(), game, false); } } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/FallOfTheGavel.java b/Mage.Sets/src/mage/sets/returntoravnica/FallOfTheGavel.java index 8ac9a2c1396..c20f0934b26 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/FallOfTheGavel.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/FallOfTheGavel.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/FencingAce.java b/Mage.Sets/src/mage/sets/returntoravnica/FencingAce.java index 02a904012c6..bc3094b2569 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/FencingAce.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/FencingAce.java @@ -27,8 +27,8 @@ */ package mage.sets.returntoravnica; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DoubleStrikeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/FiremindsForesight.java b/Mage.Sets/src/mage/sets/returntoravnica/FiremindsForesight.java index fe8ccf4271c..45bbedce1b6 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/FiremindsForesight.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/FiremindsForesight.java @@ -29,16 +29,17 @@ package mage.sets.returntoravnica; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Zone; import mage.filter.Filter; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -101,7 +102,7 @@ class FiremindsForesightSearchEffect extends OneShotEffect 0; cmc--) { @@ -117,7 +118,7 @@ class FiremindsForesightSearchEffect extends OneShotEffect)target.getTargets()) { Card card = player.getLibrary().remove(cardId, game); if (card != null){ - card.moveToZone(Constants.Zone.HAND, source.getId(), game, false); + card.moveToZone(Zone.HAND, source.getId(), game, false); game.informPlayers(sourceCard.getName()+": " + player.getName() + " chose " + card.getName() ); cardsInLibrary.remove(card); cardToReveal.add(card); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/FrostburnWeird.java b/Mage.Sets/src/mage/sets/returntoravnica/FrostburnWeird.java index ee107a22063..2829dbf7a58 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/FrostburnWeird.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/FrostburnWeird.java @@ -28,14 +28,16 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -54,7 +56,7 @@ public class FrostburnWeird extends CardImpl { this.toughness = new MageInt(4); // {U/R}: Frostburn Weird gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Constants.Duration.EndOfTurn), new ManaCostsImpl("{U/R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl("{U/R}"))); } public FrostburnWeird(final FrostburnWeird card) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GatecreeperVine.java b/Mage.Sets/src/mage/sets/returntoravnica/GatecreeperVine.java index 6d6716b93b7..49d709f6e75 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GatecreeperVine.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GatecreeperVine.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GobblingOoze.java b/Mage.Sets/src/mage/sets/returntoravnica/GobblingOoze.java index 8270d7f6a23..ac3bd1bbeb1 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GobblingOoze.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GobblingOoze.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GoblinElectromancer.java b/Mage.Sets/src/mage/sets/returntoravnica/GoblinElectromancer.java index 5eabe5597ab..8fe29c96e83 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GoblinElectromancer.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GoblinElectromancer.java @@ -28,13 +28,14 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.cost.SpellsCostReductionEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -65,7 +66,7 @@ public class GoblinElectromancer extends CardImpl { this.toughness = new MageInt(2); // Instant and sorcery spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new SpellsCostReductionEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionEffect(filter, 1))); } public GoblinElectromancer(final GoblinElectromancer card) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GoblinRally.java b/Mage.Sets/src/mage/sets/returntoravnica/GoblinRally.java index b0b087a21ee..51490397a69 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GoblinRally.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GoblinRally.java @@ -29,8 +29,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.game.permanent.token.GoblinToken; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GolgariCharm.java b/Mage.Sets/src/mage/sets/returntoravnica/GolgariCharm.java index aa41f706230..aab2ec6dc8a 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GolgariCharm.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GolgariCharm.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.Mode; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.RegenerateAllEffect; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GolgariDecoy.java b/Mage.Sets/src/mage/sets/returntoravnica/GolgariDecoy.java index 1fe9a250355..472b305a4ec 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GolgariDecoy.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GolgariDecoy.java @@ -28,15 +28,16 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.MustBlockSourceEffect; import mage.abilities.keyword.ScavengeAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -55,7 +56,7 @@ public class GolgariDecoy extends CardImpl { this.toughness = new MageInt(2); // All creatures able to block Golgari Decoy do so. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new MustBlockSourceEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBlockSourceEffect())); // Scavenge {3}{G}{G} ({3}{G}{G}, Exile this card from your graveyard: Put a number of +1/+1 counters equal to this card's power on target creature. Scavenge only as a sorcery.) this.addAbility(new ScavengeAbility(new ManaCostsImpl("{3}{G}{G}"))); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GolgariGuildgate.java b/Mage.Sets/src/mage/sets/returntoravnica/GolgariGuildgate.java index ab863039d3a..778c70c1e43 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GolgariGuildgate.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GolgariGuildgate.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.GreenManaAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GolgariKeyrune.java b/Mage.Sets/src/mage/sets/returntoravnica/GolgariKeyrune.java index 2c8d27c2ec4..0df462df1b0 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GolgariKeyrune.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GolgariKeyrune.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +39,8 @@ import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.permanent.token.Token; /** @@ -55,7 +57,7 @@ public class GolgariKeyrune extends CardImpl { this.addAbility(new GreenManaAbility()); // {B}{G}: Golgari Keyrune becomes a 2/2 black and green Insect artifact creature with deathtouch until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new GolgariKeyruneToken(), "", Constants.Duration.EndOfTurn), new ManaCostsImpl("{B}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new GolgariKeyruneToken(), "", Duration.EndOfTurn), new ManaCostsImpl("{B}{G}"))); } public GolgariKeyrune(final GolgariKeyrune card) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GolgariLonglegs.java b/Mage.Sets/src/mage/sets/returntoravnica/GolgariLonglegs.java index d7304905757..d48da542a42 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GolgariLonglegs.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GolgariLonglegs.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GoreHouseChainwalker.java b/Mage.Sets/src/mage/sets/returntoravnica/GoreHouseChainwalker.java index 6f999bcf397..e761093cc70 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GoreHouseChainwalker.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GoreHouseChainwalker.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.UnleashAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GraveBetrayal.java b/Mage.Sets/src/mage/sets/returntoravnica/GraveBetrayal.java index 2b2da9f47f3..199c0f87220 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GraveBetrayal.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GraveBetrayal.java @@ -29,11 +29,11 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.TriggeredAbilityImpl; @@ -44,6 +44,9 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; @@ -82,7 +85,7 @@ public class GraveBetrayal extends CardImpl { class GraveBetrayalTriggeredAbility extends TriggeredAbilityImpl { public GraveBetrayalTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, null); + super(Zone.BATTLEFIELD, null); } public GraveBetrayalTriggeredAbility(final GraveBetrayalTriggeredAbility ability) { @@ -97,9 +100,9 @@ class GraveBetrayalTriggeredAbility extends TriggeredAbilityImpl { public GraveBetrayalEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); staticText = " return the creature to the battlefield under your control with an additional +1/+1 counter. That creature is a black Zombie in addition to its other colors and types"; } @@ -166,7 +169,7 @@ class GraveBetrayalEffect extends OneShotEffect { class GraveBetrayalContiniousEffect extends ContinuousEffectImpl { public GraveBetrayalContiniousEffect() { - super(Duration.Custom, Constants.Outcome.Neutral); + super(Duration.Custom, Outcome.Neutral); staticText = "That creature is a black Zombie in addition to its other colors and types"; } @@ -180,17 +183,17 @@ class GraveBetrayalContiniousEffect extends ContinuousEffectImpl { class GrislySalvageEffect extends OneShotEffect { public GrislySalvageEffect() { - super(Constants.Outcome.DrawCard); + super(Outcome.DrawCard); this.staticText = "Reveal the top five cards of your library. You may put a creature or land card from among them into your hand. Put the rest into your graveyard"; } @@ -90,7 +92,7 @@ class GrislySalvageEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); if (player != null) { - Cards cards = new CardsImpl(Constants.Zone.PICK); + Cards cards = new CardsImpl(Zone.PICK); boolean properCardFound = false; int count = Math.min(player.getLibrary().size(), 5); @@ -108,12 +110,12 @@ class GrislySalvageEffect extends OneShotEffect { player.revealCards("Grisly Salvage", cards, game); FilterCard filter = new FilterCard("creature or land card to put in hand"); filter.add(Predicates.or(new CardTypePredicate(CardType.CREATURE), new CardTypePredicate(CardType.LAND))); - TargetCard target = new TargetCard(Constants.Zone.PICK, filter); - if (properCardFound && player.choose(Constants.Outcome.DrawCard, cards, target, game)) { + TargetCard target = new TargetCard(Zone.PICK, filter); + if (properCardFound && player.choose(Outcome.DrawCard, cards, target, game)) { Card card = game.getCard(target.getFirstTarget()); if (card != null) { cards.remove(card); - card.moveToZone(Constants.Zone.HAND, source.getId(), game, false); + card.moveToZone(Zone.HAND, source.getId(), game, false); } } @@ -121,7 +123,7 @@ class GrislySalvageEffect extends OneShotEffect { for (UUID cardId : cards) { Card card = game.getCard(cardId); if (card != null) { - card.moveToZone(Constants.Zone.GRAVEYARD, source.getId(), game, true); + card.moveToZone(Zone.GRAVEYARD, source.getId(), game, true); } } } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GroveOfTheGuardian.java b/Mage.Sets/src/mage/sets/returntoravnica/GroveOfTheGuardian.java index 73587b38ce2..c57c48071c0 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GroveOfTheGuardian.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GroveOfTheGuardian.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -43,6 +43,7 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.VigilanceAbility; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; @@ -65,10 +66,10 @@ public class GroveOfTheGuardian extends CardImpl { this.expansionSetCode = "RTR"; // {T}: Add {1} to your mana pool. - this.addAbility(new SimpleManaAbility(Constants.Zone.BATTLEFIELD, new Mana(0, 0, 0, 0, 0, 1, 0), new TapSourceCost())); + this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(0, 0, 0, 0, 0, 1, 0), new TapSourceCost())); // {3}{G}{W}, {T}, Tap two untapped creatures you control, Sacrifice Grove of the Guardian: Put an 8/8 green and white Elemental creature token with vigilance onto the battlefield. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new ElementalToken(), 1), new ManaCostsImpl("{3}{G}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ElementalToken(), 1), new ManaCostsImpl("{3}{G}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, false))); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GrowingRanks.java b/Mage.Sets/src/mage/sets/returntoravnica/GrowingRanks.java index 9666b1d50fd..90b94f23859 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GrowingRanks.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GrowingRanks.java @@ -28,12 +28,13 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.PopulateEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; @@ -45,7 +46,7 @@ public class GrowingRanks extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT)); + filter.add(new ControllerPredicate(TargetController.OPPONENT)); } public GrowingRanks(UUID ownerId) { @@ -56,7 +57,7 @@ public class GrowingRanks extends CardImpl { this.color.setGreen(true); // At the beginning of your upkeep, populate. (Put a token onto the battlefield that's a copy of a creature token you control.) - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new PopulateEffect(""), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new PopulateEffect(""), TargetController.YOU, false)); } public GrowingRanks(final GrowingRanks card) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GuildFeud.java b/Mage.Sets/src/mage/sets/returntoravnica/GuildFeud.java index 05562fb9545..250b1b006f1 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GuildFeud.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GuildFeud.java @@ -28,11 +28,11 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -40,6 +40,7 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.game.permanent.Permanent; @@ -65,7 +66,7 @@ public class GuildFeud extends CardImpl { // then puts the rest into his or her graveyard. You do the same with the top three // cards of your library. If two creatures are put onto the battlefield this way, // those creatures fight each other. - Ability ability = new BeginningOfUpkeepTriggeredAbility(new GuildFeudEffect(), Constants.TargetController.YOU, true); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new GuildFeudEffect(), TargetController.YOU, true); ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Guttersnipe.java b/Mage.Sets/src/mage/sets/returntoravnica/Guttersnipe.java index 0e24c373ac2..684fad526c0 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Guttersnipe.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Guttersnipe.java @@ -29,21 +29,17 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; -import mage.abilities.Ability; import mage.abilities.common.SpellCastTriggeredAbility; -import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DamagePlayersEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; -import mage.game.Game; -import mage.players.Player; /** * diff --git a/Mage.Sets/src/mage/sets/returntoravnica/HavocFestival.java b/Mage.Sets/src/mage/sets/returntoravnica/HavocFestival.java index 4e6bb3f60a7..584ab116538 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/HavocFestival.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/HavocFestival.java @@ -29,12 +29,15 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.SubLayer; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -62,7 +65,7 @@ public class HavocFestival extends CardImpl { this.color.setRed(true); // Players can't gain life. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new HavocFestivalEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new HavocFestivalEffect())); // At the beginning of each player's upkeep, that player loses half his or her life, rounded up. Ability ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new HavocFestivalLoseLifeEffect(), TargetController.ANY, false); @@ -84,7 +87,7 @@ public class HavocFestival extends CardImpl { class HavocFestivalEffect extends ContinuousEffectImpl { public HavocFestivalEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Layer.PlayerEffects, Constants.SubLayer.NA, Outcome.Benefit); + super(Duration.WhileOnBattlefield, Layer.PlayerEffects, SubLayer.NA, Outcome.Benefit); staticText = "Players can't gain life"; } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/HellholeFlailer.java b/Mage.Sets/src/mage/sets/returntoravnica/HellholeFlailer.java index d9cbd64525f..bfd4d1efeba 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/HellholeFlailer.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/HellholeFlailer.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/HorncallersChant.java b/Mage.Sets/src/mage/sets/returntoravnica/HorncallersChant.java index 930e685f226..cc403fc0aab 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/HorncallersChant.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/HorncallersChant.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.PopulateEffect; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/HoverBarrier.java b/Mage.Sets/src/mage/sets/returntoravnica/HoverBarrier.java index 4b1bc6a02ac..643cf7fa95b 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/HoverBarrier.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/HoverBarrier.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/HussarPatrol.java b/Mage.Sets/src/mage/sets/returntoravnica/HussarPatrol.java index 8a8829ae519..542e5ea4a7b 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/HussarPatrol.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/HussarPatrol.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.VigilanceAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/HypersonicDragon.java b/Mage.Sets/src/mage/sets/returntoravnica/HypersonicDragon.java index 74fe11965d2..0c7b6c6009e 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/HypersonicDragon.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/HypersonicDragon.java @@ -27,9 +27,7 @@ */ package mage.sets.returntoravnica; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -62,7 +60,7 @@ public class HypersonicDragon extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // You may cast sorcery spells as though they had flash. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new HypersonicDragonEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new HypersonicDragonEffect())); } public HypersonicDragon(final HypersonicDragon card) { @@ -78,7 +76,7 @@ public class HypersonicDragon extends CardImpl { class HypersonicDragonEffect extends AsThoughEffectImpl { public HypersonicDragonEffect() { - super(Constants.AsThoughEffectType.CAST, Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(AsThoughEffectType.CAST, Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "You may cast sorcery spells as though they had flash"; } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/InactionInjunction.java b/Mage.Sets/src/mage/sets/returntoravnica/InactionInjunction.java index 88f279ad5ed..8ce877b1c5a 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/InactionInjunction.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/InactionInjunction.java @@ -28,12 +28,13 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DetainTargetEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; @@ -47,7 +48,7 @@ public class InactionInjunction extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT)); + filter.add(new ControllerPredicate(TargetController.OPPONENT)); } public InactionInjunction(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Inspiration.java b/Mage.Sets/src/mage/sets/returntoravnica/Inspiration.java index e8b3b27f99f..2c8d88c762c 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Inspiration.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Inspiration.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/IsperiaSupremeJudge.java b/Mage.Sets/src/mage/sets/returntoravnica/IsperiaSupremeJudge.java index adbcfaf83f3..e0fbf3275fb 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/IsperiaSupremeJudge.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/IsperiaSupremeJudge.java @@ -28,14 +28,15 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -79,7 +80,7 @@ public class IsperiaSupremeJudge extends CardImpl { class IsperiaSupremeJudgeTriggeredAbility extends TriggeredAbilityImpl { public IsperiaSupremeJudgeTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), true); + super(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), true); } public IsperiaSupremeJudgeTriggeredAbility(final IsperiaSupremeJudgeTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/IsperiasSkywatch.java b/Mage.Sets/src/mage/sets/returntoravnica/IsperiasSkywatch.java index 2e089e6d6c4..6d9d8750129 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/IsperiasSkywatch.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/IsperiasSkywatch.java @@ -28,15 +28,16 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DetainTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; @@ -50,7 +51,7 @@ public class IsperiasSkywatch extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT)); + filter.add(new ControllerPredicate(TargetController.OPPONENT)); } public IsperiasSkywatch(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/IzzetCharm.java b/Mage.Sets/src/mage/sets/returntoravnica/IzzetCharm.java index 0ee7de93041..a7d65bb535c 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/IzzetCharm.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/IzzetCharm.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Mode; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CounterUnlessPaysEffect; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/IzzetGuildgate.java b/Mage.Sets/src/mage/sets/returntoravnica/IzzetGuildgate.java index 7e553f1ffa2..dbf3fa587ae 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/IzzetGuildgate.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/IzzetGuildgate.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.RedManaAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/IzzetKeyrune.java b/Mage.Sets/src/mage/sets/returntoravnica/IzzetKeyrune.java index ba3eded1ee8..4b01a57da19 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/IzzetKeyrune.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/IzzetKeyrune.java @@ -28,9 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -59,7 +58,7 @@ public class IzzetKeyrune extends CardImpl { this.addAbility(new RedManaAbility()); // {U}{R}: Until end of turn, Izzet Keyrune becomes a 2/1 blue and red Elemental artifact creature. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new IzzetKeyruneToken(), "", Constants.Duration.EndOfTurn), new ManaCostsImpl("{U}{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new IzzetKeyruneToken(), "", Duration.EndOfTurn), new ManaCostsImpl("{U}{R}"))); // Whenever Izzet Keyrune deals combat damage to a player, you may draw a card. If you do, discard a card. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new IzzetKeyruneEffect(), true)); @@ -77,7 +76,7 @@ public class IzzetKeyrune extends CardImpl { private class IzzetKeyruneEffect extends OneShotEffect { public IzzetKeyruneEffect() { - super(Constants.Outcome.DrawCard); + super(Outcome.DrawCard); this.staticText = "you may draw a card. If you do, discard a card"; } @@ -93,7 +92,7 @@ public class IzzetKeyrune extends CardImpl { @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); - if (player != null && player.chooseUse(Constants.Outcome.DrawCard, "Do you wish to draw a card? If you do, discard a card.", game)) { + if (player != null && player.chooseUse(Outcome.DrawCard, "Do you wish to draw a card? If you do, discard a card.", game)) { if (player.drawCards(1, game) > 0) { player.discard(1, source, game); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/IzzetStaticaster.java b/Mage.Sets/src/mage/sets/returntoravnica/IzzetStaticaster.java index 9d70bdf1387..85c9000e059 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/IzzetStaticaster.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/IzzetStaticaster.java @@ -29,9 +29,9 @@ package mage.sets.returntoravnica; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +40,8 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.NamePredicate; import mage.game.Game; @@ -69,7 +71,7 @@ public class IzzetStaticaster extends CardImpl { this.addAbility(HasteAbility.getInstance()); // {T}: Izzet Staticaster deals 1 damage to target creature and each other creature with the same name as that creature. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new IzzetStaticasterDamageEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new IzzetStaticasterDamageEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } @@ -87,7 +89,7 @@ public class IzzetStaticaster extends CardImpl { class IzzetStaticasterDamageEffect extends OneShotEffect { public IzzetStaticasterDamageEffect() { - super(Constants.Outcome.Exile); + super(Outcome.Exile); this.staticText = "{this} deals 1 damage to target creature and each other creature with the same name as that creature"; } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/JaceArchitectOfThought.java b/Mage.Sets/src/mage/sets/returntoravnica/JaceArchitectOfThought.java index fab80e80f0d..562c24ffb8f 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/JaceArchitectOfThought.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/JaceArchitectOfThought.java @@ -31,14 +31,14 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.PhaseStep; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.PhaseStep; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/JaradGolgariLichLord.java b/Mage.Sets/src/mage/sets/returntoravnica/JaradGolgariLichLord.java index e3cdde3e9c7..d28b98c8ebd 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/JaradGolgariLichLord.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/JaradGolgariLichLord.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +44,8 @@ import mage.abilities.effects.common.LoseLifeOpponentsEffect; import mage.abilities.effects.common.ReturnSourceFromGraveyardToHandEffect; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreatureCard; @@ -82,16 +84,16 @@ public class JaradGolgariLichLord extends CardImpl { // Jarad, Golgari Lich Lord gets +1/+1 for each creature card in your graveyard. DynamicValue amount = new CardsInControllerGraveyardCount(new FilterCreatureCard()); - Ability ability = new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(amount, amount, Constants.Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield)); this.addAbility(ability); // {1}{B}{G}, Sacrifice another creature: Each opponent loses life equal to the sacrificed creature's power. - ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new LoseLifeOpponentsEffect(new SacrificeCostCreaturesPower()),new ManaCostsImpl("{1}{B}{G}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeOpponentsEffect(new SacrificeCostCreaturesPower()),new ManaCostsImpl("{1}{B}{G}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false))); this.addAbility(ability); // Sacrifice a Swamp and a Forest: Return Jarad from your graveyard to your hand. - ability = new SimpleActivatedAbility(Constants.Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), + ability = new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new SacrificeTargetCost(new TargetControlledPermanent(filterSwamp))); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filterForest))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/JaradsOrders.java b/Mage.Sets/src/mage/sets/returntoravnica/JaradsOrders.java index d4d71574c0e..1950a0e4aaf 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/JaradsOrders.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/JaradsOrders.java @@ -29,15 +29,17 @@ package mage.sets.returntoravnica; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.game.Game; @@ -76,7 +78,7 @@ class JaradsOrdersEffect extends OneShotEffect { protected static final FilterCard filter = new FilterCard("card to put into your hand"); public JaradsOrdersEffect() { - super(Constants.Outcome.PutLandInPlay); + super(Outcome.PutLandInPlay); staticText = "Search your library for up to two creature cards and reveal them. Put one into your hand and the other into your graveyard. Then shuffle your library"; } @@ -102,18 +104,18 @@ class JaradsOrdersEffect extends OneShotEffect { } player.revealCards("Jarad's Orders", revealed, game); if (target.getTargets().size() == 2) { - TargetCard target2 = new TargetCard(Constants.Zone.PICK, filter); + TargetCard target2 = new TargetCard(Zone.PICK, filter); target2.setRequired(true); - player.choose(Constants.Outcome.Benefit, revealed, target2, game); + player.choose(Outcome.Benefit, revealed, target2, game); Card card = revealed.get(target2.getFirstTarget(), game); - card.moveToZone(Constants.Zone.HAND, source.getId(), game, false); + card.moveToZone(Zone.HAND, source.getId(), game, false); revealed.remove(card); card = revealed.getCards(game).iterator().next(); - card.moveToZone(Constants.Zone.GRAVEYARD, source.getId(), game, false); + card.moveToZone(Zone.GRAVEYARD, source.getId(), game, false); } else if (target.getTargets().size() == 1) { Card card = revealed.getCards(game).iterator().next(); - card.moveToZone(Constants.Zone.HAND, source.getId(), game, false); + card.moveToZone(Zone.HAND, source.getId(), game, false); } } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/JudgesFamiliar.java b/Mage.Sets/src/mage/sets/returntoravnica/JudgesFamiliar.java index 9a8a25c68ed..bd9b6f69f15 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/JudgesFamiliar.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/JudgesFamiliar.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -38,6 +38,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -70,7 +71,7 @@ public class JudgesFamiliar extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Sacrifice Judge's Familiar: Counter target instant or sorcery spell unless its controller pays {1}. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(1)), new SacrificeSourceCost()); ability.addTarget(new TargetSpell(filter)); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/KeeningApparition.java b/Mage.Sets/src/mage/sets/returntoravnica/KeeningApparition.java index 942b87a2e34..4532c2f8e1e 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/KeeningApparition.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/KeeningApparition.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/KnightlyValor.java b/Mage.Sets/src/mage/sets/returntoravnica/KnightlyValor.java index 5d00a98c2f8..4db48f0b144 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/KnightlyValor.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/KnightlyValor.java @@ -29,12 +29,12 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/KorozdaGuildmage.java b/Mage.Sets/src/mage/sets/returntoravnica/KorozdaGuildmage.java index ea152b9f133..622e29f310d 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/KorozdaGuildmage.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/KorozdaGuildmage.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +42,8 @@ import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.IntimidateAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; @@ -72,13 +74,13 @@ public class KorozdaGuildmage extends CardImpl { this.toughness = new MageInt(2); // {1}{B}{G}: Target creature gets +1/+1 and gains intimidate until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(1,1, Constants.Duration.EndOfTurn),new ManaCostsImpl("{1}{B}{G}")); - ability.addEffect(new GainAbilityTargetEffect(IntimidateAbility.getInstance(), Constants.Duration.EndOfTurn)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1,1, Duration.EndOfTurn),new ManaCostsImpl("{1}{B}{G}")); + ability.addEffect(new GainAbilityTargetEffect(IntimidateAbility.getInstance(), Duration.EndOfTurn)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {2}{B}{G}, Sacrifice a nontoken creature: Put X 1/1 green Saproling creature tokens onto the battlefield, where X is the sacrificed creature's toughness. - ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken(),new SacrificeCostCreaturesToughness()),new ManaCostsImpl("{2}{B}{G}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken(),new SacrificeCostCreaturesToughness()),new ManaCostsImpl("{2}{B}{G}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1,filter, true, true))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/KorozdaMonitor.java b/Mage.Sets/src/mage/sets/returntoravnica/KorozdaMonitor.java index a8194ca8fd6..0b334786ed1 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/KorozdaMonitor.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/KorozdaMonitor.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.ScavengeAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/LaunchParty.java b/Mage.Sets/src/mage/sets/returntoravnica/LaunchParty.java index e39fc2ff5e7..935a412282c 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/LaunchParty.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/LaunchParty.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.LoseLifeControllerEffect; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/LobberCrew.java b/Mage.Sets/src/mage/sets/returntoravnica/LobberCrew.java index cf92a38c58e..a2aa697db5a 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/LobberCrew.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/LobberCrew.java @@ -29,11 +29,11 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleActivatedAbility; @@ -81,7 +81,7 @@ public class LobberCrew extends CardImpl { class LobberCrewTriggeredAbility extends TriggeredAbilityImpl { public LobberCrewTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new UntapSourceEffect()); + super(Zone.BATTLEFIELD, new UntapSourceEffect()); } public LobberCrewTriggeredAbility(final LobberCrewTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/LotlethTroll.java b/Mage.Sets/src/mage/sets/returntoravnica/LotlethTroll.java index 73b9109df09..e39dc569fde 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/LotlethTroll.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/LotlethTroll.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.DiscardTargetCost; @@ -39,6 +39,7 @@ import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInHand; @@ -66,10 +67,10 @@ public class LotlethTroll extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Discard a creature card: Put a +1/+1 counter on Lotleth Troll. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new DiscardTargetCost(new TargetCardInHand(filter)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new DiscardTargetCost(new TargetCardInHand(filter)))); // {B}: Regenerate Lotleth Troll. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}"))); } public LotlethTroll(final LotlethTroll card) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/LoxodonSmiter.java b/Mage.Sets/src/mage/sets/returntoravnica/LoxodonSmiter.java index e8c46e6a4b7..1aad1b6afb9 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/LoxodonSmiter.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/LoxodonSmiter.java @@ -28,9 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.CantCounterAbility; @@ -76,7 +75,7 @@ public class LoxodonSmiter extends CardImpl { this.addAbility(new CantCounterAbility()); // Sacrifice Judge's Familiar: Counter target instant or sorcery spell unless its controller pays {1}. - this.addAbility(new SimpleStaticAbility(Constants.Zone.HAND, new LoxodonSmiterEffect())); + this.addAbility(new SimpleStaticAbility(Zone.HAND, new LoxodonSmiterEffect())); } public LoxodonSmiter(final LoxodonSmiter card) { @@ -92,7 +91,7 @@ public class LoxodonSmiter extends CardImpl { class LoxodonSmiterEffect extends ReplacementEffectImpl { public LoxodonSmiterEffect() { - super(Constants.Duration.EndOfGame, Constants.Outcome.PutCardInPlay); + super(Duration.EndOfGame, Outcome.PutCardInPlay); staticText = "If a spell or ability an opponent controls causes you to discard {this}, put it onto the battlefield instead of putting it into your graveyard"; } @@ -109,7 +108,7 @@ class LoxodonSmiterEffect extends ReplacementEffectImpl { public boolean applies(GameEvent event, Ability source, Game game) { if (event.getType() == GameEvent.EventType.ZONE_CHANGE && event.getTargetId().equals(source.getSourceId())) { ZoneChangeEvent zcEvent = (ZoneChangeEvent) event; - if (zcEvent.getFromZone() == Constants.Zone.HAND && zcEvent.getToZone() == Constants.Zone.GRAVEYARD) { + if (zcEvent.getFromZone() == Zone.HAND && zcEvent.getToZone() == Zone.GRAVEYARD) { StackObject spell = game.getStack().getStackObject(event.getSourceId()); if (spell != null && game.getOpponents(source.getControllerId()).contains(spell.getControllerId())) { return true; @@ -125,7 +124,7 @@ class LoxodonSmiterEffect extends ReplacementEffectImpl { if (card != null) { Player player = game.getPlayer(card.getOwnerId()); if (player != null) { - if (card.putOntoBattlefield(game, Constants.Zone.HAND, source.getId(), player.getId())) { + if (card.putOntoBattlefield(game, Zone.HAND, source.getId(), player.getId())) { game.fireEvent(GameEvent.getEvent(GameEvent.EventType.DISCARDED_CARD, card.getId(), source.getId(), player.getId())); return true; } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/LyevSkyknight.java b/Mage.Sets/src/mage/sets/returntoravnica/LyevSkyknight.java index 35ec1bbdb38..c09bd7b989b 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/LyevSkyknight.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/LyevSkyknight.java @@ -28,15 +28,16 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DetainTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterNonlandPermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetNonlandPermanent; @@ -50,7 +51,7 @@ public class LyevSkyknight extends CardImpl { private static final FilterNonlandPermanent filter = new FilterNonlandPermanent("nonland permanent an opponent controls"); static { - filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT)); + filter.add(new ControllerPredicate(TargetController.OPPONENT)); } public LyevSkyknight(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ManaBloom.java b/Mage.Sets/src/mage/sets/returntoravnica/ManaBloom.java index 331bfab19df..ae8276cc0d7 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ManaBloom.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ManaBloom.java @@ -29,11 +29,11 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.TriggeredAbility; @@ -49,6 +49,7 @@ import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.mana.ActivateOncePerTurnManaAbility; import mage.cards.CardImpl; import mage.choices.ChoiceColor; +import mage.constants.TargetController; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -76,7 +77,7 @@ public class ManaBloom extends CardImpl { this.addAbility(ability); // At the beginning of your upkeep, if Mana Bloom has no charge counters on it, return it to its owner's hand. - TriggeredAbility triggeredAbility = new BeginningOfUpkeepTriggeredAbility(new ReturnToHandSourceEffect(), Constants.TargetController.YOU, false); + TriggeredAbility triggeredAbility = new BeginningOfUpkeepTriggeredAbility(new ReturnToHandSourceEffect(), TargetController.YOU, false); this.addAbility(new ConditionalTriggeredAbility(triggeredAbility, new HasCounterCondition(CounterType.CHARGE, 0,0), "At the beginning of your upkeep, if Mana Bloom has no charge counters on it, return it to its owner's hand.")); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/MartialLaw.java b/Mage.Sets/src/mage/sets/returntoravnica/MartialLaw.java index ee458619c90..fd09ed9812f 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/MartialLaw.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/MartialLaw.java @@ -28,13 +28,14 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.DetainTargetEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; @@ -47,7 +48,7 @@ public class MartialLaw extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT)); + filter.add(new ControllerPredicate(TargetController.OPPONENT)); } public MartialLaw(UUID ownerId) { @@ -58,7 +59,7 @@ public class MartialLaw extends CardImpl { // At the beginning of your upkeep, detain target creature an opponent controls. // (Until your next turn, that creature can't attack or block and its activated abilities can't be activated.) - Ability ability = new BeginningOfUpkeepTriggeredAbility(new DetainTargetEffect(), Constants.TargetController.YOU, false); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new DetainTargetEffect(), TargetController.YOU, false); TargetCreaturePermanent target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/MercurialChemister.java b/Mage.Sets/src/mage/sets/returntoravnica/MercurialChemister.java index 74fc3092f38..e422cd849f0 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/MercurialChemister.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/MercurialChemister.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +41,7 @@ import mage.abilities.dynamicvalue.common.DiscardCostCardConvertedMana; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -60,12 +61,12 @@ public class MercurialChemister extends CardImpl { this.toughness = new MageInt(3); // {U}, {T}: Draw two cards. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(2), new ManaCostsImpl("{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(2), new ManaCostsImpl("{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {R}, {T}, Discard a card: Mercurial Chemister deals damage to target creature equal to the discarded card's converted mana cost. - ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(new DiscardCostCardConvertedMana()), new ManaCostsImpl("{R}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new DiscardCostCardConvertedMana()), new ManaCostsImpl("{R}")); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/MinotaurAggressor.java b/Mage.Sets/src/mage/sets/returntoravnica/MinotaurAggressor.java index 5dffb71a539..75c53278fa5 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/MinotaurAggressor.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/MinotaurAggressor.java @@ -29,8 +29,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.HasteAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/MizziumMortars.java b/Mage.Sets/src/mage/sets/returntoravnica/MizziumMortars.java index 4aff834e3b9..c28547d774d 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/MizziumMortars.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/MizziumMortars.java @@ -28,14 +28,15 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.OverloadAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; @@ -49,7 +50,7 @@ public class MizziumMortars extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.NOT_YOU)); + filter.add(new ControllerPredicate(TargetController.NOT_YOU)); } public MizziumMortars(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/MizziumSkin.java b/Mage.Sets/src/mage/sets/returntoravnica/MizziumSkin.java index 6f6a43b9f15..fc2dbe6e2da 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/MizziumSkin.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/MizziumSkin.java @@ -28,10 +28,10 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/NecropolisRegent.java b/Mage.Sets/src/mage/sets/returntoravnica/NecropolisRegent.java index db4b38b853a..f884606e3f1 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/NecropolisRegent.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/NecropolisRegent.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -38,6 +38,7 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; @@ -80,7 +81,7 @@ public class NecropolisRegent extends CardImpl { class NecropolisRegentTriggeredAbility extends TriggeredAbilityImpl { public NecropolisRegentTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.QUEST.createInstance()), false); + super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.QUEST.createInstance()), false); } public NecropolisRegentTriggeredAbility(final NecropolisRegentTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/NewPrahvGuildmage.java b/Mage.Sets/src/mage/sets/returntoravnica/NewPrahvGuildmage.java index 7d74c1bac4e..a0cf775edcd 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/NewPrahvGuildmage.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/NewPrahvGuildmage.java @@ -28,11 +28,11 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +41,7 @@ import mage.abilities.effects.common.DetainTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterNonlandPermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; @@ -55,7 +56,7 @@ public class NewPrahvGuildmage extends CardImpl { private static final FilterNonlandPermanent filter = new FilterNonlandPermanent("nonland permanent an opponent control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT)); + filter.add(new ControllerPredicate(TargetController.OPPONENT)); } public NewPrahvGuildmage(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/NivMizzetDracogenius.java b/Mage.Sets/src/mage/sets/returntoravnica/NivMizzetDracogenius.java index 0a22bb30836..c9103963f8e 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/NivMizzetDracogenius.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/NivMizzetDracogenius.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsDamageToAPlayerTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/NivixGuildmage.java b/Mage.Sets/src/mage/sets/returntoravnica/NivixGuildmage.java index a3a03aecf7b..bec1514336e 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/NivixGuildmage.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/NivixGuildmage.java @@ -28,10 +28,10 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -71,7 +71,7 @@ public class NivixGuildmage extends CardImpl { this.toughness = new MageInt(2); // {1}{U}{R}: Draw a card, then discard a card. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new ManaCostsImpl("{1}{U}{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new ManaCostsImpl("{1}{U}{R}"))); // {2}{U}{R}: Copy target instant or sorcery spell you control. You may choose new targets for the copy. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CopyTargetSpellEffect(), new ManaCostsImpl("{2}{U}{R}")); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/NivmagusElemental.java b/Mage.Sets/src/mage/sets/returntoravnica/NivmagusElemental.java index 7a08ac9f911..061e5d452aa 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/NivmagusElemental.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/NivmagusElemental.java @@ -28,16 +28,17 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.ExileFromStackCost; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; @@ -54,7 +55,7 @@ public class NivmagusElemental extends CardImpl { private static final FilterSpell filter = new FilterSpell("an instant or sorcery spell you control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(Predicates.or( new CardTypePredicate(CardType.INSTANT), new CardTypePredicate(CardType.SORCERY))); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/OakStreetInnkeeper.java b/Mage.Sets/src/mage/sets/returntoravnica/OakStreetInnkeeper.java index ad56563b5a7..d91cbbd4f16 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/OakStreetInnkeeper.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/OakStreetInnkeeper.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.NotMyTurnCondition; @@ -38,6 +38,8 @@ import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.TappedPredicate; @@ -63,8 +65,8 @@ public class OakStreetInnkeeper extends CardImpl { this.toughness = new MageInt(2); // As long as it's not your turn, tapped creatures you control have hexproof. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ConditionalContinousEffect( - new GainAbilityControlledEffect(HexproofAbility.getInstance(), Constants.Duration.WhileOnBattlefield, filter), + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, filter), NotMyTurnCondition.getInstance(), "As long as it's not your turn, tapped creatures you control have hexproof"))); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/OgreJailbreaker.java b/Mage.Sets/src/mage/sets/returntoravnica/OgreJailbreaker.java index 1679e8ddbdb..444c00a2aab 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/OgreJailbreaker.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/OgreJailbreaker.java @@ -28,9 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -61,7 +60,7 @@ public class OgreJailbreaker extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // Ogre Jailbreaker can attack as though it didn't have defender as long as you control a Gate. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new OgreJailbreakerEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OgreJailbreakerEffect())); } @@ -84,7 +83,7 @@ class OgreJailbreakerEffect extends AsThoughEffectImpl { } public OgreJailbreakerEffect() { - super(Constants.AsThoughEffectType.ATTACK, Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(AsThoughEffectType.ATTACK, Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "{this} can attack as though it didn't have defender as long as you control a Gate"; gateCondition = new ControlsPermanentCondition(filter); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/PackRat.java b/Mage.Sets/src/mage/sets/returntoravnica/PackRat.java index 43bb600be7d..3bf387279a0 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/PackRat.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/PackRat.java @@ -28,10 +28,10 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +43,8 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Outcome; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -86,9 +88,9 @@ public class PackRat extends CardImpl { this.toughness = new MageInt(0); // Pack Rat's power and toughness are each equal to the number of Rats you control. - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Constants.Duration.EndOfGame))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Duration.EndOfGame))); // {2}{B}, Discard a card: Put a token onto the battlefield that's a copy of Pack Rat. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PackRatEffect(this), new ManaCostsImpl("{2}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PackRatEffect(this), new ManaCostsImpl("{2}{B}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); } @@ -108,7 +110,7 @@ class PackRatEffect extends OneShotEffect { private Card card; public PackRatEffect(Card card) { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); this.card = card; staticText = "Put a token onto the battlefield that's a copy of Pack Rat"; } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/PalisadeGiant.java b/Mage.Sets/src/mage/sets/returntoravnica/PalisadeGiant.java index b122ca0249d..2eda3979e98 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/PalisadeGiant.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/PalisadeGiant.java @@ -28,16 +28,17 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.game.Game; import mage.game.events.DamageEvent; import mage.game.events.GameEvent; @@ -94,7 +95,7 @@ public class PalisadeGiant extends CardImpl { class PalisadeGiantReplacementEffect extends ReplacementEffectImpl { PalisadeGiantReplacementEffect() { - super(Constants.Duration.WhileOnBattlefield, Outcome.RedirectDamage); + super(Duration.WhileOnBattlefield, Outcome.RedirectDamage); staticText = "All damage that would be dealt to you or another permanent you control is dealt to Palisade Giant instead"; } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/PerilousShadow.java b/Mage.Sets/src/mage/sets/returntoravnica/PerilousShadow.java index e15cdb587da..b3ef15f83c1 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/PerilousShadow.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/PerilousShadow.java @@ -28,14 +28,16 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -55,7 +57,7 @@ public class PerilousShadow extends CardImpl { // {1}{B}: Perilous Shadow gets +2/+2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(2,2, Constants.Duration.EndOfTurn), new ManaCostsImpl("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2,2, Duration.EndOfTurn), new ManaCostsImpl("{1}{B}"))); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/PhantomGeneral.java b/Mage.Sets/src/mage/sets/returntoravnica/PhantomGeneral.java index ca3ff2b2f76..323ee2edb83 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/PhantomGeneral.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/PhantomGeneral.java @@ -28,14 +28,16 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; @@ -49,7 +51,7 @@ public class PhantomGeneral extends CardImpl { static { filter.add(new TokenPredicate()); - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public PhantomGeneral(UUID ownerId) { @@ -63,7 +65,7 @@ public class PhantomGeneral extends CardImpl { this.toughness = new MageInt(3); // Creature tokens you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Constants.Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); } public PhantomGeneral(final PhantomGeneral card) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/PrecinctCaptain.java b/Mage.Sets/src/mage/sets/returntoravnica/PrecinctCaptain.java index ace90014dfe..688f75db077 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/PrecinctCaptain.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/PrecinctCaptain.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/PsychicSpiral.java b/Mage.Sets/src/mage/sets/returntoravnica/PsychicSpiral.java index 9f155d58c14..d0ed1d43ba6 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/PsychicSpiral.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/PsychicSpiral.java @@ -28,13 +28,15 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; @@ -70,7 +72,7 @@ public class PsychicSpiral extends CardImpl { class PsychicSpiralEffect extends OneShotEffect { public PsychicSpiralEffect() { - super(Constants.Outcome.GainLife); + super(Outcome.GainLife); staticText = "Shuffle all cards from your graveyard into your library. Target player puts that many cards from the top of his or her library into his or her graveyard"; } @@ -94,7 +96,7 @@ class PsychicSpiralEffect extends OneShotEffect { if (!targetPlayer.getLibrary().getCardList().isEmpty()) { Card card = targetPlayer.getLibrary().removeFromTop(game); if (card != null) { - card.moveToZone(Constants.Zone.GRAVEYARD, source.getId(), game, false); + card.moveToZone(Zone.GRAVEYARD, source.getId(), game, false); } } } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/PursuitOfFlight.java b/Mage.Sets/src/mage/sets/returntoravnica/PursuitOfFlight.java index 39967becaf8..5ab564e8459 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/PursuitOfFlight.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/PursuitOfFlight.java @@ -29,10 +29,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -69,8 +67,8 @@ public class PursuitOfFlight extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2 and has "{U}: This creature gains flying until end of turn." - SimpleStaticAbility ability2 = new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Constants.Duration.WhileOnBattlefield)); - ability2.addEffect(new GainAbilityAttachedEffect(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn), new ManaCostsImpl("{U}")),Constants.AttachmentType.AURA, Constants.Duration.WhileOnBattlefield, rule)); + SimpleStaticAbility ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + ability2.addEffect(new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{U}")), AttachmentType.AURA, Duration.WhileOnBattlefield, rule)); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Pyroconvergence.java b/Mage.Sets/src/mage/sets/returntoravnica/Pyroconvergence.java index 11130908f3d..87a0464b16c 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Pyroconvergence.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Pyroconvergence.java @@ -29,12 +29,13 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.stack.Spell; @@ -66,7 +67,7 @@ public class Pyroconvergence extends CardImpl { } class PyroconvergenceTriggeredAbility extends TriggeredAbilityImpl { public PyroconvergenceTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(2)); + super(Zone.BATTLEFIELD, new DamageTargetEffect(2)); TargetCreatureOrPlayer target = new TargetCreatureOrPlayer(); target.setRequired(true); this.addTarget(target); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RacecourseFury.java b/Mage.Sets/src/mage/sets/returntoravnica/RacecourseFury.java index 41bf337e9fc..09ba1511f36 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RacecourseFury.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RacecourseFury.java @@ -29,12 +29,12 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -45,6 +45,7 @@ import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetLandPermanent; @@ -71,9 +72,9 @@ public class RacecourseFury extends CardImpl { this.addAbility(ability); // Enchanted land has "{T}: Target creature gains haste until end of turn." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Constants.Duration.EndOfTurn), new TapSourceCost()); + Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); gainedAbility.addTarget(new TargetCreaturePermanent()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Constants.Duration.WhileOnBattlefield, rule))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, rule))); } public RacecourseFury (final RacecourseFury card) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RakdosCackler.java b/Mage.Sets/src/mage/sets/returntoravnica/RakdosCackler.java index 3d93257c569..509d105bb5e 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RakdosCackler.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RakdosCackler.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.UnleashAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RakdosCharm.java b/Mage.Sets/src/mage/sets/returntoravnica/RakdosCharm.java index b6ec737c191..163ac496edf 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RakdosCharm.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RakdosCharm.java @@ -29,15 +29,16 @@ package mage.sets.returntoravnica; import java.util.ArrayList; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; @@ -88,7 +89,7 @@ public class RakdosCharm extends CardImpl { private class RakdosCharmDamageEffect extends OneShotEffect { public RakdosCharmDamageEffect() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); staticText = "each creature deals 1 damage to its controller"; } @@ -122,7 +123,7 @@ public class RakdosCharm extends CardImpl { class RakdosCharmExileEffect extends OneShotEffect { public RakdosCharmExileEffect() { - super(Constants.Outcome.Exile); + super(Outcome.Exile); staticText = "Exile all cards from target player's graveyard"; } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RakdosGuildgate.java b/Mage.Sets/src/mage/sets/returntoravnica/RakdosGuildgate.java index 51c253a5ecf..2ebb8be915c 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RakdosGuildgate.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RakdosGuildgate.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.RedManaAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RakdosKeyrune.java b/Mage.Sets/src/mage/sets/returntoravnica/RakdosKeyrune.java index 72ec4d8835a..8cf862a7786 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RakdosKeyrune.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RakdosKeyrune.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +39,8 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.permanent.token.Token; /** @@ -55,7 +57,7 @@ public class RakdosKeyrune extends CardImpl { this.addAbility(new RedManaAbility()); // {B}{R}: Rakdos Keyrune becomes a 3/1 black and red Devil artifact creature with first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new RakdosKeyruneToken(), "", Constants.Duration.EndOfTurn), new ManaCostsImpl("{B}{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new RakdosKeyruneToken(), "", Duration.EndOfTurn), new ManaCostsImpl("{B}{R}"))); } public RakdosKeyrune(final RakdosKeyrune card) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RakdosLordOfRiots.java b/Mage.Sets/src/mage/sets/returntoravnica/RakdosLordOfRiots.java index c47b076b7d0..5c97fdd8a1c 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RakdosLordOfRiots.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RakdosLordOfRiots.java @@ -27,9 +27,7 @@ */ package mage.sets.returntoravnica; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -73,7 +71,7 @@ public class RakdosLordOfRiots extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Creature spells you cast cost {1} less to cast for each 1 life your opponents have lost this turn. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new RakdosLordOfRiotsCostReductionEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new RakdosLordOfRiotsCostReductionEffect())); } public RakdosLordOfRiots(final RakdosLordOfRiots card) { @@ -131,7 +129,7 @@ class RakdosLordOfRiotsCost extends CostImpl { class RakdosLordOfRiotsCostReductionEffect extends CostModificationEffectImpl { RakdosLordOfRiotsCostReductionEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "Creature spells you cast cost {1} less to cast for each 1 life your opponents have lost this turn"; } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RakdosRagemutt.java b/Mage.Sets/src/mage/sets/returntoravnica/RakdosRagemutt.java index 9e0814fc1dd..82043470857 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RakdosRagemutt.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RakdosRagemutt.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.LifelinkAbility; import mage.abilities.keyword.HasteAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RakdosRingleader.java b/Mage.Sets/src/mage/sets/returntoravnica/RakdosRingleader.java index 885cd0efcc2..2192587bde2 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RakdosRingleader.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RakdosRingleader.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RakdosShredFreak.java b/Mage.Sets/src/mage/sets/returntoravnica/RakdosShredFreak.java index 1644b9c5181..e519a68384c 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RakdosShredFreak.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RakdosShredFreak.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RakdossReturn.java b/Mage.Sets/src/mage/sets/returntoravnica/RakdossReturn.java index 6417f91f315..fc0c9ab58af 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RakdossReturn.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RakdossReturn.java @@ -29,8 +29,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.DiscardTargetEffect; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RestInPeace.java b/Mage.Sets/src/mage/sets/returntoravnica/RestInPeace.java index 70483d3463b..c65b926d0f9 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RestInPeace.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RestInPeace.java @@ -28,11 +28,11 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +40,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -127,7 +128,7 @@ class RestInPeaceExileAllEffect extends OneShotEffect class RestInPeaceReplacementEffect extends ReplacementEffectImpl { public RestInPeaceReplacementEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Exile); + super(Duration.WhileOnBattlefield, Outcome.Exile); staticText = "If a card or token would be put into a graveyard from anywhere, exile it instead"; } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RighteousAuthority.java b/Mage.Sets/src/mage/sets/returntoravnica/RighteousAuthority.java index a05e42ce879..45562515764 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RighteousAuthority.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RighteousAuthority.java @@ -29,12 +29,12 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.BeginningOfDrawTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RisenSanctuary.java b/Mage.Sets/src/mage/sets/returntoravnica/RisenSanctuary.java index ae4e4daf166..621d4db8ba4 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RisenSanctuary.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RisenSanctuary.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RitesOfReaping.java b/Mage.Sets/src/mage/sets/returntoravnica/RitesOfReaping.java index 599753d7c54..e161e3e0e10 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RitesOfReaping.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RitesOfReaping.java @@ -28,12 +28,12 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RixMaadiGuildmage.java b/Mage.Sets/src/mage/sets/returntoravnica/RixMaadiGuildmage.java index e01332e4f21..e515c6f360f 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RixMaadiGuildmage.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RixMaadiGuildmage.java @@ -28,16 +28,17 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.FilterPlayer; import mage.filter.common.FilterBlockingCreature; import mage.filter.common.FilterCreaturePermanent; @@ -72,7 +73,7 @@ public class RixMaadiGuildmage extends CardImpl { this.toughness = new MageInt(2); // {B}{R}: Target blocking creature gets -1/-1 until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Constants.Duration.EndOfTurn),new ManaCostsImpl("{B}{R}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn),new ManaCostsImpl("{B}{R}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RoguesPassage.java b/Mage.Sets/src/mage/sets/returntoravnica/RoguesPassage.java index 3798ae9f26c..849a89a5809 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RoguesPassage.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RoguesPassage.java @@ -28,10 +28,10 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -52,7 +52,7 @@ public class RoguesPassage extends CardImpl { this.expansionSetCode = "RTR"; // {T}: Add {1} to your mana pool. - this.addAbility(new SimpleManaAbility(Constants.Zone.BATTLEFIELD, new Mana(0, 0, 0, 0, 0, 1, 0), new TapSourceCost())); + this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(0, 0, 0, 0, 0, 1, 0), new TapSourceCost())); // {4}, {T}: Target creature is unblockable this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UnblockableTargetEffect(), new ManaCostsImpl("{4}")); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RootbornDefenses.java b/Mage.Sets/src/mage/sets/returntoravnica/RootbornDefenses.java index 78fb2e3f3c7..f68f9a97f3a 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RootbornDefenses.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RootbornDefenses.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.Effect; import mage.abilities.effects.common.PopulateEffect; import mage.abilities.effects.common.continious.GainAbilityAllEffect; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RubblebackRhino.java b/Mage.Sets/src/mage/sets/returntoravnica/RubblebackRhino.java index 142e9db8dae..9f739152e90 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RubblebackRhino.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RubblebackRhino.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Runewing.java b/Mage.Sets/src/mage/sets/returntoravnica/Runewing.java index 9f813267535..a3dceac38b7 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Runewing.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Runewing.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SavageSurge.java b/Mage.Sets/src/mage/sets/returntoravnica/SavageSurge.java index 60444ac8863..cd05b83dfa4 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SavageSurge.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SavageSurge.java @@ -28,12 +28,13 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -50,7 +51,7 @@ public class SavageSurge extends CardImpl { // Target creature gets +2/+2 until end of turn. Untap that creature. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new UntapTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SearchTheCity.java b/Mage.Sets/src/mage/sets/returntoravnica/SearchTheCity.java index 9a6e71d2aac..bd8ff9f296c 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SearchTheCity.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SearchTheCity.java @@ -28,16 +28,17 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.NamePredicate; import mage.game.ExileZone; @@ -83,7 +84,7 @@ public class SearchTheCity extends CardImpl { class SearchTheCityExileEffect extends OneShotEffect { public SearchTheCityExileEffect() { - super(Constants.Outcome.DrawCard); + super(Outcome.DrawCard); staticText = "exile the top five cards of your library"; } @@ -171,7 +172,7 @@ class SearchTheCityTriggeredAbility extends TriggeredAbilityImpl { public SearchTheCityExiledCardToHandEffect() { - super(Constants.Outcome.DrawCard); + super(Outcome.DrawCard); staticText = "you may put one of those cards with that name into its owner's hand. Then if there are no cards exiled with Search the City, sacrifice it. If you do, take an extra turn after this one"; } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SearchWarrant.java b/Mage.Sets/src/mage/sets/returntoravnica/SearchWarrant.java index b675e24ef3c..f8291238ab7 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SearchWarrant.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SearchWarrant.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SecurityBlockade.java b/Mage.Sets/src/mage/sets/returntoravnica/SecurityBlockade.java index 0eb87ff629d..d84314203e3 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SecurityBlockade.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SecurityBlockade.java @@ -29,12 +29,12 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaCharm.java b/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaCharm.java index e6e4e415549..023d2336b05 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaCharm.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaCharm.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Mode; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.ExileTargetEffect; @@ -38,6 +38,7 @@ import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; @@ -63,8 +64,8 @@ public class SelesnyaCharm extends CardImpl { this.color.setWhite(true); // Choose one — Target creature gets +2/+2 and gains trample until end of turn; - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Constants.Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new BoostTargetEffect(2,2, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(2,2, Duration.EndOfTurn)); this.getSpellAbility().getTargets().add(new TargetCreaturePermanent()); // or exile target creature with power 5 or greater; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaGuildgate.java b/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaGuildgate.java index f8b02610629..429ff07e656 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaGuildgate.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaGuildgate.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.WhiteManaAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaKeyrune.java b/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaKeyrune.java index 80ec95b4639..8b985bdbd16 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaKeyrune.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaKeyrune.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +38,8 @@ import mage.abilities.effects.common.continious.BecomesCreatureSourceEffect; import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.permanent.token.Token; /** @@ -54,7 +56,7 @@ public class SelesnyaKeyrune extends CardImpl { this.addAbility(new WhiteManaAbility()); // {G}{W}: Selesnya Keyrune becomes a 3/3 green and white Wolf artifact creature until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new SelesnyaKeyruneToken(), "", Constants.Duration.EndOfTurn), new ManaCostsImpl("{G}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new SelesnyaKeyruneToken(), "", Duration.EndOfTurn), new ManaCostsImpl("{G}{W}"))); } public SelesnyaKeyrune(final SelesnyaKeyrune card) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaSentry.java b/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaSentry.java index 645774eb3d1..7cef46a5cd6 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaSentry.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaSentry.java @@ -29,14 +29,14 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -55,7 +55,7 @@ public class SelesnyaSentry extends CardImpl { this.toughness = new MageInt(2); // {5}{G}: Regenerate Selesnya Sentry. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{5}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{5}{G}"))); } public SelesnyaSentry(final SelesnyaSentry card) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SellerOfSongbirds.java b/Mage.Sets/src/mage/sets/returntoravnica/SellerOfSongbirds.java index ebf0a14a3cb..28257c4bcda 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SellerOfSongbirds.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SellerOfSongbirds.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SewerShambler.java b/Mage.Sets/src/mage/sets/returntoravnica/SewerShambler.java index f6149d5d88f..c95dceff347 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SewerShambler.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SewerShambler.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.ScavengeAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ShriekingAffliction.java b/Mage.Sets/src/mage/sets/returntoravnica/ShriekingAffliction.java index 51c77119930..af916c91b25 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ShriekingAffliction.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ShriekingAffliction.java @@ -29,14 +29,15 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -115,7 +116,7 @@ class ShriekingAfflictionTriggeredAbility extends TriggeredAbilityImpl { public ShriekingAfflictionTargetEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "he or she loses 3 life"; } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SkullRend.java b/Mage.Sets/src/mage/sets/returntoravnica/SkullRend.java index 6608e81627f..c612f79351e 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SkullRend.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SkullRend.java @@ -28,13 +28,14 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; @@ -68,7 +69,7 @@ public class SkullRend extends CardImpl { private class SkullRendEffect extends OneShotEffect { public SkullRendEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "{this} deals 2 damage to each opponent. Those players each discard two cards at random"; } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SkylinePredator.java b/Mage.Sets/src/mage/sets/returntoravnica/SkylinePredator.java index e82993bfd5f..006a6dfea07 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SkylinePredator.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SkylinePredator.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SkymarkRoc.java b/Mage.Sets/src/mage/sets/returntoravnica/SkymarkRoc.java index 18b2f579ef6..79923b41baf 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SkymarkRoc.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SkymarkRoc.java @@ -29,14 +29,15 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ToughnessPredicate; @@ -81,7 +82,7 @@ public class SkymarkRoc extends CardImpl { class SkymarkRocAbility extends TriggeredAbilityImpl { public SkymarkRocAbility() { - super(Constants.Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), true); + super(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), true); } public SkymarkRocAbility(final SkymarkRocAbility ability) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SlaughterGames.java b/Mage.Sets/src/mage/sets/returntoravnica/SlaughterGames.java index 0d02d9e3cf1..c1e44cd9425 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SlaughterGames.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SlaughterGames.java @@ -29,9 +29,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.common.CantCounterSourceEffect; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SlimeMolding.java b/Mage.Sets/src/mage/sets/returntoravnica/SlimeMolding.java index 3fd79d56b86..3c562683532 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SlimeMolding.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SlimeMolding.java @@ -28,13 +28,14 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.token.Token; @@ -67,7 +68,7 @@ public class SlimeMolding extends CardImpl { class SlimeMoldingEffect extends OneShotEffect { public SlimeMoldingEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); staticText = "Put an X/X green Ooze creature token onto the battlefield"; } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Slitherhead.java b/Mage.Sets/src/mage/sets/returntoravnica/Slitherhead.java index d7e7cc2a833..5a160d2b534 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Slitherhead.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Slitherhead.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.ScavengeAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SluicewayScorpion.java b/Mage.Sets/src/mage/sets/returntoravnica/SluicewayScorpion.java index b707e01d29b..6fbd4f91042 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SluicewayScorpion.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SluicewayScorpion.java @@ -27,8 +27,8 @@ */ package mage.sets.returntoravnica; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.DeathtouchAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SlumReaper.java b/Mage.Sets/src/mage/sets/returntoravnica/SlumReaper.java index 540ae7652b7..4f16d3a35f8 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SlumReaper.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SlumReaper.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.SacrificeAllEffect; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SoulTithe.java b/Mage.Sets/src/mage/sets/returntoravnica/SoulTithe.java index c3cb6df51ca..45f87f60712 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SoulTithe.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SoulTithe.java @@ -29,13 +29,13 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SoulswornSpirit.java b/Mage.Sets/src/mage/sets/returntoravnica/SoulswornSpirit.java index b4d99966971..d2934c2f3a6 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SoulswornSpirit.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SoulswornSpirit.java @@ -28,15 +28,16 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DetainTargetEffect; import mage.abilities.keyword.UnblockableAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; @@ -50,7 +51,7 @@ public class SoulswornSpirit extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT)); + filter.add(new ControllerPredicate(TargetController.OPPONENT)); } public SoulswornSpirit(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SpawnOfRixMaadi.java b/Mage.Sets/src/mage/sets/returntoravnica/SpawnOfRixMaadi.java index acfb0a3d213..c1011ff0145 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SpawnOfRixMaadi.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SpawnOfRixMaadi.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.UnleashAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SphereOfSafety.java b/Mage.Sets/src/mage/sets/returntoravnica/SphereOfSafety.java index ac78d9fefca..658b7afe9c9 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SphereOfSafety.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SphereOfSafety.java @@ -29,9 +29,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -58,7 +57,7 @@ public class SphereOfSafety extends CardImpl { this.color.setWhite(true); // Creatures can't attack you or a planeswalker you control unless their controller pays {X} for each of those creatures, where X is the number of enchantments you control. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new SphereOfSafetyReplacementEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SphereOfSafetyReplacementEffect())); } @@ -78,13 +77,13 @@ class SphereOfSafetyReplacementEffect extends ReplacementEffectImpl { this.addAbility(FlyingAbility.getInstance()); // Discard two nonland cards with the same name: Draw four cards. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(4), new DiscardTwoNonlandCardsWithTheSameNameCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(4), new DiscardTwoNonlandCardsWithTheSameNameCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SphinxsRevelation.java b/Mage.Sets/src/mage/sets/returntoravnica/SphinxsRevelation.java index b12c5ccbb56..1e2c4ee8c74 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SphinxsRevelation.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SphinxsRevelation.java @@ -29,8 +29,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SplatterThug.java b/Mage.Sets/src/mage/sets/returntoravnica/SplatterThug.java index 6313f7b98f9..1d55273b363 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SplatterThug.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SplatterThug.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.UnleashAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/StabWound.java b/Mage.Sets/src/mage/sets/returntoravnica/StabWound.java index 2a5237bfc0f..76a44d4c707 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/StabWound.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/StabWound.java @@ -29,12 +29,12 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +43,7 @@ import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.abilities.effects.common.continious.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -71,7 +72,7 @@ public class StabWound extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-2,-2, Duration.WhileOnBattlefield))); // At the beginning of the upkeep of enchanted creature's controller, that player loses 2 life. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2), Constants.TargetController.CONTROLLER_ATTACHED_TO, false, true)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2), TargetController.CONTROLLER_ATTACHED_TO, false, true)); } public StabWound (final StabWound card) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/StealerOfSecrets.java b/Mage.Sets/src/mage/sets/returntoravnica/StealerOfSecrets.java index 2779ba68b3e..8b7cf30955a 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/StealerOfSecrets.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/StealerOfSecrets.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/StonefareCrocodile.java b/Mage.Sets/src/mage/sets/returntoravnica/StonefareCrocodile.java index 2fe920c8a89..45e87fa9d87 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/StonefareCrocodile.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/StonefareCrocodile.java @@ -28,15 +28,17 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -54,7 +56,7 @@ public class StonefareCrocodile extends CardImpl { this.toughness = new MageInt(2); // {2}{B}: Stonefare Crocodile gains lifelink until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(LifelinkAbility.getInstance(), Constants.Duration.EndOfTurn), new ManaCostsImpl("{2}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{2}{B}"))); } public StonefareCrocodile(final StonefareCrocodile card) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/StreetSpasm.java b/Mage.Sets/src/mage/sets/returntoravnica/StreetSpasm.java index 2b328d26d24..3c78c4607e1 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/StreetSpasm.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/StreetSpasm.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DamageAllEffect; @@ -38,6 +38,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.OverloadAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; @@ -53,7 +54,7 @@ public class StreetSpasm extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature without flying you don't control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.NOT_YOU)); + filter.add(new ControllerPredicate(TargetController.NOT_YOU)); filter.add(Predicates.not(new AbilityPredicate(FlyingAbility.class))); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/StreetSweeper.java b/Mage.Sets/src/mage/sets/returntoravnica/StreetSweeper.java index 5603da97a0f..418cd11f4bf 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/StreetSweeper.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/StreetSweeper.java @@ -29,9 +29,9 @@ package mage.sets.returntoravnica; import java.util.LinkedList; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -39,6 +39,7 @@ import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.game.Game; @@ -86,7 +87,7 @@ public class StreetSweeper extends CardImpl { class StreetSweeperDestroyEffect extends OneShotEffect { public StreetSweeperDestroyEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); } public StreetSweeperDestroyEffect(final StreetSweeperDestroyEffect effect) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SunderingGrowth.java b/Mage.Sets/src/mage/sets/returntoravnica/SunderingGrowth.java index 262adbb3c17..283badc036a 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SunderingGrowth.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SunderingGrowth.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.PopulateEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SunspireGriffin.java b/Mage.Sets/src/mage/sets/returntoravnica/SunspireGriffin.java index c06db24c6be..fc50bfe096a 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SunspireGriffin.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SunspireGriffin.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SupremeVerdict.java b/Mage.Sets/src/mage/sets/returntoravnica/SupremeVerdict.java index 8d8a6315618..872fbf4ac3f 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SupremeVerdict.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SupremeVerdict.java @@ -29,8 +29,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CantCounterSourceEffect; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SurveyTheWreckage.java b/Mage.Sets/src/mage/sets/returntoravnica/SurveyTheWreckage.java index 7b41b7c8e3f..485c57aa8c9 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SurveyTheWreckage.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SurveyTheWreckage.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SwiftJustice.java b/Mage.Sets/src/mage/sets/returntoravnica/SwiftJustice.java index ff162e4b19d..099094823c4 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SwiftJustice.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SwiftJustice.java @@ -29,9 +29,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Syncopate.java b/Mage.Sets/src/mage/sets/returntoravnica/Syncopate.java index 7d3e1c8777c..a75cc167c07 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Syncopate.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Syncopate.java @@ -27,10 +27,11 @@ */ package mage.sets.returntoravnica; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetSpell; import java.util.UUID; @@ -75,7 +76,7 @@ public class Syncopate extends CardImpl { class SyncopateCounterUnlessPaysEffect extends OneShotEffect { public SyncopateCounterUnlessPaysEffect() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); } public SyncopateCounterUnlessPaysEffect(final SyncopateCounterUnlessPaysEffect effect) { @@ -104,12 +105,12 @@ class SyncopateCounterUnlessPaysEffect extends OneShotEffect { class TabletOfTheGuildsEntersBattlefieldEffect extends OneShotEffect { public TabletOfTheGuildsEntersBattlefieldEffect() { - super(Constants.Outcome.BoostCreature); + super(Outcome.BoostCreature); staticText = "choose two colors"; } @@ -119,7 +119,7 @@ class TabletOfTheGuildsEntersBattlefieldEffect extends OneShotEffect { public TabletOfTheGuildsGainLifeEffect() { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); staticText = "if it's at least one of the chosen colors, you gain 1 life for each of the chosen colors it is"; } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/TavernSwindler.java b/Mage.Sets/src/mage/sets/returntoravnica/TavernSwindler.java index 416169fd3fa..2883ac21688 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/TavernSwindler.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/TavernSwindler.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +38,8 @@ import mage.abilities.costs.common.PayLifeCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; @@ -58,7 +60,7 @@ public class TavernSwindler extends CardImpl { this.toughness = new MageInt(2); // {T}, Pay 3 life: Flip a coin. If you win the flip, you gain 6 life. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new TavernSwindlerEffect(),new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TavernSwindlerEffect(),new TapSourceCost()); ability.addCost(new PayLifeCost(3)); this.addAbility(ability); } @@ -76,7 +78,7 @@ public class TavernSwindler extends CardImpl { class TavernSwindlerEffect extends OneShotEffect { public TavernSwindlerEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "Flip a coin. If you win the flip, you gain 6 life"; } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Teleportal.java b/Mage.Sets/src/mage/sets/returntoravnica/Teleportal.java index 1422a4c362f..132cc94c3f1 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Teleportal.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Teleportal.java @@ -28,11 +28,12 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; @@ -94,7 +95,7 @@ class TeleportalEffect extends OneShotEffect { private FilterCreaturePermanent filter; public TeleportalEffect(FilterCreaturePermanent filter) { - super(Constants.Outcome.ReturnToHand); + super(Outcome.ReturnToHand); staticText = "each creature you control is unblockable this turn"; this.filter = filter; } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/TenementCrasher.java b/Mage.Sets/src/mage/sets/returntoravnica/TenementCrasher.java index 5bb6a81dc30..c276a92d688 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/TenementCrasher.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/TenementCrasher.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/TerrusWurm.java b/Mage.Sets/src/mage/sets/returntoravnica/TerrusWurm.java index 06d7095895f..6857becc42f 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/TerrusWurm.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/TerrusWurm.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.ScavengeAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Thoughtflare.java b/Mage.Sets/src/mage/sets/returntoravnica/Thoughtflare.java index 968ea60caba..54c4160b783 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Thoughtflare.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Thoughtflare.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DiscardControllerEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ThrillKillAssassin.java b/Mage.Sets/src/mage/sets/returntoravnica/ThrillKillAssassin.java index 2178e502142..ae93e26b8f2 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ThrillKillAssassin.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ThrillKillAssassin.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.UnleashAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/TowerDrake.java b/Mage.Sets/src/mage/sets/returntoravnica/TowerDrake.java index 92888e6c7a4..5e44df33306 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/TowerDrake.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/TowerDrake.java @@ -28,15 +28,17 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -58,7 +60,7 @@ public class TowerDrake extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {W}: Tower Drake gets +0/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Constants.Duration.EndOfTurn), new ManaCostsImpl("{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl("{W}"))); } public TowerDrake(final TowerDrake card) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ToweringIndrik.java b/Mage.Sets/src/mage/sets/returntoravnica/ToweringIndrik.java index f9d8517d221..94cba520190 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ToweringIndrik.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ToweringIndrik.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/TrainedCaracal.java b/Mage.Sets/src/mage/sets/returntoravnica/TrainedCaracal.java index d97767643a2..bbfc1c5686f 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/TrainedCaracal.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/TrainedCaracal.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/TraitorousInstinct.java b/Mage.Sets/src/mage/sets/returntoravnica/TraitorousInstinct.java index 9d9296ec589..a28574148c5 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/TraitorousInstinct.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/TraitorousInstinct.java @@ -28,7 +28,7 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/returntoravnica/TransguildPromenade.java b/Mage.Sets/src/mage/sets/returntoravnica/TransguildPromenade.java index e3971bbec93..7133a5e6714 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/TransguildPromenade.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/TransguildPromenade.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/TreasuredFind.java b/Mage.Sets/src/mage/sets/returntoravnica/TreasuredFind.java index cea7a3d773d..a87768928a9 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/TreasuredFind.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/TreasuredFind.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ExileSpellEffect; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/TrestleTroll.java b/Mage.Sets/src/mage/sets/returntoravnica/TrestleTroll.java index 724d683b296..29beb946552 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/TrestleTroll.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/TrestleTroll.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +38,7 @@ import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -61,7 +62,7 @@ public class TrestleTroll extends CardImpl { this.addAbility(ReachAbility.getInstance()); // {1}{B}{G}: Regenerate Trestle Troll. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}{G}"))); } public TrestleTroll(final TrestleTroll card) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/TrostaniSelesnyasVoice.java b/Mage.Sets/src/mage/sets/returntoravnica/TrostaniSelesnyasVoice.java index 748ea888c7a..eb6b4369eb0 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/TrostaniSelesnyasVoice.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/TrostaniSelesnyasVoice.java @@ -29,10 +29,10 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -43,6 +43,7 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.PopulateEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -122,7 +123,7 @@ class TrostaniSelesnyasVoiceTriggeredAbility extends TriggeredAbilityImpl { public TrostaniSelesnyasVoiceEffect() { - super(Constants.Outcome.GainLife); + super(Outcome.GainLife); staticText = "you gain life equal to its toughness"; } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/TrostanisJudgment.java b/Mage.Sets/src/mage/sets/returntoravnica/TrostanisJudgment.java index 85bd37601e7..c20aa9027ff 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/TrostanisJudgment.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/TrostanisJudgment.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.effects.common.PopulateEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/UltimatePrice.java b/Mage.Sets/src/mage/sets/returntoravnica/UltimatePrice.java index bf7470468a4..4ece45ffe93 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/UltimatePrice.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/UltimatePrice.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/UnderworldConnections.java b/Mage.Sets/src/mage/sets/returntoravnica/UnderworldConnections.java index a1c8278808f..bab3c105372 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/UnderworldConnections.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/UnderworldConnections.java @@ -29,12 +29,12 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -45,6 +45,7 @@ import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; @@ -72,7 +73,7 @@ public class UnderworldConnections extends CardImpl { // Enchanted land has "{T}, Pay 1 life: Draw a card." Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new TapSourceCost()); gainedAbility.addCost(new PayLifeCost(1)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Constants.Duration.WhileOnBattlefield, rule))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, rule))); } public UnderworldConnections (final UnderworldConnections card) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/UrbanBurgeoning.java b/Mage.Sets/src/mage/sets/returntoravnica/UrbanBurgeoning.java index d47b1ce8a6a..d49be75efe3 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/UrbanBurgeoning.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/UrbanBurgeoning.java @@ -29,15 +29,15 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.PhaseStep; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.PhaseStep; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/UtvaraHellkite.java b/Mage.Sets/src/mage/sets/returntoravnica/UtvaraHellkite.java index 720ef952344..692043a3bc7 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/UtvaraHellkite.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/UtvaraHellkite.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.AttacksCreatureYourControlTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Vandalblast.java b/Mage.Sets/src/mage/sets/returntoravnica/Vandalblast.java index 5cb5b5701e2..8a682c15791 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Vandalblast.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Vandalblast.java @@ -28,14 +28,15 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyAllEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.OverloadAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetArtifactPermanent; @@ -50,7 +51,7 @@ public class Vandalblast extends CardImpl { private static final FilterArtifactPermanent filter = new FilterArtifactPermanent("artifact you don't control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.NOT_YOU)); + filter.add(new ControllerPredicate(TargetController.NOT_YOU)); } public Vandalblast(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/VassalSoul.java b/Mage.Sets/src/mage/sets/returntoravnica/VassalSoul.java index 6e15c7108f6..63e03943736 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/VassalSoul.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/VassalSoul.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ViashinoRacketeer.java b/Mage.Sets/src/mage/sets/returntoravnica/ViashinoRacketeer.java index 2a436991421..5a3ba3ab1dd 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ViashinoRacketeer.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ViashinoRacketeer.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.common.DiscardCardCost; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/VituGhaziGuildmage.java b/Mage.Sets/src/mage/sets/returntoravnica/VituGhaziGuildmage.java index 51a50a1d60e..2174a510cf9 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/VituGhaziGuildmage.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/VituGhaziGuildmage.java @@ -29,9 +29,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Voidwielder.java b/Mage.Sets/src/mage/sets/returntoravnica/Voidwielder.java index e749bb6ef30..1679e4bfb4d 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Voidwielder.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Voidwielder.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/VolatileRig.java b/Mage.Sets/src/mage/sets/returntoravnica/VolatileRig.java index ff2635e7c99..9afa8745a1e 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/VolatileRig.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/VolatileRig.java @@ -29,11 +29,11 @@ package mage.sets.returntoravnica; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -42,6 +42,7 @@ import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.PhaseStep; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.events.GameEvent; @@ -118,7 +119,7 @@ class VolatileRigTriggeredAbility extends TriggeredAbilityImpl { public VraskaTheUnseenLoseGameEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); this.staticText = "that player loses the game"; } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/WayfaringTemple.java b/Mage.Sets/src/mage/sets/returntoravnica/WayfaringTemple.java index 0ff7add4ce9..e14869ab080 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/WayfaringTemple.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/WayfaringTemple.java @@ -29,10 +29,10 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/WildBeastmaster.java b/Mage.Sets/src/mage/sets/returntoravnica/WildBeastmaster.java index 2a5c7a617dc..7288b2b0cc3 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/WildBeastmaster.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/WildBeastmaster.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.dynamicvalue.common.SourcePermanentPowerCount; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/WorldspineWurm.java b/Mage.Sets/src/mage/sets/returntoravnica/WorldspineWurm.java index 742014101dc..54fa78ba679 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/WorldspineWurm.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/WorldspineWurm.java @@ -28,9 +28,9 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -40,6 +40,7 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.token.Token; import mage.players.Player; @@ -80,7 +81,7 @@ public class WorldspineWurm extends CardImpl { class WorldspineWurmEffect extends OneShotEffect { WorldspineWurmEffect() { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); staticText = "shuffle it into its owner's library"; } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ZanikevLocust.java b/Mage.Sets/src/mage/sets/returntoravnica/ZanikevLocust.java index 71ae6d810cf..134f8d501dd 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ZanikevLocust.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ZanikevLocust.java @@ -28,8 +28,8 @@ package mage.sets.returntoravnica; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/revisededition/Atog.java b/Mage.Sets/src/mage/sets/revisededition/Atog.java index 290badae929..5729c78328e 100644 --- a/Mage.Sets/src/mage/sets/revisededition/Atog.java +++ b/Mage.Sets/src/mage/sets/revisededition/Atog.java @@ -28,7 +28,7 @@ package mage.sets.revisededition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/revisededition/Clone.java b/Mage.Sets/src/mage/sets/revisededition/Clone.java index dc330c28fa8..e03647b7961 100644 --- a/Mage.Sets/src/mage/sets/revisededition/Clone.java +++ b/Mage.Sets/src/mage/sets/revisededition/Clone.java @@ -28,7 +28,7 @@ package mage.sets.revisededition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/revisededition/Counterspell.java b/Mage.Sets/src/mage/sets/revisededition/Counterspell.java index 48fbd1f7e04..de6dbd13e43 100644 --- a/Mage.Sets/src/mage/sets/revisededition/Counterspell.java +++ b/Mage.Sets/src/mage/sets/revisededition/Counterspell.java @@ -28,7 +28,7 @@ package mage.sets.revisededition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/revisededition/DancingScimitar.java b/Mage.Sets/src/mage/sets/revisededition/DancingScimitar.java index 7cf407d04e5..e4877c00fb7 100644 --- a/Mage.Sets/src/mage/sets/revisededition/DancingScimitar.java +++ b/Mage.Sets/src/mage/sets/revisededition/DancingScimitar.java @@ -28,7 +28,7 @@ package mage.sets.revisededition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/revisededition/EvilPresence.java b/Mage.Sets/src/mage/sets/revisededition/EvilPresence.java index 99b6e573709..e97b4870898 100644 --- a/Mage.Sets/src/mage/sets/revisededition/EvilPresence.java +++ b/Mage.Sets/src/mage/sets/revisededition/EvilPresence.java @@ -28,7 +28,7 @@ package mage.sets.revisededition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/revisededition/FireElemental.java b/Mage.Sets/src/mage/sets/revisededition/FireElemental.java index 1aafc4ef23b..7132d8969e6 100644 --- a/Mage.Sets/src/mage/sets/revisededition/FireElemental.java +++ b/Mage.Sets/src/mage/sets/revisededition/FireElemental.java @@ -28,7 +28,7 @@ package mage.sets.revisededition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/revisededition/Fireball.java b/Mage.Sets/src/mage/sets/revisededition/Fireball.java index 79b83e1462b..a443482ba85 100644 --- a/Mage.Sets/src/mage/sets/revisededition/Fireball.java +++ b/Mage.Sets/src/mage/sets/revisededition/Fireball.java @@ -28,7 +28,7 @@ package mage.sets.revisededition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/revisededition/GoblinBalloonBrigade.java b/Mage.Sets/src/mage/sets/revisededition/GoblinBalloonBrigade.java index 994326b07c6..a6c91e6b8d9 100644 --- a/Mage.Sets/src/mage/sets/revisededition/GoblinBalloonBrigade.java +++ b/Mage.Sets/src/mage/sets/revisededition/GoblinBalloonBrigade.java @@ -28,7 +28,7 @@ package mage.sets.revisededition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/revisededition/HypnoticSpecter.java b/Mage.Sets/src/mage/sets/revisededition/HypnoticSpecter.java index 17157f4ee28..7edad3c58ab 100644 --- a/Mage.Sets/src/mage/sets/revisededition/HypnoticSpecter.java +++ b/Mage.Sets/src/mage/sets/revisededition/HypnoticSpecter.java @@ -28,7 +28,7 @@ package mage.sets.revisededition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/revisededition/KirdApe.java b/Mage.Sets/src/mage/sets/revisededition/KirdApe.java index ab064de67cf..f1ebceb867c 100644 --- a/Mage.Sets/src/mage/sets/revisededition/KirdApe.java +++ b/Mage.Sets/src/mage/sets/revisededition/KirdApe.java @@ -28,7 +28,7 @@ package mage.sets.revisededition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/revisededition/ProdigalSorcerer.java b/Mage.Sets/src/mage/sets/revisededition/ProdigalSorcerer.java index 1bd23721a82..eb47068899c 100644 --- a/Mage.Sets/src/mage/sets/revisededition/ProdigalSorcerer.java +++ b/Mage.Sets/src/mage/sets/revisededition/ProdigalSorcerer.java @@ -28,7 +28,7 @@ package mage.sets.revisededition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/revisededition/SengirVampire.java b/Mage.Sets/src/mage/sets/revisededition/SengirVampire.java index 58e9315519b..06767ef381a 100644 --- a/Mage.Sets/src/mage/sets/revisededition/SengirVampire.java +++ b/Mage.Sets/src/mage/sets/revisededition/SengirVampire.java @@ -28,7 +28,7 @@ package mage.sets.revisededition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/revisededition/SerraAngel.java b/Mage.Sets/src/mage/sets/revisededition/SerraAngel.java index c4cf7025940..f7aa4dc048d 100644 --- a/Mage.Sets/src/mage/sets/revisededition/SerraAngel.java +++ b/Mage.Sets/src/mage/sets/revisededition/SerraAngel.java @@ -28,7 +28,7 @@ package mage.sets.revisededition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/revisededition/SolRing.java b/Mage.Sets/src/mage/sets/revisededition/SolRing.java index 99faf4f8f71..02f624c7fc4 100644 --- a/Mage.Sets/src/mage/sets/revisededition/SolRing.java +++ b/Mage.Sets/src/mage/sets/revisededition/SolRing.java @@ -29,8 +29,8 @@ package mage.sets.revisededition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.mana.BasicManaAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AffaGuardHound.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AffaGuardHound.java index 03782d4a2d4..c18a5b29b5c 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AffaGuardHound.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AffaGuardHound.java @@ -29,9 +29,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AkoumBoulderfoot.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AkoumBoulderfoot.java index b08b13505f3..7e136a1f6c5 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AkoumBoulderfoot.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AkoumBoulderfoot.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AllIsDust.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AllIsDust.java index 25114723e2c..5a2aa6674c7 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AllIsDust.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AllIsDust.java @@ -29,12 +29,13 @@ package mage.sets.riseoftheeldrazi; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; @@ -64,7 +65,7 @@ public class AllIsDust extends CardImpl { class AllIsDustEffect extends OneShotEffect { AllIsDustEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); staticText = "Each player sacrifices all colored permanents he or she controls"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AncientStirrings.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AncientStirrings.java index fa5db045d97..be513351d01 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AncientStirrings.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AncientStirrings.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AngelheartVial.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AngelheartVial.java index 55eb5ba0010..c370739e29c 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AngelheartVial.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AngelheartVial.java @@ -28,10 +28,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.Outcome; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.Outcome; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.common.RemoveCountersSourceCost; import mage.abilities.costs.common.TapSourceCost; @@ -42,6 +42,7 @@ import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.counters.CounterType; import mage.game.events.GameEvent; @@ -61,7 +62,7 @@ public class AngelheartVial extends CardImpl { this.addAbility(new AngelheartVialTriggeredAbility()); // {2}, {tap}, Remove four charge counters from Angelheart Vial: You gain 2 life and draw a card. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainLifeEffect(2), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(4)))); ability.addEffect(new DrawCardControllerEffect(1)); @@ -81,7 +82,7 @@ public class AngelheartVial extends CardImpl { class AngelheartVialTriggeredAbility extends TriggeredAbilityImpl { public AngelheartVialTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new AngelheartVialEffect(), true); + super(Zone.BATTLEFIELD, new AngelheartVialEffect(), true); } public AngelheartVialTriggeredAbility(final AngelheartVialTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ArrogantBloodlord.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ArrogantBloodlord.java index 69503e64314..7d19e57aa3f 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ArrogantBloodlord.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ArrogantBloodlord.java @@ -28,11 +28,11 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.Outcome; -import mage.Constants.Zone; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.abilities.effects.OneShotEffect; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ArtisanOfKozilek.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ArtisanOfKozilek.java index 6eca399c310..e6077f34b81 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ArtisanOfKozilek.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ArtisanOfKozilek.java @@ -29,8 +29,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraFinesse.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraFinesse.java index b454f0da0f0..926ee2c74ac 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraFinesse.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraFinesse.java @@ -28,10 +28,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraGnarlid.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraGnarlid.java index 07440dc801a..8de5395191d 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraGnarlid.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraGnarlid.java @@ -28,10 +28,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AwakeningZone.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AwakeningZone.java index 98e5a2a4a24..8c69519e753 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AwakeningZone.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AwakeningZone.java @@ -29,8 +29,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BalaGedScorpion.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BalaGedScorpion.java index d277fbe8dd7..c6df6539dea 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BalaGedScorpion.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BalaGedScorpion.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BanefulOmen.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BanefulOmen.java index 1f8c6e423eb..c28e366b45d 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BanefulOmen.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BanefulOmen.java @@ -28,15 +28,15 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.Zone; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.cards.CardImpl; import mage.abilities.TriggeredAbilityImpl; import mage.game.Game; import mage.game.events.GameEvent; import mage.abilities.effects.OneShotEffect; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.cards.Card; import mage.cards.Cards; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BattleRampart.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BattleRampart.java index 38774bcc333..9da5b969a7b 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BattleRampart.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BattleRampart.java @@ -28,10 +28,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BattleRattleShaman.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BattleRattleShaman.java index d525fa48d06..2aff7412e32 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BattleRattleShaman.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BattleRattleShaman.java @@ -28,9 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfCombatTriggeredAbility; @@ -55,7 +54,7 @@ public class BattleRattleShaman extends CardImpl { this.toughness = new MageInt(2); // At the beginning of combat on your turn, you may have target creature get +2/+0 until end of turn. - Ability ability = new BeginningOfCombatTriggeredAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Constants.Duration.EndOfTurn), Constants.TargetController.YOU, true, false); + Ability ability = new BeginningOfCombatTriggeredAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Duration.EndOfTurn), TargetController.YOU, true, false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BearUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BearUmbra.java index a08facea434..5a46ae3b34f 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BearUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BearUmbra.java @@ -28,9 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -60,14 +59,14 @@ public class BearUmbra extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature gets +2/+2 and has "Whenever this creature attacks, untap all lands you control." Ability attachedAbility = new AttacksTriggeredAbility(new UntapAllLandsControllerEffect(), false); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Constants.Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(attachedAbility, Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(attachedAbility, AttachmentType.AURA))); // Totem armor this.addAbility(new TotemArmorAbility()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BeastbreakerOfBalaGed.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BeastbreakerOfBalaGed.java index bb54e02f35d..0ed4424822b 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BeastbreakerOfBalaGed.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BeastbreakerOfBalaGed.java @@ -27,8 +27,8 @@ */ package mage.sets.riseoftheeldrazi; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodriteInvoker.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodriteInvoker.java index 78035b91348..8b6cd619b84 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodriteInvoker.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodriteInvoker.java @@ -30,9 +30,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetPlayer; /** @@ -56,7 +56,7 @@ public class BloodriteInvoker extends CardImpl { this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new LoseLifeTargetEffect(3), new GenericManaCost(8)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(3), new GenericManaCost(8)); ability.addEffect(new GainLifeEffect(3)); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodthroneVampire.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodthroneVampire.java index fbd05c71a33..c4041ca6262 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodthroneVampire.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodthroneVampire.java @@ -29,10 +29,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BoarUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BoarUmbra.java index afb7f3f30e5..9aaeb2e4001 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BoarUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BoarUmbra.java @@ -29,9 +29,7 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -58,11 +56,11 @@ public class BoarUmbra extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature gets +3/+3. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); this.addAbility(new TotemArmorAbility()); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Bramblesnap.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Bramblesnap.java index 74c9866125f..2f431197980 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Bramblesnap.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Bramblesnap.java @@ -28,10 +28,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BrimstoneMage.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BrimstoneMage.java index 8e4b2619ea9..43de50bdc99 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BrimstoneMage.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BrimstoneMage.java @@ -28,9 +28,9 @@ package mage.sets.riseoftheeldrazi; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BroodBirthing.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BroodBirthing.java index 9caf8050c03..01f0cbd280a 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BroodBirthing.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BroodBirthing.java @@ -28,9 +28,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Broodwarden.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Broodwarden.java index fa96ecd52f0..96d066a9a64 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Broodwarden.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Broodwarden.java @@ -28,10 +28,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/CadaverImp.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/CadaverImp.java index 0507f848c6c..ca84055f9e9 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/CadaverImp.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/CadaverImp.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/CaravanEscort.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/CaravanEscort.java index e2f0ba84306..92ce2cafb41 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/CaravanEscort.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/CaravanEscort.java @@ -27,8 +27,8 @@ */ package mage.sets.riseoftheeldrazi; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.AbilitiesImpl; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/CastThroughTime.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/CastThroughTime.java index 1d4fd43eb68..cd6e247d324 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/CastThroughTime.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/CastThroughTime.java @@ -27,15 +27,15 @@ */ package mage.sets.riseoftheeldrazi; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.keyword.ReboundAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -67,7 +67,7 @@ public class CastThroughTime extends CardImpl { this.color.setBlue(true); // Instant and sorcery spells you control have rebound. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainReboundEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainReboundEffect())); this.addWatcher(new LeavesBattlefieldWatcher()); } @@ -85,7 +85,7 @@ public class CastThroughTime extends CardImpl { class GainReboundEffect extends ContinuousEffectImpl { public GainReboundEffect() { - super(Constants.Duration.Custom, Constants.Layer.AbilityAddingRemovingEffects_6, Constants.SubLayer.NA, Constants.Outcome.AddAbility); + super(Duration.Custom, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility); staticText = "Instant and sorcery spells you control have rebound"; } @@ -132,7 +132,7 @@ class AttachedReboundAbility extends ReboundAbility {} class LeavesBattlefieldWatcher extends WatcherImpl { public LeavesBattlefieldWatcher() { - super("LeavesBattlefieldWatcher", Constants.WatcherScope.CARD); + super("LeavesBattlefieldWatcher", WatcherScope.CARD); } public LeavesBattlefieldWatcher(final LeavesBattlefieldWatcher watcher) { @@ -143,7 +143,7 @@ class LeavesBattlefieldWatcher extends WatcherImpl { public void watch(GameEvent event, Game game) { if (event.getType() == GameEvent.EventType.ZONE_CHANGE && event.getTargetId().equals(this.getSourceId())) { ZoneChangeEvent zEvent = (ZoneChangeEvent)event; - if (zEvent.getFromZone() == Constants.Zone.BATTLEFIELD) { + if (zEvent.getFromZone() == Zone.BATTLEFIELD) { Player player = game.getPlayer(this.getControllerId()); if (player != null) { for (Card card : player.getHand().getCards(CastThroughTime.filter, game)) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ChampionsDrake.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ChampionsDrake.java index ea65b1b942f..323dcc802a3 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ChampionsDrake.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ChampionsDrake.java @@ -28,10 +28,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; -import mage.Constants.Duration; +import mage.constants.Duration; import mage.abilities.condition.common.PermanentHasCounterCondition; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -40,7 +40,7 @@ import mage.filter.common.FilterCreaturePermanent; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.common.SimpleStaticAbility; -import mage.Constants.Zone; +import mage.constants.Zone; /** diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConqueringManticore.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConqueringManticore.java index 8b59db9b027..5fb242d566b 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConqueringManticore.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConqueringManticore.java @@ -28,9 +28,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConsumeTheMeek.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConsumeTheMeek.java index 41343b1224f..71b79d41d99 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConsumeTheMeek.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConsumeTheMeek.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.filter.Filter; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConsumingVapors.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConsumingVapors.java index 494633718b4..997788febcf 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConsumingVapors.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConsumingVapors.java @@ -28,10 +28,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.ReboundAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ContaminatedGround.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ContaminatedGround.java index 3efeeacc8c8..cc70c2e1d18 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ContaminatedGround.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ContaminatedGround.java @@ -28,10 +28,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/CoralhelmCommander.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/CoralhelmCommander.java index 1742e1911be..8809c45723a 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/CoralhelmCommander.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/CoralhelmCommander.java @@ -27,10 +27,10 @@ */ package mage.sets.riseoftheeldrazi; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Corpsehatch.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Corpsehatch.java index cd83e19ab21..66bcc7ba69f 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Corpsehatch.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Corpsehatch.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/CrabUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/CrabUmbra.java index d08b442c0e2..3456b0ad8b0 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/CrabUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/CrabUmbra.java @@ -29,9 +29,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -40,6 +39,8 @@ import mage.abilities.effects.common.UntapEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.TotemArmorAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -59,11 +60,11 @@ public class CrabUmbra extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // {2}{U}: Untap enchanted creature. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new UntapEnchantedEffect(), new ManaCostsImpl("{2}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapEnchantedEffect(), new ManaCostsImpl("{2}{U}"))); this.addAbility(new TotemArmorAbility()); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/CurseOfWizardry.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/CurseOfWizardry.java index 4559045a706..8d8fa1668e6 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/CurseOfWizardry.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/CurseOfWizardry.java @@ -27,9 +27,8 @@ */ package mage.sets.riseoftheeldrazi; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -38,6 +37,8 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; import mage.choices.ChoiceColor; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -79,7 +80,7 @@ public class CurseOfWizardry extends CardImpl { class CurseOfWizardryChooseColorEffect extends OneShotEffect { public CurseOfWizardryChooseColorEffect() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); staticText = "choose a color"; } @@ -93,7 +94,7 @@ class CurseOfWizardryChooseColorEffect extends OneShotEffect { public CurseOfWizardryPlayerCastsSpellChosenColorTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), false); + super(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), false); } public CurseOfWizardryPlayerCastsSpellChosenColorTriggeredAbility(final CurseOfWizardryPlayerCastsSpellChosenColorTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DaggerbackBasilisk.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DaggerbackBasilisk.java index a2e649add44..d80b1289578 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DaggerbackBasilisk.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DaggerbackBasilisk.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DawnglareInvoker.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DawnglareInvoker.java index 9f40489fed9..ed37bfb3af9 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DawnglareInvoker.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DawnglareInvoker.java @@ -29,10 +29,10 @@ package mage.sets.riseoftheeldrazi; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DeathCultist.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DeathCultist.java index 1f4d91bf81c..753fe39390b 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DeathCultist.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DeathCultist.java @@ -28,15 +28,16 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetPlayer; /** @@ -55,7 +56,7 @@ public class DeathCultist extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new SacrificeSourceCost()); ability.addEffect(new GainLifeEffect(1)); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DeathlessAngel.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DeathlessAngel.java index 66dba231726..60dd32009f2 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DeathlessAngel.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DeathlessAngel.java @@ -29,10 +29,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DemonicAppetite.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DemonicAppetite.java index 668ae948dab..948120bd785 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DemonicAppetite.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DemonicAppetite.java @@ -30,9 +30,7 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -58,15 +56,15 @@ public class DemonicAppetite extends CardImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); ability = new BeginningOfUpkeepTriggeredAbility( new DemonicAppetiteEffect(), - Constants.TargetController.YOU, + TargetController.YOU, false); ability.addTarget(new TargetControlledCreaturePermanent(true)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Deprive.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Deprive.java index bf288e9316c..f43070fe32a 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Deprive.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Deprive.java @@ -29,8 +29,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.common.ReturnToHandTargetCost; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DevastatingSummons.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DevastatingSummons.java index a665398dfd4..8690a1ed864 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DevastatingSummons.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DevastatingSummons.java @@ -28,9 +28,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.costs.CostImpl; @@ -38,6 +38,7 @@ import mage.abilities.costs.VariableCost; import mage.abilities.dynamicvalue.common.GetXValue; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterMana; import mage.filter.common.FilterLandPermanent; import mage.game.Game; @@ -98,7 +99,7 @@ class DevastatingSummonsCost extends CostImpl implements TargetLandPermanent target = new TargetLandPermanent(filter); while (true) { target.clearChosen(); - if (target.canChoose(controllerId, game) && target.choose(Constants.Outcome.Sacrifice, controllerId, sourceId, game)) { + if (target.canChoose(controllerId, game) && target.choose(Outcome.Sacrifice, controllerId, sourceId, game)) { UUID land = target.getFirstTarget(); if (land != null) { game.getPermanent(land).sacrifice(sourceId, game); @@ -148,7 +149,7 @@ class DevastatingSummonsCost extends CostImpl implements class DevastatingSummonsEffect extends OneShotEffect { public DevastatingSummonsEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); staticText = "Put two X/X red Elemental creature tokens onto the battlefield"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DisasterRadius.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DisasterRadius.java index a1afcb417ae..16f72884d2b 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DisasterRadius.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DisasterRadius.java @@ -28,10 +28,11 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.abilities.Ability; import mage.abilities.costs.common.RevealTargetFromHandCost; import mage.abilities.effects.OneShotEffect; @@ -82,7 +83,7 @@ class DisasterRadiusEffect extends OneShotEffect { } public DisasterRadiusEffect() { - super(Constants.Outcome.GainLife); + super(Outcome.GainLife); staticText = "{this} deals X damage to each creature your opponents control, where X is the revealed card's converted mana cost"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DistortionStrike.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DistortionStrike.java index 2357606b5c7..309c2ed5c1f 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DistortionStrike.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DistortionStrike.java @@ -28,9 +28,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.UnblockableTargetEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.ReboundAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Domestication.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Domestication.java index 40a7a62329f..d3203f350b1 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Domestication.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Domestication.java @@ -28,9 +28,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; @@ -42,6 +42,8 @@ import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.effects.common.continious.ControlEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -63,12 +65,12 @@ public class Domestication extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.GainControl)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); // At the beginning of your end step, if enchanted creature's power is 4 or greater, sacrifice Domestication. TriggeredAbility ability2 = new BeginningOfYourEndStepTriggeredAbility(new SacrificeSourceEffect(), false); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DormantGomazoa.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DormantGomazoa.java index f2409392e94..ce5855f73e3 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DormantGomazoa.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DormantGomazoa.java @@ -28,9 +28,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.Zone; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DrakeUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DrakeUmbra.java index c2eaab02387..dff73975bfc 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DrakeUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DrakeUmbra.java @@ -29,9 +29,7 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -60,12 +58,12 @@ public class DrakeUmbra extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature gets +3/+3 and has flying. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Constants.Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); this.addAbility(new TotemArmorAbility()); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DranaKalastriaBloodchief.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DranaKalastriaBloodchief.java index f66dbdd0d0b..246e6426dde 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DranaKalastriaBloodchief.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DranaKalastriaBloodchief.java @@ -29,9 +29,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -63,8 +64,8 @@ public class DranaKalastriaBloodchief extends CardImpl this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(new StaticValue(0), new SignInversionDynamicValue(new ManacostVariableValue()), Constants.Duration.EndOfTurn), new ManaCostsImpl("{X}{B}{B}")); - ability.addEffect(new BoostSourceEffect(new ManacostVariableValue(), new StaticValue(0), Constants.Duration.EndOfTurn)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(new StaticValue(0), new SignInversionDynamicValue(new ManacostVariableValue()), Duration.EndOfTurn), new ManaCostsImpl("{X}{B}{B}")); + ability.addEffect(new BoostSourceEffect(new ManacostVariableValue(), new StaticValue(0), Duration.EndOfTurn)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DreadDrone.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DreadDrone.java index e8c8e4f6a79..7e711633e67 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DreadDrone.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DreadDrone.java @@ -29,8 +29,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DreamstoneHedron.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DreamstoneHedron.java index bb19aebdcf0..d591aa13729 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DreamstoneHedron.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DreamstoneHedron.java @@ -28,9 +28,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.Mana; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EchoMage.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EchoMage.java index b3083eea6be..896b7a10c32 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EchoMage.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EchoMage.java @@ -28,10 +28,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EelUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EelUmbra.java index e4084c9587a..806c83b0810 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EelUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EelUmbra.java @@ -29,9 +29,7 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -60,11 +58,11 @@ public class EelUmbra extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); this.addAbility(new TotemArmorAbility()); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ElandUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ElandUmbra.java index 0b8619636fa..ba781bb59c9 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ElandUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ElandUmbra.java @@ -29,9 +29,7 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -58,11 +56,11 @@ public class ElandUmbra extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature gets +0/+4. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(0, 4, Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0, 4, Duration.WhileOnBattlefield))); this.addAbility(new TotemArmorAbility()); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EldraziConscription.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EldraziConscription.java index bff717ecff7..14eb74137e3 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EldraziConscription.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EldraziConscription.java @@ -30,11 +30,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -44,6 +43,8 @@ import mage.abilities.keyword.AnnihilatorAbility; import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.AttachmentType; +import mage.constants.Outcome; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -61,13 +62,13 @@ public class EldraziConscription extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(10, 10, Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), Constants.AttachmentType.AURA))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new AnnihilatorAbility(2), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new AnnihilatorAbility(2), AttachmentType.AURA))); } public EldraziConscription (final EldraziConscription card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EldraziTemple.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EldraziTemple.java index 391fc59143c..76c6cf130bd 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EldraziTemple.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EldraziTemple.java @@ -30,8 +30,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; import mage.ConditionalMana; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageObject; import mage.Mana; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmergeUnscathed.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmergeUnscathed.java index 5dd8829450f..75be517a05d 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmergeUnscathed.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmergeUnscathed.java @@ -28,13 +28,14 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.GainProtectionFromColorTargetEffect; import mage.abilities.keyword.ReboundAbility; import mage.cards.CardImpl; import mage.choices.ChoiceColor; +import mage.constants.Duration; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -50,7 +51,7 @@ public class EmergeUnscathed extends CardImpl { this.color.setWhite(true); // Target creature you control gains protection from the color of your choice until end of turn. - this.getSpellAbility().addEffect(new GainProtectionFromColorTargetEffect(Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainProtectionFromColorTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); this.getSpellAbility().addChoice(new ChoiceColor()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmrakulTheAeonsTorn.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmrakulTheAeonsTorn.java index 8ffc9e61db3..a4fb32e9b4e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmrakulTheAeonsTorn.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmrakulTheAeonsTorn.java @@ -29,10 +29,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmrakulsHatcher.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmrakulsHatcher.java index 3325b01ac74..c9ae951ad70 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmrakulsHatcher.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmrakulsHatcher.java @@ -29,8 +29,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EnatuGolem.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EnatuGolem.java index 448a34bb7b8..a0c85fddfdc 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EnatuGolem.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EnatuGolem.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EnclaveCryptologist.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EnclaveCryptologist.java index 97e838cd23f..64192624c1c 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EnclaveCryptologist.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EnclaveCryptologist.java @@ -28,9 +28,9 @@ package mage.sets.riseoftheeldrazi; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EscapedNull.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EscapedNull.java index 41057650e57..c2eeffda6e1 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EscapedNull.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EscapedNull.java @@ -28,9 +28,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EssenceFeed.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EssenceFeed.java index 86e376dc8b9..7e61f3062ec 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EssenceFeed.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EssenceFeed.java @@ -29,8 +29,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EvolvingWilds.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EvolvingWilds.java index be2b4e69427..38283f9bbc7 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EvolvingWilds.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EvolvingWilds.java @@ -29,10 +29,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ExplosiveRevelation.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ExplosiveRevelation.java index 8da01fafad1..e3ec9493013 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ExplosiveRevelation.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ExplosiveRevelation.java @@ -28,14 +28,16 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Library; @@ -72,7 +74,7 @@ public class ExplosiveRevelation extends CardImpl { class ExplosiveRevelationEffect extends OneShotEffect { public ExplosiveRevelationEffect() { - super(Constants.Outcome.DrawCard); + super(Outcome.DrawCard); this.staticText = "Choose target creature or player. Reveal cards from the top of your library until you reveal a nonland card, {this} deals damage equal to that card's converted mana cost to that creature or player. Put the nonland card into your hand and the rest on the bottom of your library in any order"; } @@ -118,7 +120,7 @@ class ExplosiveRevelationEffect extends OneShotEffect } } // move nonland card to hand - card.moveToZone(Constants.Zone.HAND, id, game, true); + card.moveToZone(Zone.HAND, id, game, true); // remove nonland card from revealed card list cards.remove(card); // put the rest of the cards on the bottom of the library in any order diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/FissureVent.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/FissureVent.java index 1df300eada7..0011780f899 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/FissureVent.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/FissureVent.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Mode; import mage.abilities.effects.common.DestroyMultiTargetEffect; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/FlameSlash.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/FlameSlash.java index b33933ee75d..df291d4cf93 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/FlameSlash.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/FlameSlash.java @@ -29,8 +29,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/FleetingDistraction.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/FleetingDistraction.java index 9c798d3b105..d323dcd05c8 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/FleetingDistraction.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/FleetingDistraction.java @@ -30,12 +30,12 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -48,7 +48,7 @@ public class FleetingDistraction extends CardImpl { super(ownerId, 67, "Fleeting Distraction", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "ROE"; this.color.setBlue(true); - this.getSpellAbility().addEffect(new BoostTargetEffect(-1, 0, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(-1, 0, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ForkedBolt.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ForkedBolt.java index d2f69efadec..423b523933f 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ForkedBolt.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ForkedBolt.java @@ -28,12 +28,13 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -69,7 +70,7 @@ public class ForkedBolt extends CardImpl { class ForkedBoltEffect extends OneShotEffect { public ForkedBoltEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "{this} deals 2 damage divided as you choose among one or two target creatures and/or players"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/FrostwindInvoker.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/FrostwindInvoker.java index ee20c2ae84b..f815871805e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/FrostwindInvoker.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/FrostwindInvoker.java @@ -28,10 +28,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GelatinousGenesis.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GelatinousGenesis.java index f6459baf023..ceb57048908 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GelatinousGenesis.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GelatinousGenesis.java @@ -28,13 +28,14 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.token.Token; @@ -67,7 +68,7 @@ public class GelatinousGenesis extends CardImpl { class GelatinousGenesisEffect extends OneShotEffect { public GelatinousGenesisEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); staticText = "Put X X/X green Ooze creature tokens onto the battlefield"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java index a63d7314689..fd97fb4b22e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java @@ -29,10 +29,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TurnPhase; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TurnPhase; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Gigantomancer.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Gigantomancer.java index 187fbd5389b..c0b7dff7055 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Gigantomancer.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Gigantomancer.java @@ -30,15 +30,16 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.SetPowerToughnessTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -55,7 +56,7 @@ public class Gigantomancer extends CardImpl { this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new SetPowerToughnessTargetEffect(7, 7, Constants.Duration.EndOfTurn), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SetPowerToughnessTargetEffect(7, 7, Duration.EndOfTurn), new GenericManaCost(1)); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Gloomhunter.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Gloomhunter.java index 34e975f878f..6e9244eb289 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Gloomhunter.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Gloomhunter.java @@ -29,8 +29,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GlorySeeker.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GlorySeeker.java index 1512e581e4f..a55166fb4e5 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GlorySeeker.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GlorySeeker.java @@ -29,8 +29,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinArsonist.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinArsonist.java index 967b6ef186b..a43d70f244d 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinArsonist.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinArsonist.java @@ -28,9 +28,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java index dd8b22dae76..36e6fbd9c5e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java @@ -29,9 +29,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GravitationalShift.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GravitationalShift.java index 2c2eb783c2e..958742e4242 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GravitationalShift.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GravitationalShift.java @@ -28,10 +28,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GravityWell.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GravityWell.java index cd1c072e04e..4d076fa933d 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GravityWell.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GravityWell.java @@ -29,9 +29,8 @@ package mage.sets.riseoftheeldrazi; import java.util.Iterator; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.cards.CardImpl; @@ -72,7 +71,7 @@ public class GravityWell extends CardImpl { class GravityWellTriggeredAbility extends TriggeredAbilityImpl { public GravityWellTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new GravityWellEffect()); + super(Zone.BATTLEFIELD, new GravityWellEffect()); } public GravityWellTriggeredAbility(final GravityWellTriggeredAbility ability) { @@ -107,7 +106,7 @@ class GravityWellTriggeredAbility extends TriggeredAbilityImpl { public GravityWellEffect() { - super(Constants.Duration.EndOfTurn, Constants.Outcome.LoseAbility); + super(Duration.EndOfTurn, Outcome.LoseAbility); staticText = "it loses flying until end of turn"; } @@ -121,12 +120,12 @@ class GravityWellEffect extends ContinuousEffectImpl { } @Override - public boolean apply(Constants.Layer layer, Constants.SubLayer sublayer, Ability source, Game game) { + public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) { Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); if (permanent != null) { switch (layer) { case AbilityAddingRemovingEffects_6: - if (sublayer == Constants.SubLayer.NA) { + if (sublayer == SubLayer.NA) { for (Iterator i = permanent.getAbilities().iterator(); i.hasNext();) { Ability entry = i.next(); if (entry.getId().equals(FlyingAbility.getInstance().getId())) @@ -146,8 +145,8 @@ class GravityWellEffect extends ContinuousEffectImpl { } @Override - public boolean hasLayer(Constants.Layer layer) { - return layer == Constants.Layer.AbilityAddingRemovingEffects_6; + public boolean hasLayer(Layer layer) { + return layer == Layer.AbilityAddingRemovingEffects_6; } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GrotagSiegeRunner.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GrotagSiegeRunner.java index aac7398004d..70ea2b74252 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GrotagSiegeRunner.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GrotagSiegeRunner.java @@ -28,10 +28,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GrowthSpasm.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GrowthSpasm.java index 3e7e4b143ec..c17baf69a2a 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GrowthSpasm.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GrowthSpasm.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuardDuty.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuardDuty.java index 3fd6d248e3a..5a2eff591fb 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuardDuty.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuardDuty.java @@ -30,9 +30,7 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -57,11 +55,11 @@ public class GuardDuty extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DefenderAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DefenderAbility.getInstance(), AttachmentType.AURA))); } public GuardDuty (final GuardDuty card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuardGomazoa.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuardGomazoa.java index f8ed1fa67b2..5ac6568b6a6 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuardGomazoa.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuardGomazoa.java @@ -28,16 +28,17 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.PreventCombatDamageSourceEffect; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.abilities.common.SimpleStaticAbility; -import mage.Constants.Zone; +import mage.constants.Zone; +import mage.constants.Duration; /** * @@ -58,7 +59,7 @@ public class GuardGomazoa extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Prevent all combat damage that would be dealt to Guard Gomazoa. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventCombatDamageSourceEffect(Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventCombatDamageSourceEffect(Duration.WhileOnBattlefield))); } public GuardGomazoa(final GuardGomazoa card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuulDrazAssassin.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuulDrazAssassin.java index dfaf1e67c39..5d60be3b4e4 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuulDrazAssassin.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuulDrazAssassin.java @@ -28,9 +28,8 @@ package mage.sets.riseoftheeldrazi; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; @@ -42,6 +41,8 @@ import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.LevelUpAbility; import mage.abilities.keyword.LevelerCardBuilder; import mage.cards.LevelerCard; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -64,13 +65,13 @@ public class GuulDrazAssassin extends LevelerCard { this.addAbility(new LevelUpAbility(new ManaCostsImpl("{1}{B}"))); Abilities abilities1 = new AbilitiesImpl(); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Constants.Duration.EndOfTurn), new ManaCostsImpl("{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl("{B}")); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); abilities1.add(ability); Abilities abilities2 = new AbilitiesImpl(); - Ability ability2 = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(-4, -4, Constants.Duration.EndOfTurn), new ManaCostsImpl("{B}")); + Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-4, -4, Duration.EndOfTurn), new ManaCostsImpl("{B}")); ability2.addTarget(new TargetCreaturePermanent()); ability2.addCost(new TapSourceCost()); abilities2.add(ability2); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HadaSpyPatrol.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HadaSpyPatrol.java index b20e70a8526..e8749531b33 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HadaSpyPatrol.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HadaSpyPatrol.java @@ -27,8 +27,8 @@ */ package mage.sets.riseoftheeldrazi; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HalimarWavewatch.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HalimarWavewatch.java index 625b6102e21..934154f8641 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HalimarWavewatch.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HalimarWavewatch.java @@ -27,8 +27,8 @@ */ package mage.sets.riseoftheeldrazi; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HandOfEmrakul.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HandOfEmrakul.java index a827301cd24..f3400118fee 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HandOfEmrakul.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HandOfEmrakul.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.common.SacrificeTargetCost; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HarmlessAssault.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HarmlessAssault.java index 4763cd35509..481e5e7362f 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HarmlessAssault.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HarmlessAssault.java @@ -28,9 +28,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.PreventAllDamageEffect; import mage.cards.CardImpl; import mage.filter.common.FilterAttackingCreature; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HazeFrog.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HazeFrog.java index 491ae6f15a7..f1cbd9a7966 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HazeFrog.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HazeFrog.java @@ -28,15 +28,16 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.PreventionEffectImpl; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.game.Game; import mage.game.events.DamageEvent; import mage.game.events.GameEvent; @@ -77,7 +78,7 @@ public class HazeFrog extends CardImpl { class HazeFrogEffect extends PreventionEffectImpl { public HazeFrogEffect() { - super(Constants.Duration.EndOfTurn); + super(Duration.EndOfTurn); this.staticText = "prevent all combat damage that other creatures would deal this turn"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HeatRay.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HeatRay.java index c2b6a5dad90..d62e89be420 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HeatRay.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HeatRay.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HedronFieldPurists.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HedronFieldPurists.java index 9ce2f0abea3..0d43bd58327 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HedronFieldPurists.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HedronFieldPurists.java @@ -28,10 +28,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HedronMatrix.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HedronMatrix.java index 1ccde8fa6ff..905436b15e5 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HedronMatrix.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HedronMatrix.java @@ -30,17 +30,19 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.game.Game; import mage.game.permanent.Permanent; @@ -54,7 +56,7 @@ public class HedronMatrix extends CardImpl { super(ownerId, 218, "Hedron Matrix", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{4}"); this.expansionSetCode = "ROE"; this.subtype.add("Equipment"); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(4))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(4))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new HedronMatrixEffect())); } @@ -72,7 +74,7 @@ public class HedronMatrix extends CardImpl { class HedronMatrixEffect extends ContinuousEffectImpl { public HedronMatrixEffect() { - super(Duration.WhileOnBattlefield, Constants.Layer.PTChangingEffects_7, Constants.SubLayer.ModifyPT_7c, Constants.Outcome.BoostCreature); + super(Duration.WhileOnBattlefield, Layer.PTChangingEffects_7, SubLayer.ModifyPT_7c, Outcome.BoostCreature); staticText = "Equipped creature gets +X/+X, where X is its converted mana cost"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HellcarverDemon.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HellcarverDemon.java index b000bce059d..92495d9a944 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HellcarverDemon.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HellcarverDemon.java @@ -28,14 +28,14 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.OneShotEffect; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.cards.Card; import mage.players.Player; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HellionEruption.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HellionEruption.java index ddd887a7b3a..4e61077660b 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HellionEruption.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HellionEruption.java @@ -27,9 +27,9 @@ */ package mage.sets.riseoftheeldrazi; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HyenaUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HyenaUmbra.java index 9a73b330e66..304b2b8fca8 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HyenaUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HyenaUmbra.java @@ -29,9 +29,7 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -60,12 +58,12 @@ public class HyenaUmbra extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature gets +1/+1 and has first strike. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Constants.Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); // Totem armor this.addAbility(new TotemArmorAbility()); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/IkiralOutrider.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/IkiralOutrider.java index e6bbce01468..a0a70600dc1 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/IkiralOutrider.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/IkiralOutrider.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/InduceDespair.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/InduceDespair.java index 2fafe3ade6e..021c49ea216 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/InduceDespair.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/InduceDespair.java @@ -28,9 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.RevealTargetFromHandCost; @@ -77,7 +76,7 @@ public class InduceDespair extends CardImpl { class InduceDespairEffect extends OneShotEffect { public InduceDespairEffect() { - super(Constants.Outcome.UnboostCreature); + super(Outcome.UnboostCreature); staticText = "Target creature gets -X/-X until end of turn, where X is the revealed card's converted mana cost"; } @@ -92,7 +91,7 @@ class InduceDespairEffect extends OneShotEffect { if (cost != null) { int CMC = -1 * cost.convertedManaCosts; if (creature != null) { - creature.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(CMC, CMC, Constants.Duration.EndOfTurn)), game); + creature.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(CMC, CMC, Duration.EndOfTurn)), game); } } return true; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/InquisitionOfKozilek.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/InquisitionOfKozilek.java index 5127b494de1..65cab8b622d 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/InquisitionOfKozilek.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/InquisitionOfKozilek.java @@ -29,10 +29,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/IrresistiblePrey.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/IrresistiblePrey.java index 0b4164c855c..a6a7337384a 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/IrresistiblePrey.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/IrresistiblePrey.java @@ -28,14 +28,16 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.MustBlockSourceEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -52,7 +54,7 @@ public class IrresistiblePrey extends CardImpl { // Target creature must be blocked this turn if able. // Draw a card. - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new MustBlockSourceEffect()), Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBlockSourceEffect()), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ItThatBetrays.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ItThatBetrays.java index 5aea9ad7582..11fbc4aed15 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ItThatBetrays.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ItThatBetrays.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.OpponentSacrificesNonTokenPermanentTriggeredAbility; import mage.abilities.effects.common.ReturnToBattlefieldUnderYourControlTargetEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/JaddiLifestrider.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/JaddiLifestrider.java index d447292adbd..15c67540bac 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/JaddiLifestrider.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/JaddiLifestrider.java @@ -28,14 +28,16 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.ControllerPredicate; @@ -78,12 +80,12 @@ class JaddiLifestriderEffect extends OneShotEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped creatures you control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(Predicates.not(new TappedPredicate())); } public JaddiLifestriderEffect() { - super(Constants.Outcome.GainLife); + super(Outcome.GainLife); staticText = "you may tap any number of untapped creatures you control. You gain 2 life for each creature tapped this way"; } @@ -98,7 +100,7 @@ class JaddiLifestriderEffect extends OneShotEffect { TargetCreaturePermanent target = new TargetCreaturePermanent(filter); while (true) { target.clearChosen(); - if (target.canChoose(source.getControllerId(), game) && target.choose(Constants.Outcome.Tap, source.getControllerId(), source.getId(), game)) { + if (target.canChoose(source.getControllerId(), game) && target.choose(Outcome.Tap, source.getControllerId(), source.getId(), game)) { UUID creature = target.getFirstTarget(); if (creature != null) { game.getPermanent(creature).tap(game); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/JoragaTreespeaker.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/JoragaTreespeaker.java index 2c56c537431..731042398ec 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/JoragaTreespeaker.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/JoragaTreespeaker.java @@ -29,10 +29,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.Mana; import mage.abilities.Abilities; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/JwariScuttler.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/JwariScuttler.java index b5fe74cd777..9b35e4257ce 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/JwariScuttler.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/JwariScuttler.java @@ -29,8 +29,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KabiraVindicator.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KabiraVindicator.java index 60daaeec6f5..46ea6f8ab85 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KabiraVindicator.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KabiraVindicator.java @@ -27,10 +27,10 @@ */ package mage.sets.riseoftheeldrazi; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KarganDragonlord.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KarganDragonlord.java index 08522e68ba2..8597936c5a3 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KarganDragonlord.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KarganDragonlord.java @@ -28,10 +28,10 @@ package mage.sets.riseoftheeldrazi; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KazanduTuskcaller.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KazanduTuskcaller.java index 25e681b18f4..87b43a0b2ed 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KazanduTuskcaller.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KazanduTuskcaller.java @@ -27,9 +27,9 @@ */ package mage.sets.riseoftheeldrazi; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KeeningStone.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KeeningStone.java index 5576ea249df..4606e824ed8 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KeeningStone.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KeeningStone.java @@ -28,10 +28,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KhalniHydra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KhalniHydra.java index 46045bf038e..e8b28775fd6 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KhalniHydra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KhalniHydra.java @@ -29,10 +29,10 @@ package mage.sets.riseoftheeldrazi; import java.util.Iterator; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KilnFiend.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KilnFiend.java index c0e07fb5bd7..a134483d176 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KilnFiend.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KilnFiend.java @@ -28,9 +28,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KnightOfCliffhaven.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KnightOfCliffhaven.java index 4ad6b8e2e93..0049facf2ca 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KnightOfCliffhaven.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KnightOfCliffhaven.java @@ -27,8 +27,8 @@ */ package mage.sets.riseoftheeldrazi; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorLineSlinger.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorLineSlinger.java index 0910aefea41..26a5a9e4e83 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorLineSlinger.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorLineSlinger.java @@ -28,9 +28,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorSpiritdancer.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorSpiritdancer.java index 4202e7c7968..590bf63140d 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorSpiritdancer.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorSpiritdancer.java @@ -28,10 +28,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.SpellCastTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozilekButcherOfTruth.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozilekButcherOfTruth.java index 1207e22da4f..9fb5f0e17e9 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozilekButcherOfTruth.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozilekButcherOfTruth.java @@ -30,10 +30,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozileksPredator.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozileksPredator.java index e019c76f801..6f8c4432318 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozileksPredator.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozileksPredator.java @@ -29,8 +29,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LagacLizard.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LagacLizard.java index 4e1577c9589..65386e3cd98 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LagacLizard.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LagacLizard.java @@ -29,8 +29,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LastKiss.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LastKiss.java index 97dd771ee40..d6e8035ef1e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LastKiss.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LastKiss.java @@ -29,8 +29,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LavafumeInvoker.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LavafumeInvoker.java index 5a92112c697..dfd3b37185f 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LavafumeInvoker.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LavafumeInvoker.java @@ -28,10 +28,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LayBare.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LayBare.java index f4acb1e5214..1b3364783d9 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LayBare.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LayBare.java @@ -28,14 +28,15 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; import mage.target.TargetSpell; @@ -83,7 +84,7 @@ class LayBareEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); - Card target = (Card) game.getLastKnownInformation(targetPointer.getFirst(game, source), Constants.Zone.STACK); + Card target = (Card) game.getLastKnownInformation(targetPointer.getFirst(game, source), Zone.STACK); if (target != null) { Player controller = game.getPlayer(target.getOwnerId()); if (controller != null) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LeafArrow.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LeafArrow.java index 19da629bf74..dc1d64fa4ee 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LeafArrow.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LeafArrow.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LighthouseChronologist.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LighthouseChronologist.java index 26ba0586db9..aea74c820de 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LighthouseChronologist.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LighthouseChronologist.java @@ -28,10 +28,9 @@ package mage.sets.riseoftheeldrazi; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; @@ -42,6 +41,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.LevelUpAbility; import mage.abilities.keyword.LevelerCardBuilder; import mage.cards.LevelerCard; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.turn.TurnMod; @@ -90,7 +90,7 @@ public class LighthouseChronologist extends LevelerCard class LighthouseChronologistAbility extends TriggeredAbilityImpl { public LighthouseChronologistAbility() { - super(Constants.Zone.BATTLEFIELD, new LighthouseChronologistEffect(), false); + super(Zone.BATTLEFIELD, new LighthouseChronologistEffect(), false); } public LighthouseChronologistAbility(final LighthouseChronologistAbility ability) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LightmineField.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LightmineField.java index 29f385cc950..18d7183bd09 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LightmineField.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LightmineField.java @@ -29,13 +29,15 @@ package mage.sets.riseoftheeldrazi; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -69,7 +71,7 @@ public class LightmineField extends CardImpl { class LightmineFieldTriggeredAbility extends TriggeredAbilityImpl { public LightmineFieldTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new LightmineFieldEffect()); + super(Zone.BATTLEFIELD, new LightmineFieldEffect()); } public LightmineFieldTriggeredAbility(final LightmineFieldTriggeredAbility ability) { @@ -98,7 +100,7 @@ class LightmineFieldTriggeredAbility extends TriggeredAbilityImpl { public LightmineFieldEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); this.staticText = "{this} deals damage to each of those creatures equal to the number of attacking creatures"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LinvalaKeeperOfSilence.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LinvalaKeeperOfSilence.java index 19f36e503a2..8fff6c4598d 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LinvalaKeeperOfSilence.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LinvalaKeeperOfSilence.java @@ -30,11 +30,11 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LivingDestiny.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LivingDestiny.java index 394d6b60d7e..e6b34343997 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LivingDestiny.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LivingDestiny.java @@ -28,12 +28,13 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.players.Player; @@ -73,7 +74,7 @@ public class LivingDestiny extends CardImpl { class LivingDestinyEffect extends OneShotEffect { public LivingDestinyEffect() { - super(Constants.Outcome.GainLife); + super(Outcome.GainLife); staticText = "You gain life equal to its converted mana cost"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LoneMissionary.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LoneMissionary.java index 2e8fb9f449e..516c8ffd4ed 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LoneMissionary.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LoneMissionary.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LordOfShatterskullPass.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LordOfShatterskullPass.java index 4294cf01c2f..d7a846a5a9e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LordOfShatterskullPass.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LordOfShatterskullPass.java @@ -29,9 +29,9 @@ package mage.sets.riseoftheeldrazi; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LuminousWake.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LuminousWake.java index d68481c0143..7776bf3ebd1 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LuminousWake.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LuminousWake.java @@ -28,14 +28,16 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; import mage.abilities.common.AttacksOrBlocksEnchantedTriggeredAbility; @@ -56,12 +58,12 @@ public class LuminousWake extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Whenever enchanted creature attacks or blocks, you gain 4 life. - Ability ability2 = new AttacksOrBlocksEnchantedTriggeredAbility(Constants.Zone.BATTLEFIELD, new GainLifeEffect(4)); + Ability ability2 = new AttacksOrBlocksEnchantedTriggeredAbility(Zone.BATTLEFIELD, new GainLifeEffect(4)); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LustForWar.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LustForWar.java index 6dda498f49c..1906d913b06 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LustForWar.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LustForWar.java @@ -28,9 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.common.BecomesTappedTriggeredAbility; @@ -59,16 +58,16 @@ public class LustForWar extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Whenever enchanted creature becomes tapped, Lust for War deals 3 damage to that creature's controller. Ability attachedAbility = new BecomesTappedTriggeredAbility(new DamageControllerEffect(3)); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(attachedAbility, Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(attachedAbility, AttachmentType.AURA))); // Enchanted creature attacks each turn if able. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new AttacksEachTurnStaticAbility(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new AttacksEachTurnStaticAbility(), AttachmentType.AURA))); } public LustForWar(final LustForWar card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Magmaw.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Magmaw.java index d3f7675e073..874089279d9 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Magmaw.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Magmaw.java @@ -27,9 +27,9 @@ */ package mage.sets.riseoftheeldrazi; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MakindiGriffin.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MakindiGriffin.java index b41a7d2a1c1..2d6a0cb7e08 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MakindiGriffin.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MakindiGriffin.java @@ -29,8 +29,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MammothUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MammothUmbra.java index 5fe39b0b0a7..e84d961a387 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MammothUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MammothUmbra.java @@ -29,9 +29,7 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -60,12 +58,12 @@ public class MammothUmbra extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature gets +3/+3 and has vigilance. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Constants.Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA))); this.addAbility(new TotemArmorAbility()); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MerfolkObserver.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MerfolkObserver.java index 364543e5aa5..80dbbb022ee 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MerfolkObserver.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MerfolkObserver.java @@ -28,9 +28,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MerfolkSkyscout.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MerfolkSkyscout.java index 1bb76d0819f..072062b9a12 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MerfolkSkyscout.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MerfolkSkyscout.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksOrBlocksTriggeredAbility; import mage.abilities.effects.common.UntapTargetEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MightOfTheMasses.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MightOfTheMasses.java index 4c3de2144a7..c4bf57e4b22 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MightOfTheMasses.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MightOfTheMasses.java @@ -28,9 +28,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MnemonicWall.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MnemonicWall.java index 9f9ed2f941d..b5161af20b3 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MnemonicWall.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MnemonicWall.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MomentousFall.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MomentousFall.java index 4911abad720..4cd5acd01a4 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MomentousFall.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MomentousFall.java @@ -28,9 +28,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.common.SacrificeTargetCost; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MorticianBeetle.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MorticianBeetle.java index dca3da47571..5af6152ca46 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MorticianBeetle.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MorticianBeetle.java @@ -27,9 +27,9 @@ */ package mage.sets.riseoftheeldrazi; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.MageObject; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MulDayaChannelers.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MulDayaChannelers.java index ed726cdfb0d..741f501e3fd 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MulDayaChannelers.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MulDayaChannelers.java @@ -28,10 +28,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; @@ -48,6 +48,7 @@ import mage.abilities.mana.ManaAbility; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.choices.ChoiceColor; +import mage.constants.Duration; import mage.game.Game; /** @@ -73,13 +74,13 @@ public class MulDayaChannelers extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithTheTopCardRevealedEffect())); // As long as the top card of your library is a creature card, Mul Daya Channelers gets +3/+3. - ConditionalContinousEffect effect = new ConditionalContinousEffect(new BoostSourceEffect(3, 3, Constants.Duration.WhileOnBattlefield), new TopLibraryCardTypeCondition(TopLibraryCardTypeCondition.CheckType.CREATURE), rule1); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect)); + ConditionalContinousEffect effect = new ConditionalContinousEffect(new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), new TopLibraryCardTypeCondition(TopLibraryCardTypeCondition.CheckType.CREATURE), rule1); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); // As long as the top card of your library is a land card, Mul Daya Channelers has "T: Add two mana of any one color to your mana pool." SimpleManaAbility manaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(2), new TapSourceCost()); manaAbility.addChoice(new ChoiceColor()); - effect = new ConditionalContinousEffect(new GainAbilitySourceEffect(manaAbility, Constants.Duration.WhileOnBattlefield), + effect = new ConditionalContinousEffect(new GainAbilitySourceEffect(manaAbility, Duration.WhileOnBattlefield), new TopLibraryCardTypeCondition(TopLibraryCardTypeCondition.CheckType.LAND), "As long as the top card of your library is a land card, Mul Daya Channelers has \"{T}: Add two mana of any one color to your mana pool.\""); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Narcolepsy.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Narcolepsy.java index 3fed288ecab..800412e4130 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Narcolepsy.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Narcolepsy.java @@ -28,16 +28,18 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -61,12 +63,12 @@ public class Narcolepsy extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Detriment)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); EnchantAbility ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // At the beginning of each upkeep, if enchanted creature is untapped, tap it. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new NarcolepsyEffect(), Constants.TargetController.ANY, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new NarcolepsyEffect(), TargetController.ANY, false)); } public Narcolepsy(final Narcolepsy card) { @@ -82,7 +84,7 @@ public class Narcolepsy extends CardImpl { class NarcolepsyEffect extends OneShotEffect { public NarcolepsyEffect() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); this.staticText = "if enchanted creature is untapped, tap it"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NearDeathExperience.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NearDeathExperience.java index 98f829cbd41..f58dd3a0f95 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NearDeathExperience.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NearDeathExperience.java @@ -28,9 +28,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -38,6 +38,7 @@ import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.WinGameEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.game.Game; /** @@ -53,7 +54,7 @@ public class NearDeathExperience extends CardImpl { this.color.setWhite(true); // At the beginning of your upkeep, if you have exactly 1 life, you win the game. - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new WinGameEffect(), Constants.TargetController.YOU, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new WinGameEffect(), TargetController.YOU, false); this.addAbility(new ConditionalTriggeredAbility(ability, new OneLifeCondition(), "At the beginning of your upkeep, if you have exactly 1 life, you win the game.")); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NemaSiltlurker.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NemaSiltlurker.java index 30a3ff0e2b2..bfff6946467 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NemaSiltlurker.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NemaSiltlurker.java @@ -29,8 +29,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NestInvader.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NestInvader.java index 4c662aafce3..73b09979a2c 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NestInvader.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NestInvader.java @@ -29,8 +29,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Nighthaze.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Nighthaze.java index 7b6262fd984..8ee6436774e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Nighthaze.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Nighthaze.java @@ -30,13 +30,13 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -49,7 +49,7 @@ public class Nighthaze extends CardImpl { super(ownerId, 118, "Nighthaze", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{B}"); this.expansionSetCode = "ROE"; this.color.setBlack(true); - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(new SwampwalkAbility(), Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(new SwampwalkAbility(), Duration.EndOfTurn)); this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NirkanaCutthroat.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NirkanaCutthroat.java index aeda80a53dc..16656354e3e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NirkanaCutthroat.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NirkanaCutthroat.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NirkanaRevenant.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NirkanaRevenant.java index 8e90953103e..572182b8f28 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NirkanaRevenant.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NirkanaRevenant.java @@ -28,16 +28,16 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.Outcome; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.Outcome; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.common.SimpleActivatedAbility; -import mage.Constants.Zone; +import mage.constants.Zone; +import mage.constants.Duration; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -68,7 +68,7 @@ public class NirkanaRevenant extends CardImpl { this.addAbility(new NirkanaRevenantTriggeredAbility()); // {B}: Nirkana Revenant gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Constants.Duration.EndOfTurn), new ManaCostsImpl("{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{B}"))); } public NirkanaRevenant(final NirkanaRevenant card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NomadsAssembly.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NomadsAssembly.java index f76e830b0dd..bcd67c291fa 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NomadsAssembly.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NomadsAssembly.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.ReboundAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NotOfThisWorld.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NotOfThisWorld.java index a86c1113fd6..69d5942e892 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NotOfThisWorld.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NotOfThisWorld.java @@ -27,9 +27,9 @@ */ package mage.sets.riseoftheeldrazi; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NullChampion.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NullChampion.java index 2f02dfea4db..0da1c12f9db 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NullChampion.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NullChampion.java @@ -28,9 +28,8 @@ package mage.sets.riseoftheeldrazi; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; @@ -41,6 +40,7 @@ import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.LevelUpAbility; import mage.abilities.keyword.LevelerCardBuilder; import mage.cards.LevelerCard; +import mage.constants.Zone; import java.util.UUID; @@ -63,7 +63,7 @@ public class NullChampion extends LevelerCard { Abilities abilities1 = new AbilitiesImpl(); Abilities abilities2 = new AbilitiesImpl(); - abilities2.add(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}"))); + abilities2.add(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}"))); LevelerCardBuilder.construct(this, new LevelerCardBuilder.LevelAbility(1, 3, abilities1, 4, 2), diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/OgreSentry.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/OgreSentry.java index 8394663f579..16c8f870f58 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/OgreSentry.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/OgreSentry.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/OgresCleaver.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/OgresCleaver.java index 99c1f81b1c5..4f672231e52 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/OgresCleaver.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/OgresCleaver.java @@ -29,10 +29,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/OnduGiant.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/OnduGiant.java index b033be6091f..867194afaa1 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/OnduGiant.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/OnduGiant.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Oust.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Oust.java index 56b91fdd5ef..a367e65034c 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Oust.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Oust.java @@ -28,10 +28,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/OvergrownBattlement.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/OvergrownBattlement.java index e99ed3a8827..1092839e19d 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/OvergrownBattlement.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/OvergrownBattlement.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PathrazerOfUlamog.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PathrazerOfUlamog.java index 66da58aab49..3a90976d014 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PathrazerOfUlamog.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PathrazerOfUlamog.java @@ -28,9 +28,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.CantBeBlockedByOneEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PawnOfUlamog.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PawnOfUlamog.java index a09778bd966..c7068b13dfe 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PawnOfUlamog.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PawnOfUlamog.java @@ -28,9 +28,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.MageObject; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PelakkaWurm.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PelakkaWurm.java index 8148399d63f..7f780d0205f 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PelakkaWurm.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PelakkaWurm.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PennonBlade.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PennonBlade.java index 94cd9319f0c..6f18621f0e1 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PennonBlade.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PennonBlade.java @@ -28,10 +28,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PerishTheThought.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PerishTheThought.java index 16afe1c9b41..6f95afa618c 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PerishTheThought.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PerishTheThought.java @@ -28,13 +28,15 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.game.Game; import mage.players.Player; @@ -73,7 +75,7 @@ class PerishTheThoughtEffect extends OneShotEffect { private static final FilterCard filter = new FilterCard("card in target opponent's hand"); public PerishTheThoughtEffect() { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); this.staticText = "Target opponent reveals his or her hand. You choose a card from it. That player shuffles that card into his or her library"; } @@ -94,14 +96,14 @@ class PerishTheThoughtEffect extends OneShotEffect { targetOpponent.revealCards("Perish the Thought", targetOpponent.getHand(), game); Player you = game.getPlayer(source.getControllerId()); if (you != null) { - TargetCard target = new TargetCard(Constants.Zone.PICK, filter); + TargetCard target = new TargetCard(Zone.PICK, filter); target.setRequired(true); target.setNotTarget(true); - if (you.choose(Constants.Outcome.Neutral, targetOpponent.getHand(), target, game)) { + if (you.choose(Outcome.Neutral, targetOpponent.getHand(), target, game)) { Card chosenCard = targetOpponent.getHand().get(target.getFirstTarget(), game); if (chosenCard != null) { if (targetOpponent != null) { - chosenCard.moveToZone(Constants.Zone.LIBRARY, id, game, false); + chosenCard.moveToZone(Zone.LIBRARY, id, game, false); targetOpponent.shuffleLibrary(game); } } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PestilenceDemon.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PestilenceDemon.java index 2124b1cbaec..f1f36e4ee1c 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PestilenceDemon.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PestilenceDemon.java @@ -30,9 +30,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -58,7 +59,7 @@ public class PestilenceDemon extends CardImpl { this.power = new MageInt(7); this.toughness = new MageInt(6); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PestilenceDemonEffect(), new ManaCostsImpl("{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PestilenceDemonEffect(), new ManaCostsImpl("{B}"))); } public PestilenceDemon (final PestilenceDemon card) { @@ -74,7 +75,7 @@ public class PestilenceDemon extends CardImpl { class PestilenceDemonEffect extends OneShotEffect { PestilenceDemonEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "{this} deals 1 damage to each creature and each player"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PhantasmalAbomination.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PhantasmalAbomination.java index 3717aa90897..296cf0a291f 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PhantasmalAbomination.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PhantasmalAbomination.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BecomesTargetTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PreysVengeance.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PreysVengeance.java index ba7ed4f0cde..87c1bfd46ce 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PreysVengeance.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PreysVengeance.java @@ -30,12 +30,12 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.ReboundAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -48,7 +48,7 @@ public class PreysVengeance extends CardImpl { super(ownerId, 205, "Prey's Vengeance", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "ROE"; this.color.setGreen(true); - this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.addAbility(new ReboundAbility()); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PropheticPrism.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PropheticPrism.java index 5a215607919..d4ef8292954 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PropheticPrism.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PropheticPrism.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PuncturingLight.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PuncturingLight.java index 243021b1104..1cc320306e8 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PuncturingLight.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PuncturingLight.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.Filter.ComparisonType; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RageNimbus.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RageNimbus.java index 7226f24a001..8dfae098c1b 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RageNimbus.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RageNimbus.java @@ -28,10 +28,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RaidBombardment.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RaidBombardment.java index 9dd371afe57..a20e42f910f 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RaidBombardment.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RaidBombardment.java @@ -28,12 +28,13 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -68,7 +69,7 @@ public class RaidBombardment extends CardImpl { class RaidBombardmentTriggeredAbility extends TriggeredAbilityImpl { public RaidBombardmentTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1)); + super(Zone.BATTLEFIELD, new DamageTargetEffect(1)); } public RaidBombardmentTriggeredAbility(final RaidBombardmentTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RapaciousOne.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RapaciousOne.java index 819db019c4f..c971ccb49c6 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RapaciousOne.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RapaciousOne.java @@ -28,9 +28,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RealitySpasm.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RealitySpasm.java index 4d4e6529e2c..7143ff1a704 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RealitySpasm.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RealitySpasm.java @@ -29,9 +29,9 @@ package mage.sets.riseoftheeldrazi; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RealmsUncharted.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RealmsUncharted.java index 4000a830568..54b2d969f67 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RealmsUncharted.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RealmsUncharted.java @@ -29,10 +29,10 @@ package mage.sets.riseoftheeldrazi; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RecurringInsight.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RecurringInsight.java index d3f0e20f968..628af543641 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RecurringInsight.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RecurringInsight.java @@ -28,13 +28,14 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.ReboundAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetOpponent; @@ -71,7 +72,7 @@ public class RecurringInsight extends CardImpl { class RecurringInsightEffect extends OneShotEffect { public RecurringInsightEffect() { - super(Constants.Outcome.DrawCard); + super(Outcome.DrawCard); staticText = "Draw cards equal to the number of cards in target opponent's hand"; } @@ -84,7 +85,7 @@ class RecurringInsightEffect extends OneShotEffect { TargetOpponent target = new TargetOpponent(); Player you = game.getPlayer(source.getControllerId()); if (target.canChoose(source.getSourceId(), source.getControllerId(), game)) { - you.chooseTarget(Constants.Outcome.DrawCard, target, source, game); + you.chooseTarget(Outcome.DrawCard, target, source, game); Player opponent = game.getPlayer(target.getFirstTarget()); if (opponent != null) { you.drawCards(opponent.getHand().size(), game); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ReinforcedBulwark.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ReinforcedBulwark.java index 6a1ec091a1b..b7d291a785d 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ReinforcedBulwark.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ReinforcedBulwark.java @@ -28,10 +28,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RenegadeDoppelganger.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RenegadeDoppelganger.java index 0a50b71847b..dd13ed94cf8 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RenegadeDoppelganger.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RenegadeDoppelganger.java @@ -28,11 +28,11 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RepayInKind.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RepayInKind.java index 98fb8103ce8..06baaca0d7f 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RepayInKind.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RepayInKind.java @@ -28,12 +28,13 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; @@ -66,7 +67,7 @@ public class RepayInKind extends CardImpl { class RepayInKindEffect extends OneShotEffect { public RepayInKindEffect() { - super(Constants.Outcome.Tap); + super(Outcome.Tap); staticText = "Each player's life total becomes the lowest life total among all players"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RepelTheDarkness.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RepelTheDarkness.java index 20f9293c446..809702efda0 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RepelTheDarkness.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RepelTheDarkness.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RunedServitor.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RunedServitor.java index 10b08cd5281..c37df28292a 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RunedServitor.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RunedServitor.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DrawCardAllEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhanTheMad.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhanTheMad.java index 7afe62e3dec..7d8380bb7c6 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhanTheMad.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhanTheMad.java @@ -29,10 +29,10 @@ package mage.sets.riseoftheeldrazi; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeaGateOracle.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeaGateOracle.java index c0091621fe1..a2e4eaa5a60 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeaGateOracle.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeaGateOracle.java @@ -29,9 +29,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.StaticValue; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeeBeyond.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeeBeyond.java index 683834ed657..47ef65d0ac5 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeeBeyond.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeeBeyond.java @@ -29,10 +29,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SharedDiscovery.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SharedDiscovery.java index 3abb0288d23..e09a215a4cc 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SharedDiscovery.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SharedDiscovery.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Shrivel.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Shrivel.java index dc09bd00de5..4cda3874de4 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Shrivel.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Shrivel.java @@ -28,9 +28,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SkeletalWurm.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SkeletalWurm.java index 60ae7d85699..6d3f498cdbd 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SkeletalWurm.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SkeletalWurm.java @@ -28,9 +28,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SkitteringInvasion.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SkitteringInvasion.java index bdc2218d97d..74460eead50 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SkitteringInvasion.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SkitteringInvasion.java @@ -29,8 +29,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.game.permanent.token.EldraziSpawnToken; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SkywatcherAdept.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SkywatcherAdept.java index 17bc72d7aa9..584164abe06 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SkywatcherAdept.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SkywatcherAdept.java @@ -27,8 +27,8 @@ */ package mage.sets.riseoftheeldrazi; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Smite.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Smite.java index 2e1c0861161..da2a1611932 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Smite.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Smite.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SnakeUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SnakeUmbra.java index 2ba0d9841c4..29b2caa5692 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SnakeUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SnakeUmbra.java @@ -28,9 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -60,16 +59,16 @@ public class SnakeUmbra extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature gets +1/+1 - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); // and has "Whenever this creature deals damage to an opponent, you may draw a card." Ability gainedAbility = new DealsDamageToOpponentTriggeredAbility(new DrawCardControllerEffect(1), true); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); // Totem armor this.addAbility(new TotemArmorAbility()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SoulboundGuardians.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SoulboundGuardians.java index a858b1fcafb..fbaab13767c 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SoulboundGuardians.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SoulboundGuardians.java @@ -29,8 +29,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SoulsAttendant.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SoulsAttendant.java index 9e7495d9ed1..04793050adc 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SoulsAttendant.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SoulsAttendant.java @@ -27,8 +27,8 @@ */ package mage.sets.riseoftheeldrazi; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AnotherCreatureEntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SoulsurgeElemental.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SoulsurgeElemental.java index 6cc32a61152..207b50671c7 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SoulsurgeElemental.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SoulsurgeElemental.java @@ -29,10 +29,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -40,6 +39,7 @@ import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; /** @@ -59,7 +59,7 @@ public class SoulsurgeElemental extends CardImpl { this.toughness = new MageInt(1); this.addAbility(FirstStrikeAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new BoostSourceEffect(new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()), new StaticValue(0), Duration.EndOfGame))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new BoostSourceEffect(new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()), new StaticValue(0), Duration.EndOfGame))); } public SoulsurgeElemental(final SoulsurgeElemental card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SpawningBreath.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SpawningBreath.java index 5c9b5c94767..24c8b1e6269 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SpawningBreath.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SpawningBreath.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SpawnsireOfUlamog.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SpawnsireOfUlamog.java index 29d39380b10..a05c3599ae7 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SpawnsireOfUlamog.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SpawnsireOfUlamog.java @@ -27,9 +27,8 @@ */ package mage.sets.riseoftheeldrazi; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -37,6 +36,7 @@ import mage.abilities.effects.common.CastCardFromOutsideTheGameEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.AnnihilatorAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.EldraziSpawnToken; @@ -68,10 +68,10 @@ public class SpawnsireOfUlamog extends CardImpl { this.addAbility(new AnnihilatorAbility(1)); // {4}: Put two 0/1 colorless Eldrazi Spawn creature tokens onto the battlefield. They have "Sacrifice this creature: Add {1} to your mana pool." - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new EldraziSpawnToken(), 2), new GenericManaCost(4))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new EldraziSpawnToken(), 2), new GenericManaCost(4))); // {20}: Cast any number of Eldrazi cards you own from outside the game without paying their mana costs. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CastCardFromOutsideTheGameEffect(filter, ruleText), new GenericManaCost(20))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CastCardFromOutsideTheGameEffect(filter, ruleText), new GenericManaCost(20))); } public SpawnsireOfUlamog(final SpawnsireOfUlamog card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SphinxBoneWand.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SphinxBoneWand.java index b765c4eb1af..a5f397dff2a 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SphinxBoneWand.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SphinxBoneWand.java @@ -28,9 +28,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SphinxOfMagosi.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SphinxOfMagosi.java index b0d2a1f6439..ad8d1080c50 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SphinxOfMagosi.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SphinxOfMagosi.java @@ -30,9 +30,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,7 @@ import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; /** @@ -57,7 +57,7 @@ public class SphinxOfMagosi extends CardImpl { this.power = new MageInt(6); this.toughness = new MageInt(6); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new ManaCostsImpl("{2}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new ManaCostsImpl("{2}{U}")); ability.addEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SpiderUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SpiderUmbra.java index b814b64ebfb..4518019cc12 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SpiderUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SpiderUmbra.java @@ -29,9 +29,7 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -60,12 +58,12 @@ public class SpiderUmbra extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature gets +1/+1 and has reach. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Constants.Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ReachAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ReachAbility.getInstance(), AttachmentType.AURA))); this.addAbility(new TotemArmorAbility()); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SplinterTwin.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SplinterTwin.java index 610036ce93b..cc5f6f9911e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SplinterTwin.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SplinterTwin.java @@ -28,11 +28,11 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SporecapSpider.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SporecapSpider.java index 4af3988c851..c569ee7c151 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SporecapSpider.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SporecapSpider.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Staggershock.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Staggershock.java index 14c07d7e7c5..9fddbf9a62b 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Staggershock.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Staggershock.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.ReboundAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/StalwartShieldBearers.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/StalwartShieldBearers.java index c7d3017cd07..0026cd78c76 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/StalwartShieldBearers.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/StalwartShieldBearers.java @@ -28,10 +28,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/StomperCub.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/StomperCub.java index afbddc2dd5c..9bacab4142c 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/StomperCub.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/StomperCub.java @@ -29,8 +29,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/StudentOfWarfare.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/StudentOfWarfare.java index 76e36759700..4e18fd1b2ac 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/StudentOfWarfare.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/StudentOfWarfare.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SufferThePast.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SufferThePast.java index de826c8cf9c..3ade489f205 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SufferThePast.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SufferThePast.java @@ -29,13 +29,14 @@ package mage.sets.riseoftheeldrazi; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterCard; import mage.game.Game; import mage.players.Player; @@ -72,7 +73,7 @@ public class SufferThePast extends CardImpl { class SufferThePastEffect extends OneShotEffect { public SufferThePastEffect() { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); this.staticText = "Exile X target cards from target player's graveyard. For each card exiled this way, that player loses 1 life and you gain 1 life"; } @@ -95,7 +96,7 @@ class SufferThePastEffect extends OneShotEffect { int numberToTarget = Math.min(targetPlayer.getGraveyard().size(), source.getManaCostsToPay().getX()); TargetCardInOpponentsGraveyard target = new TargetCardInOpponentsGraveyard(numberToTarget, numberToTarget, filter); if (you != null) { - if (target.canChoose(source.getControllerId(), game) && target.choose(Constants.Outcome.Neutral, source.getControllerId(), source.getId(), game)) { + if (target.canChoose(source.getControllerId(), game) && target.choose(Outcome.Neutral, source.getControllerId(), source.getId(), game)) { if (!target.getTargets().isEmpty()) { List targets = target.getTargets(); for (UUID targetId : targets) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SurrakarSpellblade.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SurrakarSpellblade.java index 8e381c4cb3f..2d49cf09e44 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SurrakarSpellblade.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SurrakarSpellblade.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.common.SpellCastTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SurrealMemoir.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SurrealMemoir.java index 72317d69cdb..d53943d8fe1 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SurrealMemoir.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SurrealMemoir.java @@ -29,10 +29,10 @@ package mage.sets.riseoftheeldrazi; import java.util.Random; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.ReboundAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SurvivalCache.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SurvivalCache.java index 498fb45a22a..07227da3d8f 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SurvivalCache.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SurvivalCache.java @@ -29,14 +29,14 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.keyword.ReboundAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; @@ -70,7 +70,7 @@ public class SurvivalCache extends CardImpl { class SurvivalCacheEffect extends OneShotEffect { SurvivalCacheEffect() { - super(Constants.Outcome.DrawCard); + super(Outcome.DrawCard); staticText = "Then if you have more life than an opponent, draw a card"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TajuruPreserver.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TajuruPreserver.java index dce1ff8489b..236cd999000 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TajuruPreserver.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TajuruPreserver.java @@ -27,9 +27,7 @@ */ package mage.sets.riseoftheeldrazi; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -59,7 +57,7 @@ public class TajuruPreserver extends CardImpl { this.toughness = new MageInt(1); // Spells and abilities your opponents control can't cause you to sacrifice permanents. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new TajuruPreserverEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TajuruPreserverEffect())); } public TajuruPreserver(final TajuruPreserver card) { @@ -75,7 +73,7 @@ public class TajuruPreserver extends CardImpl { class TajuruPreserverEffect extends ReplacementEffectImpl { public TajuruPreserverEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "Spells and abilities your opponents control can't cause you to sacrifice permanents"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ThoughtGorger.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ThoughtGorger.java index 09d03aa7967..d686899d343 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ThoughtGorger.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ThoughtGorger.java @@ -32,11 +32,11 @@ import mage.abilities.common.LeavesBattlefieldTriggeredAbility; import mage.abilities.keyword.TrampleAbility; import mage.players.Player; import java.util.UUID; -import mage.Constants.Outcome; -import mage.Constants.Zone; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.abilities.effects.OneShotEffect; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.game.Game; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TimeOfHeroes.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TimeOfHeroes.java index ba25d1541f0..84cb215e67d 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TimeOfHeroes.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TimeOfHeroes.java @@ -28,10 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continious.BoostAllEffect; @@ -50,7 +48,7 @@ public class TimeOfHeroes extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Each creature you control with a level counter"); static { - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(new CounterPredicate(CounterType.LEVEL)); } @@ -62,7 +60,7 @@ public class TimeOfHeroes extends CardImpl { // Each creature you control with a level counter on it gets +2/+2. ContinuousEffect boost = new BoostAllEffect(2, 2, Duration.WhileOnBattlefield, filter, false); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, boost)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, boost)); } public TimeOfHeroes(final TimeOfHeroes card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TotemGuideHartebeest.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TotemGuideHartebeest.java index 0fb08e272bf..3176c6a9118 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TotemGuideHartebeest.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TotemGuideHartebeest.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TrainingGrounds.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TrainingGrounds.java index 4c6d233fd77..e170c1ff443 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TrainingGrounds.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TrainingGrounds.java @@ -30,13 +30,13 @@ package mage.sets.riseoftheeldrazi; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TraitorousInstinct.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TraitorousInstinct.java index 6fb3427ce73..a3e4d459b4a 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TraitorousInstinct.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TraitorousInstinct.java @@ -28,9 +28,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TranscendentMaster.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TranscendentMaster.java index c869a0d784c..578c3e4b9bf 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TranscendentMaster.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TranscendentMaster.java @@ -27,8 +27,8 @@ */ package mage.sets.riseoftheeldrazi; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TuktukTheExplorer.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TuktukTheExplorer.java index 94ecac75806..06af83ba34f 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TuktukTheExplorer.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TuktukTheExplorer.java @@ -29,8 +29,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/UlamogTheInfiniteGyre.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/UlamogTheInfiniteGyre.java index 557d787293b..2d40543c159 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/UlamogTheInfiniteGyre.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/UlamogTheInfiniteGyre.java @@ -28,10 +28,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/UlamogsCrusher.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/UlamogsCrusher.java index a05f24ea9d3..dc529cd2c7a 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/UlamogsCrusher.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/UlamogsCrusher.java @@ -29,8 +29,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.keyword.AnnihilatorAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/UmbraMystic.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/UmbraMystic.java index edceefc2614..da7cf473f0b 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/UmbraMystic.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/UmbraMystic.java @@ -28,10 +28,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityAllEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/UnifiedWill.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/UnifiedWill.java index a48004cad14..29b53b45d76 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/UnifiedWill.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/UnifiedWill.java @@ -28,8 +28,8 @@ package mage.sets.riseoftheeldrazi; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ValakutFireboar.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ValakutFireboar.java index 9c4dadcd092..190efd965a7 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ValakutFireboar.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ValakutFireboar.java @@ -28,9 +28,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continious.SwitchPowerToughnessSourceEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vendetta.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vendetta.java index 388e40dbe33..d9193f2d0e3 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vendetta.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vendetta.java @@ -29,15 +29,15 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; @@ -98,7 +98,7 @@ class VendettaEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); - Permanent target = (Permanent) game.getLastKnownInformation(source.getFirstTarget(), Constants.Zone.BATTLEFIELD); + Permanent target = (Permanent) game.getLastKnownInformation(source.getFirstTarget(), Zone.BATTLEFIELD); if (player != null && target != null) { player.loseLife(target.getToughness().getValue(), game); return true; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/VeneratedTeacher.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/VeneratedTeacher.java index 8da01473332..74dc8899b6e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/VeneratedTeacher.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/VeneratedTeacher.java @@ -33,10 +33,10 @@ import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.counters.CounterType; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.cards.CardImpl; import mage.game.Game; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java index 0baa3c6d8d6..bf24ff4ca81 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java @@ -29,10 +29,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.WatcherScope; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.WatcherScope; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/VentSentinel.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/VentSentinel.java index d53efdde66e..ec2bd0fcd9e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/VentSentinel.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/VentSentinel.java @@ -28,9 +28,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/VirulentSwipe.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/VirulentSwipe.java index 0f1139f8eb9..3fe46ac31fd 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/VirulentSwipe.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/VirulentSwipe.java @@ -28,9 +28,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.DeathtouchAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/WallOfOmens.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/WallOfOmens.java index d967ebbbcb8..efa9bec75c5 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/WallOfOmens.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/WallOfOmens.java @@ -29,8 +29,8 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/WarmongersChariot.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/WarmongersChariot.java index 37c62f090a0..966ab605c15 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/WarmongersChariot.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/WarmongersChariot.java @@ -27,9 +27,7 @@ */ package mage.sets.riseoftheeldrazi; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -56,13 +54,13 @@ public class WarmongersChariot extends CardImpl { this.subtype.add("Equipment"); // Equipped creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); // As long as equipped creature has defender, it can attack as though it didn't have defender. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new WarmongersChariotEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WarmongersChariotEffect())); // Equip {3} - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(3))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3))); } public WarmongersChariot(final WarmongersChariot card) { @@ -78,7 +76,7 @@ public class WarmongersChariot extends CardImpl { class WarmongersChariotEffect extends AsThoughEffectImpl { public WarmongersChariotEffect() { - super(Constants.AsThoughEffectType.ATTACK, Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(AsThoughEffectType.ATTACK, Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "As long as equipped creature has defender, it can attack as though it didn't have defender"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/WildheartInvoker.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/WildheartInvoker.java index 5b0ce97b9e7..7937b312280 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/WildheartInvoker.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/WildheartInvoker.java @@ -28,11 +28,11 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -59,7 +59,7 @@ public class WildheartInvoker extends CardImpl { this.toughness = new MageInt(3); SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(5, 5, Duration.EndOfTurn), new ManaCostsImpl("{8}")); - ability.addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Constants.Duration.EndOfTurn)); + ability.addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/WorldAtWar.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/WorldAtWar.java index 4d1d5b63dc0..21323eb6ac6 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/WorldAtWar.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/WorldAtWar.java @@ -27,14 +27,15 @@ */ package mage.sets.riseoftheeldrazi; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.ReboundAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.TurnPhase; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -78,7 +79,7 @@ public class WorldAtWar extends CardImpl { class WorldAtWarEffect extends OneShotEffect { public WorldAtWarEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "After the first postcombat main phase this turn, there's an additional combat phase followed by an additional main phase. At the beginning of that combat, untap all creatures that attacked this turn"; } @@ -94,7 +95,7 @@ class WorldAtWarEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { // we can't add two turn modes at once, will add additional post combat on delayed trigger resolution - TurnMod combat = new TurnMod(source.getControllerId(), Constants.TurnPhase.COMBAT, Constants.TurnPhase.POSTCOMBAT_MAIN, false); + TurnMod combat = new TurnMod(source.getControllerId(), TurnPhase.COMBAT, TurnPhase.POSTCOMBAT_MAIN, false); game.getState().getTurnMods().add(combat); UntapDelayedTriggeredAbility delayedTriggeredAbility = new UntapDelayedTriggeredAbility(); delayedTriggeredAbility.setSourceId(source.getSourceId()); @@ -134,7 +135,7 @@ class UntapDelayedTriggeredAbility extends DelayedTriggeredAbility { public UntapAttackingThisTurnEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); } public UntapAttackingThisTurnEffect(final UntapAttackingThisTurnEffect effect) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/WrapInFlames.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/WrapInFlames.java index a693978735d..6f8bc3507e1 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/WrapInFlames.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/WrapInFlames.java @@ -28,9 +28,9 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.CantBlockTargetEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ZofShade.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ZofShade.java index a8a216f4a20..1b7f50f8420 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ZofShade.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ZofShade.java @@ -28,10 +28,10 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ZulaportEnforcer.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ZulaportEnforcer.java index 57f9b16abd7..8147c3b42ee 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ZulaportEnforcer.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ZulaportEnforcer.java @@ -27,9 +27,9 @@ */ package mage.sets.riseoftheeldrazi; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/AkkiDrillmaster.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/AkkiDrillmaster.java index f8db573fbae..7aba91d2390 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/AkkiDrillmaster.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/AkkiDrillmaster.java @@ -29,9 +29,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -56,7 +57,7 @@ public class AkkiDrillmaster extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); // {tap}: Target creature gains haste until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Constants.Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ArabaMothrider.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ArabaMothrider.java index 1c3165ea976..7b74af8eef2 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ArabaMothrider.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ArabaMothrider.java @@ -28,8 +28,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.BushidoAbility; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/BriarknitKami.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/BriarknitKami.java index 0ec9bf69174..819e77a9ed9 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/BriarknitKami.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/BriarknitKami.java @@ -28,8 +28,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/CaptiveFlame.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/CaptiveFlame.java index 7db404f6af4..5ee472449c0 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/CaptiveFlame.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/CaptiveFlame.java @@ -29,9 +29,7 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -50,7 +48,7 @@ public class CaptiveFlame extends CardImpl { this.expansionSetCode = "SOK"; this.color.setRed(true); // {R}: Target creature gets +1/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/DeathDenied.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/DeathDenied.java index 39d7a6e0ae8..13d82da31d3 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/DeathDenied.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/DeathDenied.java @@ -28,8 +28,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.effects.Effect; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/DescendantOfSoramaro.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/DescendantOfSoramaro.java index f65a03c5143..7ff9d6b66a1 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/DescendantOfSoramaro.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/DescendantOfSoramaro.java @@ -28,9 +28,9 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/DosansOldestChant.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/DosansOldestChant.java index 04453183753..7eb7117345b 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/DosansOldestChant.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/DosansOldestChant.java @@ -28,8 +28,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/EiganjoFreeRiders.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/EiganjoFreeRiders.java index 26b6a411cd8..8ae9fb547b5 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/EiganjoFreeRiders.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/EiganjoFreeRiders.java @@ -29,9 +29,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -39,6 +38,7 @@ import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -64,7 +64,7 @@ public class EiganjoFreeRiders extends CardImpl { this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); // At the beginning of your upkeep, return a white creature you control to its owner's hand. - Ability ability = new BeginningOfUpkeepTriggeredAbility(new ReturnToHandTargetEffect(), Constants.TargetController.YOU, false); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new ReturnToHandTargetEffect(), TargetController.YOU, false); ability.addTarget(new TargetControlledCreaturePermanent(1, 1, filter, true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/FiddleheadKami.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/FiddleheadKami.java index dd91f275a92..6a517d303a6 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/FiddleheadKami.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/FiddleheadKami.java @@ -28,8 +28,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.common.RegenerateSourceEffect; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/FreedFromTheReal.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/FreedFromTheReal.java index 2f317a5d731..3d4608ddf3d 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/FreedFromTheReal.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/FreedFromTheReal.java @@ -29,10 +29,9 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.AttachEffect; @@ -40,6 +39,7 @@ import mage.abilities.effects.common.TapEnchantedEffect; import mage.abilities.effects.common.UntapEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -57,7 +57,7 @@ public class FreedFromTheReal extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Untap)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Untap)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); // {U}: Tap enchanted creature. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapEnchantedEffect(), new ManaCostsImpl("{U}"))); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GnatMiser.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GnatMiser.java index 6deb0d9c21b..a348ebdb001 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GnatMiser.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GnatMiser.java @@ -28,11 +28,11 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.MaximumHandSizeControllerEffect; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/HandOfCruelty.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/HandOfCruelty.java index b52bc25192d..44d7cbb711a 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/HandOfCruelty.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/HandOfCruelty.java @@ -28,8 +28,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.BushidoAbility; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/HandOfHonor.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/HandOfHonor.java index 6ccc60b23c4..22e4b05a664 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/HandOfHonor.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/HandOfHonor.java @@ -29,8 +29,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.BushidoAbility; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/HaruOnna.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/HaruOnna.java index 839d5eae46c..625a49b36e4 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/HaruOnna.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/HaruOnna.java @@ -28,8 +28,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SpellCastTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/IdeasUnbound.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/IdeasUnbound.java index d7ead5ce69a..3dbd13d5a72 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/IdeasUnbound.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/IdeasUnbound.java @@ -28,8 +28,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.delayed.AtEndOfTurnDelayedTriggeredAbility; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.DiscardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/IizukaTheRuthless.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/IizukaTheRuthless.java index 74498666b44..0b1dd1b90e0 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/IizukaTheRuthless.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/IizukaTheRuthless.java @@ -29,9 +29,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.BushidoAbility; import mage.abilities.keyword.DoubleStrikeAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -68,7 +69,7 @@ public class IizukaTheRuthless extends CardImpl { this.toughness = new MageInt(3); this.addAbility(new BushidoAbility(2)); // {2}{R}, Sacrifice a Samurai: Samurai creatures you control gain double strike until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Constants.Duration.EndOfTurn, filter, false), new ManaCostsImpl("{2}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn, filter, false), new ManaCostsImpl("{2}{R}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/InnerChamberGuard.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/InnerChamberGuard.java index bacbf681fd9..2ee44619ecf 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/InnerChamberGuard.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/InnerChamberGuard.java @@ -28,8 +28,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.BushidoAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KamiOfEmptyGraves.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KamiOfEmptyGraves.java index d6c2f08a206..2d2e4367ffa 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KamiOfEmptyGraves.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KamiOfEmptyGraves.java @@ -28,8 +28,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.SoulshiftAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KamiOfTheCrescentMoon.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KamiOfTheCrescentMoon.java index ebbda1eb5d9..14a1d327f9f 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KamiOfTheCrescentMoon.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KamiOfTheCrescentMoon.java @@ -28,9 +28,9 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.common.BeginningOfDrawTriggeredAbility; import mage.abilities.effects.common.DrawCardTargetEffect; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KamiOfTheTendedGarden.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KamiOfTheTendedGarden.java index 9fdcd92e8e6..16e0d425ec6 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KamiOfTheTendedGarden.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KamiOfTheTendedGarden.java @@ -28,15 +28,17 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect; import mage.abilities.keyword.SoulshiftAbility; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.TargetController; /** * @@ -53,7 +55,7 @@ public class KamiOfTheTendedGarden extends CardImpl { this.toughness = new MageInt(4); // At the beginning of your upkeep, sacrifice Kami of the Tended Garden unless you pay {G}. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ColoredManaCost(Constants.ColoredManaSymbol.G)), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ColoredManaCost(ColoredManaSymbol.G)), TargetController.YOU, false)); this.addAbility(new SoulshiftAbility(3)); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KashiTribeElite.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KashiTribeElite.java index 064738a648f..de520294020 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KashiTribeElite.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KashiTribeElite.java @@ -28,9 +28,9 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToACreatureTriggeredAbility; @@ -40,6 +40,8 @@ import mage.abilities.effects.common.TapTargetEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; @@ -68,7 +70,7 @@ public class KashiTribeElite extends CardImpl { this.toughness = new MageInt(3); // Legendary Snakes you control have shroud. (They can't be the targets of spells or abilities.) - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityControlledEffect(ShroudAbility.getInstance(), Constants.Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); // Whenever Kashi-Tribe Elite deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step. Ability ability; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KatakiWarsWage.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KatakiWarsWage.java index a2883e04ab8..9135a4426e0 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KatakiWarsWage.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KatakiWarsWage.java @@ -29,9 +29,7 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -65,10 +63,10 @@ public class KatakiWarsWage extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); // All artifacts have "At the beginning of your upkeep, sacrifice this artifact unless you pay {1}." - Ability gainedAbility = new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new GenericManaCost(1)), Constants.TargetController.YOU, false); - Effect effect = new GainAbilityAllEffect(gainedAbility, Constants.Duration.WhileOnBattlefield, filter, false); + Ability gainedAbility = new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new GenericManaCost(1)), TargetController.YOU, false); + Effect effect = new GainAbilityAllEffect(gainedAbility, Duration.WhileOnBattlefield, filter, false); effect.setText("All artifacts have \"At the beginning of your upkeep, sacrifice this artifact unless you pay {1}.\""); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } public KatakiWarsWage(final KatakiWarsWage card) { diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KemuriOnna.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KemuriOnna.java index 8345b614bd8..25dcdc760b0 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KemuriOnna.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KemuriOnna.java @@ -28,8 +28,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KiriOnna.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KiriOnna.java index c0b10b74388..177fbd2c860 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KiriOnna.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KiriOnna.java @@ -28,8 +28,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KitsuneDawnblade.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KitsuneDawnblade.java index bb4b0c92e18..c4a75d20643 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KitsuneDawnblade.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KitsuneDawnblade.java @@ -28,8 +28,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KurosTaken.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KurosTaken.java index 794b9c33089..842ba7aab9e 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KurosTaken.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KurosTaken.java @@ -29,15 +29,15 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.BushidoAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -55,7 +55,7 @@ public class KurosTaken extends CardImpl { this.toughness = new MageInt(1); this.addAbility(new BushidoAbility(1)); // {1}{B}: Regenerate Kuro's Taken. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}"))); } public KurosTaken(final KurosTaken card) { diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/LocustMiser.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/LocustMiser.java index 1772e2c7faf..98a0f168cc2 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/LocustMiser.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/LocustMiser.java @@ -28,11 +28,11 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.MaximumHandSizeControllerEffect; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ManrikiGusari.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ManrikiGusari.java index aa0d9567320..ba132ce382a 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ManrikiGusari.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ManrikiGusari.java @@ -29,9 +29,7 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -63,12 +61,12 @@ public class ManrikiGusari extends CardImpl { this.expansionSetCode = "SOK"; this.subtype.add("Equipment"); // Equipped creature gets +1/+2 and has "{tap}: Destroy target Equipment." - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(1, 2))); - Ability gainedAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 2))); + Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); gainedAbility.addTarget(new TargetPermanent(filter)); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, Constants.AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.EQUIPMENT))); // Equip {1} - this.addAbility(new EquipAbility(Constants.Outcome.BoostCreature, new GenericManaCost(1))); + this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(1))); } public ManrikiGusari(final ManrikiGusari card) { diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MatsuTribeBirdstalker.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MatsuTribeBirdstalker.java index 8e1fc424dcc..d040a0e30c0 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MatsuTribeBirdstalker.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MatsuTribeBirdstalker.java @@ -28,9 +28,9 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToACreatureTriggeredAbility; @@ -41,6 +41,8 @@ import mage.abilities.effects.common.TapTargetEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -65,8 +67,8 @@ public class MatsuTribeBirdstalker extends CardImpl { this.addAbility(ability); // {G}: Matsu-Tribe Birdstalker gains reach until end of turn. (It can block creatures with flying.) - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, - new GainAbilitySourceEffect(ReachAbility.getInstance(), Constants.Duration.EndOfTurn), + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + new GainAbilitySourceEffect(ReachAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{G}"))); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MichikoKondaTruthSeeker.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MichikoKondaTruthSeeker.java index 489c3f1fd25..672d14c24a0 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MichikoKondaTruthSeeker.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MichikoKondaTruthSeeker.java @@ -28,9 +28,9 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.SacrificeEffect; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MikokoroCenterOfTheSea.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MikokoroCenterOfTheSea.java index 4a88e32dc33..04a99bc7559 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MikokoroCenterOfTheSea.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MikokoroCenterOfTheSea.java @@ -29,9 +29,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -39,6 +38,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DrawCardAllEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -53,7 +53,7 @@ public class MikokoroCenterOfTheSea extends CardImpl { // {tap}: Add {1} to your mana pool. this.addAbility(new ColorlessManaAbility()); // {2}, {tap}: Each player draws a card. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardAllEffect(1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardAllEffect(1), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MinamoScrollkeeper.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MinamoScrollkeeper.java index ad6d57ca35b..5f54d06e884 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MinamoScrollkeeper.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MinamoScrollkeeper.java @@ -28,16 +28,17 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.MaximumHandSizeControllerEffect; import mage.abilities.effects.common.continious.MaximumHandSizeControllerEffect.HandSizeModification; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -58,7 +59,7 @@ public class MinamoScrollkeeper extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // Your maximum hand size is increased by one. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MaximumHandSizeControllerEffect(1, Duration.WhileOnBattlefield, HandSizeModification.INCREASE))); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MoltingSkin.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MoltingSkin.java index 823f0c48f96..0196231eb1a 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MoltingSkin.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MoltingSkin.java @@ -29,14 +29,14 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.ReturnToHandSourceCost; import mage.abilities.effects.common.RegenerateTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -50,7 +50,7 @@ public class MoltingSkin extends CardImpl { this.expansionSetCode = "SOK"; this.color.setGreen(true); // Return Molting Skin to its owner's hand: Regenerate target creature. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ReturnToHandSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ReturnToHandSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MoonwingMoth.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MoonwingMoth.java index e5c5ca67277..2869284524a 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MoonwingMoth.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MoonwingMoth.java @@ -29,9 +29,7 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -54,7 +52,7 @@ public class MoonwingMoth extends CardImpl { this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); // {W}: Moonwing Moth gets +0/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.W))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W))); } public MoonwingMoth(final MoonwingMoth card) { diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/NightsoilKami.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/NightsoilKami.java index fd0f71b2ac0..4bc44fb2201 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/NightsoilKami.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/NightsoilKami.java @@ -28,8 +28,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.SoulshiftAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/NikkoOnna.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/NikkoOnna.java index 8f9e95cc4eb..d5cc4ef3543 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/NikkoOnna.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/NikkoOnna.java @@ -28,8 +28,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/OboroBreezecaller.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/OboroBreezecaller.java index 0382e1db6aa..e5d0d5399f0 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/OboroBreezecaller.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/OboroBreezecaller.java @@ -28,9 +28,9 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/OboroPalaceInTheClouds.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/OboroPalaceInTheClouds.java index cd3d4e55b22..50e9419b70f 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/OboroPalaceInTheClouds.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/OboroPalaceInTheClouds.java @@ -29,14 +29,14 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -51,7 +51,7 @@ public class OboroPalaceInTheClouds extends CardImpl { // {tap}: Add {U} to your mana pool. this.addAbility(new BlueManaAbility()); // {1}: Return Oboro, Palace in the Clouds to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new GenericManaCost(1))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new GenericManaCost(1))); } public OboroPalaceInTheClouds(final OboroPalaceInTheClouds card) { diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/OniOfWildPlaces.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/OniOfWildPlaces.java index b0ef8e73bc2..0306e5edd9c 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/OniOfWildPlaces.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/OniOfWildPlaces.java @@ -29,9 +29,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -39,6 +38,7 @@ import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -65,7 +65,7 @@ public class OniOfWildPlaces extends CardImpl { this.toughness = new MageInt(5); this.addAbility(HasteAbility.getInstance()); // At the beginning of your upkeep, return a red creature you control to its owner's hand. - Ability ability = new BeginningOfUpkeepTriggeredAbility(new ReturnToHandTargetEffect(), Constants.TargetController.YOU, false); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new ReturnToHandTargetEffect(), TargetController.YOU, false); ability.addTarget(new TargetControlledCreaturePermanent(1, 1, filter, true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/PathOfAngersFlame.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/PathOfAngersFlame.java index 8a99613bcc5..73fe6fde71f 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/PathOfAngersFlame.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/PathOfAngersFlame.java @@ -29,11 +29,11 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; /** @@ -49,7 +49,7 @@ public class PathOfAngersFlame extends CardImpl { this.color.setRed(true); // Creatures you control get +2/+0 until end of turn. - this.getSpellAbility().addEffect(new BoostControlledEffect(2, 0, Constants.Duration.EndOfTurn, new FilterCreaturePermanent(), false)); + this.getSpellAbility().addEffect(new BoostControlledEffect(2, 0, Duration.EndOfTurn, new FilterCreaturePermanent(), false)); } public PathOfAngersFlame(final PathOfAngersFlame card) { diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/PithingNeedle.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/PithingNeedle.java index bbeca7d2f1b..3efe2b3287d 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/PithingNeedle.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/PithingNeedle.java @@ -28,9 +28,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; @@ -59,7 +58,7 @@ public class PithingNeedle extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new NameCard())); // Activated abilities of sources with the chosen name can't be activated unless they're mana abilities. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new PithingNeedleEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PithingNeedleEffect())); } public PithingNeedle(final PithingNeedle card) { @@ -75,7 +74,7 @@ public class PithingNeedle extends CardImpl { class NameCard extends OneShotEffect { public NameCard() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); staticText = "name a card"; } @@ -90,7 +89,7 @@ class NameCard extends OneShotEffect { Choice cardChoice = new ChoiceImpl(); cardChoice.setChoices(CardRepository.instance.getNames()); cardChoice.clearChoice(); - while (!controller.choose(Constants.Outcome.Detriment, cardChoice, game)) { + while (!controller.choose(Outcome.Detriment, cardChoice, game)) { game.debugMessage("player canceled choosing name. retrying."); } String cardName = cardChoice.getChoice(); @@ -110,7 +109,7 @@ class NameCard extends OneShotEffect { class PithingNeedleEffect extends ReplacementEffectImpl { public PithingNeedleEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Detriment); + super(Duration.WhileOnBattlefield, Outcome.Detriment); staticText = "Activated abilities of sources with the chosen name can't be activated unless they're mana abilities"; } @@ -139,7 +138,7 @@ class PithingNeedleEffect extends ReplacementEffectImpl { MageObject object = game.getObject(event.getSourceId()); Ability ability = game.getAbility(event.getTargetId(), event.getSourceId()); if (ability != null && object != null) { - if (ability.getAbilityType() != Constants.AbilityType.MANA && + if (ability.getAbilityType() != AbilityType.MANA && object.getName().equals(game.getState().getValue(source.getSourceId().toString()))) { return true; } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/PromisedKannushi.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/PromisedKannushi.java index 9cc23cdead9..8a5015ef360 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/PromisedKannushi.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/PromisedKannushi.java @@ -28,8 +28,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.SoulshiftAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/RekiTheHistoryOfKamigawa.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/RekiTheHistoryOfKamigawa.java index a99df4d1154..c7a62a9af92 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/RekiTheHistoryOfKamigawa.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/RekiTheHistoryOfKamigawa.java @@ -28,8 +28,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/RoninCavekeeper.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/RoninCavekeeper.java index d2f04490aef..b323f3882ca 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/RoninCavekeeper.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/RoninCavekeeper.java @@ -28,8 +28,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.BushidoAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SeekTheHorizon.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SeekTheHorizon.java index 7fe9a8e204a..c77e1c15ba1 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SeekTheHorizon.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SeekTheHorizon.java @@ -28,8 +28,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.filter.common.FilterBasicLandCard; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SkullCollector.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SkullCollector.java index 4e9ebb97d4f..d3b559c37d6 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SkullCollector.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SkullCollector.java @@ -29,9 +29,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -41,6 +40,8 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -66,11 +67,11 @@ public class SkullCollector extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); // At the beginning of your upkeep, return a black creature you control to its owner's hand. - Ability ability = new BeginningOfUpkeepTriggeredAbility(new ReturnToHandTargetEffect(), Constants.TargetController.YOU, false); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new ReturnToHandTargetEffect(), TargetController.YOU, false); ability.addTarget(new TargetControlledCreaturePermanent(1, 1, filter, true)); this.addAbility(ability); // {1}{B}: Regenerate Skull Collector. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}"))); } public SkullCollector(final SkullCollector card) { diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/StampedingSerow.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/StampedingSerow.java index 3fd7012c157..49110a58e47 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/StampedingSerow.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/StampedingSerow.java @@ -27,9 +27,8 @@ */ package mage.sets.saviorsofkamigawa; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -37,6 +36,7 @@ import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.Target; @@ -65,7 +65,7 @@ public class StampedingSerow extends CardImpl { this.toughness = new MageInt(4); this.addAbility(TrampleAbility.getInstance()); // At the beginning of your upkeep, return a green creature you control to its owner's hand. - Ability ability = new BeginningOfUpkeepTriggeredAbility(new ReturnToHandTargetEffect(), Constants.TargetController.YOU, false); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new ReturnToHandTargetEffect(), TargetController.YOU, false); Target target = new TargetControlledCreaturePermanent(1, 1, filter, false); target.setRequired(true); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SunderFromWithin.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SunderFromWithin.java index 7de022a144c..dc86d8feba4 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SunderFromWithin.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SunderFromWithin.java @@ -28,8 +28,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/TombOfUrami.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/TombOfUrami.java index 96adbfb7ae1..9fdbfe9e3a5 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/TombOfUrami.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/TombOfUrami.java @@ -28,9 +28,9 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -43,6 +43,7 @@ import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.mana.BlackManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -64,7 +65,7 @@ public class TombOfUrami extends CardImpl { ability.addEffect(new DamageControllerEffect(1)); this.addAbility(ability); // {2}{B}{B}, {tap}, Sacrifice all lands you control: Put a legendary 5/5 black Demon Spirit creature token with flying named Urami onto the battlefield. - Ability ability2 = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new UramiToken()), new ManaCostsImpl("{2}{B}{B}")); + Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new UramiToken()), new ManaCostsImpl("{2}{B}{B}")); ability2.addCost(new TapSourceCost()); ability2.addCost(new SacrificeAllLandCost()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ToriiWatchward.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ToriiWatchward.java index 6520fc27112..1a3a849798a 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ToriiWatchward.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ToriiWatchward.java @@ -28,8 +28,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; import mage.abilities.keyword.SoulshiftAbility; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/TrustedAdvisor.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/TrustedAdvisor.java index 2dd38d3bbb6..d89ffd0751d 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/TrustedAdvisor.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/TrustedAdvisor.java @@ -28,11 +28,11 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/WineOfBloodAndIron.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/WineOfBloodAndIron.java index 69ebe2e69c3..933170d5e48 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/WineOfBloodAndIron.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/WineOfBloodAndIron.java @@ -28,11 +28,11 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/YukiOnna.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/YukiOnna.java index f205be43774..e4705c71845 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/YukiOnna.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/YukiOnna.java @@ -29,8 +29,8 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/AbunaAcolyte.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/AbunaAcolyte.java index 09028bf86ee..5ab1590ea45 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/AbunaAcolyte.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/AbunaAcolyte.java @@ -27,10 +27,10 @@ */ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/AccordersShield.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/AccordersShield.java index c86c2ca8ecf..a4b88811502 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/AccordersShield.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/AccordersShield.java @@ -30,10 +30,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; @@ -41,6 +40,8 @@ import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; +import mage.constants.AttachmentType; +import mage.constants.Outcome; /** * @@ -52,8 +53,8 @@ public class AccordersShield extends CardImpl { super(ownerId, 136, "Accorder's Shield", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{0}"); this.expansionSetCode = "SOM"; this.subtype.add("Equipment"); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(3))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.EQUIPMENT))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(0, 3))); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/AcidWebSpider.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/AcidWebSpider.java index 2aeb1b40a56..40662db8c3f 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/AcidWebSpider.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/AcidWebSpider.java @@ -29,8 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/AlphaTyrranax.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/AlphaTyrranax.java index e5d3a159f6c..619a5aa36aa 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/AlphaTyrranax.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/AlphaTyrranax.java @@ -28,8 +28,8 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ArcTrail.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ArcTrail.java index d28db35d3e2..20f2a7fd964 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ArcTrail.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ArcTrail.java @@ -30,9 +30,9 @@ package mage.sets.scarsofmirrodin; import java.io.ObjectStreamException; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentSphinx.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentSphinx.java index 1fc9ab59ea9..f44292cdb58 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentSphinx.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentSphinx.java @@ -30,10 +30,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ReturnFromExileEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; @@ -82,7 +82,7 @@ class ArgentSphinxEffect extends OneShotEffect { private static final String effectText = "Exile {this}. Return it to the battlefield under your control at the beginning of the next end step"; ArgentSphinxEffect ( ) { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = effectText; } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentumArmor.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentumArmor.java index 131e7e32bfa..653c37ac2d2 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentumArmor.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentumArmor.java @@ -30,10 +30,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.AttacksEquippedTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -42,6 +41,7 @@ import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.target.TargetPermanent; /** @@ -58,7 +58,7 @@ public class ArgentumArmor extends CardImpl { Ability ability = new AttacksEquippedTriggeredAbility(new DestroyTargetEffect()); ability.addTarget(new TargetPermanent()); this.addAbility(ability); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(6))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(6))); } public ArgentumArmor (final ArgentumArmor card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Asceticism.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Asceticism.java index 1fa1dacad89..37e26f35f57 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Asceticism.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Asceticism.java @@ -28,9 +28,7 @@ package mage.sets.scarsofmirrodin; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -56,15 +54,15 @@ public class Asceticism extends CardImpl { private static final FilterStackObject filter = new FilterStackObject("spells or abilities your opponents control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT)); + filter.add(new ControllerPredicate(TargetController.OPPONENT)); } public Asceticism(UUID ownerId) { super(ownerId, 110, "Asceticism", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}{G}"); this.expansionSetCode = "SOM"; this.color.setGreen(true); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new AsceticismEffect(filter, Constants.Duration.WhileOnBattlefield))); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{1}{G}")); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AsceticismEffect(filter, Duration.WhileOnBattlefield))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{1}{G}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } @@ -84,8 +82,8 @@ class AsceticismEffect extends ReplacementEffectImpl { private FilterStackObject filterSource; - public AsceticismEffect(FilterStackObject filterSource, Constants.Duration duration) { - super(duration, Constants.Outcome.Benefit); + public AsceticismEffect(FilterStackObject filterSource, Duration duration) { + super(duration, Outcome.Benefit); this.filterSource = filterSource; staticText = "Creatures you control can't be the targets of spells or abilities your opponents control"; } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/AssaultStrobe.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/AssaultStrobe.java index 5e564484d86..8952af417fb 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/AssaultStrobe.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/AssaultStrobe.java @@ -28,9 +28,9 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.DoubleStrikeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokEdgewright.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokEdgewright.java index 4c7f08c8800..edc57cc1280 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokEdgewright.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokEdgewright.java @@ -28,10 +28,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokReplica.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokReplica.java index b453024e856..131308c698d 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokReplica.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokReplica.java @@ -29,11 +29,11 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokSunchaser.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokSunchaser.java index d751184bcb0..041594749a3 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokSunchaser.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokSunchaser.java @@ -28,10 +28,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BarbedBattlegear.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BarbedBattlegear.java index d5f92f92141..79a29fac2d0 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BarbedBattlegear.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BarbedBattlegear.java @@ -30,15 +30,15 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; /** * @@ -50,7 +50,7 @@ public class BarbedBattlegear extends CardImpl { super(ownerId, 139, "Barbed Battlegear", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "SOM"; this.subtype.add("Equipment"); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(2))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(4, -1))); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BarrageOgre.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BarrageOgre.java index 91d33a6ea55..34cb9dc6f34 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BarrageOgre.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BarrageOgre.java @@ -28,9 +28,9 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BellowingTanglewurm.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BellowingTanglewurm.java index 56ea3791cd1..88aae174029 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BellowingTanglewurm.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BellowingTanglewurm.java @@ -29,10 +29,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BlackcleaveCliffs.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BlackcleaveCliffs.java index 958709d2ccb..a66dd94e801 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BlackcleaveCliffs.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BlackcleaveCliffs.java @@ -29,8 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BlackcleaveGoblin.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BlackcleaveGoblin.java index f91ed62dd55..9fc0118fbfe 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BlackcleaveGoblin.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BlackcleaveGoblin.java @@ -29,8 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.InfectAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BladeTribeBerserkers.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BladeTribeBerserkers.java index 7b0b111e7b9..87c1a6d9088 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BladeTribeBerserkers.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BladeTribeBerserkers.java @@ -28,9 +28,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BladedPinions.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BladedPinions.java index dc5fe44112e..cdc35f9edc8 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BladedPinions.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BladedPinions.java @@ -30,11 +30,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; @@ -42,6 +41,7 @@ import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; /** * @@ -53,7 +53,7 @@ public class BladedPinions extends CardImpl { super(ownerId, 140, "Bladed Pinions", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "SOM"; this.subtype.add("Equipment"); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(2))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.EQUIPMENT))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BleakCovenVampires.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BleakCovenVampires.java index 7e074ed07f9..6de0e11612e 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BleakCovenVampires.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BleakCovenVampires.java @@ -28,8 +28,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BlightMamba.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BlightMamba.java index 49078f1ca32..482229dced9 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BlightMamba.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BlightMamba.java @@ -29,9 +29,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Blistergrub.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Blistergrub.java index 836a2e61456..3e0b7259a32 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Blistergrub.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Blistergrub.java @@ -30,14 +30,14 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; @@ -70,7 +70,7 @@ public class Blistergrub extends CardImpl { class BlistergrubEffect extends OneShotEffect { public BlistergrubEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "each opponent loses 2 life"; } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BloodshotTrainee.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BloodshotTrainee.java index 1ad9fb3b348..1fcbd6f3a3b 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BloodshotTrainee.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BloodshotTrainee.java @@ -28,9 +28,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BluntTheAssault.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BluntTheAssault.java index 79eda671449..6c49882a0c1 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BluntTheAssault.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BluntTheAssault.java @@ -30,13 +30,13 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.PreventAllDamageEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; /** @@ -52,7 +52,7 @@ public class BluntTheAssault extends CardImpl { this.expansionSetCode = "SOM"; this.color.setGreen(true); this.getSpellAbility().addEffect(new GainLifeEffect(new PermanentsOnBattlefieldCount(filter))); - this.getSpellAbility().addEffect(new PreventAllDamageEffect(Constants.Duration.EndOfTurn, true)); + this.getSpellAbility().addEffect(new PreventAllDamageEffect(Duration.EndOfTurn, true)); } public BluntTheAssault (final BluntTheAssault card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BondsOfQuicksilver.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BondsOfQuicksilver.java index 1fe095e3d13..4ce2c1dc020 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BondsOfQuicksilver.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BondsOfQuicksilver.java @@ -30,15 +30,15 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.SkipEnchantedUntapEffect; import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -57,7 +57,7 @@ public class BondsOfQuicksilver extends CardImpl { this.addAbility(FlashAbility.getInstance()); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Detriment)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); ability.addEffect(new SkipEnchantedUntapEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/CarapaceForger.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/CarapaceForger.java index be388e10c6c..c2c713f31a5 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/CarapaceForger.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/CarapaceForger.java @@ -29,10 +29,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/CarnifexDemon.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/CarnifexDemon.java index 2e06af89d64..b009316c1fa 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/CarnifexDemon.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/CarnifexDemon.java @@ -30,10 +30,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -44,6 +43,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -80,7 +80,7 @@ public class CarnifexDemon extends CardImpl { class CarnifexDemonEffect extends OneShotEffect { public CarnifexDemonEffect() { - super(Constants.Outcome.UnboostCreature); + super(Outcome.UnboostCreature); staticText = "Put a -1/-1 counter on each other creature"; } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/CarrionCall.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/CarrionCall.java index 04d2a85a17c..95071c31ae0 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/CarrionCall.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/CarrionCall.java @@ -29,8 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/CerebralEruption.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/CerebralEruption.java index 66ffbab742c..82e58ecc154 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/CerebralEruption.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/CerebralEruption.java @@ -27,10 +27,10 @@ */ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.PostResolveEffect; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ChimericMass.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ChimericMass.java index 4025fa28642..7c24a99b485 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ChimericMass.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ChimericMass.java @@ -27,11 +27,11 @@ */ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.SpellAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ChromeSteed.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ChromeSteed.java index 2243b3f46d8..ca2cf909037 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ChromeSteed.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ChromeSteed.java @@ -29,10 +29,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/CloneShell.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/CloneShell.java index 495b03e6068..301fa0233b9 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/CloneShell.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/CloneShell.java @@ -27,9 +27,8 @@ */ package mage.sets.scarsofmirrodin; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -39,6 +38,8 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.game.Game; import mage.game.permanent.Permanent; @@ -84,7 +85,7 @@ class CloneShellEffect extends OneShotEffect { protected static FilterCard filter2 = new FilterCard("card to put on the bottom of your library"); public CloneShellEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library in any order"; } @@ -95,20 +96,20 @@ class CloneShellEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); - Cards cards = new CardsImpl(Constants.Zone.PICK); + Cards cards = new CardsImpl(Zone.PICK); int count = Math.min(player.getLibrary().size(), 4); for (int i = 0; i < count; i++) { Card card = player.getLibrary().removeFromTop(game); cards.add(card); - game.setZone(card.getId(), Constants.Zone.PICK); + game.setZone(card.getId(), Zone.PICK); } if (cards.size() == 0) { return false; } - TargetCard target1 = new TargetCard(Constants.Zone.PICK, filter1); - if (player.choose(Constants.Outcome.Detriment, cards, target1, game)) { + TargetCard target1 = new TargetCard(Zone.PICK, filter1); + if (player.choose(Outcome.Detriment, cards, target1, game)) { Card card = cards.get(target1.getFirstTarget(), game); if (card != null) { cards.remove(card); @@ -123,19 +124,19 @@ class CloneShellEffect extends OneShotEffect { } if (cards.size() > 0) { - TargetCard target2 = new TargetCard(Constants.Zone.PICK, filter2); + TargetCard target2 = new TargetCard(Zone.PICK, filter2); target2.setRequired(true); while (cards.size() > 1) { - player.choose(Constants.Outcome.Benefit, cards, target2, game); + player.choose(Outcome.Benefit, cards, target2, game); Card card = cards.get(target2.getFirstTarget(), game); if (card != null) { cards.remove(card); - card.moveToZone(Constants.Zone.LIBRARY, source.getId(), game, false); + card.moveToZone(Zone.LIBRARY, source.getId(), game, false); } target2.clearChosen(); } Card card = cards.get(cards.iterator().next(), game); - card.moveToZone(Constants.Zone.LIBRARY, source.getId(), game, true); + card.moveToZone(Zone.LIBRARY, source.getId(), game, true); } return true; @@ -151,7 +152,7 @@ class CloneShellEffect extends OneShotEffect { class CloneShellDiesEffect extends OneShotEffect { public CloneShellDiesEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "turn the exiled card face up. If it's a creature card, put it onto the battlefield under your control"; } @@ -161,14 +162,14 @@ class CloneShellDiesEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = (Permanent) game.getLastKnownInformation(source.getSourceId(), Constants.Zone.BATTLEFIELD); + Permanent permanent = (Permanent) game.getLastKnownInformation(source.getSourceId(), Zone.BATTLEFIELD); if (permanent != null) { List imprinted = permanent.getImprinted(); if (imprinted.size() > 0) { Card imprintedCard = game.getCard(imprinted.get(0)); imprintedCard.setFaceDown(false); if (imprintedCard.getCardType().contains(CardType.CREATURE)) { - imprintedCard.putOntoBattlefield(game, Constants.Zone.EXILED, source.getSourceId(), source.getControllerId()); + imprintedCard.putOntoBattlefield(game, Zone.EXILED, source.getSourceId(), source.getControllerId()); } } } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ContagionClasp.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ContagionClasp.java index d115690843d..2984530ac1e 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ContagionClasp.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ContagionClasp.java @@ -29,10 +29,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ContagionEngine.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ContagionEngine.java index 1b0d1386f00..cae9cc43429 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ContagionEngine.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ContagionEngine.java @@ -30,9 +30,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.ProliferateEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -60,7 +61,7 @@ public class ContagionEngine extends CardImpl { Ability ability = new EntersBattlefieldTriggeredAbility(new ContagionEngineEffect()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); - ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ProliferateEffect(), new GenericManaCost(4)); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ProliferateEffect(), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addEffect(new ProliferateEffect()); this.addAbility(ability); @@ -79,7 +80,7 @@ public class ContagionEngine extends CardImpl { class ContagionEngineEffect extends OneShotEffect { ContagionEngineEffect() { - super(Constants.Outcome.UnboostCreature); + super(Outcome.UnboostCreature); staticText = "put a -1/-1 counter on each creature target player controls"; } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ContagiousNim.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ContagiousNim.java index 993cd6f56bc..caff8388ee7 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ContagiousNim.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ContagiousNim.java @@ -29,8 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/CopperhornScout.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/CopperhornScout.java index b887c150fff..81038431084 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/CopperhornScout.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/CopperhornScout.java @@ -29,10 +29,10 @@ package mage.sets.scarsofmirrodin; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/CopperlineGorge.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/CopperlineGorge.java index 69007ed519c..0129248eab4 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/CopperlineGorge.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/CopperlineGorge.java @@ -29,8 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/CorpseCur.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/CorpseCur.java index 030a6fe254d..42f7f0c4a49 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/CorpseCur.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/CorpseCur.java @@ -29,8 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/CorruptedHarvester.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/CorruptedHarvester.java index 168b999d652..3dc5af6f18e 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/CorruptedHarvester.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/CorruptedHarvester.java @@ -29,9 +29,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/CullingDais.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/CullingDais.java index fb1bf6965ea..2724aaaf276 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/CullingDais.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/CullingDais.java @@ -30,9 +30,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -42,6 +41,8 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -57,10 +58,10 @@ public class CullingDais extends CardImpl { public CullingDais (UUID ownerId) { super(ownerId, 148, "Culling Dais", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "SOM"; - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.addAbility(ability); - ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CullingDaisEffect(), new GenericManaCost(1)); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CullingDaisEffect(), new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } @@ -78,7 +79,7 @@ public class CullingDais extends CardImpl { class CullingDaisEffect extends OneShotEffect { CullingDaisEffect() { - super(Constants.Outcome.DrawCard); + super(Outcome.DrawCard); staticText = "Draw a card for each charge counter on {this}"; } @@ -88,7 +89,7 @@ class CullingDaisEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent p = (Permanent) game.getLastKnownInformation(source.getSourceId(), Constants.Zone.BATTLEFIELD); + Permanent p = (Permanent) game.getLastKnownInformation(source.getSourceId(), Zone.BATTLEFIELD); Player player = game.getPlayer(source.getControllerId()); if (p != null && player != null) { int count = p.getCounters().getCount(CounterType.CHARGE); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Cystbearer.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Cystbearer.java index 9d377a1d22e..b6586ad9b54 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Cystbearer.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Cystbearer.java @@ -30,8 +30,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/DarkslickDrake.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/DarkslickDrake.java index 1e0191db57f..fb98fde5837 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/DarkslickDrake.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/DarkslickDrake.java @@ -28,8 +28,8 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/DarkslickShores.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/DarkslickShores.java index 20df23f42e1..6aac4adee52 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/DarkslickShores.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/DarkslickShores.java @@ -29,8 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/DarksteelAxe.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/DarksteelAxe.java index 17eddd8cd9d..f342859f9bf 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/DarksteelAxe.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/DarksteelAxe.java @@ -29,16 +29,16 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; /** * @@ -52,7 +52,7 @@ public class DarksteelAxe extends CardImpl { this.subtype.add("Equipment"); this.addAbility(IndestructibleAbility.getInstance()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(2))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); } public DarksteelAxe (final DarksteelAxe card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/DarksteelJuggernaut.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/DarksteelJuggernaut.java index ce1c1ba1bc4..eb2f36c1fb9 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/DarksteelJuggernaut.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/DarksteelJuggernaut.java @@ -29,9 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.common.SimpleStaticAbility; @@ -50,7 +49,7 @@ public class DarksteelJuggernaut extends CardImpl { private static final FilterArtifactPermanent filter = new FilterArtifactPermanent("artifacts you control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public DarksteelJuggernaut (UUID ownerId) { @@ -60,8 +59,8 @@ public class DarksteelJuggernaut extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(0); - SetPowerToughnessSourceEffect effect = new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Constants.Duration.EndOfGame); - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, effect)); + SetPowerToughnessSourceEffect effect = new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Duration.EndOfGame); + this.addAbility(new SimpleStaticAbility(Zone.ALL, effect)); this.addAbility(IndestructibleAbility.getInstance()); this.addAbility(new AttacksEachTurnStaticAbility()); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/DarksteelMyr.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/DarksteelMyr.java index 9226ccadf38..1dd93382c1b 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/DarksteelMyr.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/DarksteelMyr.java @@ -29,8 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/DarksteelSentinel.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/DarksteelSentinel.java index e8d8c10a6db..052f39c3b92 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/DarksteelSentinel.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/DarksteelSentinel.java @@ -29,8 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.IndestructibleAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/DispenseJustice.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/DispenseJustice.java index b19f4be8e3e..bc91f49c990 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/DispenseJustice.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/DispenseJustice.java @@ -29,9 +29,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.condition.common.MetalcraftCondition; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Disperse.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Disperse.java index a942a8374fb..9367f8319da 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Disperse.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Disperse.java @@ -29,8 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetNonlandPermanent; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/DissipationField.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/DissipationField.java index c1c513cce73..d00ceabced7 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/DissipationField.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/DissipationField.java @@ -28,12 +28,13 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -67,7 +68,7 @@ public class DissipationField extends CardImpl { class DissipationFieldAbility extends TriggeredAbilityImpl { public DissipationFieldAbility() { - super(Constants.Zone.BATTLEFIELD, new ReturnToHandTargetEffect()); + super(Zone.BATTLEFIELD, new ReturnToHandTargetEffect()); } public DissipationFieldAbility(DissipationFieldAbility effect) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/DrossHopper.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/DrossHopper.java index fdf6d9049c6..b29c2fbf7b7 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/DrossHopper.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/DrossHopper.java @@ -29,10 +29,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/EchoCirclet.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/EchoCirclet.java index adf82c8fb8a..39611972221 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/EchoCirclet.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/EchoCirclet.java @@ -28,10 +28,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Layer; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -53,10 +51,10 @@ public class EchoCirclet extends CardImpl { this.subtype.add("Equipment"); // Equipped creature can block an additional creature. (static abilit of equipment, no ability that will be gained to equiped creature!) - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new EchoCircletEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EchoCircletEffect())); // Equip {1} - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(1))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1))); } public EchoCirclet(final EchoCirclet card) { @@ -72,7 +70,7 @@ public class EchoCirclet extends CardImpl { class EchoCircletEffect extends ContinuousEffectImpl { public EchoCircletEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "Equipped creature can block an additional creature"; } @@ -86,7 +84,7 @@ class EchoCircletEffect extends ContinuousEffectImpl { } @Override - public boolean apply(Layer layer, Constants.SubLayer sublayer, Ability source, Game game) { + public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) { Permanent perm = game.getPermanent(source.getSourceId()); if (perm != null && perm.getAttachedTo() != null) { Permanent equipped = game.getPermanent(perm.getAttachedTo()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ElspethTirel.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ElspethTirel.java index 0fc3620f323..b21466b0e44 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ElspethTirel.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ElspethTirel.java @@ -28,9 +28,8 @@ package mage.sets.scarsofmirrodin; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.EntersBattlefieldAbility; @@ -38,6 +37,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -79,7 +79,7 @@ public class ElspethTirel extends CardImpl { class ElspethTirelFirstEffect extends OneShotEffect { public ElspethTirelFirstEffect() { - super(Constants.Outcome.GainLife); + super(Outcome.GainLife); staticText = "You gain 1 life for each creature you control"; } @@ -106,7 +106,7 @@ class ElspethTirelFirstEffect extends OneShotEffect { class ElspethTirelThirdEffect extends OneShotEffect { public ElspethTirelThirdEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); staticText = "Destroy all other permanents except for lands and tokens"; } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Embersmith.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Embersmith.java index d712fb4609b..b0221133316 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Embersmith.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Embersmith.java @@ -29,9 +29,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastTriggeredAbility; @@ -39,6 +39,7 @@ import mage.abilities.costs.Cost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; @@ -84,7 +85,7 @@ public class Embersmith extends CardImpl { class EmbersmithEffect extends OneShotEffect { EmbersmithEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "you may pay {1}. If you do, {this} deals 1 damage to target creature or player"; } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/EngulfingSlagwurm.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/EngulfingSlagwurm.java index 004e057896b..50acbf4f78b 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/EngulfingSlagwurm.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/EngulfingSlagwurm.java @@ -30,9 +30,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -40,6 +39,8 @@ import mage.abilities.common.BlocksOrBecomesBlockedByCreatureTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; @@ -76,7 +77,7 @@ public class EngulfingSlagwurm extends CardImpl { class EngulfingSlagwurmEffect extends OneShotEffect { EngulfingSlagwurmEffect() { - super(Constants.Outcome.GainLife); + super(Outcome.GainLife); staticText = "You gain life equal to that creature's toughness"; } @@ -87,7 +88,7 @@ class EngulfingSlagwurmEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - MageObject c = game.getLastKnownInformation(targetPointer.getFirst(game, source), Constants.Zone.BATTLEFIELD); + MageObject c = game.getLastKnownInformation(targetPointer.getFirst(game, source), Zone.BATTLEFIELD); if (c != null && controller != null) { controller.gainLife(c.getPower().getValue(), game); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/EtchedChampion.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/EtchedChampion.java index 9f0cde26a87..a7c32d8fd8a 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/EtchedChampion.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/EtchedChampion.java @@ -28,10 +28,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Exsanguinate.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Exsanguinate.java index 3d6bc64f59e..b1f65b8986d 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Exsanguinate.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Exsanguinate.java @@ -30,12 +30,12 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; /** @@ -64,7 +64,7 @@ public class Exsanguinate extends CardImpl { class ExsanguinateEffect extends OneShotEffect { public ExsanguinateEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "Each opponent loses X life. You gain life equal to the life lost this way"; } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/EzuriRenegadeLeader.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/EzuriRenegadeLeader.java index e5b96466ecc..a6b277c836e 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/EzuriRenegadeLeader.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/EzuriRenegadeLeader.java @@ -28,10 +28,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/EzurisArchers.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/EzurisArchers.java index a0f150d9f50..740478a954b 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/EzurisArchers.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/EzurisArchers.java @@ -28,10 +28,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/EzurisBrigade.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/EzurisBrigade.java index a25f0c674e3..a9217aa423a 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/EzurisBrigade.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/EzurisBrigade.java @@ -29,10 +29,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Ferrovore.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Ferrovore.java index 3a012cc0013..5e13e44ce64 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Ferrovore.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Ferrovore.java @@ -29,10 +29,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/FlamebornHellion.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/FlamebornHellion.java index d6bcf7b9251..c868e474367 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/FlamebornHellion.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/FlamebornHellion.java @@ -29,8 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.keyword.HasteAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/FleshAllergy.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/FleshAllergy.java index 898a4f629ff..d2f34b06f4f 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/FleshAllergy.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/FleshAllergy.java @@ -30,11 +30,11 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.WatcherScope; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.WatcherScope; +import mage.constants.Zone; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.costs.common.SacrificeTargetCost; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/FlightSpellbomb.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/FlightSpellbomb.java index 18cd1c132ea..e491c83ab6c 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/FlightSpellbomb.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/FlightSpellbomb.java @@ -29,10 +29,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/FulgentDistraction.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/FulgentDistraction.java index 14e134d74eb..0122f9d2e07 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/FulgentDistraction.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/FulgentDistraction.java @@ -31,9 +31,9 @@ package mage.sets.scarsofmirrodin; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.EquipAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/FumeSpitter.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/FumeSpitter.java index e5499a14823..3b6cece68db 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/FumeSpitter.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/FumeSpitter.java @@ -29,9 +29,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/FurnaceCelebration.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/FurnaceCelebration.java index 3b7f5baf635..0177f45e27b 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/FurnaceCelebration.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/FurnaceCelebration.java @@ -28,9 +28,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GalvanicBlast.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GalvanicBlast.java index f2de6fa797f..265e6460767 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GalvanicBlast.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GalvanicBlast.java @@ -28,8 +28,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.condition.common.MetalcraftCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DamageTargetEffect; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GenesisWave.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GenesisWave.java index 7be2fab0f00..1eadb801427 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GenesisWave.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GenesisWave.java @@ -28,10 +28,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GethLordOfTheVault.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GethLordOfTheVault.java index 4522dc58bd7..6d5009c5d78 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GethLordOfTheVault.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GethLordOfTheVault.java @@ -29,10 +29,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GhalmasWarden.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GhalmasWarden.java index 7980344ae46..72d4fa06dc9 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GhalmasWarden.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GhalmasWarden.java @@ -29,10 +29,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GlimmerpointStag.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GlimmerpointStag.java index 5aa198735ea..a6082dd70fc 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GlimmerpointStag.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GlimmerpointStag.java @@ -27,10 +27,10 @@ */ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Glimmerpost.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Glimmerpost.java index 15cf83f372c..511842b1ad4 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Glimmerpost.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Glimmerpost.java @@ -30,14 +30,14 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -76,7 +76,7 @@ class GlimmerpostEffect extends OneShotEffect { } public GlimmerpostEffect() { - super(Constants.Outcome.GainLife); + super(Outcome.GainLife); staticText = "you gain 1 life for each Locus on the battlefield"; } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GlintHawk.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GlintHawk.java index dcc04217ac9..f77f2cccde5 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GlintHawk.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GlintHawk.java @@ -28,10 +28,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GlintHawkIdol.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GlintHawkIdol.java index 349949427b5..20ea240b0e0 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GlintHawkIdol.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GlintHawkIdol.java @@ -29,12 +29,12 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +42,7 @@ import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.continious.BecomesCreatureSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; import mage.filter.FilterPermanent; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.permanent.AnotherPredicate; @@ -68,7 +69,7 @@ public class GlintHawkIdol extends CardImpl { this.addAbility(new EntersBattlefieldControlledTriggeredAbility( Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new GlintHawkIdolToken(), "", Duration.EndOfTurn), filter, true)); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new GlintHawkIdolToken(), "", Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.W))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new GlintHawkIdolToken(), "", Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W))); } public GlintHawkIdol (final GlintHawkIdol card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GoblinGaveleer.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GoblinGaveleer.java index d0227d7b765..9639faacc47 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GoblinGaveleer.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GoblinGaveleer.java @@ -28,10 +28,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.EquipmentAttachedCount; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GoldenUrn.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GoldenUrn.java index 33d2e1e88cf..2b644a8566f 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GoldenUrn.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GoldenUrn.java @@ -30,10 +30,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -56,7 +57,7 @@ public class GoldenUrn extends CardImpl { public GoldenUrn (UUID ownerId) { super(ownerId, 158, "Golden Urn", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{1}"); this.expansionSetCode = "SOM"; - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), Constants.TargetController.YOU, true)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), TargetController.YOU, true)); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GoldenUrnEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); @@ -75,7 +76,7 @@ public class GoldenUrn extends CardImpl { class GoldenUrnEffect extends OneShotEffect { public GoldenUrnEffect() { - super(Constants.Outcome.GainLife); + super(Outcome.GainLife); staticText = "You gain life equal to the number of charge counters on {this}"; } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GolemArtisan.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GolemArtisan.java index 1415e279e17..82c38b24e75 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GolemArtisan.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GolemArtisan.java @@ -27,9 +27,7 @@ */ package mage.sets.scarsofmirrodin; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -77,13 +75,13 @@ public class GolemArtisan extends CardImpl { this.toughness = new MageInt(3); // {2}: Target artifact creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Constants.Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new GenericManaCost(2)); Target target = new TargetPermanent(filter); ability.addTarget(target); this.addAbility(ability); // {2}: Target artifact creature gains your choice of flying, trample, or haste until end of turn. - ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GolemArtisanEffect(), new GenericManaCost(2)); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GolemArtisanEffect(), new GenericManaCost(2)); target = new TargetPermanent(filter); ability.addTarget(target); this.addAbility(ability); @@ -102,7 +100,7 @@ public class GolemArtisan extends CardImpl { class GolemArtisanEffect extends OneShotEffect { GolemArtisanEffect() { - super(Constants.Outcome.AddAbility); + super(Outcome.AddAbility); staticText = "Target artifact creature gains your choice of flying, trample, or haste until end of turn"; } @@ -123,7 +121,7 @@ class GolemArtisanEffect extends OneShotEffect { abilities.add(TrampleAbility.getInstance().getRule()); abilities.add(HasteAbility.getInstance().getRule()); abilityChoice.setChoices(abilities); - playerControls.choose(Constants.Outcome.AddAbility, abilityChoice, game); + playerControls.choose(Outcome.AddAbility, abilityChoice, game); String chosen = abilityChoice.getChoice(); Ability ability = null; @@ -136,7 +134,7 @@ class GolemArtisanEffect extends OneShotEffect { } if (ability != null) { - ContinuousEffect effect = new GainAbilityTargetEffect(ability, Constants.Duration.EndOfTurn); + ContinuousEffect effect = new GainAbilityTargetEffect(ability, Duration.EndOfTurn); game.addEffect(effect, source); return true; } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GolemFoundry.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GolemFoundry.java index d96452f33a4..4b5279ff417 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GolemFoundry.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GolemFoundry.java @@ -29,9 +29,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SpellCastTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GolemsHeart.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GolemsHeart.java index f55b27e563c..0ad9dbcd227 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GolemsHeart.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GolemsHeart.java @@ -29,9 +29,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GraftedExoskeleton.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GraftedExoskeleton.java index 06a0ab5f98c..dcc133976f3 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GraftedExoskeleton.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GraftedExoskeleton.java @@ -29,9 +29,7 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.UnattachedTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -53,10 +51,10 @@ public class GraftedExoskeleton extends CardImpl { this.expansionSetCode = "SOM"; this.subtype.add("Equipment"); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(2))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); // Equipped creature gets +2/+2 and has infect. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(InfectAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(InfectAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); // Whenever Grafted Exoskeleton becomes unattached from a permanent, sacrifice that permanent. this.addAbility(new UnattachedTriggeredAbility(new SacrificeEquippedEffect(), false)); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GrandArchitect.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GrandArchitect.java index eac89869778..caa026020d0 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GrandArchitect.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GrandArchitect.java @@ -31,13 +31,13 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; import mage.ConditionalMana; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.MageInt; import mage.MageObject; import mage.Mana; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GraspOfDarkness.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GraspOfDarkness.java index bbda2ff9651..73094e5fb0c 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GraspOfDarkness.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GraspOfDarkness.java @@ -29,9 +29,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Grindclock.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Grindclock.java index 08e63d4f521..27b748f4492 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Grindclock.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Grindclock.java @@ -30,10 +30,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -41,6 +40,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.game.Game; import mage.players.Player; @@ -74,7 +74,7 @@ public class Grindclock extends CardImpl { class GrindclockEffect extends OneShotEffect { public GrindclockEffect() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); staticText = "Target player puts the top X cards of his or her library into his or her graveyard, where X is the number of charge counters on {this}"; } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/HaltOrder.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/HaltOrder.java index 3464b4505ed..90a3df744ae 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/HaltOrder.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/HaltOrder.java @@ -29,8 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/HandOfThePraetors.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/HandOfThePraetors.java index d2772b2814c..2f7ec6b525f 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/HandOfThePraetors.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/HandOfThePraetors.java @@ -30,10 +30,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.effects.common.counter.AddPoisonCounterTargetEffect; import mage.abilities.keyword.InfectAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/HeavyArbalest.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/HeavyArbalest.java index d8fe5eb131f..414b23f02ef 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/HeavyArbalest.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/HeavyArbalest.java @@ -28,13 +28,13 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.PhaseStep; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.PhaseStep; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/HoardSmelterDragon.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/HoardSmelterDragon.java index d88df9cca04..a4ddff6098a 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/HoardSmelterDragon.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/HoardSmelterDragon.java @@ -30,9 +30,7 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -67,7 +65,7 @@ public class HoardSmelterDragon extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{3}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{3}{R}")); ability.addTarget(new TargetPermanent(filter)); ability.addEffect(new HoardSmelterEffect()); this.addAbility(ability); @@ -87,7 +85,7 @@ class HoardSmelterEffect extends ContinuousEffectImpl { private int costValue = 0; HoardSmelterEffect() { - super(Constants.Duration.EndOfTurn, Constants.Layer.PTChangingEffects_7, Constants.SubLayer.ModifyPT_7c, Constants.Outcome.BoostCreature); + super(Duration.EndOfTurn, Layer.PTChangingEffects_7, SubLayer.ModifyPT_7c, Outcome.BoostCreature); staticText = "{this} gets +X/+0 until end of turn, where X is that artifact's converted mana cost"; } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/HorizonSpellbomb.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/HorizonSpellbomb.java index 8715ccf9cdc..8c250722c23 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/HorizonSpellbomb.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/HorizonSpellbomb.java @@ -28,9 +28,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/IchorRats.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/IchorRats.java index f301428c2e6..4a8bcc3e38d 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/IchorRats.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/IchorRats.java @@ -30,15 +30,15 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.game.Game; import mage.players.Player; @@ -73,7 +73,7 @@ public class IchorRats extends CardImpl { class IchorRatsEffect extends OneShotEffect { public IchorRatsEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "each player gets a poison counter"; } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/IchorclawMyr.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/IchorclawMyr.java index 621afb36e67..b967d5fad98 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/IchorclawMyr.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/IchorclawMyr.java @@ -28,9 +28,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BecomesBlockedTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/IndomitableArchangel.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/IndomitableArchangel.java index 113ae6b5423..9610b6e1653 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/IndomitableArchangel.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/IndomitableArchangel.java @@ -30,10 +30,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/InexorableTide.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/InexorableTide.java index 2744f194d4b..2190caf407a 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/InexorableTide.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/InexorableTide.java @@ -29,8 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.common.counter.ProliferateEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/InfiltrationLens.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/InfiltrationLens.java index 561dd471b8d..cd3710b7473 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/InfiltrationLens.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/InfiltrationLens.java @@ -28,10 +28,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.Effect; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/InstillInfection.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/InstillInfection.java index 2de0303238d..d2780987f29 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/InstillInfection.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/InstillInfection.java @@ -29,8 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/KembaKhaRegent.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/KembaKhaRegent.java index 50b444631cc..6a56d39a44e 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/KembaKhaRegent.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/KembaKhaRegent.java @@ -29,9 +29,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/KembasSkyguard.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/KembasSkyguard.java index a56a154afc4..37bfadf6670 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/KembasSkyguard.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/KembasSkyguard.java @@ -29,8 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/KothOfTheHammer.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/KothOfTheHammer.java index 8700220b4af..16d2ed2d2fc 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/KothOfTheHammer.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/KothOfTheHammer.java @@ -30,11 +30,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.*; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -73,9 +72,9 @@ public class KothOfTheHammer extends CardImpl { static { filter.add(new SubtypePredicate("Mountain")); - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); filterCount.add(new SubtypePredicate("Mountain")); - filterCount.add(new ControllerPredicate(Constants.TargetController.YOU)); + filterCount.add(new ControllerPredicate(TargetController.YOU)); } public KothOfTheHammer (UUID ownerId) { @@ -132,7 +131,7 @@ class KothOfTheHammerEmblem extends Emblem { class KothOfTheHammerThirdEffect extends ContinuousEffectImpl { public KothOfTheHammerThirdEffect() { - super(Duration.EndOfGame, Constants.Outcome.AddAbility); + super(Duration.EndOfGame, Outcome.AddAbility); staticText = "You get an emblem with \"Mountains you control have '{T}: This land deals 1 damage to target creature or player.'\""; } @@ -141,10 +140,10 @@ class KothOfTheHammerThirdEffect extends ContinuousEffectImpl { class LifesmithEffect extends OneShotEffect { LifesmithEffect() { - super(Constants.Outcome.GainLife); + super(Outcome.GainLife); staticText = "you may pay {1}. If you do, you gain 3 life"; } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/LiquimetalCoating.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/LiquimetalCoating.java index 69f6d6167a6..d5577a9ff9e 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/LiquimetalCoating.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/LiquimetalCoating.java @@ -30,14 +30,15 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.continious.AddCardTypeTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.TargetPermanent; /** @@ -49,7 +50,7 @@ public class LiquimetalCoating extends CardImpl { public LiquimetalCoating (UUID ownerId) { super(ownerId, 171, "Liquimetal Coating", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "SOM"; - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCardTypeTargetEffect(CardType.ARTIFACT, Constants.Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCardTypeTargetEffect(CardType.ARTIFACT, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/LivewireLash.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/LivewireLash.java index f56f4cb7868..d1d3247167e 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/LivewireLash.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/LivewireLash.java @@ -28,11 +28,11 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/LoxodonWayfarer.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/LoxodonWayfarer.java index fc0ee951bcb..dec71f2bfb6 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/LoxodonWayfarer.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/LoxodonWayfarer.java @@ -28,8 +28,8 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/LumengridDrake.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/LumengridDrake.java index c3940cc73ff..f4ec1c6087e 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/LumengridDrake.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/LumengridDrake.java @@ -27,8 +27,8 @@ */ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/LuxCannon.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/LuxCannon.java index ddfd33b6451..8eadabf9c8b 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/LuxCannon.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/LuxCannon.java @@ -28,9 +28,9 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/MeltTerrain.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/MeltTerrain.java index 8873b37284b..08da6728c7e 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/MeltTerrain.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/MeltTerrain.java @@ -30,14 +30,14 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -71,7 +71,7 @@ public class MeltTerrain extends CardImpl { class MeltTerrainEffect extends OneShotEffect { MeltTerrainEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "{this} deals 2 damage to that land's controller"; } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Memnite.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Memnite.java index 8b8dcd04e1a..728c82ab536 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Memnite.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Memnite.java @@ -28,8 +28,8 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Memoricide.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Memoricide.java index cea75b67f11..45104560b88 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Memoricide.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Memoricide.java @@ -28,10 +28,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/MimicVat.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/MimicVat.java index 8541735bcf2..2e89864feb3 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/MimicVat.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/MimicVat.java @@ -27,9 +27,8 @@ */ package mage.sets.scarsofmirrodin; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.TriggeredAbilityImpl; @@ -42,6 +41,8 @@ import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -66,7 +67,7 @@ public class MimicVat extends CardImpl { this.addAbility(new MimicVatTriggeredAbility()); // {3}, {tap}: Put a token onto the battlefield that's a copy of the exiled card. It gains haste. Exile it at the beginning of the next end step. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new MimicVatCreateTokenEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MimicVatCreateTokenEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } @@ -84,7 +85,7 @@ public class MimicVat extends CardImpl { class MimicVatTriggeredAbility extends TriggeredAbilityImpl { MimicVatTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new MimicVatEffect(), true); + super(Zone.BATTLEFIELD, new MimicVatEffect(), true); } MimicVatTriggeredAbility(MimicVatTriggeredAbility ability) { @@ -104,7 +105,7 @@ class MimicVatTriggeredAbility extends TriggeredAbilityImpl { public MimicVatEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "exile that card"; } @@ -150,7 +151,7 @@ class MimicVatEffect extends OneShotEffect { // return older cards to graveyard for (UUID imprinted : permanent.getImprinted()) { Card card = game.getCard(imprinted); - card.moveToZone(Constants.Zone.GRAVEYARD, source.getSourceId(), game, false); + card.moveToZone(Zone.GRAVEYARD, source.getSourceId(), game, false); } permanent.clearImprinted(game); @@ -175,7 +176,7 @@ class MimicVatEffect extends OneShotEffect { class MimicVatCreateTokenEffect extends OneShotEffect { public MimicVatCreateTokenEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); this.staticText = "Put a token onto the battlefield that's a copy of the exiled card. It gains haste. Exile it at the beginning of the next end step"; } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Mindslaver.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Mindslaver.java index 57a72050579..16f946c820e 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Mindslaver.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Mindslaver.java @@ -29,9 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.turn.ControlTargetPlayerNextTurnEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetPlayer; /** @@ -53,7 +53,7 @@ public class Mindslaver extends CardImpl { this.supertype.add("Legendary"); // {4}, {tap}, Sacrifice Mindslaver: You control target player during that player's next turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ControlTargetPlayerNextTurnEffect(), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ControlTargetPlayerNextTurnEffect(), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPlayer(true)); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/MolderBeast.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/MolderBeast.java index d278d65412d..a8058e33753 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/MolderBeast.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/MolderBeast.java @@ -28,15 +28,16 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -74,7 +75,7 @@ public class MolderBeast extends CardImpl { class MolderBeastTriggeredAbility extends TriggeredAbilityImpl { public MolderBeastTriggeredAbility() { - super(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Constants.Duration.EndOfTurn), false); + super(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), false); } public MolderBeastTriggeredAbility(final MolderBeastTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenPsyche.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenPsyche.java index f8a8413e509..4546dd0b2b5 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenPsyche.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenPsyche.java @@ -31,10 +31,10 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.WatcherScope; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.WatcherScope; import mage.abilities.Ability; import mage.abilities.condition.common.MetalcraftCondition; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenTailMasticore.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenTailMasticore.java index 071461ae8ee..ca193c9fd65 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenTailMasticore.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenTailMasticore.java @@ -29,9 +29,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/MoriokReaver.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/MoriokReaver.java index 3f92da95d22..c686715ea83 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/MoriokReaver.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/MoriokReaver.java @@ -29,8 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/MoriokReplica.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/MoriokReplica.java index 4716c1ff273..e607c08ff1f 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/MoriokReplica.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/MoriokReplica.java @@ -29,9 +29,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/MoxOpal.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/MoxOpal.java index f2d78546ed3..c10dcfe4cd4 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/MoxOpal.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/MoxOpal.java @@ -28,8 +28,8 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.common.MetalcraftCost; import mage.abilities.mana.AnyColorManaAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/MyrBattlesphere.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/MyrBattlesphere.java index 0382617737b..4b77708527a 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/MyrBattlesphere.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/MyrBattlesphere.java @@ -29,11 +29,11 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/MyrGalvanizer.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/MyrGalvanizer.java index dc2664b4030..34d77afd636 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/MyrGalvanizer.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/MyrGalvanizer.java @@ -30,11 +30,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -88,7 +88,7 @@ public class MyrGalvanizer extends CardImpl { class MyrGalvanizerEffect extends OneShotEffect { MyrGalvanizerEffect() { - super(Constants.Outcome.Untap); + super(Outcome.Untap); staticText = "Untap each other Myr you control"; } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/MyrPropagator.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/MyrPropagator.java index 0fd9e9fa4df..ccbf054cb49 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/MyrPropagator.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/MyrPropagator.java @@ -27,9 +27,8 @@ */ package mage.sets.scarsofmirrodin; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,6 +36,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.sets.tokens.EmptyToken; @@ -60,7 +61,7 @@ public class MyrPropagator extends CardImpl { this.toughness = new MageInt(1); // {3}, {tap}: Put a token that's a copy of Myr Propagator onto the battlefield. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new MyrPropagatorCreateTokenEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MyrPropagatorCreateTokenEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } @@ -78,7 +79,7 @@ public class MyrPropagator extends CardImpl { class MyrPropagatorCreateTokenEffect extends OneShotEffect { public MyrPropagatorCreateTokenEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); this.staticText = "Put a token that's a copy of Myr Propagator onto the battlefield"; } @@ -93,7 +94,7 @@ class MyrPropagatorCreateTokenEffect extends OneShotEffect { this.addAbility(new MyrReservoirManaAbility()); // {3}, {tap}: Return target Myr card from your graveyard to your hand. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(myrCardFilter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Myrsmith.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Myrsmith.java index de00f528da9..3bd51f6a966 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Myrsmith.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Myrsmith.java @@ -29,9 +29,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastTriggeredAbility; @@ -39,6 +39,7 @@ import mage.abilities.costs.Cost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; @@ -81,7 +82,7 @@ public class Myrsmith extends CardImpl { class MyrsmithEffect extends OneShotEffect { public MyrsmithEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); staticText = "you may pay {1}. If you do, put a 1/1 colorless Myr artifact creature token onto the battlefield"; } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/NecrogenCenser.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/NecrogenCenser.java index 230bb392fd7..6e0da25a538 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/NecrogenCenser.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/NecrogenCenser.java @@ -29,9 +29,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/NecrogenScudder.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/NecrogenScudder.java index a1d4a842769..61f6d2ae7a7 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/NecrogenScudder.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/NecrogenScudder.java @@ -29,8 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LoseLifeSourceEffect; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Necropede.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Necropede.java index c888652e541..ad6ed39e333 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Necropede.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Necropede.java @@ -29,8 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/NecroticOoze.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/NecroticOoze.java index afc6f0a4410..2823cb723d4 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/NecroticOoze.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/NecroticOoze.java @@ -28,13 +28,13 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.ActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/NeurokInvisimancer.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/NeurokInvisimancer.java index e5e4b97ebd0..28402842ca5 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/NeurokInvisimancer.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/NeurokInvisimancer.java @@ -29,8 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/NeurokReplica.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/NeurokReplica.java index 7b749559afd..d573b27ea97 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/NeurokReplica.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/NeurokReplica.java @@ -28,9 +28,9 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/NihilSpellbomb.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/NihilSpellbomb.java index a834754ec0f..f37b70e6a94 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/NihilSpellbomb.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/NihilSpellbomb.java @@ -29,10 +29,10 @@ package mage.sets.scarsofmirrodin; import java.util.ArrayList; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/NimDeathmantle.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/NimDeathmantle.java index 830c5a7514f..c397b68cc63 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/NimDeathmantle.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/NimDeathmantle.java @@ -27,9 +27,7 @@ */ package mage.sets.scarsofmirrodin; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -66,13 +64,13 @@ public class NimDeathmantle extends CardImpl { this.expansionSetCode = "SOM"; this.subtype.add("Equipment"); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(4))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(4))); // Equipped creature gets +2/+2, has intimidate, and is a black Zombie. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(IntimidateAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new SetCardColorAttachedEffect(ObjectColor.BLACK, Constants.Duration.WhileOnBattlefield, Constants.AttachmentType.EQUIPMENT))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new SetCardSubtypeAttachedEffect("Zombie", Constants.Duration.WhileOnBattlefield, Constants.AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(IntimidateAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SetCardColorAttachedEffect(ObjectColor.BLACK, Duration.WhileOnBattlefield, AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SetCardSubtypeAttachedEffect("Zombie", Duration.WhileOnBattlefield, AttachmentType.EQUIPMENT))); // Whenever a nontoken creature is put into your graveyard from the battlefield, you may pay {4}. If you do, return that card to the battlefield and attach Nim Deathmantle to it. this.addAbility(new NimDeathmantleTriggeredAbility()); @@ -91,7 +89,7 @@ public class NimDeathmantle extends CardImpl { class NimDeathmantleTriggeredAbility extends TriggeredAbilityImpl { NimDeathmantleTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new NimDeathmantleEffect(), true); + super(Zone.BATTLEFIELD, new NimDeathmantleEffect(), true); } NimDeathmantleTriggeredAbility(NimDeathmantleTriggeredAbility ability) { @@ -111,7 +109,7 @@ class NimDeathmantleTriggeredAbility extends TriggeredAbilityImpl { private final Cost cost = new GenericManaCost(4); public NimDeathmantleEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); } @@ -157,16 +155,16 @@ class NimDeathmantleEffect extends OneShotEffect { Player player = game.getPlayer(source.getControllerId()); Permanent equipment = game.getPermanent(source.getSourceId()); if (player != null && equipment != null) { - if (player.chooseUse(Constants.Outcome.Benefit, equipment.getName() + " - Pay " + cost.getText() + "?", game)) { + if (player.chooseUse(Outcome.Benefit, equipment.getName() + " - Pay " + cost.getText() + "?", game)) { cost.clearPaid(); if (cost.pay(source, game, source.getId(), source.getControllerId(), false)) { UUID target = targetPointer.getFirst(game, source); if (target != null && equipment != null) { Card card = game.getCard(target); // check if it's still in graveyard - if (card != null && game.getState().getZone(card.getId()).equals(Constants.Zone.GRAVEYARD)) { + if (card != null && game.getState().getZone(card.getId()).equals(Zone.GRAVEYARD)) { Player owner = game.getPlayer(card.getOwnerId()); - if (card.putOntoBattlefield(game, Constants.Zone.GRAVEYARD, source.getId(), source.getControllerId())) { + if (card.putOntoBattlefield(game, Zone.GRAVEYARD, source.getId(), source.getControllerId())) { Permanent permanent = game.getPermanent(card.getId()); if (permanent != null) { permanent.addAttachment(equipment.getId(), game); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/OgreGeargrabber.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/OgreGeargrabber.java index b960fd48a27..653eb431de4 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/OgreGeargrabber.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/OgreGeargrabber.java @@ -28,11 +28,11 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/OriginSpellbomb.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/OriginSpellbomb.java index 0f4cc306a19..46ca4757268 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/OriginSpellbomb.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/OriginSpellbomb.java @@ -29,9 +29,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/OxiddaDaredevil.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/OxiddaDaredevil.java index 1f4570c18c1..2106f785d2d 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/OxiddaDaredevil.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/OxiddaDaredevil.java @@ -28,10 +28,10 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/OxiddaScrapmelter.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/OxiddaScrapmelter.java index 7f02333315b..6960bca39f7 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/OxiddaScrapmelter.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/OxiddaScrapmelter.java @@ -28,8 +28,8 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/PainfulQuandary.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/PainfulQuandary.java index a57bacc8309..d4d3d0b9dd3 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/PainfulQuandary.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/PainfulQuandary.java @@ -28,10 +28,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.Cost; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Painsmith.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Painsmith.java index 3204d43ff8b..6cd95f08927 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Painsmith.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Painsmith.java @@ -29,9 +29,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.common.continious.BoostTargetEffect; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/PalladiumMyr.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/PalladiumMyr.java index 32700c2dadf..9a4382138dd 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/PalladiumMyr.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/PalladiumMyr.java @@ -28,8 +28,8 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.effects.common.BasicManaEffect; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/PanicSpellbomb.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/PanicSpellbomb.java index d2c3ab45286..02b9d061ce6 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/PanicSpellbomb.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/PanicSpellbomb.java @@ -28,10 +28,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/PerilousMyr.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/PerilousMyr.java index 7573748a84c..bf32efd0ec9 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/PerilousMyr.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/PerilousMyr.java @@ -29,8 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/PlagueStinger.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/PlagueStinger.java index bf248cfc0ba..3634e3008fd 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/PlagueStinger.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/PlagueStinger.java @@ -28,8 +28,8 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.InfectAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/PlatedSeastrider.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/PlatedSeastrider.java index 25aace2914d..df2feb2e44d 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/PlatedSeastrider.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/PlatedSeastrider.java @@ -28,8 +28,8 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/PlatinumEmperion.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/PlatinumEmperion.java index a9cdf88664d..8b11d1c44ab 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/PlatinumEmperion.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/PlatinumEmperion.java @@ -27,13 +27,14 @@ */ package mage.sets.scarsofmirrodin; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.LifeTotalCantChangeControllerEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import java.util.UUID; @@ -52,7 +53,7 @@ public class PlatinumEmperion extends CardImpl { this.toughness = new MageInt(8); // Your life total can't change. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new LifeTotalCantChangeControllerEffect(Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LifeTotalCantChangeControllerEffect(Duration.WhileOnBattlefield))); } public PlatinumEmperion(final PlatinumEmperion card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/PrecursorGolem.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/PrecursorGolem.java index 665599538d1..822ca636578 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/PrecursorGolem.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/PrecursorGolem.java @@ -27,9 +27,8 @@ */ package mage.sets.scarsofmirrodin; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -39,6 +38,8 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -94,7 +95,7 @@ class PrecursorGolemCopyTriggeredAbility extends TriggeredAbilityImpl { private class QuicksilverGargantuanCopyEffect extends ContinuousEffectImpl { public QuicksilverGargantuanCopyEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Layer.CopyEffects_1, Constants.SubLayer.NA, Constants.Outcome.BecomeCreature); + super(Duration.WhileOnBattlefield, Layer.CopyEffects_1, SubLayer.NA, Outcome.BecomeCreature); staticText = "You may have {this} enter the battlefield as a copy of any creature on the battlefield, except it's still 7/7"; } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/RatchetBomb.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/RatchetBomb.java index 6a9fc246fd9..72d2efb2fe1 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/RatchetBomb.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/RatchetBomb.java @@ -30,10 +30,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -41,6 +40,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -72,7 +72,7 @@ public class RatchetBomb extends CardImpl { class RatchetBombEffect extends OneShotEffect { public RatchetBombEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); staticText = "Destroy each nonland permanent with converted mana cost equal to the number of charge counters on {this}"; } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/RazorHippogriff.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/RazorHippogriff.java index 1054edfb19a..2ca9901b3b3 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/RazorHippogriff.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/RazorHippogriff.java @@ -30,10 +30,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -42,6 +41,7 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.common.FilterArtifactCard; import mage.game.Game; import mage.players.Player; @@ -86,7 +86,7 @@ public class RazorHippogriff extends CardImpl { public class RazorHippogriffGainLifeEffect extends OneShotEffect { public RazorHippogriffGainLifeEffect() { - super(Constants.Outcome.GainLife); + super(Outcome.GainLife); staticText = "you gain life equal to that card's converted mana cost."; } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/RazorfieldThresher.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/RazorfieldThresher.java index 00cc9008291..0890c92b1fa 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/RazorfieldThresher.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/RazorfieldThresher.java @@ -28,8 +28,8 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/RazorvergeThicket.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/RazorvergeThicket.java index 33094a17bb1..5d1a70b7fd3 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/RazorvergeThicket.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/RazorvergeThicket.java @@ -29,8 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/RelicPutrescence.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/RelicPutrescence.java index fba03f8a18d..5de36b017c1 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/RelicPutrescence.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/RelicPutrescence.java @@ -30,16 +30,16 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.counter.AddCountersControllerEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; @@ -61,7 +61,7 @@ public class RelicPutrescence extends CardImpl { this.color.setBlack(true); TargetPermanent auraTarget = new TargetArtifactPermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Detriment)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); this.addAbility(new RelicPutrescenceAbility()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/RevokeExistence.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/RevokeExistence.java index ece63e7a69b..c69f2a2ee05 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/RevokeExistence.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/RevokeExistence.java @@ -28,8 +28,8 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Riddlesmith.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Riddlesmith.java index fad5a6e39f1..2c153de8534 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Riddlesmith.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Riddlesmith.java @@ -29,8 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.common.DrawDiscardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/RustTick.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/RustTick.java index ce22abf8024..684f513e002 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/RustTick.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/RustTick.java @@ -28,10 +28,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/RustedRelic.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/RustedRelic.java index ebf46c3ffb9..762739c3dc4 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/RustedRelic.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/RustedRelic.java @@ -30,11 +30,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; @@ -74,7 +73,7 @@ class RustedRelicToken extends Token { public RustedRelicToken() { super("Rusted Relic", "a 5/5 Golem artifact creature"); - cardType.add(Constants.CardType.CREATURE); + cardType.add(CardType.CREATURE); subtype.add("Golem"); power = new MageInt(5); toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SaberclawGolem.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SaberclawGolem.java index 515994205e6..1619e67290d 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SaberclawGolem.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SaberclawGolem.java @@ -28,10 +28,10 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SalvageScout.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SalvageScout.java index 7592ad5ce89..f2458074b13 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SalvageScout.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SalvageScout.java @@ -28,9 +28,9 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ScoriaElemental.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ScoriaElemental.java index 41d2759d265..656243a6650 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ScoriaElemental.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ScoriaElemental.java @@ -28,8 +28,8 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ScrapdiverSerpent.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ScrapdiverSerpent.java index 6b43b172511..9e6ba06af99 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ScrapdiverSerpent.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ScrapdiverSerpent.java @@ -30,9 +30,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.DefendingPlayerControlsCondition; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ScreechingSilcaw.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ScreechingSilcaw.java index 2466bded570..65bd65443d3 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ScreechingSilcaw.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ScreechingSilcaw.java @@ -27,8 +27,8 @@ */ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SeachromeCoast.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SeachromeCoast.java index acfb25e03d6..33797c865a6 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SeachromeCoast.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SeachromeCoast.java @@ -29,8 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SeizeTheInitiative.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SeizeTheInitiative.java index 5ce0d9876c2..e0f2d25d98f 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SeizeTheInitiative.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SeizeTheInitiative.java @@ -28,9 +28,9 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SemblanceAnvil.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SemblanceAnvil.java index 0f6bc68df90..a1619b78b67 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SemblanceAnvil.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SemblanceAnvil.java @@ -27,9 +27,7 @@ */ package mage.sets.scarsofmirrodin; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -64,7 +62,7 @@ public class SemblanceAnvil extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new SemblanceAnvilEffect(), true)); // Spells you cast that share a card type with the exiled card cost {2} less to cast. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new SemblanceAnvilCostReductionEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SemblanceAnvilCostReductionEffect())); } public SemblanceAnvil(final SemblanceAnvil card) { @@ -82,7 +80,7 @@ class SemblanceAnvilEffect extends OneShotEffect { private static FilterCard filter = new FilterNonlandCard(); public SemblanceAnvilEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "exile a nonland card from your hand"; } @@ -94,8 +92,8 @@ class SemblanceAnvilEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); if (player.getHand().size() > 0) { - TargetCard target = new TargetCard(Constants.Zone.HAND, filter); - player.choose(Constants.Outcome.Benefit, player.getHand(), target, game); + TargetCard target = new TargetCard(Zone.HAND, filter); + player.choose(Outcome.Benefit, player.getHand(), target, game); Card card = player.getHand().get(target.getFirstTarget(), game); if (card != null) { card.moveToExile(getId(), "Semblance Anvil (Imprint)", source.getSourceId(), game); @@ -121,7 +119,7 @@ class SemblanceAnvilCostReductionEffect extends CostModificationEffectImpl { private class ShapeAnewEffect extends OneShotEffect { public ShapeAnewEffect() { - super(Constants.Outcome.PutCardInPlay); + super(Outcome.PutCardInPlay); staticText = "Then reveals cards from the top of his or her library until he or she reveals an artifact card. That player puts that card onto the battlefield, then shuffles all other cards revealed this way into his or her library"; } @@ -90,7 +91,7 @@ public class ShapeAnew extends CardImpl { @Override public boolean apply(Game game, Ability source) { - Permanent sourcePermanent = (Permanent) game.getLastKnownInformation(targetPointer.getFirst(game, source), Constants.Zone.BATTLEFIELD); + Permanent sourcePermanent = (Permanent) game.getLastKnownInformation(targetPointer.getFirst(game, source), Zone.BATTLEFIELD); if (sourcePermanent == null) { return false; } @@ -112,7 +113,7 @@ public class ShapeAnew extends CardImpl { } player.revealCards("Shape Anew", revealed, game); if (artifactCard != null) { - artifactCard.putOntoBattlefield(game, Constants.Zone.LIBRARY, source.getId(), player.getId()); + artifactCard.putOntoBattlefield(game, Zone.LIBRARY, source.getId(), player.getId()); } player.getLibrary().addAll(nonArtifactCards.getCards(game), game); player.shuffleLibrary(game); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Skinrender.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Skinrender.java index eb7b3d8e8fc..b7d277bfc03 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Skinrender.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Skinrender.java @@ -30,9 +30,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SkithiryxTheBlightDragon.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SkithiryxTheBlightDragon.java index 39641dda060..fae6d5f51c3 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SkithiryxTheBlightDragon.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SkithiryxTheBlightDragon.java @@ -29,10 +29,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SkyEelSchool.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SkyEelSchool.java index d760c4da402..70a3fa9ade2 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SkyEelSchool.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SkyEelSchool.java @@ -29,8 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DrawDiscardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SliceinTwain.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SliceinTwain.java index 8245e9868a2..f5fb1877bd5 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SliceinTwain.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SliceinTwain.java @@ -29,8 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SnapsailGlider.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SnapsailGlider.java index b51d6e0c4ec..4cf4e701fc2 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SnapsailGlider.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SnapsailGlider.java @@ -28,10 +28,10 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Soliton.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Soliton.java index f3533ca8855..0755c53a656 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Soliton.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Soliton.java @@ -28,9 +28,9 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SoulParry.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SoulParry.java index 659704bfc22..6bc9ae47631 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SoulParry.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SoulParry.java @@ -29,9 +29,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.PreventDamageFromTargetEffect; import mage.cards.CardImpl; import mage.target.Target; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SpikeshotElder.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SpikeshotElder.java index a2eb6df95f5..d2a9d30cba6 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SpikeshotElder.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SpikeshotElder.java @@ -30,16 +30,16 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -76,7 +76,7 @@ public class SpikeshotElder extends CardImpl { class SpikeshotElderEffect extends OneShotEffect { public SpikeshotElderEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "{this} deals damage equal to its power to target creature or player"; } @@ -88,7 +88,7 @@ class SpikeshotElderEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Permanent sourcePermanent = game.getPermanent(source.getSourceId()); if (sourcePermanent == null) { - sourcePermanent = (Permanent) game.getLastKnownInformation(source.getSourceId(), Constants.Zone.BATTLEFIELD); + sourcePermanent = (Permanent) game.getLastKnownInformation(source.getSourceId(), Zone.BATTLEFIELD); } if (sourcePermanent == null) { return false; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SteadyProgress.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SteadyProgress.java index d6f18da0f34..28b0ef3db24 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SteadyProgress.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SteadyProgress.java @@ -29,8 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.counter.ProliferateEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SteelHellkite.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SteelHellkite.java index d7837065ae9..d75cb031ee9 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SteelHellkite.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SteelHellkite.java @@ -27,10 +27,7 @@ */ package mage.sets.scarsofmirrodin; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.WatcherScope; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateOncePerTurnActivatedAbility; @@ -67,9 +64,9 @@ public class SteelHellkite extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {2}: Steel Hellkite gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Constants.Duration.EndOfTurn), new GenericManaCost(2))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(2))); // {X}: Destroy each nonland permanent with converted mana cost X whose controller was dealt combat damage by Steel Hellkite this turn. Activate this ability only once each turn. - this.addAbility(new ActivateOncePerTurnActivatedAbility(Constants.Zone.BATTLEFIELD, new SteelHellkiteDestroyEffect(), new ManaCostsImpl("{X}"))); + this.addAbility(new ActivateOncePerTurnActivatedAbility(Zone.BATTLEFIELD, new SteelHellkiteDestroyEffect(), new ManaCostsImpl("{X}"))); this.addWatcher(new SteelHellkiteWatcher()); } @@ -87,7 +84,7 @@ public class SteelHellkite extends CardImpl { class SteelHellkiteDestroyEffect extends OneShotEffect { public SteelHellkiteDestroyEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); staticText = "Destroy each nonland permanent with converted mana cost X whose controller was dealt combat damage by Steel Hellkite this turn"; } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/StoicRebuttal.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/StoicRebuttal.java index a27c61ec68a..3481aab4ea9 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/StoicRebuttal.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/StoicRebuttal.java @@ -28,8 +28,8 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.condition.common.MetalcraftCondition; import mage.abilities.effects.common.CounterTargetEffect; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/StrataScythe.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/StrataScythe.java index 76fa46423ac..093c0ec2e58 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/StrataScythe.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/StrataScythe.java @@ -30,9 +30,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +42,8 @@ import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterLandCard; import mage.filter.predicate.mageobject.NamePredicate; @@ -62,8 +63,8 @@ public class StrataScythe extends CardImpl { this.expansionSetCode = "SOM"; this.subtype.add("Equipment"); this.addAbility(new EntersBattlefieldTriggeredAbility(new StrataScytheImprintEffect())); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(SameNameAsExiledCountValue.getInstance(), SameNameAsExiledCountValue.getInstance()))); - this.addAbility(new EquipAbility(Constants.Outcome.BoostCreature, new GenericManaCost(3))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(SameNameAsExiledCountValue.getInstance(), SameNameAsExiledCountValue.getInstance()))); + this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(3))); } public StrataScythe (final StrataScythe card) { @@ -79,7 +80,7 @@ public class StrataScythe extends CardImpl { class StrataScytheImprintEffect extends OneShotEffect { StrataScytheImprintEffect() { - super(Constants.Outcome.Exile); + super(Outcome.Exile); staticText = "search your library for a land card, exile it, then shuffle your library"; } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/StriderHarness.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/StriderHarness.java index 6f0b9a66170..2db11da8c03 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/StriderHarness.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/StriderHarness.java @@ -30,10 +30,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; @@ -41,6 +40,8 @@ import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.AttachmentType; +import mage.constants.Outcome; /** * @@ -52,8 +53,8 @@ public class StriderHarness extends CardImpl { super(ownerId, 207, "Strider Harness", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "SOM"; this.subtype.add("Equipment"); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(1))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HasteAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.EQUIPMENT))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SunblastAngel.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SunblastAngel.java index 692c0548471..381c982b010 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SunblastAngel.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SunblastAngel.java @@ -29,8 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DestroyAllEffect; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SunspearShikari.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SunspearShikari.java index 0ceb30e18fc..3df99230cbf 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SunspearShikari.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SunspearShikari.java @@ -28,9 +28,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EquippedCondition; @@ -39,6 +39,7 @@ import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -60,9 +61,9 @@ public class SunspearShikari extends CardImpl { this.toughness = new MageInt(2); ConditionalContinousEffect effect1 = new ConditionalContinousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), EquippedCondition.getInstance(), rule1); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect1)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect1)); ConditionalContinousEffect effect2 = new ConditionalContinousEffect(new GainAbilitySourceEffect(LifelinkAbility.getInstance()), EquippedCondition.getInstance(), rule2); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect2)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect2)); } public SunspearShikari(final SunspearShikari card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SwordOfBodyAndMind.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SwordOfBodyAndMind.java index 5a0f8a08005..5594c67535b 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SwordOfBodyAndMind.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SwordOfBodyAndMind.java @@ -28,11 +28,11 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SylvokLifestaff.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SylvokLifestaff.java index ad9fece23ee..1349cdbf4c1 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SylvokLifestaff.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SylvokLifestaff.java @@ -28,10 +28,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.DiesAttachedTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SylvokReplica.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SylvokReplica.java index 7103d0eee36..16c9157aa2c 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SylvokReplica.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SylvokReplica.java @@ -29,9 +29,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TaintedStrike.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TaintedStrike.java index e6aa9312f42..78a1ef5875a 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TaintedStrike.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TaintedStrike.java @@ -29,9 +29,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.InfectAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TangleAngler.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TangleAngler.java index 5e0c8fccc80..06576576a8a 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TangleAngler.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TangleAngler.java @@ -28,9 +28,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladDefiance.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladDefiance.java index c3e46d04a38..45d3b24cbe5 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladDefiance.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladDefiance.java @@ -28,12 +28,12 @@ package mage.sets.scarsofmirrodin; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.continious.GainProtectionFromTypeTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterArtifactCard; import mage.target.common.TargetCreaturePermanent; @@ -48,7 +48,7 @@ public class TelJiladDefiance extends CardImpl { super(ownerId, 129, "Tel-Jilad Defiance", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "SOM"; this.color.setGreen(true); - this.getSpellAbility().addEffect(new GainProtectionFromTypeTargetEffect(Constants.Duration.EndOfTurn, new FilterArtifactCard("artifacts"))); + this.getSpellAbility().addEffect(new GainProtectionFromTypeTargetEffect(Duration.EndOfTurn, new FilterArtifactCard("artifacts"))); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladFallen.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladFallen.java index 24a19360e5e..54303ab5750 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladFallen.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladFallen.java @@ -29,8 +29,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.InfectAbility; import mage.abilities.keyword.ProtectionAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TemperedSteel.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TemperedSteel.java index e08a1177c3d..aceae1995b8 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TemperedSteel.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TemperedSteel.java @@ -30,13 +30,13 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -55,7 +55,7 @@ public class TemperedSteel extends CardImpl { super(ownerId, 24, "Tempered Steel", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}{W}"); this.expansionSetCode = "SOM"; this.color.setWhite(true); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, false))); } public TemperedSteel (final TemperedSteel card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ThroneofGeth.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ThroneofGeth.java index c25f7c90a80..6f0aafb76e5 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ThroneofGeth.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ThroneofGeth.java @@ -29,9 +29,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Thrummingbird.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Thrummingbird.java index 469d7e7da90..c05ea4e79af 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Thrummingbird.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Thrummingbird.java @@ -30,8 +30,8 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.counter.ProliferateEffect; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TowerOfCalamities.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TowerOfCalamities.java index 2f2eea04f44..31b48e6d598 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TowerOfCalamities.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TowerOfCalamities.java @@ -28,9 +28,9 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfCorruption.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfCorruption.java index 27b2c9930e4..807006494f6 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfCorruption.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfCorruption.java @@ -28,9 +28,9 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfInfestation.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfInfestation.java index 36e4db55aa6..0065101578f 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfInfestation.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfInfestation.java @@ -28,9 +28,9 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.Costs; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfMending.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfMending.java index 97356b71a21..ec5a9f0751f 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfMending.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfMending.java @@ -28,9 +28,9 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.Costs; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfRage.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfRage.java index ad4f76fb2da..681d1a7e02c 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfRage.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfRage.java @@ -28,10 +28,10 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfThought.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfThought.java index d85dde42351..86a6e31a201 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfThought.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfThought.java @@ -28,9 +28,9 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.Costs; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrinketMage.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrinketMage.java index a34b4e47577..1205e830c79 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrinketMage.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrinketMage.java @@ -28,8 +28,8 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.SearchEffect; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrueConviction.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrueConviction.java index 4a2e93501d7..8d694a29f4a 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrueConviction.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrueConviction.java @@ -30,15 +30,15 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.DoubleStrikeAbility; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; /** @@ -52,8 +52,8 @@ public class TrueConviction extends CardImpl { this.expansionSetCode = "SOM"; this.color.setWhite(true); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent()))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityControlledEffect(LifelinkAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent()))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent()))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(LifelinkAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent()))); } public TrueConviction (final TrueConviction card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TumbleMagnet.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TumbleMagnet.java index 37ff7dd7cfd..83b2c0ad415 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TumbleMagnet.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TumbleMagnet.java @@ -29,9 +29,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TunnelIgnus.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TunnelIgnus.java index e5ab51328fa..1ddb91c3a46 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TunnelIgnus.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TunnelIgnus.java @@ -31,14 +31,15 @@ package mage.sets.scarsofmirrodin; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -46,7 +47,7 @@ import mage.target.targetpointer.FixedTarget; import mage.watchers.WatcherImpl; import java.util.UUID; -import mage.Constants.WatcherScope; +import mage.constants.WatcherScope; /** * @author Loki @@ -117,7 +118,7 @@ class TunnelIgnusWatcher extends WatcherImpl { class TunnelIgnusTriggeredAbility extends TriggeredAbilityImpl { TunnelIgnusTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(3)); + super(Zone.BATTLEFIELD, new DamageTargetEffect(3)); } TunnelIgnusTriggeredAbility(final TunnelIgnusTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnAside.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnAside.java index e46f1341034..977e1eb04f2 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnAside.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnAside.java @@ -28,12 +28,12 @@ package mage.sets.scarsofmirrodin; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.Filter; import mage.filter.FilterSpell; import mage.game.Game; @@ -92,7 +92,7 @@ public class TurnAside extends CardImpl { public CustomTargetSpell(int minNumTargets, int maxNumTargets, FilterSpell filter) { this.minNumberOfTargets = minNumTargets; this.maxNumberOfTargets = maxNumTargets; - this.zone = Constants.Zone.STACK; + this.zone = Zone.STACK; this.filter = filter; this.targetName = filter.getMessage(); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnToSlag.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnToSlag.java index afa8d5423b9..a9a8388e4bb 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnToSlag.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnToSlag.java @@ -32,12 +32,12 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; @@ -69,7 +69,7 @@ public class TurnToSlag extends CardImpl { class TurnToSlagEffect extends OneShotEffect { public TurnToSlagEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); staticText = "{this} deals 5 damage to target creature. Destroy all Equipment attached to that creature"; } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TwistedImage.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TwistedImage.java index e4953258747..5564bcbbf09 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TwistedImage.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TwistedImage.java @@ -30,12 +30,12 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.continious.SwitchPowerToughnessTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -48,7 +48,7 @@ public class TwistedImage extends CardImpl { super(ownerId, 50, "Twisted Image", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "SOM"; this.color.setBlue(true); - this.getSpellAbility().addEffect(new SwitchPowerToughnessTargetEffect(Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new SwitchPowerToughnessTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/UntamedMight.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/UntamedMight.java index c3e53754e98..53bf1587df5 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/UntamedMight.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/UntamedMight.java @@ -28,12 +28,12 @@ package mage.sets.scarsofmirrodin; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -48,7 +48,7 @@ public class UntamedMight extends CardImpl { this.expansionSetCode = "SOM"; this.color.setGreen(true); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - this.getSpellAbility().addEffect(new BoostTargetEffect(new ManacostVariableValue(), new ManacostVariableValue(), Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(new ManacostVariableValue(), new ManacostVariableValue(), Duration.EndOfTurn)); } public UntamedMight(final UntamedMight card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VaultSkyward.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VaultSkyward.java index 49f0391f604..ccf40e4d137 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VaultSkyward.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VaultSkyward.java @@ -29,9 +29,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VectorAsp.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VectorAsp.java index 67c44fd9fb9..8cd727ca3f6 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VectorAsp.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VectorAsp.java @@ -29,10 +29,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VedalkenCertarch.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VedalkenCertarch.java index 78b6c8a8fa2..2c0d06fa2ff 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VedalkenCertarch.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VedalkenCertarch.java @@ -29,9 +29,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.MetalcraftActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VenserTheSojourner.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VenserTheSojourner.java index 8e170906211..35f9c7d6752 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VenserTheSojourner.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VenserTheSojourner.java @@ -29,11 +29,11 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.TriggeredAbilityImpl; @@ -47,6 +47,7 @@ import mage.abilities.effects.common.ReturnFromExileEffect; import mage.abilities.effects.common.UnblockableAllEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.filter.FilterSpell; import mage.filter.common.FilterCreaturePermanent; @@ -102,7 +103,7 @@ class VenserTheSojournerEffect extends OneShotEffect { private static final String effectText = "Exile target permanent you own. Return it to the battlefield under your control at the beginning of the next end step"; VenserTheSojournerEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = effectText; } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VensersJournal.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VensersJournal.java index d06594c9068..f35996483da 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VensersJournal.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VensersJournal.java @@ -28,11 +28,11 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.CardsInControllerHandCount; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VigilForTheLost.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VigilForTheLost.java index a58e1fe3647..56f975d8f2d 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VigilForTheLost.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VigilForTheLost.java @@ -30,15 +30,15 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -104,7 +104,7 @@ class VigilForTheLostTriggeredAbility extends TriggeredAbilityImpl { VigilForTheLostEffect() { - super(Constants.Outcome.GainLife); + super(Outcome.GainLife); staticText = "you may pay {X}. If you do, you gain X life"; } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ViridianRevel.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ViridianRevel.java index bfbea5762c0..9b16c39db80 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ViridianRevel.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ViridianRevel.java @@ -30,13 +30,13 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -66,7 +66,7 @@ public class ViridianRevel extends CardImpl { class ViridianRevelTriggeredAbility extends TriggeredAbilityImpl { ViridianRevelTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), true); + super(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), true); } ViridianRevelTriggeredAbility(final ViridianRevelTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VolitionReins.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VolitionReins.java index 7900b5309c7..91c25d008f0 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VolitionReins.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VolitionReins.java @@ -28,10 +28,9 @@ package mage.sets.scarsofmirrodin; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +39,7 @@ import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continious.ControlEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -59,7 +59,7 @@ public class VolitionReins extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Detriment)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); @@ -78,7 +78,7 @@ public class VolitionReins extends CardImpl { public class UntapVolitionReinsEffect extends OneShotEffect { public UntapVolitionReinsEffect() { - super(Constants.Outcome.Untap); + super(Outcome.Untap); staticText = "if enchanted permanent is tapped, untap it"; } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VulshokHeartstoker.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VulshokHeartstoker.java index 2a59676d6b7..9af9d20a266 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VulshokHeartstoker.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VulshokHeartstoker.java @@ -29,9 +29,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VulshokReplica.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VulshokReplica.java index 2d7fed8c8b3..66af6c567f7 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VulshokReplica.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VulshokReplica.java @@ -29,9 +29,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/WallOfTanglecord.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/WallOfTanglecord.java index 56893b1a3da..c59decd587f 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/WallOfTanglecord.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/WallOfTanglecord.java @@ -29,10 +29,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/WhitesunsPassage.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/WhitesunsPassage.java index f0646eff09f..ce2bacf5bbd 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/WhitesunsPassage.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/WhitesunsPassage.java @@ -28,8 +28,8 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/WingPuncture.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/WingPuncture.java index c219344cda0..0ba846769c4 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/WingPuncture.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/WingPuncture.java @@ -28,10 +28,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/WithstandDeath.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/WithstandDeath.java index e018c10dbd0..dfc41f02467 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/WithstandDeath.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/WithstandDeath.java @@ -29,9 +29,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.IndestructibleAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/WurmcoilEngine.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/WurmcoilEngine.java index 753d75c9b8a..914453aada0 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/WurmcoilEngine.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/WurmcoilEngine.java @@ -28,8 +28,8 @@ package mage.sets.scarsofmirrodin; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/scourge/AstralSteel.java b/Mage.Sets/src/mage/sets/scourge/AstralSteel.java index af83901bc5d..109d59ddcbc 100644 --- a/Mage.Sets/src/mage/sets/scourge/AstralSteel.java +++ b/Mage.Sets/src/mage/sets/scourge/AstralSteel.java @@ -28,12 +28,13 @@ package mage.sets.scourge; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.StormAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -50,7 +51,7 @@ public class AstralSteel extends CardImpl { // Target creature gets +1/+2 until end of turn. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - this.getSpellAbility().addEffect(new BoostTargetEffect(1, 2, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(1, 2, Duration.EndOfTurn)); // Storm this.addAbility(new StormAbility()); } diff --git a/Mage.Sets/src/mage/sets/scourge/BrainFreeze.java b/Mage.Sets/src/mage/sets/scourge/BrainFreeze.java index 0ccac1cd182..01ae9807924 100644 --- a/Mage.Sets/src/mage/sets/scourge/BrainFreeze.java +++ b/Mage.Sets/src/mage/sets/scourge/BrainFreeze.java @@ -28,8 +28,8 @@ package mage.sets.scourge; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.abilities.keyword.StormAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scourge/CarrionFeeder.java b/Mage.Sets/src/mage/sets/scourge/CarrionFeeder.java index 23367cf197e..7f3ab0787dd 100644 --- a/Mage.Sets/src/mage/sets/scourge/CarrionFeeder.java +++ b/Mage.Sets/src/mage/sets/scourge/CarrionFeeder.java @@ -28,9 +28,9 @@ package mage.sets.scourge; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/scourge/ChartoothCougar.java b/Mage.Sets/src/mage/sets/scourge/ChartoothCougar.java index 7c0c9216b50..5970fb560a1 100644 --- a/Mage.Sets/src/mage/sets/scourge/ChartoothCougar.java +++ b/Mage.Sets/src/mage/sets/scourge/ChartoothCougar.java @@ -28,15 +28,17 @@ package mage.sets.scourge; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.MountaincyclingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -55,7 +57,7 @@ public class ChartoothCougar extends CardImpl { this.toughness = new MageInt(4); // {R}: Chartooth Cougar gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Constants.Duration.EndOfTurn), new ManaCostsImpl("{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}"))); // Mountaincycling {2} this.addAbility(new MountaincyclingAbility(new ManaCostsImpl("{2}"))); } diff --git a/Mage.Sets/src/mage/sets/scourge/DaruWarchief.java b/Mage.Sets/src/mage/sets/scourge/DaruWarchief.java index c9feac3f085..2ecc29b2f5d 100644 --- a/Mage.Sets/src/mage/sets/scourge/DaruWarchief.java +++ b/Mage.Sets/src/mage/sets/scourge/DaruWarchief.java @@ -28,10 +28,10 @@ package mage.sets.scourge; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; diff --git a/Mage.Sets/src/mage/sets/scourge/DayOfTheDragons.java b/Mage.Sets/src/mage/sets/scourge/DayOfTheDragons.java index 3579f5048c3..6edad1f009e 100644 --- a/Mage.Sets/src/mage/sets/scourge/DayOfTheDragons.java +++ b/Mage.Sets/src/mage/sets/scourge/DayOfTheDragons.java @@ -28,10 +28,8 @@ package mage.sets.scourge; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.*; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -89,7 +87,7 @@ class DayOfTheDragonsEntersEffect extends OneShotEffect { this.toughness = new MageInt(5); // {tap}: Add {G}{G}{G} to your mana pool. - this.addAbility(new SimpleManaAbility(Constants.Zone.BATTLEFIELD, Mana.GreenMana(3), new TapSourceCost())); + this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(3), new TapSourceCost())); // Forestcycling {2} this.addAbility(new ForestcyclingAbility(new ManaCostsImpl("{2}"))); } diff --git a/Mage.Sets/src/mage/sets/scourge/EternalDragon.java b/Mage.Sets/src/mage/sets/scourge/EternalDragon.java index 22ef0d17365..ab904338ec1 100644 --- a/Mage.Sets/src/mage/sets/scourge/EternalDragon.java +++ b/Mage.Sets/src/mage/sets/scourge/EternalDragon.java @@ -29,9 +29,8 @@ package mage.sets.scourge; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,7 @@ import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.PlainscyclingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -61,7 +61,7 @@ public class EternalDragon extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {3}{W}{W}: Return Eternal Dragon from your graveyard to your hand. Activate this ability only during your upkeep. - Ability ability = new SimpleActivatedAbility(Constants.Zone.GRAVEYARD, new ReturnToHandSourceEffect(), new ManaCostsImpl("{3}{W}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnToHandSourceEffect(), new ManaCostsImpl("{3}{W}{W}")); ability.addCost(new OnlyDuringUpkeepCost()); this.addAbility(ability); // PlainscyclingAbility {2} diff --git a/Mage.Sets/src/mage/sets/scourge/GoblinWarchief.java b/Mage.Sets/src/mage/sets/scourge/GoblinWarchief.java index e2ccfe733f7..bd9d469d51d 100644 --- a/Mage.Sets/src/mage/sets/scourge/GoblinWarchief.java +++ b/Mage.Sets/src/mage/sets/scourge/GoblinWarchief.java @@ -28,10 +28,10 @@ package mage.sets.scourge; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; diff --git a/Mage.Sets/src/mage/sets/scourge/HinderingTouch.java b/Mage.Sets/src/mage/sets/scourge/HinderingTouch.java index 971cb982b38..039714dbb9c 100644 --- a/Mage.Sets/src/mage/sets/scourge/HinderingTouch.java +++ b/Mage.Sets/src/mage/sets/scourge/HinderingTouch.java @@ -28,8 +28,8 @@ package mage.sets.scourge; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.abilities.keyword.StormAbility; diff --git a/Mage.Sets/src/mage/sets/scourge/HuntingPack.java b/Mage.Sets/src/mage/sets/scourge/HuntingPack.java index d10514fecce..e2b33b99d61 100644 --- a/Mage.Sets/src/mage/sets/scourge/HuntingPack.java +++ b/Mage.Sets/src/mage/sets/scourge/HuntingPack.java @@ -28,8 +28,8 @@ package mage.sets.scourge; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.StormAbility; diff --git a/Mage.Sets/src/mage/sets/scourge/KrosanWarchief.java b/Mage.Sets/src/mage/sets/scourge/KrosanWarchief.java index a75ccdcec18..d293587ea15 100644 --- a/Mage.Sets/src/mage/sets/scourge/KrosanWarchief.java +++ b/Mage.Sets/src/mage/sets/scourge/KrosanWarchief.java @@ -28,9 +28,9 @@ package mage.sets.scourge; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/scourge/NobleTemplar.java b/Mage.Sets/src/mage/sets/scourge/NobleTemplar.java index 7045ea1d218..bf52231d133 100644 --- a/Mage.Sets/src/mage/sets/scourge/NobleTemplar.java +++ b/Mage.Sets/src/mage/sets/scourge/NobleTemplar.java @@ -28,8 +28,8 @@ package mage.sets.scourge; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.PlainscyclingAbility; diff --git a/Mage.Sets/src/mage/sets/scourge/ReapingTheGraves.java b/Mage.Sets/src/mage/sets/scourge/ReapingTheGraves.java index ed0d58f432b..7e839e4d98c 100644 --- a/Mage.Sets/src/mage/sets/scourge/ReapingTheGraves.java +++ b/Mage.Sets/src/mage/sets/scourge/ReapingTheGraves.java @@ -28,8 +28,8 @@ package mage.sets.scourge; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.StormAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scourge/Scattershot.java b/Mage.Sets/src/mage/sets/scourge/Scattershot.java index 0a80c428d45..9d064a77bc9 100644 --- a/Mage.Sets/src/mage/sets/scourge/Scattershot.java +++ b/Mage.Sets/src/mage/sets/scourge/Scattershot.java @@ -28,8 +28,8 @@ package mage.sets.scourge; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.StormAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scourge/ShorelineRanger.java b/Mage.Sets/src/mage/sets/scourge/ShorelineRanger.java index 17326a678fa..9028f63d533 100644 --- a/Mage.Sets/src/mage/sets/scourge/ShorelineRanger.java +++ b/Mage.Sets/src/mage/sets/scourge/ShorelineRanger.java @@ -28,8 +28,8 @@ package mage.sets.scourge; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/scourge/SproutingVines.java b/Mage.Sets/src/mage/sets/scourge/SproutingVines.java index 93acdb8913a..9b5c0610be5 100644 --- a/Mage.Sets/src/mage/sets/scourge/SproutingVines.java +++ b/Mage.Sets/src/mage/sets/scourge/SproutingVines.java @@ -28,8 +28,8 @@ package mage.sets.scourge; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.abilities.keyword.StormAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scourge/Stifle.java b/Mage.Sets/src/mage/sets/scourge/Stifle.java index 9dee07b7ad2..30dcb8bc453 100644 --- a/Mage.Sets/src/mage/sets/scourge/Stifle.java +++ b/Mage.Sets/src/mage/sets/scourge/Stifle.java @@ -28,8 +28,8 @@ package mage.sets.scourge; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetActivatedOrTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/scourge/TemporalFissure.java b/Mage.Sets/src/mage/sets/scourge/TemporalFissure.java index fa7e6b1d0f3..57b4a2282f6 100644 --- a/Mage.Sets/src/mage/sets/scourge/TemporalFissure.java +++ b/Mage.Sets/src/mage/sets/scourge/TemporalFissure.java @@ -28,8 +28,8 @@ package mage.sets.scourge; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.StormAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scourge/TendrilsOfAgony.java b/Mage.Sets/src/mage/sets/scourge/TendrilsOfAgony.java index 5c6af40b8d5..e1b420de23a 100644 --- a/Mage.Sets/src/mage/sets/scourge/TendrilsOfAgony.java +++ b/Mage.Sets/src/mage/sets/scourge/TendrilsOfAgony.java @@ -28,8 +28,8 @@ package mage.sets.scourge; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.abilities.keyword.StormAbility; diff --git a/Mage.Sets/src/mage/sets/scourge/TwistedAbomination.java b/Mage.Sets/src/mage/sets/scourge/TwistedAbomination.java index a9db8fbafa3..78803257c37 100644 --- a/Mage.Sets/src/mage/sets/scourge/TwistedAbomination.java +++ b/Mage.Sets/src/mage/sets/scourge/TwistedAbomination.java @@ -28,7 +28,7 @@ package mage.sets.scourge; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/scourge/WingShards.java b/Mage.Sets/src/mage/sets/scourge/WingShards.java index bb12e1203f1..fad8307294c 100644 --- a/Mage.Sets/src/mage/sets/scourge/WingShards.java +++ b/Mage.Sets/src/mage/sets/scourge/WingShards.java @@ -28,8 +28,8 @@ package mage.sets.scourge; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.SacrificeEffect; import mage.abilities.keyword.StormAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scourge/WirewoodGuardian.java b/Mage.Sets/src/mage/sets/scourge/WirewoodGuardian.java index b18e03e2922..96c6fb731ef 100644 --- a/Mage.Sets/src/mage/sets/scourge/WirewoodGuardian.java +++ b/Mage.Sets/src/mage/sets/scourge/WirewoodGuardian.java @@ -28,8 +28,8 @@ package mage.sets.scourge; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.ForestcyclingAbility; diff --git a/Mage.Sets/src/mage/sets/scourge/WirewoodSymbiote.java b/Mage.Sets/src/mage/sets/scourge/WirewoodSymbiote.java index c5268bf324f..e64854be26d 100644 --- a/Mage.Sets/src/mage/sets/scourge/WirewoodSymbiote.java +++ b/Mage.Sets/src/mage/sets/scourge/WirewoodSymbiote.java @@ -28,9 +28,9 @@ package mage.sets.scourge; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateOncePerTurnActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/seventhedition/AladdinsRing.java b/Mage.Sets/src/mage/sets/seventhedition/AladdinsRing.java index a874abd4916..0833562b524 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/AladdinsRing.java +++ b/Mage.Sets/src/mage/sets/seventhedition/AladdinsRing.java @@ -28,15 +28,16 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; /** @@ -50,7 +51,7 @@ public class AladdinsRing extends CardImpl { this.expansionSetCode = "7ED"; // {8}, {tap}: Aladdin's Ring deals 4 damage to target creature or player. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(4), new ManaCostsImpl("{8}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new ManaCostsImpl("{8}")); ability.addTarget(new TargetCreatureOrPlayer()); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/seventhedition/Befoul.java b/Mage.Sets/src/mage/sets/seventhedition/Befoul.java index f294070dc95..b6d5b48ddaf 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/Befoul.java +++ b/Mage.Sets/src/mage/sets/seventhedition/Befoul.java @@ -28,7 +28,7 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/seventhedition/CityOfBrass.java b/Mage.Sets/src/mage/sets/seventhedition/CityOfBrass.java index 096ef183332..7e2d8ed75ad 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/CityOfBrass.java +++ b/Mage.Sets/src/mage/sets/seventhedition/CityOfBrass.java @@ -28,8 +28,8 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.BecomesTappedTriggeredAbility; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.mana.AnyColorManaAbility; diff --git a/Mage.Sets/src/mage/sets/seventhedition/Corrupt.java b/Mage.Sets/src/mage/sets/seventhedition/Corrupt.java index 18fb9a1bd8a..d0a09f98ead 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/Corrupt.java +++ b/Mage.Sets/src/mage/sets/seventhedition/Corrupt.java @@ -28,7 +28,7 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/seventhedition/DisruptingScepter.java b/Mage.Sets/src/mage/sets/seventhedition/DisruptingScepter.java index a94cf775126..0e93cf3d919 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/DisruptingScepter.java +++ b/Mage.Sets/src/mage/sets/seventhedition/DisruptingScepter.java @@ -28,15 +28,16 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DiscardTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetPlayer; /** @@ -50,7 +51,7 @@ public class DisruptingScepter extends CardImpl { this.expansionSetCode = "7ED"; // {3}, {tap}: Target player discards a card. Activate this ability only during your turn. - Ability ability = new ActivateAsSorceryActivatedAbility(Constants.Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl("{3}")); + Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl("{3}")); ability.addTarget(new TargetPlayer()); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/seventhedition/EagerCadet.java b/Mage.Sets/src/mage/sets/seventhedition/EagerCadet.java index c0ee3b83055..395c7b5e88d 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/EagerCadet.java +++ b/Mage.Sets/src/mage/sets/seventhedition/EagerCadet.java @@ -28,8 +28,8 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/seventhedition/ElvishLyrist.java b/Mage.Sets/src/mage/sets/seventhedition/ElvishLyrist.java index b07b3d11a6c..e155672eef8 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/ElvishLyrist.java +++ b/Mage.Sets/src/mage/sets/seventhedition/ElvishLyrist.java @@ -28,7 +28,7 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/seventhedition/FallenAngel.java b/Mage.Sets/src/mage/sets/seventhedition/FallenAngel.java index 9dcab63f469..4925741019d 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/FallenAngel.java +++ b/Mage.Sets/src/mage/sets/seventhedition/FallenAngel.java @@ -28,15 +28,17 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -57,7 +59,7 @@ public class FallenAngel extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Sacrifice a creature: Fallen Angel gets +2/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(2, 1, Constants.Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 1, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); } public FallenAngel(final FallenAngel card) { diff --git a/Mage.Sets/src/mage/sets/seventhedition/FireElemental.java b/Mage.Sets/src/mage/sets/seventhedition/FireElemental.java index d569282efeb..142516c5883 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/FireElemental.java +++ b/Mage.Sets/src/mage/sets/seventhedition/FireElemental.java @@ -28,7 +28,7 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/seventhedition/FlyingCarpet.java b/Mage.Sets/src/mage/sets/seventhedition/FlyingCarpet.java index 70b7a08dba3..932526ba5aa 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/FlyingCarpet.java +++ b/Mage.Sets/src/mage/sets/seventhedition/FlyingCarpet.java @@ -28,9 +28,9 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -38,6 +38,8 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -51,7 +53,7 @@ public class FlyingCarpet extends CardImpl { this.expansionSetCode = "7ED"; // {2}, {tap}: Target creature gains flying until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn), new ManaCostsImpl("{2}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{2}")); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/seventhedition/GiantOctopus.java b/Mage.Sets/src/mage/sets/seventhedition/GiantOctopus.java index e0e1dae1e30..46bfd0c18d5 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/GiantOctopus.java +++ b/Mage.Sets/src/mage/sets/seventhedition/GiantOctopus.java @@ -28,9 +28,11 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants; + import mage.MageInt; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; /** * @@ -39,7 +41,7 @@ import mage.cards.CardImpl; public class GiantOctopus extends CardImpl { public GiantOctopus(UUID ownerId) { - super(ownerId, 77, "Giant Octopus", Constants.Rarity.COMMON, new Constants.CardType[]{Constants.CardType.CREATURE}, "{3}{U}"); + super(ownerId, 77, "Giant Octopus", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{U}"); this.expansionSetCode = "7ED"; this.subtype.add("Octopus"); diff --git a/Mage.Sets/src/mage/sets/seventhedition/GoblinGlider.java b/Mage.Sets/src/mage/sets/seventhedition/GoblinGlider.java index e4867f79f30..94347ebc8de 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/GoblinGlider.java +++ b/Mage.Sets/src/mage/sets/seventhedition/GoblinGlider.java @@ -28,8 +28,8 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/seventhedition/GoblinMatron.java b/Mage.Sets/src/mage/sets/seventhedition/GoblinMatron.java index d50e311c180..44bd7abbd11 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/GoblinMatron.java +++ b/Mage.Sets/src/mage/sets/seventhedition/GoblinMatron.java @@ -28,7 +28,7 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/seventhedition/GoblinWarDrums.java b/Mage.Sets/src/mage/sets/seventhedition/GoblinWarDrums.java index cb44d41ee9d..a177fb09b58 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/GoblinWarDrums.java +++ b/Mage.Sets/src/mage/sets/seventhedition/GoblinWarDrums.java @@ -28,7 +28,7 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/seventhedition/HealingSalve.java b/Mage.Sets/src/mage/sets/seventhedition/HealingSalve.java index c17215c687e..b28c5de8013 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/HealingSalve.java +++ b/Mage.Sets/src/mage/sets/seventhedition/HealingSalve.java @@ -28,13 +28,14 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Mode; import mage.abilities.effects.common.GainLifeTargetEffect; import mage.abilities.effects.common.PreventDamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.TargetPlayer; import mage.target.common.TargetCreatureOrPlayer; @@ -55,7 +56,7 @@ public class HealingSalve extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer()); Mode mode = new Mode(); - mode.getEffects().add(new PreventDamageTargetEffect(Constants.Duration.EndOfTurn, 3)); + mode.getEffects().add(new PreventDamageTargetEffect(Duration.EndOfTurn, 3)); mode.getTargets().add(new TargetCreatureOrPlayer()); this.getSpellAbility().addMode(mode); diff --git a/Mage.Sets/src/mage/sets/seventhedition/InfernalContract.java b/Mage.Sets/src/mage/sets/seventhedition/InfernalContract.java index 417a14b1e79..a664e957a0b 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/InfernalContract.java +++ b/Mage.Sets/src/mage/sets/seventhedition/InfernalContract.java @@ -28,9 +28,9 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/seventhedition/KnightErrant.java b/Mage.Sets/src/mage/sets/seventhedition/KnightErrant.java index 72fa99123c5..a6f18412c23 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/KnightErrant.java +++ b/Mage.Sets/src/mage/sets/seventhedition/KnightErrant.java @@ -28,8 +28,8 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/seventhedition/LoneWolf.java b/Mage.Sets/src/mage/sets/seventhedition/LoneWolf.java index 65cc585f7ca..6d30332b48e 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/LoneWolf.java +++ b/Mage.Sets/src/mage/sets/seventhedition/LoneWolf.java @@ -28,7 +28,7 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/seventhedition/MemoryLapse.java b/Mage.Sets/src/mage/sets/seventhedition/MemoryLapse.java index 4ab8f52155a..294739f03b8 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/MemoryLapse.java +++ b/Mage.Sets/src/mage/sets/seventhedition/MemoryLapse.java @@ -27,11 +27,11 @@ */ package mage.sets.seventhedition; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetWithReplacementEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetSpell; import java.util.UUID; @@ -49,7 +49,7 @@ public class MemoryLapse extends CardImpl { this.color.setBlue(true); // Counter target spell. If that spell is countered this way, put it on top of its owner's library instead of into that player's graveyard. - this.getSpellAbility().addEffect(new CounterTargetWithReplacementEffect(Constants.Zone.LIBRARY, true)); + this.getSpellAbility().addEffect(new CounterTargetWithReplacementEffect(Zone.LIBRARY, true)); this.getSpellAbility().addTarget(new TargetSpell()); } diff --git a/Mage.Sets/src/mage/sets/seventhedition/MerfolkLooter.java b/Mage.Sets/src/mage/sets/seventhedition/MerfolkLooter.java index 8d7a91a5846..a948466aea6 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/MerfolkLooter.java +++ b/Mage.Sets/src/mage/sets/seventhedition/MerfolkLooter.java @@ -28,7 +28,7 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/seventhedition/MonstrousGrowth.java b/Mage.Sets/src/mage/sets/seventhedition/MonstrousGrowth.java index 3a2887fd465..6aeb1c4e242 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/MonstrousGrowth.java +++ b/Mage.Sets/src/mage/sets/seventhedition/MonstrousGrowth.java @@ -28,11 +28,12 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -48,7 +49,7 @@ public class MonstrousGrowth extends CardImpl { this.color.setGreen(true); // Target creature gets +4/+4 until end of turn. - this.getSpellAbility().addEffect(new BoostTargetEffect(4, 4, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(4, 4, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/seventhedition/Nausea.java b/Mage.Sets/src/mage/sets/seventhedition/Nausea.java index 47927ca2732..e7564d75628 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/Nausea.java +++ b/Mage.Sets/src/mage/sets/seventhedition/Nausea.java @@ -28,11 +28,12 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -47,7 +48,7 @@ public class Nausea extends CardImpl { this.color.setBlack(true); // All creatures get -1/-1 until end of turn. - this.getSpellAbility().addEffect(new BoostAllEffect(-1, -1, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostAllEffect(-1, -1, Duration.EndOfTurn)); } public Nausea(final Nausea card) { diff --git a/Mage.Sets/src/mage/sets/seventhedition/OrcishArtillery.java b/Mage.Sets/src/mage/sets/seventhedition/OrcishArtillery.java index 98f41e3396b..930fca903fe 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/OrcishArtillery.java +++ b/Mage.Sets/src/mage/sets/seventhedition/OrcishArtillery.java @@ -28,9 +28,9 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; /** @@ -57,7 +58,7 @@ public class OrcishArtillery extends CardImpl { this.toughness = new MageInt(3); // {tap}: Orcish Artillery deals 2 damage to target creature or player and 3 damage to you. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); ability.addEffect(new DamageControllerEffect(3)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/seventhedition/PatagiaGolem.java b/Mage.Sets/src/mage/sets/seventhedition/PatagiaGolem.java index 58839668737..ade7352b6a6 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/PatagiaGolem.java +++ b/Mage.Sets/src/mage/sets/seventhedition/PatagiaGolem.java @@ -28,9 +28,9 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +38,8 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -54,7 +56,7 @@ public class PatagiaGolem extends CardImpl { this.toughness = new MageInt(3); // {3}: Patagia Golem gains flying until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn), new ManaCostsImpl("{3}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{3}")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/seventhedition/PhyrexianHulk.java b/Mage.Sets/src/mage/sets/seventhedition/PhyrexianHulk.java index dd4a94a82f2..f9225addb5a 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/PhyrexianHulk.java +++ b/Mage.Sets/src/mage/sets/seventhedition/PhyrexianHulk.java @@ -28,7 +28,7 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/seventhedition/Pillage.java b/Mage.Sets/src/mage/sets/seventhedition/Pillage.java index 2cd1aee6f10..00a5e7c9b33 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/Pillage.java +++ b/Mage.Sets/src/mage/sets/seventhedition/Pillage.java @@ -28,8 +28,8 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/seventhedition/ProdigalSorcerer.java b/Mage.Sets/src/mage/sets/seventhedition/ProdigalSorcerer.java index 6b665f88e59..4847d7fe7e6 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/ProdigalSorcerer.java +++ b/Mage.Sets/src/mage/sets/seventhedition/ProdigalSorcerer.java @@ -28,7 +28,7 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/seventhedition/RaiseDead.java b/Mage.Sets/src/mage/sets/seventhedition/RaiseDead.java index a88e3433072..453c9423a72 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/RaiseDead.java +++ b/Mage.Sets/src/mage/sets/seventhedition/RaiseDead.java @@ -28,8 +28,8 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreatureCard; diff --git a/Mage.Sets/src/mage/sets/seventhedition/SeismicAssault.java b/Mage.Sets/src/mage/sets/seventhedition/SeismicAssault.java index 938ce7ec216..6dcac03e79d 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/SeismicAssault.java +++ b/Mage.Sets/src/mage/sets/seventhedition/SeismicAssault.java @@ -28,9 +28,9 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.DiscardTargetCost; diff --git a/Mage.Sets/src/mage/sets/seventhedition/StealArtifact.java b/Mage.Sets/src/mage/sets/seventhedition/StealArtifact.java index dd3a2537ccb..8396853f13c 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/StealArtifact.java +++ b/Mage.Sets/src/mage/sets/seventhedition/StealArtifact.java @@ -28,10 +28,10 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; diff --git a/Mage.Sets/src/mage/sets/seventhedition/StreamOfLife.java b/Mage.Sets/src/mage/sets/seventhedition/StreamOfLife.java index af1edc9ad30..3086b7653c7 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/StreamOfLife.java +++ b/Mage.Sets/src/mage/sets/seventhedition/StreamOfLife.java @@ -28,8 +28,8 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.GainLifeTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/seventhedition/TrainedOrgg.java b/Mage.Sets/src/mage/sets/seventhedition/TrainedOrgg.java index ff14d0840c0..1da8c076be2 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/TrainedOrgg.java +++ b/Mage.Sets/src/mage/sets/seventhedition/TrainedOrgg.java @@ -28,8 +28,8 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/seventhedition/Vengeance.java b/Mage.Sets/src/mage/sets/seventhedition/Vengeance.java index 103f5043aa9..d54109ba372 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/Vengeance.java +++ b/Mage.Sets/src/mage/sets/seventhedition/Vengeance.java @@ -28,8 +28,8 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/seventhedition/VerduranEnchantress.java b/Mage.Sets/src/mage/sets/seventhedition/VerduranEnchantress.java index eca1545b6c0..6e2e4a6b793 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/VerduranEnchantress.java +++ b/Mage.Sets/src/mage/sets/seventhedition/VerduranEnchantress.java @@ -28,8 +28,8 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/seventhedition/Vizzerdrix.java b/Mage.Sets/src/mage/sets/seventhedition/Vizzerdrix.java index 172fb78c8cd..b30e675ec50 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/Vizzerdrix.java +++ b/Mage.Sets/src/mage/sets/seventhedition/Vizzerdrix.java @@ -28,9 +28,11 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants; + import mage.MageInt; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; /** * @@ -39,7 +41,7 @@ import mage.cards.CardImpl; public class Vizzerdrix extends CardImpl { public Vizzerdrix(UUID ownerId) { - super(ownerId, 110, "Vizzerdrix", Constants.Rarity.RARE, new Constants.CardType[]{Constants.CardType.CREATURE}, "{6}{U}"); + super(ownerId, 110, "Vizzerdrix", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{6}{U}"); this.expansionSetCode = "7ED"; this.subtype.add("Rabbit"); this.subtype.add("Beast"); diff --git a/Mage.Sets/src/mage/sets/seventhedition/WallOfSpears.java b/Mage.Sets/src/mage/sets/seventhedition/WallOfSpears.java index 9edeee54ed3..ab2cc4744a7 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/WallOfSpears.java +++ b/Mage.Sets/src/mage/sets/seventhedition/WallOfSpears.java @@ -28,7 +28,7 @@ package mage.sets.seventhedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/shadowmoor/AphoticWisps.java b/Mage.Sets/src/mage/sets/shadowmoor/AphoticWisps.java index fb35c9c6e11..ef93c342480 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/AphoticWisps.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/AphoticWisps.java @@ -30,15 +30,15 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.effects.common.continious.SetCardColorTargetEffect; import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -53,8 +53,8 @@ public class AphoticWisps extends CardImpl { this.color.setBlack(true); // Target creature becomes black and gains fear until end of turn. (It can't be blocked except by artifact creatures and/or black creatures.) this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - this.getSpellAbility().addEffect(new SetCardColorTargetEffect(ObjectColor.BLACK, Constants.Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FearAbility.getInstance(), Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new SetCardColorTargetEffect(ObjectColor.BLACK, Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FearAbility.getInstance(), Duration.EndOfTurn)); // Draw a card. this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/AshenmoorGouger.java b/Mage.Sets/src/mage/sets/shadowmoor/AshenmoorGouger.java index 217e4283fac..235dfd68e11 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/AshenmoorGouger.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/AshenmoorGouger.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/AuguryAdept.java b/Mage.Sets/src/mage/sets/shadowmoor/AuguryAdept.java index 177510c7df2..28e0beffe55 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/AuguryAdept.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/AuguryAdept.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -40,6 +40,7 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; @@ -100,7 +101,7 @@ class AuguryAdeptEffect extends OneShotEffect { Cards cards = new CardsImpl(); Card card = player.getLibrary().removeFromTop(game); if (card != null) { - card.moveToZone(Constants.Zone.HAND, source.getSourceId(), game, true); + card.moveToZone(Zone.HAND, source.getSourceId(), game, true); int cmc = card.getManaCost().convertedManaCost(); if (cmc > 0) { diff --git a/Mage.Sets/src/mage/sets/shadowmoor/BeseechTheQueen.java b/Mage.Sets/src/mage/sets/shadowmoor/BeseechTheQueen.java index 4f7368c031b..a2fd85b975b 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/BeseechTheQueen.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/BeseechTheQueen.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.Card; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/BlightSickle.java b/Mage.Sets/src/mage/sets/shadowmoor/BlightSickle.java index 507bcbe044e..1a910c1b79b 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/BlightSickle.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/BlightSickle.java @@ -28,11 +28,11 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/BlisteringDieflyn.java b/Mage.Sets/src/mage/sets/shadowmoor/BlisteringDieflyn.java index d168928816a..205d1149789 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/BlisteringDieflyn.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/BlisteringDieflyn.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/BloodmarkMentor.java b/Mage.Sets/src/mage/sets/shadowmoor/BloodmarkMentor.java index 269811790df..4efeaed1294 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/BloodmarkMentor.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/BloodmarkMentor.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/BoartuskLiege.java b/Mage.Sets/src/mage/sets/shadowmoor/BoartuskLiege.java index 061f7b059c4..bd8d7d83852 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/BoartuskLiege.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/BoartuskLiege.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/BoggartRamGang.java b/Mage.Sets/src/mage/sets/shadowmoor/BoggartRamGang.java index 66e4ef86076..204ba4f7db5 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/BoggartRamGang.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/BoggartRamGang.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.WitherAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/BoonReflection.java b/Mage.Sets/src/mage/sets/shadowmoor/BoonReflection.java index 098a0b9e6f0..27f67520817 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/BoonReflection.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/BoonReflection.java @@ -28,9 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; @@ -52,7 +51,7 @@ public class BoonReflection extends CardImpl { this.color.setWhite(true); // If you would gain life, you gain twice that much life instead. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoonReflectionEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoonReflectionEffect())); } public BoonReflection(final BoonReflection card) { @@ -68,7 +67,7 @@ public class BoonReflection extends CardImpl { class BoonReflectionEffect extends ReplacementEffectImpl { public BoonReflectionEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "If you would gain life, you gain twice that much life instead"; } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/CeruleanWisps.java b/Mage.Sets/src/mage/sets/shadowmoor/CeruleanWisps.java index ce7741c4a12..f4c4445f48d 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/CeruleanWisps.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/CeruleanWisps.java @@ -30,14 +30,14 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.continious.SetCardColorTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -52,7 +52,7 @@ public class CeruleanWisps extends CardImpl { this.color.setBlue(true); // Target creature becomes blue until end of turn. Untap that creature. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - this.getSpellAbility().addEffect(new SetCardColorTargetEffect(ObjectColor.BLUE, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new SetCardColorTargetEffect(ObjectColor.BLUE, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new UntapTargetEffect()); // Draw a card. this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Cinderbones.java b/Mage.Sets/src/mage/sets/shadowmoor/Cinderbones.java index 887c452ba58..2072aea1e81 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Cinderbones.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Cinderbones.java @@ -28,9 +28,9 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/CorrosiveMentor.java b/Mage.Sets/src/mage/sets/shadowmoor/CorrosiveMentor.java index 7cfb64c9b63..a5c81c4902b 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/CorrosiveMentor.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/CorrosiveMentor.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Counterbore.java b/Mage.Sets/src/mage/sets/shadowmoor/Counterbore.java index 7a5bb8c1f79..025bab3237c 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Counterbore.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Counterbore.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetAndSearchGraveyardHandLibraryEffect; import mage.cards.CardImpl; import mage.target.TargetSpell; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/CrimsonWisps.java b/Mage.Sets/src/mage/sets/shadowmoor/CrimsonWisps.java index 274693bf6f4..1658db782a7 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/CrimsonWisps.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/CrimsonWisps.java @@ -30,15 +30,15 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.effects.common.continious.SetCardColorTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -53,8 +53,8 @@ public class CrimsonWisps extends CardImpl { this.color.setRed(true); // Target creature becomes red and gains haste until end of turn. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - this.getSpellAbility().addEffect(new SetCardColorTargetEffect(ObjectColor.RED, Constants.Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new SetCardColorTargetEffect(ObjectColor.RED, Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); // Draw a card. this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/CrowdOfCinders.java b/Mage.Sets/src/mage/sets/shadowmoor/CrowdOfCinders.java index 43d5202c572..26f9f26ae44 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/CrowdOfCinders.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/CrowdOfCinders.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/CultbrandCinder.java b/Mage.Sets/src/mage/sets/shadowmoor/CultbrandCinder.java index 148acc2192b..0e14209183b 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/CultbrandCinder.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/CultbrandCinder.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Cursecatcher.java b/Mage.Sets/src/mage/sets/shadowmoor/Cursecatcher.java index 9ee18fb19c7..d17b547ad53 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Cursecatcher.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Cursecatcher.java @@ -28,9 +28,9 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/DawnglowInfusion.java b/Mage.Sets/src/mage/sets/shadowmoor/DawnglowInfusion.java index a9615022da0..21c82dbba7a 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/DawnglowInfusion.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/DawnglowInfusion.java @@ -28,15 +28,16 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.condition.common.ManaWasSpentCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; +import mage.constants.ManaType; /** * @@ -55,10 +56,10 @@ public class DawnglowInfusion extends CardImpl { DynamicValue xValue = new ManacostVariableValue(); this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new GainLifeEffect(xValue), - new ManaWasSpentCondition(Constants.ManaType.GREEN), "You gain X life if {G} was spent to cast {this}")); + new ManaWasSpentCondition(ManaType.GREEN), "You gain X life if {G} was spent to cast {this}")); this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new GainLifeEffect(xValue), - new ManaWasSpentCondition(Constants.ManaType.WHITE), " And X life if {W} was spent to cast it")); + new ManaWasSpentCondition(ManaType.WHITE), " And X life if {W} was spent to cast it")); this.addInfo("Info1", "(Do both if {G}{W} was spent.)"); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/DeepchannelMentor.java b/Mage.Sets/src/mage/sets/shadowmoor/DeepchannelMentor.java index a0dfce78cc9..e4989a3b70f 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/DeepchannelMentor.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/DeepchannelMentor.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/DroveOfElves.java b/Mage.Sets/src/mage/sets/shadowmoor/DroveOfElves.java index ebbb75f2a2e..a5624331a47 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/DroveOfElves.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/DroveOfElves.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ElsewhereFlask.java b/Mage.Sets/src/mage/sets/shadowmoor/ElsewhereFlask.java index 538e5850375..521124046e5 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ElsewhereFlask.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ElsewhereFlask.java @@ -29,9 +29,8 @@ package mage.sets.shadowmoor; import java.util.Set; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -62,7 +61,7 @@ public class ElsewhereFlask extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardControllerEffect(1))); // Sacrifice Elsewhere Flask: Choose a basic land type. Each land you control becomes that type until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ElsewhereFlaskEffect(), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ElsewhereFlaskEffect(), new SacrificeSourceCost())); } public ElsewhereFlask(final ElsewhereFlask card) { @@ -78,7 +77,7 @@ public class ElsewhereFlask extends CardImpl { class ElsewhereFlaskEffect extends OneShotEffect { public ElsewhereFlaskEffect() { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); this.staticText = "Choose a basic land type. Each land you control becomes that type until end of turn"; } @@ -102,7 +101,7 @@ class ElsewhereFlaskEffect extends OneShotEffect { choicesSet.add("Mountain"); choicesSet.add("Island"); choicesSet.add("Swamp"); - if (player.choose(Constants.Outcome.Neutral, choices, game)) { + if (player.choose(Outcome.Neutral, choices, game)) { game.getState().setValue(source.getSourceId().toString() + "_ElsewhereFlask", choices.getChoice()); } game.addEffect(new ElsewhereFlaskContinuousEffect(), source); @@ -117,7 +116,7 @@ class ElsewhereFlaskContinuousEffect extends ContinuousEffectImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Discard Faerie Macabre: Exile up to two target cards from graveyards. - Ability ability = new SimpleActivatedAbility(Constants.Zone.HAND, new ExileTargetEffect(), new DiscardSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.HAND, new ExileTargetEffect(), new DiscardSourceCost()); ability.addTarget(new TargetCardInGraveyard(0, 2, new FilterCard("cards from graveyards"))); this.addAbility(ability); } @@ -81,7 +83,7 @@ public class FaerieMacabre extends CardImpl { class ExileTargetEffect extends OneShotEffect { public ExileTargetEffect() { - super(Constants.Outcome.Exile); + super(Outcome.Exile); } public ExileTargetEffect(final ExileTargetEffect effect) { diff --git a/Mage.Sets/src/mage/sets/shadowmoor/FaerieSwarm.java b/Mage.Sets/src/mage/sets/shadowmoor/FaerieSwarm.java index 11e3c11b731..db946fa1e21 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/FaerieSwarm.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/FaerieSwarm.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/FarhavenElf.java b/Mage.Sets/src/mage/sets/shadowmoor/FarhavenElf.java index c27316ed157..9072949ea7e 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/FarhavenElf.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/FarhavenElf.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/FireLitThicket.java b/Mage.Sets/src/mage/sets/shadowmoor/FireLitThicket.java index 98587567ebe..cbf3d240f99 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/FireLitThicket.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/FireLitThicket.java @@ -28,9 +28,9 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.Mana; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Firespout.java b/Mage.Sets/src/mage/sets/shadowmoor/Firespout.java index 58700bad3e7..1db39ce182a 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Firespout.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Firespout.java @@ -28,9 +28,9 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.ManaType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.ManaType; +import mage.constants.Rarity; import mage.abilities.condition.common.ManaWasSpentCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DamageAllEffect; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/FlameJavelin.java b/Mage.Sets/src/mage/sets/shadowmoor/FlameJavelin.java index 8650e1e4f91..096250bae50 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/FlameJavelin.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/FlameJavelin.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreatureOrPlayer; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/FlowOfIdeas.java b/Mage.Sets/src/mage/sets/shadowmoor/FlowOfIdeas.java index 2367cce4be4..4470dffda94 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/FlowOfIdeas.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/FlowOfIdeas.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/FossilFind.java b/Mage.Sets/src/mage/sets/shadowmoor/FossilFind.java index 9923a96069f..b0655940ca0 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/FossilFind.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/FossilFind.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/FoxfireOak.java b/Mage.Sets/src/mage/sets/shadowmoor/FoxfireOak.java index 6a1a7a03fad..e75d480d535 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/FoxfireOak.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/FoxfireOak.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/FracturingGust.java b/Mage.Sets/src/mage/sets/shadowmoor/FracturingGust.java index 81f20ad3db1..80359976c40 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/FracturingGust.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/FracturingGust.java @@ -28,9 +28,9 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/FulminatorMage.java b/Mage.Sets/src/mage/sets/shadowmoor/FulminatorMage.java index 27376e3e6d9..3a5b93c9924 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/FulminatorMage.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/FulminatorMage.java @@ -28,9 +28,9 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/GlenElendraLiege.java b/Mage.Sets/src/mage/sets/shadowmoor/GlenElendraLiege.java index 7a1e3603c89..fef1355e422 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/GlenElendraLiege.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/GlenElendraLiege.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/GnarledEffigy.java b/Mage.Sets/src/mage/sets/shadowmoor/GnarledEffigy.java index 80d555adf16..8c0065ff9ce 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/GnarledEffigy.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/GnarledEffigy.java @@ -28,9 +28,9 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/GravelgillAxeshark.java b/Mage.Sets/src/mage/sets/shadowmoor/GravelgillAxeshark.java index 3e5f579286b..4c2a019ec8e 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/GravelgillAxeshark.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/GravelgillAxeshark.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.PersistAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/GravelgillDuo.java b/Mage.Sets/src/mage/sets/shadowmoor/GravelgillDuo.java index b19145a859b..898a2f1e057 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/GravelgillDuo.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/GravelgillDuo.java @@ -28,9 +28,9 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SpellCastTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/GravenCairns.java b/Mage.Sets/src/mage/sets/shadowmoor/GravenCairns.java index 1e36cb88325..16a1e5cdffd 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/GravenCairns.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/GravenCairns.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.BasicManaEffect; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/GutturalResponse.java b/Mage.Sets/src/mage/sets/shadowmoor/GutturalResponse.java index 19be1d2daba..4a32fd4f2c1 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/GutturalResponse.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/GutturalResponse.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/HeapDoll.java b/Mage.Sets/src/mage/sets/shadowmoor/HeapDoll.java index 8d2b0a70348..6d1f15dcfcc 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/HeapDoll.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/HeapDoll.java @@ -28,9 +28,9 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/HordeOfBoggarts.java b/Mage.Sets/src/mage/sets/shadowmoor/HordeOfBoggarts.java index 803e5b7bccd..a4b4d69baa4 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/HordeOfBoggarts.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/HordeOfBoggarts.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/HungrySpriggan.java b/Mage.Sets/src/mage/sets/shadowmoor/HungrySpriggan.java index d4d2727a60f..4c91fb574b3 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/HungrySpriggan.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/HungrySpriggan.java @@ -28,9 +28,9 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/IncrementalBlight.java b/Mage.Sets/src/mage/sets/shadowmoor/IncrementalBlight.java index f36c0bdd035..e77291b24bd 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/IncrementalBlight.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/IncrementalBlight.java @@ -28,9 +28,9 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/InkfathomInfiltrator.java b/Mage.Sets/src/mage/sets/shadowmoor/InkfathomInfiltrator.java index 7db04785123..49418857c5a 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/InkfathomInfiltrator.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/InkfathomInfiltrator.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.abilities.keyword.UnblockableAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/JuvenileGloomwidow.java b/Mage.Sets/src/mage/sets/shadowmoor/JuvenileGloomwidow.java index 2d04033a4ed..a094bde27ed 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/JuvenileGloomwidow.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/JuvenileGloomwidow.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.abilities.keyword.WitherAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/KitchenFinks.java b/Mage.Sets/src/mage/sets/shadowmoor/KitchenFinks.java index 816bd633eee..a4cfc1a041a 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/KitchenFinks.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/KitchenFinks.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/KithkinRabble.java b/Mage.Sets/src/mage/sets/shadowmoor/KithkinRabble.java index 7e00a50bed6..1906ee32f1a 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/KithkinRabble.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/KithkinRabble.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/KithkinShielddare.java b/Mage.Sets/src/mage/sets/shadowmoor/KithkinShielddare.java index 10253acd045..bd774bd5842 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/KithkinShielddare.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/KithkinShielddare.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/LeechriddenSwamp.java b/Mage.Sets/src/mage/sets/shadowmoor/LeechriddenSwamp.java index eb92417f076..b9272bbc36f 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/LeechriddenSwamp.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/LeechriddenSwamp.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.Mana; import mage.ObjectColor; import mage.abilities.Ability; @@ -43,6 +43,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; @@ -61,13 +62,13 @@ public class LeechriddenSwamp extends CardImpl { this.subtype.add("Swamp"); // ({tap}: Add {B} to your mana pool.) - this.addAbility(new SimpleManaAbility(Constants.Zone.BATTLEFIELD, Mana.BlackMana, new TapSourceCost())); + this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana, new TapSourceCost())); // Leechridden Swamp enters the battlefield tapped. this.addAbility(new EntersBattlefieldTappedAbility()); // {B}, {tap}: Each opponent loses 1 life. Activate this ability only if you control two or more black permanents. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new LeechriddenSwampLoseLifeEffect(), new ManaCostsImpl("{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LeechriddenSwampLoseLifeEffect(), new ManaCostsImpl("{B}")); ability.addCost(new ControlTwoOrMoreBlackPermanentsCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/LoamdraggerGiant.java b/Mage.Sets/src/mage/sets/shadowmoor/LoamdraggerGiant.java index a204d2cafbe..a4cf34205d3 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/LoamdraggerGiant.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/LoamdraggerGiant.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/LochKorrigan.java b/Mage.Sets/src/mage/sets/shadowmoor/LochKorrigan.java index c523fc3316b..6c996c1c757 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/LochKorrigan.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/LochKorrigan.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/LureboundScarecrow.java b/Mage.Sets/src/mage/sets/shadowmoor/LureboundScarecrow.java index ed8e207e017..f23e4e0e082 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/LureboundScarecrow.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/LureboundScarecrow.java @@ -27,9 +27,8 @@ */ package mage.sets.shadowmoor; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -40,6 +39,8 @@ import mage.abilities.effects.common.SacrificeSourceEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.choices.ChoiceColor; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -82,7 +83,7 @@ public class LureboundScarecrow extends CardImpl { class LureboundScarecrowChooseColorEffect extends OneShotEffect { public LureboundScarecrowChooseColorEffect() { - super(Constants.Outcome.BoostCreature); + super(Outcome.BoostCreature); staticText = "choose a color"; } @@ -97,7 +98,7 @@ class LureboundScarecrowChooseColorEffect extends OneShotEffect { Card card = game.getCard(getTargetPointer().getFirst(game, source)); if (card != null) { Player player = game.getPlayer(source.getControllerId()); - if (player != null && player.chooseUse(Constants.Outcome.Benefit, "Cast " + card.getName() +" without paying cost?", game)) { + if (player != null && player.chooseUse(Outcome.Benefit, "Cast " + card.getName() +" without paying cost?", game)) { player.cast(card.getSpellAbility(), game, true); } } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/MidnightBanshee.java b/Mage.Sets/src/mage/sets/shadowmoor/MidnightBanshee.java index 28044a471bb..808bf4cee74 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/MidnightBanshee.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/MidnightBanshee.java @@ -28,15 +28,16 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersAllEffect; import mage.abilities.keyword.WitherAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -65,7 +66,7 @@ public class MidnightBanshee extends CardImpl { this.addAbility(WitherAbility.getInstance()); // At the beginning of your upkeep, put a -1/-1 counter on each nonblack creature. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersAllEffect(CounterType.M1M1.createInstance(), filter), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersAllEffect(CounterType.M1M1.createInstance(), filter), TargetController.YOU, false)); } public MidnightBanshee(final MidnightBanshee card) { diff --git a/Mage.Sets/src/mage/sets/shadowmoor/MistmeadowSkulk.java b/Mage.Sets/src/mage/sets/shadowmoor/MistmeadowSkulk.java index 309dd52d2e9..6d68bf76622 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/MistmeadowSkulk.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/MistmeadowSkulk.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.LifelinkAbility; import mage.abilities.keyword.ProtectionAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/MistmeadowWitch.java b/Mage.Sets/src/mage/sets/shadowmoor/MistmeadowWitch.java index d7cccc75758..6384c029d43 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/MistmeadowWitch.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/MistmeadowWitch.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/MistveilPlains.java b/Mage.Sets/src/mage/sets/shadowmoor/MistveilPlains.java index fa0ccd984eb..12fdc9a66af 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/MistveilPlains.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/MistveilPlains.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/MurderousRedcap.java b/Mage.Sets/src/mage/sets/shadowmoor/MurderousRedcap.java index 8accfc41be6..c0f05e66008 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/MurderousRedcap.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/MurderousRedcap.java @@ -28,15 +28,17 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.PersistAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -80,7 +82,7 @@ public class MurderousRedcap extends CardImpl { class MurderousRedcapEffect extends OneShotEffect { public MurderousRedcapEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "it deals damage equal to its power to target creature or player"; } @@ -93,7 +95,7 @@ class MurderousRedcapEffect extends OneShotEffect { Permanent sourcePermanent = game.getPermanent(source.getSourceId()); Permanent permanent = game.getPermanent(source.getFirstTarget()); if (sourcePermanent == null) { - sourcePermanent = (Permanent) game.getLastKnownInformation(source.getSourceId(), Constants.Zone.BATTLEFIELD); + sourcePermanent = (Permanent) game.getLastKnownInformation(source.getSourceId(), Zone.BATTLEFIELD); } if (sourcePermanent != null && permanent != null) { permanent.damage(sourcePermanent.getPower().getValue(), sourcePermanent.getId(), game, true, false); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/MysticGate.java b/Mage.Sets/src/mage/sets/shadowmoor/MysticGate.java index 250128b07c7..69653396faf 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/MysticGate.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/MysticGate.java @@ -28,9 +28,9 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.Mana; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/NiveousWisps.java b/Mage.Sets/src/mage/sets/shadowmoor/NiveousWisps.java index c3e28b7d405..561bae31052 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/NiveousWisps.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/NiveousWisps.java @@ -30,14 +30,14 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.TapTargetEffect; import mage.abilities.effects.common.continious.SetCardColorTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -52,7 +52,7 @@ public class NiveousWisps extends CardImpl { this.color.setWhite(true); // Target creature becomes white until end of turn. Tap that creature. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - this.getSpellAbility().addEffect(new SetCardColorTargetEffect(ObjectColor.WHITE, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new SetCardColorTargetEffect(ObjectColor.WHITE, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new TapTargetEffect()); // Draw a card. this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/OldGhastbark.java b/Mage.Sets/src/mage/sets/shadowmoor/OldGhastbark.java index 8032a5d29ea..22d4755228b 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/OldGhastbark.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/OldGhastbark.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/OonasGatewarden.java b/Mage.Sets/src/mage/sets/shadowmoor/OonasGatewarden.java index de226b1c69a..574651688ed 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/OonasGatewarden.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/OonasGatewarden.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/OracleOfNectars.java b/Mage.Sets/src/mage/sets/shadowmoor/OracleOfNectars.java index 0172377be68..8f83c3ae6f0 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/OracleOfNectars.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/OracleOfNectars.java @@ -29,9 +29,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -59,7 +59,7 @@ public class OracleOfNectars extends CardImpl { this.toughness = new MageInt(2); // {X}, {tap}: You gain X life. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainLifeEffect(new ManacostVariableValue()), new ManaCostsImpl("{X}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(new ManacostVariableValue()), new ManaCostsImpl("{X}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/OversoulOfDusk.java b/Mage.Sets/src/mage/sets/shadowmoor/OversoulOfDusk.java index 7ef3c628eb3..0ab17f82651 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/OversoulOfDusk.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/OversoulOfDusk.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.ProtectionAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ParapetWatchers.java b/Mage.Sets/src/mage/sets/shadowmoor/ParapetWatchers.java index 137ddf9ed0f..58d647d9413 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ParapetWatchers.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ParapetWatchers.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Plumeveil.java b/Mage.Sets/src/mage/sets/shadowmoor/Plumeveil.java index 55e8fc7a5eb..fc420e924a1 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Plumeveil.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Plumeveil.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.DefenderAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/PrismaticOmen.java b/Mage.Sets/src/mage/sets/shadowmoor/PrismaticOmen.java index 643edaad99a..08835891ed5 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/PrismaticOmen.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/PrismaticOmen.java @@ -30,13 +30,13 @@ package mage.sets.shadowmoor; import java.util.ArrayList; import java.util.Arrays; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/PrisonTerm.java b/Mage.Sets/src/mage/sets/shadowmoor/PrisonTerm.java index 7041fb8bb0a..dd51faa4559 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/PrisonTerm.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/PrisonTerm.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +40,8 @@ import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.CantBlockAttackActivateAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; @@ -58,7 +60,7 @@ public class PrisonTerm extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("a creature"); static { - filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT)); + filter.add(new ControllerPredicate(TargetController.OPPONENT)); } public PrisonTerm(UUID ownerId) { @@ -71,7 +73,7 @@ public class PrisonTerm extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Detriment)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); @@ -96,7 +98,7 @@ public class PrisonTerm extends CardImpl { class PrisonTermEffect extends OneShotEffect { public PrisonTermEffect() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); } public PrisonTermEffect(final PrisonTermEffect effect) { diff --git a/Mage.Sets/src/mage/sets/shadowmoor/PunctureBolt.java b/Mage.Sets/src/mage/sets/shadowmoor/PunctureBolt.java index 42729db90b4..5ae0b591c00 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/PunctureBolt.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/PunctureBolt.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/PyreCharger.java b/Mage.Sets/src/mage/sets/shadowmoor/PyreCharger.java index 3b0e52a3098..2b594a57529 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/PyreCharger.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/PyreCharger.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/RageReflection.java b/Mage.Sets/src/mage/sets/shadowmoor/RageReflection.java index 5f2cc973b2a..eaf4b6b6b23 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/RageReflection.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/RageReflection.java @@ -28,13 +28,15 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.DoubleStrikeAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; /** @@ -51,7 +53,7 @@ public class RageReflection extends CardImpl { this.color.setRed(true); // Creatures you control have double strike. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Constants.Duration.WhileOnBattlefield, new FilterCreaturePermanent(), false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent(), false))); } public RageReflection(final RageReflection card) { diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ReaperKing.java b/Mage.Sets/src/mage/sets/shadowmoor/ReaperKing.java index e9b0afd1fd7..9860b7abb97 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ReaperKing.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ReaperKing.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Reknit.java b/Mage.Sets/src/mage/sets/shadowmoor/Reknit.java index a3237fc8893..22da3bff9cd 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Reknit.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Reknit.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.RegenerateTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPermanent; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ResplendentMentor.java b/Mage.Sets/src/mage/sets/shadowmoor/ResplendentMentor.java index 1bff582972c..c3fc7b34609 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ResplendentMentor.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ResplendentMentor.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/RevelsongHorn.java b/Mage.Sets/src/mage/sets/shadowmoor/RevelsongHorn.java index 7046f1235ee..9ddb032a8b9 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/RevelsongHorn.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/RevelsongHorn.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.common.TapTargetCost; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/RoughshodMentor.java b/Mage.Sets/src/mage/sets/shadowmoor/RoughshodMentor.java index d7845635615..2c49e6ae5de 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/RoughshodMentor.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/RoughshodMentor.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/RuneCervinRider.java b/Mage.Sets/src/mage/sets/shadowmoor/RuneCervinRider.java index aeb95f01f88..b22803f68bf 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/RuneCervinRider.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/RuneCervinRider.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/RunedHalo.java b/Mage.Sets/src/mage/sets/shadowmoor/RunedHalo.java index edd6a563975..1d175059634 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/RunedHalo.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/RunedHalo.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +43,7 @@ import mage.cards.CardImpl; import mage.cards.repository.CardRepository; import mage.choices.Choice; import mage.choices.ChoiceImpl; +import mage.constants.Outcome; import mage.filter.FilterCard; import mage.filter.FilterObject; import mage.filter.predicate.mageobject.NamePredicate; @@ -85,7 +86,7 @@ public class RunedHalo extends CardImpl { class NameCard extends OneShotEffect { public NameCard() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); staticText = "name a card"; } @@ -100,7 +101,7 @@ class NameCard extends OneShotEffect { Choice cardChoice = new ChoiceImpl(); cardChoice.setChoices(CardRepository.instance.getNames()); cardChoice.clearChoice(); - while (!controller.choose(Constants.Outcome.Detriment, cardChoice, game)) { + while (!controller.choose(Outcome.Detriment, cardChoice, game)) { game.debugMessage("player canceled choosing name. retrying."); } String cardName = cardChoice.getChoice(); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/RustrazorButcher.java b/Mage.Sets/src/mage/sets/shadowmoor/RustrazorButcher.java index 09f86e54ef6..696dcf4d80c 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/RustrazorButcher.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/RustrazorButcher.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.WitherAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SafeholdDuo.java b/Mage.Sets/src/mage/sets/shadowmoor/SafeholdDuo.java index 01498147549..36fe9d15674 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SafeholdDuo.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SafeholdDuo.java @@ -28,9 +28,9 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SpellCastTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SafeholdElite.java b/Mage.Sets/src/mage/sets/shadowmoor/SafeholdElite.java index adb1799fbc3..e991d66c9ed 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SafeholdElite.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SafeholdElite.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.PersistAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SafewrightQuest.java b/Mage.Sets/src/mage/sets/shadowmoor/SafewrightQuest.java index 2453c1f840e..c07daf709f2 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SafewrightQuest.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SafewrightQuest.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.filter.FilterCard; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Scar.java b/Mage.Sets/src/mage/sets/shadowmoor/Scar.java index 715b37671f5..e0d6a4e4f29 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Scar.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Scar.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.counters.CounterType; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ScuzzbackMarauders.java b/Mage.Sets/src/mage/sets/shadowmoor/ScuzzbackMarauders.java index 82aba980630..2dc30ef0673 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ScuzzbackMarauders.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ScuzzbackMarauders.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.PersistAbility; import mage.abilities.keyword.TrampleAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ScuzzbackScrapper.java b/Mage.Sets/src/mage/sets/shadowmoor/ScuzzbackScrapper.java index 33cebba14fd..67aa33d914e 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ScuzzbackScrapper.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ScuzzbackScrapper.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.WitherAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SeedcradleWitch.java b/Mage.Sets/src/mage/sets/shadowmoor/SeedcradleWitch.java index 86b610999ec..6336d288ef3 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SeedcradleWitch.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SeedcradleWitch.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SickleRipper.java b/Mage.Sets/src/mage/sets/shadowmoor/SickleRipper.java index fb20d936264..3e13157b254 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SickleRipper.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SickleRipper.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.WitherAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SlinkingGiant.java b/Mage.Sets/src/mage/sets/shadowmoor/SlinkingGiant.java index 9110ca4a95d..f09d08323f5 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SlinkingGiant.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SlinkingGiant.java @@ -28,9 +28,9 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SmashToSmithereens.java b/Mage.Sets/src/mage/sets/shadowmoor/SmashToSmithereens.java index cede13b4d5b..4187e5b60c1 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SmashToSmithereens.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SmashToSmithereens.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Somnomancer.java b/Mage.Sets/src/mage/sets/shadowmoor/Somnomancer.java index 426820ec00b..e49b8dc28eb 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Somnomancer.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Somnomancer.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.TapTargetEffect; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SootstokeKindler.java b/Mage.Sets/src/mage/sets/shadowmoor/SootstokeKindler.java index e80d0ddd814..f5500f58e6c 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SootstokeKindler.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SootstokeKindler.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SpectralProcession.java b/Mage.Sets/src/mage/sets/shadowmoor/SpectralProcession.java index a8539da111f..db07d92b657 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SpectralProcession.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SpectralProcession.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.game.permanent.token.SpiritWhiteToken; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SpiteflameWitch.java b/Mage.Sets/src/mage/sets/shadowmoor/SpiteflameWitch.java index 3e55ba5a7cf..fc24498837b 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SpiteflameWitch.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SpiteflameWitch.java @@ -28,9 +28,9 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SpitefulVisions.java b/Mage.Sets/src/mage/sets/shadowmoor/SpitefulVisions.java index ad4d7553c6f..5d02013bbe7 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SpitefulVisions.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SpitefulVisions.java @@ -28,9 +28,9 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.TriggeredAbility; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.BeginningOfDrawTriggeredAbility; @@ -38,6 +38,8 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.targetpointer.FixedTarget; @@ -56,7 +58,7 @@ public class SpitefulVisions extends CardImpl { this.color.setBlack(true); // At the beginning of each player's draw step, that player draws an additional card. - this.addAbility(new BeginningOfDrawTriggeredAbility(new DrawCardTargetEffect(1), Constants.TargetController.ANY, false)); + this.addAbility(new BeginningOfDrawTriggeredAbility(new DrawCardTargetEffect(1), TargetController.ANY, false)); // Whenever a player draws a card, Spiteful Visions deals 1 damage to that player. TriggeredAbility triggeredAbility = new SpitefulVisionsTriggeredAbility(new DamageTargetEffect(1), false); @@ -76,7 +78,7 @@ public class SpitefulVisions extends CardImpl { class SpitefulVisionsTriggeredAbility extends TriggeredAbilityImpl { public SpitefulVisionsTriggeredAbility(Effect effect, boolean optional) { - super(Constants.Zone.BATTLEFIELD, effect, optional); + super(Zone.BATTLEFIELD, effect, optional); } public SpitefulVisionsTriggeredAbility(final SpitefulVisionsTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SunkenRuins.java b/Mage.Sets/src/mage/sets/shadowmoor/SunkenRuins.java index 5f0e40aeb96..32448854778 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SunkenRuins.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SunkenRuins.java @@ -28,9 +28,9 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.Mana; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SyggRiverCutthroat.java b/Mage.Sets/src/mage/sets/shadowmoor/SyggRiverCutthroat.java index 46e815931bd..80c56645421 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SyggRiverCutthroat.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SyggRiverCutthroat.java @@ -28,16 +28,17 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.OpponentLostLifeCondition; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; /** * @@ -60,7 +61,7 @@ public class SyggRiverCutthroat extends CardImpl { // At the beginning of each end step, if an opponent lost 3 or more life this turn, you may draw a card. this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), - Constants.TargetController.ANY, + TargetController.ANY, new OpponentLostLifeCondition(Condition.ComparisonType.GreaterThan, 2), true)); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/TattermungeDuo.java b/Mage.Sets/src/mage/sets/shadowmoor/TattermungeDuo.java index 1527f27818b..b2072da3622 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/TattermungeDuo.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/TattermungeDuo.java @@ -28,9 +28,9 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SpellCastTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/TattermungeManiac.java b/Mage.Sets/src/mage/sets/shadowmoor/TattermungeManiac.java index 7b4ec42a571..a7981a3e624 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/TattermungeManiac.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/TattermungeManiac.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ThistledownDuo.java b/Mage.Sets/src/mage/sets/shadowmoor/ThistledownDuo.java index 5338d148e4c..bc568f14cd7 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ThistledownDuo.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ThistledownDuo.java @@ -28,9 +28,9 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SpellCastTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ThistledownLiege.java b/Mage.Sets/src/mage/sets/shadowmoor/ThistledownLiege.java index f334c1c1f88..5e1f775e24d 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ThistledownLiege.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ThistledownLiege.java @@ -28,10 +28,10 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ToilToRenown.java b/Mage.Sets/src/mage/sets/shadowmoor/ToilToRenown.java index bbb58db0605..dc0f6d774c7 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ToilToRenown.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ToilToRenown.java @@ -28,9 +28,9 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/TurnToMist.java b/Mage.Sets/src/mage/sets/shadowmoor/TurnToMist.java index 3f5d76a46cb..0d0aa735f39 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/TurnToMist.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/TurnToMist.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ViridescentWisps.java b/Mage.Sets/src/mage/sets/shadowmoor/ViridescentWisps.java index 41a44d897de..d79a55312b8 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ViridescentWisps.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ViridescentWisps.java @@ -30,14 +30,14 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.SetCardColorTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -52,8 +52,8 @@ public class ViridescentWisps extends CardImpl { this.color.setGreen(true); // Target creature becomes green and gets +1/+0 until end of turn. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - this.getSpellAbility().addEffect(new SetCardColorTargetEffect(ObjectColor.GREEN, Constants.Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new BoostTargetEffect(1,0, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new SetCardColorTargetEffect(ObjectColor.GREEN, Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(1,0, Duration.EndOfTurn)); // Draw a card. this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/WaspLancer.java b/Mage.Sets/src/mage/sets/shadowmoor/WaspLancer.java index 6ff0db6ff09..7a6ac18c05b 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/WaspLancer.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/WaspLancer.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/WildslayerElves.java b/Mage.Sets/src/mage/sets/shadowmoor/WildslayerElves.java index 3a332c220d9..33ba36b9338 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/WildslayerElves.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/WildslayerElves.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.WitherAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/WiltLeafCavaliers.java b/Mage.Sets/src/mage/sets/shadowmoor/WiltLeafCavaliers.java index a23f3d49789..25620f6322e 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/WiltLeafCavaliers.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/WiltLeafCavaliers.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/WoodedBastion.java b/Mage.Sets/src/mage/sets/shadowmoor/WoodedBastion.java index 4e95451e396..10ddcdb331d 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/WoodedBastion.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/WoodedBastion.java @@ -28,9 +28,9 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.Mana; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/WoodfallPrimus.java b/Mage.Sets/src/mage/sets/shadowmoor/WoodfallPrimus.java index 21de2959b8a..5b5891b81f3 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/WoodfallPrimus.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/WoodfallPrimus.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ZealousGuardian.java b/Mage.Sets/src/mage/sets/shadowmoor/ZealousGuardian.java index 79d3c7e1467..aed3a5bb47b 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ZealousGuardian.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ZealousGuardian.java @@ -28,8 +28,8 @@ package mage.sets.shadowmoor; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/AdNauseam.java b/Mage.Sets/src/mage/sets/shardsofalara/AdNauseam.java index 42bbd9e0b55..ebafdbbf1d7 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/AdNauseam.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/AdNauseam.java @@ -28,10 +28,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/AgonyWarp.java b/Mage.Sets/src/mage/sets/shardsofalara/AgonyWarp.java index 1dc05b55b3b..234a75f51ca 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/AgonyWarp.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/AgonyWarp.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/AjaniVengeant.java b/Mage.Sets/src/mage/sets/shardsofalara/AjaniVengeant.java index b9b9b0fe40a..95f692fe852 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/AjaniVengeant.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/AjaniVengeant.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.LoyaltyAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.Effects; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/AkrasanSquire.java b/Mage.Sets/src/mage/sets/shardsofalara/AkrasanSquire.java index 0fc7a89f01a..5dfb8fa6d17 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/AkrasanSquire.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/AkrasanSquire.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ExaltedAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/AlgaeGharial.java b/Mage.Sets/src/mage/sets/shardsofalara/AlgaeGharial.java index 7069c0752d4..932542afd57 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/AlgaeGharial.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/AlgaeGharial.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/AngelicBenediction.java b/Mage.Sets/src/mage/sets/shardsofalara/AngelicBenediction.java index 662f6ce9c3f..80f77a57969 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/AngelicBenediction.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/AngelicBenediction.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.TapTargetEffect; import mage.abilities.keyword.ExaltedAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/AngelsHerald.java b/Mage.Sets/src/mage/sets/shardsofalara/AngelsHerald.java index d6480be40cb..a51538f78e0 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/AngelsHerald.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/AngelsHerald.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Angelsong.java b/Mage.Sets/src/mage/sets/shardsofalara/Angelsong.java index 925275fa1d1..801daf4ab4c 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Angelsong.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Angelsong.java @@ -29,9 +29,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.PreventAllDamageEffect; import mage.abilities.keyword.CyclingAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ArcaneSanctum.java b/Mage.Sets/src/mage/sets/shardsofalara/ArcaneSanctum.java index 8a787941548..02f48825506 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ArcaneSanctum.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ArcaneSanctum.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.BlueManaAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ArchdemonOfUnx.java b/Mage.Sets/src/mage/sets/shardsofalara/ArchdemonOfUnx.java index c49e3f4702d..e1825722b79 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ArchdemonOfUnx.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ArchdemonOfUnx.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -39,6 +39,7 @@ import mage.abilities.effects.common.SacrificeControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -69,7 +70,7 @@ public class ArchdemonOfUnx extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // At the beginning of your upkeep, sacrifice a non-Zombie creature, then put a 2/2 black Zombie creature token onto the battlefield. - Ability ability = new BeginningOfUpkeepTriggeredAbility(new SacrificeControllerEffect(filter, 1, ""), Constants.TargetController.YOU, false); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new SacrificeControllerEffect(filter, 1, ""), TargetController.YOU, false); ability.addEffect(new CreateTokenEffect(new ZombieToken())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BanewaspAffliction.java b/Mage.Sets/src/mage/sets/shardsofalara/BanewaspAffliction.java index c484bb0a720..2f7057dbc81 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BanewaspAffliction.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BanewaspAffliction.java @@ -28,10 +28,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.DiesAttachedTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BantBattlemage.java b/Mage.Sets/src/mage/sets/shardsofalara/BantBattlemage.java index f246a6139e2..f828bdcf68a 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BantBattlemage.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BantBattlemage.java @@ -29,10 +29,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BantCharm.java b/Mage.Sets/src/mage/sets/shardsofalara/BantCharm.java index 27576f67c6b..61cf7a81380 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BantCharm.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BantCharm.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Mode; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BantPanorama.java b/Mage.Sets/src/mage/sets/shardsofalara/BantPanorama.java index efe738fa304..4bf79c91ecf 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BantPanorama.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BantPanorama.java @@ -28,10 +28,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BattlegraceAngel.java b/Mage.Sets/src/mage/sets/shardsofalara/BattlegraceAngel.java index 52f271efdf3..76fc4ce84d1 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BattlegraceAngel.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BattlegraceAngel.java @@ -29,10 +29,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BehemothsHerald.java b/Mage.Sets/src/mage/sets/shardsofalara/BehemothsHerald.java index 7386e254c2b..8a25a39cf44 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BehemothsHerald.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BehemothsHerald.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Blightning.java b/Mage.Sets/src/mage/sets/shardsofalara/Blightning.java index 4285a5eb5a6..e6ef90429d1 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Blightning.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Blightning.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.DiscardTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BlisterBeetle.java b/Mage.Sets/src/mage/sets/shardsofalara/BlisterBeetle.java index ee2dfafff22..272f30bb7b2 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BlisterBeetle.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BlisterBeetle.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BloodCultist.java b/Mage.Sets/src/mage/sets/shardsofalara/BloodCultist.java index f1d8539642c..666152b5742 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BloodCultist.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BloodCultist.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesAndDealtDamageThisTurnTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BloodpyreElemental.java b/Mage.Sets/src/mage/sets/shardsofalara/BloodpyreElemental.java index d6d8925524d..9e06d8903f5 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BloodpyreElemental.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BloodpyreElemental.java @@ -28,15 +28,16 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -55,7 +56,7 @@ public class BloodpyreElemental extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Bloodpyre Elemental: Bloodpyre Elemental deals 4 damage to target creature. Activate this ability only any time you could cast a sorcery. - Ability ability = new ActivateAsSorceryActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(4), new SacrificeSourceCost()); + Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BloodthornTaunter.java b/Mage.Sets/src/mage/sets/shardsofalara/BloodthornTaunter.java index 7a2b5e58913..32c1a24dd49 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BloodthornTaunter.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BloodthornTaunter.java @@ -28,10 +28,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BoneSplinters.java b/Mage.Sets/src/mage/sets/shardsofalara/BoneSplinters.java index 6ec73d757d7..94421580a2e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BoneSplinters.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BoneSplinters.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BranchingBolt.java b/Mage.Sets/src/mage/sets/shardsofalara/BranchingBolt.java index cbb0a8ebeaf..78275104c5f 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BranchingBolt.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BranchingBolt.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BroodmateDragon.java b/Mage.Sets/src/mage/sets/shardsofalara/BroodmateDragon.java index 85d4cbcbc98..6b0fa024005 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BroodmateDragon.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BroodmateDragon.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BullCerodon.java b/Mage.Sets/src/mage/sets/shardsofalara/BullCerodon.java index 0099935d69a..00861c66150 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BullCerodon.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BullCerodon.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.VigilanceAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CalderaHellion.java b/Mage.Sets/src/mage/sets/shardsofalara/CalderaHellion.java index a6686ab1b29..7d7db03a1cb 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CalderaHellion.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CalderaHellion.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DamageAllEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CallToHeel.java b/Mage.Sets/src/mage/sets/shardsofalara/CallToHeel.java index 059bcb0bde7..de0cdf24064 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CallToHeel.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CallToHeel.java @@ -28,10 +28,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CarrionThrash.java b/Mage.Sets/src/mage/sets/shardsofalara/CarrionThrash.java index 09a4765d16f..2784ed8ea77 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CarrionThrash.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CarrionThrash.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CatharticAdept.java b/Mage.Sets/src/mage/sets/shardsofalara/CatharticAdept.java index 4b7ae81426e..f9bd2bfe203 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CatharticAdept.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CatharticAdept.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CavernThoctar.java b/Mage.Sets/src/mage/sets/shardsofalara/CavernThoctar.java index bf494c18034..a628dd2d8b0 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CavernThoctar.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CavernThoctar.java @@ -29,10 +29,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ClarionUltimatum.java b/Mage.Sets/src/mage/sets/shardsofalara/ClarionUltimatum.java index 1b5f5077761..2dc2dac329b 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ClarionUltimatum.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ClarionUltimatum.java @@ -30,10 +30,10 @@ package mage.sets.shardsofalara; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CloudheathDrake.java b/Mage.Sets/src/mage/sets/shardsofalara/CloudheathDrake.java index 765db6a0c15..2f2f4230200 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CloudheathDrake.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CloudheathDrake.java @@ -30,10 +30,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.Zone; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ComaVeil.java b/Mage.Sets/src/mage/sets/shardsofalara/ComaVeil.java index f08a71068e6..bff7b072131 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ComaVeil.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ComaVeil.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.SkipEnchantedUntapEffect; import mage.abilities.keyword.EnchantAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CorpseConnoisseur.java b/Mage.Sets/src/mage/sets/shardsofalara/CorpseConnoisseur.java index 41bac0b6148..0bc47260b00 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CorpseConnoisseur.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CorpseConnoisseur.java @@ -29,9 +29,9 @@ package mage.sets.shardsofalara; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -42,6 +42,8 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.players.Player; @@ -82,7 +84,7 @@ public class CorpseConnoisseur extends CardImpl { class SearchLibraryPutInGraveyard extends SearchEffect { public SearchLibraryPutInGraveyard() { - super(new TargetCardInLibrary(new FilterCreatureCard()), Constants.Outcome.Neutral); + super(new TargetCardInLibrary(new FilterCreatureCard()), Outcome.Neutral); staticText = "search your library for a card and put that card into your graveyard. Then shuffle your library"; } @@ -107,7 +109,7 @@ class SearchLibraryPutInGraveyard extends SearchEffect)target.getTargets()) { Card card = player.getLibrary().remove(cardId, game); if (card != null){ - card.moveToZone(Constants.Zone.GRAVEYARD, source.getId(), game, false); + card.moveToZone(Zone.GRAVEYARD, source.getId(), game, false); } } } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CouriersCapsule.java b/Mage.Sets/src/mage/sets/shardsofalara/CouriersCapsule.java index a65e5ef6efa..a14e0db7e2d 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CouriersCapsule.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CouriersCapsule.java @@ -29,9 +29,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CourtArchers.java b/Mage.Sets/src/mage/sets/shardsofalara/CourtArchers.java index abd554ff258..7b74c31ef90 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CourtArchers.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CourtArchers.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ExaltedAbility; import mage.abilities.keyword.ReachAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CovenantOfMinds.java b/Mage.Sets/src/mage/sets/shardsofalara/CovenantOfMinds.java index 32a249a1315..26e831b3eb9 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CovenantOfMinds.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CovenantOfMinds.java @@ -28,10 +28,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CradleOfVitality.java b/Mage.Sets/src/mage/sets/shardsofalara/CradleOfVitality.java index 863236791dd..e3f141411ac 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CradleOfVitality.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CradleOfVitality.java @@ -28,10 +28,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CrucibleOfFire.java b/Mage.Sets/src/mage/sets/shardsofalara/CrucibleOfFire.java index ad99b71a929..3363b33ee88 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CrucibleOfFire.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CrucibleOfFire.java @@ -28,9 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; @@ -46,7 +45,7 @@ public class CrucibleOfFire extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Dragon creatures"); static { - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(new SubtypePredicate("Dragon")); } @@ -57,7 +56,7 @@ public class CrucibleOfFire extends CardImpl { this.color.setRed(true); // Dragon creatures you control get +3/+3. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(3, 3, Constants.Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(3, 3, Duration.WhileOnBattlefield, filter, false))); } public CrucibleOfFire(final CrucibleOfFire card) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CruelUltimatum.java b/Mage.Sets/src/mage/sets/shardsofalara/CruelUltimatum.java index f20b0f5a27a..3a0a290a783 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CruelUltimatum.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CruelUltimatum.java @@ -28,10 +28,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.*; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CrumblingNecropolis.java b/Mage.Sets/src/mage/sets/shardsofalara/CrumblingNecropolis.java index ffca9b4d642..4e21427e400 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CrumblingNecropolis.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CrumblingNecropolis.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.BlueManaAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CunningLethemancer.java b/Mage.Sets/src/mage/sets/shardsofalara/CunningLethemancer.java index 3cf0aa4a142..8e2930c763c 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CunningLethemancer.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CunningLethemancer.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.effects.common.DiscardEachPlayerEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CylianElf.java b/Mage.Sets/src/mage/sets/shardsofalara/CylianElf.java index b4769e63a72..7e26eaa9767 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CylianElf.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CylianElf.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/DawnrayArcher.java b/Mage.Sets/src/mage/sets/shardsofalara/DawnrayArcher.java index 42d51aee4de..9686d8ada9c 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/DawnrayArcher.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/DawnrayArcher.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +39,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.ExaltedAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetAttackingOrBlockingCreature; /** @@ -60,7 +61,7 @@ public class DawnrayArcher extends CardImpl { // Exalted this.addAbility(new ExaltedAbility()); // {W}, {tap}: Dawnray Archer deals 1 damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{W}")); ability.addTarget(new TargetAttackingOrBlockingCreature()); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/DeathBaron.java b/Mage.Sets/src/mage/sets/shardsofalara/DeathBaron.java index bd0ea5d623f..8a9bc14afbc 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/DeathBaron.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/DeathBaron.java @@ -28,10 +28,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Deathgreeter.java b/Mage.Sets/src/mage/sets/shardsofalara/Deathgreeter.java index 8864f6be0f0..d89050c7acd 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Deathgreeter.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Deathgreeter.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/DeftDuelist.java b/Mage.Sets/src/mage/sets/shardsofalara/DeftDuelist.java index 7606cee72a8..a9fefd2a1b0 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/DeftDuelist.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/DeftDuelist.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.ShroudAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/DemonsHerald.java b/Mage.Sets/src/mage/sets/shardsofalara/DemonsHerald.java index 3a437aa1248..7403ea91175 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/DemonsHerald.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/DemonsHerald.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/DispellersCapsule.java b/Mage.Sets/src/mage/sets/shardsofalara/DispellersCapsule.java index 76e63e6e337..a2715c603f9 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/DispellersCapsule.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/DispellersCapsule.java @@ -30,9 +30,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/DragonFodder.java b/Mage.Sets/src/mage/sets/shardsofalara/DragonFodder.java index ad18a40cfc1..fe5f005ea31 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/DragonFodder.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/DragonFodder.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.game.permanent.token.GoblinToken; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/DragonsHerald.java b/Mage.Sets/src/mage/sets/shardsofalara/DragonsHerald.java index 90e46c394c0..af48ab34a6a 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/DragonsHerald.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/DragonsHerald.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/DregReaver.java b/Mage.Sets/src/mage/sets/shardsofalara/DregReaver.java index f78429324a4..a9aeb18f4a0 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/DregReaver.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/DregReaver.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/DregscapeZombie.java b/Mage.Sets/src/mage/sets/shardsofalara/DregscapeZombie.java index 10c6229589a..cce058284dd 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/DregscapeZombie.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/DregscapeZombie.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.UnearthAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/DruidOfTheAnima.java b/Mage.Sets/src/mage/sets/shardsofalara/DruidOfTheAnima.java index 791cadbf8cc..06b352f0332 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/DruidOfTheAnima.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/DruidOfTheAnima.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.RedManaAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Drumhunter.java b/Mage.Sets/src/mage/sets/shardsofalara/Drumhunter.java index dc5bc3debf4..75e608a4f87 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Drumhunter.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Drumhunter.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ElspethKnightErrant.java b/Mage.Sets/src/mage/sets/shardsofalara/ElspethKnightErrant.java index de3172d2641..4a080853ff4 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ElspethKnightErrant.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ElspethKnightErrant.java @@ -29,10 +29,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.LoyaltyAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ElvishVisionary.java b/Mage.Sets/src/mage/sets/shardsofalara/ElvishVisionary.java index e3de46156cc..395a1a05843 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ElvishVisionary.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ElvishVisionary.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/EmpyrialArchangel.java b/Mage.Sets/src/mage/sets/shardsofalara/EmpyrialArchangel.java index b3c7a248823..508316454b4 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/EmpyrialArchangel.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/EmpyrialArchangel.java @@ -29,9 +29,7 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -64,7 +62,7 @@ public class EmpyrialArchangel extends CardImpl { this.addAbility(FlyingAbility.getInstance()); this.addAbility(ShroudAbility.getInstance()); // All damage that would be dealt to you is dealt to Empyrial Archangel instead. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new EmpyrialArchangelEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EmpyrialArchangelEffect())); } public EmpyrialArchangel(final EmpyrialArchangel card) { @@ -79,7 +77,7 @@ public class EmpyrialArchangel extends CardImpl { class EmpyrialArchangelEffect extends ReplacementEffectImpl { EmpyrialArchangelEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.RedirectDamage); + super(Duration.WhileOnBattlefield, Outcome.RedirectDamage); staticText = "All damage that would be dealt to you is dealt to {this} instead"; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/EsperBattlemage.java b/Mage.Sets/src/mage/sets/shardsofalara/EsperBattlemage.java index 4dee83fde0f..d839f02ad80 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/EsperBattlemage.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/EsperBattlemage.java @@ -28,11 +28,11 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.ColoredManaSymbol; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/EsperCharm.java b/Mage.Sets/src/mage/sets/shardsofalara/EsperCharm.java index d5a78a6df65..914a262b0e7 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/EsperCharm.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/EsperCharm.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Mode; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.DiscardTargetEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/EsperPanorama.java b/Mage.Sets/src/mage/sets/shardsofalara/EsperPanorama.java index 7b1c6dbd93c..b756f82757c 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/EsperPanorama.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/EsperPanorama.java @@ -28,10 +28,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/EtheriumAstrolabe.java b/Mage.Sets/src/mage/sets/shardsofalara/EtheriumAstrolabe.java index 6cc8a14992e..67bcaefdae7 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/EtheriumAstrolabe.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/EtheriumAstrolabe.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -39,6 +39,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledPermanent; @@ -63,7 +64,7 @@ public class EtheriumAstrolabe extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); // {B}, {tap}, Sacrifice an artifact: Draw a card. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new ManaCostsImpl("{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new ManaCostsImpl("{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/EtheriumSculptor.java b/Mage.Sets/src/mage/sets/shardsofalara/EtheriumSculptor.java index ae6b9b46e16..daef726c406 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/EtheriumSculptor.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/EtheriumSculptor.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.cost.SpellsCostReductionEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/EtherswornCanonist.java b/Mage.Sets/src/mage/sets/shardsofalara/EtherswornCanonist.java index da9580d6ead..208f74fca11 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/EtherswornCanonist.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/EtherswornCanonist.java @@ -30,9 +30,8 @@ package mage.sets.shardsofalara; import java.util.HashMap; import java.util.Map; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -61,7 +60,7 @@ public class EtherswornCanonist extends CardImpl { // Each player who has cast a nonartifact spell this turn can't cast additional nonartifact spells. this.addWatcher(new EtherswornCanonistWatcher()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new EtherswornCanonistReplacementEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EtherswornCanonistReplacementEffect())); } public EtherswornCanonist(final EtherswornCanonist card) { @@ -79,7 +78,7 @@ class EtherswornCanonistWatcher extends WatcherImpl { private Map castNonartifactSpell = new HashMap(); public EtherswornCanonistWatcher() { - super("EtherswornCanonistWatcher", Constants.WatcherScope.GAME); + super("EtherswornCanonistWatcher", WatcherScope.GAME); } public EtherswornCanonistWatcher(final EtherswornCanonistWatcher watcher) { @@ -123,7 +122,7 @@ class EtherswornCanonistWatcher extends WatcherImpl { class EtherswornCanonistReplacementEffect extends ReplacementEffectImpl { public EtherswornCanonistReplacementEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Detriment); + super(Duration.WhileOnBattlefield, Outcome.Detriment); staticText = "Each player who has cast a nonartifact spell this turn can't cast additional nonartifact spells"; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Excommunicate.java b/Mage.Sets/src/mage/sets/shardsofalara/Excommunicate.java index 08f7cd70174..5de75007b88 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Excommunicate.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Excommunicate.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ExecutionersCapsule.java b/Mage.Sets/src/mage/sets/shardsofalara/ExecutionersCapsule.java index 92e8d6eb910..1040a033e50 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ExecutionersCapsule.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ExecutionersCapsule.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ExuberantFirestoker.java b/Mage.Sets/src/mage/sets/shardsofalara/ExuberantFirestoker.java index 654c72cb125..407ffdc3d7f 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ExuberantFirestoker.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ExuberantFirestoker.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DamageTargetEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Fatestitcher.java b/Mage.Sets/src/mage/sets/shardsofalara/Fatestitcher.java index b2f43c1e32c..b1d8b89316f 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Fatestitcher.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Fatestitcher.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +39,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.MayTapOrUntapTargetEffect; import mage.abilities.keyword.UnearthAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.TargetPermanent; @@ -65,7 +66,7 @@ public class Fatestitcher extends CardImpl { this.toughness = new MageInt(2); // {tap}: You may tap or untap another target permanent. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); // Unearth {U} diff --git a/Mage.Sets/src/mage/sets/shardsofalara/FeralHydra.java b/Mage.Sets/src/mage/sets/shardsofalara/FeralHydra.java index 362c8ac49cb..3f811312d2d 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/FeralHydra.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/FeralHydra.java @@ -28,9 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -64,8 +63,8 @@ public class FeralHydra extends CardImpl { // Feral Hydra enters the battlefield with X +1/+1 counters on it. this.addAbility(new EntersBattlefieldAbility(new FeralHydraEffect(), true)); // {3}: Put a +1/+1 counter on Feral Hydra. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()) , new ManaCostsImpl("{3}")); - ability.setMayActivate(Constants.TargetController.ANY); + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()) , new ManaCostsImpl("{3}")); + ability.setMayActivate(TargetController.ANY); ability.addEffect(new EmptyEffect("Any player may activate this ability")); this.addAbility(ability); } @@ -84,7 +83,7 @@ public class FeralHydra extends CardImpl { class FeralHydraEffect extends OneShotEffect { public FeralHydraEffect() { - super(Constants.Outcome.BoostCreature); + super(Outcome.BoostCreature); staticText = "{this} enters the battlefield with X +1/+1 counters on it"; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/FiligreeSages.java b/Mage.Sets/src/mage/sets/shardsofalara/FiligreeSages.java index af3bca95348..56e11d3b717 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/FiligreeSages.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/FiligreeSages.java @@ -29,9 +29,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/FireFieldOgre.java b/Mage.Sets/src/mage/sets/shardsofalara/FireFieldOgre.java index aff9643eaf2..54ab137f51b 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/FireFieldOgre.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/FireFieldOgre.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/FlameblastDragon.java b/Mage.Sets/src/mage/sets/shardsofalara/FlameblastDragon.java index cdcc3658840..569637ea6aa 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/FlameblastDragon.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/FlameblastDragon.java @@ -30,9 +30,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -41,6 +40,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -76,7 +76,7 @@ public class FlameblastDragon extends CardImpl { class FlameblastDragonEffect extends OneShotEffect { FlameblastDragonEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "you may pay {X}{R}. If you do, {this} deals X damage to target creature or player"; } @@ -89,7 +89,7 @@ class FlameblastDragonEffect extends OneShotEffect { Player player = game.getPlayer(source.getControllerId()); ManaCosts cost = new ManaCostsImpl("{X}{R}"); if (player != null) { - if (player.chooseUse(Constants.Outcome.Damage, "Pay " + cost.getText() + "? If you do, Flameblast Dragon deals X damage to target creature or player", game)) { + if (player.chooseUse(Outcome.Damage, "Pay " + cost.getText() + "? If you do, Flameblast Dragon deals X damage to target creature or player", game)) { cost.clearPaid(); if (cost.pay(source, game, source.getId(), source.getControllerId(), false)) { int costX = cost.getX(); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/FleshbagMarauder.java b/Mage.Sets/src/mage/sets/shardsofalara/FleshbagMarauder.java index 80772fa5eea..0292b290da2 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/FleshbagMarauder.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/FleshbagMarauder.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.SacrificeAllEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/GiftOfTheGargantuan.java b/Mage.Sets/src/mage/sets/shardsofalara/GiftOfTheGargantuan.java index 08d3aa77397..e22ee111d2b 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/GiftOfTheGargantuan.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/GiftOfTheGargantuan.java @@ -28,10 +28,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/GlazeFiend.java b/Mage.Sets/src/mage/sets/shardsofalara/GlazeFiend.java index af2e8b037ca..e67ea90ffb8 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/GlazeFiend.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/GlazeFiend.java @@ -28,14 +28,16 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.TargetController; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -49,7 +51,7 @@ public class GlazeFiend extends CardImpl { private static final FilterArtifactPermanent filter = new FilterArtifactPermanent("another artifact"); static { filter.add(new AnotherPredicate()); - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public GlazeFiend(UUID ownerId) { @@ -64,7 +66,7 @@ public class GlazeFiend extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Whenever another artifact enters the battlefield under your control, Glaze Fiend gets +2/+2 until end of turn. - this.addAbility(new EntersBattlefieldControlledTriggeredAbility(new BoostSourceEffect(2, 2, Constants.Duration.EndOfTurn), filter)); + this.addAbility(new EntersBattlefieldControlledTriggeredAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), filter)); } public GlazeFiend(final GlazeFiend card) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/GoblinAssault.java b/Mage.Sets/src/mage/sets/shardsofalara/GoblinAssault.java index 7cbfdc5f505..55ee2e63fb3 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/GoblinAssault.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/GoblinAssault.java @@ -28,11 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.*; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -63,7 +60,7 @@ public class GoblinAssault extends CardImpl { // At the beginning of your upkeep, put a 1/1 red Goblin creature token with haste onto the battlefield. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new GoblinAssaultToken()), TargetController.YOU, false)); // Goblin creatures attack each turn if able. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GoblinAssaultEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GoblinAssaultEffect())); } public GoblinAssault(final GoblinAssault card) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/GoblinDeathraiders.java b/Mage.Sets/src/mage/sets/shardsofalara/GoblinDeathraiders.java index 5ce2a2e8cd8..f394b3d5b2a 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/GoblinDeathraiders.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/GoblinDeathraiders.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/GoblinMountaineer.java b/Mage.Sets/src/mage/sets/shardsofalara/GoblinMountaineer.java index c763ca4f076..38d8a7c72c9 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/GoblinMountaineer.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/GoblinMountaineer.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.MountainwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Godsire.java b/Mage.Sets/src/mage/sets/shardsofalara/Godsire.java index 7f625e560a2..a99c1275fad 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Godsire.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Godsire.java @@ -30,15 +30,15 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.permanent.token.Token; /** @@ -57,7 +57,7 @@ public class Godsire extends CardImpl { this.power = new MageInt(8); this.toughness = new MageInt(8); this.addAbility(VigilanceAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new BeastToken()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new BeastToken()), new TapSourceCost())); } public Godsire (final Godsire card) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Godtoucher.java b/Mage.Sets/src/mage/sets/shardsofalara/Godtoucher.java index b452323ffde..27971a92626 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Godtoucher.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Godtoucher.java @@ -28,10 +28,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/GrixisBattlemage.java b/Mage.Sets/src/mage/sets/shardsofalara/GrixisBattlemage.java index 11f38291e6d..1c05176f3e2 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/GrixisBattlemage.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/GrixisBattlemage.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +39,8 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CantBlockTargetEffect; import mage.abilities.effects.common.DrawDiscardControllerEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -58,11 +60,11 @@ public class GrixisBattlemage extends CardImpl { this.toughness = new MageInt(2); // {U}, {tap}: Draw a card, then discard a card. - Ability ability1 = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new ManaCostsImpl("{U}")); + Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new ManaCostsImpl("{U}")); ability1.addCost(new TapSourceCost()); this.addAbility(ability1); // {R}, {tap}: Target creature can't block this turn. - Ability ability2 = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CantBlockTargetEffect(Constants.Duration.EndOfTurn), new ManaCostsImpl("{R}")); + Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{R}")); ability2.addCost(new TapSourceCost()); ability2.addTarget(new TargetCreaturePermanent()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/GrixisCharm.java b/Mage.Sets/src/mage/sets/shardsofalara/GrixisCharm.java index 6f63224b647..c129e49f459 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/GrixisCharm.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/GrixisCharm.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.Mode; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.effects.common.continious.BoostControlledEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/GrixisPanorama.java b/Mage.Sets/src/mage/sets/shardsofalara/GrixisPanorama.java index d1bcc477385..6097f9edb47 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/GrixisPanorama.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/GrixisPanorama.java @@ -28,10 +28,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/GuardiansOfAkrasa.java b/Mage.Sets/src/mage/sets/shardsofalara/GuardiansOfAkrasa.java index 16f0b67bd6e..d524ff0a2f2 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/GuardiansOfAkrasa.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/GuardiansOfAkrasa.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.ExaltedAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/GustriderExuberant.java b/Mage.Sets/src/mage/sets/shardsofalara/GustriderExuberant.java index 46044b6cc53..564c43b696e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/GustriderExuberant.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/GustriderExuberant.java @@ -28,10 +28,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/HellkiteOverlord.java b/Mage.Sets/src/mage/sets/shardsofalara/HellkiteOverlord.java index dc521663dc3..ba558dbbd56 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/HellkiteOverlord.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/HellkiteOverlord.java @@ -29,10 +29,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/HellsThunder.java b/Mage.Sets/src/mage/sets/shardsofalara/HellsThunder.java index bbfdcdd6302..05576cec142 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/HellsThunder.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/HellsThunder.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/HinderingLight.java b/Mage.Sets/src/mage/sets/shardsofalara/HinderingLight.java index 8c60d0a281a..302a2757f82 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/HinderingLight.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/HinderingLight.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/HissingIguanar.java b/Mage.Sets/src/mage/sets/shardsofalara/HissingIguanar.java index 0afac25f236..6d8b6e65bef 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/HissingIguanar.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/HissingIguanar.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ImmortalCoil.java b/Mage.Sets/src/mage/sets/shardsofalara/ImmortalCoil.java index 1df5ad04137..61853b4d4dc 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ImmortalCoil.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ImmortalCoil.java @@ -28,9 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.StateTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -62,11 +61,11 @@ public class ImmortalCoil extends CardImpl { this.color.setBlack(true); // {tap}, Exile two cards from your graveyard: Draw a card. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new TapSourceCost()); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(2, new FilterCard("cards from your graveyard")))); this.addAbility(ability); // If damage would be dealt to you, prevent that damage. Exile a card from your graveyard for each 1 damage prevented this way. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new PreventAllDamageToControllerEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventAllDamageToControllerEffect())); // When there are no cards in your graveyard, you lose the game. this.addAbility(new ImmortalCoilAbility()); } @@ -84,7 +83,7 @@ public class ImmortalCoil extends CardImpl { class ImmortalCoilAbility extends StateTriggeredAbility { public ImmortalCoilAbility() { - super(Constants.Zone.BATTLEFIELD, new SacrificeSourceEffect()); + super(Zone.BATTLEFIELD, new SacrificeSourceEffect()); this.addEffect(new LoseGameEffect()); } @@ -116,7 +115,7 @@ class ImmortalCoilAbility extends StateTriggeredAbility { class LoseGameEffect extends OneShotEffect { public LoseGameEffect() { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); staticText = "you lose the game"; } @@ -144,7 +143,7 @@ class PreventAllDamageToControllerEffect extends PreventionEffectImpl { this.color.setBlack(true); // All creatures get -2/-2 until end of turn. - this.getSpellAbility().addEffect(new BoostAllEffect(-2, -2, Constants.Duration.EndOfTurn, new FilterCreaturePermanent("All creatures"), false)); + this.getSpellAbility().addEffect(new BoostAllEffect(-2, -2, Duration.EndOfTurn, new FilterCreaturePermanent("All creatures"), false)); } public Infest(final Infest card) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/InvincibleHymn.java b/Mage.Sets/src/mage/sets/shardsofalara/InvincibleHymn.java index 4d6b49899aa..8fe6241c5dc 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/InvincibleHymn.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/InvincibleHymn.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/JhessianInfiltrator.java b/Mage.Sets/src/mage/sets/shardsofalara/JhessianInfiltrator.java index 2032f050f98..a3551887529 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/JhessianInfiltrator.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/JhessianInfiltrator.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.UnblockableAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/JhessianLookout.java b/Mage.Sets/src/mage/sets/shardsofalara/JhessianLookout.java index 314d8530f6c..ff99d7f4aa5 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/JhessianLookout.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/JhessianLookout.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/JundBattlemage.java b/Mage.Sets/src/mage/sets/shardsofalara/JundBattlemage.java index 2fb89a8f2e4..0ceb02a296e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/JundBattlemage.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/JundBattlemage.java @@ -29,9 +29,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/JundCharm.java b/Mage.Sets/src/mage/sets/shardsofalara/JundCharm.java index b5c8f11d673..e393d842569 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/JundCharm.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/JundCharm.java @@ -29,11 +29,11 @@ package mage.sets.shardsofalara; import java.util.ArrayList; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; @@ -70,7 +70,7 @@ public class JundCharm extends CardImpl { this.getSpellAbility().addMode(mode); // or put two +1/+1 counters on target creature. mode = new Mode(); - mode.getEffects().add(new AddCountersTargetEffect(CounterType.P1P1.createInstance(2), Constants.Outcome.BoostCreature)); + mode.getEffects().add(new AddCountersTargetEffect(CounterType.P1P1.createInstance(2), Outcome.BoostCreature)); mode.getTargets().add(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/JundPanorama.java b/Mage.Sets/src/mage/sets/shardsofalara/JundPanorama.java index c61c45d9149..25985ec8870 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/JundPanorama.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/JundPanorama.java @@ -29,10 +29,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/JungleShrine.java b/Mage.Sets/src/mage/sets/shardsofalara/JungleShrine.java index 4ee83199e3f..c3a111b4647 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/JungleShrine.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/JungleShrine.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.RedManaAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/JungleWeaver.java b/Mage.Sets/src/mage/sets/shardsofalara/JungleWeaver.java index b2d4ae9021e..10da447c641 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/JungleWeaver.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/JungleWeaver.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.CyclingAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/KathariScreecher.java b/Mage.Sets/src/mage/sets/shardsofalara/KathariScreecher.java index bb06a57b2ab..6dece09acff 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/KathariScreecher.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/KathariScreecher.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/KederektCreeper.java b/Mage.Sets/src/mage/sets/shardsofalara/KederektCreeper.java index c86c3ad34d9..5d032896bd2 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/KederektCreeper.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/KederektCreeper.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.CantBeBlockedByOneEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/KederektLeviathan.java b/Mage.Sets/src/mage/sets/shardsofalara/KederektLeviathan.java index 03f2b307608..2ec7ddec834 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/KederektLeviathan.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/KederektLeviathan.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/KeeperOfProgenitus.java b/Mage.Sets/src/mage/sets/shardsofalara/KeeperOfProgenitus.java index b22e676f5c8..f0b33faba18 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/KeeperOfProgenitus.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/KeeperOfProgenitus.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.Mana; import mage.abilities.Abilities; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/KissOfTheAmesha.java b/Mage.Sets/src/mage/sets/shardsofalara/KissOfTheAmesha.java index 0d48c8db9ce..04c0592e512 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/KissOfTheAmesha.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/KissOfTheAmesha.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.effects.common.GainLifeTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/KnightCaptainOfEos.java b/Mage.Sets/src/mage/sets/shardsofalara/KnightCaptainOfEos.java index 3192c4b68c7..7eb028e362d 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/KnightCaptainOfEos.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/KnightCaptainOfEos.java @@ -28,10 +28,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/KnightOfTheSkywardEye.java b/Mage.Sets/src/mage/sets/shardsofalara/KnightOfTheSkywardEye.java index 987fe794774..9a0789f08df 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/KnightOfTheSkywardEye.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/KnightOfTheSkywardEye.java @@ -29,10 +29,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.ActivateOncePerTurnActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/KnightOfTheWhiteOrchid.java b/Mage.Sets/src/mage/sets/shardsofalara/KnightOfTheWhiteOrchid.java index 639e47e33cd..a31c849ff3d 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/KnightOfTheWhiteOrchid.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/KnightOfTheWhiteOrchid.java @@ -29,10 +29,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.ZoneChangeTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/KreshTheBloodbraided.java b/Mage.Sets/src/mage/sets/shardsofalara/KreshTheBloodbraided.java index b48d6c1773d..f32ebd20dbb 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/KreshTheBloodbraided.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/KreshTheBloodbraided.java @@ -28,15 +28,16 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -77,7 +78,7 @@ public class KreshTheBloodbraided extends CardImpl { class KreshTheBloodbraidedEffect extends OneShotEffect { KreshTheBloodbraidedEffect() { - super(Constants.Outcome.BoostCreature); + super(Outcome.BoostCreature); staticText = "you may put X +1/+1 counters on Kresh the Bloodbraided, where X is that creature's power"; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/LichsMirror.java b/Mage.Sets/src/mage/sets/shardsofalara/LichsMirror.java index 17ea6157c93..f512045b734 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/LichsMirror.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/LichsMirror.java @@ -28,9 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; @@ -54,7 +53,7 @@ public class LichsMirror extends CardImpl { this.expansionSetCode = "ALA"; // If you would lose the game, instead shuffle your hand, your graveyard, and all permanents you own into your library, then draw seven cards and your life total becomes 20. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new LichsMirrorEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LichsMirrorEffect())); } public LichsMirror(final LichsMirror card) { @@ -70,7 +69,7 @@ public class LichsMirror extends CardImpl { class LichsMirrorEffect extends ReplacementEffectImpl { public LichsMirrorEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "If you would lose the game, instead shuffle your hand, your graveyard, and all permanents you own into your library, then draw seven cards and your life total becomes 20"; } @@ -97,19 +96,19 @@ class LichsMirrorEffect extends ReplacementEffectImpl { for (UUID uuid : player.getHand().copy()) { Card card = game.getCard(uuid); if (card != null) { - card.moveToZone(Constants.Zone.LIBRARY, source.getId(), game, true); + card.moveToZone(Zone.LIBRARY, source.getId(), game, true); } } for (UUID uuid : player.getGraveyard().copy()) { Card card = game.getCard(uuid); if (card != null) { - card.moveToZone(Constants.Zone.LIBRARY, source.getId(), game, true); + card.moveToZone(Zone.LIBRARY, source.getId(), game, true); } } for(Permanent permanent : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)){ - permanent.moveToZone(Constants.Zone.LIBRARY, source.getId(), game, true); + permanent.moveToZone(Zone.LIBRARY, source.getId(), game, true); } player.shuffleLibrary(game); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/LightningTalons.java b/Mage.Sets/src/mage/sets/shardsofalara/LightningTalons.java index 14250031e03..062e28a1af1 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/LightningTalons.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/LightningTalons.java @@ -30,11 +30,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -43,6 +42,8 @@ import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.AttachmentType; +import mage.constants.Outcome; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -60,12 +61,12 @@ public class LightningTalons extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 0, Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); } public LightningTalons (final LightningTalons card) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/LushGrowth.java b/Mage.Sets/src/mage/sets/shardsofalara/LushGrowth.java index 420f71915c8..d7c8aaba454 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/LushGrowth.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/LushGrowth.java @@ -28,15 +28,16 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continious.BecomesBasicLandEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; @@ -56,7 +57,7 @@ public class LushGrowth extends CardImpl { // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Detriment)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); // Enchanted land is a Mountain, Forest, and Plains. diff --git a/Mage.Sets/src/mage/sets/shardsofalara/MagmaSpray.java b/Mage.Sets/src/mage/sets/shardsofalara/MagmaSpray.java index eafa826e772..a87c322af97 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/MagmaSpray.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/MagmaSpray.java @@ -28,10 +28,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.DamageTargetEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Manaplasm.java b/Mage.Sets/src/mage/sets/shardsofalara/Manaplasm.java index e6cb22eee70..9d7bf271f11 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Manaplasm.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Manaplasm.java @@ -28,14 +28,16 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.EmptyEffect; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.stack.Spell; @@ -75,7 +77,7 @@ public class Manaplasm extends CardImpl { class ManaplasmAbility extends TriggeredAbilityImpl { public ManaplasmAbility() { - super(Constants.Zone.BATTLEFIELD, new EmptyEffect("{this} gets +X/+X until end of turn, where X is that spell's converted mana cost"), false); + super(Zone.BATTLEFIELD, new EmptyEffect("{this} gets +X/+X until end of turn, where X is that spell's converted mana cost"), false); } @@ -90,7 +92,7 @@ class ManaplasmAbility extends TriggeredAbilityImpl { Spell spell = game.getStack().getSpell(event.getTargetId()); if (spell != null && spell.getControllerId().equals(controllerId)) { this.getEffects().remove(0); - this.addEffect(new BoostSourceEffect(spell.getManaCost().convertedManaCost(), spell.getManaCost().convertedManaCost(), Constants.Duration.EndOfTurn)); + this.addEffect(new BoostSourceEffect(spell.getManaCost().convertedManaCost(), spell.getManaCost().convertedManaCost(), Duration.EndOfTurn)); this.getEffects().get(0).setTargetPointer(new FixedTarget(event.getPlayerId())); return true; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/MarbleChalice.java b/Mage.Sets/src/mage/sets/shardsofalara/MarbleChalice.java index 10a8dbca0b7..ef023298ecc 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/MarbleChalice.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/MarbleChalice.java @@ -29,9 +29,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/MasterOfEtherium.java b/Mage.Sets/src/mage/sets/shardsofalara/MasterOfEtherium.java index 3185e4a8808..8ddeedae497 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/MasterOfEtherium.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/MasterOfEtherium.java @@ -29,9 +29,7 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -55,7 +53,7 @@ public class MasterOfEtherium extends CardImpl { static { filterCounted.add(new CardTypePredicate(CardType.ARTIFACT)); filterBoosted.add(new CardTypePredicate(CardType.ARTIFACT)); - filterBoosted.add(new ControllerPredicate(Constants.TargetController.YOU)); + filterBoosted.add(new ControllerPredicate(TargetController.YOU)); } public MasterOfEtherium(UUID ownerId) { @@ -66,8 +64,8 @@ public class MasterOfEtherium extends CardImpl { this.color.setBlue(true); this.power = new MageInt(0); this.toughness = new MageInt(0); - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filterCounted), Constants.Duration.EndOfGame))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Constants.Duration.WhileOnBattlefield, filterBoosted, true))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filterCounted), Duration.EndOfGame))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBoosted, true))); } public MasterOfEtherium(final MasterOfEtherium card) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/MayaelTheAnima.java b/Mage.Sets/src/mage/sets/shardsofalara/MayaelTheAnima.java index 41fdd6c5dee..ff35a917655 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/MayaelTheAnima.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/MayaelTheAnima.java @@ -28,29 +28,19 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; -import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.cards.Card; import mage.cards.CardImpl; -import mage.cards.Cards; -import mage.cards.CardsImpl; import mage.filter.Filter.ComparisonType; -import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.PowerPredicate; -import mage.game.Game; -import mage.players.Player; -import mage.target.TargetCard; /** * diff --git a/Mage.Sets/src/mage/sets/shardsofalara/MemoryErosion.java b/Mage.Sets/src/mage/sets/shardsofalara/MemoryErosion.java index edbaf8531d8..3dbb42ab1e1 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/MemoryErosion.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/MemoryErosion.java @@ -28,12 +28,13 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.stack.Spell; @@ -69,7 +70,7 @@ public class MemoryErosion extends CardImpl { class SpellCastTriggeredAbility extends TriggeredAbilityImpl { public SpellCastTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(2), false); + super(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(2), false); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Metallurgeon.java b/Mage.Sets/src/mage/sets/shardsofalara/Metallurgeon.java index f6418e30f10..093404f1542 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Metallurgeon.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Metallurgeon.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/MightyEmergence.java b/Mage.Sets/src/mage/sets/shardsofalara/MightyEmergence.java index bb99c055634..4e2e2fc9c61 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/MightyEmergence.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/MightyEmergence.java @@ -28,16 +28,17 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.filter.Filter; import mage.filter.common.FilterCreatureCard; @@ -121,7 +122,7 @@ class AddCountersTargetEffect extends OneShotEffect { public AddCountersTargetEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); } public AddCountersTargetEffect(final AddCountersTargetEffect effect) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/MindlockOrb.java b/Mage.Sets/src/mage/sets/shardsofalara/MindlockOrb.java index bec6d47e649..58968c725e6 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/MindlockOrb.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/MindlockOrb.java @@ -28,11 +28,11 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/MinionReflector.java b/Mage.Sets/src/mage/sets/shardsofalara/MinionReflector.java index 24d8c83a8f0..cc12f5f6b62 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/MinionReflector.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/MinionReflector.java @@ -28,9 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; @@ -123,7 +122,7 @@ class MinionReflectorTriggeredAbility extends EntersBattlefieldAllTriggeredAbili class MinionReflectorEffect extends OneShotEffect { public MinionReflectorEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); this.staticText = "put a token that's a copy of that creature onto the battlefield. That token has haste and \"At the beginning of the end step, sacrifice this permanent."; } @@ -140,7 +139,7 @@ class MinionReflectorEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Permanent permanent = game.getPermanent(this.getTargetPointer().getFirst(game, source)); if (permanent == null) { - permanent = (Permanent) game.getLastKnownInformation(source.getFirstTarget(), Constants.Zone.BATTLEFIELD); + permanent = (Permanent) game.getLastKnownInformation(source.getFirstTarget(), Zone.BATTLEFIELD); } if (permanent != null) { @@ -148,7 +147,7 @@ class MinionReflectorEffect extends OneShotEffect { CardUtil.copyTo(token).from(permanent); token.addAbility(HasteAbility.getInstance()); - token.addAbility(new BeginningOfEndStepTriggeredAbility(new SacrificeSourceEffect(), Constants.TargetController.ANY, true)); + token.addAbility(new BeginningOfEndStepTriggeredAbility(new SacrificeSourceEffect(), TargetController.ANY, true)); token.putOntoBattlefield(1, game, source.getSourceId(), source.getControllerId()); return true; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Mosstodon.java b/Mage.Sets/src/mage/sets/shardsofalara/Mosstodon.java index d07fde55199..0859e6be513 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Mosstodon.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Mosstodon.java @@ -28,10 +28,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Mycoloth.java b/Mage.Sets/src/mage/sets/shardsofalara/Mycoloth.java index 4aecbaff5ab..d38d89706a8 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Mycoloth.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Mycoloth.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.dynamicvalue.common.CountersCount; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/NayaBattlemage.java b/Mage.Sets/src/mage/sets/shardsofalara/NayaBattlemage.java index 1c2c844e3ee..ad2f5ad8501 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/NayaBattlemage.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/NayaBattlemage.java @@ -29,10 +29,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/NayaCharm.java b/Mage.Sets/src/mage/sets/shardsofalara/NayaCharm.java index 4dbb413b416..0f69b756f9d 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/NayaCharm.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/NayaCharm.java @@ -29,9 +29,9 @@ package mage.sets.shardsofalara; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/NayaPanorama.java b/Mage.Sets/src/mage/sets/shardsofalara/NayaPanorama.java index d562ddab5f5..9912d8d78e7 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/NayaPanorama.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/NayaPanorama.java @@ -28,10 +28,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Necrogenesis.java b/Mage.Sets/src/mage/sets/shardsofalara/Necrogenesis.java index b6372248bc6..4d24abf7360 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Necrogenesis.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Necrogenesis.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfBant.java b/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfBant.java index c50fb992e01..dfb856e8327 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfBant.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfBant.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.WhiteManaAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfEsper.java b/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfEsper.java index 5001b409be8..6c5069c6bc3 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfEsper.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfEsper.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.WhiteManaAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfGrixis.java b/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfGrixis.java index 3ef53220353..804fdbf78c2 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfGrixis.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfGrixis.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.RedManaAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfJund.java b/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfJund.java index a1236ce4625..d955ce6f389 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfJund.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfJund.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.RedManaAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfNaya.java b/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfNaya.java index 221bce0dd1e..46c713ab433 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfNaya.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfNaya.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.RedManaAbility; import mage.abilities.mana.WhiteManaAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/OblivionRing.java b/Mage.Sets/src/mage/sets/shardsofalara/OblivionRing.java index d8e143004ba..a58f78bc373 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/OblivionRing.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/OblivionRing.java @@ -29,9 +29,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.LeavesBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/OnyxGoblet.java b/Mage.Sets/src/mage/sets/shardsofalara/OnyxGoblet.java index 71750289a91..d795135ec1d 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/OnyxGoblet.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/OnyxGoblet.java @@ -29,9 +29,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/OozeGarden.java b/Mage.Sets/src/mage/sets/shardsofalara/OozeGarden.java index cfa041f8fbf..17b515d3144 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/OozeGarden.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/OozeGarden.java @@ -29,9 +29,9 @@ package mage.sets.shardsofalara; import java.util.ArrayList; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.AbilitiesImpl; import mage.abilities.Ability; @@ -41,6 +41,8 @@ import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -65,7 +67,7 @@ public class OozeGarden extends CardImpl { this.color.setGreen(true); // {1}{G}, Sacrifice a non-Ooze creature: Put an X/X green Ooze creature token onto the battlefield, where X is the sacrificed creature's power. Activate this ability only any time you could cast a sorcery. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(), new ManaCostsImpl("{1}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(), new ManaCostsImpl("{1}{G}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true))); this.addAbility(ability); } @@ -83,7 +85,7 @@ public class OozeGarden extends CardImpl { class CreateTokenEffect extends OneShotEffect { public CreateTokenEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); staticText = "Put an X/X green Ooze creature token onto the battlefield, where X is the sacrificed creature's power"; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/OutriderOfJhess.java b/Mage.Sets/src/mage/sets/shardsofalara/OutriderOfJhess.java index 1fb18a0044f..70a339d8481 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/OutriderOfJhess.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/OutriderOfJhess.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ExaltedAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/PredatorDragon.java b/Mage.Sets/src/mage/sets/shardsofalara/PredatorDragon.java index 4b47d6bf06a..0f0a6fd939e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/PredatorDragon.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/PredatorDragon.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.DevourEffect.DevourFactor; import mage.abilities.keyword.DevourAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/PrinceOfThralls.java b/Mage.Sets/src/mage/sets/shardsofalara/PrinceOfThralls.java index 04a1376a78b..c414062db8a 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/PrinceOfThralls.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/PrinceOfThralls.java @@ -28,10 +28,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -40,6 +40,7 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -81,7 +82,7 @@ public class PrinceOfThralls extends CardImpl { class PrinceOfThrallsTriggeredAbility extends TriggeredAbilityImpl { PrinceOfThrallsTriggeredAbility(Effect effect) { - super(Constants.Zone.BATTLEFIELD, effect, false); + super(Zone.BATTLEFIELD, effect, false); } PrinceOfThrallsTriggeredAbility(final PrinceOfThrallsTriggeredAbility ability) { @@ -99,7 +100,7 @@ class PrinceOfThrallsTriggeredAbility extends TriggeredAbilityImpl { public PrinceOfThrallsEffect() { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); this.staticText = "put that card onto the battlefield under your control unless that opponent pays 3 life"; } @@ -137,11 +138,11 @@ class PrinceOfThrallsEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Card card = game.getCard(targetPointer.getFirst(game, source)); - Permanent permanent = (Permanent) game.getLastKnownInformation(card.getId(), Constants.Zone.BATTLEFIELD); + Permanent permanent = (Permanent) game.getLastKnownInformation(card.getId(), Zone.BATTLEFIELD); Player opponent = game.getPlayer(permanent.getControllerId()); if (opponent != null && card != null && permanent != null && source.getControllerId() != null) { PayLifeCost cost = new PayLifeCost(3); - if (opponent.chooseUse(Constants.Outcome.Neutral, cost.getText() + " or " + permanent.getName() + " comes back into the battlefield under opponents control", game)) { + if (opponent.chooseUse(Outcome.Neutral, cost.getText() + " or " + permanent.getName() + " comes back into the battlefield under opponents control", game)) { cost.clearPaid(); if (cost.pay(source, game, source.getId(), opponent.getId(), true)) { return true; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ProtomatterPowder.java b/Mage.Sets/src/mage/sets/shardsofalara/ProtomatterPowder.java index d50be7aa1a8..be94a9069e6 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ProtomatterPowder.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ProtomatterPowder.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -38,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterArtifactCard; import mage.target.common.TargetCardInYourGraveyard; @@ -54,7 +55,7 @@ public class ProtomatterPowder extends CardImpl { this.color.setBlue(true); // {4}{W}, {tap}, Sacrifice Protomatter Powder: Return target artifact card from your graveyard to the battlefield. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl("{4}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl("{4}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(new FilterArtifactCard("artifact card from your graveyard"))); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/PunishIgnorance.java b/Mage.Sets/src/mage/sets/shardsofalara/PunishIgnorance.java index 67723516c31..f9f211ff64e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/PunishIgnorance.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/PunishIgnorance.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeControllerEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/PuppetConjurer.java b/Mage.Sets/src/mage/sets/shardsofalara/PuppetConjurer.java index d79a1b4407d..b6ccb150a74 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/PuppetConjurer.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/PuppetConjurer.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -41,6 +41,8 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.SacrificeEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.Token; @@ -67,11 +69,11 @@ public class PuppetConjurer extends CardImpl { this.toughness = new MageInt(2); // {U}, {tap}: Put a 0/1 blue Homunculus artifact creature token onto the battlefield. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new HomunculusToken()), new ManaCostsImpl("{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HomunculusToken()), new ManaCostsImpl("{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); // At the beginning of your upkeep, sacrifice a Homunculus. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeEffect(filter, 1, ""), Constants.TargetController.ANY, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeEffect(filter, 1, ""), TargetController.ANY, false)); } public PuppetConjurer(final PuppetConjurer card) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/QasaliAmbusher.java b/Mage.Sets/src/mage/sets/shardsofalara/QasaliAmbusher.java index 2b7ebeb5655..055f2122d20 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/QasaliAmbusher.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/QasaliAmbusher.java @@ -28,9 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.ActivatedAbilityImpl; @@ -90,8 +89,8 @@ class QasaliAmbusherAbility extends ActivatedAbilityImpl filterForest.add(new SubtypePredicate("Forest")); } public QasaliAmbusherAbility() { - super(Constants.Zone.HAND, new QasaliAmbusherEffect(), new ManaCostsImpl()); - this.timing = Constants.TimingRule.INSTANT; + super(Zone.HAND, new QasaliAmbusherEffect(), new ManaCostsImpl()); + this.timing = TimingRule.INSTANT; this.usesStack = false; } @@ -135,7 +134,7 @@ class QasaliAmbusherAbility extends ActivatedAbilityImpl class QasaliAmbusherEffect extends OneShotEffect { public QasaliAmbusherEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = ""; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/QuietusSpike.java b/Mage.Sets/src/mage/sets/shardsofalara/QuietusSpike.java index 991e108d3a9..19be25048ba 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/QuietusSpike.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/QuietusSpike.java @@ -28,11 +28,11 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RafiqOfTheMany.java b/Mage.Sets/src/mage/sets/shardsofalara/RafiqOfTheMany.java index 5668c481fb3..d8396ead616 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RafiqOfTheMany.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RafiqOfTheMany.java @@ -29,10 +29,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RakeclawGargantuan.java b/Mage.Sets/src/mage/sets/shardsofalara/RakeclawGargantuan.java index 88953a30eb2..09828ed449c 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RakeclawGargantuan.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RakeclawGargantuan.java @@ -28,10 +28,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RangerOfEos.java b/Mage.Sets/src/mage/sets/shardsofalara/RangerOfEos.java index 88e9bbc0fc8..c2756bd73f8 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RangerOfEos.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RangerOfEos.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RealmRazer.java b/Mage.Sets/src/mage/sets/shardsofalara/RealmRazer.java index 98030fb820f..930d08c33d4 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RealmRazer.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RealmRazer.java @@ -29,9 +29,9 @@ package mage.sets.shardsofalara; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -39,7 +39,8 @@ import mage.abilities.common.LeavesBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; -import mage.filter.FilterPermanent; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.game.ExileZone; import mage.game.Game; @@ -81,7 +82,7 @@ public class RealmRazer extends CardImpl { class ExileAllEffect extends OneShotEffect { public ExileAllEffect() { - super(Constants.Outcome.Exile); + super(Outcome.Exile); staticText = "exile all lands"; } @@ -109,7 +110,7 @@ class ExileAllEffect extends OneShotEffect { class RealmRazerEffect extends OneShotEffect { public RealmRazerEffect() { - super(Constants.Outcome.ReturnToHand); + super(Outcome.ReturnToHand); this.staticText = "return the exiled cards to the battlefield tapped under their owners' control"; } @@ -128,7 +129,7 @@ class RealmRazerEffect extends OneShotEffect { if (exZone != null) { for (Card card : exZone.getCards(game)) { if (card != null) { - if(card.putOntoBattlefield(game, Constants.Zone.EXILED, source.getSourceId(), card.getOwnerId())){ + if(card.putOntoBattlefield(game, Zone.EXILED, source.getSourceId(), card.getOwnerId())){ game.getPermanent(card.getId()).setTapped(true); } } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RelicOfProgenitus.java b/Mage.Sets/src/mage/sets/shardsofalara/RelicOfProgenitus.java index 2372ad53b43..b0d02eb39c9 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RelicOfProgenitus.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RelicOfProgenitus.java @@ -28,10 +28,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingRoar.java b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingRoar.java index e85247acd81..aac20ed02c5 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingRoar.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingRoar.java @@ -28,15 +28,16 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.CycleTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.CyclingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -52,12 +53,12 @@ public class ResoundingRoar extends CardImpl { this.color.setGreen(true); // Target creature gets +3/+3 until end of turn. - this.getSpellAbility().addEffect(new BoostTargetEffect(3, 3, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(3, 3, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Cycling {5}{R}{G}{W} this.addAbility(new CyclingAbility(new ManaCostsImpl("{5}{R}{G}{W}"))); // When you cycle Resounding Roar, target creature gets +6/+6 until end of turn. - Ability ability = new CycleTriggeredAbility(new BoostTargetEffect(6, 6, Constants.Duration.EndOfTurn)); + Ability ability = new CycleTriggeredAbility(new BoostTargetEffect(6, 6, Duration.EndOfTurn)); ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingScream.java b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingScream.java index 0a24e455a7d..ab39977c355 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingScream.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingScream.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.CycleTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingSilence.java b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingSilence.java index 02e713aa207..d9416adc112 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingSilence.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingSilence.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.CycleTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingThunder.java b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingThunder.java index 30f931a4be2..0350746f6f8 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingThunder.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingThunder.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.CycleTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingWave.java b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingWave.java index b19ade5fbc0..2d013493902 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingWave.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingWave.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.CycleTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RhoxCharger.java b/Mage.Sets/src/mage/sets/shardsofalara/RhoxCharger.java index bdf75df27c2..a01c1a7af62 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RhoxCharger.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RhoxCharger.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ExaltedAbility; import mage.abilities.keyword.TrampleAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RhoxWarMonk.java b/Mage.Sets/src/mage/sets/shardsofalara/RhoxWarMonk.java index 599b76e2e93..3cad2b23314 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RhoxWarMonk.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RhoxWarMonk.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RidgeRannet.java b/Mage.Sets/src/mage/sets/shardsofalara/RidgeRannet.java index dcd6b5d4261..cc497d1ea25 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RidgeRannet.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RidgeRannet.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.CyclingAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RipClanCrasher.java b/Mage.Sets/src/mage/sets/shardsofalara/RipClanCrasher.java index 233daaee264..3c975c989b0 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RipClanCrasher.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RipClanCrasher.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RockcasterPlatoon.java b/Mage.Sets/src/mage/sets/shardsofalara/RockcasterPlatoon.java index 6a697779b5c..77d8342d8f2 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RockcasterPlatoon.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RockcasterPlatoon.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +39,7 @@ import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.effects.common.DamagePlayersEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; @@ -64,7 +65,7 @@ public class RockcasterPlatoon extends CardImpl { this.toughness = new MageInt(7); // {4}{G}: Rockcaster Platoon deals 2 damage to each creature with flying and each player. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageAllEffect(2, filter), new ManaCostsImpl("{4}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(2, filter), new ManaCostsImpl("{4}{G}")); ability.addEffect(new DamagePlayersEffect(2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RockslideElemental.java b/Mage.Sets/src/mage/sets/shardsofalara/RockslideElemental.java index 8abc2c65569..bb88701b7bd 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RockslideElemental.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RockslideElemental.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SacellumGodspeaker.java b/Mage.Sets/src/mage/sets/shardsofalara/SacellumGodspeaker.java index c3d2191427c..4764aae24b8 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SacellumGodspeaker.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SacellumGodspeaker.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -38,6 +38,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.ManaEffect; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.Filter; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.PowerPredicate; @@ -61,7 +63,7 @@ public class SacellumGodspeaker extends CardImpl { this.toughness = new MageInt(2); // {tap}: Reveal any number of creature cards with power 5 or greater from your hand. Add {G} to your mana pool for each card revealed this way. - this.addAbility(new SimpleManaAbility(Constants.Zone.BATTLEFIELD, new SacellumGodspeakerEffect(), new TapSourceCost())); + this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new SacellumGodspeakerEffect(), new TapSourceCost())); } public SacellumGodspeaker(final SacellumGodspeaker card) { @@ -100,7 +102,7 @@ class SacellumGodspeakerEffect extends ManaEffect { @Override public boolean apply(Game game, Ability source) { TargetCardInHand target = new TargetCardInHand(0,Integer.MAX_VALUE, filter); - if (target.choose(Constants.Outcome.Benefit, source.getControllerId(), source.getId(), game)) { + if (target.choose(Outcome.Benefit, source.getControllerId(), source.getId(), game)) { game.getPlayer(source.getControllerId()).getManaPool().addMana(Mana.GreenMana(target.getTargets().size()), game, source); return true; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SalvageTitan.java b/Mage.Sets/src/mage/sets/shardsofalara/SalvageTitan.java index e7842f86149..e25889ac046 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SalvageTitan.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SalvageTitan.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.AlternativeCostImpl; @@ -39,6 +39,7 @@ import mage.abilities.costs.common.ExileFromGraveCost; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.ReturnSourceFromGraveyardToHandEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterArtifactCard; import mage.filter.common.FilterControlledArtifactPermanent; import mage.filter.common.FilterControlledPermanent; @@ -70,7 +71,7 @@ public class SalvageTitan extends CardImpl { Cost cost = new SacrificeTargetCost(new TargetControlledPermanent(3, 3, new FilterControlledArtifactPermanent(), true)); this.getSpellAbility().addAlternativeCost(new AlternativeCostImpl("You may sacrifice three artifacts rather than pay {this}'s mana cost", cost)); // Exile three artifact cards from your graveyard: Return Salvage Titan from your graveyard to your hand. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ExileFromGraveCost(new TargetCardInYourGraveyard(3, new FilterArtifactCard())))); + this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ExileFromGraveCost(new TargetCardInYourGraveyard(3, new FilterArtifactCard())))); } public SalvageTitan(final SalvageTitan card) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SanctumGargoyle.java b/Mage.Sets/src/mage/sets/shardsofalara/SanctumGargoyle.java index 0b532930340..1bac8478d1d 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SanctumGargoyle.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SanctumGargoyle.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SangriteSurge.java b/Mage.Sets/src/mage/sets/shardsofalara/SangriteSurge.java index f74c9306ee6..7f8aa5ce35e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SangriteSurge.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SangriteSurge.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.DoubleStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SarkhanVol.java b/Mage.Sets/src/mage/sets/shardsofalara/SarkhanVol.java index a16935b4530..293fc4b9104 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SarkhanVol.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SarkhanVol.java @@ -29,9 +29,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.LoyaltyAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.Effects; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SavageHunger.java b/Mage.Sets/src/mage/sets/shardsofalara/SavageHunger.java index 5d6bd1b563f..1f95501fbf3 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SavageHunger.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SavageHunger.java @@ -30,11 +30,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.AttachEffect; @@ -44,6 +43,8 @@ import mage.abilities.keyword.CyclingAbility; import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.AttachmentType; +import mage.constants.Outcome; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -61,11 +62,11 @@ public class SavageHunger extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield)); - ability.addEffect(new GainAbilityAttachedEffect(TrampleAbility.getInstance(), Constants.AttachmentType.AURA)); + ability.addEffect(new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA)); this.addAbility(ability); this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SavageLands.java b/Mage.Sets/src/mage/sets/shardsofalara/SavageLands.java index 443f5ba245d..b46e2b852ec 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SavageLands.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SavageLands.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.GreenManaAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ScavengerDrake.java b/Mage.Sets/src/mage/sets/shardsofalara/ScavengerDrake.java index 64db4f1d5c0..180a6d1987c 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ScavengerDrake.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ScavengerDrake.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ScourgeDevil.java b/Mage.Sets/src/mage/sets/shardsofalara/ScourgeDevil.java index dbc023cec18..fd227b943b0 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ScourgeDevil.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ScourgeDevil.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Scourglass.java b/Mage.Sets/src/mage/sets/shardsofalara/Scourglass.java index 94b18604bf1..d4fcd93b138 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Scourglass.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Scourglass.java @@ -28,15 +28,16 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.OnlyDuringUpkeepCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -59,7 +60,7 @@ public class Scourglass extends CardImpl { this.color.setWhite(true); // {tap}, Sacrifice Scourglass: Destroy all permanents except for artifacts and lands. Activate this ability only during your upkeep. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyAllEffect(filter), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyAllEffect(filter), new TapSourceCost()); ability.addCost(new OnlyDuringUpkeepCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SeasideCitadel.java b/Mage.Sets/src/mage/sets/shardsofalara/SeasideCitadel.java index df8fa2755ef..665e599502f 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SeasideCitadel.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SeasideCitadel.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.GreenManaAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SedraxisSpecter.java b/Mage.Sets/src/mage/sets/shardsofalara/SedraxisSpecter.java index 5725615ef21..852de036723 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SedraxisSpecter.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SedraxisSpecter.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SedrisTheTraitorKing.java b/Mage.Sets/src/mage/sets/shardsofalara/SedrisTheTraitorKing.java index ed9a73170a1..7a855f6b4cf 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SedrisTheTraitorKing.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SedrisTheTraitorKing.java @@ -29,9 +29,7 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -62,7 +60,7 @@ public class SedrisTheTraitorKing extends CardImpl { this.toughness = new MageInt(5); // Each creature card in your graveyard has unearth {2}{B}. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new SedrisTheTraitorKingEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SedrisTheTraitorKingEffect())); } public SedrisTheTraitorKing(final SedrisTheTraitorKing card) { @@ -77,7 +75,7 @@ public class SedrisTheTraitorKing extends CardImpl { class SedrisTheTraitorKingEffect extends ContinuousEffectImpl { SedrisTheTraitorKingEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Layer.AbilityAddingRemovingEffects_6, Constants.SubLayer.NA, Constants.Outcome.AddAbility); + super(Duration.WhileOnBattlefield, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility); staticText = "Each creature card in your graveyard has unearth {2}{B}"; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Shadowfeed.java b/Mage.Sets/src/mage/sets/shardsofalara/Shadowfeed.java index 37a0de39275..0cfafcac089 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Shadowfeed.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Shadowfeed.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ShardingSphinx.java b/Mage.Sets/src/mage/sets/shardsofalara/ShardingSphinx.java index 3538619628c..4c1419c8baa 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ShardingSphinx.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ShardingSphinx.java @@ -28,10 +28,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.CreateTokenEffect; @@ -117,8 +117,8 @@ class ShardingSphinxTriggeredAbility extends TriggeredAbilityImpl { // Until end of turn, target creature you control gets +3/+3 and other creatures you control get +1/+1. this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); - this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Constants.Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new BoostControlledEffect(1, 1, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostControlledEffect(1, 1, Duration.EndOfTurn)); } public SigilBlessing(final SigilBlessing card) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SigilOfDistinction.java b/Mage.Sets/src/mage/sets/shardsofalara/SigilOfDistinction.java index 1baf6c11e4d..e95fd92c3e0 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SigilOfDistinction.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SigilOfDistinction.java @@ -29,10 +29,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.common.EntersBattlefieldAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SigiledPaladin.java b/Mage.Sets/src/mage/sets/shardsofalara/SigiledPaladin.java index 4e4e6bf3417..1dfe0aa0605 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SigiledPaladin.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SigiledPaladin.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ExaltedAbility; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SkeletalKathari.java b/Mage.Sets/src/mage/sets/shardsofalara/SkeletalKathari.java index 37c7ab0ebb8..9e8be2605e1 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SkeletalKathari.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SkeletalKathari.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Skeletonize.java b/Mage.Sets/src/mage/sets/shardsofalara/Skeletonize.java index 4f82984136d..d6866a7a86a 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Skeletonize.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Skeletonize.java @@ -28,11 +28,11 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SkillBorrower.java b/Mage.Sets/src/mage/sets/shardsofalara/SkillBorrower.java index 8ed032bc1f6..e995df291ab 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SkillBorrower.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SkillBorrower.java @@ -28,10 +28,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.ActivatedAbility; @@ -41,6 +41,10 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.continious.PlayWithTheTopCardRevealedEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -102,7 +106,7 @@ class SkillBorrowerAbility extends StaticAbility { class SkillBorrowerEffect extends ContinuousEffectImpl { public SkillBorrowerEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Layer.AbilityAddingRemovingEffects_6, Constants.SubLayer.NA, Constants.Outcome.AddAbility); + super(Duration.WhileOnBattlefield, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility); staticText = "As long as the top card of your library is an artifact or creature card, Skill Borrower has all activated abilities of that card"; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Skullmulcher.java b/Mage.Sets/src/mage/sets/shardsofalara/Skullmulcher.java index a9c3bc3bf9e..4b53cb57b4c 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Skullmulcher.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Skullmulcher.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.DevouredCreaturesCount; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SoulsFire.java b/Mage.Sets/src/mage/sets/shardsofalara/SoulsFire.java index f7b06f3931b..226f0d2d9b9 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SoulsFire.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SoulsFire.java @@ -28,13 +28,14 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -89,7 +90,7 @@ class SoulsFireEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Permanent sourcePermanent = game.getPermanent(source.getFirstTarget()); if (sourcePermanent == null) { - sourcePermanent = (Permanent) game.getLastKnownInformation(source.getSourceId(), Constants.Zone.BATTLEFIELD); + sourcePermanent = (Permanent) game.getLastKnownInformation(source.getSourceId(), Zone.BATTLEFIELD); } if (sourcePermanent == null) { return false; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SoulsGrace.java b/Mage.Sets/src/mage/sets/shardsofalara/SoulsGrace.java index 05e52db870d..ce195bda93a 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SoulsGrace.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SoulsGrace.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SoulsMight.java b/Mage.Sets/src/mage/sets/shardsofalara/SoulsMight.java index e4a3f4fce70..0eaff96143e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SoulsMight.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SoulsMight.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SpearbreakerBehemoth.java b/Mage.Sets/src/mage/sets/shardsofalara/SpearbreakerBehemoth.java index e6b7fb18da1..8c59cfe3d08 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SpearbreakerBehemoth.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SpearbreakerBehemoth.java @@ -28,10 +28,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SpellSnip.java b/Mage.Sets/src/mage/sets/shardsofalara/SpellSnip.java index ed8015707cd..f55a34baa2d 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SpellSnip.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SpellSnip.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CounterUnlessPaysEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SphinxSovereign.java b/Mage.Sets/src/mage/sets/shardsofalara/SphinxSovereign.java index 2786b60032a..a84a7f1aef9 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SphinxSovereign.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SphinxSovereign.java @@ -28,10 +28,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SphinxsHerald.java b/Mage.Sets/src/mage/sets/shardsofalara/SphinxsHerald.java index 7b18ca52456..3b54d0676c5 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SphinxsHerald.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SphinxsHerald.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SproutingThrinax.java b/Mage.Sets/src/mage/sets/shardsofalara/SproutingThrinax.java index 09eb175faac..2010fa1ce37 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SproutingThrinax.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SproutingThrinax.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SteelcladSerpent.java b/Mage.Sets/src/mage/sets/shardsofalara/SteelcladSerpent.java index 67898ee39bb..03fe4aea39c 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SteelcladSerpent.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SteelcladSerpent.java @@ -28,14 +28,16 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.RestrictionEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; @@ -58,7 +60,7 @@ public class SteelcladSerpent extends CardImpl { this.toughness = new MageInt(5); // Steelclad Serpent can't attack unless you control another artifact. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new SteelcladSerpentEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SteelcladSerpentEffect())); } public SteelcladSerpent(final SteelcladSerpent card) { @@ -81,7 +83,7 @@ class SteelcladSerpentEffect extends RestrictionEffect { } public SteelcladSerpentEffect() { - super(Constants.Duration.WhileOnBattlefield); + super(Duration.WhileOnBattlefield); staticText = "{this} can't attack unless you control another artifact"; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/StewardOfValeron.java b/Mage.Sets/src/mage/sets/shardsofalara/StewardOfValeron.java index 7ed9bbd627d..57f44767a97 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/StewardOfValeron.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/StewardOfValeron.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; import mage.abilities.mana.GreenManaAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/StoicAngel.java b/Mage.Sets/src/mage/sets/shardsofalara/StoicAngel.java index d88129edb75..180b6e2fbfe 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/StoicAngel.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/StoicAngel.java @@ -29,11 +29,11 @@ package mage.sets.shardsofalara; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -41,6 +41,9 @@ import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.PhaseStep; +import mage.constants.WatcherScope; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; @@ -90,7 +93,7 @@ public class StoicAngel extends CardImpl { class StoicAngelWatcher extends WatcherImpl { public StoicAngelWatcher() { - super("StoicAngelWatcher", Constants.WatcherScope.GAME); + super("StoicAngelWatcher", WatcherScope.GAME); } public StoicAngelWatcher(final StoicAngelWatcher watcher) { @@ -117,7 +120,7 @@ class StoicAngelEffect extends ReplacementEffectImpl { filter.add(new TappedPredicate()); } public StoicAngelEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Detriment); + super(Duration.WhileOnBattlefield, Outcome.Detriment); staticText = "Players can't untap more than one creature during their untap steps"; } @@ -161,7 +164,7 @@ class StoicAngelEffect extends ReplacementEffectImpl { @Override public boolean applies(GameEvent event, Ability source, Game game) { - if (game.getTurn().getStepType() == Constants.PhaseStep.UNTAP && event.getType() == GameEvent.EventType.UNTAP){ + if (game.getTurn().getStepType() == PhaseStep.UNTAP && event.getType() == GameEvent.EventType.UNTAP){ Player player = game.getPlayer(event.getPlayerId()); Permanent permanent = game.getPermanent(event.getTargetId()); if(player != null && game.getActivePlayerId().equals(event.getPlayerId()) diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SunseedNurturer.java b/Mage.Sets/src/mage/sets/shardsofalara/SunseedNurturer.java index 96a27accab5..26e99db3ffb 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SunseedNurturer.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SunseedNurturer.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/TarFiend.java b/Mage.Sets/src/mage/sets/shardsofalara/TarFiend.java index c7a361c45a0..25f1933c50a 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/TarFiend.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/TarFiend.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/TezzeretTheSeeker.java b/Mage.Sets/src/mage/sets/shardsofalara/TezzeretTheSeeker.java index f8034b877f6..63eead1f4f2 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/TezzeretTheSeeker.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/TezzeretTheSeeker.java @@ -27,7 +27,6 @@ */ package mage.sets.shardsofalara; -import mage.Constants.*; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.EntersBattlefieldAbility; @@ -39,6 +38,7 @@ import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterArtifactCard; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ThornThrashViashino.java b/Mage.Sets/src/mage/sets/shardsofalara/ThornThrashViashino.java index 3c064711e48..02ac433130d 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ThornThrashViashino.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ThornThrashViashino.java @@ -28,10 +28,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ThoughtcutterAgent.java b/Mage.Sets/src/mage/sets/shardsofalara/ThoughtcutterAgent.java index efbf250969e..8983b3c0afb 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ThoughtcutterAgent.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ThoughtcutterAgent.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +39,8 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; @@ -61,7 +63,7 @@ public class ThoughtcutterAgent extends CardImpl { this.toughness = new MageInt(1); // {U}{B}, {tap}: Target player loses 1 life and reveals his or her hand. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl("{U}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl("{U}{B}")); ability.addCost(new TapSourceCost()); ability.addEffect(new RevealHandTargetEffect()); ability.addTarget(new TargetPlayer()); @@ -83,7 +85,7 @@ class RevealHandTargetEffect extends OneShotEffect { public RevealHandTargetEffect() { - super(Constants.Outcome.Discard); + super(Outcome.Discard); staticText = "and reveals his or her hand"; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ThunderThrashElder.java b/Mage.Sets/src/mage/sets/shardsofalara/ThunderThrashElder.java index bf7266391b7..62eea987c73 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ThunderThrashElder.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ThunderThrashElder.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.DevourEffect.DevourFactor; import mage.abilities.keyword.DevourAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/TidehollowStrix.java b/Mage.Sets/src/mage/sets/shardsofalara/TidehollowStrix.java index 02f54975e4b..8353e08cedf 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/TidehollowStrix.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/TidehollowStrix.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/TitanicUltimatum.java b/Mage.Sets/src/mage/sets/shardsofalara/TitanicUltimatum.java index 750a439bc40..09c39a7bfc7 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/TitanicUltimatum.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/TitanicUltimatum.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/TopanAscetic.java b/Mage.Sets/src/mage/sets/shardsofalara/TopanAscetic.java index 0bbeeef5d49..1c4fd7e37a5 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/TopanAscetic.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/TopanAscetic.java @@ -28,14 +28,16 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; @@ -64,7 +66,7 @@ public class TopanAscetic extends CardImpl { this.toughness = new MageInt(2); // Tap an untapped creature you control: Topan Ascetic gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Constants.Duration.EndOfTurn), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true)))); } public TopanAscetic(final TopanAscetic card) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/TortoiseFormation.java b/Mage.Sets/src/mage/sets/shardsofalara/TortoiseFormation.java index 0550d991e8a..a7c7a98d261 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/TortoiseFormation.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/TortoiseFormation.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/TowerGargoyle.java b/Mage.Sets/src/mage/sets/shardsofalara/TowerGargoyle.java index bd85300a0e7..97d032c99b8 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/TowerGargoyle.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/TowerGargoyle.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/UndeadLeotau.java b/Mage.Sets/src/mage/sets/shardsofalara/UndeadLeotau.java index 92aaeef3df7..cfae3520e86 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/UndeadLeotau.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/UndeadLeotau.java @@ -29,10 +29,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/VectisSilencers.java b/Mage.Sets/src/mage/sets/shardsofalara/VectisSilencers.java index 0d79cf0c4d9..6b5e591028f 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/VectisSilencers.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/VectisSilencers.java @@ -29,10 +29,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/VeinDrinker.java b/Mage.Sets/src/mage/sets/shardsofalara/VeinDrinker.java index f38e980e004..01e8dc7f5fc 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/VeinDrinker.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/VeinDrinker.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -42,6 +42,8 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -65,7 +67,7 @@ public class VeinDrinker extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {R}, {tap}: Vein Drinker deals damage equal to its power to target creature. That creature deals damage equal to its power to Vein Drinker. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new VeinDrinkerEffect(), new ManaCostsImpl("{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VeinDrinkerEffect(), new ManaCostsImpl("{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); @@ -86,7 +88,7 @@ public class VeinDrinker extends CardImpl { class VeinDrinkerEffect extends OneShotEffect { public VeinDrinkerEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); } public VeinDrinkerEffect(final VeinDrinkerEffect effect) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ViashinoSkeleton.java b/Mage.Sets/src/mage/sets/shardsofalara/ViashinoSkeleton.java index b4fab25df4d..d09cc31143f 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ViashinoSkeleton.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ViashinoSkeleton.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ViciousShadows.java b/Mage.Sets/src/mage/sets/shardsofalara/ViciousShadows.java index 24ba3cffab1..ca316375f63 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ViciousShadows.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ViciousShadows.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ViolentUltimatum.java b/Mage.Sets/src/mage/sets/shardsofalara/ViolentUltimatum.java index a12e03f0411..9c7c8b10f65 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ViolentUltimatum.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ViolentUltimatum.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/VisceraDragger.java b/Mage.Sets/src/mage/sets/shardsofalara/VisceraDragger.java index acd054a7eff..af3a9a79eae 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/VisceraDragger.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/VisceraDragger.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.CyclingAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/VithianStinger.java b/Mage.Sets/src/mage/sets/shardsofalara/VithianStinger.java index 4da77d18f6c..206a25daf99 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/VithianStinger.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/VithianStinger.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/VolcanicSubmersion.java b/Mage.Sets/src/mage/sets/shardsofalara/VolcanicSubmersion.java index b715cba64d4..b26b063ab90 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/VolcanicSubmersion.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/VolcanicSubmersion.java @@ -28,8 +28,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.CyclingAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/WaveskimmerAven.java b/Mage.Sets/src/mage/sets/shardsofalara/WaveskimmerAven.java index 098b0147216..e6f2af1fe90 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/WaveskimmerAven.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/WaveskimmerAven.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ExaltedAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/WelkinGuide.java b/Mage.Sets/src/mage/sets/shardsofalara/WelkinGuide.java index 184a7fe0757..014dd689298 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/WelkinGuide.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/WelkinGuide.java @@ -28,9 +28,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/WhereAncientsTread.java b/Mage.Sets/src/mage/sets/shardsofalara/WhereAncientsTread.java index 85dc05f2d52..5697471ccdd 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/WhereAncientsTread.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/WhereAncientsTread.java @@ -28,13 +28,14 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; @@ -58,7 +59,7 @@ import mage.target.common.TargetCreatureOrPlayer; this.color.setRed(true); // Whenever a creature with power 5 or greater enters the battlefield under your control, you may have Where Ancients Tread deal 5 damage to target creature or player. - Ability ability = new EntersBattlefieldControlledTriggeredAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(5), filter, true); + Ability ability = new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new DamageTargetEffect(5), filter, true); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/WildNacatl.java b/Mage.Sets/src/mage/sets/shardsofalara/WildNacatl.java index 0fa14b9dd41..29634c3ed00 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/WildNacatl.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/WildNacatl.java @@ -29,9 +29,9 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostSourceWhileControlsEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/WindwrightMage.java b/Mage.Sets/src/mage/sets/shardsofalara/WindwrightMage.java index 43efa2ecda9..fbb55718b38 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/WindwrightMage.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/WindwrightMage.java @@ -28,10 +28,10 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/WoollyThoctar.java b/Mage.Sets/src/mage/sets/shardsofalara/WoollyThoctar.java index 417a1f2672d..d0908055893 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/WoollyThoctar.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/WoollyThoctar.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/YokedPlowbeast.java b/Mage.Sets/src/mage/sets/shardsofalara/YokedPlowbeast.java index 5ab4fcb2882..ba8c3a7a2f7 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/YokedPlowbeast.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/YokedPlowbeast.java @@ -29,8 +29,8 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.CyclingAbility; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Archangel.java b/Mage.Sets/src/mage/sets/sixthedition/Archangel.java index ea7996cd0e7..5abb1025136 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Archangel.java +++ b/Mage.Sets/src/mage/sets/sixthedition/Archangel.java @@ -28,7 +28,7 @@ package mage.sets.sixthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/sixthedition/DancingScimitar.java b/Mage.Sets/src/mage/sets/sixthedition/DancingScimitar.java index d460e92b768..f4cad3eb299 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/DancingScimitar.java +++ b/Mage.Sets/src/mage/sets/sixthedition/DancingScimitar.java @@ -28,7 +28,7 @@ package mage.sets.sixthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/sixthedition/FireElemental.java b/Mage.Sets/src/mage/sets/sixthedition/FireElemental.java index 2d3e3b09cb6..dc621e6b45a 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/FireElemental.java +++ b/Mage.Sets/src/mage/sets/sixthedition/FireElemental.java @@ -28,7 +28,7 @@ package mage.sets.sixthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/sixthedition/ObsianusGolem.java b/Mage.Sets/src/mage/sets/sixthedition/ObsianusGolem.java index 8026c7e4371..2ccbb815eb0 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/ObsianusGolem.java +++ b/Mage.Sets/src/mage/sets/sixthedition/ObsianusGolem.java @@ -28,8 +28,8 @@ package mage.sets.sixthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/sixthedition/ProdigalSorcerer.java b/Mage.Sets/src/mage/sets/sixthedition/ProdigalSorcerer.java index 7f03f6eb1e8..76b5e4d7287 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/ProdigalSorcerer.java +++ b/Mage.Sets/src/mage/sets/sixthedition/ProdigalSorcerer.java @@ -28,7 +28,7 @@ package mage.sets.sixthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/sixthedition/RegalUnicorn.java b/Mage.Sets/src/mage/sets/sixthedition/RegalUnicorn.java index f8fd9be6949..9c9e1e78669 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/RegalUnicorn.java +++ b/Mage.Sets/src/mage/sets/sixthedition/RegalUnicorn.java @@ -28,8 +28,8 @@ package mage.sets.sixthedition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Shatterstorm.java b/Mage.Sets/src/mage/sets/sixthedition/Shatterstorm.java index da86c999d14..3fa304fd124 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Shatterstorm.java +++ b/Mage.Sets/src/mage/sets/sixthedition/Shatterstorm.java @@ -28,7 +28,7 @@ package mage.sets.sixthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/sixthedition/VolcanicDragon.java b/Mage.Sets/src/mage/sets/sixthedition/VolcanicDragon.java index 273defc3909..5dee80cd555 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/VolcanicDragon.java +++ b/Mage.Sets/src/mage/sets/sixthedition/VolcanicDragon.java @@ -28,7 +28,7 @@ package mage.sets.sixthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/sixthedition/Warthog.java b/Mage.Sets/src/mage/sets/sixthedition/Warthog.java index 2f60c81c565..8a73057c4c4 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Warthog.java +++ b/Mage.Sets/src/mage/sets/sixthedition/Warthog.java @@ -28,7 +28,7 @@ package mage.sets.sixthedition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/stronghold/EnsnaringBridge.java b/Mage.Sets/src/mage/sets/stronghold/EnsnaringBridge.java index c2c4ac869db..0e0b9cb0c91 100644 --- a/Mage.Sets/src/mage/sets/stronghold/EnsnaringBridge.java +++ b/Mage.Sets/src/mage/sets/stronghold/EnsnaringBridge.java @@ -28,11 +28,8 @@ package mage.sets.stronghold; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; @@ -54,7 +51,7 @@ public class EnsnaringBridge extends CardImpl { this.expansionSetCode = "STH"; // Creatures with power greater than the number of cards in your hand can't attack. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new EnsnaringBridgeEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EnsnaringBridgeEffect())); } public EnsnaringBridge(final EnsnaringBridge card) { diff --git a/Mage.Sets/src/mage/sets/stronghold/Evacuation.java b/Mage.Sets/src/mage/sets/stronghold/Evacuation.java index d3af9f09a11..0615fcfba16 100644 --- a/Mage.Sets/src/mage/sets/stronghold/Evacuation.java +++ b/Mage.Sets/src/mage/sets/stronghold/Evacuation.java @@ -28,12 +28,14 @@ package mage.sets.stronghold; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -70,7 +72,7 @@ class EvacuationEffect extends OneShotEffect { public EvacuationEffect() { - super(Constants.Outcome.ReturnToHand); + super(Outcome.ReturnToHand); staticText = "Return all creatures to their owners' hands"; } @@ -81,7 +83,7 @@ class EvacuationEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { for (Permanent creature : game.getBattlefield().getActivePermanents(new FilterCreaturePermanent(), source.getControllerId(), source.getSourceId(), game)) { - creature.moveToZone(Constants.Zone.HAND, source.getSourceId(), game, true); + creature.moveToZone(Zone.HAND, source.getSourceId(), game, true); } return true; } diff --git a/Mage.Sets/src/mage/sets/stronghold/IntruderAlarm.java b/Mage.Sets/src/mage/sets/stronghold/IntruderAlarm.java index 0a81b83306a..619aff17882 100644 --- a/Mage.Sets/src/mage/sets/stronghold/IntruderAlarm.java +++ b/Mage.Sets/src/mage/sets/stronghold/IntruderAlarm.java @@ -28,12 +28,8 @@ package mage.sets.stronghold; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.PhaseStep; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; @@ -61,7 +57,7 @@ public class IntruderAlarm extends CardImpl { this.color.setBlue(true); // Creatures don't untap during their controllers' untap steps. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new IntruderAlarmEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new IntruderAlarmEffect())); // Whenever a creature enters the battlefield, untap all creatures. this.addAbility(new EntersBattlefieldAllTriggeredAbility(new UntapAllCreatureEffect(), new FilterCreaturePermanent())); } diff --git a/Mage.Sets/src/mage/sets/stronghold/LabRats.java b/Mage.Sets/src/mage/sets/stronghold/LabRats.java index 6b244c5a49a..98f1260a363 100644 --- a/Mage.Sets/src/mage/sets/stronghold/LabRats.java +++ b/Mage.Sets/src/mage/sets/stronghold/LabRats.java @@ -28,8 +28,8 @@ package mage.sets.stronghold; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/stronghold/MoxDiamond.java b/Mage.Sets/src/mage/sets/stronghold/MoxDiamond.java index cabde1a36db..9f5e5476d52 100644 --- a/Mage.Sets/src/mage/sets/stronghold/MoxDiamond.java +++ b/Mage.Sets/src/mage/sets/stronghold/MoxDiamond.java @@ -28,17 +28,18 @@ package mage.sets.stronghold; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.mana.AnyColorManaAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterLandCard; import mage.game.Game; import mage.game.events.GameEvent; @@ -74,7 +75,7 @@ public class MoxDiamond extends CardImpl { class MoxDiamondReplacementEffect extends ReplacementEffectImpl { public MoxDiamondReplacementEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Exile); + super(Duration.WhileOnBattlefield, Outcome.Exile); staticText = "If Mox Diamond would enter the battlefield, you may discard a land card instead. If you do, put Mox Diamond onto the battlefield. If you don't, put it into its owner's graveyard"; } diff --git a/Mage.Sets/src/mage/sets/stronghold/SerpentWarrior.java b/Mage.Sets/src/mage/sets/stronghold/SerpentWarrior.java index fff4e67d17a..35bd97ad80b 100644 --- a/Mage.Sets/src/mage/sets/stronghold/SerpentWarrior.java +++ b/Mage.Sets/src/mage/sets/stronghold/SerpentWarrior.java @@ -28,8 +28,8 @@ package mage.sets.stronghold; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LoseLifeControllerEffect; diff --git a/Mage.Sets/src/mage/sets/stronghold/SkyshroudFalcon.java b/Mage.Sets/src/mage/sets/stronghold/SkyshroudFalcon.java index 6f0f7a92958..c561656a688 100644 --- a/Mage.Sets/src/mage/sets/stronghold/SkyshroudFalcon.java +++ b/Mage.Sets/src/mage/sets/stronghold/SkyshroudFalcon.java @@ -28,8 +28,8 @@ package mage.sets.stronghold; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; diff --git a/Mage.Sets/src/mage/sets/stronghold/SpikeFeeder.java b/Mage.Sets/src/mage/sets/stronghold/SpikeFeeder.java index c64fbe116d7..94928eb3d88 100644 --- a/Mage.Sets/src/mage/sets/stronghold/SpikeFeeder.java +++ b/Mage.Sets/src/mage/sets/stronghold/SpikeFeeder.java @@ -28,7 +28,7 @@ package mage.sets.stronghold; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/stronghold/VolrathsStronghold.java b/Mage.Sets/src/mage/sets/stronghold/VolrathsStronghold.java index 047e5e1592f..234f79d4ab6 100644 --- a/Mage.Sets/src/mage/sets/stronghold/VolrathsStronghold.java +++ b/Mage.Sets/src/mage/sets/stronghold/VolrathsStronghold.java @@ -28,9 +28,9 @@ package mage.sets.stronghold; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -38,6 +38,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCardInYourGraveyard; @@ -63,7 +64,7 @@ public class VolrathsStronghold extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {1}{B}, {tap}: Put target creature card from your graveyard on top of your library. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new ManaCostsImpl("{1}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new ManaCostsImpl("{1}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/stronghold/WallOfBlossoms.java b/Mage.Sets/src/mage/sets/stronghold/WallOfBlossoms.java index 716b9048001..b09e978a753 100644 --- a/Mage.Sets/src/mage/sets/stronghold/WallOfBlossoms.java +++ b/Mage.Sets/src/mage/sets/stronghold/WallOfBlossoms.java @@ -28,8 +28,8 @@ package mage.sets.stronghold; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/stronghold/WallOfRazors.java b/Mage.Sets/src/mage/sets/stronghold/WallOfRazors.java index 6949c2601b9..21558a255d6 100644 --- a/Mage.Sets/src/mage/sets/stronghold/WallOfRazors.java +++ b/Mage.Sets/src/mage/sets/stronghold/WallOfRazors.java @@ -28,8 +28,8 @@ package mage.sets.stronghold; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/tempest/AdvanceScout.java b/Mage.Sets/src/mage/sets/tempest/AdvanceScout.java index 2e89e213499..520c8281a9c 100644 --- a/Mage.Sets/src/mage/sets/tempest/AdvanceScout.java +++ b/Mage.Sets/src/mage/sets/tempest/AdvanceScout.java @@ -29,9 +29,7 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -57,7 +55,7 @@ public class AdvanceScout extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FirstStrikeAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/Aftershock.java b/Mage.Sets/src/mage/sets/tempest/Aftershock.java index a3c8bd7b87e..348cc4f0302 100644 --- a/Mage.Sets/src/mage/sets/tempest/Aftershock.java +++ b/Mage.Sets/src/mage/sets/tempest/Aftershock.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tempest/AltarOfDementia.java b/Mage.Sets/src/mage/sets/tempest/AltarOfDementia.java index 66869a56a3b..ce303996ba7 100644 --- a/Mage.Sets/src/mage/sets/tempest/AltarOfDementia.java +++ b/Mage.Sets/src/mage/sets/tempest/AltarOfDementia.java @@ -28,9 +28,9 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.Cost; @@ -38,6 +38,8 @@ import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; @@ -62,7 +64,7 @@ public class AltarOfDementia extends CardImpl { this.expansionSetCode = "TMP"; // Sacrifice a creature: Target player puts a number of cards equal to the sacrificed creature's power from the top of his or her library into his or her graveyard. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AltarOfDementiaEffect(), new SacrificeTargetCost(new TargetControlledPermanent(filter))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AltarOfDementiaEffect(), new SacrificeTargetCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetPlayer()); this.addAbility(ability); @@ -81,7 +83,7 @@ public class AltarOfDementia extends CardImpl { class AltarOfDementiaEffect extends OneShotEffect { public AltarOfDementiaEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "Target player puts a number of cards equal to the sacrificed creature's power from the top of his or her library into his or her graveyard"; } @@ -105,7 +107,7 @@ class AltarOfDementiaEffect extends OneShotEffect { if (!player.getLibrary().getCardList().isEmpty()) { Card card = player.getLibrary().removeFromTop(game); if (card != null) { - card.moveToZone(Constants.Zone.GRAVEYARD, source.getId(), game, false); + card.moveToZone(Zone.GRAVEYARD, source.getId(), game, false); } } } diff --git a/Mage.Sets/src/mage/sets/tempest/AncientTomb.java b/Mage.Sets/src/mage/sets/tempest/AncientTomb.java index 4cf8eb2d7c7..f32bb610901 100644 --- a/Mage.Sets/src/mage/sets/tempest/AncientTomb.java +++ b/Mage.Sets/src/mage/sets/tempest/AncientTomb.java @@ -29,15 +29,15 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @author Loki @@ -49,7 +49,7 @@ public class AncientTomb extends CardImpl { this.expansionSetCode = "TMP"; // {tap}: Add to your mana pool. Ancient Tomb deals 2 damage to you. - Ability ability = new SimpleManaAbility(Constants.Zone.BATTLEFIELD, Mana.ColorlessMana(2), new TapSourceCost()); + Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(2), new TapSourceCost()); ability.addEffect(new DamageControllerEffect(2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/AngelicProtector.java b/Mage.Sets/src/mage/sets/tempest/AngelicProtector.java index c9b3dd5d874..e4277a4d979 100644 --- a/Mage.Sets/src/mage/sets/tempest/AngelicProtector.java +++ b/Mage.Sets/src/mage/sets/tempest/AngelicProtector.java @@ -28,9 +28,9 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BecomesTargetTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; diff --git a/Mage.Sets/src/mage/sets/tempest/ArmorSliver.java b/Mage.Sets/src/mage/sets/tempest/ArmorSliver.java index 53fe9b674e1..e42c3ba787f 100644 --- a/Mage.Sets/src/mage/sets/tempest/ArmorSliver.java +++ b/Mage.Sets/src/mage/sets/tempest/ArmorSliver.java @@ -29,9 +29,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -61,7 +62,7 @@ public class ArmorSliver extends CardImpl { this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAllEffect(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Constants.Duration.EndOfTurn), new GenericManaCost(2)), Constants.Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new GenericManaCost(2)), Duration.WhileOnBattlefield, filter, false))); } public ArmorSliver(final ArmorSliver card) { diff --git a/Mage.Sets/src/mage/sets/tempest/ArmoredPegasus.java b/Mage.Sets/src/mage/sets/tempest/ArmoredPegasus.java index 76fa9169c7c..11ad2def8a3 100644 --- a/Mage.Sets/src/mage/sets/tempest/ArmoredPegasus.java +++ b/Mage.Sets/src/mage/sets/tempest/ArmoredPegasus.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tempest/Auratog.java b/Mage.Sets/src/mage/sets/tempest/Auratog.java index b6379293c87..374bdac62f4 100644 --- a/Mage.Sets/src/mage/sets/tempest/Auratog.java +++ b/Mage.Sets/src/mage/sets/tempest/Auratog.java @@ -29,14 +29,15 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledPermanent; @@ -60,7 +61,7 @@ public class Auratog extends CardImpl { this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Constants.Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(filter)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(filter)))); } public Auratog(final Auratog card) { diff --git a/Mage.Sets/src/mage/sets/tempest/BarbedSliver.java b/Mage.Sets/src/mage/sets/tempest/BarbedSliver.java index b0e3a705e9e..bbb23f5c389 100644 --- a/Mage.Sets/src/mage/sets/tempest/BarbedSliver.java +++ b/Mage.Sets/src/mage/sets/tempest/BarbedSliver.java @@ -29,9 +29,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -61,7 +62,7 @@ public class BarbedSliver extends CardImpl { this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAllEffect(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Constants.Duration.EndOfTurn), new GenericManaCost(2)), Constants.Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(2)), Duration.WhileOnBattlefield, filter, false))); } public BarbedSliver(final BarbedSliver card) { diff --git a/Mage.Sets/src/mage/sets/tempest/BayouDragonfly.java b/Mage.Sets/src/mage/sets/tempest/BayouDragonfly.java index c0ca7f2705d..894b7cd4b5e 100644 --- a/Mage.Sets/src/mage/sets/tempest/BayouDragonfly.java +++ b/Mage.Sets/src/mage/sets/tempest/BayouDragonfly.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.SwampwalkAbility; diff --git a/Mage.Sets/src/mage/sets/tempest/BenthicBehemoth.java b/Mage.Sets/src/mage/sets/tempest/BenthicBehemoth.java index 78d82fff5ed..9f97b127955 100644 --- a/Mage.Sets/src/mage/sets/tempest/BenthicBehemoth.java +++ b/Mage.Sets/src/mage/sets/tempest/BenthicBehemoth.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.IslandwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tempest/BloodPet.java b/Mage.Sets/src/mage/sets/tempest/BloodPet.java index fedeeb522c0..fe66e8b93f8 100644 --- a/Mage.Sets/src/mage/sets/tempest/BloodPet.java +++ b/Mage.Sets/src/mage/sets/tempest/BloodPet.java @@ -29,14 +29,14 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -53,7 +53,7 @@ public class BloodPet extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Blood Pet: Add {B} to your mana pool. - this.addAbility(new SimpleManaAbility(Constants.Zone.BATTLEFIELD, Mana.BlackMana, new SacrificeSourceCost())); + this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana, new SacrificeSourceCost())); } public BloodPet(final BloodPet card) { diff --git a/Mage.Sets/src/mage/sets/tempest/Boil.java b/Mage.Sets/src/mage/sets/tempest/Boil.java index 590db71700b..1ec55b2fab8 100644 --- a/Mage.Sets/src/mage/sets/tempest/Boil.java +++ b/Mage.Sets/src/mage/sets/tempest/Boil.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/tempest/BottleGnomes.java b/Mage.Sets/src/mage/sets/tempest/BottleGnomes.java index 10466a8274f..35cf780f896 100644 --- a/Mage.Sets/src/mage/sets/tempest/BottleGnomes.java +++ b/Mage.Sets/src/mage/sets/tempest/BottleGnomes.java @@ -29,14 +29,14 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -50,7 +50,7 @@ public class BottleGnomes extends CardImpl { this.subtype.add("Gnome"); this.power = new MageInt(1); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainLifeEffect(3), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(3), new SacrificeSourceCost())); } public BottleGnomes(final BottleGnomes card) { diff --git a/Mage.Sets/src/mage/sets/tempest/BrokenFall.java b/Mage.Sets/src/mage/sets/tempest/BrokenFall.java index 0c08fbfd18a..92ea81aaddb 100644 --- a/Mage.Sets/src/mage/sets/tempest/BrokenFall.java +++ b/Mage.Sets/src/mage/sets/tempest/BrokenFall.java @@ -29,14 +29,14 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.ReturnToHandSourceCost; import mage.abilities.effects.common.RegenerateTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -49,7 +49,7 @@ public class BrokenFall extends CardImpl { super(ownerId, 110, "Broken Fall", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); this.expansionSetCode = "TMP"; this.color.setGreen(true); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ReturnToHandSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ReturnToHandSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/CalderaLake.java b/Mage.Sets/src/mage/sets/tempest/CalderaLake.java index d701a5f9eea..07cd5471fe6 100644 --- a/Mage.Sets/src/mage/sets/tempest/CalderaLake.java +++ b/Mage.Sets/src/mage/sets/tempest/CalderaLake.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.effects.common.DamageControllerEffect; diff --git a/Mage.Sets/src/mage/sets/tempest/CanopySpider.java b/Mage.Sets/src/mage/sets/tempest/CanopySpider.java index 6a2f8981a68..c7cc5da6a23 100644 --- a/Mage.Sets/src/mage/sets/tempest/CanopySpider.java +++ b/Mage.Sets/src/mage/sets/tempest/CanopySpider.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tempest/CanyonWildcat.java b/Mage.Sets/src/mage/sets/tempest/CanyonWildcat.java index a3e32ffa9d8..2a171de60a0 100644 --- a/Mage.Sets/src/mage/sets/tempest/CanyonWildcat.java +++ b/Mage.Sets/src/mage/sets/tempest/CanyonWildcat.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.MountainwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tempest/Capsize.java b/Mage.Sets/src/mage/sets/tempest/Capsize.java index b1ee5f8e379..060a5278fb0 100644 --- a/Mage.Sets/src/mage/sets/tempest/Capsize.java +++ b/Mage.Sets/src/mage/sets/tempest/Capsize.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.BuybackAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tempest/CinderMarsh.java b/Mage.Sets/src/mage/sets/tempest/CinderMarsh.java index 0dbee623927..3c7dd844438 100644 --- a/Mage.Sets/src/mage/sets/tempest/CinderMarsh.java +++ b/Mage.Sets/src/mage/sets/tempest/CinderMarsh.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.SkipNextUntapSourceEffect; import mage.abilities.mana.*; diff --git a/Mage.Sets/src/mage/sets/tempest/ClergyEnVec.java b/Mage.Sets/src/mage/sets/tempest/ClergyEnVec.java index 4939693c761..47ac4eed920 100644 --- a/Mage.Sets/src/mage/sets/tempest/ClergyEnVec.java +++ b/Mage.Sets/src/mage/sets/tempest/ClergyEnVec.java @@ -29,15 +29,16 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.PreventDamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; /** @@ -54,7 +55,7 @@ public class ClergyEnVec extends CardImpl { this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PreventDamageTargetEffect(Constants.Duration.EndOfTurn ,1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageTargetEffect(Duration.EndOfTurn ,1), new TapSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/ClotSliver.java b/Mage.Sets/src/mage/sets/tempest/ClotSliver.java index 6105372bb29..0803c91e74b 100644 --- a/Mage.Sets/src/mage/sets/tempest/ClotSliver.java +++ b/Mage.Sets/src/mage/sets/tempest/ClotSliver.java @@ -29,9 +29,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -60,7 +61,7 @@ public class ClotSliver extends CardImpl { this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAllEffect(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new GenericManaCost(2)), Constants.Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new GenericManaCost(2)), Duration.WhileOnBattlefield, filter, false))); } public ClotSliver(final ClotSliver card) { diff --git a/Mage.Sets/src/mage/sets/tempest/CloudchaserEagle.java b/Mage.Sets/src/mage/sets/tempest/CloudchaserEagle.java index 7cb54790c22..4a70f1acd45 100644 --- a/Mage.Sets/src/mage/sets/tempest/CloudchaserEagle.java +++ b/Mage.Sets/src/mage/sets/tempest/CloudchaserEagle.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/tempest/CoiledTinviper.java b/Mage.Sets/src/mage/sets/tempest/CoiledTinviper.java index 821365e9ac1..7de07e295ad 100644 --- a/Mage.Sets/src/mage/sets/tempest/CoiledTinviper.java +++ b/Mage.Sets/src/mage/sets/tempest/CoiledTinviper.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tempest/CommanderGrevenIlVec.java b/Mage.Sets/src/mage/sets/tempest/CommanderGrevenIlVec.java index c624191f22f..3261ba57308 100644 --- a/Mage.Sets/src/mage/sets/tempest/CommanderGrevenIlVec.java +++ b/Mage.Sets/src/mage/sets/tempest/CommanderGrevenIlVec.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/tempest/Counterspell.java b/Mage.Sets/src/mage/sets/tempest/Counterspell.java index 8bf12b9ae8b..192e6b71631 100644 --- a/Mage.Sets/src/mage/sets/tempest/Counterspell.java +++ b/Mage.Sets/src/mage/sets/tempest/Counterspell.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.target.TargetSpell; diff --git a/Mage.Sets/src/mage/sets/tempest/CrownOfFlames.java b/Mage.Sets/src/mage/sets/tempest/CrownOfFlames.java index fb3a58a9c9a..ce09015d375 100644 --- a/Mage.Sets/src/mage/sets/tempest/CrownOfFlames.java +++ b/Mage.Sets/src/mage/sets/tempest/CrownOfFlames.java @@ -29,9 +29,7 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -56,11 +54,11 @@ public class CrownOfFlames extends CardImpl { this.color.setRed(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.R))); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ColoredManaCost(ColoredManaSymbol.R))); } public CrownOfFlames(final CrownOfFlames card) { diff --git a/Mage.Sets/src/mage/sets/tempest/CursedScroll.java b/Mage.Sets/src/mage/sets/tempest/CursedScroll.java index 704c8f06523..553b9c2363c 100644 --- a/Mage.Sets/src/mage/sets/tempest/CursedScroll.java +++ b/Mage.Sets/src/mage/sets/tempest/CursedScroll.java @@ -28,9 +28,9 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -43,6 +43,8 @@ import mage.cards.CardsImpl; import mage.cards.repository.CardRepository; import mage.choices.Choice; import mage.choices.ChoiceImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -60,7 +62,7 @@ public class CursedScroll extends CardImpl { this.expansionSetCode = "TMP"; // {3}, {tap}: Name a card. Reveal a card at random from your hand. If it's the named card, Cursed Scroll deals 2 damage to target creature or player. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CursedScrollEffect(), new ManaCostsImpl("{3}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CursedScrollEffect(), new ManaCostsImpl("{3}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } @@ -78,7 +80,7 @@ public class CursedScroll extends CardImpl { class CursedScrollEffect extends OneShotEffect { public CursedScrollEffect() { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); staticText = "Name a card. Reveal a card at random from your hand. If it's the named card, {this} deals 2 damage to target creature or player"; } @@ -93,7 +95,7 @@ class CursedScrollEffect extends OneShotEffect { Choice cardChoice = new ChoiceImpl(); cardChoice.setChoices(CardRepository.instance.getNames()); cardChoice.clearChoice(); - while (!you.choose(Constants.Outcome.Damage, cardChoice, game)) { + while (!you.choose(Outcome.Damage, cardChoice, game)) { game.debugMessage("player canceled choosing name. retrying."); } String cardName = cardChoice.getChoice(); @@ -106,7 +108,7 @@ class CursedScrollEffect extends OneShotEffect { if (card.getName().equals(cardName)) { TargetCreatureOrPlayer target = new TargetCreatureOrPlayer(); if (target.canChoose(you.getId(), game)) { - if (you.chooseTarget(Constants.Outcome.Damage, target, source, game)) { + if (you.chooseTarget(Outcome.Damage, target, source, game)) { Permanent creature = game.getPermanent(target.getFirstTarget()); if (creature != null) { creature.damage(2, source.getSourceId(), game, true, false); diff --git a/Mage.Sets/src/mage/sets/tempest/DarkBanishing.java b/Mage.Sets/src/mage/sets/tempest/DarkBanishing.java index 067b6a8d560..8ead715cbc6 100644 --- a/Mage.Sets/src/mage/sets/tempest/DarkBanishing.java +++ b/Mage.Sets/src/mage/sets/tempest/DarkBanishing.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tempest/DarklingStalker.java b/Mage.Sets/src/mage/sets/tempest/DarklingStalker.java index 71e07248fe1..74553836973 100644 --- a/Mage.Sets/src/mage/sets/tempest/DarklingStalker.java +++ b/Mage.Sets/src/mage/sets/tempest/DarklingStalker.java @@ -29,9 +29,7 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -53,8 +51,8 @@ public class DarklingStalker extends CardImpl { this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.B))); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.B))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.B))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B))); } public DarklingStalker(final DarklingStalker card) { diff --git a/Mage.Sets/src/mage/sets/tempest/DauthiMercenary.java b/Mage.Sets/src/mage/sets/tempest/DauthiMercenary.java index eb94939c3e4..0dd7083a4af 100644 --- a/Mage.Sets/src/mage/sets/tempest/DauthiMercenary.java +++ b/Mage.Sets/src/mage/sets/tempest/DauthiMercenary.java @@ -28,10 +28,10 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/tempest/DauthiSlayer.java b/Mage.Sets/src/mage/sets/tempest/DauthiSlayer.java index 120b858a373..c9110a4e181 100644 --- a/Mage.Sets/src/mage/sets/tempest/DauthiSlayer.java +++ b/Mage.Sets/src/mage/sets/tempest/DauthiSlayer.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.keyword.ShadowAbility; diff --git a/Mage.Sets/src/mage/sets/tempest/DeathPitsOfRath.java b/Mage.Sets/src/mage/sets/tempest/DeathPitsOfRath.java index acfed58c59d..ac5c9c09264 100644 --- a/Mage.Sets/src/mage/sets/tempest/DeathPitsOfRath.java +++ b/Mage.Sets/src/mage/sets/tempest/DeathPitsOfRath.java @@ -28,13 +28,14 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.targetpointer.FixedTarget; @@ -68,7 +69,7 @@ public class DeathPitsOfRath extends CardImpl { class DeathPitsOfRathTriggeredAbility extends TriggeredAbilityImpl { public DeathPitsOfRathTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(true)); + super(Zone.BATTLEFIELD, new DestroyTargetEffect(true)); } public DeathPitsOfRathTriggeredAbility(final DeathPitsOfRathTriggeredAbility effect) { diff --git a/Mage.Sets/src/mage/sets/tempest/DiabolicEdict.java b/Mage.Sets/src/mage/sets/tempest/DiabolicEdict.java index 3768d408dae..cb15664a17d 100644 --- a/Mage.Sets/src/mage/sets/tempest/DiabolicEdict.java +++ b/Mage.Sets/src/mage/sets/tempest/DiabolicEdict.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.SacrificeEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/tempest/Disenchant.java b/Mage.Sets/src/mage/sets/tempest/Disenchant.java index b356cde262f..9d7dd8577b3 100644 --- a/Mage.Sets/src/mage/sets/tempest/Disenchant.java +++ b/Mage.Sets/src/mage/sets/tempest/Disenchant.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/tempest/Dismiss.java b/Mage.Sets/src/mage/sets/tempest/Dismiss.java index 932f524635d..ff4b1d518e5 100644 --- a/Mage.Sets/src/mage/sets/tempest/Dismiss.java +++ b/Mage.Sets/src/mage/sets/tempest/Dismiss.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tempest/DreadOfNight.java b/Mage.Sets/src/mage/sets/tempest/DreadOfNight.java index cfa7696ab0b..9ea60fb2dfd 100644 --- a/Mage.Sets/src/mage/sets/tempest/DreadOfNight.java +++ b/Mage.Sets/src/mage/sets/tempest/DreadOfNight.java @@ -29,13 +29,14 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; @@ -55,7 +56,7 @@ public class DreadOfNight extends CardImpl { super(ownerId, 24, "Dread of Night", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{B}"); this.expansionSetCode = "TMP"; this.color.setBlack(true); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostAllEffect(-1, -1, Constants.Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(-1, -1, Duration.WhileOnBattlefield, filter, false))); } public DreadOfNight(final DreadOfNight card) { diff --git a/Mage.Sets/src/mage/sets/tempest/Earthcraft.java b/Mage.Sets/src/mage/sets/tempest/Earthcraft.java index 44a3b2d0c92..4b81454b673 100644 --- a/Mage.Sets/src/mage/sets/tempest/Earthcraft.java +++ b/Mage.Sets/src/mage/sets/tempest/Earthcraft.java @@ -29,14 +29,14 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.UntapTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; @@ -64,7 +64,7 @@ public class Earthcraft extends CardImpl { super(ownerId, 116, "Earthcraft", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); this.expansionSetCode = "TMP"; this.color.setGreen(true); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new UntapTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filterCreature, false))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filterCreature, false))); ability.addTarget(new TargetControlledPermanent(filterLand)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/EladamriLordOfLeaves.java b/Mage.Sets/src/mage/sets/tempest/EladamriLordOfLeaves.java index 7ac9e3a0ee4..b742e454ef9 100644 --- a/Mage.Sets/src/mage/sets/tempest/EladamriLordOfLeaves.java +++ b/Mage.Sets/src/mage/sets/tempest/EladamriLordOfLeaves.java @@ -29,15 +29,16 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.abilities.keyword.ForestwalkAbility; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -65,8 +66,8 @@ public class EladamriLordOfLeaves extends CardImpl { this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAllEffect(new ForestwalkAbility(), Constants.Duration.WhileOnBattlefield, filterCreatures, true))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAllEffect(ShroudAbility.getInstance(), Constants.Duration.WhileOnBattlefield, filterPermanents, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new ForestwalkAbility(), Duration.WhileOnBattlefield, filterCreatures, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filterPermanents, true))); } public EladamriLordOfLeaves(final EladamriLordOfLeaves card) { diff --git a/Mage.Sets/src/mage/sets/tempest/EliteJavelineer.java b/Mage.Sets/src/mage/sets/tempest/EliteJavelineer.java index 341be226cd3..eeddf5ce191 100644 --- a/Mage.Sets/src/mage/sets/tempest/EliteJavelineer.java +++ b/Mage.Sets/src/mage/sets/tempest/EliteJavelineer.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BlocksTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/tempest/ElvishFury.java b/Mage.Sets/src/mage/sets/tempest/ElvishFury.java index 6d4f417949e..461d9e1ab2b 100644 --- a/Mage.Sets/src/mage/sets/tempest/ElvishFury.java +++ b/Mage.Sets/src/mage/sets/tempest/ElvishFury.java @@ -28,9 +28,9 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.BuybackAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tempest/EmeraldMedallion.java b/Mage.Sets/src/mage/sets/tempest/EmeraldMedallion.java index 3d8846be39e..af6b6fbdb4a 100644 --- a/Mage.Sets/src/mage/sets/tempest/EmeraldMedallion.java +++ b/Mage.Sets/src/mage/sets/tempest/EmeraldMedallion.java @@ -28,9 +28,9 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.cost.SpellsCostReductionEffect; diff --git a/Mage.Sets/src/mage/sets/tempest/Energizer.java b/Mage.Sets/src/mage/sets/tempest/Energizer.java index 9fe4d670646..2a5329458cd 100644 --- a/Mage.Sets/src/mage/sets/tempest/Energizer.java +++ b/Mage.Sets/src/mage/sets/tempest/Energizer.java @@ -29,9 +29,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; /** @@ -53,7 +53,7 @@ public class Energizer extends CardImpl { this.subtype.add("Juggernaut"); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/Enfeeblement.java b/Mage.Sets/src/mage/sets/tempest/Enfeeblement.java index b236a644284..66e7f4d860b 100644 --- a/Mage.Sets/src/mage/sets/tempest/Enfeeblement.java +++ b/Mage.Sets/src/mage/sets/tempest/Enfeeblement.java @@ -29,9 +29,7 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -53,10 +51,10 @@ public class Enfeeblement extends CardImpl { this.color.setBlack(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(-2, -2, Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-2, -2, Duration.WhileOnBattlefield))); } public Enfeeblement(final Enfeeblement card) { diff --git a/Mage.Sets/src/mage/sets/tempest/EssenceBottle.java b/Mage.Sets/src/mage/sets/tempest/EssenceBottle.java index 463d1863748..7e8c57e9329 100644 --- a/Mage.Sets/src/mage/sets/tempest/EssenceBottle.java +++ b/Mage.Sets/src/mage/sets/tempest/EssenceBottle.java @@ -28,10 +28,10 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.Cost; diff --git a/Mage.Sets/src/mage/sets/tempest/FeveredConvulsions.java b/Mage.Sets/src/mage/sets/tempest/FeveredConvulsions.java index 06cd3746d39..c1155ade9b3 100644 --- a/Mage.Sets/src/mage/sets/tempest/FeveredConvulsions.java +++ b/Mage.Sets/src/mage/sets/tempest/FeveredConvulsions.java @@ -29,14 +29,14 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; @@ -50,7 +50,7 @@ public class FeveredConvulsions extends CardImpl { super(ownerId, 30, "Fevered Convulsions", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{B}{B}"); this.expansionSetCode = "TMP"; this.color.setBlack(true); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.M1M1.createInstance(1)), new ManaCostsImpl("{2}{B}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.M1M1.createInstance(1)), new ManaCostsImpl("{2}{B}{B}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/FightingDrake.java b/Mage.Sets/src/mage/sets/tempest/FightingDrake.java index 57ada0ffd10..15a26dc4867 100644 --- a/Mage.Sets/src/mage/sets/tempest/FightingDrake.java +++ b/Mage.Sets/src/mage/sets/tempest/FightingDrake.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tempest/Firefly.java b/Mage.Sets/src/mage/sets/tempest/Firefly.java index b869105b074..7ebb03037c4 100644 --- a/Mage.Sets/src/mage/sets/tempest/Firefly.java +++ b/Mage.Sets/src/mage/sets/tempest/Firefly.java @@ -29,9 +29,7 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -53,7 +51,7 @@ public class Firefly extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); } public Firefly(final Firefly card) { diff --git a/Mage.Sets/src/mage/sets/tempest/Fireslinger.java b/Mage.Sets/src/mage/sets/tempest/Fireslinger.java index 46d539e86d2..62e19e7d55f 100644 --- a/Mage.Sets/src/mage/sets/tempest/Fireslinger.java +++ b/Mage.Sets/src/mage/sets/tempest/Fireslinger.java @@ -29,9 +29,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; /** @@ -55,7 +55,7 @@ public class Fireslinger extends CardImpl { this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addEffect(new DamageControllerEffect(1)); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/tempest/FlowstoneGiant.java b/Mage.Sets/src/mage/sets/tempest/FlowstoneGiant.java index 7917c4a333a..20a52345729 100644 --- a/Mage.Sets/src/mage/sets/tempest/FlowstoneGiant.java +++ b/Mage.Sets/src/mage/sets/tempest/FlowstoneGiant.java @@ -29,9 +29,7 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -51,7 +49,7 @@ public class FlowstoneGiant extends CardImpl { this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(2, -2, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, -2, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); } public FlowstoneGiant(final FlowstoneGiant card) { diff --git a/Mage.Sets/src/mage/sets/tempest/FlowstoneWyvern.java b/Mage.Sets/src/mage/sets/tempest/FlowstoneWyvern.java index 0fa4e6f88da..a2b6340cd79 100644 --- a/Mage.Sets/src/mage/sets/tempest/FlowstoneWyvern.java +++ b/Mage.Sets/src/mage/sets/tempest/FlowstoneWyvern.java @@ -29,9 +29,7 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -53,7 +51,7 @@ public class FlowstoneWyvern extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(2, -2, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, -2, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); } public FlowstoneWyvern(final FlowstoneWyvern card) { diff --git a/Mage.Sets/src/mage/sets/tempest/FrogTongue.java b/Mage.Sets/src/mage/sets/tempest/FrogTongue.java index adda684d06b..014ca4ebe44 100644 --- a/Mage.Sets/src/mage/sets/tempest/FrogTongue.java +++ b/Mage.Sets/src/mage/sets/tempest/FrogTongue.java @@ -29,9 +29,7 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -56,11 +54,11 @@ public class FrogTongue extends CardImpl { this.color.setGreen(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardControllerEffect(1), false)); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ReachAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ReachAbility.getInstance(), AttachmentType.AURA))); } public FrogTongue(final FrogTongue card) { diff --git a/Mage.Sets/src/mage/sets/tempest/FurnaceOfRath.java b/Mage.Sets/src/mage/sets/tempest/FurnaceOfRath.java index e25b6f7d017..4a41526f7c7 100644 --- a/Mage.Sets/src/mage/sets/tempest/FurnaceOfRath.java +++ b/Mage.Sets/src/mage/sets/tempest/FurnaceOfRath.java @@ -28,9 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; @@ -56,7 +55,7 @@ public class FurnaceOfRath extends CardImpl { this.color.setRed(true); // If a source would deal damage to a creature or player, it deals double that damage to that creature or player instead. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new FurnaceOfRathEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FurnaceOfRathEffect())); } public FurnaceOfRath(final FurnaceOfRath card) { @@ -72,7 +71,7 @@ public class FurnaceOfRath extends CardImpl { class FurnaceOfRathEffect extends ReplacementEffectImpl { public FurnaceOfRathEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Damage); + super(Duration.WhileOnBattlefield, Outcome.Damage); staticText = "If a source would deal damage to a creature or player, that source deals double that damage to that creature or player instead"; } diff --git a/Mage.Sets/src/mage/sets/tempest/Gallantry.java b/Mage.Sets/src/mage/sets/tempest/Gallantry.java index 2e772f765be..5ea9fe492d8 100644 --- a/Mage.Sets/src/mage/sets/tempest/Gallantry.java +++ b/Mage.Sets/src/mage/sets/tempest/Gallantry.java @@ -29,9 +29,9 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tempest/GerrardsBattleCry.java b/Mage.Sets/src/mage/sets/tempest/GerrardsBattleCry.java index b1c8d5bfa20..68ea52e09c2 100644 --- a/Mage.Sets/src/mage/sets/tempest/GerrardsBattleCry.java +++ b/Mage.Sets/src/mage/sets/tempest/GerrardsBattleCry.java @@ -29,13 +29,14 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; /** @@ -48,7 +49,7 @@ public class GerrardsBattleCry extends CardImpl { super(ownerId, 233, "Gerrard's Battle Cry", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{W}"); this.expansionSetCode = "TMP"; this.color.setWhite(true); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Constants.Duration.EndOfTurn, new FilterCreaturePermanent(), false), new ManaCostsImpl("{2}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.EndOfTurn, new FilterCreaturePermanent(), false), new ManaCostsImpl("{2}{W}"))); } public GerrardsBattleCry(final GerrardsBattleCry card) { diff --git a/Mage.Sets/src/mage/sets/tempest/GiantCrab.java b/Mage.Sets/src/mage/sets/tempest/GiantCrab.java index adcd7376661..ddbdc1bf74d 100644 --- a/Mage.Sets/src/mage/sets/tempest/GiantCrab.java +++ b/Mage.Sets/src/mage/sets/tempest/GiantCrab.java @@ -29,9 +29,7 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -51,7 +49,7 @@ public class GiantCrab extends CardImpl { this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(ShroudAbility.getInstance(), Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.U))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U))); } public GiantCrab(final GiantCrab card) { diff --git a/Mage.Sets/src/mage/sets/tempest/GiantStrength.java b/Mage.Sets/src/mage/sets/tempest/GiantStrength.java index b6b3a920140..ea5b20d577c 100644 --- a/Mage.Sets/src/mage/sets/tempest/GiantStrength.java +++ b/Mage.Sets/src/mage/sets/tempest/GiantStrength.java @@ -29,9 +29,7 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -53,10 +51,10 @@ public class GiantStrength extends CardImpl { this.color.setRed(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); } public GiantStrength(final GiantStrength card) { diff --git a/Mage.Sets/src/mage/sets/tempest/GoblinBombardment.java b/Mage.Sets/src/mage/sets/tempest/GoblinBombardment.java index 3f12f09bbdf..c530945d8f4 100644 --- a/Mage.Sets/src/mage/sets/tempest/GoblinBombardment.java +++ b/Mage.Sets/src/mage/sets/tempest/GoblinBombardment.java @@ -29,14 +29,14 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreatureOrPlayer; @@ -50,7 +50,7 @@ public class GoblinBombardment extends CardImpl { super(ownerId, 179, "Goblin Bombardment", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}"); this.expansionSetCode = "TMP"; this.color.setRed(true); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeTargetCost(new TargetControlledCreaturePermanent(1))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeTargetCost(new TargetControlledCreaturePermanent(1))); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/HannasCustody.java b/Mage.Sets/src/mage/sets/tempest/HannasCustody.java index 2f2ac318364..a5bc3d56ea6 100644 --- a/Mage.Sets/src/mage/sets/tempest/HannasCustody.java +++ b/Mage.Sets/src/mage/sets/tempest/HannasCustody.java @@ -29,13 +29,14 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -55,7 +56,7 @@ public class HannasCustody extends CardImpl { super(ownerId, 234, "Hanna's Custody", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); this.expansionSetCode = "TMP"; this.color.setWhite(true); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAllEffect(ShroudAbility.getInstance(), Constants.Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); } public HannasCustody(final HannasCustody card) { diff --git a/Mage.Sets/src/mage/sets/tempest/Harrow.java b/Mage.Sets/src/mage/sets/tempest/Harrow.java index 3bcf92327db..e226faf952b 100644 --- a/Mage.Sets/src/mage/sets/tempest/Harrow.java +++ b/Mage.Sets/src/mage/sets/tempest/Harrow.java @@ -28,7 +28,7 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/tempest/HeartSliver.java b/Mage.Sets/src/mage/sets/tempest/HeartSliver.java index 3cf13957b82..fe90d1c3478 100644 --- a/Mage.Sets/src/mage/sets/tempest/HeartSliver.java +++ b/Mage.Sets/src/mage/sets/tempest/HeartSliver.java @@ -29,14 +29,15 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -58,7 +59,7 @@ public class HeartSliver extends CardImpl { this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Constants.Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); } public HeartSliver(final HeartSliver card) { diff --git a/Mage.Sets/src/mage/sets/tempest/HeartwoodGiant.java b/Mage.Sets/src/mage/sets/tempest/HeartwoodGiant.java index fa76cc6c6e7..f3e9e56df14 100644 --- a/Mage.Sets/src/mage/sets/tempest/HeartwoodGiant.java +++ b/Mage.Sets/src/mage/sets/tempest/HeartwoodGiant.java @@ -29,9 +29,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPlayer; @@ -63,7 +63,7 @@ public class HeartwoodGiant extends CardImpl { this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(4); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/tempest/HeartwoodTreefolk.java b/Mage.Sets/src/mage/sets/tempest/HeartwoodTreefolk.java index 4a2655bd94c..c1dd0412d31 100644 --- a/Mage.Sets/src/mage/sets/tempest/HeartwoodTreefolk.java +++ b/Mage.Sets/src/mage/sets/tempest/HeartwoodTreefolk.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ForestwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tempest/HerosResolve.java b/Mage.Sets/src/mage/sets/tempest/HerosResolve.java index eae8659f76f..325f436a00f 100644 --- a/Mage.Sets/src/mage/sets/tempest/HerosResolve.java +++ b/Mage.Sets/src/mage/sets/tempest/HerosResolve.java @@ -29,9 +29,7 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -54,10 +52,10 @@ public class HerosResolve extends CardImpl { this.color.setWhite(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 5, Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 5, Duration.WhileOnBattlefield))); } public HerosResolve(final HerosResolve card) { diff --git a/Mage.Sets/src/mage/sets/tempest/HornedSliver.java b/Mage.Sets/src/mage/sets/tempest/HornedSliver.java index 2767eba4826..7f9c41c6a30 100644 --- a/Mage.Sets/src/mage/sets/tempest/HornedSliver.java +++ b/Mage.Sets/src/mage/sets/tempest/HornedSliver.java @@ -29,14 +29,15 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -58,7 +59,7 @@ public class HornedSliver extends CardImpl { this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAllEffect(TrampleAbility.getInstance(), Constants.Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); } public HornedSliver(final HornedSliver card) { diff --git a/Mage.Sets/src/mage/sets/tempest/Intuition.java b/Mage.Sets/src/mage/sets/tempest/Intuition.java index 69ca022eb52..ab2291ffac9 100644 --- a/Mage.Sets/src/mage/sets/tempest/Intuition.java +++ b/Mage.Sets/src/mage/sets/tempest/Intuition.java @@ -29,16 +29,17 @@ package mage.sets.tempest; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.SearchEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.game.Game; import mage.players.Player; @@ -112,19 +113,19 @@ class IntuitionEffect extends SearchEffect { } player.revealCards("Reveal", cards, game); - TargetCard targetCard = new TargetCard(Constants.Zone.PICK, new FilterCard()); + TargetCard targetCard = new TargetCard(Zone.PICK, new FilterCard()); targetCard.setRequired(true); while(!opponent.choose(Outcome.Neutral, cards, targetCard, game)); Card card = cards.get(targetCard.getFirstTarget(), game); if (card != null) { cards.remove(card); - card.moveToZone(Constants.Zone.HAND, source.getId(), game, false); + card.moveToZone(Zone.HAND, source.getId(), game, false); } for(UUID uuid : cards){ card = cards.get(uuid, game); - card.moveToZone(Constants.Zone.GRAVEYARD, source.getId(), game, false); + card.moveToZone(Zone.GRAVEYARD, source.getId(), game, false); } } diff --git a/Mage.Sets/src/mage/sets/tempest/JackalPup.java b/Mage.Sets/src/mage/sets/tempest/JackalPup.java index 7114f8f38b9..0888b076e52 100644 --- a/Mage.Sets/src/mage/sets/tempest/JackalPup.java +++ b/Mage.Sets/src/mage/sets/tempest/JackalPup.java @@ -28,14 +28,16 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; @@ -74,7 +76,7 @@ public class JackalPup extends CardImpl { class JackalPupTriggeredAbility extends TriggeredAbilityImpl { public JackalPupTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new JackalPupEffect()); + super(Zone.BATTLEFIELD, new JackalPupEffect()); } public JackalPupTriggeredAbility(final JackalPupTriggeredAbility effect) { @@ -105,7 +107,7 @@ class JackalPupTriggeredAbility extends TriggeredAbilityImpl { public JackalPupEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "it deals that much damage to you"; } diff --git a/Mage.Sets/src/mage/sets/tempest/JetMedallion.java b/Mage.Sets/src/mage/sets/tempest/JetMedallion.java index a412fba2154..15bd529a69c 100644 --- a/Mage.Sets/src/mage/sets/tempest/JetMedallion.java +++ b/Mage.Sets/src/mage/sets/tempest/JetMedallion.java @@ -28,9 +28,9 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.cost.SpellsCostReductionEffect; diff --git a/Mage.Sets/src/mage/sets/tempest/Kezzerdrix.java b/Mage.Sets/src/mage/sets/tempest/Kezzerdrix.java index 20e1d5d56fc..eefdfec1391 100644 --- a/Mage.Sets/src/mage/sets/tempest/Kezzerdrix.java +++ b/Mage.Sets/src/mage/sets/tempest/Kezzerdrix.java @@ -28,9 +28,9 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.condition.common.NoCreatureOpponentCondition; @@ -38,6 +38,8 @@ import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; +import mage.constants.Zone; /** * @@ -59,7 +61,7 @@ public class Kezzerdrix extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // At the beginning of your upkeep, if your opponents control no creatures, Kezzerdrix deals 4 damage to you. - ConditionalTriggeredAbility ability = new ConditionalTriggeredAbility(new BeginningOfUpkeepTriggeredAbility(Constants.Zone.BATTLEFIELD, new DamageControllerEffect(4), Constants.TargetController.YOU, false), NoCreatureOpponentCondition.getInstance(), "At the beginning of your upkeep, if your opponents control no creatures, {this} deals 4 damage to you."); + ConditionalTriggeredAbility ability = new ConditionalTriggeredAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new DamageControllerEffect(4), TargetController.YOU, false), NoCreatureOpponentCondition.getInstance(), "At the beginning of your upkeep, if your opponents control no creatures, {this} deals 4 damage to you."); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/LightningBlast.java b/Mage.Sets/src/mage/sets/tempest/LightningBlast.java index 896084fdd0f..040068445a3 100644 --- a/Mage.Sets/src/mage/sets/tempest/LightningBlast.java +++ b/Mage.Sets/src/mage/sets/tempest/LightningBlast.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreatureOrPlayer; diff --git a/Mage.Sets/src/mage/sets/tempest/Lobotomy.java b/Mage.Sets/src/mage/sets/tempest/Lobotomy.java index 908a2f5a3c2..39292f73e91 100644 --- a/Mage.Sets/src/mage/sets/tempest/Lobotomy.java +++ b/Mage.Sets/src/mage/sets/tempest/Lobotomy.java @@ -28,15 +28,17 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SupertypePredicate; @@ -82,7 +84,7 @@ class LobotomyEffect extends OneShotEffect { } public LobotomyEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "Target player reveals his or her hand, then you choose a card other than a basic land card from it. Search that player's graveyard, hand, and library for all cards with the same name as the chosen card and exile them. Then that player shuffles his or her library"; } @@ -97,25 +99,25 @@ class LobotomyEffect extends OneShotEffect { if (targetPlayer != null) { targetPlayer.revealCards("Lobotomy", targetPlayer.getHand(), game); if (you != null) { - TargetCard target = new TargetCard(Constants.Zone.PICK, filter); + TargetCard target = new TargetCard(Zone.PICK, filter); target.setRequired(true); target.setNotTarget(true); - if (you.choose(Constants.Outcome.Benefit, targetPlayer.getHand(), target, game)) { + if (you.choose(Outcome.Benefit, targetPlayer.getHand(), target, game)) { Card chosenCard = targetPlayer.getHand().get(target.getFirstTarget(), game); if (chosenCard != null) { if (targetPlayer != null) { //cards in Library - Cards cardsInLibrary = new CardsImpl(Constants.Zone.LIBRARY); + Cards cardsInLibrary = new CardsImpl(Zone.LIBRARY); cardsInLibrary.addAll(targetPlayer.getLibrary().getCards(game)); you.lookAtCards("Lobotomy search of Library", cardsInLibrary, game); // cards in Graveyard - Cards cardsInGraveyard = new CardsImpl(Constants.Zone.GRAVEYARD); + Cards cardsInGraveyard = new CardsImpl(Zone.GRAVEYARD); cardsInGraveyard.addAll(targetPlayer.getGraveyard()); // cards in Hand - Cards cardsInHand = new CardsImpl(Constants.Zone.HAND); + Cards cardsInHand = new CardsImpl(Zone.HAND); cardsInHand.addAll(targetPlayer.getHand()); you.lookAtCards("Lobotomy search of Hand", cardsInHand, game); diff --git a/Mage.Sets/src/mage/sets/tempest/LotusPetal.java b/Mage.Sets/src/mage/sets/tempest/LotusPetal.java index 8563e9f6f51..f82f7f1959d 100644 --- a/Mage.Sets/src/mage/sets/tempest/LotusPetal.java +++ b/Mage.Sets/src/mage/sets/tempest/LotusPetal.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.mana.AnyColorManaAbility; diff --git a/Mage.Sets/src/mage/sets/tempest/LowlandGiant.java b/Mage.Sets/src/mage/sets/tempest/LowlandGiant.java index 601651a45da..d761d8c8d07 100644 --- a/Mage.Sets/src/mage/sets/tempest/LowlandGiant.java +++ b/Mage.Sets/src/mage/sets/tempest/LowlandGiant.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tempest/Manakin.java b/Mage.Sets/src/mage/sets/tempest/Manakin.java index 79e8ea8701f..63a8f01c845 100644 --- a/Mage.Sets/src/mage/sets/tempest/Manakin.java +++ b/Mage.Sets/src/mage/sets/tempest/Manakin.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tempest/MantaRiders.java b/Mage.Sets/src/mage/sets/tempest/MantaRiders.java index 82ba3074920..43577ce65e2 100644 --- a/Mage.Sets/src/mage/sets/tempest/MantaRiders.java +++ b/Mage.Sets/src/mage/sets/tempest/MantaRiders.java @@ -29,9 +29,7 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -52,7 +50,7 @@ public class MantaRiders extends CardImpl { this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.U))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U))); } public MantaRiders(final MantaRiders card) { diff --git a/Mage.Sets/src/mage/sets/tempest/MarshLurker.java b/Mage.Sets/src/mage/sets/tempest/MarshLurker.java index 75623c5037e..f10ee5ba264 100644 --- a/Mage.Sets/src/mage/sets/tempest/MarshLurker.java +++ b/Mage.Sets/src/mage/sets/tempest/MarshLurker.java @@ -29,15 +29,16 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; @@ -61,7 +62,7 @@ public class MarshLurker extends CardImpl { this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(FearAbility.getInstance(), Constants.Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(filter)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FearAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(filter)))); } public MarshLurker(final MarshLurker card) { diff --git a/Mage.Sets/src/mage/sets/tempest/MasterDecoy.java b/Mage.Sets/src/mage/sets/tempest/MasterDecoy.java index 0b042d0d8e9..192d977d714 100644 --- a/Mage.Sets/src/mage/sets/tempest/MasterDecoy.java +++ b/Mage.Sets/src/mage/sets/tempest/MasterDecoy.java @@ -29,9 +29,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -55,7 +56,7 @@ public class MasterDecoy extends CardImpl { this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/tempest/Mawcor.java b/Mage.Sets/src/mage/sets/tempest/Mawcor.java index a2b1db2c5d7..c9f8463579f 100644 --- a/Mage.Sets/src/mage/sets/tempest/Mawcor.java +++ b/Mage.Sets/src/mage/sets/tempest/Mawcor.java @@ -29,9 +29,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; /** @@ -55,7 +55,7 @@ public class Mawcor extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/Meditate.java b/Mage.Sets/src/mage/sets/tempest/Meditate.java index 098ca63c56c..18db0bb6aaa 100644 --- a/Mage.Sets/src/mage/sets/tempest/Meditate.java +++ b/Mage.Sets/src/mage/sets/tempest/Meditate.java @@ -28,13 +28,14 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.turn.TurnMod; @@ -68,7 +69,7 @@ public class Meditate extends CardImpl { class SpipTurnEffect extends OneShotEffect { public SpipTurnEffect() { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); staticText = "You skip your next turn"; } diff --git a/Mage.Sets/src/mage/sets/tempest/MetallicSliver.java b/Mage.Sets/src/mage/sets/tempest/MetallicSliver.java index b17e0d204ba..2ac7056a082 100644 --- a/Mage.Sets/src/mage/sets/tempest/MetallicSliver.java +++ b/Mage.Sets/src/mage/sets/tempest/MetallicSliver.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tempest/MnemonicSliver.java b/Mage.Sets/src/mage/sets/tempest/MnemonicSliver.java index 423c98a042f..b3429c03feb 100644 --- a/Mage.Sets/src/mage/sets/tempest/MnemonicSliver.java +++ b/Mage.Sets/src/mage/sets/tempest/MnemonicSliver.java @@ -29,9 +29,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -62,9 +63,9 @@ public class MnemonicSliver extends CardImpl { this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability gainedAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(2)); + Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(2)); gainedAbility.addCost(new SacrificeSourceCost()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAllEffect(gainedAbility, Constants.Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(gainedAbility, Duration.WhileOnBattlefield, filter, false))); } public MnemonicSliver(final MnemonicSliver card) { diff --git a/Mage.Sets/src/mage/sets/tempest/MoggFanatic.java b/Mage.Sets/src/mage/sets/tempest/MoggFanatic.java index 3445dbaa557..7582ab60bac 100644 --- a/Mage.Sets/src/mage/sets/tempest/MoggFanatic.java +++ b/Mage.Sets/src/mage/sets/tempest/MoggFanatic.java @@ -29,15 +29,15 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; /** @@ -53,7 +53,7 @@ public class MoggFanatic extends CardImpl { this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/MoggHollows.java b/Mage.Sets/src/mage/sets/tempest/MoggHollows.java index fe74677d9a2..eaaf492c8a3 100644 --- a/Mage.Sets/src/mage/sets/tempest/MoggHollows.java +++ b/Mage.Sets/src/mage/sets/tempest/MoggHollows.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.SkipNextUntapSourceEffect; import mage.abilities.mana.ColorlessManaAbility; diff --git a/Mage.Sets/src/mage/sets/tempest/MoggRaider.java b/Mage.Sets/src/mage/sets/tempest/MoggRaider.java index dd6529913da..d93229fc505 100644 --- a/Mage.Sets/src/mage/sets/tempest/MoggRaider.java +++ b/Mage.Sets/src/mage/sets/tempest/MoggRaider.java @@ -29,15 +29,16 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; @@ -62,7 +63,7 @@ public class MoggRaider extends CardImpl { this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Constants.Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(filter))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/MongrelPack.java b/Mage.Sets/src/mage/sets/tempest/MongrelPack.java index ef115470471..2a5df095dd9 100644 --- a/Mage.Sets/src/mage/sets/tempest/MongrelPack.java +++ b/Mage.Sets/src/mage/sets/tempest/MongrelPack.java @@ -28,10 +28,10 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TurnPhase; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TurnPhase; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.ZoneChangeTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/tempest/MuscleSliver.java b/Mage.Sets/src/mage/sets/tempest/MuscleSliver.java index e258bd8fadf..4b9f71420dc 100644 --- a/Mage.Sets/src/mage/sets/tempest/MuscleSliver.java +++ b/Mage.Sets/src/mage/sets/tempest/MuscleSliver.java @@ -29,13 +29,14 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -57,7 +58,7 @@ public class MuscleSliver extends CardImpl { this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Constants.Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); } public MuscleSliver(final MuscleSliver card) { diff --git a/Mage.Sets/src/mage/sets/tempest/NaturalSpring.java b/Mage.Sets/src/mage/sets/tempest/NaturalSpring.java index 230c1206cc5..5c172e95248 100644 --- a/Mage.Sets/src/mage/sets/tempest/NaturalSpring.java +++ b/Mage.Sets/src/mage/sets/tempest/NaturalSpring.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.GainLifeTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/tempest/NeedleStorm.java b/Mage.Sets/src/mage/sets/tempest/NeedleStorm.java index 2b00a0a0820..dc60a31eae5 100644 --- a/Mage.Sets/src/mage/sets/tempest/NeedleStorm.java +++ b/Mage.Sets/src/mage/sets/tempest/NeedleStorm.java @@ -29,8 +29,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tempest/Opportunist.java b/Mage.Sets/src/mage/sets/tempest/Opportunist.java index e7842a29977..1038911331e 100644 --- a/Mage.Sets/src/mage/sets/tempest/Opportunist.java +++ b/Mage.Sets/src/mage/sets/tempest/Opportunist.java @@ -30,9 +30,9 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/tempest/OrimSamiteHealer.java b/Mage.Sets/src/mage/sets/tempest/OrimSamiteHealer.java index e903bc7d89f..2d8a7c4b14b 100644 --- a/Mage.Sets/src/mage/sets/tempest/OrimSamiteHealer.java +++ b/Mage.Sets/src/mage/sets/tempest/OrimSamiteHealer.java @@ -29,15 +29,16 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.PreventDamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; /** @@ -55,7 +56,7 @@ public class OrimSamiteHealer extends CardImpl { this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PreventDamageTargetEffect(Constants.Duration.EndOfTurn, 3), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageTargetEffect(Duration.EndOfTurn, 3), new TapSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); // {tap}: Prevent the next 3 damage that would be dealt to target creature or player this turn. diff --git a/Mage.Sets/src/mage/sets/tempest/PatchworkGnomes.java b/Mage.Sets/src/mage/sets/tempest/PatchworkGnomes.java index 72f4e4bd1a5..62ce5c5e63e 100644 --- a/Mage.Sets/src/mage/sets/tempest/PatchworkGnomes.java +++ b/Mage.Sets/src/mage/sets/tempest/PatchworkGnomes.java @@ -29,14 +29,14 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.DiscardTargetCost; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.target.common.TargetCardInHand; @@ -55,7 +55,7 @@ public class PatchworkGnomes extends CardImpl { this.toughness = new MageInt(1); // Discard a card: Regenerate Patchwork Gnomes. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new DiscardTargetCost(new TargetCardInHand(new FilterCard("a card"))))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new DiscardTargetCost(new TargetCardInHand(new FilterCard("a card"))))); } public PatchworkGnomes(final PatchworkGnomes card) { diff --git a/Mage.Sets/src/mage/sets/tempest/PearlMedallion.java b/Mage.Sets/src/mage/sets/tempest/PearlMedallion.java index cfbc5184078..9c51f16c415 100644 --- a/Mage.Sets/src/mage/sets/tempest/PearlMedallion.java +++ b/Mage.Sets/src/mage/sets/tempest/PearlMedallion.java @@ -28,9 +28,9 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.cost.SpellsCostReductionEffect; diff --git a/Mage.Sets/src/mage/sets/tempest/Perish.java b/Mage.Sets/src/mage/sets/tempest/Perish.java index 0430a4dd02f..45166c113c7 100644 --- a/Mage.Sets/src/mage/sets/tempest/Perish.java +++ b/Mage.Sets/src/mage/sets/tempest/Perish.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tempest/PhyrexianHulk.java b/Mage.Sets/src/mage/sets/tempest/PhyrexianHulk.java index d1a176e5e2f..a7908e99f1f 100644 --- a/Mage.Sets/src/mage/sets/tempest/PhyrexianHulk.java +++ b/Mage.Sets/src/mage/sets/tempest/PhyrexianHulk.java @@ -28,7 +28,7 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/tempest/PincherBeetles.java b/Mage.Sets/src/mage/sets/tempest/PincherBeetles.java index 1519e4691a4..6a5ba9d0ada 100644 --- a/Mage.Sets/src/mage/sets/tempest/PincherBeetles.java +++ b/Mage.Sets/src/mage/sets/tempest/PincherBeetles.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tempest/PineBarrens.java b/Mage.Sets/src/mage/sets/tempest/PineBarrens.java index 1c900ae900c..a79d6db00db 100644 --- a/Mage.Sets/src/mage/sets/tempest/PineBarrens.java +++ b/Mage.Sets/src/mage/sets/tempest/PineBarrens.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.effects.common.DamageControllerEffect; diff --git a/Mage.Sets/src/mage/sets/tempest/Propaganda.java b/Mage.Sets/src/mage/sets/tempest/Propaganda.java index bfd7dd5c01c..84aeb413011 100644 --- a/Mage.Sets/src/mage/sets/tempest/Propaganda.java +++ b/Mage.Sets/src/mage/sets/tempest/Propaganda.java @@ -29,16 +29,17 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; @@ -71,7 +72,7 @@ class PropagandaReplacementEffect extends ReplacementEffectImpl { this.expansionSetCode = "TMP"; // {2}, {tap}: You may tap or untap target creature. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/tempest/RainOfTears.java b/Mage.Sets/src/mage/sets/tempest/RainOfTears.java index 4da61992284..e364a7490d3 100644 --- a/Mage.Sets/src/mage/sets/tempest/RainOfTears.java +++ b/Mage.Sets/src/mage/sets/tempest/RainOfTears.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetLandPermanent; diff --git a/Mage.Sets/src/mage/sets/tempest/RangerEnVec.java b/Mage.Sets/src/mage/sets/tempest/RangerEnVec.java index c2ac95035fd..9b7ef3cac0d 100644 --- a/Mage.Sets/src/mage/sets/tempest/RangerEnVec.java +++ b/Mage.Sets/src/mage/sets/tempest/RangerEnVec.java @@ -29,15 +29,16 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; /** * @@ -56,7 +57,7 @@ public class RangerEnVec extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FirstStrikeAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.G))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.G))); } public RangerEnVec(final RangerEnVec card) { diff --git a/Mage.Sets/src/mage/sets/tempest/RatsOfRath.java b/Mage.Sets/src/mage/sets/tempest/RatsOfRath.java index 798c1a6b230..28b025cd2f4 100644 --- a/Mage.Sets/src/mage/sets/tempest/RatsOfRath.java +++ b/Mage.Sets/src/mage/sets/tempest/RatsOfRath.java @@ -29,15 +29,16 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -65,7 +66,7 @@ public class RatsOfRath extends CardImpl { this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ColoredManaCost(ColoredManaSymbol.B)); ability.addTarget(new TargetControlledPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/RecklessSpite.java b/Mage.Sets/src/mage/sets/tempest/RecklessSpite.java index 543254e3089..1408c5eb93d 100644 --- a/Mage.Sets/src/mage/sets/tempest/RecklessSpite.java +++ b/Mage.Sets/src/mage/sets/tempest/RecklessSpite.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.LoseLifeSourceEffect; diff --git a/Mage.Sets/src/mage/sets/tempest/ReflectingPool.java b/Mage.Sets/src/mage/sets/tempest/ReflectingPool.java index 0a301d6c51a..99abc014c7a 100644 --- a/Mage.Sets/src/mage/sets/tempest/ReflectingPool.java +++ b/Mage.Sets/src/mage/sets/tempest/ReflectingPool.java @@ -29,9 +29,9 @@ package mage.sets.tempest; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.Abilities; import mage.abilities.Ability; @@ -42,6 +42,7 @@ import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.choices.Choice; import mage.choices.ChoiceImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.game.Game; @@ -59,7 +60,7 @@ public class ReflectingPool extends CardImpl { this.expansionSetCode = "TMP"; // {T}: Add to your mana pool one mana of any type that a land you control could produce. - this.addAbility(new SimpleManaAbility(Constants.Zone.BATTLEFIELD, new ReflectingPoolEffect(), new TapSourceCost())); + this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new ReflectingPoolEffect(), new TapSourceCost())); } public ReflectingPool(final ReflectingPool card) { @@ -90,7 +91,7 @@ class ReflectingPoolEffect extends ManaEffect { List lands = game.getBattlefield().getActivePermanents(filter, source.getControllerId(), game); Mana types = new Mana(); for (Permanent land : lands) { - Abilities mana = land.getAbilities().getManaAbilities(Constants.Zone.BATTLEFIELD); + Abilities mana = land.getAbilities().getManaAbilities(Zone.BATTLEFIELD); for (ManaAbility ability : mana) { types.add(ability.getNetMana(game)); } diff --git a/Mage.Sets/src/mage/sets/tempest/RenegadeWarlord.java b/Mage.Sets/src/mage/sets/tempest/RenegadeWarlord.java index c2b6659b92f..ead30e1d629 100644 --- a/Mage.Sets/src/mage/sets/tempest/RenegadeWarlord.java +++ b/Mage.Sets/src/mage/sets/tempest/RenegadeWarlord.java @@ -29,14 +29,14 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterAttackingCreature; /** @@ -54,7 +54,7 @@ public class RenegadeWarlord extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FirstStrikeAbility.getInstance()); - this.addAbility(new AttacksTriggeredAbility(new BoostAllEffect(1, 0, Constants.Duration.EndOfTurn, new FilterAttackingCreature(), true), false)); + this.addAbility(new AttacksTriggeredAbility(new BoostAllEffect(1, 0, Duration.EndOfTurn, new FilterAttackingCreature(), true), false)); } public RenegadeWarlord(final RenegadeWarlord card) { diff --git a/Mage.Sets/src/mage/sets/tempest/RootbreakerWurm.java b/Mage.Sets/src/mage/sets/tempest/RootbreakerWurm.java index c3acf2912b2..4d0369d96aa 100644 --- a/Mage.Sets/src/mage/sets/tempest/RootbreakerWurm.java +++ b/Mage.Sets/src/mage/sets/tempest/RootbreakerWurm.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tempest/Rootwalla.java b/Mage.Sets/src/mage/sets/tempest/Rootwalla.java index ef810ea4acd..47fe4cc2e80 100644 --- a/Mage.Sets/src/mage/sets/tempest/Rootwalla.java +++ b/Mage.Sets/src/mage/sets/tempest/Rootwalla.java @@ -29,14 +29,15 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.ActivateOncePerTurnActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -51,7 +52,7 @@ public class Rootwalla extends CardImpl { this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new ActivateOncePerTurnActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Constants.Duration.EndOfTurn), new ManaCostsImpl("{1}{G}"))); + this.addAbility(new ActivateOncePerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("{1}{G}"))); } public Rootwalla(final Rootwalla card) { diff --git a/Mage.Sets/src/mage/sets/tempest/RootwaterDepths.java b/Mage.Sets/src/mage/sets/tempest/RootwaterDepths.java index 66d0b40d3be..a2487188aec 100644 --- a/Mage.Sets/src/mage/sets/tempest/RootwaterDepths.java +++ b/Mage.Sets/src/mage/sets/tempest/RootwaterDepths.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.SkipNextUntapSourceEffect; import mage.abilities.mana.BlackManaAbility; diff --git a/Mage.Sets/src/mage/sets/tempest/RootwaterHunter.java b/Mage.Sets/src/mage/sets/tempest/RootwaterHunter.java index 125afd8b368..e5e8703f223 100644 --- a/Mage.Sets/src/mage/sets/tempest/RootwaterHunter.java +++ b/Mage.Sets/src/mage/sets/tempest/RootwaterHunter.java @@ -29,15 +29,15 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; /** @@ -53,7 +53,7 @@ public class RootwaterHunter extends CardImpl { this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/RootwaterMatriarch.java b/Mage.Sets/src/mage/sets/tempest/RootwaterMatriarch.java index beb67c34302..7d1bf449c62 100644 --- a/Mage.Sets/src/mage/sets/tempest/RootwaterMatriarch.java +++ b/Mage.Sets/src/mage/sets/tempest/RootwaterMatriarch.java @@ -28,9 +28,9 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +39,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.common.continious.GainControlTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -57,8 +59,8 @@ public class RootwaterMatriarch extends CardImpl { this.toughness = new MageInt(3); // {TAP}: Gain control of target creature for as long as that creature is enchanted - ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainControlTargetEffect(Constants.Duration.OneUse), EnchantedTargetCondition.getInstance(), "Gain control of target creature for as long as that creature is enchanted"); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, effect, new TapSourceCost()); + ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainControlTargetEffect(Duration.OneUse), EnchantedTargetCondition.getInstance(), "Gain control of target creature for as long as that creature is enchanted"); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/RubyMedallion.java b/Mage.Sets/src/mage/sets/tempest/RubyMedallion.java index 61a5fd7df26..f8d6caabcf2 100644 --- a/Mage.Sets/src/mage/sets/tempest/RubyMedallion.java +++ b/Mage.Sets/src/mage/sets/tempest/RubyMedallion.java @@ -28,9 +28,9 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.cost.SpellsCostReductionEffect; diff --git a/Mage.Sets/src/mage/sets/tempest/SaltFlats.java b/Mage.Sets/src/mage/sets/tempest/SaltFlats.java index 9ced76fd59b..1f80d7ec0d5 100644 --- a/Mage.Sets/src/mage/sets/tempest/SaltFlats.java +++ b/Mage.Sets/src/mage/sets/tempest/SaltFlats.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.effects.common.DamageControllerEffect; diff --git a/Mage.Sets/src/mage/sets/tempest/SandstoneWarrior.java b/Mage.Sets/src/mage/sets/tempest/SandstoneWarrior.java index d233e86b26c..f64091f435a 100644 --- a/Mage.Sets/src/mage/sets/tempest/SandstoneWarrior.java +++ b/Mage.Sets/src/mage/sets/tempest/SandstoneWarrior.java @@ -29,9 +29,7 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -55,7 +53,7 @@ public class SandstoneWarrior extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); this.addAbility(FirstStrikeAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); } public SandstoneWarrior(final SandstoneWarrior card) { diff --git a/Mage.Sets/src/mage/sets/tempest/SapphireMedallion.java b/Mage.Sets/src/mage/sets/tempest/SapphireMedallion.java index dabd7273601..3703d61affe 100644 --- a/Mage.Sets/src/mage/sets/tempest/SapphireMedallion.java +++ b/Mage.Sets/src/mage/sets/tempest/SapphireMedallion.java @@ -28,9 +28,9 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.cost.SpellsCostReductionEffect; diff --git a/Mage.Sets/src/mage/sets/tempest/Scabland.java b/Mage.Sets/src/mage/sets/tempest/Scabland.java index b8ca20d7cf7..caa4ee918e0 100644 --- a/Mage.Sets/src/mage/sets/tempest/Scabland.java +++ b/Mage.Sets/src/mage/sets/tempest/Scabland.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.effects.common.DamageControllerEffect; diff --git a/Mage.Sets/src/mage/sets/tempest/ScreechingHarpy.java b/Mage.Sets/src/mage/sets/tempest/ScreechingHarpy.java index b7acca71de2..5d575fbcc2b 100644 --- a/Mage.Sets/src/mage/sets/tempest/ScreechingHarpy.java +++ b/Mage.Sets/src/mage/sets/tempest/ScreechingHarpy.java @@ -29,15 +29,15 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -54,7 +54,7 @@ public class ScreechingHarpy extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}"))); } public ScreechingHarpy(final ScreechingHarpy card) { diff --git a/Mage.Sets/src/mage/sets/tempest/ScrollRack.java b/Mage.Sets/src/mage/sets/tempest/ScrollRack.java index cc5022471da..6fb56923688 100644 --- a/Mage.Sets/src/mage/sets/tempest/ScrollRack.java +++ b/Mage.Sets/src/mage/sets/tempest/ScrollRack.java @@ -29,9 +29,9 @@ package mage.sets.tempest; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -39,6 +39,8 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.game.ExileZone; import mage.game.Game; @@ -57,7 +59,7 @@ public class ScrollRack extends CardImpl { this.expansionSetCode = "TMP"; // {1}, {tap}: Exile any number of cards from your hand face down. Put that many cards from the top of your library into your hand. Then look at the exiled cards and put them on top of your library in any order. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ScrollRackEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScrollRackEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } @@ -75,7 +77,7 @@ public class ScrollRack extends CardImpl { class ScrollRackEffect extends OneShotEffect { public ScrollRackEffect() { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); staticText = "Exile any number of cards from your hand face down. Put that many cards from the top of your library into your hand. Then look at the exiled cards and put them on top of your library in any order"; } @@ -91,7 +93,7 @@ class ScrollRackEffect extends OneShotEffect { TargetCardInHand target = new TargetCardInHand(0, you.getHand().size(), filter); int amountExiled = 0; if (you != null) { - if (target.canChoose(source.getControllerId(), game) && target.choose(Constants.Outcome.Neutral, source.getControllerId(), source.getId(), game)) { + if (target.canChoose(source.getControllerId(), game) && target.choose(Outcome.Neutral, source.getControllerId(), source.getId(), game)) { if (!target.getTargets().isEmpty()) { List targets = target.getTargets(); for (UUID targetId : targets) { @@ -110,7 +112,7 @@ class ScrollRackEffect extends OneShotEffect { for (int i = 0; i < count; i++) { Card card = you.getLibrary().removeFromTop(game); if (card != null) { - card.moveToZone(Constants.Zone.HAND, id, game, false); + card.moveToZone(Zone.HAND, id, game, false); } } } @@ -123,17 +125,17 @@ class ScrollRackEffect extends OneShotEffect { if (you != null) { you.lookAtCards("exiled cards with " + game.getCard(source.getSourceId()).getName(), scrollRackExileZone, game); } - you.choose(Constants.Outcome.Neutral, scrollRackExileZone, target2, game); + you.choose(Outcome.Neutral, scrollRackExileZone, target2, game); Card card = game.getCard(target2.getFirstTarget()); if (card != null) { game.getExile().removeCard(card, game); - card.moveToZone(Constants.Zone.LIBRARY, source.getId(), game, true); + card.moveToZone(Zone.LIBRARY, source.getId(), game, true); } target2.clearChosen(); } if (scrollRackExileZone.count(filter, game) == 1) { Card card = scrollRackExileZone.get(scrollRackExileZone.iterator().next(), game); - card.moveToZone(Constants.Zone.LIBRARY, source.getId(), game, true); + card.moveToZone(Zone.LIBRARY, source.getId(), game, true); } return true; } diff --git a/Mage.Sets/src/mage/sets/tempest/SeaMonster.java b/Mage.Sets/src/mage/sets/tempest/SeaMonster.java index bfab7bd1669..3f0e52be2d3 100644 --- a/Mage.Sets/src/mage/sets/tempest/SeaMonster.java +++ b/Mage.Sets/src/mage/sets/tempest/SeaMonster.java @@ -28,11 +28,11 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/tempest/SearingTouch.java b/Mage.Sets/src/mage/sets/tempest/SearingTouch.java index c938cd632d7..c1dbe04a7b7 100644 --- a/Mage.Sets/src/mage/sets/tempest/SearingTouch.java +++ b/Mage.Sets/src/mage/sets/tempest/SearingTouch.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.BuybackAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tempest/SeekerOfSkybreak.java b/Mage.Sets/src/mage/sets/tempest/SeekerOfSkybreak.java index 4e17ddbf3a2..0aee2a98849 100644 --- a/Mage.Sets/src/mage/sets/tempest/SeekerOfSkybreak.java +++ b/Mage.Sets/src/mage/sets/tempest/SeekerOfSkybreak.java @@ -29,15 +29,15 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.UntapTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -53,7 +53,7 @@ public class SeekerOfSkybreak extends CardImpl { this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/SegmentedWurm.java b/Mage.Sets/src/mage/sets/tempest/SegmentedWurm.java index 693d3104d27..6d3fa12d7b2 100644 --- a/Mage.Sets/src/mage/sets/tempest/SegmentedWurm.java +++ b/Mage.Sets/src/mage/sets/tempest/SegmentedWurm.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BecomesTargetTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/tempest/SeleniaDarkAngel.java b/Mage.Sets/src/mage/sets/tempest/SeleniaDarkAngel.java index 03b635a66d3..90ba6ea82ce 100644 --- a/Mage.Sets/src/mage/sets/tempest/SeleniaDarkAngel.java +++ b/Mage.Sets/src/mage/sets/tempest/SeleniaDarkAngel.java @@ -29,15 +29,15 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -55,7 +55,7 @@ public class SeleniaDarkAngel extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new PayLifeCost(2))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new PayLifeCost(2))); } public SeleniaDarkAngel(final SeleniaDarkAngel card) { diff --git a/Mage.Sets/src/mage/sets/tempest/ShimmeringWings.java b/Mage.Sets/src/mage/sets/tempest/ShimmeringWings.java index 51c6356a6a7..27f64f85e13 100644 --- a/Mage.Sets/src/mage/sets/tempest/ShimmeringWings.java +++ b/Mage.Sets/src/mage/sets/tempest/ShimmeringWings.java @@ -29,9 +29,7 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -58,11 +56,11 @@ public class ShimmeringWings extends CardImpl { this.color.setBlue(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), Constants.AttachmentType.AURA))); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.U))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ColoredManaCost(ColoredManaSymbol.U))); } public ShimmeringWings(final ShimmeringWings card) { diff --git a/Mage.Sets/src/mage/sets/tempest/SkySpirit.java b/Mage.Sets/src/mage/sets/tempest/SkySpirit.java index be29476db0e..879caaf6b95 100644 --- a/Mage.Sets/src/mage/sets/tempest/SkySpirit.java +++ b/Mage.Sets/src/mage/sets/tempest/SkySpirit.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/tempest/SkyshroudForest.java b/Mage.Sets/src/mage/sets/tempest/SkyshroudForest.java index ba6cc4fb4ac..1ac43ae9b27 100644 --- a/Mage.Sets/src/mage/sets/tempest/SkyshroudForest.java +++ b/Mage.Sets/src/mage/sets/tempest/SkyshroudForest.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.effects.common.DamageControllerEffect; diff --git a/Mage.Sets/src/mage/sets/tempest/SkyshroudTroll.java b/Mage.Sets/src/mage/sets/tempest/SkyshroudTroll.java index 045ff6e3d67..c9ed8afec25 100644 --- a/Mage.Sets/src/mage/sets/tempest/SkyshroudTroll.java +++ b/Mage.Sets/src/mage/sets/tempest/SkyshroudTroll.java @@ -29,14 +29,14 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -52,7 +52,7 @@ public class SkyshroudTroll extends CardImpl { this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{G}"))); } public SkyshroudTroll(final SkyshroudTroll card) { diff --git a/Mage.Sets/src/mage/sets/tempest/SoltariMonk.java b/Mage.Sets/src/mage/sets/tempest/SoltariMonk.java index 053004d3e97..ac5620bf74f 100644 --- a/Mage.Sets/src/mage/sets/tempest/SoltariMonk.java +++ b/Mage.Sets/src/mage/sets/tempest/SoltariMonk.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.ProtectionAbility; diff --git a/Mage.Sets/src/mage/sets/tempest/SoltariPriest.java b/Mage.Sets/src/mage/sets/tempest/SoltariPriest.java index 5c5500de7a8..1da5924e773 100644 --- a/Mage.Sets/src/mage/sets/tempest/SoltariPriest.java +++ b/Mage.Sets/src/mage/sets/tempest/SoltariPriest.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.ProtectionAbility; diff --git a/Mage.Sets/src/mage/sets/tempest/Souldrinker.java b/Mage.Sets/src/mage/sets/tempest/Souldrinker.java index 49f44aad007..d0ab44dc5aa 100644 --- a/Mage.Sets/src/mage/sets/tempest/Souldrinker.java +++ b/Mage.Sets/src/mage/sets/tempest/Souldrinker.java @@ -29,14 +29,14 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; /** @@ -52,7 +52,7 @@ public class Souldrinker extends CardImpl { this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new PayLifeCost(3))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new PayLifeCost(3))); } public Souldrinker(final Souldrinker card) { diff --git a/Mage.Sets/src/mage/sets/tempest/SpikeDrone.java b/Mage.Sets/src/mage/sets/tempest/SpikeDrone.java index fbf861d68b7..80b62de3094 100644 --- a/Mage.Sets/src/mage/sets/tempest/SpikeDrone.java +++ b/Mage.Sets/src/mage/sets/tempest/SpikeDrone.java @@ -29,9 +29,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +40,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; @@ -59,7 +59,7 @@ public class SpikeDrone extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(0); this.addAbility(new EntersBattlefieldTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)))); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(2)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/tempest/SpontaneousCombustion.java b/Mage.Sets/src/mage/sets/tempest/SpontaneousCombustion.java index 0f88bbdd7e3..d757c23cd20 100644 --- a/Mage.Sets/src/mage/sets/tempest/SpontaneousCombustion.java +++ b/Mage.Sets/src/mage/sets/tempest/SpontaneousCombustion.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.DamageAllEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tempest/SqueesToy.java b/Mage.Sets/src/mage/sets/tempest/SqueesToy.java index 95004bda0e0..1d9ea56806f 100644 --- a/Mage.Sets/src/mage/sets/tempest/SqueesToy.java +++ b/Mage.Sets/src/mage/sets/tempest/SqueesToy.java @@ -29,14 +29,15 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.PreventDamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -48,7 +49,7 @@ public class SqueesToy extends CardImpl { public SqueesToy(UUID ownerId) { super(ownerId, 299, "Squee's Toy", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{1}"); this.expansionSetCode = "TMP"; - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PreventDamageTargetEffect(Constants.Duration.EndOfTurn, 1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/StalkingStones.java b/Mage.Sets/src/mage/sets/tempest/StalkingStones.java index e7d5c53fa2d..889c1e931be 100644 --- a/Mage.Sets/src/mage/sets/tempest/StalkingStones.java +++ b/Mage.Sets/src/mage/sets/tempest/StalkingStones.java @@ -29,16 +29,16 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BecomesCreatureSourceEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.permanent.token.Token; /** @@ -51,7 +51,7 @@ public class StalkingStones extends CardImpl { super(ownerId, 333, "Stalking Stones", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, ""); this.expansionSetCode = "TMP"; this.addAbility(new ColorlessManaAbility()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new StalkingStonesToken(), "land", Duration.WhileOnBattlefield), new GenericManaCost(6))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new StalkingStonesToken(), "land", Duration.WhileOnBattlefield), new GenericManaCost(6))); } public StalkingStones(final StalkingStones card) { diff --git a/Mage.Sets/src/mage/sets/tempest/StaunchDefenders.java b/Mage.Sets/src/mage/sets/tempest/StaunchDefenders.java index f83142224c5..69dce7dd05b 100644 --- a/Mage.Sets/src/mage/sets/tempest/StaunchDefenders.java +++ b/Mage.Sets/src/mage/sets/tempest/StaunchDefenders.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/tempest/StoneRain.java b/Mage.Sets/src/mage/sets/tempest/StoneRain.java index 17a23ff6801..c407a9bbc63 100644 --- a/Mage.Sets/src/mage/sets/tempest/StoneRain.java +++ b/Mage.Sets/src/mage/sets/tempest/StoneRain.java @@ -29,8 +29,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterLandPermanent; diff --git a/Mage.Sets/src/mage/sets/tempest/TalonSliver.java b/Mage.Sets/src/mage/sets/tempest/TalonSliver.java index 430acb0d871..4ddaaefba3e 100644 --- a/Mage.Sets/src/mage/sets/tempest/TalonSliver.java +++ b/Mage.Sets/src/mage/sets/tempest/TalonSliver.java @@ -29,14 +29,15 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -58,7 +59,7 @@ public class TalonSliver extends CardImpl { this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAllEffect(FirstStrikeAbility.getInstance(), Constants.Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); } public TalonSliver(final TalonSliver card) { diff --git a/Mage.Sets/src/mage/sets/tempest/Telethopter.java b/Mage.Sets/src/mage/sets/tempest/Telethopter.java index 33f30b024ae..abacb274320 100644 --- a/Mage.Sets/src/mage/sets/tempest/Telethopter.java +++ b/Mage.Sets/src/mage/sets/tempest/Telethopter.java @@ -29,15 +29,16 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; @@ -60,7 +61,7 @@ public class Telethopter extends CardImpl { this.subtype.add("Thopter"); this.power = new MageInt(3); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false)))); } public Telethopter(final Telethopter card) { diff --git a/Mage.Sets/src/mage/sets/tempest/ThalakosLowlands.java b/Mage.Sets/src/mage/sets/tempest/ThalakosLowlands.java index 98d7f3157b3..de461d53ef2 100644 --- a/Mage.Sets/src/mage/sets/tempest/ThalakosLowlands.java +++ b/Mage.Sets/src/mage/sets/tempest/ThalakosLowlands.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.SkipNextUntapSourceEffect; import mage.abilities.mana.BlueManaAbility; diff --git a/Mage.Sets/src/mage/sets/tempest/TimeEbb.java b/Mage.Sets/src/mage/sets/tempest/TimeEbb.java index 5873f84a325..437d1a18c4a 100644 --- a/Mage.Sets/src/mage/sets/tempest/TimeEbb.java +++ b/Mage.Sets/src/mage/sets/tempest/TimeEbb.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/tempest/TimeWarp.java b/Mage.Sets/src/mage/sets/tempest/TimeWarp.java index 8f6f40edbf1..f042e59ebd1 100644 --- a/Mage.Sets/src/mage/sets/tempest/TimeWarp.java +++ b/Mage.Sets/src/mage/sets/tempest/TimeWarp.java @@ -28,7 +28,7 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/tempest/ToothAndClaw.java b/Mage.Sets/src/mage/sets/tempest/ToothAndClaw.java index c27f57a625d..173c2821b98 100644 --- a/Mage.Sets/src/mage/sets/tempest/ToothAndClaw.java +++ b/Mage.Sets/src/mage/sets/tempest/ToothAndClaw.java @@ -29,14 +29,14 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.permanent.token.Token; import mage.target.common.TargetControlledCreaturePermanent; @@ -50,7 +50,7 @@ public class ToothAndClaw extends CardImpl { super(ownerId, 210, "Tooth and Claw", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}"); this.expansionSetCode = "TMP"; this.color.setRed(true); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new CarnivoreToken(), 1), new SacrificeTargetCost(new TargetControlledCreaturePermanent(2)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CarnivoreToken(), 1), new SacrificeTargetCost(new TargetControlledCreaturePermanent(2)))); } public ToothAndClaw(final ToothAndClaw card) { diff --git a/Mage.Sets/src/mage/sets/tempest/TortureChamber.java b/Mage.Sets/src/mage/sets/tempest/TortureChamber.java index 6a9b7ea0ccb..5daaf60772f 100644 --- a/Mage.Sets/src/mage/sets/tempest/TortureChamber.java +++ b/Mage.Sets/src/mage/sets/tempest/TortureChamber.java @@ -28,10 +28,10 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; import mage.abilities.common.OnEventTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/tempest/TradewindRider.java b/Mage.Sets/src/mage/sets/tempest/TradewindRider.java index 9cc466568e7..4a16fb74209 100644 --- a/Mage.Sets/src/mage/sets/tempest/TradewindRider.java +++ b/Mage.Sets/src/mage/sets/tempest/TradewindRider.java @@ -29,9 +29,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,7 @@ import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; @@ -65,7 +65,7 @@ public class TradewindRider extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, false))); ability.addTarget(new TargetPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/tempest/TrainedArmodon.java b/Mage.Sets/src/mage/sets/tempest/TrainedArmodon.java index e4e40245156..8a7540a0a99 100644 --- a/Mage.Sets/src/mage/sets/tempest/TrainedArmodon.java +++ b/Mage.Sets/src/mage/sets/tempest/TrainedArmodon.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tempest/Tranquility.java b/Mage.Sets/src/mage/sets/tempest/Tranquility.java index fa5f81114f3..f013cd99e4e 100644 --- a/Mage.Sets/src/mage/sets/tempest/Tranquility.java +++ b/Mage.Sets/src/mage/sets/tempest/Tranquility.java @@ -29,12 +29,12 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; @@ -72,7 +72,7 @@ class TranquilityEffect extends OneShotEffect { } public TranquilityEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); staticText = "Destroy all enchantments"; } diff --git a/Mage.Sets/src/mage/sets/tempest/VecTownships.java b/Mage.Sets/src/mage/sets/tempest/VecTownships.java index 50b6d26430e..0c7b9b605b0 100644 --- a/Mage.Sets/src/mage/sets/tempest/VecTownships.java +++ b/Mage.Sets/src/mage/sets/tempest/VecTownships.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.SkipNextUntapSourceEffect; import mage.abilities.mana.ColorlessManaAbility; diff --git a/Mage.Sets/src/mage/sets/tempest/VerdantForce.java b/Mage.Sets/src/mage/sets/tempest/VerdantForce.java index 1ba6747df09..9b617ecfb66 100644 --- a/Mage.Sets/src/mage/sets/tempest/VerdantForce.java +++ b/Mage.Sets/src/mage/sets/tempest/VerdantForce.java @@ -29,13 +29,13 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.game.permanent.token.SaprolingToken; /** @@ -51,7 +51,7 @@ public class VerdantForce extends CardImpl { this.color.setGreen(true); this.power = new MageInt(7); this.toughness = new MageInt(7); - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new SaprolingToken()), Constants.TargetController.ANY, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new SaprolingToken()), TargetController.ANY, false)); } public VerdantForce(final VerdantForce card) { diff --git a/Mage.Sets/src/mage/sets/tempest/Verdigris.java b/Mage.Sets/src/mage/sets/tempest/Verdigris.java index c4f521a539d..00ede8122e4 100644 --- a/Mage.Sets/src/mage/sets/tempest/Verdigris.java +++ b/Mage.Sets/src/mage/sets/tempest/Verdigris.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/tempest/Wasteland.java b/Mage.Sets/src/mage/sets/tempest/Wasteland.java index 6bbadf590cb..27afbdfe238 100644 --- a/Mage.Sets/src/mage/sets/tempest/Wasteland.java +++ b/Mage.Sets/src/mage/sets/tempest/Wasteland.java @@ -29,9 +29,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SupertypePredicate; @@ -62,7 +62,7 @@ public class Wasteland extends CardImpl { // {tap}: Add {1} to your mana pool. this.addAbility(new ColorlessManaAbility()); // {tap}, Sacrifice Wasteland: Destroy target nonbasic land. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetLandPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/tempest/WhispersOfTheMuse.java b/Mage.Sets/src/mage/sets/tempest/WhispersOfTheMuse.java index b1681a16729..c80441c05cb 100644 --- a/Mage.Sets/src/mage/sets/tempest/WhispersOfTheMuse.java +++ b/Mage.Sets/src/mage/sets/tempest/WhispersOfTheMuse.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.keyword.BuybackAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tempest/WindDancer.java b/Mage.Sets/src/mage/sets/tempest/WindDancer.java index f728362c138..bfdc57cada1 100644 --- a/Mage.Sets/src/mage/sets/tempest/WindDancer.java +++ b/Mage.Sets/src/mage/sets/tempest/WindDancer.java @@ -29,9 +29,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -55,7 +56,7 @@ public class WindDancer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/WingedSliver.java b/Mage.Sets/src/mage/sets/tempest/WingedSliver.java index df73d5e67d3..52d336949d3 100644 --- a/Mage.Sets/src/mage/sets/tempest/WingedSliver.java +++ b/Mage.Sets/src/mage/sets/tempest/WingedSliver.java @@ -29,14 +29,15 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -58,7 +59,7 @@ public class WingedSliver extends CardImpl { this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAllEffect(FlyingAbility.getInstance(), Constants.Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); } public WingedSliver(final WingedSliver card) { diff --git a/Mage.Sets/src/mage/sets/tempest/WintersGrasp.java b/Mage.Sets/src/mage/sets/tempest/WintersGrasp.java index 7eaa2e6a759..ea65adfad62 100644 --- a/Mage.Sets/src/mage/sets/tempest/WintersGrasp.java +++ b/Mage.Sets/src/mage/sets/tempest/WintersGrasp.java @@ -28,8 +28,8 @@ package mage.sets.tempest; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetLandPermanent; diff --git a/Mage.Sets/src/mage/sets/tenth/AdarkarWastes.java b/Mage.Sets/src/mage/sets/tenth/AdarkarWastes.java index 94a0623e8f8..2aa7815d5b9 100644 --- a/Mage.Sets/src/mage/sets/tenth/AdarkarWastes.java +++ b/Mage.Sets/src/mage/sets/tenth/AdarkarWastes.java @@ -29,8 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.mana.BlueManaAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/Afflict.java b/Mage.Sets/src/mage/sets/tenth/Afflict.java index a4c762ab2e1..9f64f92b2a0 100644 --- a/Mage.Sets/src/mage/sets/tenth/Afflict.java +++ b/Mage.Sets/src/mage/sets/tenth/Afflict.java @@ -29,12 +29,12 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -47,7 +47,7 @@ public class Afflict extends CardImpl { super(ownerId, 125, "Afflict", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{B}"); this.expansionSetCode = "10E"; this.color.setBlack(true); - this.getSpellAbility().addEffect(new BoostTargetEffect(-1, -1, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(-1, -1, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/tenth/AggressiveUrge.java b/Mage.Sets/src/mage/sets/tenth/AggressiveUrge.java index 535c533585a..fc4d65f555d 100644 --- a/Mage.Sets/src/mage/sets/tenth/AggressiveUrge.java +++ b/Mage.Sets/src/mage/sets/tenth/AggressiveUrge.java @@ -29,12 +29,12 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -47,7 +47,7 @@ public class AggressiveUrge extends CardImpl { super(ownerId, 250, "Aggressive Urge", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "10E"; this.color.setGreen(true); - this.getSpellAbility().addEffect(new BoostTargetEffect(1, 1, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(1, 1, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/tenth/AmbassadorLaquatus.java b/Mage.Sets/src/mage/sets/tenth/AmbassadorLaquatus.java index 25838c93b29..15cc7ac7080 100644 --- a/Mage.Sets/src/mage/sets/tenth/AmbassadorLaquatus.java +++ b/Mage.Sets/src/mage/sets/tenth/AmbassadorLaquatus.java @@ -29,15 +29,15 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetPlayer; /** @@ -58,7 +58,7 @@ public class AmbassadorLaquatus extends CardImpl { this.toughness = new MageInt(3); // {3}: Target player puts the top three cards of his or her library into his or her graveyard. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(3), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(3), new GenericManaCost(3)); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/AnabaBodyguard.java b/Mage.Sets/src/mage/sets/tenth/AnabaBodyguard.java index a004192d519..6d9383156f6 100644 --- a/Mage.Sets/src/mage/sets/tenth/AnabaBodyguard.java +++ b/Mage.Sets/src/mage/sets/tenth/AnabaBodyguard.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/AncestorsChosen.java b/Mage.Sets/src/mage/sets/tenth/AncestorsChosen.java index 0749bc52bc0..e2fa6529873 100644 --- a/Mage.Sets/src/mage/sets/tenth/AncestorsChosen.java +++ b/Mage.Sets/src/mage/sets/tenth/AncestorsChosen.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount; diff --git a/Mage.Sets/src/mage/sets/tenth/AngelOfMercy.java b/Mage.Sets/src/mage/sets/tenth/AngelOfMercy.java index 2c710e6be2f..38510b87e34 100644 --- a/Mage.Sets/src/mage/sets/tenth/AngelOfMercy.java +++ b/Mage.Sets/src/mage/sets/tenth/AngelOfMercy.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/tenth/AngelicBlessing.java b/Mage.Sets/src/mage/sets/tenth/AngelicBlessing.java index 27abed2c2d3..e12d335b0e2 100644 --- a/Mage.Sets/src/mage/sets/tenth/AngelicBlessing.java +++ b/Mage.Sets/src/mage/sets/tenth/AngelicBlessing.java @@ -29,13 +29,13 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -48,8 +48,8 @@ public class AngelicBlessing extends CardImpl { super(ownerId, 3, "Angelic Blessing", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{W}"); this.expansionSetCode = "10E"; this.color.setWhite(true); - this.getSpellAbility().addEffect(new BoostTargetEffect(3, 3, Constants.Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(3, 3, Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/tenth/AngelicWall.java b/Mage.Sets/src/mage/sets/tenth/AngelicWall.java index f56ece3bef9..34d5b30a4c6 100644 --- a/Mage.Sets/src/mage/sets/tenth/AngelicWall.java +++ b/Mage.Sets/src/mage/sets/tenth/AngelicWall.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/AngelsFeather.java b/Mage.Sets/src/mage/sets/tenth/AngelsFeather.java index b9144735fb0..fd5771b0c28 100644 --- a/Mage.Sets/src/mage/sets/tenth/AngelsFeather.java +++ b/Mage.Sets/src/mage/sets/tenth/AngelsFeather.java @@ -29,9 +29,9 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/ArcaneTeachings.java b/Mage.Sets/src/mage/sets/tenth/ArcaneTeachings.java index be14f85cecb..5b2c605ed06 100644 --- a/Mage.Sets/src/mage/sets/tenth/ArcaneTeachings.java +++ b/Mage.Sets/src/mage/sets/tenth/ArcaneTeachings.java @@ -29,9 +29,7 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -59,13 +57,13 @@ public class ArcaneTeachings extends CardImpl { this.color.setRed(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Constants.Duration.WhileOnBattlefield))); - Ability gainedAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); gainedAbility.addTarget(new TargetCreatureOrPlayer()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); } public ArcaneTeachings(final ArcaneTeachings card) { diff --git a/Mage.Sets/src/mage/sets/tenth/ArcanisTheOmnipotent.java b/Mage.Sets/src/mage/sets/tenth/ArcanisTheOmnipotent.java index 0c51fee0406..ebb0a269bac 100644 --- a/Mage.Sets/src/mage/sets/tenth/ArcanisTheOmnipotent.java +++ b/Mage.Sets/src/mage/sets/tenth/ArcanisTheOmnipotent.java @@ -29,9 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -39,6 +38,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -54,8 +54,8 @@ public class ArcanisTheOmnipotent extends CardImpl { this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(4); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(3), new TapSourceCost())); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ManaCostsImpl("{2}{U}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(3), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ManaCostsImpl("{2}{U}{U}"))); } public ArcanisTheOmnipotent(final ArcanisTheOmnipotent card) { diff --git a/Mage.Sets/src/mage/sets/tenth/Assassinate.java b/Mage.Sets/src/mage/sets/tenth/Assassinate.java index 1e8020c7183..8ffb00c7486 100644 --- a/Mage.Sets/src/mage/sets/tenth/Assassinate.java +++ b/Mage.Sets/src/mage/sets/tenth/Assassinate.java @@ -29,8 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/tenth/AvenCloudchaser.java b/Mage.Sets/src/mage/sets/tenth/AvenCloudchaser.java index 0e774e86386..d9d1a622328 100644 --- a/Mage.Sets/src/mage/sets/tenth/AvenCloudchaser.java +++ b/Mage.Sets/src/mage/sets/tenth/AvenCloudchaser.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/AvenFisher.java b/Mage.Sets/src/mage/sets/tenth/AvenFisher.java index ee9c6cbfdcd..ddaa08ee040 100644 --- a/Mage.Sets/src/mage/sets/tenth/AvenFisher.java +++ b/Mage.Sets/src/mage/sets/tenth/AvenFisher.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/tenth/Bandage.java b/Mage.Sets/src/mage/sets/tenth/Bandage.java index 287eebe8ba6..d49e1c3164f 100644 --- a/Mage.Sets/src/mage/sets/tenth/Bandage.java +++ b/Mage.Sets/src/mage/sets/tenth/Bandage.java @@ -29,12 +29,12 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.PreventDamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreatureOrPlayer; /** @@ -47,7 +47,7 @@ public class Bandage extends CardImpl { super(ownerId, 9, "Bandage", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "10E"; this.color.setWhite(true); - this.getSpellAbility().addEffect(new PreventDamageTargetEffect(Constants.Duration.EndOfTurn, 1)); + this.getSpellAbility().addEffect(new PreventDamageTargetEffect(Duration.EndOfTurn, 1)); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/tenth/BeaconOfDestruction.java b/Mage.Sets/src/mage/sets/tenth/BeaconOfDestruction.java index c53f4748819..e260e33d559 100644 --- a/Mage.Sets/src/mage/sets/tenth/BeaconOfDestruction.java +++ b/Mage.Sets/src/mage/sets/tenth/BeaconOfDestruction.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.ShuffleSpellEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/BeaconOfImmortality.java b/Mage.Sets/src/mage/sets/tenth/BeaconOfImmortality.java index 84234209d13..12565774f16 100644 --- a/Mage.Sets/src/mage/sets/tenth/BeaconOfImmortality.java +++ b/Mage.Sets/src/mage/sets/tenth/BeaconOfImmortality.java @@ -28,9 +28,9 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ShuffleSpellEffect; diff --git a/Mage.Sets/src/mage/sets/tenth/BenalishKnight.java b/Mage.Sets/src/mage/sets/tenth/BenalishKnight.java index 0c38a861e80..85fcc239c64 100644 --- a/Mage.Sets/src/mage/sets/tenth/BenalishKnight.java +++ b/Mage.Sets/src/mage/sets/tenth/BenalishKnight.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/BirdsOfParadise.java b/Mage.Sets/src/mage/sets/tenth/BirdsOfParadise.java index d2530c28e6a..01a5be18843 100644 --- a/Mage.Sets/src/mage/sets/tenth/BirdsOfParadise.java +++ b/Mage.Sets/src/mage/sets/tenth/BirdsOfParadise.java @@ -29,8 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.mana.AnyColorManaAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/BlanchwoodArmor.java b/Mage.Sets/src/mage/sets/tenth/BlanchwoodArmor.java index da7eb3a035a..658e67930a0 100644 --- a/Mage.Sets/src/mage/sets/tenth/BlanchwoodArmor.java +++ b/Mage.Sets/src/mage/sets/tenth/BlanchwoodArmor.java @@ -29,9 +29,7 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -63,10 +61,10 @@ public class BlanchwoodArmor extends CardImpl { this.color.setGreen(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(new PermanentsOnBattlefieldCount(filter), new PermanentsOnBattlefieldCount(filter), Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(new PermanentsOnBattlefieldCount(filter), new PermanentsOnBattlefieldCount(filter), Duration.WhileOnBattlefield))); } public BlanchwoodArmor(final BlanchwoodArmor card) { diff --git a/Mage.Sets/src/mage/sets/tenth/BloodrockCyclops.java b/Mage.Sets/src/mage/sets/tenth/BloodrockCyclops.java index d0fb575174e..dc9b72766fa 100644 --- a/Mage.Sets/src/mage/sets/tenth/BloodrockCyclops.java +++ b/Mage.Sets/src/mage/sets/tenth/BloodrockCyclops.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/Boomerang.java b/Mage.Sets/src/mage/sets/tenth/Boomerang.java index ca5123e325c..f8f506e2f93 100644 --- a/Mage.Sets/src/mage/sets/tenth/Boomerang.java +++ b/Mage.Sets/src/mage/sets/tenth/Boomerang.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPermanent; diff --git a/Mage.Sets/src/mage/sets/tenth/Brushland.java b/Mage.Sets/src/mage/sets/tenth/Brushland.java index e949e41aa3e..780ff39feee 100644 --- a/Mage.Sets/src/mage/sets/tenth/Brushland.java +++ b/Mage.Sets/src/mage/sets/tenth/Brushland.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.mana.ColorlessManaAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/Cancel.java b/Mage.Sets/src/mage/sets/tenth/Cancel.java index 07d07c2e0b5..038810780e4 100644 --- a/Mage.Sets/src/mage/sets/tenth/Cancel.java +++ b/Mage.Sets/src/mage/sets/tenth/Cancel.java @@ -29,8 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.target.TargetSpell; diff --git a/Mage.Sets/src/mage/sets/tenth/ChoMannoRevolutionary.java b/Mage.Sets/src/mage/sets/tenth/ChoMannoRevolutionary.java index 65d4777e3be..8dde95c9bcc 100644 --- a/Mage.Sets/src/mage/sets/tenth/ChoMannoRevolutionary.java +++ b/Mage.Sets/src/mage/sets/tenth/ChoMannoRevolutionary.java @@ -29,13 +29,14 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.PreventAllDamageSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -52,7 +53,7 @@ public class ChoMannoRevolutionary extends CardImpl { this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new PreventAllDamageSourceEffect(Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventAllDamageSourceEffect(Duration.WhileOnBattlefield))); } public ChoMannoRevolutionary(final ChoMannoRevolutionary card) { diff --git a/Mage.Sets/src/mage/sets/tenth/ChromaticStar.java b/Mage.Sets/src/mage/sets/tenth/ChromaticStar.java index 1e4395a2e3f..320090a0773 100644 --- a/Mage.Sets/src/mage/sets/tenth/ChromaticStar.java +++ b/Mage.Sets/src/mage/sets/tenth/ChromaticStar.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/tenth/CivicWayfinder.java b/Mage.Sets/src/mage/sets/tenth/CivicWayfinder.java index 75364f06375..b0484c67500 100644 --- a/Mage.Sets/src/mage/sets/tenth/CivicWayfinder.java +++ b/Mage.Sets/src/mage/sets/tenth/CivicWayfinder.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; diff --git a/Mage.Sets/src/mage/sets/tenth/Clone.java b/Mage.Sets/src/mage/sets/tenth/Clone.java index 3b130f692ca..ec86286b880 100644 --- a/Mage.Sets/src/mage/sets/tenth/Clone.java +++ b/Mage.Sets/src/mage/sets/tenth/Clone.java @@ -29,9 +29,9 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/CloudElemental.java b/Mage.Sets/src/mage/sets/tenth/CloudElemental.java index 2229777e055..a8073c5d269 100644 --- a/Mage.Sets/src/mage/sets/tenth/CloudElemental.java +++ b/Mage.Sets/src/mage/sets/tenth/CloudElemental.java @@ -28,9 +28,9 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.CanBlockOnlyFlyingEffect; diff --git a/Mage.Sets/src/mage/sets/tenth/CloudSprite.java b/Mage.Sets/src/mage/sets/tenth/CloudSprite.java index d9e70b2cb9e..acde3ab1246 100644 --- a/Mage.Sets/src/mage/sets/tenth/CloudSprite.java +++ b/Mage.Sets/src/mage/sets/tenth/CloudSprite.java @@ -29,14 +29,14 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.CanBlockOnlyFlyingEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -52,7 +52,7 @@ public class CloudSprite extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new CanBlockOnlyFlyingEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockOnlyFlyingEffect())); } public CloudSprite(final CloudSprite card) { diff --git a/Mage.Sets/src/mage/sets/tenth/CompositeGolem.java b/Mage.Sets/src/mage/sets/tenth/CompositeGolem.java index aa073fdee37..a26f96f967f 100644 --- a/Mage.Sets/src/mage/sets/tenth/CompositeGolem.java +++ b/Mage.Sets/src/mage/sets/tenth/CompositeGolem.java @@ -29,14 +29,14 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -52,7 +52,7 @@ public class CompositeGolem extends CardImpl { this.toughness = new MageInt(4); // Sacrifice Composite Golem: Add {W}{U}{B}{R}{G} to your mana pool. - this.addAbility(new SimpleManaAbility(Constants.Zone.BATTLEFIELD, new Mana(1, 1, 1, 1, 1, 0, 0), new SacrificeSourceCost())); + this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(1, 1, 1, 1, 1, 0, 0), new SacrificeSourceCost())); } public CompositeGolem(final CompositeGolem card) { diff --git a/Mage.Sets/src/mage/sets/tenth/Condemn.java b/Mage.Sets/src/mage/sets/tenth/Condemn.java index 3910c0c39f5..79f80e47be5 100644 --- a/Mage.Sets/src/mage/sets/tenth/Condemn.java +++ b/Mage.Sets/src/mage/sets/tenth/Condemn.java @@ -30,14 +30,14 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -90,7 +90,7 @@ class CondemnEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = (Permanent)game.getLastKnownInformation(source.getFirstTarget(), Constants.Zone.BATTLEFIELD); + Permanent permanent = (Permanent)game.getLastKnownInformation(source.getFirstTarget(), Zone.BATTLEFIELD); if (permanent != null) { Player player = game.getPlayer(permanent.getControllerId()); if (player != null) { diff --git a/Mage.Sets/src/mage/sets/tenth/CraftyPathmage.java b/Mage.Sets/src/mage/sets/tenth/CraftyPathmage.java index a10abf13147..d63878dec09 100644 --- a/Mage.Sets/src/mage/sets/tenth/CraftyPathmage.java +++ b/Mage.Sets/src/mage/sets/tenth/CraftyPathmage.java @@ -29,9 +29,9 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/CrawWurm.java b/Mage.Sets/src/mage/sets/tenth/CrawWurm.java index b6ece3f131c..fe95882c261 100644 --- a/Mage.Sets/src/mage/sets/tenth/CrawWurm.java +++ b/Mage.Sets/src/mage/sets/tenth/CrawWurm.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/CreepingMold.java b/Mage.Sets/src/mage/sets/tenth/CreepingMold.java index a5668c00b34..e51e0e8c6dd 100644 --- a/Mage.Sets/src/mage/sets/tenth/CreepingMold.java +++ b/Mage.Sets/src/mage/sets/tenth/CreepingMold.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/tenth/CrucibleOfWorlds.java b/Mage.Sets/src/mage/sets/tenth/CrucibleOfWorlds.java index 4ff7df3a2d2..d8f65fb1bdb 100644 --- a/Mage.Sets/src/mage/sets/tenth/CrucibleOfWorlds.java +++ b/Mage.Sets/src/mage/sets/tenth/CrucibleOfWorlds.java @@ -28,13 +28,13 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.PlayLandAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/CruelEdict.java b/Mage.Sets/src/mage/sets/tenth/CruelEdict.java index aba69d05fd3..23cca04db99 100644 --- a/Mage.Sets/src/mage/sets/tenth/CruelEdict.java +++ b/Mage.Sets/src/mage/sets/tenth/CruelEdict.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.SacrificeEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/tenth/Deathmark.java b/Mage.Sets/src/mage/sets/tenth/Deathmark.java index 15618d7248c..b1e96459cd4 100644 --- a/Mage.Sets/src/mage/sets/tenth/Deathmark.java +++ b/Mage.Sets/src/mage/sets/tenth/Deathmark.java @@ -29,8 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/Dehydration.java b/Mage.Sets/src/mage/sets/tenth/Dehydration.java index ed68f787c2c..65b619e810b 100644 --- a/Mage.Sets/src/mage/sets/tenth/Dehydration.java +++ b/Mage.Sets/src/mage/sets/tenth/Dehydration.java @@ -28,10 +28,10 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.SkipEnchantedUntapEffect; diff --git a/Mage.Sets/src/mage/sets/tenth/Demolish.java b/Mage.Sets/src/mage/sets/tenth/Demolish.java index 567a7835e99..ae3380ebab5 100644 --- a/Mage.Sets/src/mage/sets/tenth/Demolish.java +++ b/Mage.Sets/src/mage/sets/tenth/Demolish.java @@ -29,8 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/tenth/DemonsHorn.java b/Mage.Sets/src/mage/sets/tenth/DemonsHorn.java index 070134b9cd7..79cf8067003 100644 --- a/Mage.Sets/src/mage/sets/tenth/DemonsHorn.java +++ b/Mage.Sets/src/mage/sets/tenth/DemonsHorn.java @@ -29,9 +29,9 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/Demystify.java b/Mage.Sets/src/mage/sets/tenth/Demystify.java index e77a87156c3..e2e021f54e6 100644 --- a/Mage.Sets/src/mage/sets/tenth/Demystify.java +++ b/Mage.Sets/src/mage/sets/tenth/Demystify.java @@ -29,8 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/tenth/DiabolicTutor.java b/Mage.Sets/src/mage/sets/tenth/DiabolicTutor.java index 4e3b355774d..d20d684bef8 100644 --- a/Mage.Sets/src/mage/sets/tenth/DiabolicTutor.java +++ b/Mage.Sets/src/mage/sets/tenth/DiabolicTutor.java @@ -29,8 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.target.common.TargetCardInLibrary; diff --git a/Mage.Sets/src/mage/sets/tenth/Discombobulate.java b/Mage.Sets/src/mage/sets/tenth/Discombobulate.java index 85670063cf4..59e06798833 100644 --- a/Mage.Sets/src/mage/sets/tenth/Discombobulate.java +++ b/Mage.Sets/src/mage/sets/tenth/Discombobulate.java @@ -29,8 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/Distress.java b/Mage.Sets/src/mage/sets/tenth/Distress.java index b12364a3b0a..88845f59da5 100644 --- a/Mage.Sets/src/mage/sets/tenth/Distress.java +++ b/Mage.Sets/src/mage/sets/tenth/Distress.java @@ -27,13 +27,14 @@ */ package mage.sets.tenth; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -79,7 +80,7 @@ class DistressEffect extends OneShotEffect { } public DistressEffect() { - super(Constants.Outcome.Discard); + super(Outcome.Discard); staticText = "Target player reveals his or her hand. You choose a nonland card from it. That player discards that card"; } @@ -94,9 +95,9 @@ class DistressEffect extends OneShotEffect { player.revealCards("Distress", player.getHand(), game); Player you = game.getPlayer(source.getControllerId()); if (you != null) { - TargetCard target = new TargetCard(Constants.Zone.PICK, filter); + TargetCard target = new TargetCard(Zone.PICK, filter); target.setRequired(true); - if (you.choose(Constants.Outcome.Benefit, player.getHand(), target, game)) { + if (you.choose(Outcome.Benefit, player.getHand(), target, game)) { Card card = player.getHand().get(target.getFirstTarget(), game); if (card != null) { return player.discard(card, source, game); diff --git a/Mage.Sets/src/mage/sets/tenth/DoomedNecromancer.java b/Mage.Sets/src/mage/sets/tenth/DoomedNecromancer.java index b89286456d0..ef5d357d284 100644 --- a/Mage.Sets/src/mage/sets/tenth/DoomedNecromancer.java +++ b/Mage.Sets/src/mage/sets/tenth/DoomedNecromancer.java @@ -29,9 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; @@ -58,7 +59,7 @@ public class DoomedNecromancer extends CardImpl { this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard"))); diff --git a/Mage.Sets/src/mage/sets/tenth/DragonRoost.java b/Mage.Sets/src/mage/sets/tenth/DragonRoost.java index 5e36b0cfd10..ad41ae709e1 100644 --- a/Mage.Sets/src/mage/sets/tenth/DragonRoost.java +++ b/Mage.Sets/src/mage/sets/tenth/DragonRoost.java @@ -29,9 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.permanent.token.Token; /** @@ -51,7 +51,7 @@ public class DragonRoost extends CardImpl { super(ownerId, 197, "Dragon Roost", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{4}{R}{R}"); this.expansionSetCode = "10E"; this.color.setRed(true); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new DragonToken2(), 1), new ManaCostsImpl("{5}{R}{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new DragonToken2(), 1), new ManaCostsImpl("{5}{R}{R}"))); } public DragonRoost(final DragonRoost card) { diff --git a/Mage.Sets/src/mage/sets/tenth/DragonsClaw.java b/Mage.Sets/src/mage/sets/tenth/DragonsClaw.java index ff4458ca55b..eb172c0b4ad 100644 --- a/Mage.Sets/src/mage/sets/tenth/DragonsClaw.java +++ b/Mage.Sets/src/mage/sets/tenth/DragonsClaw.java @@ -29,9 +29,9 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/DrossCrocodile.java b/Mage.Sets/src/mage/sets/tenth/DrossCrocodile.java index bfd5792f7eb..d00dd4212c8 100644 --- a/Mage.Sets/src/mage/sets/tenth/DrossCrocodile.java +++ b/Mage.Sets/src/mage/sets/tenth/DrossCrocodile.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/DrudgeSkeletons.java b/Mage.Sets/src/mage/sets/tenth/DrudgeSkeletons.java index 8d0880fa48a..370bbd6a1c8 100644 --- a/Mage.Sets/src/mage/sets/tenth/DrudgeSkeletons.java +++ b/Mage.Sets/src/mage/sets/tenth/DrudgeSkeletons.java @@ -28,7 +28,7 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/tenth/DuskImp.java b/Mage.Sets/src/mage/sets/tenth/DuskImp.java index 3d5aadcb988..4bd77911961 100644 --- a/Mage.Sets/src/mage/sets/tenth/DuskImp.java +++ b/Mage.Sets/src/mage/sets/tenth/DuskImp.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/EarthElemental.java b/Mage.Sets/src/mage/sets/tenth/EarthElemental.java index 3b8975d99fb..8b5e3b67543 100644 --- a/Mage.Sets/src/mage/sets/tenth/EarthElemental.java +++ b/Mage.Sets/src/mage/sets/tenth/EarthElemental.java @@ -29,8 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/ElvishChampion.java b/Mage.Sets/src/mage/sets/tenth/ElvishChampion.java index cf3ffc05784..d839ffaecc1 100644 --- a/Mage.Sets/src/mage/sets/tenth/ElvishChampion.java +++ b/Mage.Sets/src/mage/sets/tenth/ElvishChampion.java @@ -28,10 +28,10 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostAllEffect; diff --git a/Mage.Sets/src/mage/sets/tenth/FaerieConclave.java b/Mage.Sets/src/mage/sets/tenth/FaerieConclave.java index 021f77c8c7d..bcb47909e1b 100644 --- a/Mage.Sets/src/mage/sets/tenth/FaerieConclave.java +++ b/Mage.Sets/src/mage/sets/tenth/FaerieConclave.java @@ -29,10 +29,9 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldTappedAbility; @@ -42,6 +41,7 @@ import mage.abilities.effects.common.continious.BecomesCreatureSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.permanent.token.Token; /** @@ -55,7 +55,7 @@ public class FaerieConclave extends CardImpl { this.expansionSetCode = "10E"; this.addAbility(new EntersBattlefieldTappedAbility()); this.addAbility(new BlueManaAbility()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new FaerieConclaveToken(), "land", Duration.EndOfTurn), new ManaCostsImpl("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new FaerieConclaveToken(), "land", Duration.EndOfTurn), new ManaCostsImpl("{1}{U}"))); } public FaerieConclave(final FaerieConclave card) { diff --git a/Mage.Sets/src/mage/sets/tenth/Fear.java b/Mage.Sets/src/mage/sets/tenth/Fear.java index ac6538e8dcc..a03bdcdaee0 100644 --- a/Mage.Sets/src/mage/sets/tenth/Fear.java +++ b/Mage.Sets/src/mage/sets/tenth/Fear.java @@ -29,9 +29,7 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -58,11 +56,11 @@ public class Fear extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature has fear. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FearAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FearAbility.getInstance(), AttachmentType.AURA))); } public Fear(final Fear card) { diff --git a/Mage.Sets/src/mage/sets/tenth/FemerefArchers.java b/Mage.Sets/src/mage/sets/tenth/FemerefArchers.java index 335ec29f720..6cceeb20e0c 100644 --- a/Mage.Sets/src/mage/sets/tenth/FemerefArchers.java +++ b/Mage.Sets/src/mage/sets/tenth/FemerefArchers.java @@ -29,9 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterAttackingCreature; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetCreaturePermanent; @@ -63,7 +63,7 @@ public class FemerefArchers extends CardImpl { this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(4), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/FieldMarshal.java b/Mage.Sets/src/mage/sets/tenth/FieldMarshal.java index d48b238d833..5f7c03a0fd3 100644 --- a/Mage.Sets/src/mage/sets/tenth/FieldMarshal.java +++ b/Mage.Sets/src/mage/sets/tenth/FieldMarshal.java @@ -29,15 +29,16 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -61,8 +62,8 @@ public class FieldMarshal extends CardImpl { this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Constants.Duration.WhileOnBattlefield, filter, true))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAllEffect(FirstStrikeAbility.getInstance(), Constants.Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, true))); } public FieldMarshal(final FieldMarshal card) { diff --git a/Mage.Sets/src/mage/sets/tenth/FistsOfTheAnvil.java b/Mage.Sets/src/mage/sets/tenth/FistsOfTheAnvil.java index 3de4f80c423..de07a93d6b2 100644 --- a/Mage.Sets/src/mage/sets/tenth/FistsOfTheAnvil.java +++ b/Mage.Sets/src/mage/sets/tenth/FistsOfTheAnvil.java @@ -29,11 +29,11 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -46,7 +46,7 @@ public class FistsOfTheAnvil extends CardImpl { super(ownerId, 201, "Fists of the Anvil", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "10E"; this.color.setRed(true); - this.getSpellAbility().addEffect(new BoostTargetEffect(4, 0, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(4, 0, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/tenth/FlamewaveInvoker.java b/Mage.Sets/src/mage/sets/tenth/FlamewaveInvoker.java index 3edb7203181..d9b0ff16d87 100644 --- a/Mage.Sets/src/mage/sets/tenth/FlamewaveInvoker.java +++ b/Mage.Sets/src/mage/sets/tenth/FlamewaveInvoker.java @@ -29,15 +29,15 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetPlayer; /** @@ -54,7 +54,7 @@ public class FlamewaveInvoker extends CardImpl { this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(5), new ManaCostsImpl("{7}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(5), new ManaCostsImpl("{7}{R}")); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/Flashfreeze.java b/Mage.Sets/src/mage/sets/tenth/Flashfreeze.java index 01d10f9c21b..16a7902c58f 100644 --- a/Mage.Sets/src/mage/sets/tenth/Flashfreeze.java +++ b/Mage.Sets/src/mage/sets/tenth/Flashfreeze.java @@ -29,8 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/ForbiddingWatchtower.java b/Mage.Sets/src/mage/sets/tenth/ForbiddingWatchtower.java index 754c8642abe..6d49496bc93 100644 --- a/Mage.Sets/src/mage/sets/tenth/ForbiddingWatchtower.java +++ b/Mage.Sets/src/mage/sets/tenth/ForbiddingWatchtower.java @@ -29,10 +29,9 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldTappedAbility; @@ -41,6 +40,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BecomesCreatureSourceEffect; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.permanent.token.Token; /** @@ -54,7 +54,7 @@ public class ForbiddingWatchtower extends CardImpl { this.expansionSetCode = "10E"; this.addAbility(new EntersBattlefieldTappedAbility()); this.addAbility(new WhiteManaAbility()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new ForbiddingWatchtowerToken(), "land", Duration.EndOfTurn), new ManaCostsImpl("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new ForbiddingWatchtowerToken(), "land", Duration.EndOfTurn), new ManaCostsImpl("{1}{W}"))); } public ForbiddingWatchtower(final ForbiddingWatchtower card) { diff --git a/Mage.Sets/src/mage/sets/tenth/FountainOfYouth.java b/Mage.Sets/src/mage/sets/tenth/FountainOfYouth.java index fceb9362e7f..03dc60bf62d 100644 --- a/Mage.Sets/src/mage/sets/tenth/FountainOfYouth.java +++ b/Mage.Sets/src/mage/sets/tenth/FountainOfYouth.java @@ -29,15 +29,15 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -48,7 +48,7 @@ public class FountainOfYouth extends CardImpl { public FountainOfYouth(UUID ownerId) { super(ownerId, 323, "Fountain of Youth", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{0}"); this.expansionSetCode = "10E"; - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainLifeEffect(1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/FugitiveWizard.java b/Mage.Sets/src/mage/sets/tenth/FugitiveWizard.java index 9e906127f88..640066bf60a 100644 --- a/Mage.Sets/src/mage/sets/tenth/FugitiveWizard.java +++ b/Mage.Sets/src/mage/sets/tenth/FugitiveWizard.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/FurnaceWhelp.java b/Mage.Sets/src/mage/sets/tenth/FurnaceWhelp.java index 3f2a6c7267c..7bbde42c87a 100644 --- a/Mage.Sets/src/mage/sets/tenth/FurnaceWhelp.java +++ b/Mage.Sets/src/mage/sets/tenth/FurnaceWhelp.java @@ -29,9 +29,7 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -53,7 +51,7 @@ public class FurnaceWhelp extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); } public FurnaceWhelp(final FurnaceWhelp card) { diff --git a/Mage.Sets/src/mage/sets/tenth/GaeasHerald.java b/Mage.Sets/src/mage/sets/tenth/GaeasHerald.java index 1e5ff903bbe..cee81f28303 100644 --- a/Mage.Sets/src/mage/sets/tenth/GaeasHerald.java +++ b/Mage.Sets/src/mage/sets/tenth/GaeasHerald.java @@ -29,9 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -57,7 +56,7 @@ public class GaeasHerald extends CardImpl { this.toughness = new MageInt(1); // Creature spells can't be countered. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new CantCounterEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantCounterEffect())); } public GaeasHerald(final GaeasHerald card) { @@ -75,7 +74,7 @@ class CantCounterEffect extends ReplacementEffectImpl { public CantCounterEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "Creature spells can't be countered"; } diff --git a/Mage.Sets/src/mage/sets/tenth/GhituEncampment.java b/Mage.Sets/src/mage/sets/tenth/GhituEncampment.java index 69402460cfc..373541aebb2 100644 --- a/Mage.Sets/src/mage/sets/tenth/GhituEncampment.java +++ b/Mage.Sets/src/mage/sets/tenth/GhituEncampment.java @@ -28,10 +28,10 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/GhostWarden.java b/Mage.Sets/src/mage/sets/tenth/GhostWarden.java index 67fc2d75c11..0e32ff71a8d 100644 --- a/Mage.Sets/src/mage/sets/tenth/GhostWarden.java +++ b/Mage.Sets/src/mage/sets/tenth/GhostWarden.java @@ -28,15 +28,17 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -52,7 +54,7 @@ public class GhostWarden extends CardImpl { this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Constants.Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/GiantGrowth.java b/Mage.Sets/src/mage/sets/tenth/GiantGrowth.java index a6914575392..8739235bfb9 100644 --- a/Mage.Sets/src/mage/sets/tenth/GiantGrowth.java +++ b/Mage.Sets/src/mage/sets/tenth/GiantGrowth.java @@ -29,9 +29,9 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/tenth/GiantSpider.java b/Mage.Sets/src/mage/sets/tenth/GiantSpider.java index b1f29d5f37c..bd23163f37d 100644 --- a/Mage.Sets/src/mage/sets/tenth/GiantSpider.java +++ b/Mage.Sets/src/mage/sets/tenth/GiantSpider.java @@ -29,8 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/GloriousAnthem.java b/Mage.Sets/src/mage/sets/tenth/GloriousAnthem.java index 7cb48ae14c0..19a49f2dadc 100644 --- a/Mage.Sets/src/mage/sets/tenth/GloriousAnthem.java +++ b/Mage.Sets/src/mage/sets/tenth/GloriousAnthem.java @@ -29,12 +29,13 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; /** @@ -47,7 +48,7 @@ public class GloriousAnthem extends CardImpl { super(ownerId, 17, "Glorious Anthem", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}{W}"); this.expansionSetCode = "10E"; this.color.setWhite(true); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Constants.Duration.WhileOnBattlefield, new FilterCreaturePermanent(), false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, new FilterCreaturePermanent(), false))); } public GloriousAnthem(final GloriousAnthem card) { diff --git a/Mage.Sets/src/mage/sets/tenth/GoblinEliteInfantry.java b/Mage.Sets/src/mage/sets/tenth/GoblinEliteInfantry.java index 5ce4538c069..ad2fd2c1429 100644 --- a/Mage.Sets/src/mage/sets/tenth/GoblinEliteInfantry.java +++ b/Mage.Sets/src/mage/sets/tenth/GoblinEliteInfantry.java @@ -29,13 +29,13 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -51,7 +51,7 @@ public class GoblinEliteInfantry extends CardImpl { this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new BlocksOrBecomesBlockedTriggeredAbility(new BoostSourceEffect(-1, -1, Constants.Duration.EndOfTurn), false)); + this.addAbility(new BlocksOrBecomesBlockedTriggeredAbility(new BoostSourceEffect(-1, -1, Duration.EndOfTurn), false)); } public GoblinEliteInfantry(final GoblinEliteInfantry card) { diff --git a/Mage.Sets/src/mage/sets/tenth/GoblinKing.java b/Mage.Sets/src/mage/sets/tenth/GoblinKing.java index 47b8421d142..35429bb0b1e 100644 --- a/Mage.Sets/src/mage/sets/tenth/GoblinKing.java +++ b/Mage.Sets/src/mage/sets/tenth/GoblinKing.java @@ -29,15 +29,16 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.abilities.keyword.MountainwalkAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -60,8 +61,8 @@ public class GoblinKing extends CardImpl { this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Constants.Duration.WhileOnBattlefield, filter, true))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAllEffect(new MountainwalkAbility(), Constants.Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new MountainwalkAbility(), Duration.WhileOnBattlefield, filter, true))); } public GoblinKing(final GoblinKing card) { diff --git a/Mage.Sets/src/mage/sets/tenth/GoblinLore.java b/Mage.Sets/src/mage/sets/tenth/GoblinLore.java index 9455e121525..74e200a9169 100644 --- a/Mage.Sets/src/mage/sets/tenth/GoblinLore.java +++ b/Mage.Sets/src/mage/sets/tenth/GoblinLore.java @@ -28,9 +28,9 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/tenth/GoblinPiker.java b/Mage.Sets/src/mage/sets/tenth/GoblinPiker.java index a034605ad1f..097afadc9f1 100644 --- a/Mage.Sets/src/mage/sets/tenth/GoblinPiker.java +++ b/Mage.Sets/src/mage/sets/tenth/GoblinPiker.java @@ -29,8 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/GoblinSkyRaider.java b/Mage.Sets/src/mage/sets/tenth/GoblinSkyRaider.java index db26683393b..aba0716d4a1 100644 --- a/Mage.Sets/src/mage/sets/tenth/GoblinSkyRaider.java +++ b/Mage.Sets/src/mage/sets/tenth/GoblinSkyRaider.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/GravebornMuse.java b/Mage.Sets/src/mage/sets/tenth/GravebornMuse.java index 1ef1a2e758b..9ab8d083baf 100644 --- a/Mage.Sets/src/mage/sets/tenth/GravebornMuse.java +++ b/Mage.Sets/src/mage/sets/tenth/GravebornMuse.java @@ -29,9 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -39,6 +38,7 @@ import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.LoseLifeSourceEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -64,7 +64,7 @@ public class GravebornMuse extends CardImpl { this.toughness = new MageInt(3); // At the beginning of your upkeep, you draw X cards and you lose X life, where X is the number of Zombies you control. - Ability ability = new BeginningOfUpkeepTriggeredAbility(new DrawCardControllerEffect(new PermanentsOnBattlefieldCount(filter)), Constants.TargetController.YOU, false); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new DrawCardControllerEffect(new PermanentsOnBattlefieldCount(filter)), TargetController.YOU, false); ability.addEffect(new LoseLifeSourceEffect(new PermanentsOnBattlefieldCount(filter))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/Gravedigger.java b/Mage.Sets/src/mage/sets/tenth/Gravedigger.java index 0e507b2ce6d..14df12e6e27 100644 --- a/Mage.Sets/src/mage/sets/tenth/Gravedigger.java +++ b/Mage.Sets/src/mage/sets/tenth/Gravedigger.java @@ -29,8 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/GrizzlyBears.java b/Mage.Sets/src/mage/sets/tenth/GrizzlyBears.java index 796da46815a..cad4071d809 100644 --- a/Mage.Sets/src/mage/sets/tenth/GrizzlyBears.java +++ b/Mage.Sets/src/mage/sets/tenth/GrizzlyBears.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/HateWeaver.java b/Mage.Sets/src/mage/sets/tenth/HateWeaver.java index d903677b4b8..d487503bf10 100644 --- a/Mage.Sets/src/mage/sets/tenth/HateWeaver.java +++ b/Mage.Sets/src/mage/sets/tenth/HateWeaver.java @@ -29,9 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -39,6 +38,8 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; @@ -66,7 +67,7 @@ public class HateWeaver extends CardImpl { this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Constants.Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/HiddenHorror.java b/Mage.Sets/src/mage/sets/tenth/HiddenHorror.java index e393598177b..36cb3dafccb 100644 --- a/Mage.Sets/src/mage/sets/tenth/HiddenHorror.java +++ b/Mage.Sets/src/mage/sets/tenth/HiddenHorror.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.common.DiscardTargetCost; diff --git a/Mage.Sets/src/mage/sets/tenth/HighwayRobber.java b/Mage.Sets/src/mage/sets/tenth/HighwayRobber.java index 283d64dc0a5..7391566715b 100644 --- a/Mage.Sets/src/mage/sets/tenth/HighwayRobber.java +++ b/Mage.Sets/src/mage/sets/tenth/HighwayRobber.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/HillGiant.java b/Mage.Sets/src/mage/sets/tenth/HillGiant.java index 3c30896b283..4202321cca2 100644 --- a/Mage.Sets/src/mage/sets/tenth/HillGiant.java +++ b/Mage.Sets/src/mage/sets/tenth/HillGiant.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/HolyStrength.java b/Mage.Sets/src/mage/sets/tenth/HolyStrength.java index 1e58e7a2496..b9c3dc5423c 100644 --- a/Mage.Sets/src/mage/sets/tenth/HolyStrength.java +++ b/Mage.Sets/src/mage/sets/tenth/HolyStrength.java @@ -29,11 +29,11 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; diff --git a/Mage.Sets/src/mage/sets/tenth/HonorGuard.java b/Mage.Sets/src/mage/sets/tenth/HonorGuard.java index 1bcf1a8e8c9..4982a7bdc06 100644 --- a/Mage.Sets/src/mage/sets/tenth/HonorGuard.java +++ b/Mage.Sets/src/mage/sets/tenth/HonorGuard.java @@ -29,9 +29,7 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -52,7 +50,7 @@ public class HonorGuard extends CardImpl { this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.W))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W))); } public HonorGuard(final HonorGuard card) { diff --git a/Mage.Sets/src/mage/sets/tenth/HorseshoeCrab.java b/Mage.Sets/src/mage/sets/tenth/HorseshoeCrab.java index eb80c999803..f855621d188 100644 --- a/Mage.Sets/src/mage/sets/tenth/HorseshoeCrab.java +++ b/Mage.Sets/src/mage/sets/tenth/HorseshoeCrab.java @@ -29,14 +29,15 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.UntapSourceEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; /** * @@ -51,7 +52,7 @@ public class HorseshoeCrab extends CardImpl { this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new UntapSourceEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.U))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ColoredManaCost(ColoredManaSymbol.U))); } public HorseshoeCrab(final HorseshoeCrab card) { diff --git a/Mage.Sets/src/mage/sets/tenth/IcatianPriest.java b/Mage.Sets/src/mage/sets/tenth/IcatianPriest.java index 185312abf82..759bd7b7f75 100644 --- a/Mage.Sets/src/mage/sets/tenth/IcatianPriest.java +++ b/Mage.Sets/src/mage/sets/tenth/IcatianPriest.java @@ -29,15 +29,16 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -54,7 +55,7 @@ public class IcatianPriest extends CardImpl { this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Constants.Duration.EndOfTurn), new ManaCostsImpl("{1}{W}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{1}{W}{W}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/IcyManipulator.java b/Mage.Sets/src/mage/sets/tenth/IcyManipulator.java index 4c10f4e9bf5..13cd0423026 100644 --- a/Mage.Sets/src/mage/sets/tenth/IcyManipulator.java +++ b/Mage.Sets/src/mage/sets/tenth/IcyManipulator.java @@ -29,15 +29,15 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -61,7 +61,7 @@ public class IcyManipulator extends CardImpl { public IcyManipulator(UUID ownerId) { super(ownerId, 326, "Icy Manipulator", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{4}"); this.expansionSetCode = "10E"; - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/tenth/Incinerate.java b/Mage.Sets/src/mage/sets/tenth/Incinerate.java index 9ef7fc0904f..4c3f770dddb 100644 --- a/Mage.Sets/src/mage/sets/tenth/Incinerate.java +++ b/Mage.Sets/src/mage/sets/tenth/Incinerate.java @@ -28,10 +28,10 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.DamageTargetEffect; diff --git a/Mage.Sets/src/mage/sets/tenth/JayemdaeTome.java b/Mage.Sets/src/mage/sets/tenth/JayemdaeTome.java index acf5b7e8ca6..fd908e00060 100644 --- a/Mage.Sets/src/mage/sets/tenth/JayemdaeTome.java +++ b/Mage.Sets/src/mage/sets/tenth/JayemdaeTome.java @@ -29,15 +29,15 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -48,7 +48,7 @@ public class JayemdaeTome extends CardImpl { public JayemdaeTome(UUID ownerId) { super(ownerId, 327, "Jayemdae Tome", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{4}"); this.expansionSetCode = "10E"; - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/JoinerAdept.java b/Mage.Sets/src/mage/sets/tenth/JoinerAdept.java index fce546476ac..33bc44011c0 100644 --- a/Mage.Sets/src/mage/sets/tenth/JoinerAdept.java +++ b/Mage.Sets/src/mage/sets/tenth/JoinerAdept.java @@ -29,14 +29,15 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; /** @@ -53,7 +54,7 @@ public class JoinerAdept extends CardImpl { this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityControlledEffect(new AnyColorManaAbility(), Constants.Duration.WhileOnBattlefield, new FilterLandPermanent(), false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(new AnyColorManaAbility(), Duration.WhileOnBattlefield, new FilterLandPermanent(), false))); } public JoinerAdept(final JoinerAdept card) { diff --git a/Mage.Sets/src/mage/sets/tenth/Juggernaut.java b/Mage.Sets/src/mage/sets/tenth/Juggernaut.java index 139b9e212a9..2a2bb584ca3 100644 --- a/Mage.Sets/src/mage/sets/tenth/Juggernaut.java +++ b/Mage.Sets/src/mage/sets/tenth/Juggernaut.java @@ -29,9 +29,9 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.EvasionAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/KamahlPitFighter.java b/Mage.Sets/src/mage/sets/tenth/KamahlPitFighter.java index 79d79671ff5..7915215d18b 100644 --- a/Mage.Sets/src/mage/sets/tenth/KamahlPitFighter.java +++ b/Mage.Sets/src/mage/sets/tenth/KamahlPitFighter.java @@ -29,9 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; /** @@ -57,7 +57,7 @@ public class KamahlPitFighter extends CardImpl { this.power = new MageInt(6); this.toughness = new MageInt(1); this.addAbility(HasteAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(3), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new TapSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/KarplusanForest.java b/Mage.Sets/src/mage/sets/tenth/KarplusanForest.java index 120ce520122..7757ef22a97 100644 --- a/Mage.Sets/src/mage/sets/tenth/KarplusanForest.java +++ b/Mage.Sets/src/mage/sets/tenth/KarplusanForest.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.mana.ColorlessManaAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/KavuClimber.java b/Mage.Sets/src/mage/sets/tenth/KavuClimber.java index fead7437ddf..68ecbc0bb57 100644 --- a/Mage.Sets/src/mage/sets/tenth/KavuClimber.java +++ b/Mage.Sets/src/mage/sets/tenth/KavuClimber.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/tenth/KrakensEye.java b/Mage.Sets/src/mage/sets/tenth/KrakensEye.java index ccea0fbbd2c..dbbc1017c1d 100644 --- a/Mage.Sets/src/mage/sets/tenth/KrakensEye.java +++ b/Mage.Sets/src/mage/sets/tenth/KrakensEye.java @@ -29,9 +29,9 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/LavaAxe.java b/Mage.Sets/src/mage/sets/tenth/LavaAxe.java index 714888b24c8..82007a6f1d7 100644 --- a/Mage.Sets/src/mage/sets/tenth/LavaAxe.java +++ b/Mage.Sets/src/mage/sets/tenth/LavaAxe.java @@ -29,8 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/tenth/LeoninScimitar.java b/Mage.Sets/src/mage/sets/tenth/LeoninScimitar.java index bd579a73140..0c7711664ec 100644 --- a/Mage.Sets/src/mage/sets/tenth/LeoninScimitar.java +++ b/Mage.Sets/src/mage/sets/tenth/LeoninScimitar.java @@ -29,14 +29,15 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; /** * @author Loki @@ -47,8 +48,8 @@ public class LeoninScimitar extends CardImpl { super(ownerId, 331, "Leonin Scimitar", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{1}"); this.expansionSetCode = "10E"; this.subtype.add("Equipment"); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(1))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1))); } public LeoninScimitar(final LeoninScimitar card) { diff --git a/Mage.Sets/src/mage/sets/tenth/LightningElemental.java b/Mage.Sets/src/mage/sets/tenth/LightningElemental.java index e749c41b418..7b5fbacc8e3 100644 --- a/Mage.Sets/src/mage/sets/tenth/LightningElemental.java +++ b/Mage.Sets/src/mage/sets/tenth/LightningElemental.java @@ -29,8 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/LlanowarElves.java b/Mage.Sets/src/mage/sets/tenth/LlanowarElves.java index 1771d3f80cf..700dbff6243 100644 --- a/Mage.Sets/src/mage/sets/tenth/LlanowarElves.java +++ b/Mage.Sets/src/mage/sets/tenth/LlanowarElves.java @@ -29,8 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/LordOfTheUndead.java b/Mage.Sets/src/mage/sets/tenth/LordOfTheUndead.java index 54926ff3e8c..67ec85a0af9 100644 --- a/Mage.Sets/src/mage/sets/tenth/LordOfTheUndead.java +++ b/Mage.Sets/src/mage/sets/tenth/LordOfTheUndead.java @@ -28,10 +28,10 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/LoyalSentry.java b/Mage.Sets/src/mage/sets/tenth/LoyalSentry.java index f467632e265..ad319796663 100644 --- a/Mage.Sets/src/mage/sets/tenth/LoyalSentry.java +++ b/Mage.Sets/src/mage/sets/tenth/LoyalSentry.java @@ -30,14 +30,14 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; @@ -72,7 +72,7 @@ public class LoyalSentry extends CardImpl { class LoyalSentryEffect extends OneShotEffect { LoyalSentryEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); staticText = "destroy that creature and {this}"; } diff --git a/Mage.Sets/src/mage/sets/tenth/LumengridWarden.java b/Mage.Sets/src/mage/sets/tenth/LumengridWarden.java index 227e3e4e040..a02fb599f2b 100644 --- a/Mage.Sets/src/mage/sets/tenth/LumengridWarden.java +++ b/Mage.Sets/src/mage/sets/tenth/LumengridWarden.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/MahamotiDjinn.java b/Mage.Sets/src/mage/sets/tenth/MahamotiDjinn.java index dddf12fba87..8187428f3ff 100644 --- a/Mage.Sets/src/mage/sets/tenth/MahamotiDjinn.java +++ b/Mage.Sets/src/mage/sets/tenth/MahamotiDjinn.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/Manabarbs.java b/Mage.Sets/src/mage/sets/tenth/Manabarbs.java index 5d6cbe50c68..1dedd5e8eaa 100644 --- a/Mage.Sets/src/mage/sets/tenth/Manabarbs.java +++ b/Mage.Sets/src/mage/sets/tenth/Manabarbs.java @@ -29,10 +29,10 @@ package mage.sets.tenth; import java.util.UUID; -import static mage.Constants.Zone; +import mage.constants.Zone; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/MantisEngine.java b/Mage.Sets/src/mage/sets/tenth/MantisEngine.java index e4f0f5f8d5d..d98e8daa0e5 100644 --- a/Mage.Sets/src/mage/sets/tenth/MantisEngine.java +++ b/Mage.Sets/src/mage/sets/tenth/MantisEngine.java @@ -29,9 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -39,6 +38,8 @@ import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -52,8 +53,8 @@ public class MantisEngine extends CardImpl { this.subtype.add("Insect"); this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn), new GenericManaCost(2))); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Constants.Duration.EndOfTurn), new GenericManaCost(2))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2))); } public MantisEngine(final MantisEngine card) { diff --git a/Mage.Sets/src/mage/sets/tenth/MarchOfTheMachines.java b/Mage.Sets/src/mage/sets/tenth/MarchOfTheMachines.java index cacb4f45226..a4679d0bc21 100644 --- a/Mage.Sets/src/mage/sets/tenth/MarchOfTheMachines.java +++ b/Mage.Sets/src/mage/sets/tenth/MarchOfTheMachines.java @@ -28,9 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; @@ -54,7 +53,7 @@ public class MarchOfTheMachines extends CardImpl { this.color.setBlue(true); // Each noncreature artifact is an artifact creature with power and toughness each equal to its converted mana cost. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new MarchOfTheMachinesEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MarchOfTheMachinesEffect())); } public MarchOfTheMachines(final MarchOfTheMachines card) { @@ -74,7 +73,7 @@ class MarchOfTheMachinesEffect extends ContinuousEffectImpl { class MergimTriggeredAbility extends TriggeredAbilityImpl { MergimTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(2)); + super(Zone.BATTLEFIELD, new DamageTargetEffect(2)); this.addTarget(new TargetOpponent()); } diff --git a/Mage.Sets/src/mage/sets/tenth/MightWeaver.java b/Mage.Sets/src/mage/sets/tenth/MightWeaver.java index 0f3a3f70516..66c10a7bab6 100644 --- a/Mage.Sets/src/mage/sets/tenth/MightWeaver.java +++ b/Mage.Sets/src/mage/sets/tenth/MightWeaver.java @@ -29,9 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -40,6 +39,8 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; @@ -67,7 +68,7 @@ public class MightWeaver extends CardImpl { this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityTargetEffect(TrampleAbility.getInstance(), Constants.Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/MindRot.java b/Mage.Sets/src/mage/sets/tenth/MindRot.java index 7f30d77bc89..5497883a6a2 100644 --- a/Mage.Sets/src/mage/sets/tenth/MindRot.java +++ b/Mage.Sets/src/mage/sets/tenth/MindRot.java @@ -29,8 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DiscardTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/tenth/MindStone.java b/Mage.Sets/src/mage/sets/tenth/MindStone.java index 0fe3bccea43..11c5590b8a1 100644 --- a/Mage.Sets/src/mage/sets/tenth/MindStone.java +++ b/Mage.Sets/src/mage/sets/tenth/MindStone.java @@ -29,9 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -40,6 +39,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -51,7 +51,7 @@ public class MindStone extends CardImpl { super(ownerId, 335, "Mind Stone", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "10E"; this.addAbility(new ColorlessManaAbility()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/tenth/MirriCatWarrior.java b/Mage.Sets/src/mage/sets/tenth/MirriCatWarrior.java index 3b65bf2eefb..08fd489f9f9 100644 --- a/Mage.Sets/src/mage/sets/tenth/MirriCatWarrior.java +++ b/Mage.Sets/src/mage/sets/tenth/MirriCatWarrior.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.ForestwalkAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/Mobilization.java b/Mage.Sets/src/mage/sets/tenth/Mobilization.java index 7926634bfa0..da480c6c99d 100644 --- a/Mage.Sets/src/mage/sets/tenth/Mobilization.java +++ b/Mage.Sets/src/mage/sets/tenth/Mobilization.java @@ -29,9 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.SoldierToken; @@ -59,8 +60,8 @@ public class Mobilization extends CardImpl { super(ownerId, 29, "Mobilization", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); this.expansionSetCode = "10E"; this.color.setWhite(true); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAllEffect(VigilanceAbility.getInstance(), Constants.Duration.WhileOnBattlefield, filter, false))); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new SoldierToken(), 1), new ManaCostsImpl("{2}{W}"))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SoldierToken(), 1), new ManaCostsImpl("{2}{W}"))); } public Mobilization(final Mobilization card) { diff --git a/Mage.Sets/src/mage/sets/tenth/MoggFanatic.java b/Mage.Sets/src/mage/sets/tenth/MoggFanatic.java index c14f2a24198..41357ce8937 100644 --- a/Mage.Sets/src/mage/sets/tenth/MoggFanatic.java +++ b/Mage.Sets/src/mage/sets/tenth/MoggFanatic.java @@ -28,7 +28,7 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/tenth/MolimoMaroSorcerer.java b/Mage.Sets/src/mage/sets/tenth/MolimoMaroSorcerer.java index c4ffb060744..0b2c9a887b5 100644 --- a/Mage.Sets/src/mage/sets/tenth/MolimoMaroSorcerer.java +++ b/Mage.Sets/src/mage/sets/tenth/MolimoMaroSorcerer.java @@ -28,10 +28,10 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; diff --git a/Mage.Sets/src/mage/sets/tenth/Mortivore.java b/Mage.Sets/src/mage/sets/tenth/Mortivore.java index ff7820b79fe..d83004ab15f 100644 --- a/Mage.Sets/src/mage/sets/tenth/Mortivore.java +++ b/Mage.Sets/src/mage/sets/tenth/Mortivore.java @@ -29,11 +29,10 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -42,6 +41,7 @@ import mage.abilities.dynamicvalue.common.CardsInAllGraveyardsCount; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; import mage.filter.common.FilterCreatureCard; /** @@ -58,7 +58,7 @@ public class Mortivore extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(0); this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new CardsInAllGraveyardsCount(new FilterCreatureCard()), Duration.EndOfGame))); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.B))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.B))); } public Mortivore(final Mortivore card) { diff --git a/Mage.Sets/src/mage/sets/tenth/NantukoHusk.java b/Mage.Sets/src/mage/sets/tenth/NantukoHusk.java index 992b38756b4..86100bc9380 100644 --- a/Mage.Sets/src/mage/sets/tenth/NantukoHusk.java +++ b/Mage.Sets/src/mage/sets/tenth/NantukoHusk.java @@ -29,14 +29,15 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -53,7 +54,7 @@ public class NantukoHusk extends CardImpl { this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Constants.Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); } public NantukoHusk(final NantukoHusk card) { diff --git a/Mage.Sets/src/mage/sets/tenth/Naturalize.java b/Mage.Sets/src/mage/sets/tenth/Naturalize.java index 10f07f1090d..334dd842d91 100644 --- a/Mage.Sets/src/mage/sets/tenth/Naturalize.java +++ b/Mage.Sets/src/mage/sets/tenth/Naturalize.java @@ -29,8 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/tenth/Nightmare.java b/Mage.Sets/src/mage/sets/tenth/Nightmare.java index 17d7923b756..2ffd4c3689e 100644 --- a/Mage.Sets/src/mage/sets/tenth/Nightmare.java +++ b/Mage.Sets/src/mage/sets/tenth/Nightmare.java @@ -29,10 +29,10 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; diff --git a/Mage.Sets/src/mage/sets/tenth/Ornithopter.java b/Mage.Sets/src/mage/sets/tenth/Ornithopter.java index 8ab7b2920f8..6de454a1a5e 100644 --- a/Mage.Sets/src/mage/sets/tenth/Ornithopter.java +++ b/Mage.Sets/src/mage/sets/tenth/Ornithopter.java @@ -29,8 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/Pacifism.java b/Mage.Sets/src/mage/sets/tenth/Pacifism.java index dd2050ee638..670949b47f2 100644 --- a/Mage.Sets/src/mage/sets/tenth/Pacifism.java +++ b/Mage.Sets/src/mage/sets/tenth/Pacifism.java @@ -29,11 +29,11 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; diff --git a/Mage.Sets/src/mage/sets/tenth/Peek.java b/Mage.Sets/src/mage/sets/tenth/Peek.java index d9462de28ea..a09b7901c72 100644 --- a/Mage.Sets/src/mage/sets/tenth/Peek.java +++ b/Mage.Sets/src/mage/sets/tenth/Peek.java @@ -28,13 +28,14 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; @@ -70,7 +71,7 @@ public class Peek extends CardImpl { class PeekEffect extends OneShotEffect { PeekEffect() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); staticText = "Look at target player's hand"; } diff --git a/Mage.Sets/src/mage/sets/tenth/PhyrexianRager.java b/Mage.Sets/src/mage/sets/tenth/PhyrexianRager.java index b13ae7b25a3..43e4de504e9 100644 --- a/Mage.Sets/src/mage/sets/tenth/PhyrexianRager.java +++ b/Mage.Sets/src/mage/sets/tenth/PhyrexianRager.java @@ -29,8 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/PhyrexianVault.java b/Mage.Sets/src/mage/sets/tenth/PhyrexianVault.java index 74e23480c6b..d9bf605c8b5 100644 --- a/Mage.Sets/src/mage/sets/tenth/PhyrexianVault.java +++ b/Mage.Sets/src/mage/sets/tenth/PhyrexianVault.java @@ -29,9 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -50,7 +50,7 @@ public class PhyrexianVault extends CardImpl { public PhyrexianVault(UUID ownerId) { super(ownerId, 337, "Phyrexian Vault", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "10E"; - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/tenth/PlagueBeetle.java b/Mage.Sets/src/mage/sets/tenth/PlagueBeetle.java index 55967ef1706..d36634cf80f 100644 --- a/Mage.Sets/src/mage/sets/tenth/PlagueBeetle.java +++ b/Mage.Sets/src/mage/sets/tenth/PlagueBeetle.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/PlatinumAngel.java b/Mage.Sets/src/mage/sets/tenth/PlatinumAngel.java index 3d92bc66897..5a6982c8b8b 100644 --- a/Mage.Sets/src/mage/sets/tenth/PlatinumAngel.java +++ b/Mage.Sets/src/mage/sets/tenth/PlatinumAngel.java @@ -29,11 +29,11 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/PrimalRage.java b/Mage.Sets/src/mage/sets/tenth/PrimalRage.java index bb3ce295605..b65235becf7 100644 --- a/Mage.Sets/src/mage/sets/tenth/PrimalRage.java +++ b/Mage.Sets/src/mage/sets/tenth/PrimalRage.java @@ -29,13 +29,14 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; /** @@ -48,7 +49,7 @@ public class PrimalRage extends CardImpl { super(ownerId, 286, "Primal Rage", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); this.expansionSetCode = "10E"; this.color.setGreen(true); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityControlledEffect(TrampleAbility.getInstance(), Constants.Duration.WhileOnBattlefield, new FilterCreaturePermanent(), false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent(), false))); } public PrimalRage(final PrimalRage card) { diff --git a/Mage.Sets/src/mage/sets/tenth/ProdigalPyromancer.java b/Mage.Sets/src/mage/sets/tenth/ProdigalPyromancer.java index b0e33d7b344..c3e69f89884 100644 --- a/Mage.Sets/src/mage/sets/tenth/ProdigalPyromancer.java +++ b/Mage.Sets/src/mage/sets/tenth/ProdigalPyromancer.java @@ -29,9 +29,9 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/Puppeteer.java b/Mage.Sets/src/mage/sets/tenth/Puppeteer.java index 33799ff6d70..e46e4e1b3ea 100644 --- a/Mage.Sets/src/mage/sets/tenth/Puppeteer.java +++ b/Mage.Sets/src/mage/sets/tenth/Puppeteer.java @@ -29,9 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.MayTapOrUntapTargetEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -58,7 +59,7 @@ public class Puppeteer extends CardImpl { this.toughness = new MageInt(2); // {U}, {tap}: You may tap or untap target creature. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.U)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/tenth/Pyroclasm.java b/Mage.Sets/src/mage/sets/tenth/Pyroclasm.java index 08aaabe6034..8b624921ca0 100644 --- a/Mage.Sets/src/mage/sets/tenth/Pyroclasm.java +++ b/Mage.Sets/src/mage/sets/tenth/Pyroclasm.java @@ -29,8 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageAllEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/tenth/Quicksand.java b/Mage.Sets/src/mage/sets/tenth/Quicksand.java index c498403e8d8..2f33bd6e685 100644 --- a/Mage.Sets/src/mage/sets/tenth/Quicksand.java +++ b/Mage.Sets/src/mage/sets/tenth/Quicksand.java @@ -28,10 +28,10 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/tenth/QuirionDryad.java b/Mage.Sets/src/mage/sets/tenth/QuirionDryad.java index 185cf9d8c08..7a454a91cab 100644 --- a/Mage.Sets/src/mage/sets/tenth/QuirionDryad.java +++ b/Mage.Sets/src/mage/sets/tenth/QuirionDryad.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SpellCastTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/RageWeaver.java b/Mage.Sets/src/mage/sets/tenth/RageWeaver.java index 8eb94d07c42..d0fce53a90a 100644 --- a/Mage.Sets/src/mage/sets/tenth/RageWeaver.java +++ b/Mage.Sets/src/mage/sets/tenth/RageWeaver.java @@ -29,9 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -40,6 +39,8 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; @@ -67,7 +68,7 @@ public class RageWeaver extends CardImpl { this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Constants.Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/RagingGoblin.java b/Mage.Sets/src/mage/sets/tenth/RagingGoblin.java index e821a1d6f3d..4a8f73f8038 100644 --- a/Mage.Sets/src/mage/sets/tenth/RagingGoblin.java +++ b/Mage.Sets/src/mage/sets/tenth/RagingGoblin.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/RavenousRats.java b/Mage.Sets/src/mage/sets/tenth/RavenousRats.java index 8c9b1a223eb..e4fd95273cd 100644 --- a/Mage.Sets/src/mage/sets/tenth/RavenousRats.java +++ b/Mage.Sets/src/mage/sets/tenth/RavenousRats.java @@ -28,8 +28,8 @@ package mage.sets.tenth; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/RazormaneMasticore.java b/Mage.Sets/src/mage/sets/tenth/RazormaneMasticore.java index da2d266dfa2..d350ed1752e 100644 --- a/Mage.Sets/src/mage/sets/tenth/RazormaneMasticore.java +++ b/Mage.Sets/src/mage/sets/tenth/RazormaneMasticore.java @@ -28,9 +28,9 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfDrawTriggeredAbility; @@ -40,6 +40,8 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.target.common.TargetCardInHand; import mage.target.common.TargetCreaturePermanent; @@ -61,10 +63,10 @@ public class RazormaneMasticore extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // At the beginning of your upkeep, sacrifice Razormane Masticore unless you discard a card. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(Constants.Zone.BATTLEFIELD, new SacrificeSourceUnlessPaysEffect(new DiscardTargetCost(new TargetCardInHand())), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceUnlessPaysEffect(new DiscardTargetCost(new TargetCardInHand())), TargetController.YOU, false)); // At the beginning of your draw step, you may have Razormane Masticore deal 3 damage to target creature. - Ability ability = new BeginningOfDrawTriggeredAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(3), Constants.TargetController.YOU, true); + Ability ability = new BeginningOfDrawTriggeredAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), TargetController.YOU, true); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/Recollect.java b/Mage.Sets/src/mage/sets/tenth/Recollect.java index b1da96c9bdb..a1a19bd3927 100644 --- a/Mage.Sets/src/mage/sets/tenth/Recollect.java +++ b/Mage.Sets/src/mage/sets/tenth/Recollect.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCardInYourGraveyard; diff --git a/Mage.Sets/src/mage/sets/tenth/Regeneration.java b/Mage.Sets/src/mage/sets/tenth/Regeneration.java index 449db669bf9..aa820686dac 100644 --- a/Mage.Sets/src/mage/sets/tenth/Regeneration.java +++ b/Mage.Sets/src/mage/sets/tenth/Regeneration.java @@ -28,7 +28,7 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/tenth/RelentlessRats.java b/Mage.Sets/src/mage/sets/tenth/RelentlessRats.java index 1eefdd5b192..fb296fe2d8c 100644 --- a/Mage.Sets/src/mage/sets/tenth/RelentlessRats.java +++ b/Mage.Sets/src/mage/sets/tenth/RelentlessRats.java @@ -29,13 +29,13 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/RemoveSoul.java b/Mage.Sets/src/mage/sets/tenth/RemoveSoul.java index 52617b298a3..791d4261c9b 100644 --- a/Mage.Sets/src/mage/sets/tenth/RemoveSoul.java +++ b/Mage.Sets/src/mage/sets/tenth/RemoveSoul.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; diff --git a/Mage.Sets/src/mage/sets/tenth/RevivingDose.java b/Mage.Sets/src/mage/sets/tenth/RevivingDose.java index 967714c44c6..44162efc982 100644 --- a/Mage.Sets/src/mage/sets/tenth/RevivingDose.java +++ b/Mage.Sets/src/mage/sets/tenth/RevivingDose.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/ReyaDawnbringer.java b/Mage.Sets/src/mage/sets/tenth/ReyaDawnbringer.java index 49a785e72c4..736247c5dfa 100644 --- a/Mage.Sets/src/mage/sets/tenth/ReyaDawnbringer.java +++ b/Mage.Sets/src/mage/sets/tenth/ReyaDawnbringer.java @@ -29,15 +29,15 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; @@ -56,7 +56,7 @@ public class ReyaDawnbringer extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(6); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new BeginningOfUpkeepTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), Constants.TargetController.YOU, true); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), TargetController.YOU, true); ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard"))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/Rhox.java b/Mage.Sets/src/mage/sets/tenth/Rhox.java index 8955dbd591a..4195a2bf8d7 100644 --- a/Mage.Sets/src/mage/sets/tenth/Rhox.java +++ b/Mage.Sets/src/mage/sets/tenth/Rhox.java @@ -28,9 +28,9 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.DamageAsThoughNotBlockedAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/Righteousness.java b/Mage.Sets/src/mage/sets/tenth/Righteousness.java index bd8441f4afa..cc92155f6fb 100644 --- a/Mage.Sets/src/mage/sets/tenth/Righteousness.java +++ b/Mage.Sets/src/mage/sets/tenth/Righteousness.java @@ -28,9 +28,9 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterBlockingCreature; diff --git a/Mage.Sets/src/mage/sets/tenth/RobeOfMirrors.java b/Mage.Sets/src/mage/sets/tenth/RobeOfMirrors.java index c55585ef47e..8ead011bea3 100644 --- a/Mage.Sets/src/mage/sets/tenth/RobeOfMirrors.java +++ b/Mage.Sets/src/mage/sets/tenth/RobeOfMirrors.java @@ -28,9 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -56,12 +55,12 @@ public class RobeOfMirrors extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature has shroud. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShroudAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA))); } public RobeOfMirrors(final RobeOfMirrors card) { diff --git a/Mage.Sets/src/mage/sets/tenth/RockBadger.java b/Mage.Sets/src/mage/sets/tenth/RockBadger.java index 48807a1337f..26c34290161 100644 --- a/Mage.Sets/src/mage/sets/tenth/RockBadger.java +++ b/Mage.Sets/src/mage/sets/tenth/RockBadger.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.MountainwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/RodOfRuin.java b/Mage.Sets/src/mage/sets/tenth/RodOfRuin.java index 942efbcd78e..c9af51abf00 100644 --- a/Mage.Sets/src/mage/sets/tenth/RodOfRuin.java +++ b/Mage.Sets/src/mage/sets/tenth/RodOfRuin.java @@ -29,15 +29,15 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; /** @@ -49,7 +49,7 @@ public class RodOfRuin extends CardImpl { public RodOfRuin(UUID ownerId) { super(ownerId, 341, "Rod of Ruin", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{4}"); this.expansionSetCode = "10E"; - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/tenth/RootwaterCommando.java b/Mage.Sets/src/mage/sets/tenth/RootwaterCommando.java index 35019605ad6..aec67f0bd5d 100644 --- a/Mage.Sets/src/mage/sets/tenth/RootwaterCommando.java +++ b/Mage.Sets/src/mage/sets/tenth/RootwaterCommando.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.IslandwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/RoyalAssassin.java b/Mage.Sets/src/mage/sets/tenth/RoyalAssassin.java index 4cd40197cbe..85014d9c7e9 100644 --- a/Mage.Sets/src/mage/sets/tenth/RoyalAssassin.java +++ b/Mage.Sets/src/mage/sets/tenth/RoyalAssassin.java @@ -29,9 +29,9 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/RuleOfLaw.java b/Mage.Sets/src/mage/sets/tenth/RuleOfLaw.java index 203df72d853..14e2ed55e13 100644 --- a/Mage.Sets/src/mage/sets/tenth/RuleOfLaw.java +++ b/Mage.Sets/src/mage/sets/tenth/RuleOfLaw.java @@ -28,9 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; @@ -55,7 +54,7 @@ public class RuleOfLaw extends CardImpl { this.color.setWhite(true); // Each player can't cast more than one spell each turn. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new RuleOfLawEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new RuleOfLawEffect())); this.addWatcher(new RuleOfLawWatcher()); } @@ -73,7 +72,7 @@ public class RuleOfLaw extends CardImpl { class RuleOfLawWatcher extends WatcherImpl { public RuleOfLawWatcher() { - super("SpellCast", Constants.WatcherScope.PLAYER); + super("SpellCast", WatcherScope.PLAYER); } public RuleOfLawWatcher(final RuleOfLawWatcher watcher) { @@ -106,7 +105,7 @@ class RuleOfLawWatcher extends WatcherImpl { class RuleOfLawEffect extends ReplacementEffectImpl { public RuleOfLawEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "Each player can't cast more than one spell each turn"; } diff --git a/Mage.Sets/src/mage/sets/tenth/RushwoodDryad.java b/Mage.Sets/src/mage/sets/tenth/RushwoodDryad.java index 8b719f814cb..d171100c5c8 100644 --- a/Mage.Sets/src/mage/sets/tenth/RushwoodDryad.java +++ b/Mage.Sets/src/mage/sets/tenth/RushwoodDryad.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ForestwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/SamiteHealer.java b/Mage.Sets/src/mage/sets/tenth/SamiteHealer.java index fa0eee3a9b4..96faa695273 100644 --- a/Mage.Sets/src/mage/sets/tenth/SamiteHealer.java +++ b/Mage.Sets/src/mage/sets/tenth/SamiteHealer.java @@ -29,15 +29,16 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.PreventDamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; /** @@ -54,7 +55,7 @@ public class SamiteHealer extends CardImpl { this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PreventDamageTargetEffect(Constants.Duration.EndOfTurn, 1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/Scalpelexis.java b/Mage.Sets/src/mage/sets/tenth/Scalpelexis.java index e913c6509e5..7599b8e5cbc 100644 --- a/Mage.Sets/src/mage/sets/tenth/Scalpelexis.java +++ b/Mage.Sets/src/mage/sets/tenth/Scalpelexis.java @@ -30,9 +30,9 @@ package mage.sets.tenth; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -40,6 +40,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.Card; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; @@ -78,7 +79,7 @@ public class Scalpelexis extends CardImpl { class ScalpelexisEffect extends OneShotEffect { public ScalpelexisEffect() { - super(Constants.Outcome.Exile); + super(Outcome.Exile); this.staticText = "that player exiles the top four cards of his or her library. If two or more of those cards have the same name, repeat this process"; } diff --git a/Mage.Sets/src/mage/sets/tenth/ScatheZombies.java b/Mage.Sets/src/mage/sets/tenth/ScatheZombies.java index 01cf2f2ace3..f6b9c7c288b 100644 --- a/Mage.Sets/src/mage/sets/tenth/ScatheZombies.java +++ b/Mage.Sets/src/mage/sets/tenth/ScatheZombies.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/ScionOfTheWild.java b/Mage.Sets/src/mage/sets/tenth/ScionOfTheWild.java index dacc0f3a31a..6d551a9b7aa 100644 --- a/Mage.Sets/src/mage/sets/tenth/ScionOfTheWild.java +++ b/Mage.Sets/src/mage/sets/tenth/ScionOfTheWild.java @@ -29,14 +29,15 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; /** @@ -53,7 +54,7 @@ public class ScionOfTheWild extends CardImpl { this.color.setGreen(true); this.power = new MageInt(0); this.toughness = new MageInt(0); - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Constants.Duration.EndOfGame))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Duration.EndOfGame))); } public ScionOfTheWild(final ScionOfTheWild card) { diff --git a/Mage.Sets/src/mage/sets/tenth/SculptingSteel.java b/Mage.Sets/src/mage/sets/tenth/SculptingSteel.java index 100a4482d7b..e17a3ff804b 100644 --- a/Mage.Sets/src/mage/sets/tenth/SculptingSteel.java +++ b/Mage.Sets/src/mage/sets/tenth/SculptingSteel.java @@ -28,9 +28,9 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.EntersBattlefieldEffect; diff --git a/Mage.Sets/src/mage/sets/tenth/SengirVampire.java b/Mage.Sets/src/mage/sets/tenth/SengirVampire.java index 45451740951..93b16b3b348 100644 --- a/Mage.Sets/src/mage/sets/tenth/SengirVampire.java +++ b/Mage.Sets/src/mage/sets/tenth/SengirVampire.java @@ -27,8 +27,8 @@ */ package mage.sets.tenth; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesAndDealtDamageThisTurnTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/tenth/SerraAngel.java b/Mage.Sets/src/mage/sets/tenth/SerraAngel.java index 54494ef429c..0569758a99a 100644 --- a/Mage.Sets/src/mage/sets/tenth/SerraAngel.java +++ b/Mage.Sets/src/mage/sets/tenth/SerraAngel.java @@ -29,8 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/SerrasEmbrace.java b/Mage.Sets/src/mage/sets/tenth/SerrasEmbrace.java index de553680742..5367735775f 100644 --- a/Mage.Sets/src/mage/sets/tenth/SerrasEmbrace.java +++ b/Mage.Sets/src/mage/sets/tenth/SerrasEmbrace.java @@ -29,9 +29,7 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -57,12 +55,12 @@ public class SerrasEmbrace extends CardImpl { this.color.setWhite(true); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Constants.Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), Constants.AttachmentType.AURA))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA))); } public SerrasEmbrace(final SerrasEmbrace card) { diff --git a/Mage.Sets/src/mage/sets/tenth/SeveredLegion.java b/Mage.Sets/src/mage/sets/tenth/SeveredLegion.java index 286744c9ce1..f20a0137983 100644 --- a/Mage.Sets/src/mage/sets/tenth/SeveredLegion.java +++ b/Mage.Sets/src/mage/sets/tenth/SeveredLegion.java @@ -29,8 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/ShivanDragon.java b/Mage.Sets/src/mage/sets/tenth/ShivanDragon.java index 8c87018f158..17bba8e8e2e 100644 --- a/Mage.Sets/src/mage/sets/tenth/ShivanDragon.java +++ b/Mage.Sets/src/mage/sets/tenth/ShivanDragon.java @@ -29,9 +29,7 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -53,7 +51,7 @@ public class ShivanDragon extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); } public ShivanDragon(final ShivanDragon card) { diff --git a/Mage.Sets/src/mage/sets/tenth/ShivanHellkite.java b/Mage.Sets/src/mage/sets/tenth/ShivanHellkite.java index da3fb34ec24..c2560978e27 100644 --- a/Mage.Sets/src/mage/sets/tenth/ShivanHellkite.java +++ b/Mage.Sets/src/mage/sets/tenth/ShivanHellkite.java @@ -29,9 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; /** @@ -55,7 +55,7 @@ public class ShivanHellkite extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}{R}")); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/Shock.java b/Mage.Sets/src/mage/sets/tenth/Shock.java index 50ac79e835f..30d31cb764d 100644 --- a/Mage.Sets/src/mage/sets/tenth/Shock.java +++ b/Mage.Sets/src/mage/sets/tenth/Shock.java @@ -29,8 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreatureOrPlayer; diff --git a/Mage.Sets/src/mage/sets/tenth/Sift.java b/Mage.Sets/src/mage/sets/tenth/Sift.java index 4da378e9309..86655ccb4f3 100644 --- a/Mage.Sets/src/mage/sets/tenth/Sift.java +++ b/Mage.Sets/src/mage/sets/tenth/Sift.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DiscardControllerEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/SkyWeaver.java b/Mage.Sets/src/mage/sets/tenth/SkyWeaver.java index 931aee9baa0..5b7bd734175 100644 --- a/Mage.Sets/src/mage/sets/tenth/SkyWeaver.java +++ b/Mage.Sets/src/mage/sets/tenth/SkyWeaver.java @@ -29,9 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -40,6 +39,8 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; @@ -67,7 +68,7 @@ public class SkyWeaver extends CardImpl { this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/SkyhunterPatrol.java b/Mage.Sets/src/mage/sets/tenth/SkyhunterPatrol.java index efb9ae0c09a..f19f4fb1577 100644 --- a/Mage.Sets/src/mage/sets/tenth/SkyhunterPatrol.java +++ b/Mage.Sets/src/mage/sets/tenth/SkyhunterPatrol.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/SkyhunterProwler.java b/Mage.Sets/src/mage/sets/tenth/SkyhunterProwler.java index f965be50ece..bb0f6f53df3 100644 --- a/Mage.Sets/src/mage/sets/tenth/SkyhunterProwler.java +++ b/Mage.Sets/src/mage/sets/tenth/SkyhunterProwler.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/SkyhunterSkirmisher.java b/Mage.Sets/src/mage/sets/tenth/SkyhunterSkirmisher.java index e504ff37460..23bd38da163 100644 --- a/Mage.Sets/src/mage/sets/tenth/SkyhunterSkirmisher.java +++ b/Mage.Sets/src/mage/sets/tenth/SkyhunterSkirmisher.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.DoubleStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/SoulFeast.java b/Mage.Sets/src/mage/sets/tenth/SoulFeast.java index 98d297e3c9c..6b248537a4f 100644 --- a/Mage.Sets/src/mage/sets/tenth/SoulFeast.java +++ b/Mage.Sets/src/mage/sets/tenth/SoulFeast.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/SoulWarden.java b/Mage.Sets/src/mage/sets/tenth/SoulWarden.java index cd2dfc70a77..cb706519839 100644 --- a/Mage.Sets/src/mage/sets/tenth/SoulWarden.java +++ b/Mage.Sets/src/mage/sets/tenth/SoulWarden.java @@ -28,7 +28,7 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/tenth/SparkElemental.java b/Mage.Sets/src/mage/sets/tenth/SparkElemental.java index 4b1225d368e..daf3613f12b 100644 --- a/Mage.Sets/src/mage/sets/tenth/SparkElemental.java +++ b/Mage.Sets/src/mage/sets/tenth/SparkElemental.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; diff --git a/Mage.Sets/src/mage/sets/tenth/SpawningPool.java b/Mage.Sets/src/mage/sets/tenth/SpawningPool.java index 28fce25c018..1dde755f3a6 100644 --- a/Mage.Sets/src/mage/sets/tenth/SpawningPool.java +++ b/Mage.Sets/src/mage/sets/tenth/SpawningPool.java @@ -29,10 +29,7 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldTappedAbility; @@ -56,7 +53,7 @@ public class SpawningPool extends CardImpl { this.expansionSetCode = "10E"; this.addAbility(new EntersBattlefieldTappedAbility()); this.addAbility(new BlackManaAbility()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new SkeletonToken(), "land", Duration.EndOfTurn), new ManaCostsImpl("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new SkeletonToken(), "land", Duration.EndOfTurn), new ManaCostsImpl("{1}{B}"))); } public SpawningPool(final SpawningPool card) { @@ -77,6 +74,6 @@ class SkeletonToken extends Token { color = ObjectColor.BLACK; power = new MageInt(1); toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.B))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.B))); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/tenth/SpiketailHatchling.java b/Mage.Sets/src/mage/sets/tenth/SpiketailHatchling.java index 505bc257d5e..a36f5efadeb 100644 --- a/Mage.Sets/src/mage/sets/tenth/SpiketailHatchling.java +++ b/Mage.Sets/src/mage/sets/tenth/SpiketailHatchling.java @@ -29,9 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetSpell; /** @@ -56,7 +56,7 @@ public class SpiketailHatchling extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(1)), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(1)), new SacrificeSourceCost()); ability.addTarget(new TargetSpell()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/SpinedWurm.java b/Mage.Sets/src/mage/sets/tenth/SpinedWurm.java index 769195d8eda..6a2f17eff33 100644 --- a/Mage.Sets/src/mage/sets/tenth/SpinedWurm.java +++ b/Mage.Sets/src/mage/sets/tenth/SpinedWurm.java @@ -29,8 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/SpinelessThug.java b/Mage.Sets/src/mage/sets/tenth/SpinelessThug.java index 49c57a18881..65332d36d96 100644 --- a/Mage.Sets/src/mage/sets/tenth/SpinelessThug.java +++ b/Mage.Sets/src/mage/sets/tenth/SpinelessThug.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/SpiritWeaver.java b/Mage.Sets/src/mage/sets/tenth/SpiritWeaver.java index 2de4000abba..62162fcd7d7 100644 --- a/Mage.Sets/src/mage/sets/tenth/SpiritWeaver.java +++ b/Mage.Sets/src/mage/sets/tenth/SpiritWeaver.java @@ -29,9 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -39,6 +38,8 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; @@ -66,7 +67,7 @@ public class SpiritWeaver extends CardImpl { this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(0, 1, Constants.Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(0, 1, Duration.EndOfTurn), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/SpittingEarth.java b/Mage.Sets/src/mage/sets/tenth/SpittingEarth.java index e623f76e8ba..c18a1df1fbf 100644 --- a/Mage.Sets/src/mage/sets/tenth/SpittingEarth.java +++ b/Mage.Sets/src/mage/sets/tenth/SpittingEarth.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/StarlightInvoker.java b/Mage.Sets/src/mage/sets/tenth/StarlightInvoker.java index 41b3b982c21..3b051a0eccd 100644 --- a/Mage.Sets/src/mage/sets/tenth/StarlightInvoker.java +++ b/Mage.Sets/src/mage/sets/tenth/StarlightInvoker.java @@ -29,14 +29,14 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -53,7 +53,7 @@ public class StarlightInvoker extends CardImpl { this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainLifeEffect(5), new ManaCostsImpl("{7}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(5), new ManaCostsImpl("{7}{W}"))); } public StarlightInvoker(final StarlightInvoker card) { diff --git a/Mage.Sets/src/mage/sets/tenth/SteadfastGuard.java b/Mage.Sets/src/mage/sets/tenth/SteadfastGuard.java index 83957568389..3d466d77090 100644 --- a/Mage.Sets/src/mage/sets/tenth/SteadfastGuard.java +++ b/Mage.Sets/src/mage/sets/tenth/SteadfastGuard.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/SteelGolem.java b/Mage.Sets/src/mage/sets/tenth/SteelGolem.java index bad51fe4d35..955ca49cb45 100644 --- a/Mage.Sets/src/mage/sets/tenth/SteelGolem.java +++ b/Mage.Sets/src/mage/sets/tenth/SteelGolem.java @@ -28,9 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -55,7 +54,7 @@ public class SteelGolem extends CardImpl { this.toughness = new MageInt(4); // You can't cast creature spells. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new SteelGolemEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SteelGolemEffect())); } public SteelGolem(final SteelGolem card) { @@ -71,7 +70,7 @@ public class SteelGolem extends CardImpl { class SteelGolemEffect extends ReplacementEffectImpl { public SteelGolemEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Detriment); + super(Duration.WhileOnBattlefield, Outcome.Detriment); staticText = "You can't cast creature spells."; } diff --git a/Mage.Sets/src/mage/sets/tenth/SulfurousSprings.java b/Mage.Sets/src/mage/sets/tenth/SulfurousSprings.java index 9cf690902f8..1722d59dc71 100644 --- a/Mage.Sets/src/mage/sets/tenth/SulfurousSprings.java +++ b/Mage.Sets/src/mage/sets/tenth/SulfurousSprings.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.mana.BlackManaAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/SuntailHawk.java b/Mage.Sets/src/mage/sets/tenth/SuntailHawk.java index 3a1c64c9599..00bfe7b4e63 100644 --- a/Mage.Sets/src/mage/sets/tenth/SuntailHawk.java +++ b/Mage.Sets/src/mage/sets/tenth/SuntailHawk.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/SylvanScrying.java b/Mage.Sets/src/mage/sets/tenth/SylvanScrying.java index 810b1b48c39..122f8d42910 100644 --- a/Mage.Sets/src/mage/sets/tenth/SylvanScrying.java +++ b/Mage.Sets/src/mage/sets/tenth/SylvanScrying.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.filter.common.FilterLandCard; diff --git a/Mage.Sets/src/mage/sets/tenth/TangleSpider.java b/Mage.Sets/src/mage/sets/tenth/TangleSpider.java index 4881bb9f58c..47eb0e539d2 100644 --- a/Mage.Sets/src/mage/sets/tenth/TangleSpider.java +++ b/Mage.Sets/src/mage/sets/tenth/TangleSpider.java @@ -28,7 +28,7 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/tenth/TellingTime.java b/Mage.Sets/src/mage/sets/tenth/TellingTime.java index 12a1c5aa4c4..e9211b68de4 100644 --- a/Mage.Sets/src/mage/sets/tenth/TellingTime.java +++ b/Mage.Sets/src/mage/sets/tenth/TellingTime.java @@ -28,11 +28,11 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -131,7 +131,7 @@ class TellingTimeEffect extends OneShotEffect { return cards.getRandom(null); } - TargetCard target = new TargetCard(Constants.Zone.PICK, new FilterCard(message)); + TargetCard target = new TargetCard(Zone.PICK, new FilterCard(message)); target.setRequired(true); if (player.choose(Outcome.Benefit, cards, target, game)) { Card card = cards.get(target.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/sets/tenth/TerramorphicExpanse.java b/Mage.Sets/src/mage/sets/tenth/TerramorphicExpanse.java index 6db280dd7ca..de307dd7fc7 100644 --- a/Mage.Sets/src/mage/sets/tenth/TerramorphicExpanse.java +++ b/Mage.Sets/src/mage/sets/tenth/TerramorphicExpanse.java @@ -29,10 +29,10 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/tenth/Terror.java b/Mage.Sets/src/mage/sets/tenth/Terror.java index 09cc9fae496..7e73e5d27de 100644 --- a/Mage.Sets/src/mage/sets/tenth/Terror.java +++ b/Mage.Sets/src/mage/sets/tenth/Terror.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/TheHive.java b/Mage.Sets/src/mage/sets/tenth/TheHive.java index add45917e17..ac93489e206 100644 --- a/Mage.Sets/src/mage/sets/tenth/TheHive.java +++ b/Mage.Sets/src/mage/sets/tenth/TheHive.java @@ -29,9 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.permanent.token.Token; /** @@ -51,7 +51,7 @@ public class TheHive extends CardImpl { public TheHive(UUID ownerId) { super(ownerId, 324, "The Hive", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{5}"); this.expansionSetCode = "10E"; - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new WaspToken(), 1), new GenericManaCost(5)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new WaspToken(), 1), new GenericManaCost(5)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/Threaten.java b/Mage.Sets/src/mage/sets/tenth/Threaten.java index 7571359585b..93e1de9dd84 100644 --- a/Mage.Sets/src/mage/sets/tenth/Threaten.java +++ b/Mage.Sets/src/mage/sets/tenth/Threaten.java @@ -29,14 +29,14 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.effects.common.continious.GainControlTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -50,8 +50,8 @@ public class Threaten extends CardImpl { this.expansionSetCode = "10E"; this.color.setRed(true); this.getSpellAbility().addEffect(new UntapTargetEffect()); - this.getSpellAbility().addEffect(new GainControlTargetEffect(Constants.Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/tenth/ThrullSurgeon.java b/Mage.Sets/src/mage/sets/tenth/ThrullSurgeon.java index c4aded490a1..e0e9b887295 100644 --- a/Mage.Sets/src/mage/sets/tenth/ThrullSurgeon.java +++ b/Mage.Sets/src/mage/sets/tenth/ThrullSurgeon.java @@ -28,9 +28,9 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; @@ -39,6 +39,8 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.game.Game; import mage.players.Player; @@ -62,7 +64,7 @@ public class ThrullSurgeon extends CardImpl { this.toughness = new MageInt(1); // {1}{B}, Sacrifice Thrull Surgeon: Look at target player's hand and choose a card from it. That player discards that card. Activate this ability only any time you could cast a sorcery. - Ability ability = new ActivateAsSorceryActivatedAbility(Constants.Zone.BATTLEFIELD, new ThrullSurgeonEffect(), new ManaCostsImpl("{1}{B}")); + Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new ThrullSurgeonEffect(), new ManaCostsImpl("{1}{B}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); @@ -81,7 +83,7 @@ public class ThrullSurgeon extends CardImpl { class ThrullSurgeonEffect extends OneShotEffect { public ThrullSurgeonEffect() { - super(Constants.Outcome.Discard); + super(Outcome.Discard); staticText = "Look at target player's hand and choose a card from it. That player discards that card."; } @@ -95,10 +97,10 @@ class ThrullSurgeonEffect extends OneShotEffect { Player you = game.getPlayer(source.getControllerId()); if (targetPlayer != null && you != null) { you.lookAtCards("Discard", targetPlayer.getHand(), game); - TargetCard target = new TargetCard(Constants.Zone.PICK, new FilterCard()); + TargetCard target = new TargetCard(Zone.PICK, new FilterCard()); target.setRequired(true); target.setNotTarget(true); - if (you.choose(Constants.Outcome.Benefit, targetPlayer.getHand(), target, game)) { + if (you.choose(Outcome.Benefit, targetPlayer.getHand(), target, game)) { Card card = targetPlayer.getHand().get(target.getFirstTarget(), game); if (card != null) { return targetPlayer.discard(card, source, game); diff --git a/Mage.Sets/src/mage/sets/tenth/ThunderingGiant.java b/Mage.Sets/src/mage/sets/tenth/ThunderingGiant.java index b5fa2904b80..24b800600d1 100644 --- a/Mage.Sets/src/mage/sets/tenth/ThunderingGiant.java +++ b/Mage.Sets/src/mage/sets/tenth/ThunderingGiant.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/Tidings.java b/Mage.Sets/src/mage/sets/tenth/Tidings.java index a1bbab79e5a..0910471a3c4 100644 --- a/Mage.Sets/src/mage/sets/tenth/Tidings.java +++ b/Mage.Sets/src/mage/sets/tenth/Tidings.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/TimeStop.java b/Mage.Sets/src/mage/sets/tenth/TimeStop.java index cc31a5386ab..0837bdb73fc 100644 --- a/Mage.Sets/src/mage/sets/tenth/TimeStop.java +++ b/Mage.Sets/src/mage/sets/tenth/TimeStop.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.EndTurnEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/Traumatize.java b/Mage.Sets/src/mage/sets/tenth/Traumatize.java index cad78b98193..941b07f6213 100644 --- a/Mage.Sets/src/mage/sets/tenth/Traumatize.java +++ b/Mage.Sets/src/mage/sets/tenth/Traumatize.java @@ -29,10 +29,10 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/tenth/TreasureHunter.java b/Mage.Sets/src/mage/sets/tenth/TreasureHunter.java index fd631f59db6..e864e3f5953 100644 --- a/Mage.Sets/src/mage/sets/tenth/TreasureHunter.java +++ b/Mage.Sets/src/mage/sets/tenth/TreasureHunter.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/TreetopVillage.java b/Mage.Sets/src/mage/sets/tenth/TreetopVillage.java index e0e9ecb53b0..1eaf7733a8f 100644 --- a/Mage.Sets/src/mage/sets/tenth/TreetopVillage.java +++ b/Mage.Sets/src/mage/sets/tenth/TreetopVillage.java @@ -29,10 +29,9 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldTappedAbility; @@ -42,6 +41,7 @@ import mage.abilities.effects.common.continious.BecomesCreatureSourceEffect; import mage.abilities.keyword.TrampleAbility; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.permanent.token.Token; /** @@ -55,7 +55,7 @@ public class TreetopVillage extends CardImpl { this.expansionSetCode = "10E"; this.addAbility(new EntersBattlefieldTappedAbility()); this.addAbility(new GreenManaAbility()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new ApeToken(), "land", Duration.EndOfTurn), new ManaCostsImpl("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new ApeToken(), "land", Duration.EndOfTurn), new ManaCostsImpl("{1}{G}"))); } public TreetopVillage(final TreetopVillage card) { diff --git a/Mage.Sets/src/mage/sets/tenth/TundraWolves.java b/Mage.Sets/src/mage/sets/tenth/TundraWolves.java index 71f61570d6b..cb9fea9b83c 100644 --- a/Mage.Sets/src/mage/sets/tenth/TundraWolves.java +++ b/Mage.Sets/src/mage/sets/tenth/TundraWolves.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/UndergroundRiver.java b/Mage.Sets/src/mage/sets/tenth/UndergroundRiver.java index defba61b1ae..2f6d10587f9 100644 --- a/Mage.Sets/src/mage/sets/tenth/UndergroundRiver.java +++ b/Mage.Sets/src/mage/sets/tenth/UndergroundRiver.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.mana.BlackManaAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/UnholyStrength.java b/Mage.Sets/src/mage/sets/tenth/UnholyStrength.java index 685c412ecbe..bee2cfee657 100644 --- a/Mage.Sets/src/mage/sets/tenth/UnholyStrength.java +++ b/Mage.Sets/src/mage/sets/tenth/UnholyStrength.java @@ -28,11 +28,11 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; diff --git a/Mage.Sets/src/mage/sets/tenth/Unsummon.java b/Mage.Sets/src/mage/sets/tenth/Unsummon.java index 4c7b3209500..af6c432b45a 100644 --- a/Mage.Sets/src/mage/sets/tenth/Unsummon.java +++ b/Mage.Sets/src/mage/sets/tenth/Unsummon.java @@ -29,8 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/tenth/VedalkenMastermind.java b/Mage.Sets/src/mage/sets/tenth/VedalkenMastermind.java index d438c20d8e8..1520359246a 100644 --- a/Mage.Sets/src/mage/sets/tenth/VedalkenMastermind.java +++ b/Mage.Sets/src/mage/sets/tenth/VedalkenMastermind.java @@ -29,9 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.target.common.TargetControlledPermanent; /** @@ -55,7 +56,7 @@ public class VedalkenMastermind extends CardImpl { this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.U)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/tenth/VenerableMonk.java b/Mage.Sets/src/mage/sets/tenth/VenerableMonk.java index 96202391873..1ed98131455 100644 --- a/Mage.Sets/src/mage/sets/tenth/VenerableMonk.java +++ b/Mage.Sets/src/mage/sets/tenth/VenerableMonk.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/tenth/ViashinoRunner.java b/Mage.Sets/src/mage/sets/tenth/ViashinoRunner.java index 0e13edd8e29..25d47514910 100644 --- a/Mage.Sets/src/mage/sets/tenth/ViashinoRunner.java +++ b/Mage.Sets/src/mage/sets/tenth/ViashinoRunner.java @@ -28,9 +28,9 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.CantBeBlockedByOneEffect; diff --git a/Mage.Sets/src/mage/sets/tenth/ViridianShaman.java b/Mage.Sets/src/mage/sets/tenth/ViridianShaman.java index bf62a4902bb..115838cbbfc 100644 --- a/Mage.Sets/src/mage/sets/tenth/ViridianShaman.java +++ b/Mage.Sets/src/mage/sets/tenth/ViridianShaman.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/WallOfAir.java b/Mage.Sets/src/mage/sets/tenth/WallOfAir.java index a900e41d152..7ede8109db2 100644 --- a/Mage.Sets/src/mage/sets/tenth/WallOfAir.java +++ b/Mage.Sets/src/mage/sets/tenth/WallOfAir.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/WallOfFire.java b/Mage.Sets/src/mage/sets/tenth/WallOfFire.java index 226dfcbeb2e..a60ac8bb745 100644 --- a/Mage.Sets/src/mage/sets/tenth/WallOfFire.java +++ b/Mage.Sets/src/mage/sets/tenth/WallOfFire.java @@ -29,9 +29,7 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -53,7 +51,7 @@ public class WallOfFire extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(5); this.addAbility(DefenderAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); } public WallOfFire(final WallOfFire card) { diff --git a/Mage.Sets/src/mage/sets/tenth/WallOfSwords.java b/Mage.Sets/src/mage/sets/tenth/WallOfSwords.java index 60b15968945..20ad48ec84e 100644 --- a/Mage.Sets/src/mage/sets/tenth/WallOfSwords.java +++ b/Mage.Sets/src/mage/sets/tenth/WallOfSwords.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/tenth/WallOfWood.java b/Mage.Sets/src/mage/sets/tenth/WallOfWood.java index 1962dc85d72..2a307c93c35 100644 --- a/Mage.Sets/src/mage/sets/tenth/WallOfWood.java +++ b/Mage.Sets/src/mage/sets/tenth/WallOfWood.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/WarriorsHonor.java b/Mage.Sets/src/mage/sets/tenth/WarriorsHonor.java index d48d599879e..fdf84078938 100644 --- a/Mage.Sets/src/mage/sets/tenth/WarriorsHonor.java +++ b/Mage.Sets/src/mage/sets/tenth/WarriorsHonor.java @@ -29,11 +29,11 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; /** @@ -46,7 +46,7 @@ public class WarriorsHonor extends CardImpl { super(ownerId, 58, "Warrior's Honor", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "10E"; this.color.setWhite(true); - this.getSpellAbility().addEffect(new BoostControlledEffect(1, 1, Constants.Duration.EndOfTurn, new FilterCreaturePermanent(), false)); + this.getSpellAbility().addEffect(new BoostControlledEffect(1, 1, Duration.EndOfTurn, new FilterCreaturePermanent(), false)); } public WarriorsHonor(final WarriorsHonor card) { diff --git a/Mage.Sets/src/mage/sets/tenth/WhispersilkCloak.java b/Mage.Sets/src/mage/sets/tenth/WhispersilkCloak.java index 0088c43a884..2f319654b64 100644 --- a/Mage.Sets/src/mage/sets/tenth/WhispersilkCloak.java +++ b/Mage.Sets/src/mage/sets/tenth/WhispersilkCloak.java @@ -30,11 +30,11 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.UnblockableAttachedEffect; diff --git a/Mage.Sets/src/mage/sets/tenth/WildGriffin.java b/Mage.Sets/src/mage/sets/tenth/WildGriffin.java index f65f5fe01fa..4270af827c7 100644 --- a/Mage.Sets/src/mage/sets/tenth/WildGriffin.java +++ b/Mage.Sets/src/mage/sets/tenth/WildGriffin.java @@ -29,8 +29,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/tenth/WindbornMuse.java b/Mage.Sets/src/mage/sets/tenth/WindbornMuse.java index 8f2607bbdc7..f0d1ca6d1c4 100644 --- a/Mage.Sets/src/mage/sets/tenth/WindbornMuse.java +++ b/Mage.Sets/src/mage/sets/tenth/WindbornMuse.java @@ -29,9 +29,7 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -57,7 +55,7 @@ public class WindbornMuse extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new WindbornMuseReplacementEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WindbornMuseReplacementEffect())); // Creatures can't attack you unless their controller pays {2} for each creature he or she controls that's attacking you. } @@ -76,7 +74,7 @@ class WindbornMuseReplacementEffect extends ReplacementEffectImpl { this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), new PermanentsOnBattlefieldCount(filter), Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), new PermanentsOnBattlefieldCount(filter), Duration.WhileOnBattlefield))); } public YavimayaEnchantress(final YavimayaEnchantress card) { diff --git a/Mage.Sets/src/mage/sets/tenth/YouthfulKnight.java b/Mage.Sets/src/mage/sets/tenth/YouthfulKnight.java index 4a15451ec3c..6c809ad2ca9 100644 --- a/Mage.Sets/src/mage/sets/tenth/YouthfulKnight.java +++ b/Mage.Sets/src/mage/sets/tenth/YouthfulKnight.java @@ -28,8 +28,8 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/thedark/AshesToAshes.java b/Mage.Sets/src/mage/sets/thedark/AshesToAshes.java index d05ba9cc608..ecbf8c978e2 100644 --- a/Mage.Sets/src/mage/sets/thedark/AshesToAshes.java +++ b/Mage.Sets/src/mage/sets/thedark/AshesToAshes.java @@ -28,7 +28,7 @@ package mage.sets.thedark; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/thedark/DarkHeartOfTheWood.java b/Mage.Sets/src/mage/sets/thedark/DarkHeartOfTheWood.java index c66dd5f229b..ef5d17ebd97 100644 --- a/Mage.Sets/src/mage/sets/thedark/DarkHeartOfTheWood.java +++ b/Mage.Sets/src/mage/sets/thedark/DarkHeartOfTheWood.java @@ -28,7 +28,7 @@ package mage.sets.thedark; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/thedark/ElvesOfDeepShadow.java b/Mage.Sets/src/mage/sets/thedark/ElvesOfDeepShadow.java index cdbf63aeb5f..52c77a36fde 100644 --- a/Mage.Sets/src/mage/sets/thedark/ElvesOfDeepShadow.java +++ b/Mage.Sets/src/mage/sets/thedark/ElvesOfDeepShadow.java @@ -28,7 +28,7 @@ package mage.sets.thedark; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/thedark/Inferno.java b/Mage.Sets/src/mage/sets/thedark/Inferno.java index b83b0ef1b8c..9baa6879e33 100644 --- a/Mage.Sets/src/mage/sets/thedark/Inferno.java +++ b/Mage.Sets/src/mage/sets/thedark/Inferno.java @@ -28,8 +28,8 @@ package mage.sets.thedark; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageEverythingEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/thedark/MarshGoblins.java b/Mage.Sets/src/mage/sets/thedark/MarshGoblins.java index e5ed1a01e30..f55ec0a1004 100644 --- a/Mage.Sets/src/mage/sets/thedark/MarshGoblins.java +++ b/Mage.Sets/src/mage/sets/thedark/MarshGoblins.java @@ -28,8 +28,8 @@ package mage.sets.thedark; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/thedark/MazeOfIth.java b/Mage.Sets/src/mage/sets/thedark/MazeOfIth.java index a348105b0e8..b5c6715982c 100644 --- a/Mage.Sets/src/mage/sets/thedark/MazeOfIth.java +++ b/Mage.Sets/src/mage/sets/thedark/MazeOfIth.java @@ -28,9 +28,9 @@ package mage.sets.thedark; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -38,6 +38,8 @@ import mage.abilities.effects.common.PreventDamageFromTargetEffect; import mage.abilities.effects.common.PreventDamageTargetEffect; import mage.abilities.effects.common.UntapTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetAttackingCreature; /** @@ -51,9 +53,9 @@ public class MazeOfIth extends CardImpl { this.expansionSetCode = "DRK"; // {tap}: Untap target attacking creature. Prevent all combat damage that would be dealt to and dealt by that creature this turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); - ability.addEffect(new PreventDamageFromTargetEffect(Constants.Duration.EndOfTurn, true)); - ability.addEffect(new PreventDamageTargetEffect(Constants.Duration.EndOfTurn, Integer.MAX_VALUE)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); + ability.addEffect(new PreventDamageFromTargetEffect(Duration.EndOfTurn, true)); + ability.addEffect(new PreventDamageTargetEffect(Duration.EndOfTurn, Integer.MAX_VALUE)); ability.addTarget(new TargetAttackingCreature()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/thedark/ScarwoodGoblins.java b/Mage.Sets/src/mage/sets/thedark/ScarwoodGoblins.java index 40867cf9ed5..a51694292f2 100644 --- a/Mage.Sets/src/mage/sets/thedark/ScarwoodGoblins.java +++ b/Mage.Sets/src/mage/sets/thedark/ScarwoodGoblins.java @@ -28,8 +28,8 @@ package mage.sets.thedark; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/thedark/SkullOfOrm.java b/Mage.Sets/src/mage/sets/thedark/SkullOfOrm.java index c1f906751a4..56a5fdb88ce 100644 --- a/Mage.Sets/src/mage/sets/thedark/SkullOfOrm.java +++ b/Mage.Sets/src/mage/sets/thedark/SkullOfOrm.java @@ -28,15 +28,16 @@ package mage.sets.thedark; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInGraveyard; @@ -51,7 +52,7 @@ public class SkullOfOrm extends CardImpl { this.expansionSetCode = "DRK"; // {5}, {tap}: Return target enchantment card from your graveyard to your hand. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{5}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{5}")); ability.addTarget(new TargetCardInGraveyard(new FilterCreatureCard())); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/thedark/Squire.java b/Mage.Sets/src/mage/sets/thedark/Squire.java index 5fec5d385f5..901bd5ac7a2 100644 --- a/Mage.Sets/src/mage/sets/thedark/Squire.java +++ b/Mage.Sets/src/mage/sets/thedark/Squire.java @@ -28,7 +28,7 @@ package mage.sets.thedark; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/thedark/TormodsCrypt.java b/Mage.Sets/src/mage/sets/thedark/TormodsCrypt.java index fd537cc033f..f7c67d66543 100644 --- a/Mage.Sets/src/mage/sets/thedark/TormodsCrypt.java +++ b/Mage.Sets/src/mage/sets/thedark/TormodsCrypt.java @@ -28,7 +28,7 @@ package mage.sets.thedark; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/timeshifted/AkromaAngelOfWrath.java b/Mage.Sets/src/mage/sets/timeshifted/AkromaAngelOfWrath.java index 3dd6a72cfd6..51606d4e175 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/AkromaAngelOfWrath.java +++ b/Mage.Sets/src/mage/sets/timeshifted/AkromaAngelOfWrath.java @@ -28,8 +28,8 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.*; diff --git a/Mage.Sets/src/mage/sets/timeshifted/Auratog.java b/Mage.Sets/src/mage/sets/timeshifted/Auratog.java index f0827a777bb..b7c7a16f606 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/Auratog.java +++ b/Mage.Sets/src/mage/sets/timeshifted/Auratog.java @@ -28,7 +28,7 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/timeshifted/AvalancheRiders.java b/Mage.Sets/src/mage/sets/timeshifted/AvalancheRiders.java index 5930cb04ff3..e186c38c4c7 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/AvalancheRiders.java +++ b/Mage.Sets/src/mage/sets/timeshifted/AvalancheRiders.java @@ -28,7 +28,7 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/timeshifted/BadMoon.java b/Mage.Sets/src/mage/sets/timeshifted/BadMoon.java index 357af57a2af..2df94a0ab4d 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/BadMoon.java +++ b/Mage.Sets/src/mage/sets/timeshifted/BadMoon.java @@ -28,7 +28,7 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/timeshifted/CallOfTheHerd.java b/Mage.Sets/src/mage/sets/timeshifted/CallOfTheHerd.java index a8c75ffb5f0..aac1939339e 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/CallOfTheHerd.java +++ b/Mage.Sets/src/mage/sets/timeshifted/CallOfTheHerd.java @@ -29,13 +29,13 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; +import mage.constants.TimingRule; import mage.game.permanent.token.ElephantToken; /** @@ -53,7 +53,7 @@ public class CallOfTheHerd extends CardImpl { // Put a 3/3 green Elephant creature token onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new ElephantToken())); // Flashback {3}{G} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{3}{G}"), Constants.TimingRule.SORCERY)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{3}{G}"), TimingRule.SORCERY)); } public CallOfTheHerd(final CallOfTheHerd card) { diff --git a/Mage.Sets/src/mage/sets/timeshifted/ClawsOfGix.java b/Mage.Sets/src/mage/sets/timeshifted/ClawsOfGix.java index 05a4336a53e..f69942cfa86 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/ClawsOfGix.java +++ b/Mage.Sets/src/mage/sets/timeshifted/ClawsOfGix.java @@ -28,7 +28,7 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/timeshifted/Darkness.java b/Mage.Sets/src/mage/sets/timeshifted/Darkness.java index f459fbe9910..cfa58166b8f 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/Darkness.java +++ b/Mage.Sets/src/mage/sets/timeshifted/Darkness.java @@ -28,11 +28,12 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.PreventAllDamageEffect; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -47,7 +48,7 @@ public class Darkness extends CardImpl { this.color.setBlack(true); // Prevent all combat damage that would be dealt this turn. - this.getSpellAbility().addEffect(new PreventAllDamageEffect(Constants.Duration.EndOfTurn, true)); + this.getSpellAbility().addEffect(new PreventAllDamageEffect(Duration.EndOfTurn, true)); } public Darkness(final Darkness card) { diff --git a/Mage.Sets/src/mage/sets/timeshifted/DauthiSlayer.java b/Mage.Sets/src/mage/sets/timeshifted/DauthiSlayer.java index b6f3ce7a9ce..de9e044e74a 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/DauthiSlayer.java +++ b/Mage.Sets/src/mage/sets/timeshifted/DauthiSlayer.java @@ -28,7 +28,7 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/timeshifted/Disenchant.java b/Mage.Sets/src/mage/sets/timeshifted/Disenchant.java index c646294546a..f4d51d8ba1b 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/Disenchant.java +++ b/Mage.Sets/src/mage/sets/timeshifted/Disenchant.java @@ -28,7 +28,7 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/timeshifted/DragonWhelp.java b/Mage.Sets/src/mage/sets/timeshifted/DragonWhelp.java index b239135475c..5f0431a044e 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/DragonWhelp.java +++ b/Mage.Sets/src/mage/sets/timeshifted/DragonWhelp.java @@ -28,7 +28,7 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/timeshifted/Dragonstorm.java b/Mage.Sets/src/mage/sets/timeshifted/Dragonstorm.java index bae0ef2b1e0..97f0e77fa76 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/Dragonstorm.java +++ b/Mage.Sets/src/mage/sets/timeshifted/Dragonstorm.java @@ -28,8 +28,8 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.abilities.keyword.StormAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/timeshifted/FieryTemper.java b/Mage.Sets/src/mage/sets/timeshifted/FieryTemper.java index af04d670ec8..817394ba801 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/FieryTemper.java +++ b/Mage.Sets/src/mage/sets/timeshifted/FieryTemper.java @@ -27,8 +27,8 @@ */ package mage.sets.timeshifted; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.MadnessAbility; diff --git a/Mage.Sets/src/mage/sets/timeshifted/FlyingMen.java b/Mage.Sets/src/mage/sets/timeshifted/FlyingMen.java index 387ef5a0a34..b5464570ff8 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/FlyingMen.java +++ b/Mage.Sets/src/mage/sets/timeshifted/FlyingMen.java @@ -28,8 +28,8 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/timeshifted/FuneralCharm.java b/Mage.Sets/src/mage/sets/timeshifted/FuneralCharm.java index 0ad2a12f629..317bd67bb60 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/FuneralCharm.java +++ b/Mage.Sets/src/mage/sets/timeshifted/FuneralCharm.java @@ -29,15 +29,15 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Mode; import mage.abilities.effects.common.DiscardTargetEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; @@ -57,11 +57,11 @@ public class FuneralCharm extends CardImpl { this.getSpellAbility().addEffect(new DiscardTargetEffect(1)); this.getSpellAbility().addTarget(new TargetPlayer()); Mode mode = new Mode(); - mode.getEffects().add(new BoostTargetEffect(2, -1, Constants.Duration.EndOfTurn)); + mode.getEffects().add(new BoostTargetEffect(2, -1, Duration.EndOfTurn)); mode.getTargets().add(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); mode = new Mode(); - mode.getEffects().add(new GainAbilityTargetEffect(new SwampwalkAbility(), Constants.Duration.EndOfTurn)); + mode.getEffects().add(new GainAbilityTargetEffect(new SwampwalkAbility(), Duration.EndOfTurn)); mode.getTargets().add(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/sets/timeshifted/GemstoneMine.java b/Mage.Sets/src/mage/sets/timeshifted/GemstoneMine.java index 5913274dd55..85329796721 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/GemstoneMine.java +++ b/Mage.Sets/src/mage/sets/timeshifted/GemstoneMine.java @@ -28,9 +28,9 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.StateTriggeredAbility; import mage.abilities.common.EntersBattlefieldAbility; @@ -39,6 +39,7 @@ import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; @@ -88,7 +89,7 @@ class GemstoneMineTriggeredAbility extends StateTriggeredAbility { // {tap}: Add {G} to your mana pool. this.addAbility(new GreenManaAbility()); // {tap}: Target 1/1 creature gets +1/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(1, 2, Constants.Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 2, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/timeshifted/ProdigalSorcerer.java b/Mage.Sets/src/mage/sets/timeshifted/ProdigalSorcerer.java index 102c72f1e15..c260d2aa081 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/ProdigalSorcerer.java +++ b/Mage.Sets/src/mage/sets/timeshifted/ProdigalSorcerer.java @@ -28,9 +28,9 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/timeshifted/PsionicBlast.java b/Mage.Sets/src/mage/sets/timeshifted/PsionicBlast.java index b250de51087..6929bc67d8b 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/PsionicBlast.java +++ b/Mage.Sets/src/mage/sets/timeshifted/PsionicBlast.java @@ -29,13 +29,13 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; @@ -70,7 +70,7 @@ public class PsionicBlast extends CardImpl { class PsionicBlastEffect extends OneShotEffect { PsionicBlastEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "{this} deals 2 damage to you"; } diff --git a/Mage.Sets/src/mage/sets/timeshifted/ShadowmageInfiltrator.java b/Mage.Sets/src/mage/sets/timeshifted/ShadowmageInfiltrator.java index 16acfa7da44..c64b44e59ff 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/ShadowmageInfiltrator.java +++ b/Mage.Sets/src/mage/sets/timeshifted/ShadowmageInfiltrator.java @@ -28,8 +28,8 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/timeshifted/SolkanarTheSwampKing.java b/Mage.Sets/src/mage/sets/timeshifted/SolkanarTheSwampKing.java index 7935f80a693..aaf8af613ae 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/SolkanarTheSwampKing.java +++ b/Mage.Sets/src/mage/sets/timeshifted/SolkanarTheSwampKing.java @@ -29,14 +29,14 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.stack.Spell; @@ -78,7 +78,7 @@ public class SolkanarTheSwampKing extends CardImpl { class SolkanarTheSwampKingAbility extends TriggeredAbilityImpl { public SolkanarTheSwampKingAbility() { - super(Constants.Zone.BATTLEFIELD, new GainLifeEffect(1), false); + super(Zone.BATTLEFIELD, new GainLifeEffect(1), false); } public SolkanarTheSwampKingAbility(final SolkanarTheSwampKingAbility ability) { diff --git a/Mage.Sets/src/mage/sets/timeshifted/SoltariPriest.java b/Mage.Sets/src/mage/sets/timeshifted/SoltariPriest.java index 7972638f26d..0d3c0b8f140 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/SoltariPriest.java +++ b/Mage.Sets/src/mage/sets/timeshifted/SoltariPriest.java @@ -28,7 +28,7 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/timeshifted/SpikeFeeder.java b/Mage.Sets/src/mage/sets/timeshifted/SpikeFeeder.java index 3bc7ac03d82..c6c388b558b 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/SpikeFeeder.java +++ b/Mage.Sets/src/mage/sets/timeshifted/SpikeFeeder.java @@ -29,9 +29,8 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -42,6 +41,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; @@ -63,12 +63,12 @@ public class SpikeFeeder extends CardImpl { // Spike Feeder enters the battlefield with two +1/+1 counters on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), "with two +1/+1 counters on it")); // {2}, Remove a +1/+1 counter from Spike Feeder: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Remove a +1/+1 counter from Spike Feeder: You gain 2 life. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainLifeEffect(2), new RemoveCountersSourceCost(CounterType.P1P1.createInstance()))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), new RemoveCountersSourceCost(CounterType.P1P1.createInstance()))); } public SpikeFeeder(final SpikeFeeder card) { diff --git a/Mage.Sets/src/mage/sets/timeshifted/Squire.java b/Mage.Sets/src/mage/sets/timeshifted/Squire.java index 34a4de08094..b939bcfdb8b 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/Squire.java +++ b/Mage.Sets/src/mage/sets/timeshifted/Squire.java @@ -28,8 +28,8 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/timeshifted/StormscapeFamiliar.java b/Mage.Sets/src/mage/sets/timeshifted/StormscapeFamiliar.java index 1320735ba7b..1de52045507 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/StormscapeFamiliar.java +++ b/Mage.Sets/src/mage/sets/timeshifted/StormscapeFamiliar.java @@ -28,9 +28,9 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/timeshifted/Stupor.java b/Mage.Sets/src/mage/sets/timeshifted/Stupor.java index 2429ce7f343..d615321d7bd 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/Stupor.java +++ b/Mage.Sets/src/mage/sets/timeshifted/Stupor.java @@ -28,8 +28,8 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DiscardTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetOpponent; diff --git a/Mage.Sets/src/mage/sets/timeshifted/SuqAtaLancer.java b/Mage.Sets/src/mage/sets/timeshifted/SuqAtaLancer.java index 133ffadd40f..f0060bf8d3e 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/SuqAtaLancer.java +++ b/Mage.Sets/src/mage/sets/timeshifted/SuqAtaLancer.java @@ -28,8 +28,8 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlankingAbility; import mage.abilities.keyword.HasteAbility; diff --git a/Mage.Sets/src/mage/sets/timeshifted/Thallid.java b/Mage.Sets/src/mage/sets/timeshifted/Thallid.java index 46dc0596482..ca99bec6b6b 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/Thallid.java +++ b/Mage.Sets/src/mage/sets/timeshifted/Thallid.java @@ -29,9 +29,8 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.common.RemoveCountersSourceCost; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.permanent.token.SaprolingToken; @@ -58,9 +59,9 @@ public class Thallid extends CardImpl { this.toughness = new MageInt(1); // At the beginning of your upkeep, put a spore counter on Thallid. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()), TargetController.YOU, false)); // Remove three spore counters from Thallid: Put a 1/1 green Saproling creature token onto the battlefield. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); } public Thallid(final Thallid card) { diff --git a/Mage.Sets/src/mage/sets/timeshifted/TormodsCrypt.java b/Mage.Sets/src/mage/sets/timeshifted/TormodsCrypt.java index ae418245567..fc2694e90ba 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/TormodsCrypt.java +++ b/Mage.Sets/src/mage/sets/timeshifted/TormodsCrypt.java @@ -29,10 +29,10 @@ package mage.sets.timeshifted; import java.util.ArrayList; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/timeshifted/TribalFlames.java b/Mage.Sets/src/mage/sets/timeshifted/TribalFlames.java index 00b0c985422..95fd09b21de 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/TribalFlames.java +++ b/Mage.Sets/src/mage/sets/timeshifted/TribalFlames.java @@ -28,7 +28,7 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/timeshifted/TwistedAbomination.java b/Mage.Sets/src/mage/sets/timeshifted/TwistedAbomination.java index f7522fa7ae0..1b43b49ae9b 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/TwistedAbomination.java +++ b/Mage.Sets/src/mage/sets/timeshifted/TwistedAbomination.java @@ -28,15 +28,16 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.SwampcyclingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -55,7 +56,7 @@ public class TwistedAbomination extends CardImpl { this.toughness = new MageInt(3); // {B}: Regenerate Twisted Abomination. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}"))); // Swampcycling {2} this.addAbility(new SwampcyclingAbility(new ManaCostsImpl("{2}"))); } diff --git a/Mage.Sets/src/mage/sets/timeshifted/Void.java b/Mage.Sets/src/mage/sets/timeshifted/Void.java index 904a5371b98..80d0f09af6d 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/Void.java +++ b/Mage.Sets/src/mage/sets/timeshifted/Void.java @@ -28,7 +28,7 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/timeshifted/WallOfRoots.java b/Mage.Sets/src/mage/sets/timeshifted/WallOfRoots.java index 0ffaa77e91a..880dda53d94 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/WallOfRoots.java +++ b/Mage.Sets/src/mage/sets/timeshifted/WallOfRoots.java @@ -28,9 +28,9 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/timeshifted/WhirlingDervish.java b/Mage.Sets/src/mage/sets/timeshifted/WhirlingDervish.java index cceaa6664b0..3ec851b97aa 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/WhirlingDervish.java +++ b/Mage.Sets/src/mage/sets/timeshifted/WhirlingDervish.java @@ -28,8 +28,8 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.TriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/timeshifted/WitheredWretch.java b/Mage.Sets/src/mage/sets/timeshifted/WitheredWretch.java index efef45d9119..b04bce3e637 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/WitheredWretch.java +++ b/Mage.Sets/src/mage/sets/timeshifted/WitheredWretch.java @@ -28,7 +28,7 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/timeshifted/ZhalfirinCommander.java b/Mage.Sets/src/mage/sets/timeshifted/ZhalfirinCommander.java index 9c42785a72a..32055a956af 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/ZhalfirinCommander.java +++ b/Mage.Sets/src/mage/sets/timeshifted/ZhalfirinCommander.java @@ -28,9 +28,9 @@ package mage.sets.timeshifted; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +38,8 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.FlankingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; @@ -67,7 +69,7 @@ public class ZhalfirinCommander extends CardImpl { // Flanking this.addAbility(new FlankingAbility()); // {1}{W}{W}: Target Knight creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Constants.Duration.EndOfTurn), new ManaCostsImpl("{1}{W}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{1}{W}{W}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/timespiral/AcademyRuins.java b/Mage.Sets/src/mage/sets/timespiral/AcademyRuins.java index b22cd201e8e..880a0d301d4 100644 --- a/Mage.Sets/src/mage/sets/timespiral/AcademyRuins.java +++ b/Mage.Sets/src/mage/sets/timespiral/AcademyRuins.java @@ -28,9 +28,9 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -38,6 +38,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterArtifactCard; import mage.target.common.TargetCardInYourGraveyard; @@ -55,7 +56,7 @@ public class AcademyRuins extends CardImpl { // {tap}: Add {1} to your mana pool. this.addAbility(new ColorlessManaAbility()); // {1}{U}, {tap}: Put target artifact card from your graveyard on top of your library. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new ManaCostsImpl("{1}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new ManaCostsImpl("{1}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(new FilterArtifactCard("artifact card from your graveyard"))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/timespiral/AmrouScout.java b/Mage.Sets/src/mage/sets/timespiral/AmrouScout.java index 5cdce64ab8f..7d0784e0543 100644 --- a/Mage.Sets/src/mage/sets/timespiral/AmrouScout.java +++ b/Mage.Sets/src/mage/sets/timespiral/AmrouScout.java @@ -28,15 +28,16 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.Filter; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; @@ -67,7 +68,7 @@ public class AmrouScout extends CardImpl { this.toughness = new MageInt(1); // {4}, {tap}: Search your library for a Rebel permanent card with converted mana cost 3 or less and put it onto the battlefield. Then shuffle your library. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false), new ManaCostsImpl("{4}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/timespiral/AmrouSeekers.java b/Mage.Sets/src/mage/sets/timespiral/AmrouSeekers.java index e4ec8c392cb..5e7f549069a 100644 --- a/Mage.Sets/src/mage/sets/timespiral/AmrouSeekers.java +++ b/Mage.Sets/src/mage/sets/timespiral/AmrouSeekers.java @@ -28,9 +28,9 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -39,6 +39,7 @@ import mage.abilities.MageSingleton; import mage.abilities.effects.RestrictionEffect; import mage.abilities.keyword.IntimidateAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -108,7 +109,7 @@ class AmrouSeekersRestrictionEffect extends RestrictionEffect { this.color.setBlue(true); // Target creature gets -3/-0 until end of turn. - this.getSpellAbility().addEffect(new BoostTargetEffect(-3, 0, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(-3, 0, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/timespiral/BlazingBladeAskari.java b/Mage.Sets/src/mage/sets/timespiral/BlazingBladeAskari.java index 3988a69596b..8c17f0a66b7 100644 --- a/Mage.Sets/src/mage/sets/timespiral/BlazingBladeAskari.java +++ b/Mage.Sets/src/mage/sets/timespiral/BlazingBladeAskari.java @@ -28,9 +28,9 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +38,8 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.SetCardColorSourceEffect; import mage.abilities.keyword.FlankingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -58,7 +60,7 @@ public class BlazingBladeAskari extends CardImpl { // Flanking this.addAbility(new FlankingAbility()); // {2}: Blazing Blade Askari becomes colorless until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new SetCardColorSourceEffect(new ObjectColor(""),Constants.Duration.EndOfTurn), new ManaCostsImpl("{2}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SetCardColorSourceEffect(new ObjectColor(""), Duration.EndOfTurn), new ManaCostsImpl("{2}"))); } public BlazingBladeAskari(final BlazingBladeAskari card) { diff --git a/Mage.Sets/src/mage/sets/timespiral/BogardanHellkite.java b/Mage.Sets/src/mage/sets/timespiral/BogardanHellkite.java index 79b1945fcf6..a99a4f6bf3a 100644 --- a/Mage.Sets/src/mage/sets/timespiral/BogardanHellkite.java +++ b/Mage.Sets/src/mage/sets/timespiral/BogardanHellkite.java @@ -28,7 +28,7 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/timespiral/CavalryMaster.java b/Mage.Sets/src/mage/sets/timespiral/CavalryMaster.java index 0ce5561376d..5363467e2f9 100644 --- a/Mage.Sets/src/mage/sets/timespiral/CavalryMaster.java +++ b/Mage.Sets/src/mage/sets/timespiral/CavalryMaster.java @@ -28,14 +28,16 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.abilities.keyword.FlankingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; @@ -64,7 +66,7 @@ public class CavalryMaster extends CardImpl { // Flanking this.addAbility(new FlankingAbility()); // Other creatures you control with flanking have flanking. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAllEffect(new FlankingAbility(), Constants.Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new FlankingAbility(), Duration.WhileOnBattlefield, filter, true))); } public CavalryMaster(final CavalryMaster card) { diff --git a/Mage.Sets/src/mage/sets/timespiral/ChromaticStar.java b/Mage.Sets/src/mage/sets/timespiral/ChromaticStar.java index 5ee0872af82..d73264522e5 100644 --- a/Mage.Sets/src/mage/sets/timespiral/ChromaticStar.java +++ b/Mage.Sets/src/mage/sets/timespiral/ChromaticStar.java @@ -28,7 +28,7 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/timespiral/DarkWithering.java b/Mage.Sets/src/mage/sets/timespiral/DarkWithering.java index f58181eb6da..94f31a50e41 100644 --- a/Mage.Sets/src/mage/sets/timespiral/DarkWithering.java +++ b/Mage.Sets/src/mage/sets/timespiral/DarkWithering.java @@ -27,8 +27,8 @@ */ package mage.sets.timespiral; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/timespiral/DemonicCollusion.java b/Mage.Sets/src/mage/sets/timespiral/DemonicCollusion.java index a0cdd8c00f8..52559bdf36c 100644 --- a/Mage.Sets/src/mage/sets/timespiral/DemonicCollusion.java +++ b/Mage.Sets/src/mage/sets/timespiral/DemonicCollusion.java @@ -28,8 +28,8 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.common.DiscardTargetCost; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.abilities.keyword.BuybackAbility; diff --git a/Mage.Sets/src/mage/sets/timespiral/DreadReturn.java b/Mage.Sets/src/mage/sets/timespiral/DreadReturn.java index 232ac2fb3c7..283819475a4 100644 --- a/Mage.Sets/src/mage/sets/timespiral/DreadReturn.java +++ b/Mage.Sets/src/mage/sets/timespiral/DreadReturn.java @@ -28,9 +28,9 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TimingRule; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TimingRule; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.abilities.keyword.FlashbackAbility; diff --git a/Mage.Sets/src/mage/sets/timespiral/DurkwoodBaloth.java b/Mage.Sets/src/mage/sets/timespiral/DurkwoodBaloth.java index 3369c80a638..5e8997f2c17 100644 --- a/Mage.Sets/src/mage/sets/timespiral/DurkwoodBaloth.java +++ b/Mage.Sets/src/mage/sets/timespiral/DurkwoodBaloth.java @@ -28,12 +28,12 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.SuspendAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/timespiral/DuskriderPeregrine.java b/Mage.Sets/src/mage/sets/timespiral/DuskriderPeregrine.java index fa375230aca..4b97dc96167 100644 --- a/Mage.Sets/src/mage/sets/timespiral/DuskriderPeregrine.java +++ b/Mage.Sets/src/mage/sets/timespiral/DuskriderPeregrine.java @@ -28,8 +28,8 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/timespiral/EmptyTheWarrens.java b/Mage.Sets/src/mage/sets/timespiral/EmptyTheWarrens.java index 7a155fd9a96..2d734246330 100644 --- a/Mage.Sets/src/mage/sets/timespiral/EmptyTheWarrens.java +++ b/Mage.Sets/src/mage/sets/timespiral/EmptyTheWarrens.java @@ -28,8 +28,8 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.StormAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/timespiral/ErrantEphemeron.java b/Mage.Sets/src/mage/sets/timespiral/ErrantEphemeron.java index da825500b73..b493e882616 100644 --- a/Mage.Sets/src/mage/sets/timespiral/ErrantEphemeron.java +++ b/Mage.Sets/src/mage/sets/timespiral/ErrantEphemeron.java @@ -28,8 +28,8 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/timespiral/FlagstonesOfTrokair.java b/Mage.Sets/src/mage/sets/timespiral/FlagstonesOfTrokair.java index 89ead8008a7..9a85e133555 100644 --- a/Mage.Sets/src/mage/sets/timespiral/FlagstonesOfTrokair.java +++ b/Mage.Sets/src/mage/sets/timespiral/FlagstonesOfTrokair.java @@ -28,8 +28,8 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.abilities.mana.WhiteManaAbility; diff --git a/Mage.Sets/src/mage/sets/timespiral/Fortify.java b/Mage.Sets/src/mage/sets/timespiral/Fortify.java index d16990341f5..3b2b18855ee 100644 --- a/Mage.Sets/src/mage/sets/timespiral/Fortify.java +++ b/Mage.Sets/src/mage/sets/timespiral/Fortify.java @@ -29,12 +29,12 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Mode; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -49,9 +49,9 @@ public class Fortify extends CardImpl { this.color.setWhite(true); // Choose one - Creatures you control get +2/+0 until end of turn; or creatures you control get +0/+2 until end of turn. - this.getSpellAbility().addEffect(new BoostControlledEffect(2, 0, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostControlledEffect(2, 0, Duration.EndOfTurn)); Mode mode = new Mode(); - mode.getEffects().add(new BoostControlledEffect(0, 2, Constants.Duration.EndOfTurn)); + mode.getEffects().add(new BoostControlledEffect(0, 2, Duration.EndOfTurn)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/sets/timespiral/Grapeshot.java b/Mage.Sets/src/mage/sets/timespiral/Grapeshot.java index e267d2c4eaa..95e8fcf2b5a 100644 --- a/Mage.Sets/src/mage/sets/timespiral/Grapeshot.java +++ b/Mage.Sets/src/mage/sets/timespiral/Grapeshot.java @@ -28,8 +28,8 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.StormAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/timespiral/GreaterGargadon.java b/Mage.Sets/src/mage/sets/timespiral/GreaterGargadon.java index ec269047d48..b02a8c7f3db 100644 --- a/Mage.Sets/src/mage/sets/timespiral/GreaterGargadon.java +++ b/Mage.Sets/src/mage/sets/timespiral/GreaterGargadon.java @@ -28,9 +28,9 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.common.SacrificeTargetCost; @@ -39,6 +39,7 @@ import mage.abilities.effects.common.counter.RemoveCounterSourceEffect; import mage.abilities.keyword.SuspendAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; @@ -88,7 +89,7 @@ class GreaterGargadonAbility extends ActivatedAbilityImpl { // Target creature without flying can't block this turn. this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); - this.getSpellAbility().addEffect(new CantBlockTargetEffect(Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new CantBlockTargetEffect(Duration.EndOfTurn)); // Storm this.addAbility(new StormAbility()); } diff --git a/Mage.Sets/src/mage/sets/timespiral/HarmonicSliver.java b/Mage.Sets/src/mage/sets/timespiral/HarmonicSliver.java index 4c453a0576e..73ee5aa5443 100644 --- a/Mage.Sets/src/mage/sets/timespiral/HarmonicSliver.java +++ b/Mage.Sets/src/mage/sets/timespiral/HarmonicSliver.java @@ -28,10 +28,10 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/timespiral/HavenwoodWurm.java b/Mage.Sets/src/mage/sets/timespiral/HavenwoodWurm.java index 513ab37d959..8a44262b163 100644 --- a/Mage.Sets/src/mage/sets/timespiral/HavenwoodWurm.java +++ b/Mage.Sets/src/mage/sets/timespiral/HavenwoodWurm.java @@ -28,8 +28,8 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.TrampleAbility; diff --git a/Mage.Sets/src/mage/sets/timespiral/IgniteMemories.java b/Mage.Sets/src/mage/sets/timespiral/IgniteMemories.java index cf56111180a..b33f3c6ef3b 100644 --- a/Mage.Sets/src/mage/sets/timespiral/IgniteMemories.java +++ b/Mage.Sets/src/mage/sets/timespiral/IgniteMemories.java @@ -28,9 +28,9 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.StormAbility; @@ -38,6 +38,7 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; @@ -75,7 +76,7 @@ public class IgniteMemories extends CardImpl { class IgniteMemoriesEffect extends OneShotEffect { public IgniteMemoriesEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "Target player reveals a card at random from his or her hand. Ignite Memories deals damage to that player equal to that card's converted mana cost"; } diff --git a/Mage.Sets/src/mage/sets/timespiral/IvoryGiant.java b/Mage.Sets/src/mage/sets/timespiral/IvoryGiant.java index f4c3721744d..4eb0741e330 100644 --- a/Mage.Sets/src/mage/sets/timespiral/IvoryGiant.java +++ b/Mage.Sets/src/mage/sets/timespiral/IvoryGiant.java @@ -28,8 +28,8 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/timespiral/JeditsDragoons.java b/Mage.Sets/src/mage/sets/timespiral/JeditsDragoons.java index 4c2d6f1c0a0..d4bba1ad3d8 100644 --- a/Mage.Sets/src/mage/sets/timespiral/JeditsDragoons.java +++ b/Mage.Sets/src/mage/sets/timespiral/JeditsDragoons.java @@ -28,8 +28,8 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/timespiral/KrosanGrip.java b/Mage.Sets/src/mage/sets/timespiral/KrosanGrip.java index 620303bf274..fbc9ef02262 100644 --- a/Mage.Sets/src/mage/sets/timespiral/KrosanGrip.java +++ b/Mage.Sets/src/mage/sets/timespiral/KrosanGrip.java @@ -28,8 +28,8 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.SplitSecondAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/timespiral/LightningAxe.java b/Mage.Sets/src/mage/sets/timespiral/LightningAxe.java index fa3d969c9e3..a5b802260ac 100644 --- a/Mage.Sets/src/mage/sets/timespiral/LightningAxe.java +++ b/Mage.Sets/src/mage/sets/timespiral/LightningAxe.java @@ -28,8 +28,8 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.OrCost; import mage.abilities.costs.common.DiscardCardCost; import mage.abilities.costs.mana.GenericManaCost; diff --git a/Mage.Sets/src/mage/sets/timespiral/LivingEnd.java b/Mage.Sets/src/mage/sets/timespiral/LivingEnd.java index d65bbc7c5f5..8c1bab4bbc7 100644 --- a/Mage.Sets/src/mage/sets/timespiral/LivingEnd.java +++ b/Mage.Sets/src/mage/sets/timespiral/LivingEnd.java @@ -28,18 +28,16 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.SacrificeAllEffect; import mage.abilities.keyword.SuspendAbility; import mage.cards.Card; import mage.cards.CardImpl; -import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; diff --git a/Mage.Sets/src/mage/sets/timespiral/LocketOfYesterdays.java b/Mage.Sets/src/mage/sets/timespiral/LocketOfYesterdays.java index e2fc0eb0e15..5cd2f45f328 100644 --- a/Mage.Sets/src/mage/sets/timespiral/LocketOfYesterdays.java +++ b/Mage.Sets/src/mage/sets/timespiral/LocketOfYesterdays.java @@ -28,9 +28,8 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -54,7 +53,7 @@ public class LocketOfYesterdays extends CardImpl { this.expansionSetCode = "TSP"; // Spells you cast cost {1} less to cast for each card with the same name as that spell in your graveyard. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new LocketOfYesterdaysCostReductionEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LocketOfYesterdaysCostReductionEffect())); } public LocketOfYesterdays(final LocketOfYesterdays card) { @@ -70,7 +69,7 @@ public class LocketOfYesterdays extends CardImpl { class LocketOfYesterdaysCostReductionEffect extends CostModificationEffectImpl { LocketOfYesterdaysCostReductionEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "Spells you cast cost {1} less to cast for each card with the same name as that spell in your graveyard"; } diff --git a/Mage.Sets/src/mage/sets/timespiral/LooterIlKor.java b/Mage.Sets/src/mage/sets/timespiral/LooterIlKor.java index 80688bbd030..db998c2f9ca 100644 --- a/Mage.Sets/src/mage/sets/timespiral/LooterIlKor.java +++ b/Mage.Sets/src/mage/sets/timespiral/LooterIlKor.java @@ -28,8 +28,8 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.DealsDamageToOpponentTriggeredAbility; import mage.abilities.effects.common.DrawDiscardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/timespiral/LotusBloom.java b/Mage.Sets/src/mage/sets/timespiral/LotusBloom.java index f50df0df163..a43d2cd5759 100644 --- a/Mage.Sets/src/mage/sets/timespiral/LotusBloom.java +++ b/Mage.Sets/src/mage/sets/timespiral/LotusBloom.java @@ -28,9 +28,9 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; @@ -40,6 +40,7 @@ import mage.abilities.keyword.SuspendAbility; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.choices.ChoiceColor; +import mage.constants.Zone; /** * @@ -55,7 +56,7 @@ public class LotusBloom extends CardImpl { this.addAbility(new SuspendAbility(3, new GenericManaCost(0), this)); // {tap}, Sacrifice Lotus Bloom: Add three mana of any one color to your mana pool. - Ability ability = new SimpleManaAbility(Constants.Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(3), new TapSourceCost()); + Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(3), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addChoice(new ChoiceColor()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/timespiral/MangaraOfCorondor.java b/Mage.Sets/src/mage/sets/timespiral/MangaraOfCorondor.java index ba49b2d5077..3bbc89b9d4b 100644 --- a/Mage.Sets/src/mage/sets/timespiral/MangaraOfCorondor.java +++ b/Mage.Sets/src/mage/sets/timespiral/MangaraOfCorondor.java @@ -28,9 +28,9 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.ExileSourceEffect; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetPermanent; /** @@ -58,7 +59,7 @@ public class MangaraOfCorondor extends CardImpl { this.toughness = new MageInt(1); // {tap}: Exile Mangara of Corondor and target permanent. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ExileSourceEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileSourceEffect(), new TapSourceCost()); ability.addEffect(new ExileTargetEffect()); ability.addTarget(new TargetPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/timespiral/MightOfOldKrosa.java b/Mage.Sets/src/mage/sets/timespiral/MightOfOldKrosa.java index 1861b4d2f26..71e3650cefa 100644 --- a/Mage.Sets/src/mage/sets/timespiral/MightOfOldKrosa.java +++ b/Mage.Sets/src/mage/sets/timespiral/MightOfOldKrosa.java @@ -28,9 +28,9 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.condition.common.MyMainPhaseCondition; import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; diff --git a/Mage.Sets/src/mage/sets/timespiral/MindlashSliver.java b/Mage.Sets/src/mage/sets/timespiral/MindlashSliver.java index fd0e8d8a236..4826caac1de 100644 --- a/Mage.Sets/src/mage/sets/timespiral/MindlashSliver.java +++ b/Mage.Sets/src/mage/sets/timespiral/MindlashSliver.java @@ -28,10 +28,10 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/timespiral/Mindstab.java b/Mage.Sets/src/mage/sets/timespiral/Mindstab.java index 829406e96ac..1b22807048b 100644 --- a/Mage.Sets/src/mage/sets/timespiral/Mindstab.java +++ b/Mage.Sets/src/mage/sets/timespiral/Mindstab.java @@ -28,8 +28,8 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DiscardTargetEffect; import mage.abilities.keyword.SuspendAbility; diff --git a/Mage.Sets/src/mage/sets/timespiral/MoggWarMarshal.java b/Mage.Sets/src/mage/sets/timespiral/MoggWarMarshal.java index 224e55703c6..f1055e6d857 100644 --- a/Mage.Sets/src/mage/sets/timespiral/MoggWarMarshal.java +++ b/Mage.Sets/src/mage/sets/timespiral/MoggWarMarshal.java @@ -28,8 +28,8 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/timespiral/MomentaryBlink.java b/Mage.Sets/src/mage/sets/timespiral/MomentaryBlink.java index fe23e3c8e7e..c2d1f7547cf 100644 --- a/Mage.Sets/src/mage/sets/timespiral/MomentaryBlink.java +++ b/Mage.Sets/src/mage/sets/timespiral/MomentaryBlink.java @@ -27,14 +27,14 @@ */ package mage.sets.timespiral; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ExileTargetForSourceEffect; import mage.abilities.effects.common.ReturnToBattlefieldUnderYourControlTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; +import mage.constants.TimingRule; import mage.target.common.TargetControlledCreaturePermanent; import java.util.UUID; @@ -56,7 +56,7 @@ public class MomentaryBlink extends CardImpl { this.getSpellAbility().addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect()); // Flashback {3}{U} - this.addAbility(new FlashbackAbility(new ManaCostsImpl("{3}{U}"), Constants.TimingRule.INSTANT)); + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{3}{U}"), TimingRule.INSTANT)); } public MomentaryBlink(final MomentaryBlink card) { diff --git a/Mage.Sets/src/mage/sets/timespiral/NantukoShaman.java b/Mage.Sets/src/mage/sets/timespiral/NantukoShaman.java index a78a0c22bc8..34c07b84de5 100644 --- a/Mage.Sets/src/mage/sets/timespiral/NantukoShaman.java +++ b/Mage.Sets/src/mage/sets/timespiral/NantukoShaman.java @@ -28,8 +28,8 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/timespiral/RestoreBalance.java b/Mage.Sets/src/mage/sets/timespiral/RestoreBalance.java index 8f2967735b4..8708cbf0424 100644 --- a/Mage.Sets/src/mage/sets/timespiral/RestoreBalance.java +++ b/Mage.Sets/src/mage/sets/timespiral/RestoreBalance.java @@ -28,10 +28,10 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.costs.mana.ManaCostsImpl; @@ -80,7 +80,7 @@ class RestoreBalanceEffect extends OneShotEffect { public RestoreBalanceEffect() { - super(Constants.Outcome.Sacrifice); + super(Outcome.Sacrifice); } public RestoreBalanceEffect(final RestoreBalanceEffect effect) { diff --git a/Mage.Sets/src/mage/sets/timespiral/RiftBolt.java b/Mage.Sets/src/mage/sets/timespiral/RiftBolt.java index 73303106827..3e164536ea8 100644 --- a/Mage.Sets/src/mage/sets/timespiral/RiftBolt.java +++ b/Mage.Sets/src/mage/sets/timespiral/RiftBolt.java @@ -28,8 +28,8 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.SuspendAbility; diff --git a/Mage.Sets/src/mage/sets/timespiral/RiftwingCloudskate.java b/Mage.Sets/src/mage/sets/timespiral/RiftwingCloudskate.java index e754dc8069c..c8db513dc1c 100644 --- a/Mage.Sets/src/mage/sets/timespiral/RiftwingCloudskate.java +++ b/Mage.Sets/src/mage/sets/timespiral/RiftwingCloudskate.java @@ -28,8 +28,8 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/timespiral/SearchForTomorrow.java b/Mage.Sets/src/mage/sets/timespiral/SearchForTomorrow.java index dafc4349430..70ced9bdcf4 100644 --- a/Mage.Sets/src/mage/sets/timespiral/SearchForTomorrow.java +++ b/Mage.Sets/src/mage/sets/timespiral/SearchForTomorrow.java @@ -28,9 +28,9 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.abilities.keyword.SuspendAbility; diff --git a/Mage.Sets/src/mage/sets/timespiral/SerraAvenger.java b/Mage.Sets/src/mage/sets/timespiral/SerraAvenger.java index e094b9c14b4..37c58c593c6 100644 --- a/Mage.Sets/src/mage/sets/timespiral/SerraAvenger.java +++ b/Mage.Sets/src/mage/sets/timespiral/SerraAvenger.java @@ -28,11 +28,11 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/timespiral/SidewinderSliver.java b/Mage.Sets/src/mage/sets/timespiral/SidewinderSliver.java index d6a89f73571..cfd8910d7c7 100644 --- a/Mage.Sets/src/mage/sets/timespiral/SidewinderSliver.java +++ b/Mage.Sets/src/mage/sets/timespiral/SidewinderSliver.java @@ -28,14 +28,16 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.abilities.keyword.FlankingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -61,7 +63,7 @@ public class SidewinderSliver extends CardImpl { this.toughness = new MageInt(1); // All Sliver creatures have flanking. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAllEffect(new FlankingAbility(), Constants.Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new FlankingAbility(), Duration.WhileOnBattlefield, filter, false))); } public SidewinderSliver(final SidewinderSliver card) { diff --git a/Mage.Sets/src/mage/sets/timespiral/SkulkingKnight.java b/Mage.Sets/src/mage/sets/timespiral/SkulkingKnight.java index a1acf670387..62153fb645f 100644 --- a/Mage.Sets/src/mage/sets/timespiral/SkulkingKnight.java +++ b/Mage.Sets/src/mage/sets/timespiral/SkulkingKnight.java @@ -28,8 +28,8 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BecomesTargetTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; diff --git a/Mage.Sets/src/mage/sets/timespiral/SpellBurst.java b/Mage.Sets/src/mage/sets/timespiral/SpellBurst.java index a79ad19231a..38746a3c041 100644 --- a/Mage.Sets/src/mage/sets/timespiral/SpellBurst.java +++ b/Mage.Sets/src/mage/sets/timespiral/SpellBurst.java @@ -28,8 +28,8 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.effects.common.CounterTargetEffect; diff --git a/Mage.Sets/src/mage/sets/timespiral/SporesowerThallid.java b/Mage.Sets/src/mage/sets/timespiral/SporesowerThallid.java index 43fea7ca496..54e8284716a 100644 --- a/Mage.Sets/src/mage/sets/timespiral/SporesowerThallid.java +++ b/Mage.Sets/src/mage/sets/timespiral/SporesowerThallid.java @@ -28,10 +28,6 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +35,10 @@ import mage.abilities.costs.common.RemoveCountersSourceCost; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.counter.AddCountersAllEffect; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -53,7 +53,7 @@ public class SporesowerThallid extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Fungus you control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(new SubtypePredicate("Fungus")); } @@ -67,7 +67,7 @@ public class SporesowerThallid extends CardImpl { this.toughness = new MageInt(4); // At the beginning of your upkeep, put a spore counter on each Fungus you control. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersAllEffect(CounterType.SPORE.createInstance(), filter), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersAllEffect(CounterType.SPORE.createInstance(), filter), TargetController.YOU, false)); // Remove three spore counters from Sporesower Thallid: Put a 1/1 green Saproling creature token onto the battlefield. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); } diff --git a/Mage.Sets/src/mage/sets/timespiral/StuffyDoll.java b/Mage.Sets/src/mage/sets/timespiral/StuffyDoll.java index d07d474ee1d..51a4920e963 100644 --- a/Mage.Sets/src/mage/sets/timespiral/StuffyDoll.java +++ b/Mage.Sets/src/mage/sets/timespiral/StuffyDoll.java @@ -28,10 +28,10 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage.Sets/src/mage/sets/timespiral/SuddenSpoiling.java b/Mage.Sets/src/mage/sets/timespiral/SuddenSpoiling.java index 8425981611b..329f3b930b4 100644 --- a/Mage.Sets/src/mage/sets/timespiral/SuddenSpoiling.java +++ b/Mage.Sets/src/mage/sets/timespiral/SuddenSpoiling.java @@ -28,13 +28,13 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.keyword.SplitSecondAbility; @@ -103,7 +103,7 @@ class SuddenSpoilingEffect extends ContinuousEffectImpl { } @Override - public boolean apply(Layer layer, Constants.SubLayer sublayer, Ability source, Game game) { + public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) { Player player = game.getPlayer(this.getTargetPointer().getFirst(game, source)); if (player != null) { for (Permanent permanent : game.getState().getBattlefield().getAllActivePermanents(new FilterCreaturePermanent(), player.getId(), game)) { @@ -131,8 +131,8 @@ class SuddenSpoilingEffect extends ContinuousEffectImpl { } @Override - public boolean hasLayer(Constants.Layer layer) { - return layer == Layer.AbilityAddingRemovingEffects_6 || layer == Constants.Layer.PTChangingEffects_7; + public boolean hasLayer(Layer layer) { + return layer == Layer.AbilityAddingRemovingEffects_6 || layer == Layer.PTChangingEffects_7; } } diff --git a/Mage.Sets/src/mage/sets/timespiral/ThallidGerminator.java b/Mage.Sets/src/mage/sets/timespiral/ThallidGerminator.java index 597a9b21406..d9767f4efae 100644 --- a/Mage.Sets/src/mage/sets/timespiral/ThallidGerminator.java +++ b/Mage.Sets/src/mage/sets/timespiral/ThallidGerminator.java @@ -28,11 +28,6 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -43,6 +38,11 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; diff --git a/Mage.Sets/src/mage/sets/timespiral/ThallidShellDweller.java b/Mage.Sets/src/mage/sets/timespiral/ThallidShellDweller.java index 28f41f91b0f..2ac0d3f3721 100644 --- a/Mage.Sets/src/mage/sets/timespiral/ThallidShellDweller.java +++ b/Mage.Sets/src/mage/sets/timespiral/ThallidShellDweller.java @@ -28,10 +28,6 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +36,10 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.permanent.token.SaprolingToken; diff --git a/Mage.Sets/src/mage/sets/timespiral/Trickbind.java b/Mage.Sets/src/mage/sets/timespiral/Trickbind.java index a4280896e00..c31d78869a7 100644 --- a/Mage.Sets/src/mage/sets/timespiral/Trickbind.java +++ b/Mage.Sets/src/mage/sets/timespiral/Trickbind.java @@ -28,10 +28,10 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.ReplacementEffectImpl; diff --git a/Mage.Sets/src/mage/sets/timespiral/TwoHeadedSliver.java b/Mage.Sets/src/mage/sets/timespiral/TwoHeadedSliver.java index 486dc16ef09..01cc2b2ce1e 100644 --- a/Mage.Sets/src/mage/sets/timespiral/TwoHeadedSliver.java +++ b/Mage.Sets/src/mage/sets/timespiral/TwoHeadedSliver.java @@ -29,10 +29,10 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.CantBeBlockedByOneEffect; diff --git a/Mage.Sets/src/mage/sets/timespiral/UrzasFactory.java b/Mage.Sets/src/mage/sets/timespiral/UrzasFactory.java index 3973769f863..c594ae35f6c 100644 --- a/Mage.Sets/src/mage/sets/timespiral/UrzasFactory.java +++ b/Mage.Sets/src/mage/sets/timespiral/UrzasFactory.java @@ -29,9 +29,8 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.permanent.token.Token; /** @@ -56,7 +56,7 @@ public class UrzasFactory extends CardImpl { // {tap}: Add {1} to your mana pool. this.addAbility(new ColorlessManaAbility()); // {7}, {tap}: Put a 2/2 colorless Assembly-Worker artifact creature token onto the battlefield. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new AssemblyWorkerToken()), new GenericManaCost(7)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new AssemblyWorkerToken()), new GenericManaCost(7)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/timespiral/VensersSliver.java b/Mage.Sets/src/mage/sets/timespiral/VensersSliver.java index d8756a1b4b3..531c2f3bf3c 100644 --- a/Mage.Sets/src/mage/sets/timespiral/VensersSliver.java +++ b/Mage.Sets/src/mage/sets/timespiral/VensersSliver.java @@ -28,8 +28,8 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/timespiral/Vesuva.java b/Mage.Sets/src/mage/sets/timespiral/Vesuva.java index 9e06877aa60..b349e9fa945 100644 --- a/Mage.Sets/src/mage/sets/timespiral/Vesuva.java +++ b/Mage.Sets/src/mage/sets/timespiral/Vesuva.java @@ -28,9 +28,9 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.EntersBattlefieldEffect; import mage.abilities.effects.common.CopyPermanentEffect; diff --git a/Mage.Sets/src/mage/sets/timespiral/VolcanicAwakening.java b/Mage.Sets/src/mage/sets/timespiral/VolcanicAwakening.java index 4b0b0dae620..d9babd45e64 100644 --- a/Mage.Sets/src/mage/sets/timespiral/VolcanicAwakening.java +++ b/Mage.Sets/src/mage/sets/timespiral/VolcanicAwakening.java @@ -28,8 +28,8 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.StormAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/timespiral/WalkTheAeons.java b/Mage.Sets/src/mage/sets/timespiral/WalkTheAeons.java index be747c6b47f..37296fbe4ed 100644 --- a/Mage.Sets/src/mage/sets/timespiral/WalkTheAeons.java +++ b/Mage.Sets/src/mage/sets/timespiral/WalkTheAeons.java @@ -28,9 +28,9 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/timespiral/WipeAway.java b/Mage.Sets/src/mage/sets/timespiral/WipeAway.java index 75382fafde5..42ba8ba97a9 100644 --- a/Mage.Sets/src/mage/sets/timespiral/WipeAway.java +++ b/Mage.Sets/src/mage/sets/timespiral/WipeAway.java @@ -28,8 +28,8 @@ package mage.sets.timespiral; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.SplitSecondAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/torment/AngelOfRetribution.java b/Mage.Sets/src/mage/sets/torment/AngelOfRetribution.java index 68b5ccb591c..1f88450fbad 100644 --- a/Mage.Sets/src/mage/sets/torment/AngelOfRetribution.java +++ b/Mage.Sets/src/mage/sets/torment/AngelOfRetribution.java @@ -28,8 +28,8 @@ package mage.sets.torment; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/torment/Aquamoeba.java b/Mage.Sets/src/mage/sets/torment/Aquamoeba.java index 5d599222c4b..6d911dcf196 100644 --- a/Mage.Sets/src/mage/sets/torment/Aquamoeba.java +++ b/Mage.Sets/src/mage/sets/torment/Aquamoeba.java @@ -27,14 +27,15 @@ */ package mage.sets.torment; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.DiscardCardCost; import mage.abilities.effects.common.continious.SwitchPowerToughnessSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import java.util.UUID; @@ -56,7 +57,7 @@ public class Aquamoeba extends CardImpl { this.toughness = new MageInt(3); // Discard a card: Switch Aquamoeba's power and toughness until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new SwitchPowerToughnessSourceEffect(Constants.Duration.EndOfTurn), new DiscardCardCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), new DiscardCardCost())); } public Aquamoeba(final Aquamoeba card) { diff --git a/Mage.Sets/src/mage/sets/torment/ArrogantWurm.java b/Mage.Sets/src/mage/sets/torment/ArrogantWurm.java index 7b714460734..6e2bac59834 100644 --- a/Mage.Sets/src/mage/sets/torment/ArrogantWurm.java +++ b/Mage.Sets/src/mage/sets/torment/ArrogantWurm.java @@ -27,8 +27,8 @@ */ package mage.sets.torment; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.MadnessAbility; diff --git a/Mage.Sets/src/mage/sets/torment/BaskingRootwalla.java b/Mage.Sets/src/mage/sets/torment/BaskingRootwalla.java index 6b76cc1a2a7..275b671e25e 100644 --- a/Mage.Sets/src/mage/sets/torment/BaskingRootwalla.java +++ b/Mage.Sets/src/mage/sets/torment/BaskingRootwalla.java @@ -27,15 +27,16 @@ */ package mage.sets.torment; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.ActivateOncePerTurnActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.MadnessAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import java.util.UUID; @@ -55,8 +56,8 @@ public class BaskingRootwalla extends CardImpl { this.toughness = new MageInt(1); // {1}{G}: Basking Rootwalla gets +2/+2 until end of turn. Activate this ability only once each turn. - this.addAbility(new ActivateOncePerTurnActivatedAbility(Constants.Zone.BATTLEFIELD, - new BoostSourceEffect(2, 2, Constants.Duration.EndOfTurn), new ManaCostsImpl("{1}{G}"))); + this.addAbility(new ActivateOncePerTurnActivatedAbility(Zone.BATTLEFIELD, + new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("{1}{G}"))); // Madness {0} this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{0}"))); diff --git a/Mage.Sets/src/mage/sets/torment/CabalRitual.java b/Mage.Sets/src/mage/sets/torment/CabalRitual.java index ed8d4b1e562..95b4e124219 100644 --- a/Mage.Sets/src/mage/sets/torment/CabalRitual.java +++ b/Mage.Sets/src/mage/sets/torment/CabalRitual.java @@ -28,8 +28,8 @@ package mage.sets.torment; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.condition.common.CardsInControllerGraveCondition; import mage.abilities.decorator.ConditionalOneShotEffect; diff --git a/Mage.Sets/src/mage/sets/torment/CircularLogic.java b/Mage.Sets/src/mage/sets/torment/CircularLogic.java index 466c2722a22..688aa0c7bfb 100644 --- a/Mage.Sets/src/mage/sets/torment/CircularLogic.java +++ b/Mage.Sets/src/mage/sets/torment/CircularLogic.java @@ -27,9 +27,8 @@ */ package mage.sets.torment; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.costs.mana.GenericManaCost; @@ -37,6 +36,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.MadnessAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.stack.StackObject; import mage.players.Player; @@ -77,7 +77,7 @@ public class CircularLogic extends CardImpl { class CircularLogicCounterUnlessPaysEffect extends OneShotEffect { public CircularLogicCounterUnlessPaysEffect() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); } public CircularLogicCounterUnlessPaysEffect(final CircularLogicCounterUnlessPaysEffect effect) { diff --git a/Mage.Sets/src/mage/sets/torment/DeepAnalysis.java b/Mage.Sets/src/mage/sets/torment/DeepAnalysis.java index 8de686ada52..4be9bc4ecc3 100644 --- a/Mage.Sets/src/mage/sets/torment/DeepAnalysis.java +++ b/Mage.Sets/src/mage/sets/torment/DeepAnalysis.java @@ -27,9 +27,8 @@ */ package mage.sets.torment; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.Costs; import mage.abilities.costs.CostsImpl; import mage.abilities.costs.common.PayLifeCost; @@ -37,6 +36,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; +import mage.constants.TimingRule; import mage.target.TargetPlayer; import java.util.UUID; @@ -61,7 +61,7 @@ public class DeepAnalysis extends CardImpl { Costs costs = new CostsImpl(); costs.add(new ManaCostsImpl("{1}{U}")); costs.add(new PayLifeCost(3)); - this.addAbility(new FlashbackAbility(costs, Constants.TimingRule.SORCERY)); + this.addAbility(new FlashbackAbility(costs, TimingRule.SORCERY)); } public DeepAnalysis(final DeepAnalysis card) { diff --git a/Mage.Sets/src/mage/sets/torment/FieryTemper.java b/Mage.Sets/src/mage/sets/torment/FieryTemper.java index d6599798d42..fae524b6b4f 100644 --- a/Mage.Sets/src/mage/sets/torment/FieryTemper.java +++ b/Mage.Sets/src/mage/sets/torment/FieryTemper.java @@ -28,7 +28,7 @@ package mage.sets.torment; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/torment/FranticPurification.java b/Mage.Sets/src/mage/sets/torment/FranticPurification.java index fff4449ff71..aa38eae5cf6 100644 --- a/Mage.Sets/src/mage/sets/torment/FranticPurification.java +++ b/Mage.Sets/src/mage/sets/torment/FranticPurification.java @@ -27,8 +27,8 @@ */ package mage.sets.torment; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.MadnessAbility; diff --git a/Mage.Sets/src/mage/sets/torment/MajorTeroh.java b/Mage.Sets/src/mage/sets/torment/MajorTeroh.java index 857d6c48acf..8efcfaf922f 100644 --- a/Mage.Sets/src/mage/sets/torment/MajorTeroh.java +++ b/Mage.Sets/src/mage/sets/torment/MajorTeroh.java @@ -28,9 +28,9 @@ package mage.sets.torment; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -40,6 +40,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ExileAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; @@ -68,7 +69,7 @@ public class MajorTeroh extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {3}{W}{W}, Sacrifice Major Teroh: Exile all black creatures. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ExileAllEffect(filter),new ManaCostsImpl("{3}{W}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileAllEffect(filter),new ManaCostsImpl("{3}{W}{W}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/torment/ObsessiveSearch.java b/Mage.Sets/src/mage/sets/torment/ObsessiveSearch.java index 61942107d3a..95d8a516732 100644 --- a/Mage.Sets/src/mage/sets/torment/ObsessiveSearch.java +++ b/Mage.Sets/src/mage/sets/torment/ObsessiveSearch.java @@ -27,8 +27,8 @@ */ package mage.sets.torment; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.keyword.MadnessAbility; diff --git a/Mage.Sets/src/mage/sets/torment/PsychoticHaze.java b/Mage.Sets/src/mage/sets/torment/PsychoticHaze.java index d5558d7a392..23aea0c8f93 100644 --- a/Mage.Sets/src/mage/sets/torment/PsychoticHaze.java +++ b/Mage.Sets/src/mage/sets/torment/PsychoticHaze.java @@ -27,8 +27,8 @@ */ package mage.sets.torment; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageEverythingEffect; import mage.abilities.keyword.MadnessAbility; diff --git a/Mage.Sets/src/mage/sets/torment/TaintedField.java b/Mage.Sets/src/mage/sets/torment/TaintedField.java index 053449ea8a4..3344ecaef6f 100644 --- a/Mage.Sets/src/mage/sets/torment/TaintedField.java +++ b/Mage.Sets/src/mage/sets/torment/TaintedField.java @@ -28,9 +28,9 @@ package mage.sets.torment; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.condition.common.ControlsPermanentCondition; import mage.abilities.costs.common.TapSourceCost; @@ -38,6 +38,7 @@ import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.mana.ActivateIfConditionManaAbility; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -61,12 +62,12 @@ public class TaintedField extends CardImpl { // {tap}: Add {W} or {B} to your mana pool. Activate this ability only if you control a Swamp. this.addAbility(new ActivateIfConditionManaAbility( - Constants.Zone.BATTLEFIELD, + Zone.BATTLEFIELD, new BasicManaEffect(Mana.WhiteMana), new TapSourceCost(), new ControlsPermanentCondition(filter, ControlsPermanentCondition.CountType.MORE_THAN, 0))); this.addAbility(new ActivateIfConditionManaAbility( - Constants.Zone.BATTLEFIELD, + Zone.BATTLEFIELD, new BasicManaEffect(Mana.BlackMana), new TapSourceCost(), new ControlsPermanentCondition(filter, ControlsPermanentCondition.CountType.MORE_THAN, 0))); diff --git a/Mage.Sets/src/mage/sets/torment/TaintedPeak.java b/Mage.Sets/src/mage/sets/torment/TaintedPeak.java index 136a91fdccf..3257389df85 100644 --- a/Mage.Sets/src/mage/sets/torment/TaintedPeak.java +++ b/Mage.Sets/src/mage/sets/torment/TaintedPeak.java @@ -28,9 +28,9 @@ package mage.sets.torment; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.condition.common.ControlsPermanentCondition; import mage.abilities.costs.common.TapSourceCost; @@ -38,6 +38,7 @@ import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.mana.ActivateIfConditionManaAbility; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -61,12 +62,12 @@ public class TaintedPeak extends CardImpl { // {tap}: Add {B} or {R} to your mana pool. Activate this ability only if you control a Swamp. this.addAbility(new ActivateIfConditionManaAbility( - Constants.Zone.BATTLEFIELD, + Zone.BATTLEFIELD, new BasicManaEffect(Mana.BlackMana), new TapSourceCost(), new ControlsPermanentCondition(filter, ControlsPermanentCondition.CountType.MORE_THAN, 0))); this.addAbility(new ActivateIfConditionManaAbility( - Constants.Zone.BATTLEFIELD, + Zone.BATTLEFIELD, new BasicManaEffect(Mana.RedMana), new TapSourceCost(), new ControlsPermanentCondition(filter, ControlsPermanentCondition.CountType.MORE_THAN, 0))); diff --git a/Mage.Sets/src/mage/sets/torment/TaintedWood.java b/Mage.Sets/src/mage/sets/torment/TaintedWood.java index 338cfcd72a9..786887db9cd 100644 --- a/Mage.Sets/src/mage/sets/torment/TaintedWood.java +++ b/Mage.Sets/src/mage/sets/torment/TaintedWood.java @@ -28,9 +28,9 @@ package mage.sets.torment; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.condition.common.ControlsPermanentCondition; import mage.abilities.costs.common.TapSourceCost; @@ -38,6 +38,7 @@ import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.mana.ActivateIfConditionManaAbility; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -61,12 +62,12 @@ public class TaintedWood extends CardImpl { // {tap}: Add {B} or {G} to your mana pool. Activate this ability only if you control a Swamp. this.addAbility(new ActivateIfConditionManaAbility( - Constants.Zone.BATTLEFIELD, + Zone.BATTLEFIELD, new BasicManaEffect(Mana.BlackMana), new TapSourceCost(), new ControlsPermanentCondition(filter, ControlsPermanentCondition.CountType.MORE_THAN, 0))); this.addAbility(new ActivateIfConditionManaAbility( - Constants.Zone.BATTLEFIELD, + Zone.BATTLEFIELD, new BasicManaEffect(Mana.GreenMana), new TapSourceCost(), new ControlsPermanentCondition(filter, ControlsPermanentCondition.CountType.MORE_THAN, 0))); diff --git a/Mage.Sets/src/mage/sets/torment/ViolentEruption.java b/Mage.Sets/src/mage/sets/torment/ViolentEruption.java index 620fc0e1c8f..d8b1ad64dfd 100644 --- a/Mage.Sets/src/mage/sets/torment/ViolentEruption.java +++ b/Mage.Sets/src/mage/sets/torment/ViolentEruption.java @@ -27,8 +27,8 @@ */ package mage.sets.torment; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageMultiEffect; import mage.abilities.keyword.MadnessAbility; diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Clone.java b/Mage.Sets/src/mage/sets/unlimitededition/Clone.java index f1b21c8a4cf..4e47efe2429 100644 --- a/Mage.Sets/src/mage/sets/unlimitededition/Clone.java +++ b/Mage.Sets/src/mage/sets/unlimitededition/Clone.java @@ -28,7 +28,7 @@ package mage.sets.unlimitededition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Counterspell.java b/Mage.Sets/src/mage/sets/unlimitededition/Counterspell.java index a035a660fc8..2438967797d 100644 --- a/Mage.Sets/src/mage/sets/unlimitededition/Counterspell.java +++ b/Mage.Sets/src/mage/sets/unlimitededition/Counterspell.java @@ -28,7 +28,7 @@ package mage.sets.unlimitededition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/unlimitededition/EvilPresence.java b/Mage.Sets/src/mage/sets/unlimitededition/EvilPresence.java index 50db9a5e79d..2016a9023f8 100644 --- a/Mage.Sets/src/mage/sets/unlimitededition/EvilPresence.java +++ b/Mage.Sets/src/mage/sets/unlimitededition/EvilPresence.java @@ -28,7 +28,7 @@ package mage.sets.unlimitededition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/unlimitededition/FireElemental.java b/Mage.Sets/src/mage/sets/unlimitededition/FireElemental.java index 841461a2dee..8400d246efc 100644 --- a/Mage.Sets/src/mage/sets/unlimitededition/FireElemental.java +++ b/Mage.Sets/src/mage/sets/unlimitededition/FireElemental.java @@ -28,7 +28,7 @@ package mage.sets.unlimitededition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Fireball.java b/Mage.Sets/src/mage/sets/unlimitededition/Fireball.java index acb6fff8c81..496e7c1f232 100644 --- a/Mage.Sets/src/mage/sets/unlimitededition/Fireball.java +++ b/Mage.Sets/src/mage/sets/unlimitededition/Fireball.java @@ -28,7 +28,7 @@ package mage.sets.unlimitededition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/unlimitededition/GoblinBalloonBrigade.java b/Mage.Sets/src/mage/sets/unlimitededition/GoblinBalloonBrigade.java index c3d689884f5..78d643da5a3 100644 --- a/Mage.Sets/src/mage/sets/unlimitededition/GoblinBalloonBrigade.java +++ b/Mage.Sets/src/mage/sets/unlimitededition/GoblinBalloonBrigade.java @@ -28,7 +28,7 @@ package mage.sets.unlimitededition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/unlimitededition/HypnoticSpecter.java b/Mage.Sets/src/mage/sets/unlimitededition/HypnoticSpecter.java index 94c5070324e..699af071bc8 100644 --- a/Mage.Sets/src/mage/sets/unlimitededition/HypnoticSpecter.java +++ b/Mage.Sets/src/mage/sets/unlimitededition/HypnoticSpecter.java @@ -28,7 +28,7 @@ package mage.sets.unlimitededition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/unlimitededition/ProdigalSorcerer.java b/Mage.Sets/src/mage/sets/unlimitededition/ProdigalSorcerer.java index 95d5497ce6c..f83796fd4f9 100644 --- a/Mage.Sets/src/mage/sets/unlimitededition/ProdigalSorcerer.java +++ b/Mage.Sets/src/mage/sets/unlimitededition/ProdigalSorcerer.java @@ -28,7 +28,7 @@ package mage.sets.unlimitededition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/unlimitededition/PsionicBlast.java b/Mage.Sets/src/mage/sets/unlimitededition/PsionicBlast.java index 272f95e88c7..372b07ab936 100644 --- a/Mage.Sets/src/mage/sets/unlimitededition/PsionicBlast.java +++ b/Mage.Sets/src/mage/sets/unlimitededition/PsionicBlast.java @@ -28,7 +28,7 @@ package mage.sets.unlimitededition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/unlimitededition/SengirVampire.java b/Mage.Sets/src/mage/sets/unlimitededition/SengirVampire.java index fcd89cfdfd1..192b15d4fdb 100644 --- a/Mage.Sets/src/mage/sets/unlimitededition/SengirVampire.java +++ b/Mage.Sets/src/mage/sets/unlimitededition/SengirVampire.java @@ -28,7 +28,7 @@ package mage.sets.unlimitededition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/unlimitededition/SerraAngel.java b/Mage.Sets/src/mage/sets/unlimitededition/SerraAngel.java index c3302edfd98..9c44892a5ea 100644 --- a/Mage.Sets/src/mage/sets/unlimitededition/SerraAngel.java +++ b/Mage.Sets/src/mage/sets/unlimitededition/SerraAngel.java @@ -28,7 +28,7 @@ package mage.sets.unlimitededition; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/unlimitededition/VolcanicIsland.java b/Mage.Sets/src/mage/sets/unlimitededition/VolcanicIsland.java index 6424a4a80af..e276853ac7b 100644 --- a/Mage.Sets/src/mage/sets/unlimitededition/VolcanicIsland.java +++ b/Mage.Sets/src/mage/sets/unlimitededition/VolcanicIsland.java @@ -28,8 +28,8 @@ package mage.sets.unlimitededition; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/AetherSting.java b/Mage.Sets/src/mage/sets/urzasdestiny/AetherSting.java index 675091290a0..2a8ed28859f 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/AetherSting.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/AetherSting.java @@ -28,9 +28,9 @@ package mage.sets.urzasdestiny; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/AncientSilverback.java b/Mage.Sets/src/mage/sets/urzasdestiny/AncientSilverback.java index 420b9b44884..6d0b8d7bcf7 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/AncientSilverback.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/AncientSilverback.java @@ -28,9 +28,9 @@ package mage.sets.urzasdestiny; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/Attrition.java b/Mage.Sets/src/mage/sets/urzasdestiny/Attrition.java index d54119b7d6d..c78cdb50986 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/Attrition.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/Attrition.java @@ -28,9 +28,9 @@ package mage.sets.urzasdestiny; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/BlizzardElemental.java b/Mage.Sets/src/mage/sets/urzasdestiny/BlizzardElemental.java index 8237b5304af..c9096d7a65a 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/BlizzardElemental.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/BlizzardElemental.java @@ -28,9 +28,9 @@ package mage.sets.urzasdestiny; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/BloodshotCyclops.java b/Mage.Sets/src/mage/sets/urzasdestiny/BloodshotCyclops.java index 83aa8ac5585..a32f03b6468 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/BloodshotCyclops.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/BloodshotCyclops.java @@ -28,10 +28,10 @@ package mage.sets.urzasdestiny; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/BraidwoodCup.java b/Mage.Sets/src/mage/sets/urzasdestiny/BraidwoodCup.java index 0e38451dbdb..7f90b570df3 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/BraidwoodCup.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/BraidwoodCup.java @@ -28,14 +28,15 @@ package mage.sets.urzasdestiny; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -48,7 +49,7 @@ public class BraidwoodCup extends CardImpl { this.expansionSetCode = "UDS"; // {T}: You gain 1 life. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainLifeEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/BrassSecretary.java b/Mage.Sets/src/mage/sets/urzasdestiny/BrassSecretary.java index a39d4db1edc..c8e75187aa0 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/BrassSecretary.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/BrassSecretary.java @@ -28,9 +28,9 @@ package mage.sets.urzasdestiny; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +38,7 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -53,7 +54,7 @@ public class BrassSecretary extends CardImpl { this.toughness = new MageInt(1); // {2}, Sacrifice Brass Secretary: Draw a card. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(2)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/BubblingBeebles.java b/Mage.Sets/src/mage/sets/urzasdestiny/BubblingBeebles.java index ce2313e5cc7..3423dd95100 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/BubblingBeebles.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/BubblingBeebles.java @@ -28,9 +28,9 @@ package mage.sets.urzasdestiny; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.DefendingPlayerControlsCondition; diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/CapashenKnight.java b/Mage.Sets/src/mage/sets/urzasdestiny/CapashenKnight.java index 429fbc7b23f..c0b467f8b5b 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/CapashenKnight.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/CapashenKnight.java @@ -28,10 +28,10 @@ package mage.sets.urzasdestiny; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/CapashenTemplar.java b/Mage.Sets/src/mage/sets/urzasdestiny/CapashenTemplar.java index bbf429affad..0defd62da2c 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/CapashenTemplar.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/CapashenTemplar.java @@ -28,10 +28,10 @@ package mage.sets.urzasdestiny; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/ElvishLookout.java b/Mage.Sets/src/mage/sets/urzasdestiny/ElvishLookout.java index ef48987b5fb..b4d716f7464 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/ElvishLookout.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/ElvishLookout.java @@ -28,8 +28,8 @@ package mage.sets.urzasdestiny; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/Extruder.java b/Mage.Sets/src/mage/sets/urzasdestiny/Extruder.java index 7f23bad97fb..f269f3e2bd2 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/Extruder.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/Extruder.java @@ -28,9 +28,9 @@ package mage.sets.urzasdestiny; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/FodderCannon.java b/Mage.Sets/src/mage/sets/urzasdestiny/FodderCannon.java index 2e0ccc79202..c3820e70db0 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/FodderCannon.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/FodderCannon.java @@ -28,9 +28,9 @@ package mage.sets.urzasdestiny; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -38,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -52,7 +53,7 @@ public class FodderCannon extends CardImpl { this.expansionSetCode = "UDS"; // {4}, {tap}, Sacrifice a creature: Fodder Cannon deals 4 damage to target creature. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(4), new ManaCostsImpl("{4}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new ManaCostsImpl("{4}")); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/GoblinBerserker.java b/Mage.Sets/src/mage/sets/urzasdestiny/GoblinBerserker.java index f6ce7e70536..2ea23732d45 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/GoblinBerserker.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/GoblinBerserker.java @@ -28,8 +28,8 @@ package mage.sets.urzasdestiny; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.HasteAbility; diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/GoblinMarshal.java b/Mage.Sets/src/mage/sets/urzasdestiny/GoblinMarshal.java index 628afd06d39..bd13128f567 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/GoblinMarshal.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/GoblinMarshal.java @@ -28,8 +28,8 @@ package mage.sets.urzasdestiny; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/GoliathBeetle.java b/Mage.Sets/src/mage/sets/urzasdestiny/GoliathBeetle.java index 6f45d90d392..6a899ed3ff6 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/GoliathBeetle.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/GoliathBeetle.java @@ -28,8 +28,8 @@ package mage.sets.urzasdestiny; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/HuntingMoa.java b/Mage.Sets/src/mage/sets/urzasdestiny/HuntingMoa.java index bea6822bc0a..7b8d2067561 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/HuntingMoa.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/HuntingMoa.java @@ -28,8 +28,8 @@ package mage.sets.urzasdestiny; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/KeldonVandals.java b/Mage.Sets/src/mage/sets/urzasdestiny/KeldonVandals.java index b3debbb1d71..cf1cfd975d7 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/KeldonVandals.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/KeldonVandals.java @@ -28,8 +28,8 @@ package mage.sets.urzasdestiny; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/Metalworker.java b/Mage.Sets/src/mage/sets/urzasdestiny/Metalworker.java index 74084ec2a7b..419b870a195 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/Metalworker.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/Metalworker.java @@ -28,10 +28,10 @@ package mage.sets.urzasdestiny; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -41,6 +41,7 @@ import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterArtifactCard; import mage.game.Game; @@ -62,7 +63,7 @@ public class Metalworker extends CardImpl { this.toughness = new MageInt(2); // {tap}: Reveal any number of artifact cards in your hand. Add {2} to your mana pool for each card revealed this way. - this.addAbility(new SimpleManaAbility(Constants.Zone.BATTLEFIELD, new MetalworkerManaEffect(), new TapSourceCost())); + this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new MetalworkerManaEffect(), new TapSourceCost())); } public Metalworker(final Metalworker card) { diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/PlatedSpider.java b/Mage.Sets/src/mage/sets/urzasdestiny/PlatedSpider.java index d844ab8135c..e6b65587fc8 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/PlatedSpider.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/PlatedSpider.java @@ -28,8 +28,8 @@ package mage.sets.urzasdestiny; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/PlowUnder.java b/Mage.Sets/src/mage/sets/urzasdestiny/PlowUnder.java index 716fc2d60f1..14cb91c2a14 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/PlowUnder.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/PlowUnder.java @@ -28,8 +28,8 @@ package mage.sets.urzasdestiny; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetLandPermanent; diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/Solidarity.java b/Mage.Sets/src/mage/sets/urzasdestiny/Solidarity.java index 75794352fbe..a37b19ffada 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/Solidarity.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/Solidarity.java @@ -28,11 +28,12 @@ package mage.sets.urzasdestiny; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -47,7 +48,7 @@ public class Solidarity extends CardImpl { this.color.setWhite(true); // Creatures you control get +0/+5 until end of turn. - this.getSpellAbility().addEffect(new BoostControlledEffect(0, 5, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostControlledEffect(0, 5, Duration.EndOfTurn)); } public Solidarity(final Solidarity card) { diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/SquirmingMass.java b/Mage.Sets/src/mage/sets/urzasdestiny/SquirmingMass.java index 95e4e9fdd25..04b51f6d179 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/SquirmingMass.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/SquirmingMass.java @@ -28,8 +28,8 @@ package mage.sets.urzasdestiny; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/ThornElemental.java b/Mage.Sets/src/mage/sets/urzasdestiny/ThornElemental.java index 9305ef56ca8..f0d79bcc082 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/ThornElemental.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/ThornElemental.java @@ -28,8 +28,8 @@ package mage.sets.urzasdestiny; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DamageAsThoughNotBlockedAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/ThranDynamo.java b/Mage.Sets/src/mage/sets/urzasdestiny/ThranDynamo.java index 2042d0e18f5..e2360247a7b 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/ThranDynamo.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/ThranDynamo.java @@ -28,13 +28,14 @@ package mage.sets.urzasdestiny; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -47,7 +48,7 @@ public class ThranDynamo extends CardImpl { this.expansionSetCode = "UDS"; // {tap}: Add {3} to your mana pool. - this.addAbility(new SimpleManaAbility(Constants.Zone.BATTLEFIELD, Mana.ColorlessMana(3), new TapSourceCost())); + this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(3), new TapSourceCost())); } diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/ThranGolem.java b/Mage.Sets/src/mage/sets/urzasdestiny/ThranGolem.java index 3744f8a0b55..fb8347e54ef 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/ThranGolem.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/ThranGolem.java @@ -28,7 +28,7 @@ package mage.sets.urzasdestiny; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/TormentedAngel.java b/Mage.Sets/src/mage/sets/urzasdestiny/TormentedAngel.java index d8a17c78b7d..5a986ae08ce 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/TormentedAngel.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/TormentedAngel.java @@ -28,8 +28,8 @@ package mage.sets.urzasdestiny; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/Treachery.java b/Mage.Sets/src/mage/sets/urzasdestiny/Treachery.java index cebea46e1d1..4fa004a662d 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/Treachery.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/Treachery.java @@ -29,9 +29,8 @@ package mage.sets.urzasdestiny; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +39,8 @@ import mage.abilities.effects.common.UntapLandsEffect; import mage.abilities.effects.common.continious.ControlEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -59,13 +60,13 @@ public class Treachery extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // When Treachery enters the battlefield, untap up to five lands. this.addAbility(new EntersBattlefieldTriggeredAbility(new UntapLandsEffect(5))); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); } diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/WildColos.java b/Mage.Sets/src/mage/sets/urzasdestiny/WildColos.java index 3f03dbea5d7..76b136478ee 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/WildColos.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/WildColos.java @@ -28,8 +28,8 @@ package mage.sets.urzasdestiny; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/AboutFace.java b/Mage.Sets/src/mage/sets/urzaslegacy/AboutFace.java index 0ca0219f250..8d1f904614c 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/AboutFace.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/AboutFace.java @@ -29,9 +29,9 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.SwitchPowerToughnessTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/AngelicCurator.java b/Mage.Sets/src/mage/sets/urzaslegacy/AngelicCurator.java index c32db1a0fcc..6a0fdfa2713 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/AngelicCurator.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/AngelicCurator.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.ProtectionAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Anthroplasm.java b/Mage.Sets/src/mage/sets/urzaslegacy/Anthroplasm.java index 8cb4a86585f..9b3280175d7 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Anthroplasm.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Anthroplasm.java @@ -28,10 +28,10 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -41,6 +41,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -63,7 +64,7 @@ public class Anthroplasm extends CardImpl { // Anthroplasm enters the battlefield with two +1/+1 counters on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), "with two +1/+1 counters on it")); // {X}, {tap}: Remove all +1/+1 counters from Anthroplasm and put X +1/+1 counters on it. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AnthroplasmEffect(), new ManaCostsImpl("{X}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AnthroplasmEffect(), new ManaCostsImpl("{X}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Archivist.java b/Mage.Sets/src/mage/sets/urzaslegacy/Archivist.java index 726e9df653d..a44734acd2d 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Archivist.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Archivist.java @@ -28,14 +28,15 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -53,7 +54,7 @@ public class Archivist extends CardImpl { this.toughness = new MageInt(1); //{T}: Draw a card. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new TapSourceCost())); } public Archivist(final Archivist card) { diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/AuraFlux.java b/Mage.Sets/src/mage/sets/urzaslegacy/AuraFlux.java index 28aad783809..3cf17f7ec3a 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/AuraFlux.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/AuraFlux.java @@ -28,9 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -59,8 +58,8 @@ public class AuraFlux extends CardImpl { this.color.setBlue(true); // Other enchantments have "At the beginning of your upkeep, sacrifice this enchantment unless you pay {2}." - Ability gainedAbility = new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new GenericManaCost(2)), Constants.TargetController.YOU, false); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAllEffect(gainedAbility, Constants.Duration.WhileOnBattlefield, filter, true))); + Ability gainedAbility = new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new GenericManaCost(2)), TargetController.YOU, false); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(gainedAbility, Duration.WhileOnBattlefield, filter, true))); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/AvalancheRiders.java b/Mage.Sets/src/mage/sets/urzaslegacy/AvalancheRiders.java index 181b3465cb5..3c7b2b88bc5 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/AvalancheRiders.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/AvalancheRiders.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/BlessedReversal.java b/Mage.Sets/src/mage/sets/urzaslegacy/BlessedReversal.java index 45bbde0fa43..bb9597cf004 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/BlessedReversal.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/BlessedReversal.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/BloatedToad.java b/Mage.Sets/src/mage/sets/urzaslegacy/BloatedToad.java index a9d54782148..09bd59012b9 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/BloatedToad.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/BloatedToad.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/BoneShredder.java b/Mage.Sets/src/mage/sets/urzaslegacy/BoneShredder.java index 556fb9f0f5d..51fdf838bc8 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/BoneShredder.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/BoneShredder.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/BouncingBeebles.java b/Mage.Sets/src/mage/sets/urzaslegacy/BouncingBeebles.java index d457a89b1c7..22081455c23 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/BouncingBeebles.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/BouncingBeebles.java @@ -29,9 +29,9 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.DefendingPlayerControlsCondition; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/BrinkOfMadness.java b/Mage.Sets/src/mage/sets/urzaslegacy/BrinkOfMadness.java index fcd92c9eac2..9b3bc90b3c5 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/BrinkOfMadness.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/BrinkOfMadness.java @@ -29,9 +29,8 @@ package mage.sets.urzaslegacy; import java.util.Set; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -58,7 +57,7 @@ public class BrinkOfMadness extends CardImpl { this.color.setBlack(true); // At the beginning of your upkeep, if you have no cards in hand, sacrifice Brink of Madness and target opponent discards his or her hand. - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(Constants.Zone.BATTLEFIELD, new SacrificeSourceEffect(), Constants.TargetController.YOU, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceEffect(), TargetController.YOU, false); ability.addEffect(new BrinkOfMadnessEffect()); ability.addTarget(new TargetOpponent()); CardsInHandCondition contition = new CardsInHandCondition(CardsInHandCondition.CountType.EQUAL_TO, 0); @@ -78,7 +77,7 @@ public class BrinkOfMadness extends CardImpl { class BrinkOfMadnessEffect extends OneShotEffect { public BrinkOfMadnessEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); this.staticText = "Target player discards his or her hand"; } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/BurstOfEnergy.java b/Mage.Sets/src/mage/sets/urzaslegacy/BurstOfEnergy.java index 0d074a37eaa..7257f215ab2 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/BurstOfEnergy.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/BurstOfEnergy.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.UntapTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPermanent; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Cessation.java b/Mage.Sets/src/mage/sets/urzaslegacy/Cessation.java index fc44a2f78f2..0ba58443ed2 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Cessation.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Cessation.java @@ -29,9 +29,7 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -60,11 +58,11 @@ public class Cessation extends CardImpl { //Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Detriment)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); //Enchanted creature can't attack. Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new CessationEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CessationEffect())); //When Cessation is put into a graveyard from the battlefield, return Cessation to its owner's hand. this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new ReturnToHandSourceEffect())); } @@ -82,7 +80,7 @@ public class Cessation extends CardImpl { class CessationEffect extends RestrictionEffect { public CessationEffect() { - super(Constants.Duration.WhileOnBattlefield); + super(Duration.WhileOnBattlefield); staticText = "Enchanted creature can't attack"; } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/CloudOfFaeries.java b/Mage.Sets/src/mage/sets/urzaslegacy/CloudOfFaeries.java index a2e79251427..92d33d31b55 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/CloudOfFaeries.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/CloudOfFaeries.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/CropRotation.java b/Mage.Sets/src/mage/sets/urzaslegacy/CropRotation.java index 19c98068f20..7a98f883710 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/CropRotation.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/CropRotation.java @@ -28,9 +28,9 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/DarkwatchElves.java b/Mage.Sets/src/mage/sets/urzaslegacy/DarkwatchElves.java index 8f8057c0b1f..94bd1fe6720 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/DarkwatchElves.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/DarkwatchElves.java @@ -27,8 +27,8 @@ */ package mage.sets.urzaslegacy; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/DefenderOfChaos.java b/Mage.Sets/src/mage/sets/urzaslegacy/DefenderOfChaos.java index 549c37c2f39..9fea1fddaac 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/DefenderOfChaos.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/DefenderOfChaos.java @@ -27,8 +27,8 @@ */ package mage.sets.urzaslegacy; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.FlashAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/DefenderOfLaw.java b/Mage.Sets/src/mage/sets/urzaslegacy/DefenderOfLaw.java index 381f19bbb09..253afedd7a8 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/DefenderOfLaw.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/DefenderOfLaw.java @@ -27,8 +27,8 @@ */ package mage.sets.urzaslegacy; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.FlashAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/DefenseOfTheHeart.java b/Mage.Sets/src/mage/sets/urzaslegacy/DefenseOfTheHeart.java index 8955c429256..dcd0815642a 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/DefenseOfTheHeart.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/DefenseOfTheHeart.java @@ -29,9 +29,8 @@ package mage.sets.urzaslegacy; import java.util.Set; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -58,8 +57,8 @@ public class DefenseOfTheHeart extends CardImpl { this.color.setGreen(true); // At the beginning of your upkeep, if an opponent controls three or more creatures, sacrifice Defense of the Heart, search your library for up to two creature cards, and put those cards onto the battlefield. Then shuffle your library. - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(Constants.Zone.BATTLEFIELD, new SacrificeSourceEffect(), Constants.TargetController.YOU, false); - ability.addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 2, new FilterCreatureCard()), false, Constants.Outcome.PutLandInPlay)); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceEffect(), TargetController.YOU, false); + ability.addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 2, new FilterCreatureCard()), false, Outcome.PutLandInPlay)); DefenseOfTheHeartCondition contition = new DefenseOfTheHeartCondition(); this.addAbility(new ConditionalTriggeredAbility(ability, contition, "At the beginning of your upkeep, if an opponent controls three or more creatures, sacrifice {this}, search your library for up to two creature cards, and put those cards onto the battlefield. Then shuffle your library")); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/DelusionsOfMediocrity.java b/Mage.Sets/src/mage/sets/urzaslegacy/DelusionsOfMediocrity.java index 9bcb0d5a83e..ae043a40bb2 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/DelusionsOfMediocrity.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/DelusionsOfMediocrity.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.LeavesBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/DerangedHermit.java b/Mage.Sets/src/mage/sets/urzaslegacy/DerangedHermit.java index 76178943ebb..5d8e4b5766c 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/DerangedHermit.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/DerangedHermit.java @@ -28,10 +28,10 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/DevoutHarpist.java b/Mage.Sets/src/mage/sets/urzaslegacy/DevoutHarpist.java index 919eb1df0bb..5eb4328ee69 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/DevoutHarpist.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/DevoutHarpist.java @@ -28,9 +28,9 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/EngineeredPlague.java b/Mage.Sets/src/mage/sets/urzaslegacy/EngineeredPlague.java index db35272c058..fd7259bb20e 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/EngineeredPlague.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/EngineeredPlague.java @@ -28,9 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; @@ -60,7 +59,7 @@ public class EngineeredPlague extends CardImpl { // As Engineered Plague enters the battlefield, choose a creature type. this.addAbility(new AsEntersBattlefieldAbility(new EngineeredPlagueEntersBattlefieldEffect(), "choose a creature type")); // All creatures of the chosen type get -1/-1. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostAllEffect(-1, -1, Constants.Duration.WhileOnBattlefield, new FilterEngineeredPlague(), false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(-1, -1, Duration.WhileOnBattlefield, new FilterEngineeredPlague(), false))); } public EngineeredPlague(final EngineeredPlague card) { @@ -75,7 +74,7 @@ public class EngineeredPlague extends CardImpl { class EngineeredPlagueEntersBattlefieldEffect extends OneShotEffect { public EngineeredPlagueEntersBattlefieldEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "As {this} enters the battlefield, choose a creature type"; } @@ -91,7 +90,7 @@ public class EngineeredPlague extends CardImpl { Choice typeChoice = new ChoiceImpl(true); typeChoice.setMessage("Choose creature type"); typeChoice.setChoices(CardRepository.instance.getCreatureTypes()); - while (!player.choose(Constants.Outcome.Detriment, typeChoice, game)) { + while (!player.choose(Outcome.Detriment, typeChoice, game)) { game.debugMessage("player canceled choosing type. retrying."); } game.informPlayers(permanent.getName() + ": " + player.getName() + " has chosen " + typeChoice.getChoice()); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Erase.java b/Mage.Sets/src/mage/sets/urzaslegacy/Erase.java index 99eefbc1054..0cf88209f47 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Erase.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Erase.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Eviscerator.java b/Mage.Sets/src/mage/sets/urzaslegacy/Eviscerator.java index a96e1b3a31e..04f269aff98 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Eviscerator.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Eviscerator.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/ExpendableTroops.java b/Mage.Sets/src/mage/sets/urzaslegacy/ExpendableTroops.java index dcd05a6c4d0..961b222d24e 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/ExpendableTroops.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/ExpendableTroops.java @@ -28,9 +28,9 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +38,7 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterAttackingOrBlockingCreature; import mage.target.common.TargetCreaturePermanent; @@ -58,7 +59,7 @@ public class ExpendableTroops extends CardImpl { this.toughness = new MageInt(1); // {tap}, Sacrifice Expendable Troops: Expendable Troops deals 2 damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(new FilterAttackingOrBlockingCreature())); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/FogOfGnats.java b/Mage.Sets/src/mage/sets/urzaslegacy/FogOfGnats.java index 0a45e6ad864..68acdd51a72 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/FogOfGnats.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/FogOfGnats.java @@ -28,9 +28,9 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/FranticSearch.java b/Mage.Sets/src/mage/sets/urzaslegacy/FranticSearch.java index 48cb4ac19df..78225e1f969 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/FranticSearch.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/FranticSearch.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DiscardControllerEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.UntapLandsEffect; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/GangOfElk.java b/Mage.Sets/src/mage/sets/urzaslegacy/GangOfElk.java index 728e55d308c..a3b5a117509 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/GangOfElk.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/GangOfElk.java @@ -28,13 +28,14 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BecomesBlockedByCreatureTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -53,7 +54,7 @@ public class GangOfElk extends CardImpl { this.toughness = new MageInt(4); // Whenever Gang of Elk becomes blocked, it gets +2/+2 until end of turn for each creature blocking it. - this.addAbility(new BecomesBlockedByCreatureTriggeredAbility(new BoostSourceEffect(2, 2, Constants.Duration.EndOfTurn), false)); + this.addAbility(new BecomesBlockedByCreatureTriggeredAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), false)); } public GangOfElk(final GangOfElk card) { diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/GhituSlinger.java b/Mage.Sets/src/mage/sets/urzaslegacy/GhituSlinger.java index a0b25bc0f14..afd70c41c56 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/GhituSlinger.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/GhituSlinger.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/GhituWarCry.java b/Mage.Sets/src/mage/sets/urzaslegacy/GhituWarCry.java index 650278ae8ef..02225152af9 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/GhituWarCry.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/GhituWarCry.java @@ -28,10 +28,10 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/GoblinMedics.java b/Mage.Sets/src/mage/sets/urzaslegacy/GoblinMedics.java index 87e9a450c64..72c54d8ebaa 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/GoblinMedics.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/GoblinMedics.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BecomesTappedTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/GoblinWelder.java b/Mage.Sets/src/mage/sets/urzaslegacy/GoblinWelder.java index 74f26d3c8fb..7d0642df0c5 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/GoblinWelder.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/GoblinWelder.java @@ -28,9 +28,9 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -39,6 +39,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterArtifactCard; import mage.filter.common.FilterArtifactPermanent; import mage.game.Game; @@ -65,7 +67,7 @@ public class GoblinWelder extends CardImpl { this.toughness = new MageInt(1); // {tap}: Choose target artifact a player controls and target artifact card in that player's graveyard. If both targets are still legal as this ability resolves, that player simultaneously sacrifices the artifact and returns the artifact card to the battlefield. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GoblinWelderEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GoblinWelderEffect(), new TapSourceCost()); ability.addTarget(new TargetArtifactPermanent(new FilterArtifactPermanent("artifact a player controls"))); ability.addTarget(new GoblinWelderTarget()); this.addAbility(ability); @@ -85,7 +87,7 @@ public class GoblinWelder extends CardImpl { public class GoblinWelderEffect extends OneShotEffect { public GoblinWelderEffect() { - super(Constants.Outcome.PutCardInPlay); + super(Outcome.PutCardInPlay); } public GoblinWelderEffect(final GoblinWelderEffect effect) { @@ -99,8 +101,8 @@ public class GoblinWelder extends CardImpl { if (artifact != null && card != null) { - Constants.Zone currentZone = game.getState().getZone(card.getId()); - if(artifact.getCardType().contains(CardType.ARTIFACT) && card.getCardType().contains(CardType.ARTIFACT) && currentZone == Constants.Zone.GRAVEYARD && card.getOwnerId().equals(artifact.getControllerId())) + Zone currentZone = game.getState().getZone(card.getId()); + if(artifact.getCardType().contains(CardType.ARTIFACT) && card.getCardType().contains(CardType.ARTIFACT) && currentZone == Zone.GRAVEYARD && card.getOwnerId().equals(artifact.getControllerId())) { boolean sacrifice = artifact.sacrifice(source.getId(), game); boolean putOnBF = card.putOntoBattlefield(game, currentZone, source.getId(), card.getOwnerId()); @@ -127,7 +129,7 @@ public class GoblinWelder extends CardImpl { class GoblinWelderTarget extends TargetCard { public GoblinWelderTarget() { - super(1, 1, Constants.Zone.GRAVEYARD, new FilterArtifactCard()); + super(1, 1, Zone.GRAVEYARD, new FilterArtifactCard()); targetName = "target artifact card in that player's graveyard"; } @@ -142,7 +144,7 @@ public class GoblinWelder extends CardImpl { Player player = game.getPlayer(artifact.getControllerId()); Card card = game.getCard(id); - if (card != null && player != null && game.getState().getZone(card.getId()) == Constants.Zone.GRAVEYARD) + if (card != null && player != null && game.getState().getZone(card.getId()) == Zone.GRAVEYARD) { if (player.getGraveyard().contains(id)) { diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/GraniteGrip.java b/Mage.Sets/src/mage/sets/urzaslegacy/GraniteGrip.java index ce333529ced..0d51ade2977 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/GraniteGrip.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/GraniteGrip.java @@ -28,9 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.AttachEffect; @@ -53,7 +52,7 @@ public class GraniteGrip extends CardImpl { static { filter.add(new SubtypePredicate("Mountain")); - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public GraniteGrip(UUID ownerId) { @@ -66,13 +65,13 @@ public class GraniteGrip extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); // Enchanted creature gets +1/+0 for each Mountain you control. - SimpleStaticAbility ability = new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, + SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(new PermanentsOnBattlefieldCount(filter, 1), new PermanentsOnBattlefieldCount(filter, 0), - Constants.Duration.WhileOnBattlefield)); + Duration.WhileOnBattlefield)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/GrimMonolith.java b/Mage.Sets/src/mage/sets/urzaslegacy/GrimMonolith.java index 886672640b2..7b68aab1740 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/GrimMonolith.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/GrimMonolith.java @@ -28,9 +28,9 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +40,7 @@ import mage.abilities.effects.common.SkipUntapSourceEffect; import mage.abilities.effects.common.UntapSourceEffect; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -52,11 +53,11 @@ public class GrimMonolith extends CardImpl { this.expansionSetCode = "ULG"; // Grim Monolith doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new SkipUntapSourceEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipUntapSourceEffect())); // {tap}: Add {3} to your mana pool. - this.addAbility(new SimpleManaAbility(Constants.Zone.BATTLEFIELD, Mana.ColorlessMana(3), new TapSourceCost())); + this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(3), new TapSourceCost())); // {4}: Untap Grim Monolith. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl("{4}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl("{4}"))); } public GrimMonolith(final GrimMonolith card) { diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/HarmonicConvergence.java b/Mage.Sets/src/mage/sets/urzaslegacy/HarmonicConvergence.java index 61c3efd8772..3ed007c5ba1 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/HarmonicConvergence.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/HarmonicConvergence.java @@ -31,10 +31,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/HopeAndGlory.java b/Mage.Sets/src/mage/sets/urzaslegacy/HopeAndGlory.java index 6cf211ec862..80d6824d2af 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/HopeAndGlory.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/HopeAndGlory.java @@ -28,12 +28,13 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -50,7 +51,7 @@ public class HopeAndGlory extends CardImpl { // Untap two target creatures. Each of them gets +1/+1 until end of turn. this.getSpellAbility().addEffect(new UntapTargetEffect()); - this.getSpellAbility().addEffect(new BoostTargetEffect(1, 1, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(1, 1, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent(2)); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/ImpendingDisaster.java b/Mage.Sets/src/mage/sets/urzaslegacy/ImpendingDisaster.java index 4e76add17de..0c9d12b8243 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/ImpendingDisaster.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/ImpendingDisaster.java @@ -28,9 +28,9 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -39,6 +39,8 @@ import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.DestroyAllEffect; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.game.Game; @@ -55,7 +57,7 @@ public class ImpendingDisaster extends CardImpl { this.color.setRed(true); // At the beginning of your upkeep, if there are seven or more lands on the battlefield, sacrifice Impending Disaster and destroy all lands. - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(Constants.Zone.BATTLEFIELD, new SacrificeSourceEffect(), Constants.TargetController.YOU, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceEffect(), TargetController.YOU, false); ability.addEffect(new DestroyAllEffect(new FilterLandPermanent())); ImpendingDisasterCondition contition = new ImpendingDisasterCondition(); this.addAbility(new ConditionalTriggeredAbility(ability, contition, "At the beginning of your upkeep, if there are seven or more lands on the battlefield, sacrifice {this} and destroy all lands")); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Intervene.java b/Mage.Sets/src/mage/sets/urzaslegacy/Intervene.java index dae43ebf933..9003f3a4918 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Intervene.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Intervene.java @@ -30,12 +30,13 @@ package mage.sets.urzaslegacy; import java.util.HashSet; import java.util.Set; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.Filter; import mage.filter.FilterSpell; import mage.game.Game; @@ -75,7 +76,7 @@ public class Intervene extends CardImpl { public InterveneTargetSpell() { - super(1, Constants.Zone.STACK); + super(1, Zone.STACK); this.targetName = "spell that targets a creature"; } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/IronMaiden.java b/Mage.Sets/src/mage/sets/urzaslegacy/IronMaiden.java index 157ef5c983b..0994f7c712e 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/IronMaiden.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/IronMaiden.java @@ -28,14 +28,16 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.game.Game; import mage.players.Player; @@ -50,7 +52,7 @@ public class IronMaiden extends CardImpl { this.expansionSetCode = "ULG"; // At the beginning of each opponent's upkeep, Iron Maiden deals X damage to that player, where X is the number of cards in his or her hand minus 4. - Ability ability = new BeginningOfUpkeepTriggeredAbility(new IronMaidenEffect(), Constants.TargetController.OPPONENT, false); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new IronMaidenEffect(), TargetController.OPPONENT, false); this.addAbility(ability); } @@ -74,7 +76,7 @@ class IronMaidenEffect extends OneShotEffect { } public IronMaidenEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); } @Override diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/IronWill.java b/Mage.Sets/src/mage/sets/urzaslegacy/IronWill.java index ff5507cf1b2..0dcf55a7317 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/IronWill.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/IronWill.java @@ -28,9 +28,9 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.CyclingAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/JhoirasToolbox.java b/Mage.Sets/src/mage/sets/urzaslegacy/JhoirasToolbox.java index 5b619750502..cef77ed4f67 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/JhoirasToolbox.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/JhoirasToolbox.java @@ -28,15 +28,16 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCreaturePermanent; @@ -62,7 +63,7 @@ public class JhoirasToolbox extends CardImpl { this.toughness = new MageInt(1); // {2}: Regenerate target artifact creature. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{2}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{2}")); ability.addTarget(new TargetCreaturePermanent(filer)); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/KarmicGuide.java b/Mage.Sets/src/mage/sets/urzaslegacy/KarmicGuide.java index a351761791c..8d7030487b7 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/KarmicGuide.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/KarmicGuide.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/KingCrab.java b/Mage.Sets/src/mage/sets/urzaslegacy/KingCrab.java index d5e4f460643..73b31fc4c97 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/KingCrab.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/KingCrab.java @@ -28,9 +28,9 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Knighthood.java b/Mage.Sets/src/mage/sets/urzaslegacy/Knighthood.java index 1c4f6f32d30..256b6b095aa 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Knighthood.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Knighthood.java @@ -28,10 +28,10 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/LoneWolf.java b/Mage.Sets/src/mage/sets/urzaslegacy/LoneWolf.java index b76b658afd9..b4483b77b66 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/LoneWolf.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/LoneWolf.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DamageAsThoughNotBlockedAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/MemoryJar.java b/Mage.Sets/src/mage/sets/urzaslegacy/MemoryJar.java index b27fe68b38c..9c71e2baa9f 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/MemoryJar.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/MemoryJar.java @@ -29,10 +29,10 @@ package mage.sets.urzaslegacy; import java.util.Iterator; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +44,7 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -64,7 +65,7 @@ public class MemoryJar extends CardImpl { // {tap}, Sacrifice Memory Jar: Each player exiles all cards from his or her hand face down and draws seven cards. // At the beginning of the next end step, each player discards his or her hand and returns to his or her hand each //card he or she exiled this way. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new MemoryJarEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MemoryJarEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); @@ -171,7 +172,7 @@ class MemoryJarDelayedEffect extends OneShotEffect { //Return to hand for (Iterator it = cards.getCards(game).iterator(); it.hasNext();) { Card card = it.next(); - card.moveToZone(Constants.Zone.HAND, source.getSourceId(), game, true); + card.moveToZone(Zone.HAND, source.getSourceId(), game, true); } return true; } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Miscalculation.java b/Mage.Sets/src/mage/sets/urzaslegacy/Miscalculation.java index 8909c335e89..44a259efb3b 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Miscalculation.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Miscalculation.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CounterUnlessPaysEffect; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/MoltenHydra.java b/Mage.Sets/src/mage/sets/urzaslegacy/MoltenHydra.java index d665b5b307d..7e18ebfd448 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/MoltenHydra.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/MoltenHydra.java @@ -28,9 +28,9 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +42,7 @@ import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.Counter; import mage.counters.CounterType; import mage.game.Game; @@ -66,9 +67,9 @@ public class MoltenHydra extends CardImpl { this.toughness = new MageInt(1); // {1}{R}{R}: Put a +1/+1 counter on Molten Hydra. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new ManaCostsImpl("{1}{R}{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new ManaCostsImpl("{1}{R}{R}"))); // {tap}, Remove all +1/+1 counters from Molten Hydra: Molten Hydra deals damage to target creature or player equal to the number of +1/+1 counters removed this way. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(new MotltenHydraDynamicValue()), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new MotltenHydraDynamicValue()), new TapSourceCost()); ability.addCost(new RemoveAllCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/MotherOfRunes.java b/Mage.Sets/src/mage/sets/urzaslegacy/MotherOfRunes.java index bd0c91b882c..10de6bb83b3 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/MotherOfRunes.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/MotherOfRunes.java @@ -29,9 +29,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.continious.GainProtectionFromColorTargetEffect; import mage.cards.CardImpl; import mage.choices.ChoiceColor; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -58,7 +59,7 @@ public class MotherOfRunes extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target creature you control gains protection from the color of your choice until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainProtectionFromColorTargetEffect(Constants.Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainProtectionFromColorTargetEffect(Duration.EndOfTurn), new TapSourceCost()); ability.addChoice(new ChoiceColor()); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/MultaniMaroSorcerer.java b/Mage.Sets/src/mage/sets/urzaslegacy/MultaniMaroSorcerer.java index cddc1e2fffd..20190eb453d 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/MultaniMaroSorcerer.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/MultaniMaroSorcerer.java @@ -28,9 +28,9 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -38,6 +38,8 @@ import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; @@ -60,7 +62,7 @@ public class MultaniMaroSorcerer extends CardImpl { // Shroud this.addAbility(ShroudAbility.getInstance()); // Multani, Maro-Sorcerer's power and toughness are each equal to the total number of cards in all players' hands. - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new CardsInHandCount(), Constants.Duration.EndOfGame))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new CardsInHandCount(), Duration.EndOfGame))); } public MultaniMaroSorcerer(final MultaniMaroSorcerer card) { diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/MultanisAcolyte.java b/Mage.Sets/src/mage/sets/urzaslegacy/MultanisAcolyte.java index 912e2846577..d1c82c6aded 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/MultanisAcolyte.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/MultanisAcolyte.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/NoMercy.java b/Mage.Sets/src/mage/sets/urzaslegacy/NoMercy.java index bca8bfafce6..4135be01717 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/NoMercy.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/NoMercy.java @@ -28,13 +28,14 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -68,7 +69,7 @@ public class NoMercy extends CardImpl { public class NoMercyTriggeredAbility extends TriggeredAbilityImpl { public NoMercyTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect()); + super(Zone.BATTLEFIELD, new DestroyTargetEffect()); } public NoMercyTriggeredAbility(final NoMercyTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Opportunity.java b/Mage.Sets/src/mage/sets/urzaslegacy/Opportunity.java index 974b1974b68..cef8713412f 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Opportunity.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Opportunity.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Ostracize.java b/Mage.Sets/src/mage/sets/urzaslegacy/Ostracize.java index 285ada30479..490e39f6626 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Ostracize.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Ostracize.java @@ -28,10 +28,10 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Palinchron.java b/Mage.Sets/src/mage/sets/urzaslegacy/Palinchron.java index f5b007b7b7b..4adbd45046c 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Palinchron.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Palinchron.java @@ -28,9 +28,9 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Parch.java b/Mage.Sets/src/mage/sets/urzaslegacy/Parch.java index b3969040d32..f72f7617fca 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Parch.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Parch.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.Mode; import mage.abilities.effects.common.DamageTargetEffect; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/PeaceAndQuiet.java b/Mage.Sets/src/mage/sets/urzaslegacy/PeaceAndQuiet.java index 7eff8a99705..300df7592c2 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/PeaceAndQuiet.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/PeaceAndQuiet.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterEnchantment; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianBroodlings.java b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianBroodlings.java index be4584c0a31..c3cc3be2a69 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianBroodlings.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianBroodlings.java @@ -28,9 +28,9 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDebaser.java b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDebaser.java index 02dc7b6c408..fac2bb7cc8b 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDebaser.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDebaser.java @@ -28,10 +28,10 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDefiler.java b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDefiler.java index 78e733a23b6..b7f365a57e7 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDefiler.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDefiler.java @@ -28,10 +28,10 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDenouncer.java b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDenouncer.java index 6e9d8bf3bf5..b3d6c47963e 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDenouncer.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDenouncer.java @@ -28,10 +28,10 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianPlaguelord.java b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianPlaguelord.java index 445003940c9..b54d226bf9d 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianPlaguelord.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianPlaguelord.java @@ -28,10 +28,10 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianReclamation.java b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianReclamation.java index 4ae4cf76369..8ff65ece447 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianReclamation.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianReclamation.java @@ -28,9 +28,9 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.PayLifeCost; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/PlanarCollapse.java b/Mage.Sets/src/mage/sets/urzaslegacy/PlanarCollapse.java index 97f81975eb7..377a454b118 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/PlanarCollapse.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/PlanarCollapse.java @@ -28,10 +28,10 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -39,6 +39,7 @@ import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.DestroyAllEffect; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -55,7 +56,7 @@ public class PlanarCollapse extends CardImpl { this.color.setWhite(true); // At the beginning of your upkeep, if there are four or more creatures on the battlefield, sacrifice Planar Collapse and destroy all creatures. They can't be regenerated. - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceEffect(), Constants.TargetController.YOU, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceEffect(), TargetController.YOU, false); ability.addEffect(new DestroyAllEffect(new FilterCreaturePermanent(), true)); PlanarCollapseCondition contition = new PlanarCollapseCondition(); this.addAbility(new ConditionalTriggeredAbility(ability, contition, "At the beginning of your upkeep, if there are four or more creatures on the battlefield, sacrifice {this} and destroy all creatures. They can't be regenerated")); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Purify.java b/Mage.Sets/src/mage/sets/urzaslegacy/Purify.java index 663098fd270..a9aa9c19984 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Purify.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Purify.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/PygmyPyrosaur.java b/Mage.Sets/src/mage/sets/urzaslegacy/PygmyPyrosaur.java index cc7f101b2da..2b3c3921cc9 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/PygmyPyrosaur.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/PygmyPyrosaur.java @@ -28,10 +28,10 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/RackAndRuin.java b/Mage.Sets/src/mage/sets/urzaslegacy/RackAndRuin.java index d1d6838b713..d465a3cc26e 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/RackAndRuin.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/RackAndRuin.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetArtifactPermanent; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/RadiantArchangel.java b/Mage.Sets/src/mage/sets/urzaslegacy/RadiantArchangel.java index 15498691b7e..d4da911eb71 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/RadiantArchangel.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/RadiantArchangel.java @@ -28,13 +28,13 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/RadiantsDragoons.java b/Mage.Sets/src/mage/sets/urzaslegacy/RadiantsDragoons.java index 887e141a23d..e8112300478 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/RadiantsDragoons.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/RadiantsDragoons.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/RadiantsJudgment.java b/Mage.Sets/src/mage/sets/urzaslegacy/RadiantsJudgment.java index 5b73e359259..ec634881b34 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/RadiantsJudgment.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/RadiantsJudgment.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.CyclingAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Rancor.java b/Mage.Sets/src/mage/sets/urzaslegacy/Rancor.java index d933064eaa5..eda573f85cb 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Rancor.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Rancor.java @@ -27,9 +27,7 @@ */ package mage.sets.urzaslegacy; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -60,13 +58,13 @@ public class Rancor extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature gets +2/+0 and has trample. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 0))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 0))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA))); // When Rancor is put into a graveyard from the battlefield, return Rancor to its owner's hand. this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new ReturnToHandSourceEffect())); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/RankAndFile.java b/Mage.Sets/src/mage/sets/urzaslegacy/RankAndFile.java index 38d5d5fc0b9..3d4d895159a 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/RankAndFile.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/RankAndFile.java @@ -28,9 +28,9 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/RavenFamiliar.java b/Mage.Sets/src/mage/sets/urzaslegacy/RavenFamiliar.java index a773e44843c..1b5678f8a30 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/RavenFamiliar.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/RavenFamiliar.java @@ -28,9 +28,9 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +41,8 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.game.Game; import mage.players.Player; @@ -82,7 +84,7 @@ public class RavenFamiliar extends CardImpl { class RavenFamiliarEffect extends OneShotEffect { public RavenFamiliarEffect() { - super(Constants.Outcome.DrawCard); + super(Outcome.DrawCard); this.staticText = "look at the top three cards of your library. Put one of them into your hand and the rest on the bottom of your library in any order"; } @@ -98,40 +100,40 @@ public class RavenFamiliar extends CardImpl { @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); - Cards cards = new CardsImpl(Constants.Zone.PICK); + Cards cards = new CardsImpl(Zone.PICK); int count = Math.min(player.getLibrary().size(), 3); for (int i = 0; i < count; i++) { Card card = player.getLibrary().removeFromTop(game); if (card != null) { cards.add(card); - game.setZone(card.getId(), Constants.Zone.PICK); + game.setZone(card.getId(), Zone.PICK); } } player.lookAtCards("Raven Familiar", cards, game); - TargetCard target = new TargetCard(Constants.Zone.PICK, new FilterCard("card to put into your hand")); - if (player.choose(Constants.Outcome.DrawCard, cards, target, game)) { + TargetCard target = new TargetCard(Zone.PICK, new FilterCard("card to put into your hand")); + if (player.choose(Outcome.DrawCard, cards, target, game)) { Card card = cards.get(target.getFirstTarget(), game); if (card != null) { cards.remove(card); - card.moveToZone(Constants.Zone.HAND, source.getId(), game, false); + card.moveToZone(Zone.HAND, source.getId(), game, false); } } - target = new TargetCard(Constants.Zone.PICK, new FilterCard("card to put on the bottom of your library")); + target = new TargetCard(Zone.PICK, new FilterCard("card to put on the bottom of your library")); target.setRequired(true); while (cards.size() > 1) { - player.choose(Constants.Outcome.Neutral, cards, target, game); + player.choose(Outcome.Neutral, cards, target, game); Card card = cards.get(target.getFirstTarget(), game); if (card != null) { cards.remove(card); - card.moveToZone(Constants.Zone.LIBRARY, source.getId(), game, false); + card.moveToZone(Zone.LIBRARY, source.getId(), game, false); } target.clearChosen(); } if (cards.size() == 1) { Card card = cards.get(cards.iterator().next(), game); - card.moveToZone(Constants.Zone.LIBRARY, source.getId(), game, false); + card.moveToZone(Zone.LIBRARY, source.getId(), game, false); } return true; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Rebuild.java b/Mage.Sets/src/mage/sets/urzaslegacy/Rebuild.java index be0a8167adc..c7187ad751c 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Rebuild.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Rebuild.java @@ -28,14 +28,16 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.CyclingAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterArtifactPermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -70,7 +72,7 @@ public class Rebuild extends CardImpl { class RebuildEffect extends OneShotEffect { public RebuildEffect() { - super(Constants.Outcome.ReturnToHand); + super(Outcome.ReturnToHand); staticText = "Return all artifacts to their owner's hand."; } @@ -81,7 +83,7 @@ class RebuildEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { for (Permanent creature : game.getBattlefield().getActivePermanents(new FilterArtifactPermanent(), source.getControllerId(), source.getSourceId(), game)) { - creature.moveToZone(Constants.Zone.HAND, source.getSourceId(), game, true); + creature.moveToZone(Zone.HAND, source.getSourceId(), game, true); } return true; } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Repopulate.java b/Mage.Sets/src/mage/sets/urzaslegacy/Repopulate.java index 56c3b71f8ce..44385b17889 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Repopulate.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Repopulate.java @@ -29,15 +29,17 @@ package mage.sets.urzaslegacy; import java.util.Set; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.CyclingAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.players.Player; @@ -75,7 +77,7 @@ public class Repopulate extends CardImpl { class RepopulateEffect extends OneShotEffect { RepopulateEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "Shuffle all creature cards from target player's graveyard into that player's library"; } @@ -90,7 +92,7 @@ class RepopulateEffect extends OneShotEffect { Set cards = player.getGraveyard().getCards(new FilterCreatureCard(), game); for(Card card : cards) { - card.moveToZone(Constants.Zone.LIBRARY, source.getId(), game, true); + card.moveToZone(Zone.LIBRARY, source.getId(), game, true); } player.shuffleLibrary(game); return true; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/RingOfGix.java b/Mage.Sets/src/mage/sets/urzaslegacy/RingOfGix.java index 1702d9cb61f..42ed8317a0c 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/RingOfGix.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/RingOfGix.java @@ -28,9 +28,9 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Rivalry.java b/Mage.Sets/src/mage/sets/urzaslegacy/Rivalry.java index 68c55d991cb..253804b10b1 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Rivalry.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Rivalry.java @@ -28,13 +28,14 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterLandPermanent; import mage.game.Game; @@ -75,7 +76,7 @@ class RivalryTriggeredAbility extends TriggeredAbilityImpl { this.color.setBlue(true); // At the beginning of your upkeep, if you have 5 or less life, sacrifice Second Chance and take an extra turn after this one. - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceEffect(), Constants.TargetController.YOU, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceEffect(), TargetController.YOU, false); ability.addEffect(new AddExtraTurnControllerEffect()); this.addAbility(new ConditionalTriggeredAbility(ability, new FiveOrLessLifeCondition(), "At the beginning of your upkeep, if you have 5 or less life, sacrifice {this} and take an extra turn after this one")); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/ShivanPhoenix.java b/Mage.Sets/src/mage/sets/urzaslegacy/ShivanPhoenix.java index 0e27b142636..7692188ec00 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/ShivanPhoenix.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/ShivanPhoenix.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.ReturnToHandSourceEffect; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/SickAndTired.java b/Mage.Sets/src/mage/sets/urzaslegacy/SickAndTired.java index 87525c66ded..855fdff0f1c 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/SickAndTired.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/SickAndTired.java @@ -28,9 +28,9 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/SilkNet.java b/Mage.Sets/src/mage/sets/urzaslegacy/SilkNet.java index c1c9a5c111f..453684b5bd6 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/SilkNet.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/SilkNet.java @@ -28,9 +28,9 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.ReachAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/SimianGrunts.java b/Mage.Sets/src/mage/sets/urzaslegacy/SimianGrunts.java index 07c90104977..e3f9ffcfc9f 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/SimianGrunts.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/SimianGrunts.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.EchoAbility; import mage.abilities.keyword.FlashAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/SleepersGuile.java b/Mage.Sets/src/mage/sets/urzaslegacy/SleepersGuile.java index f98ebc51afe..bdef4eb546c 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/SleepersGuile.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/SleepersGuile.java @@ -28,11 +28,11 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/SlowMotion.java b/Mage.Sets/src/mage/sets/urzaslegacy/SlowMotion.java index 7dbb8657ac4..9ca5bc315d9 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/SlowMotion.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/SlowMotion.java @@ -28,9 +28,9 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; @@ -41,6 +41,8 @@ import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -63,12 +65,12 @@ public class SlowMotion extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // At the beginning of the upkeep of enchanted creature's controller, that player sacrifices that creature unless he or she pays {2}. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeEquipedUnlessPaysEffect(new GenericManaCost(2)), Constants.TargetController.CONTROLLER_ATTACHED_TO, false )); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeEquipedUnlessPaysEffect(new GenericManaCost(2)), TargetController.CONTROLLER_ATTACHED_TO, false )); // When Slow Motion is put into a graveyard from the battlefield, return Slow Motion to its owner's hand. this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new ReturnToHandSourceEffect())); @@ -88,7 +90,7 @@ class SacrificeEquipedUnlessPaysEffect extends OneShotEffect { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Snap.java b/Mage.Sets/src/mage/sets/urzaslegacy/Snap.java index 46f32d86463..3fa3aff44f6 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Snap.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Snap.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.effects.common.UntapLandsEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Subversion.java b/Mage.Sets/src/mage/sets/urzaslegacy/Subversion.java index 3cb9e3a66e8..f53f5c4b270 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Subversion.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Subversion.java @@ -28,14 +28,15 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.game.Game; /** @@ -51,7 +52,7 @@ public class Subversion extends CardImpl { this.color.setBlack(true); // At the beginning of your upkeep, each opponent loses 1 life. You gain life equal to the life lost this way. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SubversionEffect(), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SubversionEffect(), TargetController.YOU, false)); } public Subversion(final Subversion card) { diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/SustainerOfTheRealm.java b/Mage.Sets/src/mage/sets/urzaslegacy/SustainerOfTheRealm.java index 992e577184b..51562c2b452 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/SustainerOfTheRealm.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/SustainerOfTheRealm.java @@ -28,9 +28,9 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/TetheredSkirge.java b/Mage.Sets/src/mage/sets/urzaslegacy/TetheredSkirge.java index 567f4ca072d..00380fe781a 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/TetheredSkirge.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/TetheredSkirge.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BecomesTargetTriggeredAbility; import mage.abilities.effects.common.LoseLifeSourceEffect; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/ThornwindFaeries.java b/Mage.Sets/src/mage/sets/urzaslegacy/ThornwindFaeries.java index 2090da089cb..66fa92a5154 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/ThornwindFaeries.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/ThornwindFaeries.java @@ -28,9 +28,9 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/ThranLens.java b/Mage.Sets/src/mage/sets/urzaslegacy/ThranLens.java index 6c829636c3d..432412ebf05 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/ThranLens.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/ThranLens.java @@ -28,9 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -49,7 +48,7 @@ public class ThranLens extends CardImpl { super(ownerId, 133, "Thran Lens", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "ULG"; // All permanents are colorless. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ThranLensEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ThranLensEffect())); } public ThranLens(final ThranLens card) { @@ -69,7 +68,7 @@ public class ThranLens extends CardImpl { public ThranLensEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Layer.ColorChangingEffects_5, Constants.SubLayer.NA, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Layer.ColorChangingEffects_5, SubLayer.NA, Outcome.Benefit); staticText = "All permanents are colorless"; } @Override diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/ThranWarMachine.java b/Mage.Sets/src/mage/sets/urzaslegacy/ThranWarMachine.java index c6309d86d4c..a21a13f6e16 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/ThranWarMachine.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/ThranWarMachine.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.keyword.EchoAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/ThranWeaponry.java b/Mage.Sets/src/mage/sets/urzaslegacy/ThranWeaponry.java index bb34de1ce47..d21421fe7d3 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/ThranWeaponry.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/ThranWeaponry.java @@ -28,10 +28,10 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SkipUntapOptionalAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/TickingGnomes.java b/Mage.Sets/src/mage/sets/urzaslegacy/TickingGnomes.java index 4513c75b54b..1b53f773581 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/TickingGnomes.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/TickingGnomes.java @@ -28,9 +28,9 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +38,7 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.EchoAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; /** @@ -57,7 +58,7 @@ public class TickingGnomes extends CardImpl { // Echo {3} this.addAbility(new EchoAbility("{3}")); // Sacrifice Ticking Gnomes: Ticking Gnomes deals 1 damage to target creature or player. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Tinker.java b/Mage.Sets/src/mage/sets/urzaslegacy/Tinker.java index 62e67d37026..bfb02153311 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Tinker.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Tinker.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/TragicPoet.java b/Mage.Sets/src/mage/sets/urzaslegacy/TragicPoet.java index 0d030253c82..8cbd9013415 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/TragicPoet.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/TragicPoet.java @@ -28,9 +28,9 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/TreefolkMystic.java b/Mage.Sets/src/mage/sets/urzaslegacy/TreefolkMystic.java index ee9b4a9afcc..09c6ee71be2 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/TreefolkMystic.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/TreefolkMystic.java @@ -29,15 +29,16 @@ package mage.sets.urzaslegacy; import java.util.LinkedList; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.BlocksOrBecomesBlockedByCreatureTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; @@ -75,7 +76,7 @@ class TreefolkMysticEffect extends OneShotEffect { public TreefolkMysticEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); } public TreefolkMysticEffect(final TreefolkMysticEffect effect) { diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Unearth.java b/Mage.Sets/src/mage/sets/urzaslegacy/Unearth.java index b8da8fb95b9..b026b1d8e22 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Unearth.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Unearth.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.abilities.keyword.CyclingAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/UrzasBlueprints.java b/Mage.Sets/src/mage/sets/urzaslegacy/UrzasBlueprints.java index bee109c342d..edc76df337d 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/UrzasBlueprints.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/UrzasBlueprints.java @@ -28,14 +28,15 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.keyword.EchoAbility; import mage.cards.CardImpl; +import mage.constants.Zone; /** * @@ -50,7 +51,7 @@ public class UrzasBlueprints extends CardImpl { // Echo {6} this.addAbility(new EchoAbility("{6}")); // {tap}: Draw a card. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new TapSourceCost())); } public UrzasBlueprints(final UrzasBlueprints card) { diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/ViashinoCutthroat.java b/Mage.Sets/src/mage/sets/urzaslegacy/ViashinoCutthroat.java index 0bc798a67cb..cfc64c8478b 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/ViashinoCutthroat.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/ViashinoCutthroat.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; import mage.abilities.effects.common.ReturnToHandSourceEffect; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/ViashinoHeretic.java b/Mage.Sets/src/mage/sets/urzaslegacy/ViashinoHeretic.java index 1c5decac691..e1fa46654d3 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/ViashinoHeretic.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/ViashinoHeretic.java @@ -28,9 +28,9 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -39,6 +39,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -60,7 +62,7 @@ public class ViashinoHeretic extends CardImpl { this.toughness = new MageInt(3); // {1}{R}, {tap}: Destroy target artifact. Viashino Heretic deals damage to that artifact's controller equal to the artifact's converted mana cost. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ViashinoHereticEffect(), new ManaCostsImpl("{1}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ViashinoHereticEffect(), new ManaCostsImpl("{1}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); @@ -80,7 +82,7 @@ class ViashinoHereticEffect extends OneShotEffect { public ViashinoHereticEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); } public ViashinoHereticEffect(final ViashinoHereticEffect effect) { diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/ViashinoSandscout.java b/Mage.Sets/src/mage/sets/urzaslegacy/ViashinoSandscout.java index 3f06667e467..6e4fb980e53 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/ViashinoSandscout.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/ViashinoSandscout.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; import mage.abilities.effects.common.ReturnToHandSourceEffect; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/VigilantDrake.java b/Mage.Sets/src/mage/sets/urzaslegacy/VigilantDrake.java index 94936c9b9b6..3fa8f95d5d2 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/VigilantDrake.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/VigilantDrake.java @@ -28,9 +28,9 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/WeatherseedElf.java b/Mage.Sets/src/mage/sets/urzaslegacy/WeatherseedElf.java index 0dcb407134e..f3743f67c78 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/WeatherseedElf.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/WeatherseedElf.java @@ -28,10 +28,10 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/WeatherseedFaeries.java b/Mage.Sets/src/mage/sets/urzaslegacy/WeatherseedFaeries.java index 5c01a9f0595..4ebbd4f8141 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/WeatherseedFaeries.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/WeatherseedFaeries.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/WeatherseedTreefolk.java b/Mage.Sets/src/mage/sets/urzaslegacy/WeatherseedTreefolk.java index 474ca19b7e6..0cef5251887 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/WeatherseedTreefolk.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/WeatherseedTreefolk.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.ReturnToHandSourceEffect; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/WheelOfTorture.java b/Mage.Sets/src/mage/sets/urzaslegacy/WheelOfTorture.java index 84b3d4c2519..fcdec4e008d 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/WheelOfTorture.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/WheelOfTorture.java @@ -28,14 +28,16 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.game.Game; import mage.players.Player; @@ -50,7 +52,7 @@ public class WheelOfTorture extends CardImpl { this.expansionSetCode = "ULG"; // At the beginning of each opponent's upkeep, Wheel of Torture deals X damage to that player, where X is 3 minus the number of cards in his or her hand. - Ability ability = new BeginningOfUpkeepTriggeredAbility(new WheelOfTortureEffect(), Constants.TargetController.OPPONENT, false); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new WheelOfTortureEffect(), TargetController.OPPONENT, false); this.addAbility(ability); } @@ -72,7 +74,7 @@ class WheelOfTortureEffect extends OneShotEffect { } public WheelOfTortureEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); } @Override diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/WingSnare.java b/Mage.Sets/src/mage/sets/urzaslegacy/WingSnare.java index 1c04f5d5044..55ce5c640fa 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/WingSnare.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/WingSnare.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/YavimayaGranger.java b/Mage.Sets/src/mage/sets/urzaslegacy/YavimayaGranger.java index e0ad415fda6..f202f3b40e2 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/YavimayaGranger.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/YavimayaGranger.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/YavimayaScion.java b/Mage.Sets/src/mage/sets/urzaslegacy/YavimayaScion.java index adb2f67f33e..449567c5eee 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/YavimayaScion.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/YavimayaScion.java @@ -28,8 +28,8 @@ package mage.sets.urzaslegacy; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzassaga/AbsoluteGrace.java b/Mage.Sets/src/mage/sets/urzassaga/AbsoluteGrace.java index e31dd87d1a5..8c57ad177a2 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/AbsoluteGrace.java +++ b/Mage.Sets/src/mage/sets/urzassaga/AbsoluteGrace.java @@ -29,10 +29,10 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/AbsoluteLaw.java b/Mage.Sets/src/mage/sets/urzassaga/AbsoluteLaw.java index a3b7d717c46..eb1482d8495 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/AbsoluteLaw.java +++ b/Mage.Sets/src/mage/sets/urzassaga/AbsoluteLaw.java @@ -29,10 +29,10 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/AbyssalHorror.java b/Mage.Sets/src/mage/sets/urzassaga/AbyssalHorror.java index 9125bcff802..65490f014c9 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/AbyssalHorror.java +++ b/Mage.Sets/src/mage/sets/urzassaga/AbyssalHorror.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/AcidicSoil.java b/Mage.Sets/src/mage/sets/urzassaga/AcidicSoil.java index b91951b8d15..438e1871aa9 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/AcidicSoil.java +++ b/Mage.Sets/src/mage/sets/urzassaga/AcidicSoil.java @@ -29,12 +29,13 @@ package mage.sets.urzassaga; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.common.FilterLandPermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -68,7 +69,7 @@ public class AcidicSoil extends CardImpl { class AcidicSoilEffect extends OneShotEffect { AcidicSoilEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "Acidic Soil deals damage to each player equal to the number of lands he or she controls"; } diff --git a/Mage.Sets/src/mage/sets/urzassaga/Acridian.java b/Mage.Sets/src/mage/sets/urzassaga/Acridian.java index c9723e86b99..763cb320386 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Acridian.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Acridian.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.EchoAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzassaga/AlbinoTroll.java b/Mage.Sets/src/mage/sets/urzassaga/AlbinoTroll.java index a9db87e640d..405f72c5906 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/AlbinoTroll.java +++ b/Mage.Sets/src/mage/sets/urzassaga/AlbinoTroll.java @@ -29,9 +29,9 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/urzassaga/Anaconda.java b/Mage.Sets/src/mage/sets/urzassaga/Anaconda.java index 223781fb627..4fc6f26eb2f 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Anaconda.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Anaconda.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzassaga/AngelicChorus.java b/Mage.Sets/src/mage/sets/urzassaga/AngelicChorus.java index 57fbea017c5..9d42cade02c 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/AngelicChorus.java +++ b/Mage.Sets/src/mage/sets/urzassaga/AngelicChorus.java @@ -28,10 +28,10 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; diff --git a/Mage.Sets/src/mage/sets/urzassaga/AngelicPage.java b/Mage.Sets/src/mage/sets/urzassaga/AngelicPage.java index 1a48fdbe284..3fe8bc0e310 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/AngelicPage.java +++ b/Mage.Sets/src/mage/sets/urzassaga/AngelicPage.java @@ -28,10 +28,10 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/ArcLightning.java b/Mage.Sets/src/mage/sets/urzassaga/ArcLightning.java index 35f8a6010d9..c4e4f0055eb 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/ArcLightning.java +++ b/Mage.Sets/src/mage/sets/urzassaga/ArcLightning.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageMultiEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreatureOrPlayerAmount; diff --git a/Mage.Sets/src/mage/sets/urzassaga/ArgothianElder.java b/Mage.Sets/src/mage/sets/urzassaga/ArgothianElder.java index 19b541e5d85..c49dc0fcc0b 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/ArgothianElder.java +++ b/Mage.Sets/src/mage/sets/urzassaga/ArgothianElder.java @@ -30,9 +30,9 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/ArgothianEnchantress.java b/Mage.Sets/src/mage/sets/urzassaga/ArgothianEnchantress.java index 62da0b8bef0..1d797887181 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/ArgothianEnchantress.java +++ b/Mage.Sets/src/mage/sets/urzassaga/ArgothianEnchantress.java @@ -28,8 +28,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SpellCastTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/urzassaga/ArgothianSwine.java b/Mage.Sets/src/mage/sets/urzassaga/ArgothianSwine.java index 37a0009ac42..3eaa088d011 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/ArgothianSwine.java +++ b/Mage.Sets/src/mage/sets/urzassaga/ArgothianSwine.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzassaga/BarrinMasterWizard.java b/Mage.Sets/src/mage/sets/urzassaga/BarrinMasterWizard.java index f6284ae57d7..fd6a9636a39 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/BarrinMasterWizard.java +++ b/Mage.Sets/src/mage/sets/urzassaga/BarrinMasterWizard.java @@ -28,9 +28,9 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; diff --git a/Mage.Sets/src/mage/sets/urzassaga/BarrinsCodex.java b/Mage.Sets/src/mage/sets/urzassaga/BarrinsCodex.java index 287625ce34d..6e7578eed7d 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/BarrinsCodex.java +++ b/Mage.Sets/src/mage/sets/urzassaga/BarrinsCodex.java @@ -29,10 +29,9 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,7 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.dynamicvalue.common.CountersCount; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.counters.CounterType; /** @@ -56,7 +56,7 @@ public class BarrinsCodex extends CardImpl { this.expansionSetCode = "USG"; //At the beginning of your upkeep, you may put a page counter on Barrin's Codex. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.PAGE.createInstance()), Constants.TargetController.YOU, true)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.PAGE.createInstance()), TargetController.YOU, true)); //{4}, {T}, Sacrifice Barrin's Codex: Draw X cards, where X is the number of page counters on Barrin's Codex. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(new CountersCount(CounterType.PAGE)), new ManaCostsImpl("{4}")); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Bedlam.java b/Mage.Sets/src/mage/sets/urzassaga/Bedlam.java index 7752ec568a0..ac67ecfb3e0 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Bedlam.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Bedlam.java @@ -29,13 +29,15 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.RestrictionEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; @@ -51,7 +53,7 @@ public class Bedlam extends CardImpl { this.color.setRed(true); // Creatures can't block. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BedlamEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BedlamEffect())); } public Bedlam(final Bedlam card) { @@ -67,7 +69,7 @@ public class Bedlam extends CardImpl { class BedlamEffect extends RestrictionEffect { BedlamEffect() { - super(Constants.Duration.WhileOnBattlefield); + super(Duration.WhileOnBattlefield); staticText = "Creatures can't block"; } diff --git a/Mage.Sets/src/mage/sets/urzassaga/BlanchwoodTreefolk.java b/Mage.Sets/src/mage/sets/urzassaga/BlanchwoodTreefolk.java index 7f00c37a714..2cda9aec7bd 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/BlanchwoodTreefolk.java +++ b/Mage.Sets/src/mage/sets/urzassaga/BlanchwoodTreefolk.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzassaga/BlastedLandscape.java b/Mage.Sets/src/mage/sets/urzassaga/BlastedLandscape.java index 193721ed7af..53abcebaf8b 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/BlastedLandscape.java +++ b/Mage.Sets/src/mage/sets/urzassaga/BlastedLandscape.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.CyclingAbility; import mage.abilities.mana.ColorlessManaAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/BloodVassal.java b/Mage.Sets/src/mage/sets/urzassaga/BloodVassal.java index c501faf5d06..ed36df32f59 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/BloodVassal.java +++ b/Mage.Sets/src/mage/sets/urzassaga/BloodVassal.java @@ -28,9 +28,9 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.Mana; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage.Sets/src/mage/sets/urzassaga/Bravado.java b/Mage.Sets/src/mage/sets/urzassaga/Bravado.java index b5380af8b32..d1e43ccfd65 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Bravado.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Bravado.java @@ -28,13 +28,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; @@ -62,12 +57,12 @@ public class Bravado extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature gets +1/+1 for each other creature you control. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BravadoBoostEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BravadoBoostEnchantedEffect())); } public Bravado(final Bravado card) { diff --git a/Mage.Sets/src/mage/sets/urzassaga/Breach.java b/Mage.Sets/src/mage/sets/urzassaga/Breach.java index 2ed368bc3b5..707ef9dd747 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Breach.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Breach.java @@ -29,13 +29,13 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -51,8 +51,8 @@ public class Breach extends CardImpl { this.color.setBlack(true); // Target creature gets +2/+0 and gains fear until end of turn. - this.getSpellAbility().addEffect(new BoostTargetEffect(2, 0, Constants.Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FearAbility.getInstance(), Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(2, 0, Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FearAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/BrilliantHalo.java b/Mage.Sets/src/mage/sets/urzassaga/BrilliantHalo.java index 1e82fe98ff6..dd7e4c0a06f 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/BrilliantHalo.java +++ b/Mage.Sets/src/mage/sets/urzassaga/BrilliantHalo.java @@ -29,9 +29,7 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -59,11 +57,11 @@ public class BrilliantHalo extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature gets +1/+2. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2, Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield))); // When Brilliant Halo is put into a graveyard from the battlefield, return Brilliant Halo to its owner's hand. this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new ReturnToHandSourceEffect())); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/BullHippo.java b/Mage.Sets/src/mage/sets/urzassaga/BullHippo.java index bab6d42d2ee..8ccd069a994 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/BullHippo.java +++ b/Mage.Sets/src/mage/sets/urzassaga/BullHippo.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.IslandwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzassaga/Bulwark.java b/Mage.Sets/src/mage/sets/urzassaga/Bulwark.java index 7854eb47ad3..6ab9a45b27f 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Bulwark.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Bulwark.java @@ -28,14 +28,15 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetOpponent; @@ -53,7 +54,7 @@ public class Bulwark extends CardImpl { // At the beginning of your upkeep, Bulwark deals X damage to target opponent, where X is // the number of cards in your hand minus the number of cards in that player's hand. - Ability ability = new BeginningOfUpkeepTriggeredAbility(new BulwarkDamageEffect(), Constants.TargetController.YOU, false); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new BulwarkDamageEffect(), TargetController.YOU, false); ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/CacklingFiend.java b/Mage.Sets/src/mage/sets/urzassaga/CacklingFiend.java index 6a56160a095..b6dd4f54cac 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/CacklingFiend.java +++ b/Mage.Sets/src/mage/sets/urzassaga/CacklingFiend.java @@ -29,9 +29,9 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/CarpetOfFlowers.java b/Mage.Sets/src/mage/sets/urzassaga/CarpetOfFlowers.java index 19c9296589c..51cda9a0a34 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/CarpetOfFlowers.java +++ b/Mage.Sets/src/mage/sets/urzassaga/CarpetOfFlowers.java @@ -29,10 +29,10 @@ package mage.sets.urzassaga; import java.util.LinkedHashSet; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -40,6 +40,7 @@ import mage.abilities.effects.common.ManaEffect; import mage.cards.CardImpl; import mage.choices.ChoiceColor; import mage.choices.ChoiceImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -80,7 +81,7 @@ class CarpetOfFlowersTriggeredAbility extends TriggeredAbilityImpl { this.toughness = new MageInt(7); this.addAbility(TrampleAbility.getInstance()); - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{G}{G}")), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{G}{G}")), TargetController.YOU, false)); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{G}"))); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/ChimericStaff.java b/Mage.Sets/src/mage/sets/urzassaga/ChimericStaff.java index b115490c688..4bddf7f9010 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/ChimericStaff.java +++ b/Mage.Sets/src/mage/sets/urzassaga/ChimericStaff.java @@ -28,13 +28,13 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/urzassaga/CitanulCentaurs.java b/Mage.Sets/src/mage/sets/urzassaga/CitanulCentaurs.java index c56988f979b..8f56a9511b8 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/CitanulCentaurs.java +++ b/Mage.Sets/src/mage/sets/urzassaga/CitanulCentaurs.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.EchoAbility; import mage.abilities.keyword.ShroudAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/CitanulFlute.java b/Mage.Sets/src/mage/sets/urzassaga/CitanulFlute.java index 27bb2fcc969..aff87104e5e 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/CitanulFlute.java +++ b/Mage.Sets/src/mage/sets/urzassaga/CitanulFlute.java @@ -28,11 +28,11 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -62,7 +62,7 @@ public class CitanulFlute extends CardImpl { // {X}, {T}: Search your library for a creature card with converted mana cost X or less, reveal it, // and put it into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CitanulFluteSearchEffect(), new ManaCostsImpl("{X}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CitanulFluteSearchEffect(), new ManaCostsImpl("{X}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/CitanulHierophants.java b/Mage.Sets/src/mage/sets/urzassaga/CitanulHierophants.java index 9117c34a9a9..1c68bd8da13 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/CitanulHierophants.java +++ b/Mage.Sets/src/mage/sets/urzassaga/CitanulHierophants.java @@ -28,10 +28,10 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; diff --git a/Mage.Sets/src/mage/sets/urzassaga/ClawsOfGix.java b/Mage.Sets/src/mage/sets/urzassaga/ClawsOfGix.java index cb678578944..637856f170a 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/ClawsOfGix.java +++ b/Mage.Sets/src/mage/sets/urzassaga/ClawsOfGix.java @@ -28,15 +28,16 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetControlledPermanent; /** @@ -50,7 +51,7 @@ public class ClawsOfGix extends CardImpl { this.expansionSetCode = "USG"; //{1}, Sacrifice a permanent: You gain 1 life. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainLifeEffect(1), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new GenericManaCost(1)); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/Clear.java b/Mage.Sets/src/mage/sets/urzassaga/Clear.java index bd6eeeeee08..17e19d98737 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Clear.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Clear.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.CyclingAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/CloakOfMists.java b/Mage.Sets/src/mage/sets/urzassaga/CloakOfMists.java index 45dd932600e..6a2e442e840 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/CloakOfMists.java +++ b/Mage.Sets/src/mage/sets/urzassaga/CloakOfMists.java @@ -28,11 +28,11 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.UnblockableAttachedEffect; diff --git a/Mage.Sets/src/mage/sets/urzassaga/Confiscate.java b/Mage.Sets/src/mage/sets/urzassaga/Confiscate.java index 72d09ecdfab..51739fb531b 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Confiscate.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Confiscate.java @@ -27,15 +27,16 @@ */ package mage.sets.urzassaga; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continious.ControlEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import java.util.UUID; @@ -56,12 +57,12 @@ public class Confiscate extends CardImpl { // Enchant permanent TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // You control enchanted permanent. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); } public Confiscate(final Confiscate card) { diff --git a/Mage.Sets/src/mage/sets/urzassaga/Congregate.java b/Mage.Sets/src/mage/sets/urzassaga/Congregate.java index c2c7daa2306..6f0169ef694 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Congregate.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Congregate.java @@ -28,8 +28,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.GainLifeTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzassaga/Corrupt.java b/Mage.Sets/src/mage/sets/urzassaga/Corrupt.java index 024b77f2c77..4b5569a2a0a 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Corrupt.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Corrupt.java @@ -28,7 +28,7 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/urzassaga/CradleGuard.java b/Mage.Sets/src/mage/sets/urzassaga/CradleGuard.java index 17232d012fa..729663f3bc7 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/CradleGuard.java +++ b/Mage.Sets/src/mage/sets/urzassaga/CradleGuard.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.EchoAbility; import mage.abilities.keyword.TrampleAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/CraterHellion.java b/Mage.Sets/src/mage/sets/urzassaga/CraterHellion.java index 771a82cef81..bd246eb1f23 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/CraterHellion.java +++ b/Mage.Sets/src/mage/sets/urzassaga/CraterHellion.java @@ -30,9 +30,9 @@ package mage.sets.urzassaga; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/CrazedSkirge.java b/Mage.Sets/src/mage/sets/urzassaga/CrazedSkirge.java index 30f40e8cda6..a527a2a5765 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/CrazedSkirge.java +++ b/Mage.Sets/src/mage/sets/urzassaga/CrazedSkirge.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/DarkHatchling.java b/Mage.Sets/src/mage/sets/urzassaga/DarkHatchling.java index 5c064a27ab4..26699ed5de9 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/DarkHatchling.java +++ b/Mage.Sets/src/mage/sets/urzassaga/DarkHatchling.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/urzassaga/DiscipleOfGrace.java b/Mage.Sets/src/mage/sets/urzassaga/DiscipleOfGrace.java index 725fe057294..9c4e149fd75 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/DiscipleOfGrace.java +++ b/Mage.Sets/src/mage/sets/urzassaga/DiscipleOfGrace.java @@ -28,8 +28,8 @@ package mage.sets.urzassaga; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/urzassaga/DiscipleOfLaw.java b/Mage.Sets/src/mage/sets/urzassaga/DiscipleOfLaw.java index b5253f72fd5..c6748526a5a 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/DiscipleOfLaw.java +++ b/Mage.Sets/src/mage/sets/urzassaga/DiscipleOfLaw.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/urzassaga/Disenchant.java b/Mage.Sets/src/mage/sets/urzassaga/Disenchant.java index 5b3a7b859e8..558029fcb40 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Disenchant.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Disenchant.java @@ -29,7 +29,7 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/urzassaga/DisruptiveStudent.java b/Mage.Sets/src/mage/sets/urzassaga/DisruptiveStudent.java index 1702d5de934..83805dc1e38 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/DisruptiveStudent.java +++ b/Mage.Sets/src/mage/sets/urzassaga/DisruptiveStudent.java @@ -29,9 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.TargetSpell; /** @@ -58,7 +58,7 @@ public class DisruptiveStudent extends CardImpl { this.toughness = new MageInt(1); // {tap}: Counter target spell unless its controller pays {1}. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(1)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(1)), new TapSourceCost()); ability.addTarget(new TargetSpell()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/DriftingDjinn.java b/Mage.Sets/src/mage/sets/urzassaga/DriftingDjinn.java index 4d99eb32dd2..56ac8eb803a 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/DriftingDjinn.java +++ b/Mage.Sets/src/mage/sets/urzassaga/DriftingDjinn.java @@ -29,9 +29,9 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +39,7 @@ import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect; import mage.abilities.keyword.CyclingAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; /** * @@ -54,7 +55,7 @@ public class DriftingDjinn extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{1}{U}")), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{1}{U}")), TargetController.YOU, false)); this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/DriftingMeadow.java b/Mage.Sets/src/mage/sets/urzassaga/DriftingMeadow.java index 4310322f3b4..6776582bc0c 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/DriftingMeadow.java +++ b/Mage.Sets/src/mage/sets/urzassaga/DriftingMeadow.java @@ -30,8 +30,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.CyclingAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/Dromosaur.java b/Mage.Sets/src/mage/sets/urzassaga/Dromosaur.java index 92f5386532c..1048c5db687 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Dromosaur.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Dromosaur.java @@ -28,9 +28,9 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; diff --git a/Mage.Sets/src/mage/sets/urzassaga/EasternPaladin.java b/Mage.Sets/src/mage/sets/urzassaga/EasternPaladin.java index 2fb1bbddd1f..88edb797f70 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/EasternPaladin.java +++ b/Mage.Sets/src/mage/sets/urzassaga/EasternPaladin.java @@ -30,9 +30,9 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/urzassaga/EliteArchers.java b/Mage.Sets/src/mage/sets/urzassaga/EliteArchers.java index f251e4d6d53..66dfaec26bd 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/EliteArchers.java +++ b/Mage.Sets/src/mage/sets/urzassaga/EliteArchers.java @@ -29,15 +29,15 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.target.common.TargetAttackingOrBlockingCreature; /** @@ -58,7 +58,7 @@ public class EliteArchers extends CardImpl { this.toughness = new MageInt(3); // {tap}: Elite Archers deals 3 damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(3), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/ElvishLyrist.java b/Mage.Sets/src/mage/sets/urzassaga/ElvishLyrist.java index 755d106b89d..ea87a428143 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/ElvishLyrist.java +++ b/Mage.Sets/src/mage/sets/urzassaga/ElvishLyrist.java @@ -28,9 +28,9 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +39,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterEnchantmentPermanent; import mage.target.TargetPermanent; @@ -58,7 +59,7 @@ public class ElvishLyrist extends CardImpl { this.toughness = new MageInt(1); // {G}, {tap}, Sacrifice Elvish Lyrist: Destroy target enchantment. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(new FilterEnchantmentPermanent())); diff --git a/Mage.Sets/src/mage/sets/urzassaga/EnergyField.java b/Mage.Sets/src/mage/sets/urzassaga/EnergyField.java index 136e4a8cde3..96b378720cd 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/EnergyField.java +++ b/Mage.Sets/src/mage/sets/urzassaga/EnergyField.java @@ -28,15 +28,17 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.PreventionEffectImpl; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -54,7 +56,7 @@ public class EnergyField extends CardImpl { this.color.setBlue(true); // Prevent all damage that would be dealt to you by sources you don't control. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new EnergyFieldEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EnergyFieldEffect())); // When a card is put into your graveyard from anywhere, sacrifice Energy Field. this.addAbility(new PutIntoYourGraveyardTriggeredAbility()); } @@ -72,7 +74,7 @@ public class EnergyField extends CardImpl { class EnergyFieldEffect extends PreventionEffectImpl { public EnergyFieldEffect() { - super(Constants.Duration.WhileOnBattlefield); + super(Duration.WhileOnBattlefield); staticText = "Prevent all damage that would be dealt to you by sources you don't control"; } @@ -118,7 +120,7 @@ class PutIntoYourGraveyardTriggeredAbility extends TriggeredAbilityImpl { this.addAbility(FlyingAbility.getInstance()); // Prevent all combat damage that would be dealt to and dealt by Fog Bank. - Ability ability = new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new PreventCombatDamageSourceEffect(Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventCombatDamageSourceEffect(Duration.WhileOnBattlefield)); ability.addEffect(new PreventCombatDamageFromSourceEffect(Duration.WhileOnBattlefield)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/GaeasCradle.java b/Mage.Sets/src/mage/sets/urzassaga/GaeasCradle.java index 31e3e60f238..1b786e67c55 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/GaeasCradle.java +++ b/Mage.Sets/src/mage/sets/urzassaga/GaeasCradle.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.mana.DynamicManaAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/GaeasEmbrace.java b/Mage.Sets/src/mage/sets/urzassaga/GaeasEmbrace.java index dcbf3ca318b..84c41e9f14a 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/GaeasEmbrace.java +++ b/Mage.Sets/src/mage/sets/urzassaga/GaeasEmbrace.java @@ -28,12 +28,12 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.ColoredManaSymbol; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/GoblinLackey.java b/Mage.Sets/src/mage/sets/urzassaga/GoblinLackey.java index 0ad403c8a10..44eefeb51f3 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/GoblinLackey.java +++ b/Mage.Sets/src/mage/sets/urzassaga/GoblinLackey.java @@ -28,10 +28,10 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage.Sets/src/mage/sets/urzassaga/GoblinMatron.java b/Mage.Sets/src/mage/sets/urzassaga/GoblinMatron.java index 4af99345689..5ef7047348b 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/GoblinMatron.java +++ b/Mage.Sets/src/mage/sets/urzassaga/GoblinMatron.java @@ -28,8 +28,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; diff --git a/Mage.Sets/src/mage/sets/urzassaga/GoblinOffensive.java b/Mage.Sets/src/mage/sets/urzassaga/GoblinOffensive.java index 2c7c2b46c6c..2e1e893b36b 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/GoblinOffensive.java +++ b/Mage.Sets/src/mage/sets/urzassaga/GoblinOffensive.java @@ -28,8 +28,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.dynamicvalue.common.ManacostVariableValue; diff --git a/Mage.Sets/src/mage/sets/urzassaga/GoblinPatrol.java b/Mage.Sets/src/mage/sets/urzassaga/GoblinPatrol.java index d6f45fbed00..bdcf4f54856 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/GoblinPatrol.java +++ b/Mage.Sets/src/mage/sets/urzassaga/GoblinPatrol.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.EchoAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzassaga/GoblinRaider.java b/Mage.Sets/src/mage/sets/urzassaga/GoblinRaider.java index d20f6bd75aa..8fc1c994163 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/GoblinRaider.java +++ b/Mage.Sets/src/mage/sets/urzassaga/GoblinRaider.java @@ -28,8 +28,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzassaga/GoblinWarBuggy.java b/Mage.Sets/src/mage/sets/urzassaga/GoblinWarBuggy.java index e36253259ba..fe6486abea9 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/GoblinWarBuggy.java +++ b/Mage.Sets/src/mage/sets/urzassaga/GoblinWarBuggy.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.EchoAbility; import mage.abilities.keyword.HasteAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/GorillaWarrior.java b/Mage.Sets/src/mage/sets/urzassaga/GorillaWarrior.java index bf318ae08c7..bb8902c838e 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/GorillaWarrior.java +++ b/Mage.Sets/src/mage/sets/urzassaga/GorillaWarrior.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzassaga/Guma.java b/Mage.Sets/src/mage/sets/urzassaga/Guma.java index 4732e88144f..cd0c8a51bc4 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Guma.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Guma.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.ProtectionAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/HawkeaterMoth.java b/Mage.Sets/src/mage/sets/urzassaga/HawkeaterMoth.java index 1d8eaa712a8..583d2901172 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/HawkeaterMoth.java +++ b/Mage.Sets/src/mage/sets/urzassaga/HawkeaterMoth.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.ShroudAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/HeraldOfSerra.java b/Mage.Sets/src/mage/sets/urzassaga/HeraldOfSerra.java index 8be2836598a..16cb929417a 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/HeraldOfSerra.java +++ b/Mage.Sets/src/mage/sets/urzassaga/HeraldOfSerra.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.EchoAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/Hibernation.java b/Mage.Sets/src/mage/sets/urzassaga/Hibernation.java index 0cc2b417a8e..913f51a7682 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Hibernation.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Hibernation.java @@ -28,13 +28,15 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; @@ -75,7 +77,7 @@ class HibernationEffect extends OneShotEffect { } public HibernationEffect() { - super(Constants.Outcome.ReturnToHand); + super(Outcome.ReturnToHand); staticText = "Return all green permanents to their owners' hands"; } @@ -86,7 +88,7 @@ class HibernationEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { for (Permanent permanent : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { - permanent.moveToZone(Constants.Zone.HAND, source.getSourceId(), game, true); + permanent.moveToZone(Zone.HAND, source.getSourceId(), game, true); } return true; } diff --git a/Mage.Sets/src/mage/sets/urzassaga/HollowDogs.java b/Mage.Sets/src/mage/sets/urzassaga/HollowDogs.java index 2ea6b8d5c0a..ae4eefb5b5b 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/HollowDogs.java +++ b/Mage.Sets/src/mage/sets/urzassaga/HollowDogs.java @@ -29,13 +29,13 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -54,7 +54,7 @@ public class HollowDogs extends CardImpl { this.toughness = new MageInt(3); // Whenever Hollow Dogs attacks, it gets +2/+0 until end of turn. - this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(2, 0, Constants.Duration.EndOfTurn), false)); + this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), false)); } public HollowDogs(final HollowDogs card) { diff --git a/Mage.Sets/src/mage/sets/urzassaga/Hush.java b/Mage.Sets/src/mage/sets/urzassaga/Hush.java index 74c0abeac86..0ffd168b3bf 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Hush.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Hush.java @@ -28,14 +28,15 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.CyclingAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; @@ -75,7 +76,7 @@ class HushEffect extends OneShotEffect { } public HushEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); staticText = "Destroy all enchantments"; } diff --git a/Mage.Sets/src/mage/sets/urzassaga/IntrepidHero.java b/Mage.Sets/src/mage/sets/urzassaga/IntrepidHero.java index 6de445d50c1..b68ba5c627a 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/IntrepidHero.java +++ b/Mage.Sets/src/mage/sets/urzassaga/IntrepidHero.java @@ -28,9 +28,9 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/LayWaste.java b/Mage.Sets/src/mage/sets/urzassaga/LayWaste.java index 3b057ddd220..6dc2d303cd9 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/LayWaste.java +++ b/Mage.Sets/src/mage/sets/urzassaga/LayWaste.java @@ -28,8 +28,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.CyclingAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/LightningDragon.java b/Mage.Sets/src/mage/sets/urzassaga/LightningDragon.java index ac5bb219ec8..8b0e5f828b5 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/LightningDragon.java +++ b/Mage.Sets/src/mage/sets/urzassaga/LightningDragon.java @@ -29,11 +29,11 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.ColoredManaSymbol; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; diff --git a/Mage.Sets/src/mage/sets/urzassaga/LingeringMirage.java b/Mage.Sets/src/mage/sets/urzassaga/LingeringMirage.java index 6fbccea76bb..55fb4873f05 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/LingeringMirage.java +++ b/Mage.Sets/src/mage/sets/urzassaga/LingeringMirage.java @@ -28,9 +28,9 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +39,8 @@ import mage.abilities.effects.common.continious.BecomesBasicLandEnchantedEffect; import mage.abilities.keyword.CyclingAbility; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; @@ -58,11 +60,11 @@ public class LingeringMirage extends CardImpl { // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Detriment)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted land is an Island. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BecomesBasicLandEnchantedEffect("Island"))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesBasicLandEnchantedEffect("Island"))); // Cycling {2} this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/Lull.java b/Mage.Sets/src/mage/sets/urzassaga/Lull.java index 4d9a0697c15..18057cd64d3 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Lull.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Lull.java @@ -28,9 +28,9 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.PreventAllDamageEffect; import mage.abilities.keyword.CyclingAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/Morphling.java b/Mage.Sets/src/mage/sets/urzassaga/Morphling.java index 01e8c26d54b..075cf606d48 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Morphling.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Morphling.java @@ -29,9 +29,7 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -59,15 +57,15 @@ public class Morphling extends CardImpl { this.toughness = new MageInt(3); // {U}: Untap Morphling. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new UntapSourceEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.U))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ColoredManaCost(ColoredManaSymbol.U))); // {U}: Morphling gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.U))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U))); // {U}: Morphling gains shroud until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilitySourceEffect(ShroudAbility.getInstance(), Constants.Duration.EndOfTurn), new ColoredManaCost(Constants.ColoredManaSymbol.U))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U))); // {1}: Morphling gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Constants.Duration.EndOfTurn), new GenericManaCost(1))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new GenericManaCost(1))); // {1}: Morphling gets -1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(+1, 1, Constants.Duration.EndOfTurn), new GenericManaCost(1))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(+1, 1, Duration.EndOfTurn), new GenericManaCost(1))); } public Morphling(final Morphling card) { diff --git a/Mage.Sets/src/mage/sets/urzassaga/OrderOfYawgmoth.java b/Mage.Sets/src/mage/sets/urzassaga/OrderOfYawgmoth.java index dc7557e9bba..5bd1ca79d6a 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/OrderOfYawgmoth.java +++ b/Mage.Sets/src/mage/sets/urzassaga/OrderOfYawgmoth.java @@ -28,8 +28,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.DiscardTargetEffect; diff --git a/Mage.Sets/src/mage/sets/urzassaga/PegasusCharger.java b/Mage.Sets/src/mage/sets/urzassaga/PegasusCharger.java index bec3c901075..b7681c73458 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/PegasusCharger.java +++ b/Mage.Sets/src/mage/sets/urzassaga/PegasusCharger.java @@ -28,8 +28,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/PendrellDrake.java b/Mage.Sets/src/mage/sets/urzassaga/PendrellDrake.java index 037409776e1..0902769acb5 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/PendrellDrake.java +++ b/Mage.Sets/src/mage/sets/urzassaga/PendrellDrake.java @@ -28,8 +28,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/urzassaga/PeregrineDrake.java b/Mage.Sets/src/mage/sets/urzassaga/PeregrineDrake.java index 5dc17a82e36..ef73713527b 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/PeregrineDrake.java +++ b/Mage.Sets/src/mage/sets/urzassaga/PeregrineDrake.java @@ -28,8 +28,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.UntapLandsEffect; diff --git a/Mage.Sets/src/mage/sets/urzassaga/Pestilence.java b/Mage.Sets/src/mage/sets/urzassaga/Pestilence.java index 2b4a9074398..aec24f04ac5 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Pestilence.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Pestilence.java @@ -28,9 +28,9 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.TriggeredAbility; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +40,7 @@ import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.DamageEverythingEffect; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.game.events.GameEvent; /** @@ -60,7 +61,7 @@ public class Pestilence extends CardImpl { this.addAbility(new ConditionalTriggeredAbility(triggered, new NoCreatureCondition(), ruleText)); // {B}: Pestilence deals 1 damage to each creature and each player. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageEverythingEffect(1), new ManaCostsImpl("{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(1), new ManaCostsImpl("{B}"))); } public Pestilence(final Pestilence card) { diff --git a/Mage.Sets/src/mage/sets/urzassaga/PhyrexianTower.java b/Mage.Sets/src/mage/sets/urzassaga/PhyrexianTower.java index cee26bdbed4..74ed524496b 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/PhyrexianTower.java +++ b/Mage.Sets/src/mage/sets/urzassaga/PhyrexianTower.java @@ -28,9 +28,9 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.SacrificeTargetCost; diff --git a/Mage.Sets/src/mage/sets/urzassaga/PollutedMire.java b/Mage.Sets/src/mage/sets/urzassaga/PollutedMire.java index b1dc26835ae..816258ba902 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/PollutedMire.java +++ b/Mage.Sets/src/mage/sets/urzassaga/PollutedMire.java @@ -30,8 +30,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.CyclingAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/PouncingJaguar.java b/Mage.Sets/src/mage/sets/urzassaga/PouncingJaguar.java index 3e52e47f461..dd910d7757e 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/PouncingJaguar.java +++ b/Mage.Sets/src/mage/sets/urzassaga/PouncingJaguar.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.EchoAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzassaga/PriestOfGix.java b/Mage.Sets/src/mage/sets/urzassaga/PriestOfGix.java index a73f2d0ae84..6e8f15c113d 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/PriestOfGix.java +++ b/Mage.Sets/src/mage/sets/urzassaga/PriestOfGix.java @@ -28,8 +28,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/PriestOfTitania.java b/Mage.Sets/src/mage/sets/urzassaga/PriestOfTitania.java index 695e7a38416..46f58d69703 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/PriestOfTitania.java +++ b/Mage.Sets/src/mage/sets/urzassaga/PriestOfTitania.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; diff --git a/Mage.Sets/src/mage/sets/urzassaga/RainOfFilth.java b/Mage.Sets/src/mage/sets/urzassaga/RainOfFilth.java index 5357ea513bb..3d2b8040156 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/RainOfFilth.java +++ b/Mage.Sets/src/mage/sets/urzassaga/RainOfFilth.java @@ -28,15 +28,17 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.abilities.mana.ManaAbility; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; /** @@ -52,8 +54,8 @@ public class RainOfFilth extends CardImpl { this.color.setBlack(true); // Until end of turn, lands you control gain "Sacrifice this land: Add {B} to your mana pool." - ManaAbility ability = new SimpleManaAbility(Constants.Zone.BATTLEFIELD, Mana.BlackMana, new SacrificeSourceCost()); - this.getSpellAbility().addEffect(new GainAbilityAllEffect(ability, Constants.Duration.EndOfTurn, new FilterControlledLandPermanent())); + ManaAbility ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana, new SacrificeSourceCost()); + this.getSpellAbility().addEffect(new GainAbilityAllEffect(ability, Duration.EndOfTurn, new FilterControlledLandPermanent())); } public RainOfFilth(final RainOfFilth card) { diff --git a/Mage.Sets/src/mage/sets/urzassaga/RainOfSalt.java b/Mage.Sets/src/mage/sets/urzassaga/RainOfSalt.java index 746041fa810..4cbee6c0b5c 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/RainOfSalt.java +++ b/Mage.Sets/src/mage/sets/urzassaga/RainOfSalt.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/urzassaga/RavenousSkirge.java b/Mage.Sets/src/mage/sets/urzassaga/RavenousSkirge.java index 63d1515a93c..219bba2ccdb 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/RavenousSkirge.java +++ b/Mage.Sets/src/mage/sets/urzassaga/RavenousSkirge.java @@ -29,14 +29,14 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -59,7 +59,7 @@ public class RavenousSkirge extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Whenever Ravenous Skirge attacks, it gets +2/+0 until end of turn. - this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(2, 0, Constants.Duration.EndOfTurn), false)); + this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), false)); } public RavenousSkirge(final RavenousSkirge card) { diff --git a/Mage.Sets/src/mage/sets/urzassaga/Reflexes.java b/Mage.Sets/src/mage/sets/urzassaga/Reflexes.java index 91f2ba5fc37..d5f68885044 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Reflexes.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Reflexes.java @@ -28,9 +28,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -57,12 +56,12 @@ public class Reflexes extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature has first strike. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), Constants.AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/Rejuvenate.java b/Mage.Sets/src/mage/sets/urzassaga/Rejuvenate.java index 91bf788d6aa..eb533201302 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Rejuvenate.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Rejuvenate.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.keyword.CyclingAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/RemoteIsle.java b/Mage.Sets/src/mage/sets/urzassaga/RemoteIsle.java index c21c999f394..9f5bfdd791d 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/RemoteIsle.java +++ b/Mage.Sets/src/mage/sets/urzassaga/RemoteIsle.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.CyclingAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/Rescind.java b/Mage.Sets/src/mage/sets/urzassaga/Rescind.java index 9e28ca5c572..1f98044a636 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Rescind.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Rescind.java @@ -28,8 +28,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.CyclingAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/Rewind.java b/Mage.Sets/src/mage/sets/urzassaga/Rewind.java index 2f69a0c0bad..4f6c23cc739 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Rewind.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Rewind.java @@ -28,8 +28,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.UntapLandsEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzassaga/RuneOfProtectionBlack.java b/Mage.Sets/src/mage/sets/urzassaga/RuneOfProtectionBlack.java index 7922c954e4a..2f990a78ffd 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/RuneOfProtectionBlack.java +++ b/Mage.Sets/src/mage/sets/urzassaga/RuneOfProtectionBlack.java @@ -28,9 +28,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -56,7 +55,7 @@ public class RuneOfProtectionBlack extends CardImpl { this.color.setWhite(true); // {W}: The next time a black source of your choice would deal damage to you this turn, prevent that damage. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RuneOfProtectionBlackEffect() , new ManaCostsImpl("W"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RuneOfProtectionBlackEffect() , new ManaCostsImpl("W"))); // Cycling {2} ({2}, Discard this card: Draw a card.) this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); } @@ -82,7 +81,7 @@ class RuneOfProtectionBlackEffect extends PreventionEffectImpl { this.color.setWhite(true); // {W}: The next time a blue source of your choice would deal damage to you this turn, prevent that damage. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RuneOfProtectionBlueEffect() , new ManaCostsImpl("W"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RuneOfProtectionBlueEffect() , new ManaCostsImpl("W"))); // Cycling {2} ({2}, Discard this card: Draw a card.) this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); } @@ -82,7 +81,7 @@ class RuneOfProtectionBlueEffect extends PreventionEffectImpl { this.color.setWhite(true); // {W}: The next time a green source of your choice would deal damage to you this turn, prevent that damage. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RuneOfProtectionGreenEffect() , new ManaCostsImpl("W"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RuneOfProtectionGreenEffect() , new ManaCostsImpl("W"))); // Cycling {2} ({2}, Discard this card: Draw a card.) this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); } @@ -82,7 +81,7 @@ class RuneOfProtectionGreenEffect extends PreventionEffectImpl { this.color.setWhite(true); // {W}: The next time a red source of your choice would deal damage to you this turn, prevent that damage. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RuneOfProtectionRedEffect() , new ManaCostsImpl("W"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RuneOfProtectionRedEffect() , new ManaCostsImpl("W"))); // Cycling {2} ({2}, Discard this card: Draw a card.) this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); } @@ -82,7 +81,7 @@ class RuneOfProtectionRedEffect extends PreventionEffectImpl { this.color.setWhite(true); // {W}: The next time a white source of your choice would deal damage to you this turn, prevent that damage. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RuneOfProtectionWhiteEffect() , new ManaCostsImpl("W"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RuneOfProtectionWhiteEffect() , new ManaCostsImpl("W"))); // Cycling {2} ({2}, Discard this card: Draw a card.) this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); } @@ -82,7 +81,7 @@ class RuneOfProtectionWhiteEffect extends PreventionEffectImpl { this.toughness = new MageInt(0); // Serra Avatar's power and toughness are each equal to your life total. - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new ControllerLifeCount(), Constants.Duration.EndOfGame))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new ControllerLifeCount(), Duration.EndOfGame))); // When Serra Avatar is put into a graveyard from anywhere, shuffle it into its owner's library. this.addAbility(new PutIntoGraveFromAnywhereTriggeredAbility(new SerraAvatarEffect())); } @@ -77,7 +75,7 @@ public class SerraAvatar extends CardImpl { class SerraAvatarEffect extends OneShotEffect { SerraAvatarEffect() { - super(Constants.Outcome.ReturnToHand); + super(Outcome.ReturnToHand); staticText = "shuffle it into its owner's library"; } diff --git a/Mage.Sets/src/mage/sets/urzassaga/SerraZealot.java b/Mage.Sets/src/mage/sets/urzassaga/SerraZealot.java index b77fac470fc..e51b0db64f4 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/SerraZealot.java +++ b/Mage.Sets/src/mage/sets/urzassaga/SerraZealot.java @@ -28,8 +28,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzassaga/SerrasSanctum.java b/Mage.Sets/src/mage/sets/urzassaga/SerrasSanctum.java index a897adf6bfb..117a0a4d5db 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/SerrasSanctum.java +++ b/Mage.Sets/src/mage/sets/urzassaga/SerrasSanctum.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.mana.DynamicManaAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/ShimmeringBarrier.java b/Mage.Sets/src/mage/sets/urzassaga/ShimmeringBarrier.java index 5007482e193..07454896a83 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/ShimmeringBarrier.java +++ b/Mage.Sets/src/mage/sets/urzassaga/ShimmeringBarrier.java @@ -28,8 +28,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/ShivanGorge.java b/Mage.Sets/src/mage/sets/urzassaga/ShivanGorge.java index 72faed03e96..a2f59c05ba0 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/ShivanGorge.java +++ b/Mage.Sets/src/mage/sets/urzassaga/ShivanGorge.java @@ -28,10 +28,10 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/urzassaga/ShivanRaptor.java b/Mage.Sets/src/mage/sets/urzassaga/ShivanRaptor.java index a7a5b39652b..2887dc3648c 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/ShivanRaptor.java +++ b/Mage.Sets/src/mage/sets/urzassaga/ShivanRaptor.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.EchoAbility; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/ShowAndTell.java b/Mage.Sets/src/mage/sets/urzassaga/ShowAndTell.java index f4e40dc6385..85966e58dc8 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/ShowAndTell.java +++ b/Mage.Sets/src/mage/sets/urzassaga/ShowAndTell.java @@ -28,10 +28,10 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/urzassaga/Sicken.java b/Mage.Sets/src/mage/sets/urzassaga/Sicken.java index 7ae00007156..4540c09a614 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Sicken.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Sicken.java @@ -28,9 +28,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -58,11 +57,11 @@ public class Sicken extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Neutral)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Neutral)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature gets -2/-2. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(-1, -1, Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-1, -1, Duration.WhileOnBattlefield))); //Cycling this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/SilentAttendant.java b/Mage.Sets/src/mage/sets/urzassaga/SilentAttendant.java index 063120cbc2d..76e00900a28 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/SilentAttendant.java +++ b/Mage.Sets/src/mage/sets/urzassaga/SilentAttendant.java @@ -29,9 +29,9 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/urzassaga/SlipperyKarst.java b/Mage.Sets/src/mage/sets/urzassaga/SlipperyKarst.java index 49d78666d9d..9206c40fe87 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/SlipperyKarst.java +++ b/Mage.Sets/src/mage/sets/urzassaga/SlipperyKarst.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.CyclingAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/SmolderingCrater.java b/Mage.Sets/src/mage/sets/urzassaga/SmolderingCrater.java index e17e1359f33..9c9a3baec32 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/SmolderingCrater.java +++ b/Mage.Sets/src/mage/sets/urzassaga/SmolderingCrater.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.CyclingAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/SpinedFluke.java b/Mage.Sets/src/mage/sets/urzassaga/SpinedFluke.java index 7b70426fb30..cc93092a7f6 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/SpinedFluke.java +++ b/Mage.Sets/src/mage/sets/urzassaga/SpinedFluke.java @@ -29,9 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.effects.common.SacrificeEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; /** @@ -63,7 +64,7 @@ public class SpinedFluke extends CardImpl { // When Spined Fluke enters the battlefield, sacrifice a creature. this.addAbility(new EntersBattlefieldTriggeredAbility(new SacrificeEffect(new FilterCreaturePermanent("a creature"), 1, ""))); // {B}: Regenerate Spined Fluke. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.B))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.B))); } public SpinedFluke(final SpinedFluke card) { diff --git a/Mage.Sets/src/mage/sets/urzassaga/SpreadingAlgae.java b/Mage.Sets/src/mage/sets/urzassaga/SpreadingAlgae.java index 0f0dbed5373..9762e0292fb 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/SpreadingAlgae.java +++ b/Mage.Sets/src/mage/sets/urzassaga/SpreadingAlgae.java @@ -28,9 +28,9 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; @@ -40,6 +40,8 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -70,7 +72,7 @@ public class SpreadingAlgae extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // When enchanted land becomes tapped, destroy it. @@ -95,7 +97,7 @@ public class SpreadingAlgae extends CardImpl { class SpreadingAlgaeTriggeredAbility extends TriggeredAbilityImpl { public SpreadingAlgaeTriggeredAbility(Effect effect) { - super(Constants.Zone.BATTLEFIELD, effect); + super(Zone.BATTLEFIELD, effect); } public SpreadingAlgaeTriggeredAbility(final SpreadingAlgaeTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/urzassaga/SternProctor.java b/Mage.Sets/src/mage/sets/urzassaga/SternProctor.java index 98b75985853..0e421050477 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/SternProctor.java +++ b/Mage.Sets/src/mage/sets/urzassaga/SternProctor.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/StrokeOfGenius.java b/Mage.Sets/src/mage/sets/urzassaga/StrokeOfGenius.java index df9dd064fe4..98bfe7d3933 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/StrokeOfGenius.java +++ b/Mage.Sets/src/mage/sets/urzassaga/StrokeOfGenius.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzassaga/Telepathy.java b/Mage.Sets/src/mage/sets/urzassaga/Telepathy.java index f698bacd208..3c8c94e4d57 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Telepathy.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Telepathy.java @@ -27,9 +27,7 @@ */ package mage.sets.urzassaga; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; @@ -52,7 +50,7 @@ public class Telepathy extends CardImpl { this.color.setBlue(true); // Your opponents play with their hands revealed. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new OpponentsPlayWithTheTopCardRevealedEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OpponentsPlayWithTheTopCardRevealedEffect())); } public Telepathy(final Telepathy card) { @@ -68,7 +66,7 @@ public class Telepathy extends CardImpl { class OpponentsPlayWithTheTopCardRevealedEffect extends ContinuousEffectImpl { public OpponentsPlayWithTheTopCardRevealedEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Layer.PlayerEffects, Constants.SubLayer.NA, Constants.Outcome.Detriment); + super(Duration.WhileOnBattlefield, Layer.PlayerEffects, SubLayer.NA, Outcome.Detriment); staticText = "Your opponents play with their hands revealed"; } diff --git a/Mage.Sets/src/mage/sets/urzassaga/ThranQuarry.java b/Mage.Sets/src/mage/sets/urzassaga/ThranQuarry.java index 211116d9ef8..73e767a8573 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/ThranQuarry.java +++ b/Mage.Sets/src/mage/sets/urzassaga/ThranQuarry.java @@ -28,13 +28,14 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.events.GameEvent; @@ -70,7 +71,7 @@ public class ThranQuarry extends CardImpl { class ThranQuarryTriggeredAbility extends TriggeredAbilityImpl { ThranQuarryTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new SacrificeSourceEffect()); + super(Zone.BATTLEFIELD, new SacrificeSourceEffect()); } ThranQuarryTriggeredAbility(final ThranQuarryTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/urzassaga/TimeSpiral.java b/Mage.Sets/src/mage/sets/urzassaga/TimeSpiral.java index 4e4e376bd50..74ba499db4e 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/TimeSpiral.java +++ b/Mage.Sets/src/mage/sets/urzassaga/TimeSpiral.java @@ -28,9 +28,9 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileSpellEffect; diff --git a/Mage.Sets/src/mage/sets/urzassaga/TolarianAcademy.java b/Mage.Sets/src/mage/sets/urzassaga/TolarianAcademy.java index 37d121b3a94..fbcccc76a98 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/TolarianAcademy.java +++ b/Mage.Sets/src/mage/sets/urzassaga/TolarianAcademy.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.mana.DynamicManaAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/TreefolkSeedlings.java b/Mage.Sets/src/mage/sets/urzassaga/TreefolkSeedlings.java index e5f48281353..9d19a3930c9 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/TreefolkSeedlings.java +++ b/Mage.Sets/src/mage/sets/urzassaga/TreefolkSeedlings.java @@ -30,10 +30,10 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; diff --git a/Mage.Sets/src/mage/sets/urzassaga/Turnabout.java b/Mage.Sets/src/mage/sets/urzassaga/Turnabout.java index baf32ac38f3..df5961788a0 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Turnabout.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Turnabout.java @@ -29,14 +29,15 @@ package mage.sets.urzassaga; import java.util.HashSet; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.choices.Choice; import mage.choices.ChoiceImpl; +import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -91,7 +92,7 @@ class TurnaboutEffect extends OneShotEffect { } public TurnaboutEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "Choose artifact, creature, or land. Tap all untapped permanents of the chosen type target player controls, or untap all tapped permanents of that type that player controls"; } diff --git a/Mage.Sets/src/mage/sets/urzassaga/UnworthyDead.java b/Mage.Sets/src/mage/sets/urzassaga/UnworthyDead.java index 6e2451861d6..4bb9d9328e3 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/UnworthyDead.java +++ b/Mage.Sets/src/mage/sets/urzassaga/UnworthyDead.java @@ -29,9 +29,9 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/urzassaga/UrzasArmor.java b/Mage.Sets/src/mage/sets/urzassaga/UrzasArmor.java index 5d6059b5371..2f3cc0abc39 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/UrzasArmor.java +++ b/Mage.Sets/src/mage/sets/urzassaga/UrzasArmor.java @@ -28,10 +28,10 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.PreventionEffectImpl; diff --git a/Mage.Sets/src/mage/sets/urzassaga/VampiricEmbrace.java b/Mage.Sets/src/mage/sets/urzassaga/VampiricEmbrace.java index c43f9b71ec2..5f45139c59d 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/VampiricEmbrace.java +++ b/Mage.Sets/src/mage/sets/urzassaga/VampiricEmbrace.java @@ -28,12 +28,12 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.DiesAndDealtDamageThisTurnTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/urzassaga/VernalBloom.java b/Mage.Sets/src/mage/sets/urzassaga/VernalBloom.java index 4c05c60faf6..b32f0021760 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/VernalBloom.java +++ b/Mage.Sets/src/mage/sets/urzassaga/VernalBloom.java @@ -28,15 +28,16 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.common.ManaEffect; import mage.abilities.mana.TriggeredManaAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -79,7 +80,7 @@ class VernalBloomTriggeredAbility extends TriggeredManaAbility { this.expansionSetCode = "USG"; //{3}: Each player puts the top two cards of his or her library into his or her graveyard. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new WhetstoneEffect(), new ManaCostsImpl("{3}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WhetstoneEffect(), new ManaCostsImpl("{3}")); this.addAbility(ability); } @@ -69,7 +70,7 @@ public class Whetstone extends CardImpl { class WhetstoneEffect extends OneShotEffect { WhetstoneEffect() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); staticText = "Each player puts the top two cards of his or her library into his or her graveyard"; } diff --git a/Mage.Sets/src/mage/sets/urzassaga/Wildfire.java b/Mage.Sets/src/mage/sets/urzassaga/Wildfire.java index 1b4a0cf19d5..a68691a7289 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Wildfire.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Wildfire.java @@ -28,8 +28,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.effects.common.SacrificeAllEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzassaga/WindingWurm.java b/Mage.Sets/src/mage/sets/urzassaga/WindingWurm.java index 3e10660594a..5261a4aabe2 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/WindingWurm.java +++ b/Mage.Sets/src/mage/sets/urzassaga/WindingWurm.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.EchoAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzassaga/WornPowerstone.java b/Mage.Sets/src/mage/sets/urzassaga/WornPowerstone.java index 2ffbf30f1a8..ecac258b297 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/WornPowerstone.java +++ b/Mage.Sets/src/mage/sets/urzassaga/WornPowerstone.java @@ -29,8 +29,8 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.effects.common.BasicManaEffect; diff --git a/Mage.Sets/src/mage/sets/urzassaga/Worship.java b/Mage.Sets/src/mage/sets/urzassaga/Worship.java index da20cf1c55c..47fc5323056 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Worship.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Worship.java @@ -27,9 +27,7 @@ */ package mage.sets.urzassaga; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; @@ -54,7 +52,7 @@ public class Worship extends CardImpl { this.color.setWhite(true); // If you control a creature, damage that would reduce your life total to less than 1 reduces it to 1 instead. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new WorshipReplacementEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WorshipReplacementEffect())); } public Worship(final Worship card) { @@ -70,7 +68,7 @@ public class Worship extends CardImpl { class WorshipReplacementEffect extends ReplacementEffectImpl { public WorshipReplacementEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "If you control a creature, damage that would reduce your life total to less than 1 reduces it to 1 instead"; } @@ -88,7 +86,7 @@ class WorshipReplacementEffect extends ReplacementEffectImpl { } public AnvilOfBogardanEffect() { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); staticText = "that player draws an additional card, then discards a card"; } diff --git a/Mage.Sets/src/mage/sets/visions/Archangel.java b/Mage.Sets/src/mage/sets/visions/Archangel.java index 2bca8814e57..cbf1645b66e 100644 --- a/Mage.Sets/src/mage/sets/visions/Archangel.java +++ b/Mage.Sets/src/mage/sets/visions/Archangel.java @@ -28,7 +28,7 @@ package mage.sets.visions; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/visions/Breezekeeper.java b/Mage.Sets/src/mage/sets/visions/Breezekeeper.java index ea68dd0b3e9..b34b540a6b4 100644 --- a/Mage.Sets/src/mage/sets/visions/Breezekeeper.java +++ b/Mage.Sets/src/mage/sets/visions/Breezekeeper.java @@ -28,8 +28,8 @@ package mage.sets.visions; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.PhasingAbility; diff --git a/Mage.Sets/src/mage/sets/visions/Coercion.java b/Mage.Sets/src/mage/sets/visions/Coercion.java index 3ee23d17a45..40453277110 100644 --- a/Mage.Sets/src/mage/sets/visions/Coercion.java +++ b/Mage.Sets/src/mage/sets/visions/Coercion.java @@ -28,10 +28,10 @@ package mage.sets.visions; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/visions/CryptRats.java b/Mage.Sets/src/mage/sets/visions/CryptRats.java index 98cec73c7b6..5e6fff61be8 100644 --- a/Mage.Sets/src/mage/sets/visions/CryptRats.java +++ b/Mage.Sets/src/mage/sets/visions/CryptRats.java @@ -28,9 +28,9 @@ package mage.sets.visions; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/visions/ElephantGrass.java b/Mage.Sets/src/mage/sets/visions/ElephantGrass.java index 5b847b3c841..4e81954eece 100644 --- a/Mage.Sets/src/mage/sets/visions/ElephantGrass.java +++ b/Mage.Sets/src/mage/sets/visions/ElephantGrass.java @@ -28,9 +28,8 @@ package mage.sets.visions; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -57,9 +56,9 @@ public class ElephantGrass extends CardImpl { // Cumulative upkeep {1} this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl("{1}"))); // Black creatures can't attack you. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ElephantGrassReplacementEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ElephantGrassReplacementEffect())); // Nonblack creatures can't attack you unless their controller pays {2} for each creature he or she controls that's attacking you. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ElephantGrassReplacementEffect2())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ElephantGrassReplacementEffect2())); } public ElephantGrass(final ElephantGrass card) { @@ -77,7 +76,7 @@ class ElephantGrassReplacementEffect extends ReplacementEffectImpl { ElephantGrassReplacementEffect2 ( ) { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Neutral); + super(Duration.WhileOnBattlefield, Outcome.Neutral); staticText = "Nonblack creatures can't attack you unless their controller pays {2} for each creature he or she controls that's attacking you"; } @@ -136,7 +135,7 @@ class ElephantGrassReplacementEffect2 extends ReplacementEffectImpl { class UndiscoveredParadiseEffect extends OneShotEffect { public UndiscoveredParadiseEffect() { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); staticText = "During your next untap step, as you untap your permanents, return {this} to its owner's hand"; } diff --git a/Mage.Sets/src/mage/sets/visions/Warthog.java b/Mage.Sets/src/mage/sets/visions/Warthog.java index f3811ff1af0..1ab07f028aa 100644 --- a/Mage.Sets/src/mage/sets/visions/Warthog.java +++ b/Mage.Sets/src/mage/sets/visions/Warthog.java @@ -28,8 +28,8 @@ package mage.sets.visions; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/weatherlight/ArdentMilitia.java b/Mage.Sets/src/mage/sets/weatherlight/ArdentMilitia.java index 093bf615856..be61e7487b4 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/ArdentMilitia.java +++ b/Mage.Sets/src/mage/sets/weatherlight/ArdentMilitia.java @@ -28,7 +28,7 @@ package mage.sets.weatherlight; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/weatherlight/CallOfTheWild.java b/Mage.Sets/src/mage/sets/weatherlight/CallOfTheWild.java index 2531f96ee3a..7851342fb41 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/CallOfTheWild.java +++ b/Mage.Sets/src/mage/sets/weatherlight/CallOfTheWild.java @@ -28,11 +28,11 @@ package mage.sets.weatherlight; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -57,7 +57,7 @@ public class CallOfTheWild extends CardImpl { this.color.setGreen(true); // {2}{G}{G}: Reveal the top card of your library. If it's a creature card, put it onto the battlefield. Otherwise, put it into your graveyard. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CallOfTheWildEffect(), new ManaCostsImpl("{2}{G}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CallOfTheWildEffect(), new ManaCostsImpl("{2}{G}{G}"))); } public CallOfTheWild(final CallOfTheWild card) { diff --git a/Mage.Sets/src/mage/sets/weatherlight/Doomsday.java b/Mage.Sets/src/mage/sets/weatherlight/Doomsday.java index 4877b1413e7..8597e6eb8d5 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/Doomsday.java +++ b/Mage.Sets/src/mage/sets/weatherlight/Doomsday.java @@ -28,16 +28,17 @@ package mage.sets.weatherlight; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.game.Game; import mage.players.Player; @@ -73,7 +74,7 @@ public class Doomsday extends CardImpl { class DoomsdayEffect extends OneShotEffect { public DoomsdayEffect() { - super(Constants.Outcome.LoseLife); + super(Outcome.LoseLife); staticText = "Search your library and graveyard for five cards and exile the rest. Put the chosen cards on top of your library in any order. You lose half your life, rounded up"; } @@ -92,12 +93,12 @@ class DoomsdayEffect extends OneShotEffect { if (player != null) { //Search your library and graveyard for five cards - Cards allCards = new CardsImpl(Constants.Zone.PICK); - Cards cards = new CardsImpl(Constants.Zone.PICK); + Cards allCards = new CardsImpl(Zone.PICK); + Cards cards = new CardsImpl(Zone.PICK); allCards.addAll(player.getLibrary().getCardList()); allCards.addAll(player.getGraveyard()); int number = Math.min(5, allCards.size()); - TargetCard target = new TargetCard(number, number, Constants.Zone.PICK, new FilterCard()); + TargetCard target = new TargetCard(number, number, Zone.PICK, new FilterCard()); if(player.choose(Outcome.Benefit, allCards, target, game)){ // exile the rest @@ -114,20 +115,20 @@ class DoomsdayEffect extends OneShotEffect { } //Put the chosen cards on top of your library in any order - target = new TargetCard(Constants.Zone.PICK, new FilterCard("Card to put on top")); + target = new TargetCard(Zone.PICK, new FilterCard("Card to put on top")); target.setRequired(true); while (cards.size() > 1) { player.choose(Outcome.Neutral, cards, target, game); Card card = cards.get(target.getFirstTarget(), game); if (card != null) { cards.remove(card); - card.moveToZone(Constants.Zone.LIBRARY, source.getId(), game, true); + card.moveToZone(Zone.LIBRARY, source.getId(), game, true); } target.clearChosen(); } if (cards.size() == 1) { Card card = cards.get(cards.iterator().next(), game); - card.moveToZone(Constants.Zone.LIBRARY, source.getId(), game, true); + card.moveToZone(Zone.LIBRARY, source.getId(), game, true); } } diff --git a/Mage.Sets/src/mage/sets/weatherlight/Firestorm.java b/Mage.Sets/src/mage/sets/weatherlight/Firestorm.java index 236828fed18..79dbb4b0fe4 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/Firestorm.java +++ b/Mage.Sets/src/mage/sets/weatherlight/Firestorm.java @@ -29,9 +29,9 @@ package mage.sets.weatherlight; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.CostImpl; import mage.abilities.costs.VariableCost; @@ -39,6 +39,8 @@ import mage.abilities.dynamicvalue.common.GetXValue; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterMana; import mage.game.Game; import mage.game.permanent.Permanent; @@ -79,7 +81,7 @@ public class Firestorm extends CardImpl { class FirestormEffect extends OneShotEffect { public FirestormEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "{this} deals X damage to each of X target creatures and/or players"; } @@ -93,7 +95,7 @@ class FirestormEffect extends OneShotEffect { int amount = (new GetXValue()).calculate(game, source); TargetCreatureOrPlayer target = new TargetCreatureOrPlayer(amount); if (you != null) { - if (target.canChoose(source.getControllerId(), game) && target.choose(Constants.Outcome.Neutral, source.getControllerId(), source.getId(), game)) { + if (target.canChoose(source.getControllerId(), game) && target.choose(Outcome.Neutral, source.getControllerId(), source.getId(), game)) { if (!target.getTargets().isEmpty()) { List targets = target.getTargets(); for (UUID targetId : targets) { @@ -146,11 +148,11 @@ class FirestormCost extends CostImpl implements VariableCost { Player you = game.getPlayer(controllerId); while (true) { target.clearChosen(); - if (target.canChoose(controllerId, game) && target.choose(Constants.Outcome.Discard, controllerId, sourceId, game)) { + if (target.canChoose(controllerId, game) && target.choose(Outcome.Discard, controllerId, sourceId, game)) { Card card = you.getHand().get(target.getFirstTarget(), game); if (card != null) { you.getHand().remove(card); - card.moveToZone(Constants.Zone.GRAVEYARD, sourceId, game, false); + card.moveToZone(Zone.GRAVEYARD, sourceId, game, false); amountPaid++; } } else { diff --git a/Mage.Sets/src/mage/sets/weatherlight/GemstoneMine.java b/Mage.Sets/src/mage/sets/weatherlight/GemstoneMine.java index 46a50d1b24a..d1aa00eab5c 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/GemstoneMine.java +++ b/Mage.Sets/src/mage/sets/weatherlight/GemstoneMine.java @@ -28,7 +28,7 @@ package mage.sets.weatherlight; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/weatherlight/JabarisBanner.java b/Mage.Sets/src/mage/sets/weatherlight/JabarisBanner.java index 0348b08d69c..175cf7c5a29 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/JabarisBanner.java +++ b/Mage.Sets/src/mage/sets/weatherlight/JabarisBanner.java @@ -28,9 +28,9 @@ package mage.sets.weatherlight; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -38,6 +38,8 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FlankingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; /** @@ -51,7 +53,7 @@ public class JabarisBanner extends CardImpl { this.expansionSetCode = "WTH"; // {1}, {tap}: Target creature gains flanking until end of turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityTargetEffect(new FlankingAbility(), Constants.Duration.EndOfTurn), new ManaCostsImpl("{1}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new FlankingAbility(), Duration.EndOfTurn), new ManaCostsImpl("{1}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/weatherlight/LavaHounds.java b/Mage.Sets/src/mage/sets/weatherlight/LavaHounds.java index 9c690ddbda7..fe6fd4a3087 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/LavaHounds.java +++ b/Mage.Sets/src/mage/sets/weatherlight/LavaHounds.java @@ -28,8 +28,8 @@ package mage.sets.weatherlight; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DamageControllerEffect; diff --git a/Mage.Sets/src/mage/sets/weatherlight/MaraxusOfKeld.java b/Mage.Sets/src/mage/sets/weatherlight/MaraxusOfKeld.java index 75e935e08e9..2bda55d8841 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/MaraxusOfKeld.java +++ b/Mage.Sets/src/mage/sets/weatherlight/MaraxusOfKeld.java @@ -27,14 +27,15 @@ */ package mage.sets.weatherlight; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -70,7 +71,7 @@ public class MaraxusOfKeld extends CardImpl { this.toughness = new MageInt(0); // Maraxus of Keld's power and toughness are each equal to the number of untapped artifacts, creatures, and lands you control. - this.addAbility(new SimpleStaticAbility(Constants.Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Constants.Duration.EndOfGame))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Duration.EndOfGame))); } public MaraxusOfKeld(final MaraxusOfKeld card) { diff --git a/Mage.Sets/src/mage/sets/weatherlight/MindStone.java b/Mage.Sets/src/mage/sets/weatherlight/MindStone.java index a6504894676..3d3c88ac02a 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/MindStone.java +++ b/Mage.Sets/src/mage/sets/weatherlight/MindStone.java @@ -28,7 +28,7 @@ package mage.sets.weatherlight; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/weatherlight/OrcishSettlers.java b/Mage.Sets/src/mage/sets/weatherlight/OrcishSettlers.java index be5501e6c68..a47509f89db 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/OrcishSettlers.java +++ b/Mage.Sets/src/mage/sets/weatherlight/OrcishSettlers.java @@ -29,9 +29,9 @@ package mage.sets.weatherlight; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +41,8 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -63,7 +65,7 @@ public class OrcishSettlers extends CardImpl { this.toughness = new MageInt(1); // {X}{X}{R}, {tap}, Sacrifice Orcish Settlers: Destroy X target lands. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new OrcishSettlersEffect(), new ManaCostsImpl("{X}{X}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OrcishSettlersEffect(), new ManaCostsImpl("{X}{X}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); @@ -82,7 +84,7 @@ public class OrcishSettlers extends CardImpl { class OrcishSettlersEffect extends OneShotEffect { public OrcishSettlersEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); this.staticText = "Destroy X target lands"; } @@ -105,7 +107,7 @@ class OrcishSettlersEffect extends OneShotEffect { return false; } - if (player.choose(Constants.Outcome.DestroyPermanent, target, id, game)) { + if (player.choose(Outcome.DestroyPermanent, target, id, game)) { List targets = target.getTargets(); for (UUID landId : targets) { Permanent land = game.getPermanent(landId); diff --git a/Mage.Sets/src/mage/sets/weatherlight/RedwoodTreefolk.java b/Mage.Sets/src/mage/sets/weatherlight/RedwoodTreefolk.java index 6e2301b6eab..1a9ae39ec3c 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/RedwoodTreefolk.java +++ b/Mage.Sets/src/mage/sets/weatherlight/RedwoodTreefolk.java @@ -28,8 +28,8 @@ package mage.sets.weatherlight; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/weatherlight/ShadowRider.java b/Mage.Sets/src/mage/sets/weatherlight/ShadowRider.java index 43f7e154855..9760f9bce18 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/ShadowRider.java +++ b/Mage.Sets/src/mage/sets/weatherlight/ShadowRider.java @@ -28,8 +28,8 @@ package mage.sets.weatherlight; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlankingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/weatherlight/TolarianDrake.java b/Mage.Sets/src/mage/sets/weatherlight/TolarianDrake.java index bf5cbe82a35..6de102c4b78 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/TolarianDrake.java +++ b/Mage.Sets/src/mage/sets/weatherlight/TolarianDrake.java @@ -28,8 +28,8 @@ package mage.sets.weatherlight; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.PhasingAbility; diff --git a/Mage.Sets/src/mage/sets/weatherlight/UktabiEfreet.java b/Mage.Sets/src/mage/sets/weatherlight/UktabiEfreet.java index 454ad5f0e93..d0904ddfdf0 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/UktabiEfreet.java +++ b/Mage.Sets/src/mage/sets/weatherlight/UktabiEfreet.java @@ -28,8 +28,8 @@ package mage.sets.weatherlight; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.CumulativeUpkeepAbility; diff --git a/Mage.Sets/src/mage/sets/worldwake/AEtherTradewinds.java b/Mage.Sets/src/mage/sets/worldwake/AEtherTradewinds.java index 10c815b5814..cfa92f48140 100644 --- a/Mage.Sets/src/mage/sets/worldwake/AEtherTradewinds.java +++ b/Mage.Sets/src/mage/sets/worldwake/AEtherTradewinds.java @@ -28,9 +28,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -50,7 +49,7 @@ public class AEtherTradewinds extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("permanent you don't control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.NOT_YOU)); + filter.add(new ControllerPredicate(TargetController.NOT_YOU)); } public AEtherTradewinds(UUID ownerId) { @@ -79,7 +78,7 @@ public class AEtherTradewinds extends CardImpl { class AEtherTradewindsEffect extends OneShotEffect { public AEtherTradewindsEffect() { - super(Constants.Outcome.ReturnToHand); + super(Outcome.ReturnToHand); this.staticText = "Return target permanent you control and target permanent you don't control to their owners' hands"; } @@ -98,11 +97,11 @@ class AEtherTradewindsEffect extends OneShotEffect { Permanent permanent = game.getPermanent(source.getFirstTarget()); if (permanent != null) { - result |= permanent.moveToZone(Constants.Zone.HAND, source.getId(), game, false); + result |= permanent.moveToZone(Zone.HAND, source.getId(), game, false); } permanent = game.getPermanent(source.getTargets().get(1).getFirstTarget()); if (permanent != null) { - result |= permanent.moveToZone(Constants.Zone.HAND, source.getId(), game, false); + result |= permanent.moveToZone(Zone.HAND, source.getId(), game, false); } return result; diff --git a/Mage.Sets/src/mage/sets/worldwake/AbyssalPersecutor.java b/Mage.Sets/src/mage/sets/worldwake/AbyssalPersecutor.java index fcaec8491a8..2251ad35e12 100644 --- a/Mage.Sets/src/mage/sets/worldwake/AbyssalPersecutor.java +++ b/Mage.Sets/src/mage/sets/worldwake/AbyssalPersecutor.java @@ -28,11 +28,11 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/worldwake/AdmonitionAngel.java b/Mage.Sets/src/mage/sets/worldwake/AdmonitionAngel.java index f7737edfd8e..d96fbcea04e 100644 --- a/Mage.Sets/src/mage/sets/worldwake/AdmonitionAngel.java +++ b/Mage.Sets/src/mage/sets/worldwake/AdmonitionAngel.java @@ -28,9 +28,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; @@ -40,6 +40,7 @@ import mage.abilities.effects.common.ExileTargetForSourceEffect; import mage.abilities.effects.common.ReturnFromExileForSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -72,12 +73,12 @@ public class AdmonitionAngel extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Landfall - Whenever a land enters the battlefield under your control, you may exile target nonland permanent other than Admonition Angel. - TriggeredAbility ability = new LandfallAbility(Constants.Zone.BATTLEFIELD, new ExileTargetForSourceEffect("Admonition Angel Exile"), true); + TriggeredAbility ability = new LandfallAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect("Admonition Angel Exile"), true); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); // When Admonition Angel leaves the battlefield, return all cards exiled with it to the battlefield under their owners' control. - Ability ability2 = new LeavesBattlefieldTriggeredAbility(new ReturnFromExileForSourceEffect(Constants.Zone.BATTLEFIELD), false); + Ability ability2 = new LeavesBattlefieldTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.BATTLEFIELD), false); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/worldwake/AgadeemOccultist.java b/Mage.Sets/src/mage/sets/worldwake/AgadeemOccultist.java index 43ef9603dbb..6d9fe1ff88d 100644 --- a/Mage.Sets/src/mage/sets/worldwake/AgadeemOccultist.java +++ b/Mage.Sets/src/mage/sets/worldwake/AgadeemOccultist.java @@ -28,9 +28,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +38,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; @@ -63,7 +65,7 @@ public class AgadeemOccultist extends CardImpl { this.toughness = new MageInt(2); // {tap}: Put target creature card from an opponent's graveyard onto the battlefield under your control if its converted mana cost is less than or equal to the number of Allies you control. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AgadeemOccultistEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AgadeemOccultistEffect(), new TapSourceCost())); } @@ -80,7 +82,7 @@ public class AgadeemOccultist extends CardImpl { class AgadeemOccultistEffect extends OneShotEffect { public AgadeemOccultistEffect() { - super(Constants.Outcome.GainControl); + super(Outcome.GainControl); this.staticText = "Put target creature card from an opponent's graveyard onto the battlefield under your control if its converted mana cost is less than or equal to the number of Allies you control"; } @@ -110,12 +112,12 @@ class AgadeemOccultistEffect extends OneShotEffect { if (you != null) { if (target.canChoose(source.getControllerId(), game) - && you.choose(Constants.Outcome.GainControl, target, source.getSourceId(), game)) { + && you.choose(Outcome.GainControl, target, source.getSourceId(), game)) { if (!target.getTargets().isEmpty()) { Card card = game.getCard(target.getFirstTarget()); if (card != null) { if (card.getManaCost().convertedManaCost() <= allycount) { - card.putOntoBattlefield(game, Constants.Zone.GRAVEYARD, source.getId(), source.getControllerId()); + card.putOntoBattlefield(game, Zone.GRAVEYARD, source.getId(), source.getControllerId()); return true; } } diff --git a/Mage.Sets/src/mage/sets/worldwake/AkoumBattlesinger.java b/Mage.Sets/src/mage/sets/worldwake/AkoumBattlesinger.java index d17ddba7007..b8f969d99cb 100644 --- a/Mage.Sets/src/mage/sets/worldwake/AkoumBattlesinger.java +++ b/Mage.Sets/src/mage/sets/worldwake/AkoumBattlesinger.java @@ -28,10 +28,10 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.common.AllyEntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; diff --git a/Mage.Sets/src/mage/sets/worldwake/AmuletOfVigor.java b/Mage.Sets/src/mage/sets/worldwake/AmuletOfVigor.java index c2daf83433b..8d476c54622 100644 --- a/Mage.Sets/src/mage/sets/worldwake/AmuletOfVigor.java +++ b/Mage.Sets/src/mage/sets/worldwake/AmuletOfVigor.java @@ -28,9 +28,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.UntapTargetEffect; diff --git a/Mage.Sets/src/mage/sets/worldwake/AnowonTheRuinSage.java b/Mage.Sets/src/mage/sets/worldwake/AnowonTheRuinSage.java index efb96a0a320..2cb1f9f7e71 100644 --- a/Mage.Sets/src/mage/sets/worldwake/AnowonTheRuinSage.java +++ b/Mage.Sets/src/mage/sets/worldwake/AnowonTheRuinSage.java @@ -28,9 +28,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.SacrificeAllEffect; diff --git a/Mage.Sets/src/mage/sets/worldwake/ApexHawks.java b/Mage.Sets/src/mage/sets/worldwake/ApexHawks.java index d6e3a6f0810..acd80fd6c84 100644 --- a/Mage.Sets/src/mage/sets/worldwake/ApexHawks.java +++ b/Mage.Sets/src/mage/sets/worldwake/ApexHawks.java @@ -28,8 +28,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.dynamicvalue.common.MultikickerCount; diff --git a/Mage.Sets/src/mage/sets/worldwake/ArborElf.java b/Mage.Sets/src/mage/sets/worldwake/ArborElf.java index def44549cf9..8aa332f7173 100644 --- a/Mage.Sets/src/mage/sets/worldwake/ArborElf.java +++ b/Mage.Sets/src/mage/sets/worldwake/ArborElf.java @@ -29,9 +29,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/worldwake/ArchonOfRedemption.java b/Mage.Sets/src/mage/sets/worldwake/ArchonOfRedemption.java index 28a99aae0a7..8e289036d46 100644 --- a/Mage.Sets/src/mage/sets/worldwake/ArchonOfRedemption.java +++ b/Mage.Sets/src/mage/sets/worldwake/ArchonOfRedemption.java @@ -29,9 +29,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -39,6 +38,8 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -76,7 +77,7 @@ public class ArchonOfRedemption extends CardImpl { class ArchonOfRedemptionTriggeredAbility extends TriggeredAbilityImpl { ArchonOfRedemptionTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new ArchonOfRedemptionEffect(), true); + super(Zone.BATTLEFIELD, new ArchonOfRedemptionEffect(), true); } ArchonOfRedemptionTriggeredAbility(final ArchonOfRedemptionTriggeredAbility ability) { @@ -114,7 +115,7 @@ class ArchonOfRedemptionTriggeredAbility extends TriggeredAbilityImpl { ArchonOfRedemptionEffect() { - super(Constants.Outcome.GainLife); + super(Outcome.GainLife); } ArchonOfRedemptionEffect(final ArchonOfRedemptionEffect effect) { @@ -126,7 +127,7 @@ class ArchonOfRedemptionEffect extends OneShotEffect { Permanent p = game.getPermanent(targetPointer.getFirst(game, source)); Player player = game.getPlayer(source.getControllerId()); if (p == null) { - p = (Permanent) game.getLastKnownInformation(targetPointer.getFirst(game, source), Constants.Zone.BATTLEFIELD); + p = (Permanent) game.getLastKnownInformation(targetPointer.getFirst(game, source), Zone.BATTLEFIELD); } if (p != null && player != null) { player.gainLife(p.getPower().getValue(), game); diff --git a/Mage.Sets/src/mage/sets/worldwake/AvengerOfZendikar.java b/Mage.Sets/src/mage/sets/worldwake/AvengerOfZendikar.java index 2a8760bc16e..14fcdd96fd7 100644 --- a/Mage.Sets/src/mage/sets/worldwake/AvengerOfZendikar.java +++ b/Mage.Sets/src/mage/sets/worldwake/AvengerOfZendikar.java @@ -29,8 +29,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.LandfallAbility; diff --git a/Mage.Sets/src/mage/sets/worldwake/BasiliskCollar.java b/Mage.Sets/src/mage/sets/worldwake/BasiliskCollar.java index 6232b41fc59..07c38d2e88c 100644 --- a/Mage.Sets/src/mage/sets/worldwake/BasiliskCollar.java +++ b/Mage.Sets/src/mage/sets/worldwake/BasiliskCollar.java @@ -30,11 +30,10 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; @@ -42,6 +41,7 @@ import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; +import mage.constants.AttachmentType; /** * @@ -54,8 +54,8 @@ public class BasiliskCollar extends CardImpl { this.expansionSetCode = "WWK"; this.subtype.add("Equipment"); this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DeathtouchAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DeathtouchAbility.getInstance(), AttachmentType.EQUIPMENT))); } public BasiliskCollar(final BasiliskCollar card) { diff --git a/Mage.Sets/src/mage/sets/worldwake/BattleHurda.java b/Mage.Sets/src/mage/sets/worldwake/BattleHurda.java index 5b84921924c..2c3d1473cfa 100644 --- a/Mage.Sets/src/mage/sets/worldwake/BattleHurda.java +++ b/Mage.Sets/src/mage/sets/worldwake/BattleHurda.java @@ -29,8 +29,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/worldwake/BazaarTrader.java b/Mage.Sets/src/mage/sets/worldwake/BazaarTrader.java index fed14f3002c..c033475c88c 100644 --- a/Mage.Sets/src/mage/sets/worldwake/BazaarTrader.java +++ b/Mage.Sets/src/mage/sets/worldwake/BazaarTrader.java @@ -28,13 +28,13 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/worldwake/BestialMenace.java b/Mage.Sets/src/mage/sets/worldwake/BestialMenace.java index 5e5715ac238..922646eab08 100644 --- a/Mage.Sets/src/mage/sets/worldwake/BestialMenace.java +++ b/Mage.Sets/src/mage/sets/worldwake/BestialMenace.java @@ -29,8 +29,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.game.permanent.token.ElephantToken; diff --git a/Mage.Sets/src/mage/sets/worldwake/BloodhuskRitualist.java b/Mage.Sets/src/mage/sets/worldwake/BloodhuskRitualist.java index 1a1f169423c..b6d544c7e37 100644 --- a/Mage.Sets/src/mage/sets/worldwake/BloodhuskRitualist.java +++ b/Mage.Sets/src/mage/sets/worldwake/BloodhuskRitualist.java @@ -29,8 +29,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/worldwake/BojukaBog.java b/Mage.Sets/src/mage/sets/worldwake/BojukaBog.java index 7b479a8105f..7cd56ab50b9 100644 --- a/Mage.Sets/src/mage/sets/worldwake/BojukaBog.java +++ b/Mage.Sets/src/mage/sets/worldwake/BojukaBog.java @@ -29,10 +29,10 @@ package mage.sets.worldwake; import java.util.ArrayList; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/worldwake/BojukaBrigand.java b/Mage.Sets/src/mage/sets/worldwake/BojukaBrigand.java index fd0bd97e3d1..9936f9d1369 100644 --- a/Mage.Sets/src/mage/sets/worldwake/BojukaBrigand.java +++ b/Mage.Sets/src/mage/sets/worldwake/BojukaBrigand.java @@ -28,8 +28,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AllyEntersBattlefieldTriggeredAbility; import mage.abilities.common.CantBlockAbility; diff --git a/Mage.Sets/src/mage/sets/worldwake/BrinkOfDisaster.java b/Mage.Sets/src/mage/sets/worldwake/BrinkOfDisaster.java index 1b4c82dcf43..aecebb11a81 100644 --- a/Mage.Sets/src/mage/sets/worldwake/BrinkOfDisaster.java +++ b/Mage.Sets/src/mage/sets/worldwake/BrinkOfDisaster.java @@ -29,14 +29,15 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -70,7 +71,7 @@ public class BrinkOfDisaster extends CardImpl { // Enchant creature or land TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); // When enchanted permanent becomes tapped, destroy it. this.addAbility(new EnchantedBecomesTappedTriggeredAbility(new DestroyTargetEffect())); @@ -89,7 +90,7 @@ public class BrinkOfDisaster extends CardImpl { class EnchantedBecomesTappedTriggeredAbility extends TriggeredAbilityImpl { public EnchantedBecomesTappedTriggeredAbility(Effect effect) { - super(Constants.Zone.BATTLEFIELD, effect); + super(Zone.BATTLEFIELD, effect); } public EnchantedBecomesTappedTriggeredAbility(final EnchantedBecomesTappedTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/worldwake/BullRush.java b/Mage.Sets/src/mage/sets/worldwake/BullRush.java index 369c7fa5d16..4a4820d1fbc 100644 --- a/Mage.Sets/src/mage/sets/worldwake/BullRush.java +++ b/Mage.Sets/src/mage/sets/worldwake/BullRush.java @@ -29,9 +29,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/worldwake/ButcherOfMalakir.java b/Mage.Sets/src/mage/sets/worldwake/ButcherOfMalakir.java index 0b847ccc300..58925518f46 100644 --- a/Mage.Sets/src/mage/sets/worldwake/ButcherOfMalakir.java +++ b/Mage.Sets/src/mage/sets/worldwake/ButcherOfMalakir.java @@ -29,15 +29,17 @@ package mage.sets.worldwake; import java.util.Set; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesThisOrAnotherCreatureTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -85,7 +87,7 @@ public class ButcherOfMalakir extends CardImpl { class ButcherOfMalakirEffect extends OneShotEffect { public ButcherOfMalakirEffect() { - super(Constants.Outcome.Sacrifice); + super(Outcome.Sacrifice); this.staticText = "Each opponent sacrifices a creature"; } @@ -102,7 +104,7 @@ class ButcherOfMalakirEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { FilterControlledPermanent filter = new FilterControlledPermanent("creature you control"); filter.add(new CardTypePredicate(CardType.CREATURE)); - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); Set opponents = game.getOpponents(source.getControllerId()); for (UUID opponentId : opponents) { @@ -111,7 +113,7 @@ class ButcherOfMalakirEffect extends OneShotEffect { if (target.canChoose(player.getId(), game)) { while (!target.isChosen() && target.canChoose(player.getId(), game)) { - player.choose(Constants.Outcome.Sacrifice, target, source.getSourceId(), game); + player.choose(Outcome.Sacrifice, target, source.getSourceId(), game); } Permanent permanent = game.getPermanent(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/sets/worldwake/CalciteSnapper.java b/Mage.Sets/src/mage/sets/worldwake/CalciteSnapper.java index c655a81d42f..add7edbfbf7 100644 --- a/Mage.Sets/src/mage/sets/worldwake/CalciteSnapper.java +++ b/Mage.Sets/src/mage/sets/worldwake/CalciteSnapper.java @@ -28,9 +28,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.continious.SwitchPowerToughnessSourceEffect; diff --git a/Mage.Sets/src/mage/sets/worldwake/CanopyCover.java b/Mage.Sets/src/mage/sets/worldwake/CanopyCover.java index a9f969a2213..f4abe659a88 100644 --- a/Mage.Sets/src/mage/sets/worldwake/CanopyCover.java +++ b/Mage.Sets/src/mage/sets/worldwake/CanopyCover.java @@ -28,12 +28,12 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.RestrictionEffect; diff --git a/Mage.Sets/src/mage/sets/worldwake/CausticCrawler.java b/Mage.Sets/src/mage/sets/worldwake/CausticCrawler.java index 507934996e4..3046f2cc93a 100644 --- a/Mage.Sets/src/mage/sets/worldwake/CausticCrawler.java +++ b/Mage.Sets/src/mage/sets/worldwake/CausticCrawler.java @@ -28,9 +28,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.continious.BoostTargetEffect; diff --git a/Mage.Sets/src/mage/sets/worldwake/CelestialColonnade.java b/Mage.Sets/src/mage/sets/worldwake/CelestialColonnade.java index ee31d7390de..591acf568f2 100644 --- a/Mage.Sets/src/mage/sets/worldwake/CelestialColonnade.java +++ b/Mage.Sets/src/mage/sets/worldwake/CelestialColonnade.java @@ -29,10 +29,10 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/worldwake/ChainReaction.java b/Mage.Sets/src/mage/sets/worldwake/ChainReaction.java index d17af4a19fa..a205f8f5530 100644 --- a/Mage.Sets/src/mage/sets/worldwake/ChainReaction.java +++ b/Mage.Sets/src/mage/sets/worldwake/ChainReaction.java @@ -28,8 +28,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DamageAllEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/worldwake/ClawsOfValakut.java b/Mage.Sets/src/mage/sets/worldwake/ClawsOfValakut.java index 862fa8b13d6..b859d67af86 100644 --- a/Mage.Sets/src/mage/sets/worldwake/ClawsOfValakut.java +++ b/Mage.Sets/src/mage/sets/worldwake/ClawsOfValakut.java @@ -30,11 +30,10 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.AttachEffect; @@ -43,6 +42,9 @@ import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.AttachmentType; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -59,7 +61,7 @@ public class ClawsOfValakut extends CardImpl { static { filter.add(new SubtypePredicate("Mountain")); - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public ClawsOfValakut (UUID ownerId) { @@ -70,12 +72,12 @@ public class ClawsOfValakut extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(new PermanentsOnBattlefieldCount(filter, 1), new PermanentsOnBattlefieldCount(filter, 0), Duration.WhileOnBattlefield)); - ability.addEffect(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), Constants.AttachmentType.AURA)); + ability.addEffect(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/worldwake/CometStorm.java b/Mage.Sets/src/mage/sets/worldwake/CometStorm.java index 982cd87ba21..787a5be278f 100644 --- a/Mage.Sets/src/mage/sets/worldwake/CometStorm.java +++ b/Mage.Sets/src/mage/sets/worldwake/CometStorm.java @@ -28,9 +28,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.dynamicvalue.common.MultikickerCount; diff --git a/Mage.Sets/src/mage/sets/worldwake/CorruptedZendikon.java b/Mage.Sets/src/mage/sets/worldwake/CorruptedZendikon.java index 88b3b333d49..e0e4b90ccc4 100644 --- a/Mage.Sets/src/mage/sets/worldwake/CorruptedZendikon.java +++ b/Mage.Sets/src/mage/sets/worldwake/CorruptedZendikon.java @@ -28,9 +28,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; @@ -63,11 +62,11 @@ public class CorruptedZendikon extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.PutCreatureInPlay)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutCreatureInPlay)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - Ability ability2 = new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new OozeToken(), "Enchanted land is a 3/3 black Ooze creature. It's still a land.", Constants.Duration.Custom)); + Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new OozeToken(), "Enchanted land is a 3/3 black Ooze creature. It's still a land.", Duration.Custom)); this.addAbility(ability2); Ability ability3 = new DiesAttachedTriggeredAbility(new ReturnToHandAttachedEffect(), "enchanted land", false, false); diff --git a/Mage.Sets/src/mage/sets/worldwake/CosisRavager.java b/Mage.Sets/src/mage/sets/worldwake/CosisRavager.java index c8a5da0be15..d0b44f6fa1c 100644 --- a/Mage.Sets/src/mage/sets/worldwake/CosisRavager.java +++ b/Mage.Sets/src/mage/sets/worldwake/CosisRavager.java @@ -29,8 +29,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LandfallAbility; diff --git a/Mage.Sets/src/mage/sets/worldwake/CreepingTarPit.java b/Mage.Sets/src/mage/sets/worldwake/CreepingTarPit.java index 472d11a1173..77e10fb93bf 100644 --- a/Mage.Sets/src/mage/sets/worldwake/CreepingTarPit.java +++ b/Mage.Sets/src/mage/sets/worldwake/CreepingTarPit.java @@ -29,10 +29,10 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/worldwake/CrusherZendikon.java b/Mage.Sets/src/mage/sets/worldwake/CrusherZendikon.java index caf0b132829..de5293ce60a 100644 --- a/Mage.Sets/src/mage/sets/worldwake/CrusherZendikon.java +++ b/Mage.Sets/src/mage/sets/worldwake/CrusherZendikon.java @@ -28,9 +28,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; @@ -64,11 +63,11 @@ public class CrusherZendikon extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.PutCreatureInPlay)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutCreatureInPlay)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - Ability ability2 = new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new BeastToken(), "Enchanted land is a 4/2 red Beast creature with trample. It's still a land.", Constants.Duration.Custom)); + Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new BeastToken(), "Enchanted land is a 4/2 red Beast creature with trample. It's still a land.", Duration.Custom)); this.addAbility(ability2); Ability ability3 = new DiesAttachedTriggeredAbility(new ReturnToHandAttachedEffect(), "enchanted land", false, false); diff --git a/Mage.Sets/src/mage/sets/worldwake/CunningSparkmage.java b/Mage.Sets/src/mage/sets/worldwake/CunningSparkmage.java index 8214dbbce8c..0894e8151d7 100644 --- a/Mage.Sets/src/mage/sets/worldwake/CunningSparkmage.java +++ b/Mage.Sets/src/mage/sets/worldwake/CunningSparkmage.java @@ -29,9 +29,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/worldwake/DeadReckoning.java b/Mage.Sets/src/mage/sets/worldwake/DeadReckoning.java index 24852b024b1..2f324760310 100644 --- a/Mage.Sets/src/mage/sets/worldwake/DeadReckoning.java +++ b/Mage.Sets/src/mage/sets/worldwake/DeadReckoning.java @@ -28,13 +28,15 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.game.permanent.Permanent; @@ -72,7 +74,7 @@ public class DeadReckoning extends CardImpl { class DeadReckoningEffect extends OneShotEffect { public DeadReckoningEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); this.staticText = "You may put target creature card from your graveyard on top of your library. If you do, {this} deals damage equal to that card's power to target creature"; } @@ -93,12 +95,12 @@ class DeadReckoningEffect extends OneShotEffect { if (you != null) { if (target1.canChoose(source.getControllerId(), game) - && you.choose(Constants.Outcome.Benefit, target1, source.getSourceId(), game) + && you.choose(Outcome.Benefit, target1, source.getSourceId(), game) && target2.canChoose(source.getControllerId(), game) - && you.choose(Constants.Outcome.Damage, target2, source.getSourceId(), game)) { + && you.choose(Outcome.Damage, target2, source.getSourceId(), game)) { Card creatureInGraveyard = game.getCard(target1.getFirstTarget()); if (creatureInGraveyard != null) { - if (creatureInGraveyard.moveToZone(Constants.Zone.LIBRARY, id, game, true)) { + if (creatureInGraveyard.moveToZone(Zone.LIBRARY, id, game, true)) { int power = creatureInGraveyard.getPower().getValue(); Permanent creature = game.getPermanent(target2.getFirstTarget()); if (creature != null) { diff --git a/Mage.Sets/src/mage/sets/worldwake/DeathforgeShaman.java b/Mage.Sets/src/mage/sets/worldwake/DeathforgeShaman.java index 65dbc0b264d..7437f84bbf3 100644 --- a/Mage.Sets/src/mage/sets/worldwake/DeathforgeShaman.java +++ b/Mage.Sets/src/mage/sets/worldwake/DeathforgeShaman.java @@ -28,9 +28,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/worldwake/DeathsShadow.java b/Mage.Sets/src/mage/sets/worldwake/DeathsShadow.java index 24b275b6581..219b1b2023b 100644 --- a/Mage.Sets/src/mage/sets/worldwake/DeathsShadow.java +++ b/Mage.Sets/src/mage/sets/worldwake/DeathsShadow.java @@ -28,15 +28,17 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.ControllerLifeCount; import mage.abilities.dynamicvalue.common.SignInversionDynamicValue; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -54,7 +56,7 @@ public class DeathsShadow extends CardImpl { this.toughness = new MageInt(13); // Death's Shadow gets -X/-X, where X is your life total. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(new SignInversionDynamicValue(new ControllerLifeCount()), new SignInversionDynamicValue(new ControllerLifeCount()), Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new SignInversionDynamicValue(new ControllerLifeCount()), new SignInversionDynamicValue(new ControllerLifeCount()), Duration.WhileOnBattlefield))); } public DeathsShadow(final DeathsShadow card) { diff --git a/Mage.Sets/src/mage/sets/worldwake/Dispel.java b/Mage.Sets/src/mage/sets/worldwake/Dispel.java index 9eedd697c81..6c02dd42820 100644 --- a/Mage.Sets/src/mage/sets/worldwake/Dispel.java +++ b/Mage.Sets/src/mage/sets/worldwake/Dispel.java @@ -28,8 +28,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; diff --git a/Mage.Sets/src/mage/sets/worldwake/DragonmasterOutcast.java b/Mage.Sets/src/mage/sets/worldwake/DragonmasterOutcast.java index 4a3bb7c1a9a..ca5f1379dad 100644 --- a/Mage.Sets/src/mage/sets/worldwake/DragonmasterOutcast.java +++ b/Mage.Sets/src/mage/sets/worldwake/DragonmasterOutcast.java @@ -28,9 +28,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.TriggeredAbility; @@ -40,6 +40,7 @@ import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.permanent.token.Token; @@ -67,7 +68,7 @@ public class DragonmasterOutcast extends CardImpl { this.toughness = new MageInt(1); // At the beginning of your upkeep, if you control six or more lands, put a 5/5 red Dragon creature token with flying onto the battlefield. - TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new DragonToken(), 1), Constants.TargetController.YOU, false); + TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new DragonToken(), 1), TargetController.YOU, false); this.addAbility(new ConditionalTriggeredAbility(ability, new ControlsPermanentCondition(filter, ControlsPermanentCondition.CountType.MORE_THAN, 5), "At the beginning of your upkeep, if you control six or more lands, put a 5/5 red Dragon creature token with flying onto the battlefield.")); } diff --git a/Mage.Sets/src/mage/sets/worldwake/DreadStatuary.java b/Mage.Sets/src/mage/sets/worldwake/DreadStatuary.java index 29964db7116..b7ea622d8ed 100644 --- a/Mage.Sets/src/mage/sets/worldwake/DreadStatuary.java +++ b/Mage.Sets/src/mage/sets/worldwake/DreadStatuary.java @@ -29,10 +29,10 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/worldwake/EnclaveElite.java b/Mage.Sets/src/mage/sets/worldwake/EnclaveElite.java index 0492d71cf77..4d55f2d513c 100644 --- a/Mage.Sets/src/mage/sets/worldwake/EnclaveElite.java +++ b/Mage.Sets/src/mage/sets/worldwake/EnclaveElite.java @@ -28,8 +28,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.dynamicvalue.common.MultikickerCount; diff --git a/Mage.Sets/src/mage/sets/worldwake/EverflowingChalice.java b/Mage.Sets/src/mage/sets/worldwake/EverflowingChalice.java index 40963b9bbf1..47e8b83894e 100644 --- a/Mage.Sets/src/mage/sets/worldwake/EverflowingChalice.java +++ b/Mage.Sets/src/mage/sets/worldwake/EverflowingChalice.java @@ -29,8 +29,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.dynamicvalue.common.CountersCount; diff --git a/Mage.Sets/src/mage/sets/worldwake/Explore.java b/Mage.Sets/src/mage/sets/worldwake/Explore.java index 2109a9061c6..e64dc743474 100644 --- a/Mage.Sets/src/mage/sets/worldwake/Explore.java +++ b/Mage.Sets/src/mage/sets/worldwake/Explore.java @@ -30,9 +30,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.continious.PlayAdditionalLandsControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/worldwake/EyeOfUgin.java b/Mage.Sets/src/mage/sets/worldwake/EyeOfUgin.java index 8f2d96f4fad..cb67ed04d25 100644 --- a/Mage.Sets/src/mage/sets/worldwake/EyeOfUgin.java +++ b/Mage.Sets/src/mage/sets/worldwake/EyeOfUgin.java @@ -29,9 +29,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/worldwake/FeralContest.java b/Mage.Sets/src/mage/sets/worldwake/FeralContest.java index 1ce75657495..e29afe65303 100644 --- a/Mage.Sets/src/mage/sets/worldwake/FeralContest.java +++ b/Mage.Sets/src/mage/sets/worldwake/FeralContest.java @@ -28,14 +28,15 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.RequirementEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -78,10 +79,10 @@ public class FeralContest extends CardImpl { class FeralContestEffect extends RequirementEffect { public FeralContestEffect() { - this(Constants.Duration.EndOfTurn); + this(Duration.EndOfTurn); } - public FeralContestEffect(Constants.Duration duration) { + public FeralContestEffect(Duration duration) { super(duration); staticText = "Another target creature blocks it this turn if able"; } diff --git a/Mage.Sets/src/mage/sets/worldwake/FledglingGriffin.java b/Mage.Sets/src/mage/sets/worldwake/FledglingGriffin.java index 4f0b48f7a98..82662bb0d27 100644 --- a/Mage.Sets/src/mage/sets/worldwake/FledglingGriffin.java +++ b/Mage.Sets/src/mage/sets/worldwake/FledglingGriffin.java @@ -29,9 +29,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; diff --git a/Mage.Sets/src/mage/sets/worldwake/GnarlidPack.java b/Mage.Sets/src/mage/sets/worldwake/GnarlidPack.java index 19fdbda6f0f..a3f0bfedafa 100644 --- a/Mage.Sets/src/mage/sets/worldwake/GnarlidPack.java +++ b/Mage.Sets/src/mage/sets/worldwake/GnarlidPack.java @@ -28,8 +28,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.dynamicvalue.common.MultikickerCount; diff --git a/Mage.Sets/src/mage/sets/worldwake/GoblinRoughrider.java b/Mage.Sets/src/mage/sets/worldwake/GoblinRoughrider.java index 3cfbcf01d36..c09cf19f69d 100644 --- a/Mage.Sets/src/mage/sets/worldwake/GoblinRoughrider.java +++ b/Mage.Sets/src/mage/sets/worldwake/GoblinRoughrider.java @@ -29,8 +29,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/worldwake/GoliathSphinx.java b/Mage.Sets/src/mage/sets/worldwake/GoliathSphinx.java index 689dacbb7ab..ad8e212e484 100644 --- a/Mage.Sets/src/mage/sets/worldwake/GoliathSphinx.java +++ b/Mage.Sets/src/mage/sets/worldwake/GoliathSphinx.java @@ -29,8 +29,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/worldwake/GrapplerSpider.java b/Mage.Sets/src/mage/sets/worldwake/GrapplerSpider.java index e57771a50d9..4dd4565a297 100644 --- a/Mage.Sets/src/mage/sets/worldwake/GrapplerSpider.java +++ b/Mage.Sets/src/mage/sets/worldwake/GrapplerSpider.java @@ -29,8 +29,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/worldwake/GraypeltHunter.java b/Mage.Sets/src/mage/sets/worldwake/GraypeltHunter.java index 3c35584e225..8fec1d0846c 100644 --- a/Mage.Sets/src/mage/sets/worldwake/GraypeltHunter.java +++ b/Mage.Sets/src/mage/sets/worldwake/GraypeltHunter.java @@ -28,8 +28,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AllyEntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/worldwake/GrotagThrasher.java b/Mage.Sets/src/mage/sets/worldwake/GrotagThrasher.java index 9dea1f70cab..11528bc68f3 100644 --- a/Mage.Sets/src/mage/sets/worldwake/GrotagThrasher.java +++ b/Mage.Sets/src/mage/sets/worldwake/GrotagThrasher.java @@ -28,13 +28,14 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.CantBlockTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; /** @@ -53,7 +54,7 @@ public class GrotagThrasher extends CardImpl { this.toughness = new MageInt(3); // Whenever Grotag Thrasher attacks, target creature can't block this turn. - AttacksTriggeredAbility ability = new AttacksTriggeredAbility(new CantBlockTargetEffect(Constants.Duration.EndOfTurn), false); + AttacksTriggeredAbility ability = new AttacksTriggeredAbility(new CantBlockTargetEffect(Duration.EndOfTurn), false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/worldwake/Groundswell.java b/Mage.Sets/src/mage/sets/worldwake/Groundswell.java index 06d2f68513c..e9fb6f243f9 100644 --- a/Mage.Sets/src/mage/sets/worldwake/Groundswell.java +++ b/Mage.Sets/src/mage/sets/worldwake/Groundswell.java @@ -30,12 +30,12 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/worldwake/GuardianZendikon.java b/Mage.Sets/src/mage/sets/worldwake/GuardianZendikon.java index 88f315f64ad..0e6240fe77f 100644 --- a/Mage.Sets/src/mage/sets/worldwake/GuardianZendikon.java +++ b/Mage.Sets/src/mage/sets/worldwake/GuardianZendikon.java @@ -28,9 +28,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; @@ -64,11 +63,11 @@ public class GuardianZendikon extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.PutCreatureInPlay)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutCreatureInPlay)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - Ability ability2 = new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new WallToken(), "Enchanted land is a 2/6 white wall creature with defender. It's still a land", Constants.Duration.Custom)); + Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new WallToken(), "Enchanted land is a 2/6 white wall creature with defender. It's still a land", Duration.Custom)); this.addAbility(ability2); Ability ability3 = new DiesAttachedTriggeredAbility(new ReturnToHandAttachedEffect(), "enchanted land", false, false); diff --git a/Mage.Sets/src/mage/sets/worldwake/HadaFreeblade.java b/Mage.Sets/src/mage/sets/worldwake/HadaFreeblade.java index 64d9ace1676..654a31b840d 100644 --- a/Mage.Sets/src/mage/sets/worldwake/HadaFreeblade.java +++ b/Mage.Sets/src/mage/sets/worldwake/HadaFreeblade.java @@ -28,8 +28,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AllyEntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/worldwake/HalimarDepths.java b/Mage.Sets/src/mage/sets/worldwake/HalimarDepths.java index 5eeb422662d..51a1fb86491 100644 --- a/Mage.Sets/src/mage/sets/worldwake/HalimarDepths.java +++ b/Mage.Sets/src/mage/sets/worldwake/HalimarDepths.java @@ -29,8 +29,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryControllerEffect; diff --git a/Mage.Sets/src/mage/sets/worldwake/HalimarExcavator.java b/Mage.Sets/src/mage/sets/worldwake/HalimarExcavator.java index f9f694c0d1f..447affe3c69 100644 --- a/Mage.Sets/src/mage/sets/worldwake/HalimarExcavator.java +++ b/Mage.Sets/src/mage/sets/worldwake/HalimarExcavator.java @@ -29,9 +29,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AllyEntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/worldwake/HammerOfRuin.java b/Mage.Sets/src/mage/sets/worldwake/HammerOfRuin.java index f8374844035..40c356fefb2 100644 --- a/Mage.Sets/src/mage/sets/worldwake/HammerOfRuin.java +++ b/Mage.Sets/src/mage/sets/worldwake/HammerOfRuin.java @@ -30,10 +30,10 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; diff --git a/Mage.Sets/src/mage/sets/worldwake/HarabazDruid.java b/Mage.Sets/src/mage/sets/worldwake/HarabazDruid.java index 109712a92c0..1804e997623 100644 --- a/Mage.Sets/src/mage/sets/worldwake/HarabazDruid.java +++ b/Mage.Sets/src/mage/sets/worldwake/HarabazDruid.java @@ -29,8 +29,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/worldwake/HedronRover.java b/Mage.Sets/src/mage/sets/worldwake/HedronRover.java index 1bbd0b8b6d8..439acc9522a 100644 --- a/Mage.Sets/src/mage/sets/worldwake/HedronRover.java +++ b/Mage.Sets/src/mage/sets/worldwake/HedronRover.java @@ -29,9 +29,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; diff --git a/Mage.Sets/src/mage/sets/worldwake/HorizonDrake.java b/Mage.Sets/src/mage/sets/worldwake/HorizonDrake.java index 84eac17a1a7..3008adddb48 100644 --- a/Mage.Sets/src/mage/sets/worldwake/HorizonDrake.java +++ b/Mage.Sets/src/mage/sets/worldwake/HorizonDrake.java @@ -28,8 +28,8 @@ package mage.sets.worldwake; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.ProtectionAbility; diff --git a/Mage.Sets/src/mage/sets/worldwake/IonasJudgment.java b/Mage.Sets/src/mage/sets/worldwake/IonasJudgment.java index afdc947b0f4..c4336a2c4a1 100644 --- a/Mage.Sets/src/mage/sets/worldwake/IonasJudgment.java +++ b/Mage.Sets/src/mage/sets/worldwake/IonasJudgment.java @@ -29,8 +29,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/worldwake/JaceTheMindSculptor.java b/Mage.Sets/src/mage/sets/worldwake/JaceTheMindSculptor.java index f1339c1b2f5..f14a0c35d75 100644 --- a/Mage.Sets/src/mage/sets/worldwake/JaceTheMindSculptor.java +++ b/Mage.Sets/src/mage/sets/worldwake/JaceTheMindSculptor.java @@ -30,10 +30,10 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.EntersBattlefieldAbility; diff --git a/Mage.Sets/src/mage/sets/worldwake/JagwaspSwarm.java b/Mage.Sets/src/mage/sets/worldwake/JagwaspSwarm.java index 54152de2e30..96a0e93d122 100644 --- a/Mage.Sets/src/mage/sets/worldwake/JagwaspSwarm.java +++ b/Mage.Sets/src/mage/sets/worldwake/JagwaspSwarm.java @@ -29,8 +29,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/worldwake/JoinTheRanks.java b/Mage.Sets/src/mage/sets/worldwake/JoinTheRanks.java index 3afa5d6f716..7bb1d3f7c0e 100644 --- a/Mage.Sets/src/mage/sets/worldwake/JoinTheRanks.java +++ b/Mage.Sets/src/mage/sets/worldwake/JoinTheRanks.java @@ -29,8 +29,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.game.permanent.token.SoldierToken; diff --git a/Mage.Sets/src/mage/sets/worldwake/JoragaWarcaller.java b/Mage.Sets/src/mage/sets/worldwake/JoragaWarcaller.java index de41dab8de3..be11b0246ce 100644 --- a/Mage.Sets/src/mage/sets/worldwake/JoragaWarcaller.java +++ b/Mage.Sets/src/mage/sets/worldwake/JoragaWarcaller.java @@ -28,10 +28,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.*; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; @@ -83,7 +81,7 @@ public class JoragaWarcaller extends CardImpl { // Other Elf creatures you control get +1/+1 for each +1/+1 counter on Joraga Warcaller. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostAllEffect(new CountersCount(CounterType.P1P1), new CountersCount(CounterType.P1P1), Constants.Duration.WhileOnBattlefield, filter, true, rule))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(new CountersCount(CounterType.P1P1), new CountersCount(CounterType.P1P1), Duration.WhileOnBattlefield, filter, true, rule))); } diff --git a/Mage.Sets/src/mage/sets/worldwake/JwariShapeshifter.java b/Mage.Sets/src/mage/sets/worldwake/JwariShapeshifter.java index 84f80566f6b..b0d07d1c2c5 100644 --- a/Mage.Sets/src/mage/sets/worldwake/JwariShapeshifter.java +++ b/Mage.Sets/src/mage/sets/worldwake/JwariShapeshifter.java @@ -28,9 +28,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java b/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java index 8c88aedfda7..0ae364c7d1c 100644 --- a/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java +++ b/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java @@ -27,9 +27,9 @@ */ package mage.sets.worldwake; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/worldwake/KazuulTyrantOfTheCliffs.java b/Mage.Sets/src/mage/sets/worldwake/KazuulTyrantOfTheCliffs.java index b2a3d0a0db7..8ab1577b163 100644 --- a/Mage.Sets/src/mage/sets/worldwake/KazuulTyrantOfTheCliffs.java +++ b/Mage.Sets/src/mage/sets/worldwake/KazuulTyrantOfTheCliffs.java @@ -28,9 +28,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -38,6 +38,8 @@ import mage.abilities.costs.Cost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -79,7 +81,7 @@ public class KazuulTyrantOfTheCliffs extends CardImpl { class KazuulTyrantOfTheCliffsTriggeredAbility extends TriggeredAbilityImpl { public KazuulTyrantOfTheCliffsTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new KazuulTyrantOfTheCliffsEffect(new GenericManaCost(3))); + super(Zone.BATTLEFIELD, new KazuulTyrantOfTheCliffsEffect(new GenericManaCost(3))); } public KazuulTyrantOfTheCliffsTriggeredAbility(final KazuulTyrantOfTheCliffsTriggeredAbility ability) { @@ -118,7 +120,7 @@ class KazuulTyrantOfTheCliffsEffect extends OneShotEffect { this.expansionSetCode = "WWK"; this.subtype.add("Equipment"); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(2))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); } public Kitesail(final Kitesail card) { diff --git a/Mage.Sets/src/mage/sets/worldwake/KitesailApprentice.java b/Mage.Sets/src/mage/sets/worldwake/KitesailApprentice.java index 9b661b329d0..32dc7fdd552 100644 --- a/Mage.Sets/src/mage/sets/worldwake/KitesailApprentice.java +++ b/Mage.Sets/src/mage/sets/worldwake/KitesailApprentice.java @@ -28,9 +28,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EquippedCondition; @@ -39,6 +39,8 @@ import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -59,10 +61,10 @@ public class KitesailApprentice extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - ConditionalContinousEffect effect1 = new ConditionalContinousEffect(new BoostSourceEffect(1, 1, Constants.Duration.WhileOnBattlefield), EquippedCondition.getInstance(), rule1); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect1)); + ConditionalContinousEffect effect1 = new ConditionalContinousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), EquippedCondition.getInstance(), rule1); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect1)); ConditionalContinousEffect effect2 = new ConditionalContinousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), EquippedCondition.getInstance(), rule2); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect2)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect2)); } public KitesailApprentice(final KitesailApprentice card) { diff --git a/Mage.Sets/src/mage/sets/worldwake/KorFirewalker.java b/Mage.Sets/src/mage/sets/worldwake/KorFirewalker.java index 252f324ba0e..d58d6433854 100644 --- a/Mage.Sets/src/mage/sets/worldwake/KorFirewalker.java +++ b/Mage.Sets/src/mage/sets/worldwake/KorFirewalker.java @@ -29,9 +29,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage.Sets/src/mage/sets/worldwake/LavaclawReaches.java b/Mage.Sets/src/mage/sets/worldwake/LavaclawReaches.java index 8516ac9fb53..e64ddad8f45 100644 --- a/Mage.Sets/src/mage/sets/worldwake/LavaclawReaches.java +++ b/Mage.Sets/src/mage/sets/worldwake/LavaclawReaches.java @@ -29,10 +29,10 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/worldwake/LeatherbackBaloth.java b/Mage.Sets/src/mage/sets/worldwake/LeatherbackBaloth.java index b50a1debe55..2e6f18600d5 100644 --- a/Mage.Sets/src/mage/sets/worldwake/LeatherbackBaloth.java +++ b/Mage.Sets/src/mage/sets/worldwake/LeatherbackBaloth.java @@ -29,8 +29,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/worldwake/LightkeeperOfEmeria.java b/Mage.Sets/src/mage/sets/worldwake/LightkeeperOfEmeria.java index 9e98b334937..390eeb46ce3 100644 --- a/Mage.Sets/src/mage/sets/worldwake/LightkeeperOfEmeria.java +++ b/Mage.Sets/src/mage/sets/worldwake/LightkeeperOfEmeria.java @@ -28,8 +28,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.MultikickerCount; diff --git a/Mage.Sets/src/mage/sets/worldwake/LoamLion.java b/Mage.Sets/src/mage/sets/worldwake/LoamLion.java index 4a2451fc49d..9e8f7f2885b 100644 --- a/Mage.Sets/src/mage/sets/worldwake/LoamLion.java +++ b/Mage.Sets/src/mage/sets/worldwake/LoamLion.java @@ -28,10 +28,10 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.ControlsPermanentCondition; diff --git a/Mage.Sets/src/mage/sets/worldwake/LodestoneGolem.java b/Mage.Sets/src/mage/sets/worldwake/LodestoneGolem.java index 103cfd723a1..8178d975386 100644 --- a/Mage.Sets/src/mage/sets/worldwake/LodestoneGolem.java +++ b/Mage.Sets/src/mage/sets/worldwake/LodestoneGolem.java @@ -27,9 +27,7 @@ */ package mage.sets.worldwake; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -59,7 +57,7 @@ public class LodestoneGolem extends CardImpl { this.toughness = new MageInt(3); // Nonartifact spells cost {1} more to cast. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new LodestoneGolemCostReductionEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LodestoneGolemCostReductionEffect())); } public LodestoneGolem(final LodestoneGolem card) { @@ -75,7 +73,7 @@ public class LodestoneGolem extends CardImpl { class LodestoneGolemCostReductionEffect extends CostModificationEffectImpl { LodestoneGolemCostReductionEffect ( ) { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "Nonartifact spells cost {1} more to cast"; } diff --git a/Mage.Sets/src/mage/sets/worldwake/MarshThreader.java b/Mage.Sets/src/mage/sets/worldwake/MarshThreader.java index 81b7dd29510..9ec8db172a6 100644 --- a/Mage.Sets/src/mage/sets/worldwake/MarshThreader.java +++ b/Mage.Sets/src/mage/sets/worldwake/MarshThreader.java @@ -29,8 +29,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/worldwake/MarshalsAnthem.java b/Mage.Sets/src/mage/sets/worldwake/MarshalsAnthem.java index 38eadf1026f..b064c2b71d8 100644 --- a/Mage.Sets/src/mage/sets/worldwake/MarshalsAnthem.java +++ b/Mage.Sets/src/mage/sets/worldwake/MarshalsAnthem.java @@ -28,10 +28,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -74,7 +72,7 @@ public class MarshalsAnthem extends CardImpl { this.addAbility(new MultikickerAbility("{1}{W}")); // Creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Constants.Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); // When Marshal's Anthem enters the battlefield, return up to X target creature cards from your graveyard to the battlefield, where X is the number of times Marshal's Anthem was kicked. diff --git a/Mage.Sets/src/mage/sets/worldwake/MiresToll.java b/Mage.Sets/src/mage/sets/worldwake/MiresToll.java index 3dccb896f79..c3bd2345441 100644 --- a/Mage.Sets/src/mage/sets/worldwake/MiresToll.java +++ b/Mage.Sets/src/mage/sets/worldwake/MiresToll.java @@ -29,9 +29,8 @@ package mage.sets.worldwake; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -82,11 +81,11 @@ class MiresTollEffect extends OneShotEffect { static { filter.add(new SubtypePredicate("Swamp")); - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public MiresTollEffect() { - super(Constants.Outcome.Discard); + super(Outcome.Discard); staticText = "Target player reveals a number of cards from his or her hand equal to the number of Swamps you control. You choose one of them. That player discards that card"; } @@ -104,13 +103,13 @@ class MiresTollEffect extends OneShotEffect { int swamps = game.getBattlefield().count(filter, source.getSourceId(), source.getControllerId(), game); Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); if (swamps > 0 && targetPlayer != null) { - Cards revealedCards = new CardsImpl(Constants.Zone.PICK); + Cards revealedCards = new CardsImpl(Zone.PICK); int amount = Math.min(targetPlayer.getHand().size(), swamps); FilterCard filter = new FilterCard("card in target player's hand"); TargetCardInHand chosenCards = new TargetCardInHand(amount, amount, filter); chosenCards.setRequired(true); chosenCards.setNotTarget(true); - if (chosenCards.canChoose(targetPlayer.getId(), game) && targetPlayer.choose(Constants.Outcome.Discard, targetPlayer.getHand(), chosenCards, game)) { + if (chosenCards.canChoose(targetPlayer.getId(), game) && targetPlayer.choose(Outcome.Discard, targetPlayer.getHand(), chosenCards, game)) { if (!chosenCards.getTargets().isEmpty()) { List targets = chosenCards.getTargets(); for (UUID targetid : targets) { @@ -127,10 +126,10 @@ class MiresTollEffect extends OneShotEffect { Player you = game.getPlayer(source.getControllerId()); if (you != null) { - TargetCard yourChoice = new TargetCard(Constants.Zone.PICK, new FilterCard()); + TargetCard yourChoice = new TargetCard(Zone.PICK, new FilterCard()); yourChoice.setRequired(true); yourChoice.setNotTarget(true); - if (you.choose(Constants.Outcome.Benefit, revealedCards, yourChoice, game)) { + if (you.choose(Outcome.Benefit, revealedCards, yourChoice, game)) { Card card = targetPlayer.getHand().get(yourChoice.getFirstTarget(), game); if (card != null) { return targetPlayer.discard(card, source, game); diff --git a/Mage.Sets/src/mage/sets/worldwake/MordantDragon.java b/Mage.Sets/src/mage/sets/worldwake/MordantDragon.java index 433a096acb9..c6ca9e0dbdf 100644 --- a/Mage.Sets/src/mage/sets/worldwake/MordantDragon.java +++ b/Mage.Sets/src/mage/sets/worldwake/MordantDragon.java @@ -28,10 +28,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -66,7 +64,7 @@ public class MordantDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {1}{R}: Mordant Dragon gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Constants.Duration.EndOfTurn), new ManaCostsImpl("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{R}"))); // Whenever Mordant Dragon deals combat damage to a player, you may have it deal that much damage to target creature that player controls. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new MordantDragonEffect(), true, true)); @@ -102,7 +100,7 @@ class MordantDragonEffect extends OneShotEffect { FilterCreaturePermanent filter = new FilterCreaturePermanent("creature " + player.getName() + " controls"); filter.add(new ControllerIdPredicate(player.getId())); TargetCreaturePermanent target = new TargetCreaturePermanent(filter); - if (target.canChoose(source.getControllerId(), game) && target.choose(Constants.Outcome.Damage, source.getControllerId(), source.getId(), game)) { + if (target.canChoose(source.getControllerId(), game) && target.choose(Outcome.Damage, source.getControllerId(), source.getId(), game)) { UUID creature = target.getFirstTarget(); if (creature != null) { game.getPermanent(creature).damage(amount, source.getSourceId(), game, true, false); diff --git a/Mage.Sets/src/mage/sets/worldwake/MysteriesOfTheDeep.java b/Mage.Sets/src/mage/sets/worldwake/MysteriesOfTheDeep.java index 3826f05dc79..171a411fce6 100644 --- a/Mage.Sets/src/mage/sets/worldwake/MysteriesOfTheDeep.java +++ b/Mage.Sets/src/mage/sets/worldwake/MysteriesOfTheDeep.java @@ -28,8 +28,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.condition.common.LandfallCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/worldwake/NaturesClaim.java b/Mage.Sets/src/mage/sets/worldwake/NaturesClaim.java index 9c3f5ab5aea..074580a55c1 100644 --- a/Mage.Sets/src/mage/sets/worldwake/NaturesClaim.java +++ b/Mage.Sets/src/mage/sets/worldwake/NaturesClaim.java @@ -30,13 +30,14 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -79,7 +80,7 @@ public class NaturesClaim extends CardImpl { class NaturesClaimEffect extends OneShotEffect { NaturesClaimEffect() { - super(Constants.Outcome.GainLife); + super(Outcome.GainLife); staticText = "Its controller gains 4 life"; } @@ -89,7 +90,7 @@ class NaturesClaimEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent target = (Permanent) game.getLastKnownInformation(targetPointer.getFirst(game, source), Constants.Zone.BATTLEFIELD); + Permanent target = (Permanent) game.getLastKnownInformation(targetPointer.getFirst(game, source), Zone.BATTLEFIELD); if (target != null) { Player player = game.getPlayer(target.getControllerId()); if (player != null) { diff --git a/Mage.Sets/src/mage/sets/worldwake/NemesisTrap.java b/Mage.Sets/src/mage/sets/worldwake/NemesisTrap.java index 2b30f5dcfee..2b5d61ad124 100644 --- a/Mage.Sets/src/mage/sets/worldwake/NemesisTrap.java +++ b/Mage.Sets/src/mage/sets/worldwake/NemesisTrap.java @@ -29,9 +29,9 @@ package mage.sets.worldwake; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.delayed.AtEndOfTurnDelayedTriggeredAbility; import mage.abilities.costs.AlternativeCostImpl; @@ -39,6 +39,8 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileSourceEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.sets.tokens.EmptyToken; @@ -113,7 +115,7 @@ class NemesisTrapAlternativeCost extends AlternativeCostImpl { public NemesisTrapEffect() { - super(Constants.Outcome.Exile); + super(Outcome.Exile); this.staticText = "Exile target attacking creature. Put a token that's a copy of that creature onto the battlefield. Exile it at the beginning of the next end step"; } @@ -130,7 +132,7 @@ class NemesisTrapEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Permanent targetedCreature = game.getPermanent(source.getFirstTarget()); if (targetedCreature == null) { - targetedCreature = (Permanent) game.getLastKnownInformation(source.getFirstTarget(), Constants.Zone.BATTLEFIELD); + targetedCreature = (Permanent) game.getLastKnownInformation(source.getFirstTarget(), Zone.BATTLEFIELD); } if (targetedCreature != null) { targetedCreature.moveToExile(id, "Nemesis Trap Exile", id, game); diff --git a/Mage.Sets/src/mage/sets/worldwake/NovablastWurm.java b/Mage.Sets/src/mage/sets/worldwake/NovablastWurm.java index f7fead9f7ba..d78ad1c4ace 100644 --- a/Mage.Sets/src/mage/sets/worldwake/NovablastWurm.java +++ b/Mage.Sets/src/mage/sets/worldwake/NovablastWurm.java @@ -28,8 +28,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.DestroyAllEffect; diff --git a/Mage.Sets/src/mage/sets/worldwake/OmnathLocusOfMana.java b/Mage.Sets/src/mage/sets/worldwake/OmnathLocusOfMana.java index cdcc1db9b8b..a63f38614dc 100644 --- a/Mage.Sets/src/mage/sets/worldwake/OmnathLocusOfMana.java +++ b/Mage.Sets/src/mage/sets/worldwake/OmnathLocusOfMana.java @@ -30,11 +30,8 @@ package mage.sets.worldwake; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.ManaType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -63,11 +60,11 @@ public class OmnathLocusOfMana extends CardImpl { this.toughness = new MageInt(1); // Green mana doesn't empty from your mana pool as steps and phases end. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new OmnathReplacementEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OmnathReplacementEffect())); // Omnath, Locus of Mana gets +1/+1 for each green mana in your mana pool DynamicValue boost = new ManaTypeInManaPoolCount(ManaType.GREEN); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(boost, boost, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(boost, boost, Duration.WhileOnBattlefield))); } @@ -93,7 +90,7 @@ class OmnathReplacementEffect extends ReplacementEffectImpl { class PerimeterCaptainTriggeredAbility extends TriggeredAbilityImpl { public PerimeterCaptainTriggeredAbility(Effect effect, boolean optional) { - super(Constants.Zone.BATTLEFIELD, effect, optional); + super(Zone.BATTLEFIELD, effect, optional); } public PerimeterCaptainTriggeredAbility(final PerimeterCaptainTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/worldwake/PermafrostTrap.java b/Mage.Sets/src/mage/sets/worldwake/PermafrostTrap.java index 6274c5ca913..3d319372707 100644 --- a/Mage.Sets/src/mage/sets/worldwake/PermafrostTrap.java +++ b/Mage.Sets/src/mage/sets/worldwake/PermafrostTrap.java @@ -28,9 +28,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.costs.AlternativeCostImpl; @@ -38,6 +38,7 @@ import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.CardImpl; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -81,7 +82,7 @@ public class PermafrostTrap extends CardImpl { class PermafrostTrapWatcher extends WatcherImpl { public PermafrostTrapWatcher() { - super("PermafrostTrapWatcher", Constants.WatcherScope.GAME); + super("PermafrostTrapWatcher", WatcherScope.GAME); } public PermafrostTrapWatcher(final PermafrostTrapWatcher watcher) { @@ -117,7 +118,7 @@ class PermafrostTrapAlternativeCost extends AlternativeCostImpl { public PermafrostTrapEffect() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); staticText = "Tap up to two target creatures. Those creatures don't untap during their controller's next untap step"; } @@ -178,7 +179,7 @@ class PermafrostEffect2 extends ReplacementEffectImpl { protected UUID creatureId; public PermafrostEffect2(UUID creatureId) { - super(Constants.Duration.OneUse, Constants.Outcome.Detriment); + super(Duration.OneUse, Outcome.Detriment); this.creatureId = creatureId; } @@ -205,7 +206,7 @@ class PermafrostEffect2 extends ReplacementEffectImpl { @Override public boolean applies(GameEvent event, Ability source, Game game) { - if (game.getTurn().getStepType() == Constants.PhaseStep.UNTAP + if (game.getTurn().getStepType() == PhaseStep.UNTAP && event.getType() == GameEvent.EventType.UNTAP && event.getTargetId().equals(creatureId)) { return true; diff --git a/Mage.Sets/src/mage/sets/worldwake/PilgrimsEye.java b/Mage.Sets/src/mage/sets/worldwake/PilgrimsEye.java index 95131c75813..1096d4b6c4b 100644 --- a/Mage.Sets/src/mage/sets/worldwake/PilgrimsEye.java +++ b/Mage.Sets/src/mage/sets/worldwake/PilgrimsEye.java @@ -29,8 +29,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; diff --git a/Mage.Sets/src/mage/sets/worldwake/PulseTracker.java b/Mage.Sets/src/mage/sets/worldwake/PulseTracker.java index 89b3edf384b..97666e690a2 100644 --- a/Mage.Sets/src/mage/sets/worldwake/PulseTracker.java +++ b/Mage.Sets/src/mage/sets/worldwake/PulseTracker.java @@ -28,9 +28,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/worldwake/QuagVampires.java b/Mage.Sets/src/mage/sets/worldwake/QuagVampires.java index 9e9ae17b380..90767617f20 100644 --- a/Mage.Sets/src/mage/sets/worldwake/QuagVampires.java +++ b/Mage.Sets/src/mage/sets/worldwake/QuagVampires.java @@ -28,8 +28,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.dynamicvalue.common.MultikickerCount; diff --git a/Mage.Sets/src/mage/sets/worldwake/QuestForRenewal.java b/Mage.Sets/src/mage/sets/worldwake/QuestForRenewal.java index fe5d7b0439d..37990be2b7b 100644 --- a/Mage.Sets/src/mage/sets/worldwake/QuestForRenewal.java +++ b/Mage.Sets/src/mage/sets/worldwake/QuestForRenewal.java @@ -28,9 +28,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.BecomesTappedCreatureControlledTriggeredAbility; import mage.abilities.common.BeginningOfUntapTriggeredAbility; import mage.abilities.condition.common.HasCounterCondition; @@ -38,6 +38,8 @@ import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.UntapAllControllerEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; @@ -60,7 +62,7 @@ public class QuestForRenewal extends CardImpl { // As long as there are four or more quest counters on Quest for Renewal, untap all creatures you control during each other player's untap step. ConditionalOneShotEffect effect = new ConditionalOneShotEffect(new UntapAllControllerEffect(filter, ""), new HasCounterCondition(CounterType.QUEST, 4), "as long as there are four or more quest counters on , untap all creatures you control"); - this.addAbility(new BeginningOfUntapTriggeredAbility(Constants.Zone.BATTLEFIELD, effect, Constants.TargetController.OPPONENT, false)); + this.addAbility(new BeginningOfUntapTriggeredAbility(Zone.BATTLEFIELD, effect, TargetController.OPPONENT, false)); } diff --git a/Mage.Sets/src/mage/sets/worldwake/QuestForTheGoblinLord.java b/Mage.Sets/src/mage/sets/worldwake/QuestForTheGoblinLord.java index 9a65cbd1895..c0ed6d267fa 100644 --- a/Mage.Sets/src/mage/sets/worldwake/QuestForTheGoblinLord.java +++ b/Mage.Sets/src/mage/sets/worldwake/QuestForTheGoblinLord.java @@ -28,11 +28,12 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Duration; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.HasCounterCondition; @@ -72,7 +73,7 @@ public class QuestForTheGoblinLord extends CardImpl { this.addAbility(new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.QUEST.createInstance()), goblinFilter, true)); // As long as Quest for the Goblin Lord has five or more quest counters on it, creatures you control get +2/+0. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostAllEffect(2, 0, Constants.Duration.WhileOnBattlefield, filter, false), new HasCounterCondition(CounterType.QUEST, 5, Integer.MAX_VALUE), rule))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostAllEffect(2, 0, Duration.WhileOnBattlefield, filter, false), new HasCounterCondition(CounterType.QUEST, 5, Integer.MAX_VALUE), rule))); } public QuestForTheGoblinLord(final QuestForTheGoblinLord card) { diff --git a/Mage.Sets/src/mage/sets/worldwake/QuestForTheNihilStone.java b/Mage.Sets/src/mage/sets/worldwake/QuestForTheNihilStone.java index 3968827159e..5fdb464c3f7 100644 --- a/Mage.Sets/src/mage/sets/worldwake/QuestForTheNihilStone.java +++ b/Mage.Sets/src/mage/sets/worldwake/QuestForTheNihilStone.java @@ -28,10 +28,10 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.LoseLifeTargetEffect; @@ -122,7 +122,7 @@ class QuestForTheNihilStoneTriggeredAbility2 extends TriggeredAbilityImpl { this.color.setBlue(true); // At the beginning of your upkeep, you may look at the top card of your library. If it's a creature card, you may reveal it and put a quest counter on Quest for Ula's Temple. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(Constants.Zone.BATTLEFIELD, new QuestForUlasTempleEffect(), TargetController.YOU, true)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new QuestForUlasTempleEffect(), TargetController.YOU, true)); // At the beginning of each end step, if there are three or more quest counters on Quest for Ula's Temple, you may put a Kraken, Leviathan, Octopus, or Serpent creature card from your hand onto the battlefield. this.addAbility(new QuestForUlasTempleTriggeredAbility()); @@ -82,7 +80,7 @@ public class QuestForUlasTemple extends CardImpl { class QuestForUlasTempleEffect extends OneShotEffect { public QuestForUlasTempleEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); this.staticText = "you may look at the top card of your library. If it's a creature card, you may reveal it and put a quest counter on {this}"; } @@ -104,7 +102,7 @@ class QuestForUlasTempleEffect extends OneShotEffect { cards.add(card); player.lookAtCards("This card", cards, game); if (card.getCardType().contains(CardType.CREATURE)) { - if (player.chooseUse(Constants.Outcome.DrawCard, "Do you wish to reveal the creature card at the top of the library?", game)) { + if (player.chooseUse(Outcome.DrawCard, "Do you wish to reveal the creature card at the top of the library?", game)) { player.revealCards("Quest for Ula's Temple", cards, game); Permanent questForUlasTemple = game.getPermanent(source.getSourceId()); if (questForUlasTemple != null) { @@ -121,7 +119,7 @@ class QuestForUlasTempleEffect extends OneShotEffect { class QuestForUlasTempleTriggeredAbility extends TriggeredAbilityImpl { public QuestForUlasTempleTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new QuestForUlasTempleEffect2(), true); + super(Zone.BATTLEFIELD, new QuestForUlasTempleEffect2(), true); } public QuestForUlasTempleTriggeredAbility(final QuestForUlasTempleTriggeredAbility ability) { @@ -164,7 +162,7 @@ class QuestForUlasTempleEffect2 extends OneShotEffect } QuestForUlasTempleEffect2() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); } QuestForUlasTempleEffect2(final QuestForUlasTempleEffect2 effect) { @@ -174,14 +172,14 @@ class QuestForUlasTempleEffect2 extends OneShotEffect @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); - if (player == null || !player.chooseUse(Constants.Outcome.PutCreatureInPlay, query, game)) { + if (player == null || !player.chooseUse(Outcome.PutCreatureInPlay, query, game)) { return false; } TargetCardInHand target = new TargetCardInHand(filter); - if (player.choose(Constants.Outcome.PutCreatureInPlay, target, source.getSourceId(), game)) { + if (player.choose(Outcome.PutCreatureInPlay, target, source.getSourceId(), game)) { Card card = game.getCard(target.getFirstTarget()); if (card != null) { - card.putOntoBattlefield(game, Constants.Zone.HAND, source.getId(), source.getControllerId()); + card.putOntoBattlefield(game, Zone.HAND, source.getId(), source.getControllerId()); return true; } } diff --git a/Mage.Sets/src/mage/sets/worldwake/Quicksand.java b/Mage.Sets/src/mage/sets/worldwake/Quicksand.java index 82ca8a50274..ebf8ce0f960 100644 --- a/Mage.Sets/src/mage/sets/worldwake/Quicksand.java +++ b/Mage.Sets/src/mage/sets/worldwake/Quicksand.java @@ -28,7 +28,7 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.Rarity; +import mage.constants.Rarity; /** * diff --git a/Mage.Sets/src/mage/sets/worldwake/RagingRavine.java b/Mage.Sets/src/mage/sets/worldwake/RagingRavine.java index aadb6064819..bf973a06316 100644 --- a/Mage.Sets/src/mage/sets/worldwake/RagingRavine.java +++ b/Mage.Sets/src/mage/sets/worldwake/RagingRavine.java @@ -29,10 +29,10 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.EntersBattlefieldTappedAbility; diff --git a/Mage.Sets/src/mage/sets/worldwake/RazorBoomerang.java b/Mage.Sets/src/mage/sets/worldwake/RazorBoomerang.java index 6c01cd96083..27424a7a915 100644 --- a/Mage.Sets/src/mage/sets/worldwake/RazorBoomerang.java +++ b/Mage.Sets/src/mage/sets/worldwake/RazorBoomerang.java @@ -28,10 +28,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -59,13 +57,13 @@ public class RazorBoomerang extends CardImpl { this.subtype.add("Equipment"); // Equipped creature has "{tap}, Unattach Razor Boomerang: Razor Boomerang deals 1 damage to target creature or player. Return Razor Boomerang to its owner's hand." - Ability gainAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RazorBoomerangEffect(this.getId()), new TapSourceCost()); + Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RazorBoomerangEffect(this.getId()), new TapSourceCost()); gainAbility.addCost(new UnattachCost(this.getId())); gainAbility.addTarget(new TargetCreatureOrPlayer()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, Constants.AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, AttachmentType.EQUIPMENT))); // Equip {2} - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(2))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); } public RazorBoomerang(final RazorBoomerang card) { @@ -153,7 +151,7 @@ class RazorBoomerangEffect extends OneShotEffect { } Permanent razor = game.getPermanent(attachmentid); if (razor != null) { - razor.moveToZone(Constants.Zone.HAND, id, game, true); + razor.moveToZone(Zone.HAND, id, game, true); } return true; } diff --git a/Mage.Sets/src/mage/sets/worldwake/RefractionTrap.java b/Mage.Sets/src/mage/sets/worldwake/RefractionTrap.java index 9db89563249..de1cf2ee172 100644 --- a/Mage.Sets/src/mage/sets/worldwake/RefractionTrap.java +++ b/Mage.Sets/src/mage/sets/worldwake/RefractionTrap.java @@ -28,15 +28,18 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.PreventionEffectImpl; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -63,7 +66,7 @@ public class RefractionTrap extends CardImpl { this.getSpellAbility().addAlternativeCost(new RefractionTrapAlternativeCost()); // Prevent the next 3 damage that a source of your choice would deal to you and/or permanents you control this turn. If damage is prevented this way, Refraction Trap deals that much damage to target creature or player. - this.getSpellAbility().addEffect(new RefractionTrapPreventDamageEffect(Constants.Duration.EndOfTurn, 3)); + this.getSpellAbility().addEffect(new RefractionTrapPreventDamageEffect(Duration.EndOfTurn, 3)); this.getSpellAbility().addTarget(new TargetSource()); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); @@ -83,7 +86,7 @@ public class RefractionTrap extends CardImpl { class RefractionTrapWatcher extends WatcherImpl { public RefractionTrapWatcher() { - super("RefractionTrapWatcher", Constants.WatcherScope.GAME); + super("RefractionTrapWatcher", WatcherScope.GAME); } public RefractionTrapWatcher(final RefractionTrapWatcher watcher) { @@ -124,7 +127,7 @@ class RefractionTrapAlternativeCost extends AlternativeCostImpl { public RicochetTrapEffect() { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); staticText = "Change the target of target spell with a single target"; } diff --git a/Mage.Sets/src/mage/sets/worldwake/RoilingTerrain.java b/Mage.Sets/src/mage/sets/worldwake/RoilingTerrain.java index 223a033ca2f..64c8f755057 100644 --- a/Mage.Sets/src/mage/sets/worldwake/RoilingTerrain.java +++ b/Mage.Sets/src/mage/sets/worldwake/RoilingTerrain.java @@ -28,12 +28,13 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; @@ -77,7 +78,7 @@ class RoilingTerrainEffect extends OneShotEffect { } public RoilingTerrainEffect() { - super(Constants.Outcome.Sacrifice); + super(Outcome.Sacrifice); this.staticText = "Destroy target land, then {this} deals damage to that land's controller equal to the number of land cards in that player's graveyard"; } diff --git a/Mage.Sets/src/mage/sets/worldwake/RuinGhost.java b/Mage.Sets/src/mage/sets/worldwake/RuinGhost.java index 5914558092c..4d4d48e03e2 100644 --- a/Mage.Sets/src/mage/sets/worldwake/RuinGhost.java +++ b/Mage.Sets/src/mage/sets/worldwake/RuinGhost.java @@ -28,9 +28,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +39,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ExileTargetForSourceEffect; import mage.abilities.effects.common.ReturnToBattlefieldUnderYourControlTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledPermanent; @@ -65,7 +66,7 @@ public class RuinGhost extends CardImpl { this.toughness = new MageInt(1); // {W}, {tap}: Exile target land you control, then return it to the battlefield under your control. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ExileTargetForSourceEffect("Exile Ruin Ghost"), new ManaCostsImpl("{W")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect("Exile Ruin Ghost"), new ManaCostsImpl("{W")); ability.addCost(new TapSourceCost()); ability.addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect()); ability.addTarget(new TargetControlledPermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/worldwake/RumblingAftershocks.java b/Mage.Sets/src/mage/sets/worldwake/RumblingAftershocks.java index 0c0ed37e681..a5996426c2d 100644 --- a/Mage.Sets/src/mage/sets/worldwake/RumblingAftershocks.java +++ b/Mage.Sets/src/mage/sets/worldwake/RumblingAftershocks.java @@ -28,11 +28,11 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.abilities.Abilities; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage.Sets/src/mage/sets/worldwake/RuthlessCullblade.java b/Mage.Sets/src/mage/sets/worldwake/RuthlessCullblade.java index 371592afc20..4a88f1f1ef4 100644 --- a/Mage.Sets/src/mage/sets/worldwake/RuthlessCullblade.java +++ b/Mage.Sets/src/mage/sets/worldwake/RuthlessCullblade.java @@ -28,10 +28,10 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.TenOrLessLifeCondition; diff --git a/Mage.Sets/src/mage/sets/worldwake/ScribNibblers.java b/Mage.Sets/src/mage/sets/worldwake/ScribNibblers.java index 79b2d832cb0..d18805cd2dd 100644 --- a/Mage.Sets/src/mage/sets/worldwake/ScribNibblers.java +++ b/Mage.Sets/src/mage/sets/worldwake/ScribNibblers.java @@ -28,9 +28,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LandfallAbility; @@ -40,6 +40,8 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.UntapSourceEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; @@ -60,12 +62,12 @@ public class ScribNibblers extends CardImpl { this.toughness = new MageInt(1); // {tap}: Exile the top card of target player's library. If it's a land card, you gain 1 life. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ScribNibblersEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScribNibblersEffect(), new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); // Landfall - Whenever a land enters the battlefield under your control, you may untap Scrib Nibblers. - this.addAbility(new LandfallAbility(Constants.Zone.BATTLEFIELD, new UntapSourceEffect(), true)); + this.addAbility(new LandfallAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), true)); } public ScribNibblers(final ScribNibblers card) { @@ -81,7 +83,7 @@ public class ScribNibblers extends CardImpl { class ScribNibblersEffect extends OneShotEffect { public ScribNibblersEffect() { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); this.staticText = "Exile the top card of target player's library. If it's a land card, you gain 1 life"; } diff --git a/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java b/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java index c7869702247..9ee24db1187 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java +++ b/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java @@ -31,9 +31,9 @@ package mage.sets.worldwake; import java.util.HashSet; import java.util.Set; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/worldwake/SeersSundial.java b/Mage.Sets/src/mage/sets/worldwake/SeersSundial.java index bb6933221ae..0d2c1bf888b 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SeersSundial.java +++ b/Mage.Sets/src/mage/sets/worldwake/SeersSundial.java @@ -28,8 +28,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.LandfallAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DoIfCostPaid; diff --git a/Mage.Sets/src/mage/sets/worldwake/SejiriMerfolk.java b/Mage.Sets/src/mage/sets/worldwake/SejiriMerfolk.java index 79430ef3d6d..5cc97f9628e 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SejiriMerfolk.java +++ b/Mage.Sets/src/mage/sets/worldwake/SejiriMerfolk.java @@ -27,9 +27,9 @@ */ package mage.sets.worldwake; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.ControlsPermanentCondition; diff --git a/Mage.Sets/src/mage/sets/worldwake/SejiriSteppe.java b/Mage.Sets/src/mage/sets/worldwake/SejiriSteppe.java index 5c777b8558b..f7d244fa752 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SejiriSteppe.java +++ b/Mage.Sets/src/mage/sets/worldwake/SejiriSteppe.java @@ -29,9 +29,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continious.GainProtectionFromColorTargetEffect; diff --git a/Mage.Sets/src/mage/sets/worldwake/SelectiveMemory.java b/Mage.Sets/src/mage/sets/worldwake/SelectiveMemory.java index 8c41c3ecd8d..ccfd6325c53 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SelectiveMemory.java +++ b/Mage.Sets/src/mage/sets/worldwake/SelectiveMemory.java @@ -28,9 +28,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/worldwake/ShorelineSalvager.java b/Mage.Sets/src/mage/sets/worldwake/ShorelineSalvager.java index 5ccf761eea8..1f58de33e27 100644 --- a/Mage.Sets/src/mage/sets/worldwake/ShorelineSalvager.java +++ b/Mage.Sets/src/mage/sets/worldwake/ShorelineSalvager.java @@ -28,9 +28,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.condition.common.ControlsPermanentCondition; diff --git a/Mage.Sets/src/mage/sets/worldwake/SkitterOfLizards.java b/Mage.Sets/src/mage/sets/worldwake/SkitterOfLizards.java index 416227a553d..d9a78162333 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SkitterOfLizards.java +++ b/Mage.Sets/src/mage/sets/worldwake/SkitterOfLizards.java @@ -28,8 +28,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.dynamicvalue.common.MultikickerCount; diff --git a/Mage.Sets/src/mage/sets/worldwake/SlaveringNulls.java b/Mage.Sets/src/mage/sets/worldwake/SlaveringNulls.java index 7401665c090..df62a9e1e1b 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SlaveringNulls.java +++ b/Mage.Sets/src/mage/sets/worldwake/SlaveringNulls.java @@ -28,14 +28,15 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DiscardTargetEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -84,7 +85,7 @@ class SlaveringNullsTriggeredAbility extends TriggeredAbilityImpl { this.color.setRed(true); // Stone Idol Trap costs {1} less to cast for each attacking creature. - Ability ability = new SimpleStaticAbility(Constants.Zone.STACK, new StoneIdolTrapCostReductionEffect()); + Ability ability = new SimpleStaticAbility(Zone.STACK, new StoneIdolTrapCostReductionEffect()); ability.setRuleAtTheTop(true); this.addAbility(ability); @@ -128,7 +124,7 @@ class StoneIdolTrapCostReductionEffect extends CostModificationEffectImpl { public StoneIdolTrapEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); this.staticText = "Put a 6/12 colorless Construct artifact creature token with trample onto the battlefield. Exile it at the beginning of your next end step"; } @@ -147,7 +143,7 @@ class StoneIdolTrapEffect extends OneShotEffect { token.putOntoBattlefield(1, game, source.getSourceId(), source.getControllerId()); ExileTargetEffect exileEffect = new ExileTargetEffect("exile the token"); exileEffect.setTargetPointer(new FixedTarget(token.getLastAddedToken())); - DelayedTriggeredAbility delayedAbility = new AtEndOfTurnDelayedTriggeredAbility(exileEffect, Constants.TargetController.YOU); + DelayedTriggeredAbility delayedAbility = new AtEndOfTurnDelayedTriggeredAbility(exileEffect, TargetController.YOU); delayedAbility.setSourceId(source.getSourceId()); delayedAbility.setControllerId(source.getControllerId()); game.addDelayedTriggeredAbility(delayedAbility); diff --git a/Mage.Sets/src/mage/sets/worldwake/StoneforgeMystic.java b/Mage.Sets/src/mage/sets/worldwake/StoneforgeMystic.java index b3bd5aa3406..80b32b4a8c9 100644 --- a/Mage.Sets/src/mage/sets/worldwake/StoneforgeMystic.java +++ b/Mage.Sets/src/mage/sets/worldwake/StoneforgeMystic.java @@ -28,9 +28,9 @@ package mage.sets.worldwake; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/worldwake/StrengthOfTheTajuru.java b/Mage.Sets/src/mage/sets/worldwake/StrengthOfTheTajuru.java index 15cf4e22315..b8c56c96900 100644 --- a/Mage.Sets/src/mage/sets/worldwake/StrengthOfTheTajuru.java +++ b/Mage.Sets/src/mage/sets/worldwake/StrengthOfTheTajuru.java @@ -28,9 +28,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.dynamicvalue.common.MultikickerCount; diff --git a/Mage.Sets/src/mage/sets/worldwake/SummitApes.java b/Mage.Sets/src/mage/sets/worldwake/SummitApes.java index 7d2bbf6891d..cec0959da2c 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SummitApes.java +++ b/Mage.Sets/src/mage/sets/worldwake/SummitApes.java @@ -28,15 +28,16 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.ControlsPermanentCondition; import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.common.continious.CantBeBlockedByOneEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -63,7 +64,7 @@ public class SummitApes extends CardImpl { this.toughness = new MageInt(2); // As long as you control a Mountain, Summit Apes can't be blocked except by two or more creatures. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new CantBeBlockedByOneEffect(2), new ControlsPermanentCondition(filter), rule))); } diff --git a/Mage.Sets/src/mage/sets/worldwake/SurrakarBanisher.java b/Mage.Sets/src/mage/sets/worldwake/SurrakarBanisher.java index a7fc86fa476..2ff795fe23d 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SurrakarBanisher.java +++ b/Mage.Sets/src/mage/sets/worldwake/SurrakarBanisher.java @@ -28,8 +28,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/worldwake/TalusPaladin.java b/Mage.Sets/src/mage/sets/worldwake/TalusPaladin.java index c0817b94200..778d1b0e511 100644 --- a/Mage.Sets/src/mage/sets/worldwake/TalusPaladin.java +++ b/Mage.Sets/src/mage/sets/worldwake/TalusPaladin.java @@ -28,11 +28,11 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -40,6 +40,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -127,7 +128,7 @@ class TalusPaladinTriggeredAbility extends TriggeredAbilityImpl { public TalusPaladinEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); } public TalusPaladinEffect(final TalusPaladinEffect effect) { @@ -141,7 +142,7 @@ class TalusPaladinEffect extends OneShotEffect { if (taluspPaladin != null) { StringBuilder sb = new StringBuilder(); sb.append("Put a +1/+1 counter on Talus Paladin?"); - if (!player.chooseUse(Constants.Outcome.Benefit, sb.toString(), game)) { + if (!player.chooseUse(Outcome.Benefit, sb.toString(), game)) { return false; } taluspPaladin.addCounters(CounterType.P1P1.createInstance(), game); diff --git a/Mage.Sets/src/mage/sets/worldwake/TectonicEdge.java b/Mage.Sets/src/mage/sets/worldwake/TectonicEdge.java index c9688577643..440b57e0589 100644 --- a/Mage.Sets/src/mage/sets/worldwake/TectonicEdge.java +++ b/Mage.Sets/src/mage/sets/worldwake/TectonicEdge.java @@ -28,9 +28,9 @@ package mage.sets.worldwake; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.CostImpl; diff --git a/Mage.Sets/src/mage/sets/worldwake/Terastodon.java b/Mage.Sets/src/mage/sets/worldwake/Terastodon.java index d0f41812c48..5908b784a7f 100644 --- a/Mage.Sets/src/mage/sets/worldwake/Terastodon.java +++ b/Mage.Sets/src/mage/sets/worldwake/Terastodon.java @@ -28,10 +28,10 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/worldwake/TerraEternal.java b/Mage.Sets/src/mage/sets/worldwake/TerraEternal.java index 061774d2a08..ed8f2c74cf5 100644 --- a/Mage.Sets/src/mage/sets/worldwake/TerraEternal.java +++ b/Mage.Sets/src/mage/sets/worldwake/TerraEternal.java @@ -28,10 +28,10 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continious.GainAbilityAllEffect; diff --git a/Mage.Sets/src/mage/sets/worldwake/ThadaAdelAcquisitor.java b/Mage.Sets/src/mage/sets/worldwake/ThadaAdelAcquisitor.java index de580488c50..ce7ef00b60e 100644 --- a/Mage.Sets/src/mage/sets/worldwake/ThadaAdelAcquisitor.java +++ b/Mage.Sets/src/mage/sets/worldwake/ThadaAdelAcquisitor.java @@ -28,9 +28,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -81,7 +80,7 @@ public class ThadaAdelAcquisitor extends CardImpl { class ThadaAdelAcquisitorEffect extends OneShotEffect { ThadaAdelAcquisitorEffect() { - super(Constants.Outcome.Exile); + super(Outcome.Exile); staticText = "search that player's library for an artifact card and exile it. Then that player shuffles his or her library. Until end of turn, you may play that card"; } @@ -123,7 +122,7 @@ class ThadaAdelPlayFromExileEffect extends AsThoughEffectImpl { // {U}, {tap}: You may tap or untap another target creature. Ability ability = new SimpleActivatedAbility( - Constants.Zone.BATTLEFIELD, + Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), - new ColoredManaCost(Constants.ColoredManaSymbol.U)); + new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/worldwake/TombHex.java b/Mage.Sets/src/mage/sets/worldwake/TombHex.java index 4a9f6f482c4..ee287cf5488 100644 --- a/Mage.Sets/src/mage/sets/worldwake/TombHex.java +++ b/Mage.Sets/src/mage/sets/worldwake/TombHex.java @@ -28,13 +28,14 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.condition.common.LandfallCondition; import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; import mage.watchers.common.LandfallWatcher; @@ -53,7 +54,7 @@ public class TombHex extends CardImpl { // Target creature gets -2/-2 until end of turn. // Landfall - If you had a land enter the battlefield under your control this turn, that creature gets -4/-4 until end of turn instead. this.addWatcher(new LandfallWatcher()); - this.getSpellAbility().addEffect(new ConditionalContinousEffect(new BoostTargetEffect(-4, -4, Constants.Duration.EndOfTurn), new BoostTargetEffect(-2, -2, Constants.Duration.EndOfTurn), LandfallCondition.getInstance(), "Target creature gets -2/-2 until end of turn. Landfall - If you had a land enter the battlefield under your control this turn, that creature gets -4/-4 until end of turn instead", true)); + this.getSpellAbility().addEffect(new ConditionalContinousEffect(new BoostTargetEffect(-4, -4, Duration.EndOfTurn), new BoostTargetEffect(-2, -2, Duration.EndOfTurn), LandfallCondition.getInstance(), "Target creature gets -2/-2 until end of turn. Landfall - If you had a land enter the battlefield under your control this turn, that creature gets -4/-4 until end of turn instead", true)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/worldwake/TreasureHunt.java b/Mage.Sets/src/mage/sets/worldwake/TreasureHunt.java index ea37a955b0d..72a93109406 100644 --- a/Mage.Sets/src/mage/sets/worldwake/TreasureHunt.java +++ b/Mage.Sets/src/mage/sets/worldwake/TreasureHunt.java @@ -28,10 +28,10 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/worldwake/TuktukScrapper.java b/Mage.Sets/src/mage/sets/worldwake/TuktukScrapper.java index d723080e827..a24a1538828 100644 --- a/Mage.Sets/src/mage/sets/worldwake/TuktukScrapper.java +++ b/Mage.Sets/src/mage/sets/worldwake/TuktukScrapper.java @@ -28,10 +28,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -81,7 +79,7 @@ public class TuktukScrapper extends CardImpl { class TuktukScrapperTriggeredAbility extends TriggeredAbilityImpl { public TuktukScrapperTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new TuktukScrapperEffect(), true); + super(Zone.BATTLEFIELD, new TuktukScrapperEffect(), true); } public TuktukScrapperTriggeredAbility(final TuktukScrapperTriggeredAbility ability) { @@ -125,7 +123,7 @@ class TuktukScrapperEffect extends OneShotEffect { } public TuktukScrapperEffect() { - super(Constants.Outcome.DestroyPermanent); + super(Outcome.DestroyPermanent); } public TuktukScrapperEffect(final TuktukScrapperEffect effect) { @@ -142,7 +140,7 @@ class TuktukScrapperEffect extends OneShotEffect { TargetArtifactPermanent target = new TargetArtifactPermanent(); Player you = game.getPlayer(source.getControllerId()); if (you != null) { - if (target.canChoose(source.getControllerId(), game) && target.choose(Constants.Outcome.DestroyPermanent, source.getControllerId(), source.getId(), game)) { + if (target.canChoose(source.getControllerId(), game) && target.choose(Outcome.DestroyPermanent, source.getControllerId(), source.getId(), game)) { Permanent targetedArtifact = game.getPermanent(target.getFirstTarget()); if (targetedArtifact != null) { Card artifact = game.getCard(targetedArtifact.getId()); diff --git a/Mage.Sets/src/mage/sets/worldwake/Twitch.java b/Mage.Sets/src/mage/sets/worldwake/Twitch.java index c02561d3b0c..880bf7479a1 100644 --- a/Mage.Sets/src/mage/sets/worldwake/Twitch.java +++ b/Mage.Sets/src/mage/sets/worldwake/Twitch.java @@ -28,8 +28,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.MayTapOrUntapTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/worldwake/UrgeToFeed.java b/Mage.Sets/src/mage/sets/worldwake/UrgeToFeed.java index f72a633e95b..7128a928741 100644 --- a/Mage.Sets/src/mage/sets/worldwake/UrgeToFeed.java +++ b/Mage.Sets/src/mage/sets/worldwake/UrgeToFeed.java @@ -28,13 +28,16 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -59,7 +62,7 @@ public class UrgeToFeed extends CardImpl { this.color.setBlack(true); // Target creature gets -3/-3 until end of turn. You may tap any number of untapped Vampire creatures you control. If you do, put a +1/+1 counter on each of those Vampires. - this.getSpellAbility().addEffect(new BoostTargetEffect(-3, -3, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(-3, -3, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new UrgeToFeedEffect()); } @@ -79,13 +82,13 @@ class UrgeToFeedEffect extends OneShotEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped Vampire creatures you control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(Predicates.not(new TappedPredicate())); filter.add(new SubtypePredicate("Vampire")); } public UrgeToFeedEffect() { - super(Constants.Outcome.BoostCreature); + super(Outcome.BoostCreature); staticText = "You may tap any number of untapped Vampire creatures you control. If you do, put a +1/+1 counter on each of those Vampires"; } @@ -98,7 +101,7 @@ class UrgeToFeedEffect extends OneShotEffect { TargetCreaturePermanent target = new TargetCreaturePermanent(filter); while (true) { target.clearChosen(); - if (target.canChoose(source.getControllerId(), game) && target.choose(Constants.Outcome.Tap, source.getControllerId(), source.getId(), game)) { + if (target.canChoose(source.getControllerId(), game) && target.choose(Outcome.Tap, source.getControllerId(), source.getId(), game)) { UUID vampire = target.getFirstTarget(); if (vampire != null) { game.getPermanent(vampire).tap(game); diff --git a/Mage.Sets/src/mage/sets/worldwake/VaporSnare.java b/Mage.Sets/src/mage/sets/worldwake/VaporSnare.java index 59c78d3e480..27cd4652f1e 100644 --- a/Mage.Sets/src/mage/sets/worldwake/VaporSnare.java +++ b/Mage.Sets/src/mage/sets/worldwake/VaporSnare.java @@ -28,9 +28,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -63,15 +62,15 @@ public class VaporSnare extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Detriment)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); // At the beginning of your upkeep, sacrifice Vapor Snare unless you return a land you control to its owner's hand. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new VaporSnareEffect(), Constants.TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new VaporSnareEffect(), TargetController.YOU, false)); } public VaporSnare(final VaporSnare card) { @@ -90,7 +89,7 @@ class VaporSnareEffect extends OneShotEffect { private static final String effectText = "sacrifice {this} unless you return a land you control to its owner's hand"; VaporSnareEffect( ) { - super(Constants.Outcome.Sacrifice); + super(Outcome.Sacrifice); staticText = effectText; } @@ -105,12 +104,12 @@ class VaporSnareEffect extends OneShotEffect { TargetPermanent target = new TargetPermanent(1, 1, filter, false); if (target.canChoose(player.getId(), game)) { - player.choose(Constants.Outcome.Sacrifice, target, source.getSourceId(), game); + player.choose(Outcome.Sacrifice, target, source.getSourceId(), game); Permanent permanent = game.getPermanent(target.getFirstTarget()); if ( permanent != null ) { targetChosen = true; - permanent.moveToZone(Constants.Zone.HAND, this.getId(), game, false); + permanent.moveToZone(Zone.HAND, this.getId(), game, false); } } diff --git a/Mage.Sets/src/mage/sets/worldwake/VastwoodAnimist.java b/Mage.Sets/src/mage/sets/worldwake/VastwoodAnimist.java index 9879d15afd2..f65cf80a59c 100644 --- a/Mage.Sets/src/mage/sets/worldwake/VastwoodAnimist.java +++ b/Mage.Sets/src/mage/sets/worldwake/VastwoodAnimist.java @@ -28,11 +28,11 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -69,7 +69,7 @@ public class VastwoodAnimist extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target land you control becomes an X/X Elemental creature until end of turn, where X is the number of Allies you control. It's still a land. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BecomesCreatureTargetEffect(new ElementalLandToken(), "land", Constants.Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureTargetEffect(new ElementalLandToken(), "land", Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetControlledPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/worldwake/VastwoodZendikon.java b/Mage.Sets/src/mage/sets/worldwake/VastwoodZendikon.java index 9824748e5ab..68244901af8 100644 --- a/Mage.Sets/src/mage/sets/worldwake/VastwoodZendikon.java +++ b/Mage.Sets/src/mage/sets/worldwake/VastwoodZendikon.java @@ -28,9 +28,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; @@ -63,11 +62,11 @@ public class VastwoodZendikon extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.PutCreatureInPlay)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutCreatureInPlay)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - Ability ability2 = new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new VastwoodElementalToken(), "Enchanted land is a 6/4 green Elemental creature. It's still a land", Constants.Duration.Custom)); + Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new VastwoodElementalToken(), "Enchanted land is a 6/4 green Elemental creature. It's still a land", Duration.Custom)); this.addAbility(ability2); Ability ability3 = new DiesAttachedTriggeredAbility(new ReturnToHandAttachedEffect(), "enchanted land", false, false); diff --git a/Mage.Sets/src/mage/sets/worldwake/VeteransReflexes.java b/Mage.Sets/src/mage/sets/worldwake/VeteransReflexes.java index 75517baff6c..09b246d8744 100644 --- a/Mage.Sets/src/mage/sets/worldwake/VeteransReflexes.java +++ b/Mage.Sets/src/mage/sets/worldwake/VeteransReflexes.java @@ -29,9 +29,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.UntapTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/worldwake/VoyagerDrake.java b/Mage.Sets/src/mage/sets/worldwake/VoyagerDrake.java index 0ecdee168a6..f5df8a4d317 100644 --- a/Mage.Sets/src/mage/sets/worldwake/VoyagerDrake.java +++ b/Mage.Sets/src/mage/sets/worldwake/VoyagerDrake.java @@ -28,9 +28,9 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +41,7 @@ import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.MultikickerAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.game.Game; import mage.target.common.TargetCreaturePermanent; @@ -67,7 +68,7 @@ public class VoyagerDrake extends CardImpl { // When Voyager Drake enters the battlefield, up to X target creatures gain flying until end of turn, where X is the number of times Voyager Drake was kicked. Ability ability = new ConditionalTriggeredAbility( - new EntersBattlefieldTriggeredAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn), false), + new EntersBattlefieldTriggeredAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), false), KickedCondition.getInstance(), "When {this} enters the battlefield, up to X target creatures gain flying until end of turn, where X is the number of times {this} was kicked."); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/worldwake/WalkingAtlas.java b/Mage.Sets/src/mage/sets/worldwake/WalkingAtlas.java index 2549c080084..b10bc27d2e2 100644 --- a/Mage.Sets/src/mage/sets/worldwake/WalkingAtlas.java +++ b/Mage.Sets/src/mage/sets/worldwake/WalkingAtlas.java @@ -30,9 +30,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterLandCard; import mage.game.Game; import mage.target.common.TargetCardInHand; @@ -56,7 +57,7 @@ public class WalkingAtlas extends CardImpl { this.subtype.add("Construct"); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new WalkingAtlasEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WalkingAtlasEffect(), new TapSourceCost()); ability.addTarget(new TargetCardInHand(new FilterLandCard())); this.addAbility(ability); } @@ -74,7 +75,7 @@ public class WalkingAtlas extends CardImpl { class WalkingAtlasEffect extends OneShotEffect { WalkingAtlasEffect() { - super(Constants.Outcome.PutLandInPlay); + super(Outcome.PutLandInPlay); staticText = "You may put a land card from your hand onto the battlefield"; } @@ -86,7 +87,7 @@ class WalkingAtlasEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Card c = game.getCard(targetPointer.getFirst(game, source)); if (c != null) { - c.moveToZone(Constants.Zone.BATTLEFIELD, source.getSourceId(), game, false); + c.moveToZone(Zone.BATTLEFIELD, source.getSourceId(), game, false); return true; } return false; diff --git a/Mage.Sets/src/mage/sets/worldwake/WindZendikon.java b/Mage.Sets/src/mage/sets/worldwake/WindZendikon.java index a525a34a4e7..73597560d34 100644 --- a/Mage.Sets/src/mage/sets/worldwake/WindZendikon.java +++ b/Mage.Sets/src/mage/sets/worldwake/WindZendikon.java @@ -28,9 +28,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; @@ -64,11 +63,11 @@ public class WindZendikon extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.PutCreatureInPlay)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutCreatureInPlay)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - Ability ability2 = new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new ElementalToken(), "Enchanted land is a 2/2 blue Elemental creature with flying. It's still a land", Constants.Duration.Custom)); + Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new ElementalToken(), "Enchanted land is a 2/2 blue Elemental creature with flying. It's still a land", Duration.Custom)); this.addAbility(ability2); Ability ability3 = new DiesAttachedTriggeredAbility(new ReturnToHandAttachedEffect(), "enchanted land", false, false); diff --git a/Mage.Sets/src/mage/sets/worldwake/WolfbriarElemental.java b/Mage.Sets/src/mage/sets/worldwake/WolfbriarElemental.java index 45f19a28db7..415c7b5f392 100644 --- a/Mage.Sets/src/mage/sets/worldwake/WolfbriarElemental.java +++ b/Mage.Sets/src/mage/sets/worldwake/WolfbriarElemental.java @@ -29,8 +29,8 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.MultikickerCount; diff --git a/Mage.Sets/src/mage/sets/worldwake/WrexialTheRisenDeep.java b/Mage.Sets/src/mage/sets/worldwake/WrexialTheRisenDeep.java index c9eae94b24b..c07237c84b4 100644 --- a/Mage.Sets/src/mage/sets/worldwake/WrexialTheRisenDeep.java +++ b/Mage.Sets/src/mage/sets/worldwake/WrexialTheRisenDeep.java @@ -28,11 +28,11 @@ package mage.sets.worldwake; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/AdventuringGear.java b/Mage.Sets/src/mage/sets/zendikar/AdventuringGear.java index 3fa733bd6f7..28baab4dda5 100644 --- a/Mage.Sets/src/mage/sets/zendikar/AdventuringGear.java +++ b/Mage.Sets/src/mage/sets/zendikar/AdventuringGear.java @@ -29,10 +29,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.common.LandfallAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostTargetEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java b/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java index ec95d6f29dd..f8a90be1289 100644 --- a/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java +++ b/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java @@ -29,8 +29,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/AkoumRefuge.java b/Mage.Sets/src/mage/sets/zendikar/AkoumRefuge.java index 67f7ea0646b..0dd26b97650 100644 --- a/Mage.Sets/src/mage/sets/zendikar/AkoumRefuge.java +++ b/Mage.Sets/src/mage/sets/zendikar/AkoumRefuge.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java b/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java index 66681ecd674..f38afe83428 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.mana.GenericManaCost; @@ -43,7 +43,7 @@ import mage.watchers.Watcher; import mage.watchers.WatcherImpl; import java.util.UUID; -import mage.Constants.WatcherScope; +import mage.constants.WatcherScope; /** * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/sets/zendikar/ArchmageAscension.java b/Mage.Sets/src/mage/sets/zendikar/ArchmageAscension.java index 412abd5e302..16d52661e88 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ArchmageAscension.java +++ b/Mage.Sets/src/mage/sets/zendikar/ArchmageAscension.java @@ -27,8 +27,6 @@ */ package mage.sets.zendikar; -import mage.Constants; -import mage.Constants.*; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; @@ -36,6 +34,7 @@ import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.*; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; @@ -64,7 +63,7 @@ public class ArchmageAscension extends CardImpl { this.addWatcher(new CardsDrawnControllerWatcher()); // As long as Archmage Ascension has six or more quest counters on it, if you would draw a card, you may instead search your library for a card, put that card into your hand, then shuffle your library. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ArchmageAscensionReplacementEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ArchmageAscensionReplacementEffect())); } @@ -81,7 +80,7 @@ public class ArchmageAscension extends CardImpl { class ArchmageAscensionTriggeredAbility extends TriggeredAbilityImpl { public ArchmageAscensionTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.QUEST.createInstance(1)), true); + super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.QUEST.createInstance(1)), true); } public ArchmageAscensionTriggeredAbility(final ArchmageAscensionTriggeredAbility ability) { @@ -174,7 +173,7 @@ class ArchmageAscensionReplacementEffect extends ReplacementEffectImpl= 6 && you != null - && you.chooseUse(Constants.Outcome.Benefit, "Would you like to search you library instead of drawing a card?", game)) { + && you.chooseUse(Outcome.Benefit, "Would you like to search you library instead of drawing a card?", game)) { return true; } return false; diff --git a/Mage.Sets/src/mage/sets/zendikar/AridMesa.java b/Mage.Sets/src/mage/sets/zendikar/AridMesa.java index 95186e90b5b..7d52b1149a9 100644 --- a/Mage.Sets/src/mage/sets/zendikar/AridMesa.java +++ b/Mage.Sets/src/mage/sets/zendikar/AridMesa.java @@ -29,8 +29,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.FetchLandActivatedAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/ArmamentMaster.java b/Mage.Sets/src/mage/sets/zendikar/ArmamentMaster.java index 21928a6f677..fc21445b866 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ArmamentMaster.java +++ b/Mage.Sets/src/mage/sets/zendikar/ArmamentMaster.java @@ -27,13 +27,13 @@ */ package mage.sets.zendikar; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/ArrowVolleyTrap.java b/Mage.Sets/src/mage/sets/zendikar/ArrowVolleyTrap.java index 2510a0a11a2..606ccb1405b 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ArrowVolleyTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/ArrowVolleyTrap.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/BalaGedThief.java b/Mage.Sets/src/mage/sets/zendikar/BalaGedThief.java index c1476e31a10..407148ade61 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BalaGedThief.java +++ b/Mage.Sets/src/mage/sets/zendikar/BalaGedThief.java @@ -29,9 +29,9 @@ package mage.sets.zendikar; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; @@ -40,6 +40,8 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; @@ -74,7 +76,7 @@ public class BalaGedThief extends CardImpl { new SubtypePredicate("Ally"))); // Whenever Bala Ged Thief or another Ally enters the battlefield under your control, target player reveals a number of cards from his or her hand equal to the number of Allies you control. You choose one of them. That player discards that card. - Ability ability = new EntersBattlefieldAllTriggeredAbility(Constants.Zone.BATTLEFIELD, new BalaGedThiefEffect(), filter, false); + Ability ability = new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new BalaGedThiefEffect(), filter, false); TargetPlayer target = new TargetPlayer(); target.setRequired(true); ability.addTarget(target); @@ -94,7 +96,7 @@ public class BalaGedThief extends CardImpl { class BalaGedThiefEffect extends OneShotEffect { public BalaGedThiefEffect() { - super(Constants.Outcome.Discard); + super(Outcome.Discard); this.staticText = "target player reveals a number of cards from his or her hand equal to the number of Allies you control. You choose one of them. That player discards that card"; } @@ -122,16 +124,16 @@ class BalaGedThiefEffect extends OneShotEffect { int numberOfAllies = game.getBattlefield().countAll(filter, you.getId(), game); - Cards cardsInHand = new CardsImpl(Constants.Zone.PICK); + Cards cardsInHand = new CardsImpl(Zone.PICK); cardsInHand.addAll(targetPlayer.getHand()); int count = Math.min(cardsInHand.size(), numberOfAllies); - TargetCard target = new TargetCard(count, Constants.Zone.PICK, new FilterCard()); + TargetCard target = new TargetCard(count, Zone.PICK, new FilterCard()); target.setRequired(true); Cards revealedCards = new CardsImpl(); - if (targetPlayer.choose(Constants.Outcome.DrawCard, cardsInHand, target, game)) { + if (targetPlayer.choose(Outcome.DrawCard, cardsInHand, target, game)) { List targets = target.getTargets(); for (UUID targetId : targets) { Card card = game.getCard(targetId); @@ -141,12 +143,12 @@ class BalaGedThiefEffect extends OneShotEffect { } } - TargetCard targetInHand = new TargetCard(Constants.Zone.PICK, new FilterCard("card to discard")); + TargetCard targetInHand = new TargetCard(Zone.PICK, new FilterCard("card to discard")); targetInHand.setRequired(true); if (!revealedCards.isEmpty()) { targetPlayer.revealCards("Bala Ged Thief", revealedCards, game); - you.choose(Constants.Outcome.Neutral, revealedCards, targetInHand, game); + you.choose(Outcome.Neutral, revealedCards, targetInHand, game); Card card = revealedCards.get(targetInHand.getFirstTarget(), game); if (card != null) { targetPlayer.discard(card, source, game); diff --git a/Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java b/Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java index 35fb8dab253..f6b1aa322ec 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -38,6 +38,7 @@ import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; +import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -78,7 +79,7 @@ public class BalothCageTrap extends CardImpl { class BalothCageTrapWatcher extends WatcherImpl { public BalothCageTrapWatcher() { - super("BalothCageTrapWatcher", Constants.WatcherScope.GAME); + super("BalothCageTrapWatcher", WatcherScope.GAME); } public BalothCageTrapWatcher(final BalothCageTrapWatcher watcher) { diff --git a/Mage.Sets/src/mage/sets/zendikar/BalothWoodcrasher.java b/Mage.Sets/src/mage/sets/zendikar/BalothWoodcrasher.java index c250cead528..ed60a340573 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BalothWoodcrasher.java +++ b/Mage.Sets/src/mage/sets/zendikar/BalothWoodcrasher.java @@ -28,10 +28,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; @@ -55,7 +55,7 @@ public class BalothWoodcrasher extends CardImpl { this.toughness = new MageInt(4); LandfallAbility ability = new LandfallAbility(new BoostSourceEffect(4, 4, Duration.EndOfTurn), false); - ability.addEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Constants.Duration.EndOfTurn)); + ability.addEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/BeastHunt.java b/Mage.Sets/src/mage/sets/zendikar/BeastHunt.java index dff9cd5d64e..b5ba642f6ae 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BeastHunt.java +++ b/Mage.Sets/src/mage/sets/zendikar/BeastHunt.java @@ -28,10 +28,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/zendikar/BeastmasterAscension.java b/Mage.Sets/src/mage/sets/zendikar/BeastmasterAscension.java index 0c23da30f79..93c22688b16 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BeastmasterAscension.java +++ b/Mage.Sets/src/mage/sets/zendikar/BeastmasterAscension.java @@ -28,10 +28,10 @@ package mage.sets.zendikar; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.AttacksCreatureYourControlTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/BladeOfTheBloodchief.java b/Mage.Sets/src/mage/sets/zendikar/BladeOfTheBloodchief.java index 0d418df4d31..34393102337 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BladeOfTheBloodchief.java +++ b/Mage.Sets/src/mage/sets/zendikar/BladeOfTheBloodchief.java @@ -28,11 +28,11 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.GenericManaCost; @@ -57,7 +57,7 @@ public class BladeOfTheBloodchief extends CardImpl { this.expansionSetCode = "ZEN"; this.getSubtype().add("Equipment"); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(1))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1))); this.addAbility(new BladeOfTheBloodChiefTriggeredAbility()); } @@ -89,7 +89,7 @@ class BladeOfTheBloodChiefTriggeredAbility extends TriggeredAbilityImpl { this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn), new ManaCostsImpl("{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/zendikar/CaravanHurda.java b/Mage.Sets/src/mage/sets/zendikar/CaravanHurda.java index 23511519e1d..74f2b3435a3 100644 --- a/Mage.Sets/src/mage/sets/zendikar/CaravanHurda.java +++ b/Mage.Sets/src/mage/sets/zendikar/CaravanHurda.java @@ -29,8 +29,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/CarnageAltar.java b/Mage.Sets/src/mage/sets/zendikar/CarnageAltar.java index a458a4ef6cf..702cd1809c8 100644 --- a/Mage.Sets/src/mage/sets/zendikar/CarnageAltar.java +++ b/Mage.Sets/src/mage/sets/zendikar/CarnageAltar.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.mana.GenericManaCost; diff --git a/Mage.Sets/src/mage/sets/zendikar/CelestialMantle.java b/Mage.Sets/src/mage/sets/zendikar/CelestialMantle.java index 7fcb53ce309..c17821b50ee 100644 --- a/Mage.Sets/src/mage/sets/zendikar/CelestialMantle.java +++ b/Mage.Sets/src/mage/sets/zendikar/CelestialMantle.java @@ -30,9 +30,7 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; @@ -64,10 +62,10 @@ public class CelestialMantle extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Constants.Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); this.addAbility(new CelestialMantleAbility()); } @@ -85,7 +83,7 @@ public class CelestialMantle extends CardImpl { class CelestialMantleAbility extends TriggeredAbilityImpl { public CelestialMantleAbility() { - super(Constants.Zone.BATTLEFIELD, new CelestialMantleEffect()); + super(Zone.BATTLEFIELD, new CelestialMantleEffect()); this.addEffect(new UntapAllLandsControllerEffect()); } @@ -118,7 +116,7 @@ class CelestialMantleAbility extends TriggeredAbilityImpl { CelestialMantleEffect() { - super(Constants.Outcome.GainLife); + super(Outcome.GainLife); } CelestialMantleEffect(final CelestialMantleEffect effect) { diff --git a/Mage.Sets/src/mage/sets/zendikar/ChandraAblaze.java b/Mage.Sets/src/mage/sets/zendikar/ChandraAblaze.java index 5ebeecc7be1..0a5d005b37d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ChandraAblaze.java +++ b/Mage.Sets/src/mage/sets/zendikar/ChandraAblaze.java @@ -29,9 +29,9 @@ package mage.sets.zendikar; import java.util.Set; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/CliffThreader.java b/Mage.Sets/src/mage/sets/zendikar/CliffThreader.java index c8e97d500a7..0997342562b 100644 --- a/Mage.Sets/src/mage/sets/zendikar/CliffThreader.java +++ b/Mage.Sets/src/mage/sets/zendikar/CliffThreader.java @@ -29,8 +29,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.MountainwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/CobraTrap.java b/Mage.Sets/src/mage/sets/zendikar/CobraTrap.java index d2964df2625..24495f3e329 100644 --- a/Mage.Sets/src/mage/sets/zendikar/CobraTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/CobraTrap.java @@ -28,11 +28,11 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.ColoredManaSymbol; -import mage.Constants.Rarity; -import mage.Constants.WatcherScope; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Rarity; +import mage.constants.WatcherScope; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.mana.ColoredManaCost; diff --git a/Mage.Sets/src/mage/sets/zendikar/ConquerorsPledge.java b/Mage.Sets/src/mage/sets/zendikar/ConquerorsPledge.java index e5d519e6c1f..72cdf1339f6 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ConquerorsPledge.java +++ b/Mage.Sets/src/mage/sets/zendikar/ConquerorsPledge.java @@ -29,8 +29,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.condition.common.KickedCondition; import mage.abilities.decorator.ConditionalOneShotEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/CosisTrickster.java b/Mage.Sets/src/mage/sets/zendikar/CosisTrickster.java index 5e4419b0959..6dfc10986ec 100644 --- a/Mage.Sets/src/mage/sets/zendikar/CosisTrickster.java +++ b/Mage.Sets/src/mage/sets/zendikar/CosisTrickster.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/CryptOfAgadeem.java b/Mage.Sets/src/mage/sets/zendikar/CryptOfAgadeem.java index 4d49630d10d..627d37a3e7a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/CryptOfAgadeem.java +++ b/Mage.Sets/src/mage/sets/zendikar/CryptOfAgadeem.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.Mana; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldTappedAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/CryptRipper.java b/Mage.Sets/src/mage/sets/zendikar/CryptRipper.java index e30fe4de624..bf09e8c1ad1 100644 --- a/Mage.Sets/src/mage/sets/zendikar/CryptRipper.java +++ b/Mage.Sets/src/mage/sets/zendikar/CryptRipper.java @@ -28,10 +28,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/DayOfJudgment.java b/Mage.Sets/src/mage/sets/zendikar/DayOfJudgment.java index 2df4d7440a2..7ee6ab634a9 100644 --- a/Mage.Sets/src/mage/sets/zendikar/DayOfJudgment.java +++ b/Mage.Sets/src/mage/sets/zendikar/DayOfJudgment.java @@ -29,8 +29,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/zendikar/DesecratedEarth.java b/Mage.Sets/src/mage/sets/zendikar/DesecratedEarth.java index 44c4fbdc824..e38de26df19 100644 --- a/Mage.Sets/src/mage/sets/zendikar/DesecratedEarth.java +++ b/Mage.Sets/src/mage/sets/zendikar/DesecratedEarth.java @@ -28,10 +28,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/DevoutLightcaster.java b/Mage.Sets/src/mage/sets/zendikar/DevoutLightcaster.java index f5f7ad595ec..fa396464a99 100644 --- a/Mage.Sets/src/mage/sets/zendikar/DevoutLightcaster.java +++ b/Mage.Sets/src/mage/sets/zendikar/DevoutLightcaster.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/Disfigure.java b/Mage.Sets/src/mage/sets/zendikar/Disfigure.java index 8d97f6bd8de..5844134b5a0 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Disfigure.java +++ b/Mage.Sets/src/mage/sets/zendikar/Disfigure.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/zendikar/EldraziMonument.java b/Mage.Sets/src/mage/sets/zendikar/EldraziMonument.java index 53479857f8f..f218fb88de1 100644 --- a/Mage.Sets/src/mage/sets/zendikar/EldraziMonument.java +++ b/Mage.Sets/src/mage/sets/zendikar/EldraziMonument.java @@ -29,11 +29,11 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/Electropotence.java b/Mage.Sets/src/mage/sets/zendikar/Electropotence.java index 3333538d2b8..b06f151dcb3 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Electropotence.java +++ b/Mage.Sets/src/mage/sets/zendikar/Electropotence.java @@ -28,10 +28,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/ElementalAppeal.java b/Mage.Sets/src/mage/sets/zendikar/ElementalAppeal.java index d59643028d7..ec75e338175 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ElementalAppeal.java +++ b/Mage.Sets/src/mage/sets/zendikar/ElementalAppeal.java @@ -28,10 +28,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.delayed.AtEndOfTurnDelayedTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/EmeriaAngel.java b/Mage.Sets/src/mage/sets/zendikar/EmeriaAngel.java index 8affae6547e..142dc297e74 100644 --- a/Mage.Sets/src/mage/sets/zendikar/EmeriaAngel.java +++ b/Mage.Sets/src/mage/sets/zendikar/EmeriaAngel.java @@ -29,8 +29,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/EmeriaTheSkyRuin.java b/Mage.Sets/src/mage/sets/zendikar/EmeriaTheSkyRuin.java index b074d3965c8..1b27a387ca7 100644 --- a/Mage.Sets/src/mage/sets/zendikar/EmeriaTheSkyRuin.java +++ b/Mage.Sets/src/mage/sets/zendikar/EmeriaTheSkyRuin.java @@ -27,9 +27,9 @@ */ package mage.sets.zendikar; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/EternityVessel.java b/Mage.Sets/src/mage/sets/zendikar/EternityVessel.java index aeeea357b96..186db61f440 100644 --- a/Mage.Sets/src/mage/sets/zendikar/EternityVessel.java +++ b/Mage.Sets/src/mage/sets/zendikar/EternityVessel.java @@ -28,10 +28,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.common.EntersBattlefieldAbility; @@ -39,6 +39,7 @@ import mage.abilities.common.LandfallAbility; import mage.abilities.effects.EntersBattlefieldEffect; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -58,7 +59,7 @@ public class EternityVessel extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new EternityVesselEffect())); // Landfall - Whenever a land enters the battlefield under your control, you may have your life total become the number of charge counters on Eternity Vessel. - this.addAbility(new LandfallAbility(Constants.Zone.BATTLEFIELD, new EternityVesselEffect2(), true)); + this.addAbility(new LandfallAbility(Zone.BATTLEFIELD, new EternityVesselEffect2(), true)); } public EternityVessel(final EternityVessel card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/ExpeditionMap.java b/Mage.Sets/src/mage/sets/zendikar/ExpeditionMap.java index b4970e6a4b4..cbd8f2cc136 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ExpeditionMap.java +++ b/Mage.Sets/src/mage/sets/zendikar/ExpeditionMap.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/zendikar/ExplorersScope.java b/Mage.Sets/src/mage/sets/zendikar/ExplorersScope.java index 359e75228bd..59f729ab350 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ExplorersScope.java +++ b/Mage.Sets/src/mage/sets/zendikar/ExplorersScope.java @@ -28,10 +28,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.AttacksEquippedTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; diff --git a/Mage.Sets/src/mage/sets/zendikar/FeastOfBlood.java b/Mage.Sets/src/mage/sets/zendikar/FeastOfBlood.java index 1041314aff7..b944b4fee48 100644 --- a/Mage.Sets/src/mage/sets/zendikar/FeastOfBlood.java +++ b/Mage.Sets/src/mage/sets/zendikar/FeastOfBlood.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.CostImpl; import mage.abilities.effects.common.DestroyTargetEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/FelidarSovereign.java b/Mage.Sets/src/mage/sets/zendikar/FelidarSovereign.java index 3c789ffd6ae..02ee6dbfa07 100644 --- a/Mage.Sets/src/mage/sets/zendikar/FelidarSovereign.java +++ b/Mage.Sets/src/mage/sets/zendikar/FelidarSovereign.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/FrontierGuide.java b/Mage.Sets/src/mage/sets/zendikar/FrontierGuide.java index 694edb19dbc..d41f925b197 100644 --- a/Mage.Sets/src/mage/sets/zendikar/FrontierGuide.java +++ b/Mage.Sets/src/mage/sets/zendikar/FrontierGuide.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/zendikar/GatekeeperOfMalakir.java b/Mage.Sets/src/mage/sets/zendikar/GatekeeperOfMalakir.java index 633617671d1..58e2757d530 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GatekeeperOfMalakir.java +++ b/Mage.Sets/src/mage/sets/zendikar/GatekeeperOfMalakir.java @@ -27,8 +27,8 @@ */ package mage.sets.zendikar; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/GeyserGlider.java b/Mage.Sets/src/mage/sets/zendikar/GeyserGlider.java index 3c5a5656b90..b4526275ce1 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GeyserGlider.java +++ b/Mage.Sets/src/mage/sets/zendikar/GeyserGlider.java @@ -28,14 +28,15 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -53,7 +54,7 @@ public class GeyserGlider extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); - this.addAbility(new LandfallAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Constants.Duration.EndOfTurn), false)); + this.addAbility(new LandfallAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), false)); } public GeyserGlider(final GeyserGlider card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/GiantScorpion.java b/Mage.Sets/src/mage/sets/zendikar/GiantScorpion.java index 4e20cbfb5df..6f2c22ec731 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GiantScorpion.java +++ b/Mage.Sets/src/mage/sets/zendikar/GiantScorpion.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/Gigantiform.java b/Mage.Sets/src/mage/sets/zendikar/Gigantiform.java index d33a966a10d..4a111ed9d4f 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Gigantiform.java +++ b/Mage.Sets/src/mage/sets/zendikar/Gigantiform.java @@ -28,13 +28,13 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.StaticAbility; import mage.abilities.TriggeredAbilityImpl; @@ -77,7 +77,7 @@ public class Gigantiform extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature is 8/8 and has trample. diff --git a/Mage.Sets/src/mage/sets/zendikar/GoblinBushwhacker.java b/Mage.Sets/src/mage/sets/zendikar/GoblinBushwhacker.java index edac1065ff4..7a574e80bc1 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GoblinBushwhacker.java +++ b/Mage.Sets/src/mage/sets/zendikar/GoblinBushwhacker.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; diff --git a/Mage.Sets/src/mage/sets/zendikar/GoblinGuide.java b/Mage.Sets/src/mage/sets/zendikar/GoblinGuide.java index 3b3ed2e82c3..049e6cf093e 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GoblinGuide.java +++ b/Mage.Sets/src/mage/sets/zendikar/GoblinGuide.java @@ -29,10 +29,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/GoblinRuinblaster.java b/Mage.Sets/src/mage/sets/zendikar/GoblinRuinblaster.java index e205073231d..205eae59165 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GoblinRuinblaster.java +++ b/Mage.Sets/src/mage/sets/zendikar/GoblinRuinblaster.java @@ -29,8 +29,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; diff --git a/Mage.Sets/src/mage/sets/zendikar/GoblinShortcutter.java b/Mage.Sets/src/mage/sets/zendikar/GoblinShortcutter.java index e108220e038..ede187aa80e 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GoblinShortcutter.java +++ b/Mage.Sets/src/mage/sets/zendikar/GoblinShortcutter.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/GoblinWarPaint.java b/Mage.Sets/src/mage/sets/zendikar/GoblinWarPaint.java index 5e31db3cae4..e26110298a4 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GoblinWarPaint.java +++ b/Mage.Sets/src/mage/sets/zendikar/GoblinWarPaint.java @@ -28,12 +28,12 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; @@ -41,6 +41,8 @@ import mage.abilities.effects.common.AttachEffect; import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.Layer; +import mage.constants.SubLayer; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -80,7 +82,7 @@ public class GoblinWarPaint extends CardImpl { class GoblinWarPaintEffect extends ContinuousEffectImpl { public GoblinWarPaintEffect() { - super(Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "Enchanted creature gets +2/+2 and has haste"; } @@ -89,20 +91,20 @@ class GoblinWarPaintEffect extends ContinuousEffectImpl { } @Override - public boolean apply(Constants.Layer layer, Constants.SubLayer sublayer, Ability source, Game game) { + public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) { Permanent enchantment = game.getPermanent(source.getSourceId()); if (enchantment != null && enchantment.getAttachedTo() != null) { Permanent creature = game.getPermanent(enchantment.getAttachedTo()); if (creature != null) { switch (layer) { case PTChangingEffects_7: - if (sublayer == Constants.SubLayer.ModifyPT_7c) { + if (sublayer == SubLayer.ModifyPT_7c) { creature.addPower(2); creature.addToughness(2); } break; case AbilityAddingRemovingEffects_6: - if (sublayer == Constants.SubLayer.NA) { + if (sublayer == SubLayer.NA) { creature.addAbility(HasteAbility.getInstance(), game); } break; @@ -119,8 +121,8 @@ class GoblinWarPaintEffect extends ContinuousEffectImpl { } @Override - public boolean hasLayer(Constants.Layer layer) { - return layer == Constants.Layer.AbilityAddingRemovingEffects_6 || layer == layer.PTChangingEffects_7; + public boolean hasLayer(Layer layer) { + return layer == Layer.AbilityAddingRemovingEffects_6 || layer == layer.PTChangingEffects_7; } @Override diff --git a/Mage.Sets/src/mage/sets/zendikar/Gomazoa.java b/Mage.Sets/src/mage/sets/zendikar/Gomazoa.java index 46d70fadf51..c560c7ccb7d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Gomazoa.java +++ b/Mage.Sets/src/mage/sets/zendikar/Gomazoa.java @@ -27,11 +27,10 @@ */ package mage.sets.zendikar; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -138,7 +138,7 @@ class BlockedByWatcher extends WatcherImpl { public List blockedByWatcher = new ArrayList(); public BlockedByWatcher() { - super("BlockedByWatcher", Constants.WatcherScope.CARD); + super("BlockedByWatcher", WatcherScope.CARD); } public BlockedByWatcher(final BlockedByWatcher watcher) { diff --git a/Mage.Sets/src/mage/sets/zendikar/GrapplingHook.java b/Mage.Sets/src/mage/sets/zendikar/GrapplingHook.java index 3a1d9ffb04b..3e795c4063e 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GrapplingHook.java +++ b/Mage.Sets/src/mage/sets/zendikar/GrapplingHook.java @@ -28,12 +28,12 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.AttacksEquippedTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/GraypeltRefuge.java b/Mage.Sets/src/mage/sets/zendikar/GraypeltRefuge.java index 41381e2ee8f..1bb578bf352 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GraypeltRefuge.java +++ b/Mage.Sets/src/mage/sets/zendikar/GraypeltRefuge.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/GrazingGladehart.java b/Mage.Sets/src/mage/sets/zendikar/GrazingGladehart.java index 13c52a1f7ce..d835a5dd20f 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GrazingGladehart.java +++ b/Mage.Sets/src/mage/sets/zendikar/GrazingGladehart.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/GreenweaverDruid.java b/Mage.Sets/src/mage/sets/zendikar/GreenweaverDruid.java index d401f90bd21..52620cd7ab7 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GreenweaverDruid.java +++ b/Mage.Sets/src/mage/sets/zendikar/GreenweaverDruid.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.Mana; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/zendikar/GrimDiscovery.java b/Mage.Sets/src/mage/sets/zendikar/GrimDiscovery.java index 3cd59fca3f9..c96d69d8b74 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GrimDiscovery.java +++ b/Mage.Sets/src/mage/sets/zendikar/GrimDiscovery.java @@ -28,10 +28,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/GuulDrazSpecter.java b/Mage.Sets/src/mage/sets/zendikar/GuulDrazSpecter.java index 4ef00340fa3..76cc8bde208 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GuulDrazSpecter.java +++ b/Mage.Sets/src/mage/sets/zendikar/GuulDrazSpecter.java @@ -29,10 +29,10 @@ package mage.sets.zendikar; import java.util.Set; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/GuulDrazVampire.java b/Mage.Sets/src/mage/sets/zendikar/GuulDrazVampire.java index 7c7d01b1fe9..8cd0b4281c1 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GuulDrazVampire.java +++ b/Mage.Sets/src/mage/sets/zendikar/GuulDrazVampire.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EquippedCondition; @@ -39,6 +39,8 @@ import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.IntimidateAbility; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Zone; /** * @@ -59,10 +61,10 @@ public class GuulDrazVampire extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - ConditionalContinousEffect effect1 = new ConditionalContinousEffect(new BoostSourceEffect(2, 1, Constants.Duration.WhileOnBattlefield), EquippedCondition.getInstance(), rule1); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect1)); + ConditionalContinousEffect effect1 = new ConditionalContinousEffect(new BoostSourceEffect(2, 1, Duration.WhileOnBattlefield), EquippedCondition.getInstance(), rule1); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect1)); ConditionalContinousEffect effect2 = new ConditionalContinousEffect(new GainAbilitySourceEffect(IntimidateAbility.getInstance()), EquippedCondition.getInstance(), rule2); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect2)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect2)); } diff --git a/Mage.Sets/src/mage/sets/zendikar/HagraCrocodile.java b/Mage.Sets/src/mage/sets/zendikar/HagraCrocodile.java index 194eaad8bbf..82d2cf3d0b1 100644 --- a/Mage.Sets/src/mage/sets/zendikar/HagraCrocodile.java +++ b/Mage.Sets/src/mage/sets/zendikar/HagraCrocodile.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.abilities.common.LandfallAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/HagraDiabolist.java b/Mage.Sets/src/mage/sets/zendikar/HagraDiabolist.java index ad400996fa2..4de4af005df 100644 --- a/Mage.Sets/src/mage/sets/zendikar/HagraDiabolist.java +++ b/Mage.Sets/src/mage/sets/zendikar/HagraDiabolist.java @@ -29,15 +29,15 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AllyEntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -53,7 +53,7 @@ public class HagraDiabolist extends CardImpl { static { filter.add(new SubtypePredicate("Ally")); - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public HagraDiabolist(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/zendikar/HaloHunter.java b/Mage.Sets/src/mage/sets/zendikar/HaloHunter.java index 31adead90a4..973b73d5014 100644 --- a/Mage.Sets/src/mage/sets/zendikar/HaloHunter.java +++ b/Mage.Sets/src/mage/sets/zendikar/HaloHunter.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/Harrow.java b/Mage.Sets/src/mage/sets/zendikar/Harrow.java index c8ec60546ff..8cf741f9319 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Harrow.java +++ b/Mage.Sets/src/mage/sets/zendikar/Harrow.java @@ -29,9 +29,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/HeartstabberMosquito.java b/Mage.Sets/src/mage/sets/zendikar/HeartstabberMosquito.java index e2812e16511..70c8d628f09 100644 --- a/Mage.Sets/src/mage/sets/zendikar/HeartstabberMosquito.java +++ b/Mage.Sets/src/mage/sets/zendikar/HeartstabberMosquito.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; diff --git a/Mage.Sets/src/mage/sets/zendikar/HedronCrab.java b/Mage.Sets/src/mage/sets/zendikar/HedronCrab.java index 4829a3ad450..8edcba52e82 100644 --- a/Mage.Sets/src/mage/sets/zendikar/HedronCrab.java +++ b/Mage.Sets/src/mage/sets/zendikar/HedronCrab.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/HedronScrabbler.java b/Mage.Sets/src/mage/sets/zendikar/HedronScrabbler.java index a16114d1caa..bbe117af12a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/HedronScrabbler.java +++ b/Mage.Sets/src/mage/sets/zendikar/HedronScrabbler.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/HellfireMongrel.java b/Mage.Sets/src/mage/sets/zendikar/HellfireMongrel.java index 0fbdb67829d..1896e92d2f1 100644 --- a/Mage.Sets/src/mage/sets/zendikar/HellfireMongrel.java +++ b/Mage.Sets/src/mage/sets/zendikar/HellfireMongrel.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DamageTargetEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/HellkiteCharger.java b/Mage.Sets/src/mage/sets/zendikar/HellkiteCharger.java index 6fef8c73f42..217cfc86261 100644 --- a/Mage.Sets/src/mage/sets/zendikar/HellkiteCharger.java +++ b/Mage.Sets/src/mage/sets/zendikar/HellkiteCharger.java @@ -28,10 +28,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -42,6 +42,7 @@ import mage.abilities.effects.common.UntapAllControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; +import mage.constants.TurnPhase; import mage.filter.common.FilterAttackingCreature; import mage.game.Game; import mage.game.turn.TurnMod; @@ -100,7 +101,7 @@ class HellkiteChargerEffect extends OneShotEffect { cost.clearPaid(); if (cost.pay(source, game, source.getId(), source.getControllerId(), false)) { new UntapAllControllerEffect(new FilterAttackingCreature(),"").apply(game, source); - game.getState().getTurnMods().add(new TurnMod(source.getControllerId(), Constants.TurnPhase.COMBAT, null, false)); + game.getState().getTurnMods().add(new TurnMod(source.getControllerId(), TurnPhase.COMBAT, null, false)); return true; } } diff --git a/Mage.Sets/src/mage/sets/zendikar/HideousEnd.java b/Mage.Sets/src/mage/sets/zendikar/HideousEnd.java index f09560b8a0e..d7cc95cced8 100644 --- a/Mage.Sets/src/mage/sets/zendikar/HideousEnd.java +++ b/Mage.Sets/src/mage/sets/zendikar/HideousEnd.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.LoseLifeControllerEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/HighlandBerserker.java b/Mage.Sets/src/mage/sets/zendikar/HighlandBerserker.java index 4faed11438c..91127f07042 100644 --- a/Mage.Sets/src/mage/sets/zendikar/HighlandBerserker.java +++ b/Mage.Sets/src/mage/sets/zendikar/HighlandBerserker.java @@ -29,15 +29,15 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AllyEntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -52,7 +52,7 @@ public class HighlandBerserker extends CardImpl { static { filter.add(new SubtypePredicate("Ally")); - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public HighlandBerserker(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/zendikar/InfernoTrap.java b/Mage.Sets/src/mage/sets/zendikar/InfernoTrap.java index de0e9fdef86..7ab1a538d37 100644 --- a/Mage.Sets/src/mage/sets/zendikar/InfernoTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/InfernoTrap.java @@ -28,15 +28,16 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.common.TargetCreaturePermanent; @@ -79,7 +80,7 @@ class ControllerDamagedByCreatureWatcher extends WatcherImpl { this.addAbility(new AsEntersBattlefieldAbility(new IonaShieldOfEmeriaChooseColorEffect())); // Your opponents can't cast spells of the chosen color. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new IonaShieldOfEmeriaReplacementEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new IonaShieldOfEmeriaReplacementEffect())); } @@ -86,7 +85,7 @@ public class IonaShieldOfEmeria extends CardImpl { class IonaShieldOfEmeriaChooseColorEffect extends OneShotEffect { public IonaShieldOfEmeriaChooseColorEffect() { - super(Constants.Outcome.Detriment); + super(Outcome.Detriment); staticText = "choose a color"; } @@ -100,7 +99,7 @@ class IonaShieldOfEmeriaChooseColorEffect extends OneShotEffect { IonaShieldOfEmeriaReplacementEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Detriment); + super(Duration.WhileOnBattlefield, Outcome.Detriment); staticText = "Your opponents can't cast spells of the chosen color"; } diff --git a/Mage.Sets/src/mage/sets/zendikar/IorRuinExpedition.java b/Mage.Sets/src/mage/sets/zendikar/IorRuinExpedition.java index 3e71a2036ce..0aac571e7f1 100644 --- a/Mage.Sets/src/mage/sets/zendikar/IorRuinExpedition.java +++ b/Mage.Sets/src/mage/sets/zendikar/IorRuinExpedition.java @@ -27,9 +27,8 @@ */ package mage.sets.zendikar; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.LandfallAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +37,7 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.counters.CounterType; import java.util.UUID; @@ -55,7 +55,7 @@ public class IorRuinExpedition extends CardImpl { this.color.setBlue(true); this.addAbility(new LandfallAbility(new AddCountersSourceEffect(CounterType.QUEST.createInstance()), true)); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(3), new RemoveCountersSourceCost(CounterType.QUEST.createInstance(3))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(3), new RemoveCountersSourceCost(CounterType.QUEST.createInstance(3))); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/JoragaBard.java b/Mage.Sets/src/mage/sets/zendikar/JoragaBard.java index 8227a1fc184..6894166045a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/JoragaBard.java +++ b/Mage.Sets/src/mage/sets/zendikar/JoragaBard.java @@ -29,15 +29,15 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AllyEntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -52,7 +52,7 @@ public class JoragaBard extends CardImpl { static { filter.add(new SubtypePredicate("Ally")); - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public JoragaBard(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/zendikar/JourneyToNowhere.java b/Mage.Sets/src/mage/sets/zendikar/JourneyToNowhere.java index e70c7f13612..c36fbfc7667 100644 --- a/Mage.Sets/src/mage/sets/zendikar/JourneyToNowhere.java +++ b/Mage.Sets/src/mage/sets/zendikar/JourneyToNowhere.java @@ -29,9 +29,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.LeavesBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/JwarIsleRefuge.java b/Mage.Sets/src/mage/sets/zendikar/JwarIsleRefuge.java index 660e4f65bfe..3be5bfd0c58 100644 --- a/Mage.Sets/src/mage/sets/zendikar/JwarIsleRefuge.java +++ b/Mage.Sets/src/mage/sets/zendikar/JwarIsleRefuge.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/KabiraCrossroads.java b/Mage.Sets/src/mage/sets/zendikar/KabiraCrossroads.java index 3c5027a4c23..d3231bfb3c3 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KabiraCrossroads.java +++ b/Mage.Sets/src/mage/sets/zendikar/KabiraCrossroads.java @@ -29,8 +29,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/KabiraEvangel.java b/Mage.Sets/src/mage/sets/zendikar/KabiraEvangel.java index 836cc3cbd27..fb144d19312 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KabiraEvangel.java +++ b/Mage.Sets/src/mage/sets/zendikar/KabiraEvangel.java @@ -28,11 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.*; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -77,7 +74,7 @@ public class KabiraEvangel extends CardImpl { new SubtypePredicate("Ally"))); // Whenever Kabira Evangel or another Ally enters the battlefield under your control, you may choose a color. If you do, Allies you control gain protection from the chosen color until end of turn. - this.addAbility(new EntersBattlefieldAllTriggeredAbility(Constants.Zone.BATTLEFIELD, new ChooseColorEffect(), filter, true)); + this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new ChooseColorEffect(), filter, true)); } public KabiraEvangel(final KabiraEvangel card) { @@ -93,7 +90,7 @@ public class KabiraEvangel extends CardImpl { class ChooseColorEffect extends OneShotEffect { public ChooseColorEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "choose a color. All Allies you control gain protection from the chosen color until end of turn"; } @@ -107,7 +104,7 @@ class ChooseColorEffect extends OneShotEffect { Permanent perm = game.getPermanent(source.getSourceId()); if (player != null && perm != null) { ChoiceColor colorChoice = new ChoiceColor(); - if (player.choose(Constants.Outcome.Benefit, colorChoice, game)) { + if (player.choose(Outcome.Benefit, colorChoice, game)) { game.informPlayers(perm.getName() + ": " + player.getName() + " has chosen " + colorChoice.getChoice()); game.addEffect(new GainProtectionFromChosenColorEffect(colorChoice.getColor()), source); } diff --git a/Mage.Sets/src/mage/sets/zendikar/KalitasBloodchiefOfGhet.java b/Mage.Sets/src/mage/sets/zendikar/KalitasBloodchiefOfGhet.java index 573ee9b4112..d07632bfba8 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KalitasBloodchiefOfGhet.java +++ b/Mage.Sets/src/mage/sets/zendikar/KalitasBloodchiefOfGhet.java @@ -28,10 +28,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/zendikar/KazanduBlademaster.java b/Mage.Sets/src/mage/sets/zendikar/KazanduBlademaster.java index adddb973b1e..f8bdfe08b7d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KazanduBlademaster.java +++ b/Mage.Sets/src/mage/sets/zendikar/KazanduBlademaster.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AllyEntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/KazanduRefuge.java b/Mage.Sets/src/mage/sets/zendikar/KazanduRefuge.java index 74cd0d37ae2..50e3eb273c5 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KazanduRefuge.java +++ b/Mage.Sets/src/mage/sets/zendikar/KazanduRefuge.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/KazuulWarlord.java b/Mage.Sets/src/mage/sets/zendikar/KazuulWarlord.java index d11fc5f65d0..f123cb5f8a1 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KazuulWarlord.java +++ b/Mage.Sets/src/mage/sets/zendikar/KazuulWarlord.java @@ -29,9 +29,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.common.AllyEntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersAllEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/KhalniGem.java b/Mage.Sets/src/mage/sets/zendikar/KhalniGem.java index d7540a280bf..d7a019566f9 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KhalniGem.java +++ b/Mage.Sets/src/mage/sets/zendikar/KhalniGem.java @@ -29,10 +29,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/zendikar/KhalniHeartExpedition.java b/Mage.Sets/src/mage/sets/zendikar/KhalniHeartExpedition.java index 673aab68ecc..b30b0b763f0 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KhalniHeartExpedition.java +++ b/Mage.Sets/src/mage/sets/zendikar/KhalniHeartExpedition.java @@ -29,10 +29,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.LandfallAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; diff --git a/Mage.Sets/src/mage/sets/zendikar/KorAeronaut.java b/Mage.Sets/src/mage/sets/zendikar/KorAeronaut.java index e8078b69fd7..93de9791982 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KorAeronaut.java +++ b/Mage.Sets/src/mage/sets/zendikar/KorAeronaut.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; diff --git a/Mage.Sets/src/mage/sets/zendikar/KorCartographer.java b/Mage.Sets/src/mage/sets/zendikar/KorCartographer.java index 1c4af00c6c7..b36b86ca239 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KorCartographer.java +++ b/Mage.Sets/src/mage/sets/zendikar/KorCartographer.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/KorDuelist.java b/Mage.Sets/src/mage/sets/zendikar/KorDuelist.java index 9466fe4c1fb..c7865f01668 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KorDuelist.java +++ b/Mage.Sets/src/mage/sets/zendikar/KorDuelist.java @@ -29,10 +29,10 @@ package mage.sets.zendikar; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/KorHookmaster.java b/Mage.Sets/src/mage/sets/zendikar/KorHookmaster.java index c7af0967b22..5a9761fa6f5 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KorHookmaster.java +++ b/Mage.Sets/src/mage/sets/zendikar/KorHookmaster.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.SkipNextUntapTargetEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/KorOutfitter.java b/Mage.Sets/src/mage/sets/zendikar/KorOutfitter.java index ed343a99815..4c7439ad5b8 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KorOutfitter.java +++ b/Mage.Sets/src/mage/sets/zendikar/KorOutfitter.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/KorSanctifiers.java b/Mage.Sets/src/mage/sets/zendikar/KorSanctifiers.java index eb2dc23ac41..e5ab6fb16aa 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KorSanctifiers.java +++ b/Mage.Sets/src/mage/sets/zendikar/KorSanctifiers.java @@ -29,8 +29,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; diff --git a/Mage.Sets/src/mage/sets/zendikar/KorSkyfisher.java b/Mage.Sets/src/mage/sets/zendikar/KorSkyfisher.java index 9cbda3d21a7..3dc3f788d3f 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KorSkyfisher.java +++ b/Mage.Sets/src/mage/sets/zendikar/KorSkyfisher.java @@ -29,8 +29,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/KrakenHatchling.java b/Mage.Sets/src/mage/sets/zendikar/KrakenHatchling.java index 068a3bcf085..c8d8fb675c3 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KrakenHatchling.java +++ b/Mage.Sets/src/mage/sets/zendikar/KrakenHatchling.java @@ -29,8 +29,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/LandbindRitual.java b/Mage.Sets/src/mage/sets/zendikar/LandbindRitual.java index 970e54c7147..f6b96f2b718 100644 --- a/Mage.Sets/src/mage/sets/zendikar/LandbindRitual.java +++ b/Mage.Sets/src/mage/sets/zendikar/LandbindRitual.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/LavaballTrap.java b/Mage.Sets/src/mage/sets/zendikar/LavaballTrap.java index 7bfaa84041f..67aaaff89e7 100644 --- a/Mage.Sets/src/mage/sets/zendikar/LavaballTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/LavaballTrap.java @@ -30,15 +30,16 @@ package mage.sets.zendikar; import java.util.HashMap; import java.util.Map; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; +import mage.constants.WatcherScope; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.events.GameEvent; @@ -85,7 +86,7 @@ class LavaballTrapWatcher extends WatcherImpl { private Map amountOfLandsPlayedThisTurn = new HashMap(); public LavaballTrapWatcher() { - super("LavaballTrapWatcher", Constants.WatcherScope.GAME); + super("LavaballTrapWatcher", WatcherScope.GAME); } public LavaballTrapWatcher(final LavaballTrapWatcher watcher) { diff --git a/Mage.Sets/src/mage/sets/zendikar/LethargyTrap.java b/Mage.Sets/src/mage/sets/zendikar/LethargyTrap.java index 6a3d19c21ae..54f5601064a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/LethargyTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/LethargyTrap.java @@ -28,14 +28,15 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AttackingPredicate; import mage.game.Game; @@ -63,7 +64,7 @@ public class LethargyTrap extends CardImpl { this.getSpellAbility().addAlternativeCost(new LethargyTrapAlternativeCost()); // Attacking creatures get -3/-0 until end of turn. - this.getSpellAbility().addEffect(new BoostAllEffect(-3, 0, Constants.Duration.EndOfTurn, filter, false)); + this.getSpellAbility().addEffect(new BoostAllEffect(-3, 0, Duration.EndOfTurn, filter, false)); } diff --git a/Mage.Sets/src/mage/sets/zendikar/LivingTsunami.java b/Mage.Sets/src/mage/sets/zendikar/LivingTsunami.java index 6fe345213a6..08272be3f1f 100644 --- a/Mage.Sets/src/mage/sets/zendikar/LivingTsunami.java +++ b/Mage.Sets/src/mage/sets/zendikar/LivingTsunami.java @@ -28,16 +28,17 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.costs.common.ReturnToHandTargetCost; import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledPermanent; @@ -67,7 +68,7 @@ public class LivingTsunami extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // At the beginning of your upkeep, sacrifice Living Tsunami unless you return a land you control to its owner's hand. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(Constants.Zone.BATTLEFIELD, new SacrificeSourceUnlessPaysEffect(new ReturnToHandTargetCost(new TargetControlledPermanent(1, 1, filter, true))), TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceUnlessPaysEffect(new ReturnToHandTargetCost(new TargetControlledPermanent(1, 1, filter, true))), TargetController.YOU, false)); } public LivingTsunami(final LivingTsunami card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/LorthosTheTidemaker.java b/Mage.Sets/src/mage/sets/zendikar/LorthosTheTidemaker.java index fd41324eabf..a98e0583796 100644 --- a/Mage.Sets/src/mage/sets/zendikar/LorthosTheTidemaker.java +++ b/Mage.Sets/src/mage/sets/zendikar/LorthosTheTidemaker.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -39,6 +39,9 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.PhaseStep; import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.events.GameEvent; @@ -83,7 +86,7 @@ public class LorthosTheTidemaker extends CardImpl { class LorthosTheTideMakerEffect extends OneShotEffect { public LorthosTheTideMakerEffect() { - super(Constants.Outcome.Tap); + super(Outcome.Tap); this.staticText = "you may pay {8}. If you do, tap up to eight target permanents. Those permanents don't untap during their controllers' next untap steps"; } @@ -101,7 +104,7 @@ class LorthosTheTideMakerEffect extends OneShotEffect Player player = game.getPlayer(source.getControllerId()); if (player != null) { Cost cost = new ManaCostsImpl("{8}"); - if (player.chooseUse(Constants.Outcome.Tap, "Pay " + cost.getText() + " and " + staticText, game)) { + if (player.chooseUse(Outcome.Tap, "Pay " + cost.getText() + " and " + staticText, game)) { cost.clearPaid(); if (cost.pay(source, game, source.getId(), source.getControllerId(), false)) { for (UUID target : this.targetPointer.getTargets(game, source)) { @@ -124,7 +127,7 @@ class LorthosTheTideMakerEffect2 extends ReplacementEffectImpl { this.addAbility(new LullmageMentorTriggeredAbility()); this.addWatcher(new CastedSpellsWithSpellTarget()); // Tap seven untapped Merfolk you control: Counter target spell. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CounterTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(7, 7, filter, true))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(7, 7, filter, true))); ability.addTarget(new TargetSpell()); this.addAbility(ability); @@ -134,7 +135,7 @@ class MerfolkToken extends Token { public MerfolkToken() { super("Merfolk", "1/1 blue Merfolk creature token"); - cardType.add(Constants.CardType.CREATURE); + cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add("Merfolk"); power = new MageInt(1); @@ -148,7 +149,7 @@ class CastedSpellsWithSpellTarget extends WatcherImpl casted = new HashMap(); public CastedSpellsWithSpellTarget() { - super("CastedSpellsWithSpellTarget", Constants.WatcherScope.GAME); + super("CastedSpellsWithSpellTarget", WatcherScope.GAME); } public CastedSpellsWithSpellTarget(final CastedSpellsWithSpellTarget watcher) { diff --git a/Mage.Sets/src/mage/sets/zendikar/LuminarchAscension.java b/Mage.Sets/src/mage/sets/zendikar/LuminarchAscension.java index 46eaf195452..4f22a51d2e1 100644 --- a/Mage.Sets/src/mage/sets/zendikar/LuminarchAscension.java +++ b/Mage.Sets/src/mage/sets/zendikar/LuminarchAscension.java @@ -28,10 +28,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleActivatedAbility; @@ -66,7 +66,7 @@ public class LuminarchAscension extends CardImpl { this.addAbility(new ConditionalTriggeredAbility(new LuminarchAscensionTriggeredAbility(), YouLostNoLifeThisTurnCondition.getInstance(), rule, true)); // {1}{W}: Put a 4/4 white Angel creature token with flying onto the battlefield. Activate this ability only if Luminarch Ascension has four or more quest counters on it. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new AngelToken()), new ManaCostsImpl("{1}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new AngelToken()), new ManaCostsImpl("{1}{W}")); ability.addCost(new SourceHasCountersCost(4, CounterType.QUEST)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/MagmaRift.java b/Mage.Sets/src/mage/sets/zendikar/MagmaRift.java index aee1ad77dcb..a2c88c57d11 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MagmaRift.java +++ b/Mage.Sets/src/mage/sets/zendikar/MagmaRift.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/MagosiTheWaterveil.java b/Mage.Sets/src/mage/sets/zendikar/MagosiTheWaterveil.java index 7c82aeafd99..0a69ad0fff5 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MagosiTheWaterveil.java +++ b/Mage.Sets/src/mage/sets/zendikar/MagosiTheWaterveil.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +42,8 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.turn.AddExtraTurnControllerEffect; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -65,12 +67,12 @@ public class MagosiTheWaterveil extends CardImpl { this.addAbility(new BlueManaAbility()); // {U}, {tap}: Put an eon counter on Magosi, the Waterveil. Skip your next turn. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new MagosiTheWaterveilEffect(), new ManaCostsImpl("{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MagosiTheWaterveilEffect(), new ManaCostsImpl("{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {tap}, Remove an eon counter from Magosi, the Waterveil and return it to its owner's hand: Take an extra turn after this one. - Ability ability2 = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddExtraTurnControllerEffect(), new TapSourceCost()); + Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddExtraTurnControllerEffect(), new TapSourceCost()); ability2.addCost(new RemoveCountersSourceCost(CounterType.EON.createInstance())); ability2.addCost(new ReturnToHandSourceCost()); this.addAbility(ability2); @@ -90,7 +92,7 @@ public class MagosiTheWaterveil extends CardImpl { class MagosiTheWaterveilEffect extends OneShotEffect { public MagosiTheWaterveilEffect() { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); staticText = "Put an eon counter on Magosi, the Waterveil. Skip your next turn"; } diff --git a/Mage.Sets/src/mage/sets/zendikar/MakindiShieldmate.java b/Mage.Sets/src/mage/sets/zendikar/MakindiShieldmate.java index 627b428b5c4..307ce853609 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MakindiShieldmate.java +++ b/Mage.Sets/src/mage/sets/zendikar/MakindiShieldmate.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AllyEntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/MalakirBloodwitch.java b/Mage.Sets/src/mage/sets/zendikar/MalakirBloodwitch.java index a56bd811f47..59d2e491209 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MalakirBloodwitch.java +++ b/Mage.Sets/src/mage/sets/zendikar/MalakirBloodwitch.java @@ -29,9 +29,9 @@ package mage.sets.zendikar; import java.util.Set; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/zendikar/MarkOfMutiny.java b/Mage.Sets/src/mage/sets/zendikar/MarkOfMutiny.java index 7ea43f9dc99..1283348b115 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MarkOfMutiny.java +++ b/Mage.Sets/src/mage/sets/zendikar/MarkOfMutiny.java @@ -29,9 +29,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.effects.common.continious.GainControlTargetEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/MarshCasualties.java b/Mage.Sets/src/mage/sets/zendikar/MarshCasualties.java index 641c13efecf..64dbdeb17ba 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MarshCasualties.java +++ b/Mage.Sets/src/mage/sets/zendikar/MarshCasualties.java @@ -27,12 +27,12 @@ */ package mage.sets.zendikar; -import mage.Constants.*; import mage.abilities.Ability; import mage.abilities.condition.common.KickedCondition; import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.CardImpl; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/sets/zendikar/MarshFlats.java b/Mage.Sets/src/mage/sets/zendikar/MarshFlats.java index fbf2b61ecd7..f79ceba99b3 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MarshFlats.java +++ b/Mage.Sets/src/mage/sets/zendikar/MarshFlats.java @@ -29,8 +29,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.FetchLandActivatedAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/MerfolkSeastalkers.java b/Mage.Sets/src/mage/sets/zendikar/MerfolkSeastalkers.java index 491a118227c..d8bb17b1b99 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MerfolkSeastalkers.java +++ b/Mage.Sets/src/mage/sets/zendikar/MerfolkSeastalkers.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/MerfolkWayfinder.java b/Mage.Sets/src/mage/sets/zendikar/MerfolkWayfinder.java index cc481118f8c..8ea4062120d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MerfolkWayfinder.java +++ b/Mage.Sets/src/mage/sets/zendikar/MerfolkWayfinder.java @@ -28,10 +28,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/MindSludge.java b/Mage.Sets/src/mage/sets/zendikar/MindSludge.java index c9937a0f937..ad7d8abfcb3 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MindSludge.java +++ b/Mage.Sets/src/mage/sets/zendikar/MindSludge.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DiscardTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/MindbreakTrap.java b/Mage.Sets/src/mage/sets/zendikar/MindbreakTrap.java index 2f5a95d8fc4..0e8116c90d7 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MindbreakTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/MindbreakTrap.java @@ -31,10 +31,10 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.WatcherScope; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.WatcherScope; import mage.abilities.Ability; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.mana.GenericManaCost; diff --git a/Mage.Sets/src/mage/sets/zendikar/MindlessNull.java b/Mage.Sets/src/mage/sets/zendikar/MindlessNull.java index be1ff974fd6..2f78e266adc 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MindlessNull.java +++ b/Mage.Sets/src/mage/sets/zendikar/MindlessNull.java @@ -28,10 +28,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/MireBlight.java b/Mage.Sets/src/mage/sets/zendikar/MireBlight.java index c30e5648fbe..71a5014109d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MireBlight.java +++ b/Mage.Sets/src/mage/sets/zendikar/MireBlight.java @@ -28,10 +28,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.AttachEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/MistyRainforest.java b/Mage.Sets/src/mage/sets/zendikar/MistyRainforest.java index f7330cdb90e..ec4c0d7038f 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MistyRainforest.java +++ b/Mage.Sets/src/mage/sets/zendikar/MistyRainforest.java @@ -29,8 +29,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.FetchLandActivatedAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/MoldShambler.java b/Mage.Sets/src/mage/sets/zendikar/MoldShambler.java index 1a1ad07feb8..052ece5cedb 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MoldShambler.java +++ b/Mage.Sets/src/mage/sets/zendikar/MoldShambler.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; diff --git a/Mage.Sets/src/mage/sets/zendikar/MoltenRavager.java b/Mage.Sets/src/mage/sets/zendikar/MoltenRavager.java index 49650c09f3c..f598a981131 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MoltenRavager.java +++ b/Mage.Sets/src/mage/sets/zendikar/MoltenRavager.java @@ -28,10 +28,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/MurasaPyromancer.java b/Mage.Sets/src/mage/sets/zendikar/MurasaPyromancer.java index a6b10842ab3..184711e482c 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MurasaPyromancer.java +++ b/Mage.Sets/src/mage/sets/zendikar/MurasaPyromancer.java @@ -29,15 +29,15 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AllyEntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -53,7 +53,7 @@ public class MurasaPyromancer extends CardImpl { static { filter.add(new SubtypePredicate("Ally")); - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public MurasaPyromancer(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/zendikar/NarrowEscape.java b/Mage.Sets/src/mage/sets/zendikar/NarrowEscape.java index 41ed5e1c01c..f7ba4be89de 100644 --- a/Mage.Sets/src/mage/sets/zendikar/NarrowEscape.java +++ b/Mage.Sets/src/mage/sets/zendikar/NarrowEscape.java @@ -29,8 +29,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/NeedlebiteTrap.java b/Mage.Sets/src/mage/sets/zendikar/NeedlebiteTrap.java index 73e1ecf3ee2..986852ac444 100644 --- a/Mage.Sets/src/mage/sets/zendikar/NeedlebiteTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/NeedlebiteTrap.java @@ -28,15 +28,16 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; +import mage.constants.ColoredManaSymbol; import mage.game.Game; import mage.target.TargetPlayer; import mage.watchers.common.PlayerGainedLifeWatcher; @@ -79,7 +80,7 @@ class NeedlebiteTrapAlternativeCost extends AlternativeCostImpl { static { filter.add(new SubtypePredicate("Ally")); - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public OnduCleric(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/zendikar/OracleOfMulDaya.java b/Mage.Sets/src/mage/sets/zendikar/OracleOfMulDaya.java index 10e67bd6d9c..48703186c0c 100644 --- a/Mage.Sets/src/mage/sets/zendikar/OracleOfMulDaya.java +++ b/Mage.Sets/src/mage/sets/zendikar/OracleOfMulDaya.java @@ -28,10 +28,10 @@ package mage.sets.zendikar; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.PlayAdditionalLandsControllerEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/OranRiefRecluse.java b/Mage.Sets/src/mage/sets/zendikar/OranRiefRecluse.java index e0c80f5f059..c1e8800e9b6 100644 --- a/Mage.Sets/src/mage/sets/zendikar/OranRiefRecluse.java +++ b/Mage.Sets/src/mage/sets/zendikar/OranRiefRecluse.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; diff --git a/Mage.Sets/src/mage/sets/zendikar/OranRiefSurvivalist.java b/Mage.Sets/src/mage/sets/zendikar/OranRiefSurvivalist.java index 4fe4aebfcb5..2f2e7f1575c 100644 --- a/Mage.Sets/src/mage/sets/zendikar/OranRiefSurvivalist.java +++ b/Mage.Sets/src/mage/sets/zendikar/OranRiefSurvivalist.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AllyEntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/OranRiefTheVastwood.java b/Mage.Sets/src/mage/sets/zendikar/OranRiefTheVastwood.java index b3587ea8a4a..5f6a5d5847d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/OranRiefTheVastwood.java +++ b/Mage.Sets/src/mage/sets/zendikar/OranRiefTheVastwood.java @@ -29,10 +29,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/ParalyzingGrasp.java b/Mage.Sets/src/mage/sets/zendikar/ParalyzingGrasp.java index 643be877ef4..ea0e6bc82d5 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ParalyzingGrasp.java +++ b/Mage.Sets/src/mage/sets/zendikar/ParalyzingGrasp.java @@ -28,10 +28,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.SkipEnchantedUntapEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/PillarfieldOx.java b/Mage.Sets/src/mage/sets/zendikar/PillarfieldOx.java index e9bc31837fb..4884b1ec33a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/PillarfieldOx.java +++ b/Mage.Sets/src/mage/sets/zendikar/PillarfieldOx.java @@ -29,8 +29,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/PiranhaMarsh.java b/Mage.Sets/src/mage/sets/zendikar/PiranhaMarsh.java index 383e37aa0c4..9e1513203f7 100644 --- a/Mage.Sets/src/mage/sets/zendikar/PiranhaMarsh.java +++ b/Mage.Sets/src/mage/sets/zendikar/PiranhaMarsh.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LoseLifeTargetEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/PitfallTrap.java b/Mage.Sets/src/mage/sets/zendikar/PitfallTrap.java index abbe4053840..9d945bd814e 100644 --- a/Mage.Sets/src/mage/sets/zendikar/PitfallTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/PitfallTrap.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/PlatedGeopede.java b/Mage.Sets/src/mage/sets/zendikar/PlatedGeopede.java index e3c9440c987..41afba02123 100644 --- a/Mage.Sets/src/mage/sets/zendikar/PlatedGeopede.java +++ b/Mage.Sets/src/mage/sets/zendikar/PlatedGeopede.java @@ -29,9 +29,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/PredatoryUrge.java b/Mage.Sets/src/mage/sets/zendikar/PredatoryUrge.java index ec069871bc6..29406225b55 100644 --- a/Mage.Sets/src/mage/sets/zendikar/PredatoryUrge.java +++ b/Mage.Sets/src/mage/sets/zendikar/PredatoryUrge.java @@ -28,11 +28,11 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/PrimalBellow.java b/Mage.Sets/src/mage/sets/zendikar/PrimalBellow.java index 62065dc65f7..c53cfb058cc 100644 --- a/Mage.Sets/src/mage/sets/zendikar/PrimalBellow.java +++ b/Mage.Sets/src/mage/sets/zendikar/PrimalBellow.java @@ -28,10 +28,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/PunishingFire.java b/Mage.Sets/src/mage/sets/zendikar/PunishingFire.java index 9ccdd50aeac..768563d71b7 100644 --- a/Mage.Sets/src/mage/sets/zendikar/PunishingFire.java +++ b/Mage.Sets/src/mage/sets/zendikar/PunishingFire.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/PyromancerAscension.java b/Mage.Sets/src/mage/sets/zendikar/PyromancerAscension.java index 6553fd3e2c7..0541cedb17b 100644 --- a/Mage.Sets/src/mage/sets/zendikar/PyromancerAscension.java +++ b/Mage.Sets/src/mage/sets/zendikar/PyromancerAscension.java @@ -29,9 +29,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.CopyTargetSpellEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/QuestForAncientSecrets.java b/Mage.Sets/src/mage/sets/zendikar/QuestForAncientSecrets.java index 5cd75e8cece..38bea8003ee 100644 --- a/Mage.Sets/src/mage/sets/zendikar/QuestForAncientSecrets.java +++ b/Mage.Sets/src/mage/sets/zendikar/QuestForAncientSecrets.java @@ -28,10 +28,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/QuestForPureFlame.java b/Mage.Sets/src/mage/sets/zendikar/QuestForPureFlame.java index 67052f30bc6..af49838576a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/QuestForPureFlame.java +++ b/Mage.Sets/src/mage/sets/zendikar/QuestForPureFlame.java @@ -28,10 +28,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +40,8 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; +import mage.constants.Duration; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; @@ -63,7 +65,7 @@ public class QuestForPureFlame extends CardImpl { this.addAbility(new QuestForPureFlameTriggeredAbility()); // Remove four quest counters from Quest for Pure Flame and sacrifice it: If any source you control would deal damage to a creature or player this turn, it deals double that damage to that creature or player instead. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new QuestForPureFlameEffect(), new RemoveCountersSourceCost(CounterType.QUEST.createInstance(4))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new QuestForPureFlameEffect(), new RemoveCountersSourceCost(CounterType.QUEST.createInstance(4))); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } @@ -123,7 +125,7 @@ class QuestForPureFlameTriggeredAbility extends TriggeredAbilityImpl { public QuestForPureFlameEffect() { - super(Constants.Duration.EndOfTurn, Constants.Outcome.Damage); + super(Duration.EndOfTurn, Outcome.Damage); staticText = "If any source you control would deal damage to a creature or player this turn, it deals double that damage to that creature or player instead"; } diff --git a/Mage.Sets/src/mage/sets/zendikar/QuestForTheGemblades.java b/Mage.Sets/src/mage/sets/zendikar/QuestForTheGemblades.java index d1ddb5d696c..d3d4a6522bc 100644 --- a/Mage.Sets/src/mage/sets/zendikar/QuestForTheGemblades.java +++ b/Mage.Sets/src/mage/sets/zendikar/QuestForTheGemblades.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; diff --git a/Mage.Sets/src/mage/sets/zendikar/QuestForTheGravelord.java b/Mage.Sets/src/mage/sets/zendikar/QuestForTheGravelord.java index ec640ff9814..176d0a44aff 100644 --- a/Mage.Sets/src/mage/sets/zendikar/QuestForTheGravelord.java +++ b/Mage.Sets/src/mage/sets/zendikar/QuestForTheGravelord.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.DiesCreatureTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/QuestForTheHolyRelic.java b/Mage.Sets/src/mage/sets/zendikar/QuestForTheHolyRelic.java index 9f98dcd626c..560c9634d54 100644 --- a/Mage.Sets/src/mage/sets/zendikar/QuestForTheHolyRelic.java +++ b/Mage.Sets/src/mage/sets/zendikar/QuestForTheHolyRelic.java @@ -29,11 +29,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SpellCastTriggeredAbility; @@ -75,7 +74,7 @@ public class QuestForTheHolyRelic extends CardImpl { // Whenever you cast a creature spell, you may put a quest counter on Quest for the Holy Relic. this.addAbility(new SpellCastTriggeredAbility(new AddCountersSourceEffect(CounterType.QUEST.createInstance()), filter, true)); // Remove five quest counters from Quest for the Holy Relic and sacrifice it: Search your library for an Equipment card, put it onto the battlefield, and attach it to a creature you control. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new QuestForTheHolyRelicEffect(), new RemoveCountersSourceCost(CounterType.QUEST.createInstance(5))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new QuestForTheHolyRelicEffect(), new RemoveCountersSourceCost(CounterType.QUEST.createInstance(5))); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/RampagingBaloths.java b/Mage.Sets/src/mage/sets/zendikar/RampagingBaloths.java index cdb76d64678..5873d193be7 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RampagingBaloths.java +++ b/Mage.Sets/src/mage/sets/zendikar/RampagingBaloths.java @@ -29,8 +29,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.CreateTokenEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/RavenousTrap.java b/Mage.Sets/src/mage/sets/zendikar/RavenousTrap.java index d32790e0280..bca9fc64a28 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RavenousTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/RavenousTrap.java @@ -29,14 +29,16 @@ package mage.sets.zendikar; import java.util.ArrayList; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; @@ -113,7 +115,7 @@ class RavenousTrapAlternativeCost extends AlternativeCostImpl { public RavenousTrapEffect() { - super(Constants.Outcome.Exile); + super(Outcome.Exile); staticText = "Exile all cards from target player's graveyard"; } @@ -128,7 +130,7 @@ class RavenousTrapEffect extends OneShotEffect { if (targetPlayer != null) { ArrayList graveyard = new ArrayList(targetPlayer.getGraveyard()); for (UUID cardId : graveyard) { - game.getCard(cardId).moveToZone(Constants.Zone.EXILED, cardId, game, false); + game.getCard(cardId).moveToZone(Zone.EXILED, cardId, game, false); } return true; } diff --git a/Mage.Sets/src/mage/sets/zendikar/RecklessScholar.java b/Mage.Sets/src/mage/sets/zendikar/RecklessScholar.java index 7f3fe81b5af..de128cbcea6 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RecklessScholar.java +++ b/Mage.Sets/src/mage/sets/zendikar/RecklessScholar.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/RelicCrush.java b/Mage.Sets/src/mage/sets/zendikar/RelicCrush.java index 39adface6bc..b4d3d464359 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RelicCrush.java +++ b/Mage.Sets/src/mage/sets/zendikar/RelicCrush.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/RiteOfReplication.java b/Mage.Sets/src/mage/sets/zendikar/RiteOfReplication.java index 7a83ba9ff31..35e06e4f22a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RiteOfReplication.java +++ b/Mage.Sets/src/mage/sets/zendikar/RiteOfReplication.java @@ -28,10 +28,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.condition.common.KickedCondition; import mage.abilities.decorator.ConditionalOneShotEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/RiverBoa.java b/Mage.Sets/src/mage/sets/zendikar/RiverBoa.java index 9c43611d10c..c0305cc9995 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RiverBoa.java +++ b/Mage.Sets/src/mage/sets/zendikar/RiverBoa.java @@ -29,9 +29,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/RoilElemental.java b/Mage.Sets/src/mage/sets/zendikar/RoilElemental.java index 033b7959e44..c0601232a02 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RoilElemental.java +++ b/Mage.Sets/src/mage/sets/zendikar/RoilElemental.java @@ -28,10 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LandfallAbility; @@ -70,8 +68,8 @@ public class RoilElemental extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Landfall - Whenever a land enters the battlefield under your control, you may gain control of target creature for as long as you control Roil Elemental. - ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainControlTargetEffect(Constants.Duration.Custom), new ControlsPermanentCondition(filter), rule); - Ability ability = new LandfallAbility(Constants.Zone.BATTLEFIELD, effect, true); + ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainControlTargetEffect(Duration.Custom), new ControlsPermanentCondition(filter), rule); + Ability ability = new LandfallAbility(Zone.BATTLEFIELD, effect, true); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/RuinousMinotaur.java b/Mage.Sets/src/mage/sets/zendikar/RuinousMinotaur.java index 883774d9bef..eef8591041d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RuinousMinotaur.java +++ b/Mage.Sets/src/mage/sets/zendikar/RuinousMinotaur.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.SacrificeTargetEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java b/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java index 6760be5fb30..fbaa2df113f 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java @@ -27,9 +27,9 @@ */ package mage.sets.zendikar; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.WatcherScope; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.WatcherScope; import mage.abilities.Ability; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/SadisticSacrament.java b/Mage.Sets/src/mage/sets/zendikar/SadisticSacrament.java index 316bd5883a3..d03615eeb06 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SadisticSacrament.java +++ b/Mage.Sets/src/mage/sets/zendikar/SadisticSacrament.java @@ -29,9 +29,9 @@ package mage.sets.zendikar; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.condition.common.KickedCondition; import mage.abilities.decorator.ConditionalOneShotEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/SavageSilhouette.java b/Mage.Sets/src/mage/sets/zendikar/SavageSilhouette.java index 107990ac4d4..bf33a0eeac6 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SavageSilhouette.java +++ b/Mage.Sets/src/mage/sets/zendikar/SavageSilhouette.java @@ -28,12 +28,12 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/ScaldingTarn.java b/Mage.Sets/src/mage/sets/zendikar/ScaldingTarn.java index b997244af57..0b961b1c44e 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ScaldingTarn.java +++ b/Mage.Sets/src/mage/sets/zendikar/ScaldingTarn.java @@ -29,8 +29,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.FetchLandActivatedAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/ScuteMob.java b/Mage.Sets/src/mage/sets/zendikar/ScuteMob.java index 1db81873bc9..29238cb52db 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ScuteMob.java +++ b/Mage.Sets/src/mage/sets/zendikar/ScuteMob.java @@ -29,9 +29,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/ScytheTiger.java b/Mage.Sets/src/mage/sets/zendikar/ScytheTiger.java index 69b846f9b94..49f4a6df66b 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ScytheTiger.java +++ b/Mage.Sets/src/mage/sets/zendikar/ScytheTiger.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.common.SacrificeTargetCost; diff --git a/Mage.Sets/src/mage/sets/zendikar/SeaGateLoremaster.java b/Mage.Sets/src/mage/sets/zendikar/SeaGateLoremaster.java index ab5bed13c2c..23e83c20703 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SeaGateLoremaster.java +++ b/Mage.Sets/src/mage/sets/zendikar/SeaGateLoremaster.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage.Sets/src/mage/sets/zendikar/SeascapeAerialist.java b/Mage.Sets/src/mage/sets/zendikar/SeascapeAerialist.java index 0b85d6125a6..f1f5f6b2ac4 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SeascapeAerialist.java +++ b/Mage.Sets/src/mage/sets/zendikar/SeascapeAerialist.java @@ -29,15 +29,15 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AllyEntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -52,7 +52,7 @@ public class SeascapeAerialist extends CardImpl { static { filter.add(new SubtypePredicate("Ally")); - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); } public SeascapeAerialist(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/zendikar/SeismicShudder.java b/Mage.Sets/src/mage/sets/zendikar/SeismicShudder.java index a48a3067051..8c7a949d52d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SeismicShudder.java +++ b/Mage.Sets/src/mage/sets/zendikar/SeismicShudder.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/SejiriRefuge.java b/Mage.Sets/src/mage/sets/zendikar/SejiriRefuge.java index 4a3939e2036..c81bcc6c0d7 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SejiriRefuge.java +++ b/Mage.Sets/src/mage/sets/zendikar/SejiriRefuge.java @@ -29,8 +29,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/ShatterskullGiant.java b/Mage.Sets/src/mage/sets/zendikar/ShatterskullGiant.java index 3438fc7ec6e..cc324833a5d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ShatterskullGiant.java +++ b/Mage.Sets/src/mage/sets/zendikar/ShatterskullGiant.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/ShepherdOfTheLost.java b/Mage.Sets/src/mage/sets/zendikar/ShepherdOfTheLost.java index e35aa005d2f..aed977cc712 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ShepherdOfTheLost.java +++ b/Mage.Sets/src/mage/sets/zendikar/ShepherdOfTheLost.java @@ -29,8 +29,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/ShieldmatesBlessing.java b/Mage.Sets/src/mage/sets/zendikar/ShieldmatesBlessing.java index 038b147a993..0e8ba3f7232 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ShieldmatesBlessing.java +++ b/Mage.Sets/src/mage/sets/zendikar/ShieldmatesBlessing.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.PreventDamageTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreatureOrPlayer; diff --git a/Mage.Sets/src/mage/sets/zendikar/ShoalSerpent.java b/Mage.Sets/src/mage/sets/zendikar/ShoalSerpent.java index 6bb12aff1da..f8375057fb1 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ShoalSerpent.java +++ b/Mage.Sets/src/mage/sets/zendikar/ShoalSerpent.java @@ -29,13 +29,8 @@ package mage.sets.zendikar; import java.util.Iterator; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.SubLayer; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LandfallAbility; @@ -64,7 +59,7 @@ public class ShoalSerpent extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // Landfall - Whenever a land enters the battlefield under your control, Shoal Serpent loses defender until end of turn. - Ability ability = new LandfallAbility(Constants.Zone.BATTLEFIELD, new ShoalSerpentEffect(), false); + Ability ability = new LandfallAbility(Zone.BATTLEFIELD, new ShoalSerpentEffect(), false); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/SkyRuinDrake.java b/Mage.Sets/src/mage/sets/zendikar/SkyRuinDrake.java index eddd3b48819..fcf9723c211 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SkyRuinDrake.java +++ b/Mage.Sets/src/mage/sets/zendikar/SkyRuinDrake.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/SlaughterCry.java b/Mage.Sets/src/mage/sets/zendikar/SlaughterCry.java index 32607fa73a0..dd4228da9e0 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SlaughterCry.java +++ b/Mage.Sets/src/mage/sets/zendikar/SlaughterCry.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FirstStrikeAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/SoaringSeacliff.java b/Mage.Sets/src/mage/sets/zendikar/SoaringSeacliff.java index 92b92b42972..1176542791a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SoaringSeacliff.java +++ b/Mage.Sets/src/mage/sets/zendikar/SoaringSeacliff.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/SorinMarkov.java b/Mage.Sets/src/mage/sets/zendikar/SorinMarkov.java index 6dd160d6cd0..d9599623f19 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SorinMarkov.java +++ b/Mage.Sets/src/mage/sets/zendikar/SorinMarkov.java @@ -27,9 +27,8 @@ */ package mage.sets.zendikar; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.EntersBattlefieldAbility; @@ -39,6 +38,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.effects.common.turn.ControlTargetPlayerNextTurnEffect; import mage.cards.CardImpl; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.game.Game; import mage.players.Player; @@ -93,7 +93,7 @@ public class SorinMarkov extends CardImpl { class SorinMarkovEffect extends OneShotEffect { public SorinMarkovEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "Target opponent's life total becomes 10"; } diff --git a/Mage.Sets/src/mage/sets/zendikar/SoulStairExpedition.java b/Mage.Sets/src/mage/sets/zendikar/SoulStairExpedition.java index ce8f2efe2ec..34d6f0450f1 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SoulStairExpedition.java +++ b/Mage.Sets/src/mage/sets/zendikar/SoulStairExpedition.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.LandfallAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/SpellPierce.java b/Mage.Sets/src/mage/sets/zendikar/SpellPierce.java index 3b73f470463..3005a15362f 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SpellPierce.java +++ b/Mage.Sets/src/mage/sets/zendikar/SpellPierce.java @@ -29,8 +29,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/SphinxOfJwarIsle.java b/Mage.Sets/src/mage/sets/zendikar/SphinxOfJwarIsle.java index 347e1f74483..d773ae1772e 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SphinxOfJwarIsle.java +++ b/Mage.Sets/src/mage/sets/zendikar/SphinxOfJwarIsle.java @@ -28,10 +28,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/SphinxOfLostTruths.java b/Mage.Sets/src/mage/sets/zendikar/SphinxOfLostTruths.java index cd889d1ba38..e1fe23f64b7 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SphinxOfLostTruths.java +++ b/Mage.Sets/src/mage/sets/zendikar/SphinxOfLostTruths.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/SpidersilkNet.java b/Mage.Sets/src/mage/sets/zendikar/SpidersilkNet.java index deafc4c1006..70468040ffe 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SpidersilkNet.java +++ b/Mage.Sets/src/mage/sets/zendikar/SpidersilkNet.java @@ -28,11 +28,11 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/SpireBarrage.java b/Mage.Sets/src/mage/sets/zendikar/SpireBarrage.java index 122060143fb..dda6eee8edc 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SpireBarrage.java +++ b/Mage.Sets/src/mage/sets/zendikar/SpireBarrage.java @@ -27,9 +27,9 @@ */ package mage.sets.zendikar; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/SpreadingSeas.java b/Mage.Sets/src/mage/sets/zendikar/SpreadingSeas.java index 6e5ffd25b69..ef3612b8fe1 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SpreadingSeas.java +++ b/Mage.Sets/src/mage/sets/zendikar/SpreadingSeas.java @@ -29,10 +29,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/SteppeLynx.java b/Mage.Sets/src/mage/sets/zendikar/SteppeLynx.java index 7408b126313..cab7b630821 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SteppeLynx.java +++ b/Mage.Sets/src/mage/sets/zendikar/SteppeLynx.java @@ -29,9 +29,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/StoneworkPuma.java b/Mage.Sets/src/mage/sets/zendikar/StoneworkPuma.java index a78939d176a..86e23616915 100644 --- a/Mage.Sets/src/mage/sets/zendikar/StoneworkPuma.java +++ b/Mage.Sets/src/mage/sets/zendikar/StoneworkPuma.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/SummonersBane.java b/Mage.Sets/src/mage/sets/zendikar/SummonersBane.java index 61b7cb7ec27..f4737394838 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SummonersBane.java +++ b/Mage.Sets/src/mage/sets/zendikar/SummonersBane.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.effects.common.CounterTargetEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/SummoningTrap.java b/Mage.Sets/src/mage/sets/zendikar/SummoningTrap.java index 86898bf4ce7..a58bb32e8d0 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SummoningTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/SummoningTrap.java @@ -29,12 +29,11 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.WatcherScope; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.WatcherScope; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.mana.GenericManaCost; @@ -185,12 +184,12 @@ class SummoningTrapEffect extends OneShotEffect { } } if (cards.size() > 0) { - TargetCard target2 = new TargetCard(Constants.Zone.PICK, + TargetCard target2 = new TargetCard(Zone.PICK, new FilterCard( "card to put on the bottom of your library")); target2.setRequired(true); while (cards.size() > 1) { - player.choose(Constants.Outcome.Benefit, cards, target2, + player.choose(Outcome.Benefit, cards, target2, game); Card card = cards.get(target2.getFirstTarget(), game); if (card != null) { diff --git a/Mage.Sets/src/mage/sets/zendikar/SunspringExpedition.java b/Mage.Sets/src/mage/sets/zendikar/SunspringExpedition.java index eb18b14ea4a..eb6fd394c72 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SunspringExpedition.java +++ b/Mage.Sets/src/mage/sets/zendikar/SunspringExpedition.java @@ -29,9 +29,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.ActivatedAbility; import mage.abilities.common.LandfallAbility; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/SurrakarMarauder.java b/Mage.Sets/src/mage/sets/zendikar/SurrakarMarauder.java index ee08e8deeaf..212000186c2 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SurrakarMarauder.java +++ b/Mage.Sets/src/mage/sets/zendikar/SurrakarMarauder.java @@ -28,14 +28,15 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.IntimidateAbility; import mage.cards.CardImpl; +import mage.constants.Duration; /** * @@ -52,7 +53,7 @@ public class SurrakarMarauder extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new LandfallAbility(new GainAbilitySourceEffect(IntimidateAbility.getInstance(), Constants.Duration.EndOfTurn), false)); + this.addAbility(new LandfallAbility(new GainAbilitySourceEffect(IntimidateAbility.getInstance(), Duration.EndOfTurn), false)); } public SurrakarMarauder(final SurrakarMarauder card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/TajuruArcher.java b/Mage.Sets/src/mage/sets/zendikar/TajuruArcher.java index 4ac94e8ffd3..d8d8c3e0665 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TajuruArcher.java +++ b/Mage.Sets/src/mage/sets/zendikar/TajuruArcher.java @@ -29,9 +29,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AllyEntersBattlefieldTriggeredAbility; @@ -39,6 +38,7 @@ import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -56,7 +56,7 @@ public class TajuruArcher extends CardImpl { static { filter.add(new SubtypePredicate("Ally")); - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); filterTarget.add(new AbilityPredicate(FlyingAbility.class)); } diff --git a/Mage.Sets/src/mage/sets/zendikar/Tanglesap.java b/Mage.Sets/src/mage/sets/zendikar/Tanglesap.java index f6a00769cf7..3422e83133d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Tanglesap.java +++ b/Mage.Sets/src/mage/sets/zendikar/Tanglesap.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.PreventAllDamageEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/TeeteringPeaks.java b/Mage.Sets/src/mage/sets/zendikar/TeeteringPeaks.java index 7aeff411a5e..81fb205175a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TeeteringPeaks.java +++ b/Mage.Sets/src/mage/sets/zendikar/TeeteringPeaks.java @@ -29,9 +29,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/TempestOwl.java b/Mage.Sets/src/mage/sets/zendikar/TempestOwl.java index 02b5e66357d..42cfde67bcd 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TempestOwl.java +++ b/Mage.Sets/src/mage/sets/zendikar/TempestOwl.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; diff --git a/Mage.Sets/src/mage/sets/zendikar/TerraStomper.java b/Mage.Sets/src/mage/sets/zendikar/TerraStomper.java index f1815dcd425..5fe00a4d851 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TerraStomper.java +++ b/Mage.Sets/src/mage/sets/zendikar/TerraStomper.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.CantCounterSourceEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/TerritorialBaloth.java b/Mage.Sets/src/mage/sets/zendikar/TerritorialBaloth.java index af05d7990a5..bd9aae36eb8 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TerritorialBaloth.java +++ b/Mage.Sets/src/mage/sets/zendikar/TerritorialBaloth.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/TimbermawLarva.java b/Mage.Sets/src/mage/sets/zendikar/TimbermawLarva.java index d23138b6d40..0f1b546e689 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TimbermawLarva.java +++ b/Mage.Sets/src/mage/sets/zendikar/TimbermawLarva.java @@ -28,10 +28,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; -import mage.Constants.TargetController; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; diff --git a/Mage.Sets/src/mage/sets/zendikar/TorchSlinger.java b/Mage.Sets/src/mage/sets/zendikar/TorchSlinger.java index 4c4c2e5d9b1..38dc30a21c5 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TorchSlinger.java +++ b/Mage.Sets/src/mage/sets/zendikar/TorchSlinger.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; diff --git a/Mage.Sets/src/mage/sets/zendikar/TrailblazersBoots.java b/Mage.Sets/src/mage/sets/zendikar/TrailblazersBoots.java index 089a7cae6c6..a5af0b8a1cd 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TrailblazersBoots.java +++ b/Mage.Sets/src/mage/sets/zendikar/TrailblazersBoots.java @@ -28,11 +28,11 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.AttachmentType; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/TrapfindersTrick.java b/Mage.Sets/src/mage/sets/zendikar/TrapfindersTrick.java index a65921d0e2b..0dee7e07df7 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TrapfindersTrick.java +++ b/Mage.Sets/src/mage/sets/zendikar/TrapfindersTrick.java @@ -29,9 +29,9 @@ package mage.sets.zendikar; import java.util.Set; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/zendikar/TrapmakersSnare.java b/Mage.Sets/src/mage/sets/zendikar/TrapmakersSnare.java index 8e1e2c79955..63a68d1abe5 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TrapmakersSnare.java +++ b/Mage.Sets/src/mage/sets/zendikar/TrapmakersSnare.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.filter.FilterCard; diff --git a/Mage.Sets/src/mage/sets/zendikar/TrustyMachete.java b/Mage.Sets/src/mage/sets/zendikar/TrustyMachete.java index 55aa4fcfcc2..678486f994f 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TrustyMachete.java +++ b/Mage.Sets/src/mage/sets/zendikar/TrustyMachete.java @@ -30,15 +30,15 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; +import mage.constants.Outcome; /** * @@ -50,7 +50,7 @@ public class TrustyMachete extends CardImpl { super(ownerId, 209, "Trusty Machete", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{1}"); this.expansionSetCode = "ZEN"; this.subtype.add("Equipment"); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(2))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 1))); } diff --git a/Mage.Sets/src/mage/sets/zendikar/TuktukGrunts.java b/Mage.Sets/src/mage/sets/zendikar/TuktukGrunts.java index b18012d2e6b..99fabeeb060 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TuktukGrunts.java +++ b/Mage.Sets/src/mage/sets/zendikar/TuktukGrunts.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AllyEntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/TurntimberBasilisk.java b/Mage.Sets/src/mage/sets/zendikar/TurntimberBasilisk.java index 775f1a750b6..43152855300 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TurntimberBasilisk.java +++ b/Mage.Sets/src/mage/sets/zendikar/TurntimberBasilisk.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.MustBlockSourceTargetEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/TurntimberGrove.java b/Mage.Sets/src/mage/sets/zendikar/TurntimberGrove.java index f0e82272bbd..87b9a50e9be 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TurntimberGrove.java +++ b/Mage.Sets/src/mage/sets/zendikar/TurntimberGrove.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continious.BoostTargetEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/TurntimberRanger.java b/Mage.Sets/src/mage/sets/zendikar/TurntimberRanger.java index 0e17c8f38e1..88967f195a6 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TurntimberRanger.java +++ b/Mage.Sets/src/mage/sets/zendikar/TurntimberRanger.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AllyEntersBattlefieldTriggeredAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/UmaraRaptor.java b/Mage.Sets/src/mage/sets/zendikar/UmaraRaptor.java index 55f1dd440ec..fa71b82111d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/UmaraRaptor.java +++ b/Mage.Sets/src/mage/sets/zendikar/UmaraRaptor.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AllyEntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/UnstableFooting.java b/Mage.Sets/src/mage/sets/zendikar/UnstableFooting.java index a8ddef3417f..224d5c68727 100644 --- a/Mage.Sets/src/mage/sets/zendikar/UnstableFooting.java +++ b/Mage.Sets/src/mage/sets/zendikar/UnstableFooting.java @@ -28,10 +28,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.condition.common.KickedCondition; @@ -40,6 +40,7 @@ import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.KickerAbility; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.TargetPlayer; @@ -93,7 +94,7 @@ public class UnstableFooting extends CardImpl { class UnstableFootingEffect extends ReplacementEffectImpl { public UnstableFootingEffect() { - super(Constants.Duration.EndOfTurn, Outcome.Benefit); + super(Duration.EndOfTurn, Outcome.Benefit); staticText = "Damage can't be prevented this turn"; } diff --git a/Mage.Sets/src/mage/sets/zendikar/ValakutTheMoltenPinnacle.java b/Mage.Sets/src/mage/sets/zendikar/ValakutTheMoltenPinnacle.java index 22d772aa775..b1ae43a4a90 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ValakutTheMoltenPinnacle.java +++ b/Mage.Sets/src/mage/sets/zendikar/ValakutTheMoltenPinnacle.java @@ -29,10 +29,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.effects.common.DamageTargetEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/VampireHexmage.java b/Mage.Sets/src/mage/sets/zendikar/VampireHexmage.java index b4217fae298..28d205b5e8a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/VampireHexmage.java +++ b/Mage.Sets/src/mage/sets/zendikar/VampireHexmage.java @@ -29,10 +29,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/VampireLacerator.java b/Mage.Sets/src/mage/sets/zendikar/VampireLacerator.java index ac0a56f6beb..0f145eb5623 100644 --- a/Mage.Sets/src/mage/sets/zendikar/VampireLacerator.java +++ b/Mage.Sets/src/mage/sets/zendikar/VampireLacerator.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.condition.common.TenOrLessLifeCondition; @@ -38,6 +38,7 @@ import mage.abilities.condition.common.UnlessCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.LoseLifeSourceEffect; import mage.cards.CardImpl; +import mage.constants.TargetController; /** * @@ -58,7 +59,7 @@ public class VampireLacerator extends CardImpl { new ConditionalOneShotEffect( new LoseLifeSourceEffect(1), new UnlessCondition( new TenOrLessLifeCondition(TenOrLessLifeCondition.CheckType.AN_OPPONENT) ), - "you lose 1 life unless an opponent has 10 or less life"), Constants.TargetController.YOU, false)); + "you lose 1 life unless an opponent has 10 or less life"), TargetController.YOU, false)); } public VampireLacerator(final VampireLacerator card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/VampireNighthawk.java b/Mage.Sets/src/mage/sets/zendikar/VampireNighthawk.java index 94a4c51762b..16e9e1cb617 100644 --- a/Mage.Sets/src/mage/sets/zendikar/VampireNighthawk.java +++ b/Mage.Sets/src/mage/sets/zendikar/VampireNighthawk.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/VampiresBite.java b/Mage.Sets/src/mage/sets/zendikar/VampiresBite.java index 8c2fcd4af5c..69a40c8e9b9 100644 --- a/Mage.Sets/src/mage/sets/zendikar/VampiresBite.java +++ b/Mage.Sets/src/mage/sets/zendikar/VampiresBite.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.condition.common.KickedCondition; import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.ContinuousEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/VastwoodGorger.java b/Mage.Sets/src/mage/sets/zendikar/VastwoodGorger.java index 1f6b54d87cd..5099e99b614 100644 --- a/Mage.Sets/src/mage/sets/zendikar/VastwoodGorger.java +++ b/Mage.Sets/src/mage/sets/zendikar/VastwoodGorger.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/VerdantCatacombs.java b/Mage.Sets/src/mage/sets/zendikar/VerdantCatacombs.java index add06cfadd1..b48b4c1633f 100644 --- a/Mage.Sets/src/mage/sets/zendikar/VerdantCatacombs.java +++ b/Mage.Sets/src/mage/sets/zendikar/VerdantCatacombs.java @@ -29,8 +29,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.common.FetchLandActivatedAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/VinesOfVastwood.java b/Mage.Sets/src/mage/sets/zendikar/VinesOfVastwood.java index b1e002657e1..5139ae8d53f 100644 --- a/Mage.Sets/src/mage/sets/zendikar/VinesOfVastwood.java +++ b/Mage.Sets/src/mage/sets/zendikar/VinesOfVastwood.java @@ -29,9 +29,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.condition.common.KickedCondition; import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/WarrenInstigator.java b/Mage.Sets/src/mage/sets/zendikar/WarrenInstigator.java index bdebe1c0003..c3f904555f2 100644 --- a/Mage.Sets/src/mage/sets/zendikar/WarrenInstigator.java +++ b/Mage.Sets/src/mage/sets/zendikar/WarrenInstigator.java @@ -28,10 +28,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/WelkinTern.java b/Mage.Sets/src/mage/sets/zendikar/WelkinTern.java index 1496bfa135e..25e750252a6 100644 --- a/Mage.Sets/src/mage/sets/zendikar/WelkinTern.java +++ b/Mage.Sets/src/mage/sets/zendikar/WelkinTern.java @@ -29,9 +29,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.CanBlockOnlyFlyingEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/WhiplashTrap.java b/Mage.Sets/src/mage/sets/zendikar/WhiplashTrap.java index 531a8fea40c..1760a7d0323 100644 --- a/Mage.Sets/src/mage/sets/zendikar/WhiplashTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/WhiplashTrap.java @@ -30,14 +30,15 @@ package mage.sets.zendikar; import java.util.HashMap; import java.util.Map; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; +import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -82,7 +83,7 @@ class WhiplashTrapWatcher extends WatcherImpl { private Map amountOfCreaturesPlayedThisTurn = new HashMap(); public WhiplashTrapWatcher() { - super("WhiplashTrapWatcher", Constants.WatcherScope.GAME); + super("WhiplashTrapWatcher", WatcherScope.GAME); } public WhiplashTrapWatcher(final WhiplashTrapWatcher watcher) { diff --git a/Mage.Sets/src/mage/sets/zendikar/WindborneCharge.java b/Mage.Sets/src/mage/sets/zendikar/WindborneCharge.java index 5326b1bd521..56ed6ef5962 100644 --- a/Mage.Sets/src/mage/sets/zendikar/WindborneCharge.java +++ b/Mage.Sets/src/mage/sets/zendikar/WindborneCharge.java @@ -28,9 +28,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/WindriderEel.java b/Mage.Sets/src/mage/sets/zendikar/WindriderEel.java index 844a380bc90..229e181236a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/WindriderEel.java +++ b/Mage.Sets/src/mage/sets/zendikar/WindriderEel.java @@ -29,9 +29,9 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/WorldQueller.java b/Mage.Sets/src/mage/sets/zendikar/WorldQueller.java index 17b17ad203d..0881ea0351e 100644 --- a/Mage.Sets/src/mage/sets/zendikar/WorldQueller.java +++ b/Mage.Sets/src/mage/sets/zendikar/WorldQueller.java @@ -32,11 +32,11 @@ import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.TargetController; + +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -100,7 +100,7 @@ class WorldQuellerEffect extends OneShotEffect { } public WorldQuellerEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "you may choose a card type. If you do, each player sacrifices a permanent of that type"; } @@ -153,7 +153,7 @@ class WorldQuellerEffect extends OneShotEffect { // you always go first if (target.canChoose(you.getId(), game)) { while (!target.isChosen() && target.canChoose(you.getId(), game)) { - you.choose(Constants.Outcome.Sacrifice, target, source.getId(), game); + you.choose(Outcome.Sacrifice, target, source.getId(), game); } Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null) { @@ -169,7 +169,7 @@ class WorldQuellerEffect extends OneShotEffect { Player player = game.getPlayer(playerId); if (target.canChoose(playerId, game)) { while (!target.isChosen() && target.canChoose(playerId, game)) { - player.choose(Constants.Outcome.Sacrifice, target, source.getId(), game); + player.choose(Outcome.Sacrifice, target, source.getId(), game); } Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null) { diff --git a/Mage.Sets/src/mage/sets/zendikar/ZektarShrineExpedition.java b/Mage.Sets/src/mage/sets/zendikar/ZektarShrineExpedition.java index ab252de4f5a..fea55d281e0 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ZektarShrineExpedition.java +++ b/Mage.Sets/src/mage/sets/zendikar/ZektarShrineExpedition.java @@ -28,10 +28,10 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage.Sets/src/mage/sets/zendikar/ZendikarFarguide.java b/Mage.Sets/src/mage/sets/zendikar/ZendikarFarguide.java index 0d4d331932d..214752418e4 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ZendikarFarguide.java +++ b/Mage.Sets/src/mage/sets/zendikar/ZendikarFarguide.java @@ -28,8 +28,8 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.ForestwalkAbility; import mage.cards.CardImpl; diff --git a/Mage.Tests/src/frozen/org/mage/test/clientside/LandTestExtended.java b/Mage.Tests/src/frozen/org/mage/test/clientside/LandTestExtended.java index 4dee8a596db..495c965d4b6 100644 --- a/Mage.Tests/src/frozen/org/mage/test/clientside/LandTestExtended.java +++ b/Mage.Tests/src/frozen/org/mage/test/clientside/LandTestExtended.java @@ -1,6 +1,6 @@ package org.mage.test.clientside; -import mage.Constants; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.clientside.base.MageAPIExtended; @@ -10,7 +10,7 @@ public class LandTestExtended extends MageAPIExtended { @Test public void testPlayingLandInMainPhase() throws Exception { - addCard("Mountain", Constants.Zone.HAND); + addCard("Mountain", Zone.HAND); setPhase("Precombat Main", mine); play("Mountain"); assertBattlefield("Mountain"); diff --git a/Mage.Tests/src/frozen/org/mage/test/clientside/base/MageAPIExtended.java b/Mage.Tests/src/frozen/org/mage/test/clientside/base/MageAPIExtended.java index cef5ce49afc..0646948ec28 100644 --- a/Mage.Tests/src/frozen/org/mage/test/clientside/base/MageAPIExtended.java +++ b/Mage.Tests/src/frozen/org/mage/test/clientside/base/MageAPIExtended.java @@ -1,6 +1,6 @@ package org.mage.test.clientside.base; -import mage.Constants; +import mage.constants.Zone; import org.mage.test.clientside.bdd.and.And; import org.mage.test.clientside.bdd.given.Given; import org.mage.test.clientside.bdd.then.Then; @@ -13,7 +13,7 @@ import static org.mage.test.clientside.base.MageAPI.Owner.mine; */ public class MageAPIExtended extends MageAPI { - public void addCard(String cardName, Constants.Zone zone) throws Exception { + public void addCard(String cardName, Zone zone) throws Exception { Given.I.have.a.card("Mountain"); } diff --git a/Mage.Tests/src/frozen/org/mage/test/clientside/base/MageBase.java b/Mage.Tests/src/frozen/org/mage/test/clientside/base/MageBase.java index d544f6d0904..192c09c3f4f 100644 --- a/Mage.Tests/src/frozen/org/mage/test/clientside/base/MageBase.java +++ b/Mage.Tests/src/frozen/org/mage/test/clientside/base/MageBase.java @@ -19,8 +19,8 @@ import java.util.Date; import java.util.UUID; import java.util.logging.Level; import java.util.logging.Logger; -import mage.Constants.MultiplayerAttackOption; -import mage.Constants.RangeOfInfluence; +import mage.constants.MultiplayerAttackOption; +import mage.constants.RangeOfInfluence; import mage.game.match.MatchOptions; /** diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/EquipAbilityTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/EquipAbilityTest.java index f6a41ceae1e..f4dac404d66 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/EquipAbilityTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/EquipAbilityTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.abilities.activated; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.game.permanent.Permanent; import org.junit.Assert; import org.junit.Test; @@ -16,13 +17,13 @@ public class EquipAbilityTest extends CardTestPlayerBase { */ @Test public void testEquipHexproof() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Ring of Evos Isle"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Merfolk Spy"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains"); + addCard(Zone.BATTLEFIELD, playerA, "Ring of Evos Isle"); + addCard(Zone.BATTLEFIELD, playerA, "Merfolk Spy"); + addCard(Zone.BATTLEFIELD, playerA, "Plains"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Equip", "Merfolk Spy"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Equip", "Merfolk Spy"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); Permanent merfolk = getPermanent("Merfolk Spy", playerA); @@ -35,13 +36,13 @@ public class EquipAbilityTest extends CardTestPlayerBase { */ @Test public void testEquipShroud() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Ring of Evos Isle"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Simic Sky Swallower"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains"); + addCard(Zone.BATTLEFIELD, playerA, "Ring of Evos Isle"); + addCard(Zone.BATTLEFIELD, playerA, "Simic Sky Swallower"); + addCard(Zone.BATTLEFIELD, playerA, "Plains"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Equip", "Simic Sky Swallower"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Equip", "Simic Sky Swallower"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); Permanent sky = getPermanent("Simic Sky Swallower", playerA); @@ -54,13 +55,13 @@ public class EquipAbilityTest extends CardTestPlayerBase { */ @Test public void testEquipOpponentsCreature() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Ring of Evos Isle"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Llanowar Elves"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains"); + addCard(Zone.BATTLEFIELD, playerA, "Ring of Evos Isle"); + addCard(Zone.BATTLEFIELD, playerB, "Llanowar Elves"); + addCard(Zone.BATTLEFIELD, playerA, "Plains"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Equip", "Llanowar Elves"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Equip", "Llanowar Elves"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); Permanent elves = getPermanent("Llanowar Elves", playerB); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/LevelUpAbilityTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/LevelUpAbilityTest.java index 984ae6afafe..0d4ab6fe2d1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/LevelUpAbilityTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/LevelUpAbilityTest.java @@ -1,9 +1,10 @@ package org.mage.test.cards.abilities.activated; import junit.framework.Assert; -import mage.Constants; import mage.abilities.keyword.IndestructibleAbility; import mage.abilities.keyword.LifelinkAbility; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.permanent.Permanent; import org.junit.Test; @@ -19,10 +20,10 @@ public class LevelUpAbilityTest extends CardTestPlayerBase { */ @Test public void testFirstLevel() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Transcendent Master"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 15); + addCard(Zone.BATTLEFIELD, playerA, "Transcendent Master"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 15); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); Permanent master = getPermanent("Transcendent Master", playerA.getId()); @@ -39,12 +40,12 @@ public class LevelUpAbilityTest extends CardTestPlayerBase { */ @Test public void testFirstLevelWithOneCounter() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Transcendent Master"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 15); + addCard(Zone.BATTLEFIELD, playerA, "Transcendent Master"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 15); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Level up {1}"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Level up {1}"); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); Permanent master = getPermanent("Transcendent Master", playerA.getId()); @@ -61,14 +62,14 @@ public class LevelUpAbilityTest extends CardTestPlayerBase { */ @Test public void testSecondLevel() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Transcendent Master"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 15); + addCard(Zone.BATTLEFIELD, playerA, "Transcendent Master"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 15); for (int i = 0; i < 6; i++) { - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Level up {1}"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Level up {1}"); } - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); Permanent master = getPermanent("Transcendent Master", playerA.getId()); @@ -87,14 +88,14 @@ public class LevelUpAbilityTest extends CardTestPlayerBase { */ @Test public void testThirdLevel() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Transcendent Master"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 15); + addCard(Zone.BATTLEFIELD, playerA, "Transcendent Master"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 15); for (int i = 0; i < 12; i++) { - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Level up {1}"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Level up {1}"); } - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); Permanent master = getPermanent("Transcendent Master", playerA.getId()); @@ -111,14 +112,14 @@ public class LevelUpAbilityTest extends CardTestPlayerBase { */ @Test public void testExtraCounters() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Transcendent Master"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 15); + addCard(Zone.BATTLEFIELD, playerA, "Transcendent Master"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 15); for (int i = 0; i < 15; i++) { - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Level up {1}"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Level up {1}"); } - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); Permanent master = getPermanent("Transcendent Master", playerA.getId()); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CursesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CursesTest.java index de0fa36498f..1dcd091d79b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CursesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CursesTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.abilities.curses; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,16 +13,16 @@ public class CursesTest extends CardTestPlayerBase { @Test public void testCurseOfBloodletting() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 7); - addCard(Constants.Zone.HAND, playerA, "Curse of Bloodletting"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt", 2); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 7); + addCard(Zone.HAND, playerA, "Curse of Bloodletting"); + addCard(Zone.HAND, playerA, "Lightning Bolt", 2); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Curse of Bloodletting", playerB); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", playerB); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", playerA); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Curse of Bloodletting", playerB); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", playerB); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", playerA); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerA, 17); @@ -30,15 +31,15 @@ public class CursesTest extends CardTestPlayerBase { @Test public void testCurseOfEchoes() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 5); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Island", 5); - addCard(Constants.Zone.HAND, playerA, "Curse of Echoes"); - addCard(Constants.Zone.HAND, playerB, "Jace's Ingenuity"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 5); + addCard(Zone.BATTLEFIELD, playerB, "Island", 5); + addCard(Zone.HAND, playerA, "Curse of Echoes"); + addCard(Zone.HAND, playerB, "Jace's Ingenuity"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Curse of Echoes", playerB); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerB, "Jace's Ingenuity"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Curse of Echoes", playerB); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Jace's Ingenuity"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertHandCount(playerA, 3); @@ -47,17 +48,17 @@ public class CursesTest extends CardTestPlayerBase { @Test public void testCurseOfExhaustion1() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 4); - addCard(Constants.Zone.HAND, playerA, "Curse of Exhaustion"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Mountain", 2); - addCard(Constants.Zone.HAND, playerB, "Lightning Bolt", 2); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 4); + addCard(Zone.HAND, playerA, "Curse of Exhaustion"); + addCard(Zone.BATTLEFIELD, playerB, "Mountain", 2); + addCard(Zone.HAND, playerB, "Lightning Bolt", 2); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Curse of Exhaustion", playerB); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerB, "Lightning Bolt", playerA); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerB, "Lightning Bolt", playerA); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Curse of Exhaustion", playerB); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Lightning Bolt", playerA); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Lightning Bolt", playerA); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerB, 20); @@ -66,17 +67,17 @@ public class CursesTest extends CardTestPlayerBase { @Test public void testCurseOfExhaustion2() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 4); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 2); - addCard(Constants.Zone.HAND, playerA, "Curse of Exhaustion"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt", 2); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 2); + addCard(Zone.HAND, playerA, "Curse of Exhaustion"); + addCard(Zone.HAND, playerA, "Lightning Bolt", 2); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Curse of Exhaustion", playerB); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", playerB); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", playerB); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Curse of Exhaustion", playerB); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", playerB); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", playerB); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); @@ -85,12 +86,12 @@ public class CursesTest extends CardTestPlayerBase { @Test public void testCurseOfThirst1() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 5); - addCard(Constants.Zone.HAND, playerA, "Curse of Thirst"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 5); + addCard(Zone.HAND, playerA, "Curse of Thirst"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Curse of Thirst", playerB); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Curse of Thirst", playerB); - setStopAt(2, Constants.PhaseStep.DRAW); + setStopAt(2, PhaseStep.DRAW); execute(); assertLife(playerA, 20); @@ -99,15 +100,15 @@ public class CursesTest extends CardTestPlayerBase { @Test public void testCurseOfThirst2() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 5); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 5); - addCard(Constants.Zone.HAND, playerA, "Curse of Thirst"); - addCard(Constants.Zone.HAND, playerA, "Curse of Bloodletting"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 5); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5); + addCard(Zone.HAND, playerA, "Curse of Thirst"); + addCard(Zone.HAND, playerA, "Curse of Bloodletting"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Curse of Bloodletting", playerB); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Curse of Thirst", playerB); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Curse of Bloodletting", playerB); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Curse of Thirst", playerB); - setStopAt(2, Constants.PhaseStep.DRAW); + setStopAt(2, PhaseStep.DRAW); execute(); assertLife(playerA, 20); @@ -117,13 +118,13 @@ public class CursesTest extends CardTestPlayerBase { @Test public void testCurseOfMisfortune1() { removeAllCardsFromLibrary(playerA); - addCard(Constants.Zone.LIBRARY, playerA, "Curse of Misfortunes", 2); - addCard(Constants.Zone.HAND, playerA, "Curse of Misfortunes"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 5); + addCard(Zone.LIBRARY, playerA, "Curse of Misfortunes", 2); + addCard(Zone.HAND, playerA, "Curse of Misfortunes"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 5); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Curse of Misfortunes", playerB); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Curse of Misfortunes", playerB); - setStopAt(3, Constants.PhaseStep.DRAW); + setStopAt(3, PhaseStep.DRAW); execute(); assertLife(playerA, 20); @@ -134,13 +135,13 @@ public class CursesTest extends CardTestPlayerBase { @Test public void testCurseOfMisfortune2() { removeAllCardsFromLibrary(playerA); - addCard(Constants.Zone.LIBRARY, playerA, "Curse of Bloodletting", 2); - addCard(Constants.Zone.HAND, playerA, "Curse of Misfortunes"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 5); + addCard(Zone.LIBRARY, playerA, "Curse of Bloodletting", 2); + addCard(Zone.HAND, playerA, "Curse of Misfortunes"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 5); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Curse of Misfortunes", playerB); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Curse of Misfortunes", playerB); - setStopAt(3, Constants.PhaseStep.DRAW); + setStopAt(3, PhaseStep.DRAW); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/AEtherFigmentTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/AEtherFigmentTest.java index 1d27ab265b6..a90111a2f38 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/AEtherFigmentTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/AEtherFigmentTest.java @@ -1,7 +1,8 @@ package org.mage.test.cards.abilities.enters; import junit.framework.Assert; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.game.permanent.Permanent; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -14,12 +15,12 @@ public class AEtherFigmentTest extends CardTestPlayerBase { @Test public void testEnteringWithCounters() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 5); - addCard(Constants.Zone.HAND, playerA, "AEther Figment"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 5); + addCard(Zone.HAND, playerA, "AEther Figment"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "AEther Figment"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "AEther Figment"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/DearlyDepartedTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/DearlyDepartedTest.java index ac4364aeda9..c8b1ce05da2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/DearlyDepartedTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/DearlyDepartedTest.java @@ -1,7 +1,8 @@ package org.mage.test.cards.abilities.enters; import junit.framework.Assert; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.game.permanent.Permanent; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -14,13 +15,13 @@ public class DearlyDepartedTest extends CardTestPlayerBase { @Test public void testEnteringWithCounters() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 5); - addCard(Constants.Zone.GRAVEYARD, playerA, "Dearly Departed"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Thraben Doomsayer"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 5); + addCard(Zone.GRAVEYARD, playerA, "Dearly Departed"); + addCard(Zone.BATTLEFIELD, playerA, "Thraben Doomsayer"); - activateAbility(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Put a 1/1 white Human creature token onto the battlefield."); + activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Put a 1/1 white Human creature token onto the battlefield."); - setStopAt(2, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/MasterBiomancerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/MasterBiomancerTest.java index 8aaceccd575..cf402815f8d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/MasterBiomancerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/MasterBiomancerTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.abilities.enters; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -25,13 +26,13 @@ public class MasterBiomancerTest extends CardTestPlayerBase { // a creature enters the battlefield and gets a counter for each point of power of Master Biomancer - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 5); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Master Biomancer", 1); - addCard(Constants.Zone.HAND, playerA, "Mindeye Drake"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 5); + addCard(Zone.BATTLEFIELD, playerA, "Master Biomancer", 1); + addCard(Zone.HAND, playerA, "Mindeye Drake"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Mindeye Drake"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mindeye Drake"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -52,18 +53,18 @@ public class MasterBiomancerTest extends CardTestPlayerBase { // doubled by Corpsejack Menace (when he ist cast, his own ability will not apply) // http://blogs.magicjudges.org/rulestips/2013/03/corpsejack-menace-and-master-biomancer/ - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Master Biomancer", 1); + addCard(Zone.BATTLEFIELD, playerA, "Island", 2); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 2); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 1); + addCard(Zone.BATTLEFIELD, playerA, "Master Biomancer", 1); - addCard(Constants.Zone.HAND, playerA, "Corpsejack Menace"); - addCard(Constants.Zone.HAND, playerA, "Mindeye Drake"); + addCard(Zone.HAND, playerA, "Corpsejack Menace"); + addCard(Zone.HAND, playerA, "Mindeye Drake"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Corpsejack Menace"); - castSpell(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Mindeye Drake"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Corpsejack Menace"); + castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Mindeye Drake"); - setStopAt(3, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/OrbOfDreamsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/OrbOfDreamsTest.java index 1d19b52dd71..1ecefa8f504 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/OrbOfDreamsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/OrbOfDreamsTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.abilities.enters; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.game.permanent.Permanent; import org.junit.Assert; import org.junit.Test; @@ -30,14 +31,14 @@ public class OrbOfDreamsTest extends CardTestPlayerBase { @Test public void testOrbNotTappingItself() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 5); - addCard(Constants.Zone.HAND, playerA, "Orb of Dreams"); - addCard(Constants.Zone.HAND, playerA, "Razortip Whip"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 5); + addCard(Zone.HAND, playerA, "Orb of Dreams"); + addCard(Zone.HAND, playerA, "Razortip Whip"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Orb of Dreams"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Razortip Whip"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Orb of Dreams"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Razortip Whip"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/ProteanHydraTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/ProteanHydraTest.java index a4e556ac4c8..a23967da8a2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/ProteanHydraTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/ProteanHydraTest.java @@ -1,7 +1,8 @@ package org.mage.test.cards.abilities.enters; import junit.framework.Assert; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.game.permanent.Permanent; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -14,12 +15,12 @@ public class ProteanHydraTest extends CardTestPlayerBase { @Test public void testEnteringWithCounters() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 5); - addCard(Constants.Zone.HAND, playerA, "Protean Hydra"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 5); + addCard(Zone.HAND, playerA, "Protean Hydra"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Protean Hydra"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Protean Hydra"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/equipped/GolemSkinGauntletsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/equipped/GolemSkinGauntletsTest.java index 47dabdf10bc..8d4772bc3b1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/equipped/GolemSkinGauntletsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/equipped/GolemSkinGauntletsTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.abilities.equipped; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.game.permanent.Permanent; import org.junit.Assert; import org.junit.Test; @@ -17,15 +18,15 @@ public class GolemSkinGauntletsTest extends CardTestPlayerBase { */ @Test public void testBoostOnEquip() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 6); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Heavy Arbalest"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Golem-Skin Gauntlets"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 6); + addCard(Zone.BATTLEFIELD, playerA, "Heavy Arbalest"); + addCard(Zone.BATTLEFIELD, playerA, "Golem-Skin Gauntlets"); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Equip {4}", "Elite Vanguard"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Equip {2}", "Elite Vanguard"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Equip {4}", "Elite Vanguard"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Equip {2}", "Elite Vanguard"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/equipped/HeavyArbalestTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/equipped/HeavyArbalestTest.java index 1681004f938..fc742561e93 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/equipped/HeavyArbalestTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/equipped/HeavyArbalestTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.abilities.equipped; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.game.permanent.Permanent; import org.junit.Assert; import org.junit.Test; @@ -17,15 +18,15 @@ public class HeavyArbalestTest extends CardTestPlayerBase { */ @Test public void testNotUntapping() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 4); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Heavy Arbalest"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Llanowar Elves"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4); + addCard(Zone.BATTLEFIELD, playerA, "Heavy Arbalest"); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerB, "Llanowar Elves"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Equip {4}", "Elite Vanguard"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: {source} deals 2 damage", playerB); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Equip {4}", "Elite Vanguard"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: {source} deals 2 damage", playerB); - setStopAt(3, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -41,16 +42,16 @@ public class HeavyArbalestTest extends CardTestPlayerBase { */ @Test public void testUntapsLater() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 8); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Heavy Arbalest"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Llanowar Elves"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 8); + addCard(Zone.BATTLEFIELD, playerA, "Heavy Arbalest"); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Llanowar Elves"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Equip {4}", "Elite Vanguard"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: {source} deals 2 damage", playerB); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Equip {4}", "Llanowar Elves"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Equip {4}", "Elite Vanguard"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: {source} deals 2 damage", playerB); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Equip {4}", "Llanowar Elves"); - setStopAt(5, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(5, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/flicker/CloudshiftTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/flicker/CloudshiftTest.java index 446fbc49c3e..4d59fea2ffe 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/flicker/CloudshiftTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/flicker/CloudshiftTest.java @@ -1,9 +1,10 @@ package org.mage.test.cards.abilities.flicker; -import mage.Constants; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.IntimidateAbility; import mage.abilities.keyword.LifelinkAbility; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.game.permanent.Permanent; import org.junit.Assert; import org.junit.Test; @@ -20,17 +21,17 @@ public class CloudshiftTest extends CardTestPlayerBase { */ @Test public void testSpellFizzle() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Plains"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain"); - addCard(Constants.Zone.HAND, playerA, "Cloudshift"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.HAND, playerA, "Cloudshift"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Elite Vanguard"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Cloudshift", "Elite Vanguard"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Elite Vanguard"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cloudshift", "Elite Vanguard"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); // should be alive because of Cloudshift @@ -43,21 +44,21 @@ public class CloudshiftTest extends CardTestPlayerBase { */ @Test public void testCopyEffectDiscarded() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 4); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 4); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 4); + addCard(Zone.BATTLEFIELD, playerA, "Island", 4); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Knight of Meadowgrain"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Heirs of Stromkirk"); + addCard(Zone.BATTLEFIELD, playerB, "Knight of Meadowgrain"); + addCard(Zone.BATTLEFIELD, playerB, "Heirs of Stromkirk"); - addCard(Constants.Zone.HAND, playerA, "Clone"); - addCard(Constants.Zone.HAND, playerA, "Cloudshift"); + addCard(Zone.HAND, playerA, "Clone"); + addCard(Zone.HAND, playerA, "Cloudshift"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Clone"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Clone"); setChoice(playerA, "Knight of Meadowgrain"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Cloudshift", "Clone"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Cloudshift", "Clone"); setChoice(playerA, "Heirs of Stromkirk"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); Permanent clone = getPermanent("Heirs of Stromkirk", playerA.getId()); @@ -68,16 +69,16 @@ public class CloudshiftTest extends CardTestPlayerBase { } @Test public void testEquipmentDetached() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 4); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Silvercoat Lion"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Bonesplitter"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 4); + addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion"); + addCard(Zone.BATTLEFIELD, playerA, "Bonesplitter"); - addCard(Constants.Zone.HAND, playerA, "Cloudshift"); + addCard(Zone.HAND, playerA, "Cloudshift"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Equip {1}", "Silvercoat Lion"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Cloudshift", "Silvercoat Lion"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Equip {1}", "Silvercoat Lion"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Cloudshift", "Silvercoat Lion"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); Permanent bonesplitter = getPermanent("Bonesplitter", playerA.getId()); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AffinityForArtifactsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AffinityForArtifactsTest.java index 9c735298579..3dbd3c90029 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AffinityForArtifactsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AffinityForArtifactsTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.abilities.keywords; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,14 +13,14 @@ public class AffinityForArtifactsTest extends CardTestPlayerBase { @Test public void testCastForCheaperCost() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 4); - addCard(Constants.Zone.HAND, playerA, "Myr Enforcer"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4); + addCard(Zone.HAND, playerA, "Myr Enforcer"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Myr Enforcer", 3); + addCard(Zone.BATTLEFIELD, playerA, "Myr Enforcer", 3); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Myr Enforcer"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Myr Enforcer"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerA, "Myr Enforcer", 4); @@ -30,14 +31,14 @@ public class AffinityForArtifactsTest extends CardTestPlayerBase { */ @Test public void testCorrectCostReduction() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 3); - addCard(Constants.Zone.HAND, playerA, "Myr Enforcer"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3); + addCard(Zone.HAND, playerA, "Myr Enforcer"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Myr Enforcer", 3); + addCard(Zone.BATTLEFIELD, playerA, "Myr Enforcer", 3); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Myr Enforcer"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Myr Enforcer"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerA, "Myr Enforcer", 3); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BushidoTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BushidoTest.java index aa89a0347a4..f02153a56b9 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BushidoTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BushidoTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.abilities.keywords; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -14,13 +15,13 @@ public class BushidoTest extends CardTestPlayerBase { */ @Test public void testBeingBlocked() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Isao, Enlightened Bushi"); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerB, "Isao, Enlightened Bushi"); attack(2, playerB, "Isao, Enlightened Bushi"); block(2, playerA, "Elite Vanguard", "Isao, Enlightened Bushi"); - setStopAt(2, Constants.PhaseStep.END_COMBAT); + setStopAt(2, PhaseStep.END_COMBAT); execute(); assertPowerToughness(playerB, "Isao, Enlightened Bushi", 4, 3); @@ -32,13 +33,13 @@ public class BushidoTest extends CardTestPlayerBase { */ @Test public void testBlocking() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Isao, Enlightened Bushi"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Isao, Enlightened Bushi"); + addCard(Zone.BATTLEFIELD, playerB, "Elite Vanguard"); attack(2, playerB, "Elite Vanguard"); block(2, playerA, "Isao, Enlightened Bushi", "Elite Vanguard"); - setStopAt(2, Constants.PhaseStep.END_COMBAT); + setStopAt(2, PhaseStep.END_COMBAT); execute(); assertPowerToughness(playerA, "Isao, Enlightened Bushi", 4, 3); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EvolveTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EvolveTest.java index ce32489e160..ba2009d4619 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EvolveTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EvolveTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.abilities.keywords; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -17,14 +18,14 @@ public class EvolveTest extends CardTestPlayerBase { // Cloudfin Raptor gets one +1/+1 because Mindeye Drake comes into play - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 5); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Cloudfin Raptor", 1); + addCard(Zone.BATTLEFIELD, playerA, "Island", 5); + addCard(Zone.BATTLEFIELD, playerA, "Cloudfin Raptor", 1); - addCard(Constants.Zone.HAND, playerA, "Mindeye Drake"); + addCard(Zone.HAND, playerA, "Mindeye Drake"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Mindeye Drake"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mindeye Drake"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -42,14 +43,14 @@ public class EvolveTest extends CardTestPlayerBase { // Experiment One gets no counter because Kird Ape is 1/1 with no Forest in play - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Experiment One", 1); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1); + addCard(Zone.BATTLEFIELD, playerA, "Experiment One", 1); - addCard(Constants.Zone.HAND, playerA, "Kird Ape"); + addCard(Zone.HAND, playerA, "Kird Ape"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Kird Ape"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Kird Ape"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -67,15 +68,15 @@ public class EvolveTest extends CardTestPlayerBase { // Experiment One gets a counter because Kird Ape is 2/2 with a Forest in play - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Experiment One", 1); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 1); + addCard(Zone.BATTLEFIELD, playerA, "Experiment One", 1); - addCard(Constants.Zone.HAND, playerA, "Kird Ape"); + addCard(Zone.HAND, playerA, "Kird Ape"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Kird Ape"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Kird Ape"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -93,15 +94,15 @@ public class EvolveTest extends CardTestPlayerBase { // Experiment One gets a counter because Kird Ape is 2/2 with a Forest in play - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Experiment One", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Master Biomancer", 1); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 1); + addCard(Zone.BATTLEFIELD, playerA, "Experiment One", 1); + addCard(Zone.BATTLEFIELD, playerA, "Master Biomancer", 1); - addCard(Constants.Zone.HAND, playerA, "Experiment One"); + addCard(Zone.HAND, playerA, "Experiment One"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Experiment One"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Experiment One"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ExaltedTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ExaltedTest.java index 20bfc6e8431..d46d99499e9 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ExaltedTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ExaltedTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.abilities.keywords; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -14,13 +15,13 @@ public class ExaltedTest extends CardTestPlayerBase { */ @Test public void testBeingBlocked() { - addCard(Constants.Zone.BATTLEFIELD, playerB, "Sublime Archangel"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Llanowar Elves"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Elite Vanguard", 2); + addCard(Zone.BATTLEFIELD, playerB, "Sublime Archangel"); + addCard(Zone.BATTLEFIELD, playerB, "Llanowar Elves"); + addCard(Zone.BATTLEFIELD, playerB, "Elite Vanguard", 2); attack(2, playerB, "Llanowar Elves"); - setStopAt(2, Constants.PhaseStep.END_COMBAT); + setStopAt(2, PhaseStep.END_COMBAT); execute(); // 1/1 and +4/+4 diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MiracleTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MiracleTest.java index 4ff7806c3d2..6fd48851a56 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MiracleTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MiracleTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.abilities.keywords; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -14,17 +15,17 @@ public class MiracleTest extends CardTestPlayerBase { */ @Test public void testMiracleCost() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 2); - addCard(Constants.Zone.LIBRARY, playerA, "Terminus"); - addCard(Constants.Zone.HAND, playerA, "Think Twice"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 2); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 2); + addCard(Zone.LIBRARY, playerA, "Terminus"); + addCard(Zone.HAND, playerA, "Think Twice"); skipInitShuffling(); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Elite Vanguard", 1); + addCard(Zone.BATTLEFIELD, playerB, "Elite Vanguard", 1); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Think Twice"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Think Twice"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); // check Terminus was played @@ -36,18 +37,18 @@ public class MiracleTest extends CardTestPlayerBase { */ @Test public void testMiracleOnExtraTurn() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 4); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 4); - addCard(Constants.Zone.LIBRARY, playerA, "Terminus"); - addCard(Constants.Zone.LIBRARY, playerA, "Temporal Mastery"); - addCard(Constants.Zone.HAND, playerA, "Think Twice"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 4); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 4); + addCard(Zone.LIBRARY, playerA, "Terminus"); + addCard(Zone.LIBRARY, playerA, "Temporal Mastery"); + addCard(Zone.HAND, playerA, "Think Twice"); skipInitShuffling(); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Elite Vanguard", 1); + addCard(Zone.BATTLEFIELD, playerB, "Elite Vanguard", 1); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Think Twice"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Think Twice"); - setStopAt(2, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); // check Terminus was played diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ReboundTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ReboundTest.java index d02099d1c2b..f0fce19f6b7 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ReboundTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ReboundTest.java @@ -4,7 +4,8 @@ */ package org.mage.test.cards.abilities.keywords; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -16,14 +17,14 @@ public class ReboundTest extends CardTestPlayerBase{ @Test public void testCastFromHandMovedToExile() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 1); - addCard(Constants.Zone.HAND, playerA, "Distortion Strike"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 1); + addCard(Zone.HAND, playerA, "Distortion Strike"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Memnite", 1); + addCard(Zone.BATTLEFIELD, playerB, "Memnite", 1); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Distortion Strike", "Memnite"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Distortion Strike", "Memnite"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); //check exile and graveyard diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SoulbondKeywordTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SoulbondKeywordTest.java index da56ac0540b..9edb951084e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SoulbondKeywordTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SoulbondKeywordTest.java @@ -1,9 +1,10 @@ package org.mage.test.cards.abilities.keywords; -import mage.Constants; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; import mage.abilities.keyword.LifelinkAbility; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.filter.Filter; import mage.game.permanent.Permanent; import org.junit.Assert; @@ -17,13 +18,13 @@ public class SoulbondKeywordTest extends CardTestPlayerBase { @Test public void testPairOnCast() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - addCard(Constants.Zone.HAND, playerA, "Trusted Forcemage"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 3); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.HAND, playerA, "Trusted Forcemage"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 3); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Trusted Forcemage"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Trusted Forcemage"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerA, "Trusted Forcemage", 1); @@ -36,13 +37,13 @@ public class SoulbondKeywordTest extends CardTestPlayerBase { */ @Test public void testPairOnEntersBattlefield() { - addCard(Constants.Zone.HAND, playerA, "Elite Vanguard"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Trusted Forcemage"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 1); + addCard(Zone.HAND, playerA, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Trusted Forcemage"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 1); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Vanguard"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Vanguard"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerA, "Trusted Forcemage", 1); @@ -55,13 +56,13 @@ public class SoulbondKeywordTest extends CardTestPlayerBase { */ @Test public void testTwoSoulbondCreaturesOnBattlefield() { - addCard(Constants.Zone.HAND, playerA, "Trusted Forcemage", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 6); + addCard(Zone.HAND, playerA, "Trusted Forcemage", 2); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 6); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Trusted Forcemage"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Trusted Forcemage"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Trusted Forcemage"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Trusted Forcemage"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerA, "Trusted Forcemage", 2); @@ -73,12 +74,12 @@ public class SoulbondKeywordTest extends CardTestPlayerBase { */ @Test public void testNoPairOnSingleCreature() { - addCard(Constants.Zone.HAND, playerA, "Trusted Forcemage", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 3); + addCard(Zone.HAND, playerA, "Trusted Forcemage", 1); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 3); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Trusted Forcemage"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Trusted Forcemage"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerA, "Trusted Forcemage", 1); @@ -90,17 +91,17 @@ public class SoulbondKeywordTest extends CardTestPlayerBase { */ @Test public void testChangeControllerForSoulbondCreature() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - addCard(Constants.Zone.HAND, playerA, "Trusted Forcemage"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 3); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.HAND, playerA, "Trusted Forcemage"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 3); - addCard(Constants.Zone.HAND, playerB, "Act of Treason"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Mountain", 3); + addCard(Zone.HAND, playerB, "Act of Treason"); + addCard(Zone.BATTLEFIELD, playerB, "Mountain", 3); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Trusted Forcemage"); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Act of Treason", "Trusted Forcemage"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Trusted Forcemage"); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Act of Treason", "Trusted Forcemage"); - setStopAt(2, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerA, "Trusted Forcemage", 0); @@ -117,17 +118,17 @@ public class SoulbondKeywordTest extends CardTestPlayerBase { */ @Test public void testChangeControllerForAnotherCreature() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - addCard(Constants.Zone.HAND, playerA, "Trusted Forcemage"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 3); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.HAND, playerA, "Trusted Forcemage"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 3); - addCard(Constants.Zone.HAND, playerB, "Act of Treason"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Mountain", 3); + addCard(Zone.HAND, playerB, "Act of Treason"); + addCard(Zone.BATTLEFIELD, playerB, "Mountain", 3); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Trusted Forcemage"); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Act of Treason", "Elite Vanguard"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Trusted Forcemage"); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Act of Treason", "Elite Vanguard"); - setStopAt(2, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerA, "Trusted Forcemage", 1); @@ -144,17 +145,17 @@ public class SoulbondKeywordTest extends CardTestPlayerBase { */ @Test public void testChangeControllerAndGettingBack() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - addCard(Constants.Zone.HAND, playerA, "Trusted Forcemage"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 3); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.HAND, playerA, "Trusted Forcemage"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 3); - addCard(Constants.Zone.HAND, playerB, "Act of Treason"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Mountain", 3); + addCard(Zone.HAND, playerB, "Act of Treason"); + addCard(Zone.BATTLEFIELD, playerB, "Mountain", 3); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Trusted Forcemage"); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Act of Treason", "Trusted Forcemage"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Trusted Forcemage"); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Act of Treason", "Trusted Forcemage"); - setStopAt(3, Constants.PhaseStep.PRECOMBAT_MAIN); + setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); assertPermanentCount(playerA, "Trusted Forcemage", 1); @@ -168,19 +169,19 @@ public class SoulbondKeywordTest extends CardTestPlayerBase { */ @Test public void testSoulbondWorksOnControllerSide() { - addCard(Constants.Zone.HAND, playerA, "Trusted Forcemage"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 3); + addCard(Zone.HAND, playerA, "Trusted Forcemage"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 3); - addCard(Constants.Zone.HAND, playerB, "Act of Treason"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Mountain", 3); - addCard(Constants.Zone.HAND, playerB, "Elite Vanguard"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Plains", 3); + addCard(Zone.HAND, playerB, "Act of Treason"); + addCard(Zone.BATTLEFIELD, playerB, "Mountain", 3); + addCard(Zone.HAND, playerB, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerB, "Plains", 3); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Trusted Forcemage"); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Act of Treason", "Trusted Forcemage"); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Elite Vanguard"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Trusted Forcemage"); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Act of Treason", "Trusted Forcemage"); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Elite Vanguard"); - setStopAt(2, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); // stolen @@ -196,19 +197,19 @@ public class SoulbondKeywordTest extends CardTestPlayerBase { */ @Test public void testReturnBack() { - addCard(Constants.Zone.HAND, playerA, "Trusted Forcemage"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 3); + addCard(Zone.HAND, playerA, "Trusted Forcemage"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 3); - addCard(Constants.Zone.HAND, playerB, "Act of Treason"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Mountain", 3); - addCard(Constants.Zone.HAND, playerB, "Elite Vanguard"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Plains", 3); + addCard(Zone.HAND, playerB, "Act of Treason"); + addCard(Zone.BATTLEFIELD, playerB, "Mountain", 3); + addCard(Zone.HAND, playerB, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerB, "Plains", 3); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Trusted Forcemage"); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Act of Treason", "Trusted Forcemage"); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Elite Vanguard"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Trusted Forcemage"); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Act of Treason", "Trusted Forcemage"); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Elite Vanguard"); - setStopAt(3, Constants.PhaseStep.PRECOMBAT_MAIN); // Effect of "Act of Treason" will end here + setStopAt(3, PhaseStep.PRECOMBAT_MAIN); // Effect of "Act of Treason" will end here execute(); // returned back with no boost @@ -224,16 +225,16 @@ public class SoulbondKeywordTest extends CardTestPlayerBase { */ @Test public void testUnsummon() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - addCard(Constants.Zone.HAND, playerA, "Trusted Forcemage"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 3); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 3); - addCard(Constants.Zone.HAND, playerA, "Unsummon", 1); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.HAND, playerA, "Trusted Forcemage"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 3); + addCard(Zone.BATTLEFIELD, playerA, "Island", 3); + addCard(Zone.HAND, playerA, "Unsummon", 1); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Trusted Forcemage"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Unsummon", "Elite Vanguard"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Trusted Forcemage"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Unsummon", "Elite Vanguard"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerA, "Elite Vanguard", 0); @@ -245,14 +246,14 @@ public class SoulbondKeywordTest extends CardTestPlayerBase { */ @Test public void testPairOnAnimatedLand() { - addCard(Constants.Zone.HAND, playerA, "Trusted Forcemage"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 4); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Blinkmoth Nexus", 1); + addCard(Zone.HAND, playerA, "Trusted Forcemage"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 4); + addCard(Zone.BATTLEFIELD, playerA, "Blinkmoth Nexus", 1); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{1}: "); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Trusted Forcemage"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{1}: "); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Trusted Forcemage"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); // test paired with boost @@ -265,14 +266,14 @@ public class SoulbondKeywordTest extends CardTestPlayerBase { */ @Test public void testPairOnPostAnimatedLand() { - addCard(Constants.Zone.HAND, playerA, "Trusted Forcemage"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 4); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Blinkmoth Nexus", 1); + addCard(Zone.HAND, playerA, "Trusted Forcemage"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 4); + addCard(Zone.BATTLEFIELD, playerA, "Blinkmoth Nexus", 1); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Trusted Forcemage"); - activateAbility(1, Constants.PhaseStep.BEGIN_COMBAT, playerA, "{1}: "); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Trusted Forcemage"); + activateAbility(1, PhaseStep.BEGIN_COMBAT, playerA, "{1}: "); - setStopAt(1, Constants.PhaseStep.DECLARE_ATTACKERS); + setStopAt(1, PhaseStep.DECLARE_ATTACKERS); execute(); // no effect on later animation @@ -285,14 +286,14 @@ public class SoulbondKeywordTest extends CardTestPlayerBase { */ @Test public void testCreatureTypeLoss() { - addCard(Constants.Zone.HAND, playerA, "Trusted Forcemage"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 4); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Blinkmoth Nexus", 1); + addCard(Zone.HAND, playerA, "Trusted Forcemage"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 4); + addCard(Zone.BATTLEFIELD, playerA, "Blinkmoth Nexus", 1); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{1}: "); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Trusted Forcemage"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{1}: "); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Trusted Forcemage"); - setStopAt(2, Constants.PhaseStep.PRECOMBAT_MAIN); + setStopAt(2, PhaseStep.PRECOMBAT_MAIN); execute(); // test boost loss @@ -304,21 +305,21 @@ public class SoulbondKeywordTest extends CardTestPlayerBase { */ @Test public void testRebondOnNextCreature() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - addCard(Constants.Zone.HAND, playerA, "Phantasmal Bear"); - addCard(Constants.Zone.HAND, playerA, "Trusted Forcemage"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 3); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 3); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 3); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 3); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.HAND, playerA, "Phantasmal Bear"); + addCard(Zone.HAND, playerA, "Trusted Forcemage"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 3); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 3); + addCard(Zone.BATTLEFIELD, playerA, "Island", 3); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt", 1); + addCard(Zone.HAND, playerA, "Lightning Bolt", 1); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Trusted Forcemage"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Elite Vanguard"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Phantasmal Bear"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Trusted Forcemage"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Elite Vanguard"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Phantasmal Bear"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerA, "Elite Vanguard", 0); @@ -333,13 +334,13 @@ public class SoulbondKeywordTest extends CardTestPlayerBase { */ @Test public void testGrantingAbility() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - addCard(Constants.Zone.HAND, playerA, "Nearheath Pilgrim"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 2); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.HAND, playerA, "Nearheath Pilgrim"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 2); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Nearheath Pilgrim"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Nearheath Pilgrim"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPowerToughness(playerA, "Nearheath Pilgrim", 2, 1); @@ -353,17 +354,17 @@ public class SoulbondKeywordTest extends CardTestPlayerBase { @Test public void testExileAndReturnBack() { - addCard(Constants.Zone.HAND, playerA, "Elite Vanguard"); - addCard(Constants.Zone.HAND, playerA, "Cloudshift"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Trusted Forcemage"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 2); + addCard(Zone.HAND, playerA, "Elite Vanguard"); + addCard(Zone.HAND, playerA, "Cloudshift"); + addCard(Zone.BATTLEFIELD, playerA, "Trusted Forcemage"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 2); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Vanguard"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Vanguard"); setChoice(playerA, "Yes"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Cloudshift", "Trusted Forcemage"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Cloudshift", "Trusted Forcemage"); setChoice(playerA, "No"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertPermanentCount(playerA, "Trusted Forcemage", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/UndyingTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/UndyingTest.java index 5c694095e61..ab8753847ef 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/UndyingTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/UndyingTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.abilities.keywords; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -14,13 +15,13 @@ public class UndyingTest extends CardTestPlayerBase { */ @Test public void testWithBoost() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Geralf's Messenger"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 3); - addCard(Constants.Zone.HAND, playerA, "Last Gasp"); + addCard(Zone.BATTLEFIELD, playerA, "Geralf's Messenger"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 3); + addCard(Zone.HAND, playerA, "Last Gasp"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Last Gasp", "Geralf's Messenger"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Last Gasp", "Geralf's Messenger"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerA, "Geralf's Messenger", 1); @@ -32,14 +33,14 @@ public class UndyingTest extends CardTestPlayerBase { */ @Test public void testWithMassBoost() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Strangleroot Geist"); + addCard(Zone.BATTLEFIELD, playerA, "Strangleroot Geist"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Swamp", 3); - addCard(Constants.Zone.HAND, playerB, "Cower in Fear"); + addCard(Zone.BATTLEFIELD, playerB, "Swamp", 3); + addCard(Zone.HAND, playerB, "Cower in Fear"); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Cower in Fear"); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Cower in Fear"); - setStopAt(2, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerA, "Strangleroot Geist", 1); @@ -52,15 +53,15 @@ public class UndyingTest extends CardTestPlayerBase { */ @Test public void testUndyingEvil() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 3); - addCard(Constants.Zone.HAND, playerA, "Last Gasp"); - addCard(Constants.Zone.HAND, playerA, "Undying Evil"); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 3); + addCard(Zone.HAND, playerA, "Last Gasp"); + addCard(Zone.HAND, playerA, "Undying Evil"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Last Gasp", "Elite Vanguard"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Undying Evil", "Elite Vanguard"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Last Gasp", "Elite Vanguard"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Undying Evil", "Elite Vanguard"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerA, "Elite Vanguard", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/lose/LoseAbilityByEquipmentTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/lose/LoseAbilityByEquipmentTest.java index b42c23b09eb..accfb913db8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/lose/LoseAbilityByEquipmentTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/lose/LoseAbilityByEquipmentTest.java @@ -1,7 +1,8 @@ package org.mage.test.cards.abilities.lose; -import mage.Constants; import mage.abilities.keyword.FlyingAbility; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.game.permanent.Permanent; import org.junit.Assert; import org.junit.Test; @@ -18,19 +19,19 @@ public class LoseAbilityByEquipmentTest extends CardTestPlayerBase { */ @Test public void testGainVsLoseByEquipmentAbility() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Silvercoat Lion"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 3); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 4); + addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 3); + addCard(Zone.BATTLEFIELD, playerA, "Island", 4); - addCard(Constants.Zone.HAND, playerA, "Magebane Armor"); // loses Flying - addCard(Constants.Zone.HAND, playerA, "Cobbled Wings"); // gives Flying + addCard(Zone.HAND, playerA, "Magebane Armor"); // loses Flying + addCard(Zone.HAND, playerA, "Cobbled Wings"); // gives Flying - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Magebane Armor"); - castSpell(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Cobbled Wings"); - activateAbility(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Equip {1}", "Silvercoat Lion"); // give Flying - activateAbility(3, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Equip {2}", "Silvercoat Lion"); // lose Flying + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Magebane Armor"); + castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Cobbled Wings"); + activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Equip {1}", "Silvercoat Lion"); // give Flying + activateAbility(3, PhaseStep.POSTCOMBAT_MAIN, playerA, "Equip {2}", "Silvercoat Lion"); // lose Flying - setStopAt(3, Constants.PhaseStep.END_TURN); + setStopAt(3, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/lose/LoseAbilityTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/lose/LoseAbilityTest.java index e1ec48eebba..bca4c5b5507 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/lose/LoseAbilityTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/lose/LoseAbilityTest.java @@ -1,7 +1,8 @@ package org.mage.test.cards.abilities.lose; -import mage.Constants; import mage.abilities.keyword.FlyingAbility; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.game.permanent.Permanent; import org.junit.Assert; import org.junit.Test; @@ -15,16 +16,16 @@ public class LoseAbilityTest extends CardTestPlayerBase { @Test public void testLoseFlyingByEnchantCreature() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 4); - addCard(Constants.Zone.HAND, playerA, "Grounded", 2); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 4); + addCard(Zone.HAND, playerA, "Grounded", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Air Elemental"); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Air Elemental"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Grounded", "Elite Vanguard"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Grounded", "Air Elemental"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Grounded", "Elite Vanguard"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Grounded", "Air Elemental"); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); @@ -45,16 +46,16 @@ public class LoseAbilityTest extends CardTestPlayerBase { */ @Test public void testLoseVsGainAbility() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Air Elemental"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 2); - addCard(Constants.Zone.HAND, playerA, "Grounded"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 6); - addCard(Constants.Zone.HAND, playerA, "Drake Umbra"); + addCard(Zone.BATTLEFIELD, playerA, "Air Elemental"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 2); + addCard(Zone.HAND, playerA, "Grounded"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 6); + addCard(Zone.HAND, playerA, "Drake Umbra"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Grounded", "Air Elemental"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Drake Umbra", "Air Elemental"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Grounded", "Air Elemental"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Drake Umbra", "Air Elemental"); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); @@ -73,17 +74,17 @@ public class LoseAbilityTest extends CardTestPlayerBase { */ @Test public void testMultiGainVsLoseAbility() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Air Elemental"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 10); - addCard(Constants.Zone.HAND, playerA, "Grounded"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 10); - addCard(Constants.Zone.HAND, playerA, "Drake Umbra", 2); + addCard(Zone.BATTLEFIELD, playerA, "Air Elemental"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 10); + addCard(Zone.HAND, playerA, "Grounded"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 10); + addCard(Zone.HAND, playerA, "Drake Umbra", 2); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Drake Umbra", "Air Elemental"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Drake Umbra", "Air Elemental"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Grounded", "Air Elemental"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Drake Umbra", "Air Elemental"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Drake Umbra", "Air Elemental"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Grounded", "Air Elemental"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -101,17 +102,17 @@ public class LoseAbilityTest extends CardTestPlayerBase { */ @Test public void testMultiGainTriggeredVsLoseAbility() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Sublime Archangel",2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Silvercoat Lion"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 3); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 3); - addCard(Constants.Zone.HAND, playerA, "Turn to Frog"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Island", 5); + addCard(Zone.BATTLEFIELD, playerA, "Sublime Archangel",2); + addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 3); + addCard(Zone.BATTLEFIELD, playerA, "Island", 3); + addCard(Zone.HAND, playerA, "Turn to Frog"); + addCard(Zone.BATTLEFIELD, playerB, "Island", 5); - castSpell(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Turn to Frog", "Sublime Archangel"); + castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Turn to Frog", "Sublime Archangel"); attack(3, playerA, "Silvercoat Lion"); - setStopAt(3, Constants.PhaseStep.END_COMBAT); + setStopAt(3, PhaseStep.END_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/SecondGuessTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/SecondGuessTest.java index 69b32ad9bed..583976c74b5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/SecondGuessTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/SecondGuessTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.abilities.oneshot.counterspell; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,15 +13,15 @@ public class SecondGuessTest extends CardTestPlayerBase { @Test public void testCounterFirstSpell() { - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 2); - addCard(Constants.Zone.HAND, playerA, "Second Guess"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1); + addCard(Zone.BATTLEFIELD, playerA, "Island", 2); + addCard(Zone.HAND, playerA, "Second Guess"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Second Guess", "Lightning Bolt"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Second Guess", "Lightning Bolt"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); @@ -31,17 +32,17 @@ public class SecondGuessTest extends CardTestPlayerBase { @Test public void testCounterSecondSpell() { - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt", 1); - addCard(Constants.Zone.HAND, playerA, "Shock", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 2); - addCard(Constants.Zone.HAND, playerA, "Second Guess"); + addCard(Zone.HAND, playerA, "Lightning Bolt", 1); + addCard(Zone.HAND, playerA, "Shock", 1); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 2); + addCard(Zone.BATTLEFIELD, playerA, "Island", 2); + addCard(Zone.HAND, playerA, "Second Guess"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Shock", playerB); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Second Guess", "Lightning Bolt"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Shock", playerB); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Second Guess", "Lightning Bolt"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); @@ -53,18 +54,18 @@ public class SecondGuessTest extends CardTestPlayerBase { @Test public void testCounterThirdSpell() { - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt", 2); - addCard(Constants.Zone.HAND, playerA, "Shock", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 3); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 2); - addCard(Constants.Zone.HAND, playerA, "Second Guess"); + addCard(Zone.HAND, playerA, "Lightning Bolt", 2); + addCard(Zone.HAND, playerA, "Shock", 1); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3); + addCard(Zone.BATTLEFIELD, playerA, "Island", 2); + addCard(Zone.HAND, playerA, "Second Guess"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Shock", playerB); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Second Guess", "Shock"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Shock", playerB); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Second Guess", "Shock"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); @@ -79,19 +80,19 @@ public class SecondGuessTest extends CardTestPlayerBase { */ @Test public void testOverallCount() { - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 2); - addCard(Constants.Zone.HAND, playerA, "Second Guess"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 2); + addCard(Zone.HAND, playerA, "Second Guess"); - addCard(Constants.Zone.HAND, playerB, "Shock"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Mountain"); + addCard(Zone.HAND, playerB, "Shock"); + addCard(Zone.BATTLEFIELD, playerB, "Mountain"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerB, "Shock", playerA); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Second Guess", "Shock"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Shock", playerA); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Second Guess", "Shock"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/LightningBoltTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/LightningBoltTest.java index aaaefe64cc0..a03d66c4cb7 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/LightningBoltTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/LightningBoltTest.java @@ -1,7 +1,7 @@ package org.mage.test.cards.abilities.oneshot.damage; -import mage.Constants; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,12 +12,12 @@ public class LightningBoltTest extends CardTestPlayerBase { @Test public void testDamageOpponent() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); assertLife(playerB, 17); @@ -25,12 +25,12 @@ public class LightningBoltTest extends CardTestPlayerBase { @Test public void testDamageSelf() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerA); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 17); assertLife(playerB, 20); @@ -38,42 +38,42 @@ public class LightningBoltTest extends CardTestPlayerBase { @Test public void testDamageSmallCreature() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Sejiri Merfolk"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerB, "Sejiri Merfolk"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Sejiri Merfolk"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerB, "Sejiri Merfolk", 0); } @Test public void testDamageBigCreature() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerB, "Craw Wurm"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Craw Wurm"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerB, "Craw Wurm", 1); } @Test public void testDamageBigCreatureTwice() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerB, "Craw Wurm"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Craw Wurm"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Craw Wurm"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerB, "Craw Wurm", 0); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/PsionicBlastTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/PsionicBlastTest.java index 7bb5c7dfb42..14c411a1bc9 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/PsionicBlastTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/PsionicBlastTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.abilities.oneshot.damage; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -11,13 +12,13 @@ public class PsionicBlastTest extends CardTestPlayerBase { @Test public void testDamageInPlayer() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island"); - addCard(Constants.Zone.HAND, playerA, "Psionic Blast"); + addCard(Zone.BATTLEFIELD, playerA, "Island"); + addCard(Zone.BATTLEFIELD, playerA, "Island"); + addCard(Zone.BATTLEFIELD, playerA, "Island"); + addCard(Zone.HAND, playerA, "Psionic Blast"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA ,"Psionic Blast"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA ,"Psionic Blast"); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 18); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/SpitefulShadowsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/SpitefulShadowsTest.java index 50949bde3a9..fd45afbe5d6 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/SpitefulShadowsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/SpitefulShadowsTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.abilities.oneshot.damage; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.counters.CounterType; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -16,16 +17,16 @@ public class SpitefulShadowsTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Glistener Elf"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 2); - addCard(Constants.Zone.HAND, playerA, "Spiteful Shadows"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Glistener Elf"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 2); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 2); + addCard(Zone.HAND, playerA, "Spiteful Shadows"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Spiteful Shadows", "Glistener Elf"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "Glistener Elf"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Spiteful Shadows", "Glistener Elf"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "Glistener Elf"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); @@ -35,16 +36,16 @@ public class SpitefulShadowsTest extends CardTestPlayerBase { @Test public void testCard1() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Craw Wurm"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 2); - addCard(Constants.Zone.HAND, playerA, "Spiteful Shadows"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 2); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 2); + addCard(Zone.HAND, playerA, "Spiteful Shadows"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Spiteful Shadows", "Craw Wurm"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "Craw Wurm"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Spiteful Shadows", "Craw Wurm"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "Craw Wurm"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerA, 17); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/HideousEndTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/HideousEndTest.java index 7411c980931..805884ff7a3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/HideousEndTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/HideousEndTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.abilities.oneshot.destroy; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Ignore; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -9,15 +10,15 @@ public class HideousEndTest extends CardTestPlayerBase { @Test public void testWithValidTarget() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); - addCard(Constants.Zone.HAND, playerA, "Hideous End"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Copper Myr"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp"); + addCard(Zone.HAND, playerA, "Hideous End"); + addCard(Zone.BATTLEFIELD, playerB, "Copper Myr"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Hideous End", "Copper Myr"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Hideous End", "Copper Myr"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerB, "Copper Myr", 0); @@ -26,15 +27,15 @@ public class HideousEndTest extends CardTestPlayerBase { @Test public void testWithInvalidTarget() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); - addCard(Constants.Zone.HAND, playerA, "Hideous End"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Zombie Goliath"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp"); + addCard(Zone.HAND, playerA, "Hideous End"); + addCard(Zone.BATTLEFIELD, playerB, "Zombie Goliath"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Hideous End", "Zombie Goliath"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Hideous End", "Zombie Goliath"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerB, "Zombie Goliath", 1); @@ -44,18 +45,18 @@ public class HideousEndTest extends CardTestPlayerBase { @Test @Ignore public void testWithPossibleProtection() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); - addCard(Constants.Zone.HAND, playerA, "Hideous End"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Plains"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Plains"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Copper Myr"); - addCard(Constants.Zone.HAND, playerB, "Apostle's Blessing"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp"); + addCard(Zone.HAND, playerA, "Hideous End"); + addCard(Zone.BATTLEFIELD, playerB, "Plains"); + addCard(Zone.BATTLEFIELD, playerB, "Plains"); + addCard(Zone.BATTLEFIELD, playerB, "Copper Myr"); + addCard(Zone.HAND, playerB, "Apostle's Blessing"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Hideous End", "Copper Myr"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Hideous End", "Copper Myr"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerB, "Copper Myr", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/LeaveNoTraceTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/LeaveNoTraceTest.java index f36f4da0fdc..9f72886f5af 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/LeaveNoTraceTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/LeaveNoTraceTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.abilities.oneshot.destroy; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -11,17 +12,17 @@ public class LeaveNoTraceTest extends CardTestPlayerBase { @Test public void testDestroy() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains"); - addCard(Constants.Zone.HAND, playerA, "Leave No Trace"); + addCard(Zone.BATTLEFIELD, playerA, "Plains"); + addCard(Zone.BATTLEFIELD, playerA, "Plains"); + addCard(Zone.HAND, playerA, "Leave No Trace"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Asceticism"); // Green - addCard(Constants.Zone.BATTLEFIELD, playerB, "Awakening Zone"); // Green - addCard(Constants.Zone.BATTLEFIELD, playerB, "Back from the Brink"); // Blue + addCard(Zone.BATTLEFIELD, playerB, "Asceticism"); // Green + addCard(Zone.BATTLEFIELD, playerB, "Awakening Zone"); // Green + addCard(Zone.BATTLEFIELD, playerB, "Back from the Brink"); // Blue - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Leave No Trace", "Asceticism"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Leave No Trace", "Asceticism"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerB, "Asceticism", 0); assertPermanentCount(playerB, "Awakening Zone", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/regenerate/NecrobiteRegenerateTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/regenerate/NecrobiteRegenerateTest.java index d2d0fe045bc..0661879f33d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/regenerate/NecrobiteRegenerateTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/regenerate/NecrobiteRegenerateTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.abilities.oneshot.regenerate; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.game.permanent.Permanent; import org.junit.Assert; import org.junit.Test; @@ -14,17 +15,17 @@ public class NecrobiteRegenerateTest extends CardTestPlayerBase { @Test public void testRegenerateAndDeathtouch() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerA, "Craw Wurm"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Elite Vanguard"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Swamp", 3); - addCard(Constants.Zone.HAND, playerB, "Necrobite"); + addCard(Zone.BATTLEFIELD, playerB, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerB, "Swamp", 3); + addCard(Zone.HAND, playerB, "Necrobite"); attack(2, playerB, "Elite Vanguard"); block(2, playerA, "Craw Wurm", "Elite Vanguard"); - castSpell(2, Constants.PhaseStep.DECLARE_BLOCKERS, playerB, "Necrobite", "Elite Vanguard"); + castSpell(2, PhaseStep.DECLARE_BLOCKERS, playerB, "Necrobite", "Elite Vanguard"); - setStopAt(2, Constants.PhaseStep.POSTCOMBAT_MAIN); + setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/sacrifice/BarterInBloodTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/sacrifice/BarterInBloodTest.java index 46d596899e0..1e14106532f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/sacrifice/BarterInBloodTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/sacrifice/BarterInBloodTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.abilities.oneshot.sacrifice; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -14,20 +15,20 @@ public class BarterInBloodTest extends CardTestPlayerBase { */ @Test public void testSacrifice() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 4); - addCard(Constants.Zone.HAND, playerA, "Barter in Blood"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 4); + addCard(Zone.HAND, playerA, "Barter in Blood"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Memnite"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Royal Assassin"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Sengir Vampire"); + addCard(Zone.BATTLEFIELD, playerA, "Memnite"); + addCard(Zone.BATTLEFIELD, playerA, "Royal Assassin"); + addCard(Zone.BATTLEFIELD, playerA, "Sengir Vampire"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Island"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Flowering Lumberknot"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Moorland Inquisitor"); + addCard(Zone.BATTLEFIELD, playerB, "Island"); + addCard(Zone.BATTLEFIELD, playerB, "Flowering Lumberknot"); + addCard(Zone.BATTLEFIELD, playerB, "Moorland Inquisitor"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Barter in Blood"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Barter in Blood"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerA, 5); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/sacrifice/GethsVerdictTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/sacrifice/GethsVerdictTest.java index d443d69b644..2c489f7b5b0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/sacrifice/GethsVerdictTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/sacrifice/GethsVerdictTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.abilities.oneshot.sacrifice; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -14,13 +15,13 @@ public class GethsVerdictTest extends CardTestPlayerBase { */ @Test public void testVersusProtectionFromBlack() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); - addCard(Constants.Zone.HAND, playerA, "Geth's Verdict"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "White Knight"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp"); + addCard(Zone.HAND, playerA, "Geth's Verdict"); + addCard(Zone.BATTLEFIELD, playerB, "White Knight"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Geth's Verdict"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Geth's Verdict"); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerB, "White Knight", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/sacrifice/MorticianBeetleTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/sacrifice/MorticianBeetleTest.java index 0e2df9898c3..6ce8bb7f03c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/sacrifice/MorticianBeetleTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/sacrifice/MorticianBeetleTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.abilities.oneshot.sacrifice; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -14,19 +15,19 @@ public class MorticianBeetleTest extends CardTestPlayerBase { */ @Test public void testSacrifice() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 4); - addCard(Constants.Zone.HAND, playerA, "Cruel Edict"); - addCard(Constants.Zone.HAND, playerA, "Geth's Verdict"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mortician Beetle"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 4); + addCard(Zone.HAND, playerA, "Cruel Edict"); + addCard(Zone.HAND, playerA, "Geth's Verdict"); + addCard(Zone.BATTLEFIELD, playerA, "Mortician Beetle"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Savannah Lions"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Sigiled Paladin"); + addCard(Zone.BATTLEFIELD, playerB, "Savannah Lions"); + addCard(Zone.BATTLEFIELD, playerB, "Sigiled Paladin"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Cruel Edict"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Geth's Verdict"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cruel Edict"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Geth's Verdict"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerB, 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/AlchemistsRefugeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/AlchemistsRefugeTest.java index daa44ed12e1..2d152d0634d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/AlchemistsRefugeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/AlchemistsRefugeTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.asthough; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -14,16 +15,16 @@ public class AlchemistsRefugeTest extends CardTestPlayerBase { @Test public void testCastAsThoughHasFlash() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Alchemist's Refuge"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains"); - addCard(Constants.Zone.HAND, playerA, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Alchemist's Refuge"); + addCard(Zone.BATTLEFIELD, playerA, "Forest"); + addCard(Zone.BATTLEFIELD, playerA, "Island"); + addCard(Zone.BATTLEFIELD, playerA, "Plains"); + addCard(Zone.HAND, playerA, "Elite Vanguard"); - activateAbility(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{G}{U}, {T}:"); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Vanguard"); + activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerA, "{G}{U}, {T}:"); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Vanguard"); - setStopAt(2, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -36,15 +37,15 @@ public class AlchemistsRefugeTest extends CardTestPlayerBase { */ @Test public void testNoCastPossibleOnOpponentsTurn() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Alchemist's Refuge"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains"); - addCard(Constants.Zone.HAND, playerA, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Alchemist's Refuge"); + addCard(Zone.BATTLEFIELD, playerA, "Forest"); + addCard(Zone.BATTLEFIELD, playerA, "Island"); + addCard(Zone.BATTLEFIELD, playerA, "Plains"); + addCard(Zone.HAND, playerA, "Elite Vanguard"); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Vanguard"); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Vanguard"); - setStopAt(2, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -59,16 +60,16 @@ public class AlchemistsRefugeTest extends CardTestPlayerBase { */ @Test public void testEffectOnlyForOneTurn() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Alchemist's Refuge"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains"); - addCard(Constants.Zone.HAND, playerA, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Alchemist's Refuge"); + addCard(Zone.BATTLEFIELD, playerA, "Forest"); + addCard(Zone.BATTLEFIELD, playerA, "Island"); + addCard(Zone.BATTLEFIELD, playerA, "Plains"); + addCard(Zone.HAND, playerA, "Elite Vanguard"); - activateAbility(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{G}{U}, {T}:"); - castSpell(4, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Vanguard"); + activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerA, "{G}{U}, {T}:"); + castSpell(4, PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Vanguard"); - setStopAt(4, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(4, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/YevaNaturesHeraldTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/YevaNaturesHeraldTest.java index 444c2b31716..d39ad016992 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/YevaNaturesHeraldTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/YevaNaturesHeraldTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.asthough; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -14,13 +15,13 @@ public class YevaNaturesHeraldTest extends CardTestPlayerBase { @Test public void testOnBattlefield() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Yeva, Nature's Herald"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest"); - addCard(Constants.Zone.HAND, playerA, "Llanowar Elves"); + addCard(Zone.BATTLEFIELD, playerA, "Yeva, Nature's Herald"); + addCard(Zone.BATTLEFIELD, playerA, "Forest"); + addCard(Zone.HAND, playerA, "Llanowar Elves"); - castSpell(1, Constants.PhaseStep.BEGIN_COMBAT, playerA, "Llanowar Elves"); + castSpell(1, PhaseStep.BEGIN_COMBAT, playerA, "Llanowar Elves"); - setStopAt(1, Constants.PhaseStep.END_COMBAT); + setStopAt(1, PhaseStep.END_COMBAT); execute(); assertPermanentCount(playerA, "Llanowar Elves", 1); @@ -28,13 +29,13 @@ public class YevaNaturesHeraldTest extends CardTestPlayerBase { @Test public void testNonGreen() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Yeva, Nature's Herald"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains"); - addCard(Constants.Zone.HAND, playerA, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Yeva, Nature's Herald"); + addCard(Zone.BATTLEFIELD, playerA, "Plains"); + addCard(Zone.HAND, playerA, "Elite Vanguard"); - castSpell(1, Constants.PhaseStep.BEGIN_COMBAT, playerA, "Elite Vanguard"); + castSpell(1, PhaseStep.BEGIN_COMBAT, playerA, "Elite Vanguard"); - setStopAt(1, Constants.PhaseStep.END_COMBAT); + setStopAt(1, PhaseStep.END_COMBAT); execute(); assertPermanentCount(playerA, "Elite Vanguard", 0); @@ -42,15 +43,15 @@ public class YevaNaturesHeraldTest extends CardTestPlayerBase { @Test public void testOtherZones() { - addCard(Constants.Zone.GRAVEYARD, playerA, "Yeva, Nature's Herald"); - addCard(Constants.Zone.LIBRARY, playerA, "Yeva, Nature's Herald"); - addCard(Constants.Zone.HAND, playerA, "Yeva, Nature's Herald"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest"); - addCard(Constants.Zone.HAND, playerA, "Llanowar Elves"); + addCard(Zone.GRAVEYARD, playerA, "Yeva, Nature's Herald"); + addCard(Zone.LIBRARY, playerA, "Yeva, Nature's Herald"); + addCard(Zone.HAND, playerA, "Yeva, Nature's Herald"); + addCard(Zone.BATTLEFIELD, playerA, "Forest"); + addCard(Zone.HAND, playerA, "Llanowar Elves"); - castSpell(1, Constants.PhaseStep.BEGIN_COMBAT, playerA, "Llanowar Elves"); + castSpell(1, PhaseStep.BEGIN_COMBAT, playerA, "Llanowar Elves"); - setStopAt(1, Constants.PhaseStep.END_COMBAT); + setStopAt(1, PhaseStep.END_COMBAT); execute(); assertPermanentCount(playerA, "Llanowar Elves", 0); @@ -58,16 +59,16 @@ public class YevaNaturesHeraldTest extends CardTestPlayerBase { @Test public void testEffectGetRemovedOnExile() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Yeva, Nature's Herald"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains"); - addCard(Constants.Zone.HAND, playerA, "Llanowar Elves"); - addCard(Constants.Zone.HAND, playerA, "Path to Exile"); + addCard(Zone.BATTLEFIELD, playerA, "Yeva, Nature's Herald"); + addCard(Zone.BATTLEFIELD, playerA, "Forest"); + addCard(Zone.BATTLEFIELD, playerA, "Plains"); + addCard(Zone.HAND, playerA, "Llanowar Elves"); + addCard(Zone.HAND, playerA, "Path to Exile"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Path to Exile", "Yeva, Nature's Herald"); - castSpell(1, Constants.PhaseStep.BEGIN_COMBAT, playerA, "Llanowar Elves"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Path to Exile", "Yeva, Nature's Herald"); + castSpell(1, PhaseStep.BEGIN_COMBAT, playerA, "Llanowar Elves"); - setStopAt(1, Constants.PhaseStep.END_COMBAT); + setStopAt(1, PhaseStep.END_COMBAT); execute(); assertPermanentCount(playerA, "Llanowar Elves", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/JacesPhantasmTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/JacesPhantasmTest.java index 86de61125f6..c3e7d52c785 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/JacesPhantasmTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/JacesPhantasmTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.conditional; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -11,12 +12,12 @@ public class JacesPhantasmTest extends CardTestPlayerBase { @Test public void testNoBoost() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island"); - addCard(Constants.Zone.HAND, playerA, "Jace's Phantasm"); + addCard(Zone.BATTLEFIELD, playerA, "Island"); + addCard(Zone.HAND, playerA, "Jace's Phantasm"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Jace's Phantasm"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Jace's Phantasm"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPowerToughness(playerA, "Jace's Phantasm", 1, 1); @@ -24,16 +25,16 @@ public class JacesPhantasmTest extends CardTestPlayerBase { @Test public void testWithBoost() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 7); - addCard(Constants.Zone.HAND, playerA, "Jace's Phantasm"); - addCard(Constants.Zone.HAND, playerA, "Mind Sculpt", 3); + addCard(Zone.BATTLEFIELD, playerA, "Island", 7); + addCard(Zone.HAND, playerA, "Jace's Phantasm"); + addCard(Zone.HAND, playerA, "Mind Sculpt", 3); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Mind Sculpt", playerB); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Mind Sculpt", playerB); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Mind Sculpt", playerA); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Jace's Phantasm"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mind Sculpt", playerB); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mind Sculpt", playerB); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mind Sculpt", playerA); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Jace's Phantasm"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertPowerToughness(playerA, "Jace's Phantasm", 5, 5); @@ -41,16 +42,16 @@ public class JacesPhantasmTest extends CardTestPlayerBase { @Test public void testWithBoost2() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 7); - addCard(Constants.Zone.HAND, playerA, "Jace's Phantasm"); - addCard(Constants.Zone.HAND, playerA, "Mind Sculpt", 3); + addCard(Zone.BATTLEFIELD, playerA, "Island", 7); + addCard(Zone.HAND, playerA, "Jace's Phantasm"); + addCard(Zone.HAND, playerA, "Mind Sculpt", 3); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Jace's Phantasm"); - castSpell(3, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Mind Sculpt", playerB); - castSpell(3, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Mind Sculpt", playerB); - castSpell(3, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Mind Sculpt", playerA); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Jace's Phantasm"); + castSpell(3, PhaseStep.POSTCOMBAT_MAIN, playerA, "Mind Sculpt", playerB); + castSpell(3, PhaseStep.POSTCOMBAT_MAIN, playerA, "Mind Sculpt", playerB); + castSpell(3, PhaseStep.POSTCOMBAT_MAIN, playerA, "Mind Sculpt", playerA); - setStopAt(3, Constants.PhaseStep.END_TURN); + setStopAt(3, PhaseStep.END_TURN); execute(); assertGraveyardCount(playerB, 14); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/MulDayaChannelersTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/MulDayaChannelersTest.java index 8ed307be802..f854a43b38d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/MulDayaChannelersTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/MulDayaChannelersTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.conditional; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.filter.Filter; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,15 +13,15 @@ public class MulDayaChannelersTest extends CardTestPlayerBase { @Test public void testBoostFromTopCreatureCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 3); - addCard(Constants.Zone.HAND, playerA, "Mul Daya Channelers"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 3); + addCard(Zone.HAND, playerA, "Mul Daya Channelers"); - addCard(Constants.Zone.LIBRARY, playerA, "Memnite"); + addCard(Zone.LIBRARY, playerA, "Memnite"); skipInitShuffling(); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Mul Daya Channelers"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mul Daya Channelers"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -31,13 +32,13 @@ public class MulDayaChannelersTest extends CardTestPlayerBase { @Test public void testNoBoostFromTopNonCreatureCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 3); - addCard(Constants.Zone.HAND, playerA, "Mul Daya Channelers"); - addCard(Constants.Zone.LIBRARY, playerA, "Shock"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 3); + addCard(Zone.HAND, playerA, "Mul Daya Channelers"); + addCard(Zone.LIBRARY, playerA, "Shock"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Mul Daya Channelers"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mul Daya Channelers"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -48,16 +49,16 @@ public class MulDayaChannelersTest extends CardTestPlayerBase { @Test public void testBoostLossThroughPhases() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 3); - addCard(Constants.Zone.HAND, playerA, "Mul Daya Channelers"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 3); + addCard(Zone.HAND, playerA, "Mul Daya Channelers"); - addCard(Constants.Zone.LIBRARY, playerA, "Shock"); - addCard(Constants.Zone.LIBRARY, playerA, "Memnite"); + addCard(Zone.LIBRARY, playerA, "Shock"); + addCard(Zone.LIBRARY, playerA, "Memnite"); skipInitShuffling(); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Mul Daya Channelers"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mul Daya Channelers"); - setStopAt(3, Constants.PhaseStep.PRECOMBAT_MAIN); + setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/RootwaterMatriarchTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/RootwaterMatriarchTest.java index c40713ed938..7f74e563818 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/RootwaterMatriarchTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/RootwaterMatriarchTest.java @@ -4,7 +4,8 @@ */ package org.mage.test.cards.conditional; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -17,12 +18,12 @@ public class RootwaterMatriarchTest extends CardTestPlayerBase { @Test public void testTargetFail() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Rootwater Matriarch"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Memnite"); + addCard(Zone.BATTLEFIELD, playerA, "Rootwater Matriarch"); + addCard(Zone.BATTLEFIELD, playerB, "Memnite"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Gain control of target creature for as long as that creature is enchanted.", "Memnite"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Gain control of target creature for as long as that creature is enchanted.", "Memnite"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerA, "Rootwater Matriarch", 1); @@ -32,17 +33,17 @@ public class RootwaterMatriarchTest extends CardTestPlayerBase { @Test public void testTargetSuccess() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Rootwater Matriarch"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Memnite"); + addCard(Zone.BATTLEFIELD, playerA, "Rootwater Matriarch"); + addCard(Zone.BATTLEFIELD, playerA, "Island"); + addCard(Zone.BATTLEFIELD, playerB, "Memnite"); - addCard(Constants.Zone.HAND, playerA, "Flight"); + addCard(Zone.HAND, playerA, "Flight"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Flight", "Memnite"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Flight", "Memnite"); - activateAbility(1, Constants.PhaseStep.BEGIN_COMBAT, playerA, "{T}: Gain control of target creature for as long as that creature is enchanted.", "Memnite"); + activateAbility(1, PhaseStep.BEGIN_COMBAT, playerA, "{T}: Gain control of target creature for as long as that creature is enchanted.", "Memnite"); - setStopAt(1, Constants.PhaseStep.END_COMBAT); + setStopAt(1, PhaseStep.END_COMBAT); execute(); assertPermanentCount(playerA, "Rootwater Matriarch", 1); @@ -53,19 +54,19 @@ public class RootwaterMatriarchTest extends CardTestPlayerBase { @Test public void testGainControlEnchantedTargetAndRWLeavesPlay() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Rootwater Matriarch"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 2); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Memnite"); - addCard(Constants.Zone.HAND, playerA, "Unsummon"); - addCard(Constants.Zone.HAND, playerA, "Flight"); + addCard(Zone.BATTLEFIELD, playerA, "Rootwater Matriarch"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 2); + addCard(Zone.BATTLEFIELD, playerB, "Memnite"); + addCard(Zone.HAND, playerA, "Unsummon"); + addCard(Zone.HAND, playerA, "Flight"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Flight", "Memnite"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Flight", "Memnite"); - activateAbility(1, Constants.PhaseStep.BEGIN_COMBAT, playerA, "{T}: Gain control of target creature for as long as that creature is enchanted.", "Memnite"); + activateAbility(1, PhaseStep.BEGIN_COMBAT, playerA, "{T}: Gain control of target creature for as long as that creature is enchanted.", "Memnite"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Unsummon", "Rootwater Matriarch"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Unsummon", "Rootwater Matriarch"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertPermanentCount(playerA, "Rootwater Matriarch", 0); @@ -75,20 +76,20 @@ public class RootwaterMatriarchTest extends CardTestPlayerBase { @Test public void testGainControlEnchantedTargetAndAuraIsDisenchanted() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Rootwater Matriarch"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 2); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Memnite"); - addCard(Constants.Zone.HAND, playerA, "Disenchant"); - addCard(Constants.Zone.HAND, playerA, "Flight"); + addCard(Zone.BATTLEFIELD, playerA, "Rootwater Matriarch"); + addCard(Zone.BATTLEFIELD, playerA, "Island"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 2); + addCard(Zone.BATTLEFIELD, playerB, "Memnite"); + addCard(Zone.HAND, playerA, "Disenchant"); + addCard(Zone.HAND, playerA, "Flight"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Flight", "Memnite"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Flight", "Memnite"); - activateAbility(1, Constants.PhaseStep.BEGIN_COMBAT, playerA, "{T}: Gain control of target creature for as long as that creature is enchanted.", "Memnite"); + activateAbility(1, PhaseStep.BEGIN_COMBAT, playerA, "{T}: Gain control of target creature for as long as that creature is enchanted.", "Memnite"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Disenchant", "Flight"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Disenchant", "Flight"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertPermanentCount(playerA, "Rootwater Matriarch", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/SejiriMerfolkTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/SejiriMerfolkTest.java index baea0a5f206..18da4e3e0ca 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/SejiriMerfolkTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/SejiriMerfolkTest.java @@ -1,9 +1,10 @@ package org.mage.test.cards.conditional; import junit.framework.Assert; -import mage.Constants; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.LifelinkAbility; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.game.permanent.Permanent; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -15,9 +16,9 @@ public class SejiriMerfolkTest extends CardTestPlayerBase { @Test public void testWithoutPlains() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Sejiri Merfolk"); + addCard(Zone.BATTLEFIELD, playerA, "Sejiri Merfolk"); - setStopAt(1, Constants.PhaseStep.DRAW); + setStopAt(1, PhaseStep.DRAW); execute(); Permanent merfolk = getPermanent("Sejiri Merfolk", playerA.getId()); @@ -28,10 +29,10 @@ public class SejiriMerfolkTest extends CardTestPlayerBase { @Test public void testWithPlains() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Sejiri Merfolk"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains"); + addCard(Zone.BATTLEFIELD, playerA, "Sejiri Merfolk"); + addCard(Zone.BATTLEFIELD, playerA, "Plains"); - setStopAt(1, Constants.PhaseStep.DRAW); + setStopAt(1, PhaseStep.DRAW); execute(); Permanent merfolk = getPermanent("Sejiri Merfolk", playerA.getId()); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/TragicSlipTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/TragicSlipTest.java index 9388a3a494b..77741d2ca40 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/TragicSlipTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/TragicSlipTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.conditional; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -15,17 +16,17 @@ public class TragicSlipTest extends CardTestPlayerBase { @Test public void testNoCreatureDied() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp"); // Tragic Slip - Instant, B - Target creature gets -1/-1 until end of turn. // Morbid — That creature gets -13/-13 until end of turn instead if a creature died this turn. - addCard(Constants.Zone.HAND, playerA, "Tragic Slip"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Silvercoat Lion"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Pillarfield Ox"); + addCard(Zone.HAND, playerA, "Tragic Slip"); + addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion"); + addCard(Zone.BATTLEFIELD, playerA, "Pillarfield Ox"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Tragic Slip", "Pillarfield Ox"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Tragic Slip", "Pillarfield Ox"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPowerToughness(playerA, "Pillarfield Ox", 1, 3); @@ -33,22 +34,22 @@ public class TragicSlipTest extends CardTestPlayerBase { @Test public void testCreatureDiedAfter() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 2); + addCard(Zone.BATTLEFIELD, playerA, "Swamp"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 2); // Tragic Slip - Instant, B - Target creature gets -1/-1 until end of turn. // Morbid — That creature gets -13/-13 until end of turn instead if a creature died this turn. - addCard(Constants.Zone.HAND, playerA, "Tragic Slip"); + addCard(Zone.HAND, playerA, "Tragic Slip"); // Searing Spear - Instant, 1R - Searing Spear deals 3 damage to target creature or player. - addCard(Constants.Zone.HAND, playerA, "Searing Spear"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Silvercoat Lion"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Pillarfield Ox"); + addCard(Zone.HAND, playerA, "Searing Spear"); + addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion"); + addCard(Zone.BATTLEFIELD, playerA, "Pillarfield Ox"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Tragic Slip", "Pillarfield Ox"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Tragic Slip", "Pillarfield Ox"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Searing Spear", "Silvercoat Lion"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Searing Spear", "Silvercoat Lion"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertPowerToughness(playerA, "Pillarfield Ox", 1, 3); @@ -56,22 +57,22 @@ public class TragicSlipTest extends CardTestPlayerBase { @Test public void testCreatureDiedBefore() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 3); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 2); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 3); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 2); // Tragic Slip - Instant, B - Target creature gets -1/-1 until end of turn. // Morbid — That creature gets -13/-13 until end of turn instead if a creature died this turn. - addCard(Constants.Zone.HAND, playerA, "Tragic Slip"); + addCard(Zone.HAND, playerA, "Tragic Slip"); // Searing Spear - Instant, 1R - Searing Spear deals 3 damage to target creature or player. - addCard(Constants.Zone.HAND, playerA, "Searing Spear"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Silvercoat Lion"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Pillarfield Ox"); + addCard(Zone.HAND, playerA, "Searing Spear"); + addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion"); + addCard(Zone.BATTLEFIELD, playerA, "Pillarfield Ox"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Searing Spear", "Silvercoat Lion"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Searing Spear", "Silvercoat Lion"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Tragic Slip", "Pillarfield Ox"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Tragic Slip", "Pillarfield Ox"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertPermanentCount(playerA, "Silvercoat Lion", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/twofaced/TwoFacedCardEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/twofaced/TwoFacedCardEffectsTest.java index 7cff08be862..85752f1a14b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/twofaced/TwoFacedCardEffectsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/twofaced/TwoFacedCardEffectsTest.java @@ -1,7 +1,8 @@ package org.mage.test.cards.conditional.twofaced; import junit.framework.Assert; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.filter.Filter; import mage.game.permanent.Permanent; import org.junit.Test; @@ -17,11 +18,11 @@ public class TwoFacedCardEffectsTest extends CardTestPlayerBase { */ @Test public void testEffectTurnedOffOnTransform() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mayor of Avabruck"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Wolfir Avenger"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Inquisitor"); + addCard(Zone.BATTLEFIELD, playerA, "Mayor of Avabruck"); + addCard(Zone.BATTLEFIELD, playerA, "Wolfir Avenger"); + addCard(Zone.BATTLEFIELD, playerA, "Elite Inquisitor"); - setStopAt(2, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); // check was transformed @@ -41,16 +42,16 @@ public class TwoFacedCardEffectsTest extends CardTestPlayerBase { */ @Test public void testCopyCardWithTransform() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 2); - addCard(Constants.Zone.HAND, playerA, "Mayor of Avabruck"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Island", 4); - addCard(Constants.Zone.HAND, playerB, "Clone"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 2); + addCard(Zone.HAND, playerA, "Mayor of Avabruck"); + addCard(Zone.BATTLEFIELD, playerB, "Island", 4); + addCard(Zone.HAND, playerB, "Clone"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Mayor of Avabruck"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mayor of Avabruck"); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Clone"); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Clone"); - setStopAt(2, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); assertHandCount(playerA, 0); @@ -65,16 +66,16 @@ public class TwoFacedCardEffectsTest extends CardTestPlayerBase { */ @Test public void testCopyCantTransform() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 2); - addCard(Constants.Zone.HAND, playerA, "Mayor of Avabruck"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Island", 4); - addCard(Constants.Zone.HAND, playerB, "Clone"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 2); + addCard(Zone.HAND, playerA, "Mayor of Avabruck"); + addCard(Zone.BATTLEFIELD, playerB, "Island", 4); + addCard(Zone.HAND, playerB, "Clone"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Mayor of Avabruck"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mayor of Avabruck"); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Clone"); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Clone"); - setStopAt(5, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(5, PhaseStep.BEGIN_COMBAT); execute(); assertHandCount(playerA, 2); @@ -91,14 +92,14 @@ public class TwoFacedCardEffectsTest extends CardTestPlayerBase { */ @Test public void testCopyAlreadyTransformedCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mayor of Avabruck"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Island", 4); - addCard(Constants.Zone.HAND, playerB, "Clone"); + addCard(Zone.BATTLEFIELD, playerA, "Mayor of Avabruck"); + addCard(Zone.BATTLEFIELD, playerB, "Island", 4); + addCard(Zone.HAND, playerB, "Clone"); // copy already transformed - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Clone"); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Clone"); - setStopAt(2, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); assertHandCount(playerA, 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/AngelOfJubilationTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/AngelOfJubilationTest.java index 8bec8bb0379..9becbc62b35 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/AngelOfJubilationTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/AngelOfJubilationTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.continuous; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -18,11 +19,11 @@ public class AngelOfJubilationTest extends CardTestPlayerBase { */ @Test public void testBoost() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Angel of Jubilation"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Devout Chaplain"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Corpse Traders"); + addCard(Zone.BATTLEFIELD, playerA, "Angel of Jubilation"); + addCard(Zone.BATTLEFIELD, playerA, "Devout Chaplain"); + addCard(Zone.BATTLEFIELD, playerA, "Corpse Traders"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -38,16 +39,16 @@ public class AngelOfJubilationTest extends CardTestPlayerBase { */ @Test public void testNoBoostOnBattlefieldLeave() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Angel of Jubilation"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Devout Chaplain"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Corpse Traders"); + addCard(Zone.BATTLEFIELD, playerA, "Angel of Jubilation"); + addCard(Zone.BATTLEFIELD, playerA, "Devout Chaplain"); + addCard(Zone.BATTLEFIELD, playerA, "Corpse Traders"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Angel of Jubilation"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Angel of Jubilation"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/AngelsTombTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/AngelsTombTest.java index 08439c48e5f..261d32eab5f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/AngelsTombTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/AngelsTombTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.continuous; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -15,21 +16,21 @@ public class AngelsTombTest extends CardTestPlayerBase { */ @Test public void testUnsummonToAnimatedArtifact() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 3); + addCard(Zone.BATTLEFIELD, playerA, "Forest"); + addCard(Zone.BATTLEFIELD, playerA, "Island"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 3); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Angel's Tomb"); + addCard(Zone.BATTLEFIELD, playerA, "Angel's Tomb"); - addCard(Constants.Zone.HAND, playerA, "Llanowar Elves"); - addCard(Constants.Zone.HAND, playerA, "Unsummon"); + addCard(Zone.HAND, playerA, "Llanowar Elves"); + addCard(Zone.HAND, playerA, "Unsummon"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Llanowar Elves"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Llanowar Elves"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Unsummon", "Angel's Tomb"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Angel's Tomb"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Unsummon", "Angel's Tomb"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Angel's Tomb"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertGraveyardCount(playerA, "Unsummon", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/DearlyDepartedTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/DearlyDepartedTest.java index fc85daab4d4..5df42b42abe 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/DearlyDepartedTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/DearlyDepartedTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.continuous; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -14,13 +15,13 @@ public class DearlyDepartedTest extends CardTestPlayerBase { */ @Test public void testDoesntWorkFromHand() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 1); - addCard(Constants.Zone.HAND, playerA, "Elite Vanguard"); - addCard(Constants.Zone.HAND, playerA, "Dearly Departed"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 1); + addCard(Zone.HAND, playerA, "Elite Vanguard"); + addCard(Zone.HAND, playerA, "Dearly Departed"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Vanguard"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Vanguard"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerA, "Elite Vanguard", 1); @@ -32,13 +33,13 @@ public class DearlyDepartedTest extends CardTestPlayerBase { */ @Test public void testInGraveyard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 1); - addCard(Constants.Zone.HAND, playerA, "Elite Vanguard"); - addCard(Constants.Zone.GRAVEYARD, playerA, "Dearly Departed"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 1); + addCard(Zone.HAND, playerA, "Elite Vanguard"); + addCard(Zone.GRAVEYARD, playerA, "Dearly Departed"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Vanguard"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Vanguard"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerA, "Elite Vanguard", 1); @@ -50,13 +51,13 @@ public class DearlyDepartedTest extends CardTestPlayerBase { */ @Test public void testInOpponentGraveyard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 1); - addCard(Constants.Zone.HAND, playerA, "Elite Vanguard"); - addCard(Constants.Zone.GRAVEYARD, playerB, "Dearly Departed"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 1); + addCard(Zone.HAND, playerA, "Elite Vanguard"); + addCard(Zone.GRAVEYARD, playerB, "Dearly Departed"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Vanguard"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Vanguard"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerA, "Elite Vanguard", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/EvernightShadeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/EvernightShadeTest.java index 66fbf0ef58e..fada03b1349 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/EvernightShadeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/EvernightShadeTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.continuous; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -14,16 +15,16 @@ public class EvernightShadeTest extends CardTestPlayerBase { */ @Test public void testBoostWithUndying() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 3); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Evernight Shade"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 3); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1); + addCard(Zone.BATTLEFIELD, playerA, "Evernight Shade"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{B}"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{B}"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "Evernight Shade"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{B}"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{B}"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "Evernight Shade"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertPowerToughness(playerA, "Evernight Shade", 2, 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/FavorableWindsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/FavorableWindsTest.java index 7c4462dc6db..5b2d45b3f7b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/FavorableWindsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/FavorableWindsTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.continuous; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.game.permanent.Permanent; import org.junit.Assert; import org.junit.Test; @@ -16,14 +17,14 @@ public class FavorableWindsTest extends CardTestPlayerBase { */ @Test public void testBoostForFlyingCreatures() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 4); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Favorable Winds", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Merfolk Looter", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Sky Spirit", 2); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Merfolk Looter", 2); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Sky Spirit", 2); + addCard(Zone.BATTLEFIELD, playerA, "Island", 4); + addCard(Zone.BATTLEFIELD, playerA, "Favorable Winds", 1); + addCard(Zone.BATTLEFIELD, playerA, "Merfolk Looter", 2); + addCard(Zone.BATTLEFIELD, playerA, "Sky Spirit", 2); + addCard(Zone.BATTLEFIELD, playerB, "Merfolk Looter", 2); + addCard(Zone.BATTLEFIELD, playerB, "Sky Spirit", 2); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -71,14 +72,14 @@ public class FavorableWindsTest extends CardTestPlayerBase { */ @Test public void testMultiBoostForFlyingCreatures() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 4); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Favorable Winds", 3); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Merfolk Looter", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Sky Spirit", 2); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Merfolk Looter", 2); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Sky Spirit", 2); + addCard(Zone.BATTLEFIELD, playerA, "Island", 4); + addCard(Zone.BATTLEFIELD, playerA, "Favorable Winds", 3); + addCard(Zone.BATTLEFIELD, playerA, "Merfolk Looter", 2); + addCard(Zone.BATTLEFIELD, playerA, "Sky Spirit", 2); + addCard(Zone.BATTLEFIELD, playerB, "Merfolk Looter", 2); + addCard(Zone.BATTLEFIELD, playerB, "Sky Spirit", 2); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GoblinBushwhackerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GoblinBushwhackerTest.java index 23b19bb7042..e04d205a639 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GoblinBushwhackerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GoblinBushwhackerTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.continuous; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -11,15 +12,15 @@ public class GoblinBushwhackerTest extends CardTestPlayerBase { @Test public void testKicker() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 2); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 2); // Goblin Bushwhacker - Creature — Goblin Warrior 1/1, R - Kicker {R} (You may pay an additional {R} as you cast this spell.) // When Goblin Bushwhacker enters the battlefield, if it was kicked, creatures you control get +1/+0 and gain haste until end of turn. - addCard(Constants.Zone.HAND, playerA, "Goblin Bushwhacker"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.HAND, playerA, "Goblin Bushwhacker"); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Goblin Bushwhacker"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Goblin Bushwhacker"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerA, "Elite Vanguard", 1); @@ -31,15 +32,15 @@ public class GoblinBushwhackerTest extends CardTestPlayerBase { */ @Test public void testDoesntWorkFromHand() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains"); - addCard(Constants.Zone.HAND, playerA, "Elite Vanguard"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Goblin Bushwhacker"); - addCard(Constants.Zone.LIBRARY, playerA, "Goblin Bushwhacker"); - addCard(Constants.Zone.GRAVEYARD, playerA, "Goblin Bushwhacker"); + addCard(Zone.BATTLEFIELD, playerA, "Plains"); + addCard(Zone.HAND, playerA, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Goblin Bushwhacker"); + addCard(Zone.LIBRARY, playerA, "Goblin Bushwhacker"); + addCard(Zone.GRAVEYARD, playerA, "Goblin Bushwhacker"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Vanguard"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Vanguard"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerA, "Elite Vanguard", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/MasterOfThePearlTridentTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/MasterOfThePearlTridentTest.java index f3d618dec2b..ea0729e16e9 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/MasterOfThePearlTridentTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/MasterOfThePearlTridentTest.java @@ -1,7 +1,8 @@ package org.mage.test.cards.continuous; -import mage.Constants; import mage.abilities.keyword.IslandwalkAbility; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,19 +13,19 @@ public class MasterOfThePearlTridentTest extends CardTestPlayerBase { @Test public void testLordAbility() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 2); - addCard(Constants.Zone.HAND, playerA, "Master of the Pearl Trident"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Merfolk of the Pearl Trident"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 2); + addCard(Zone.HAND, playerA, "Master of the Pearl Trident"); + addCard(Zone.BATTLEFIELD, playerA, "Merfolk of the Pearl Trident"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Llanowar Elves"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Island"); + addCard(Zone.BATTLEFIELD, playerB, "Llanowar Elves"); + addCard(Zone.BATTLEFIELD, playerB, "Island"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Master of the Pearl Trident"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Master of the Pearl Trident"); attack(3, playerA, "Merfolk of the Pearl Trident"); block(3, playerB, "Llanowar Elves", "Merfolk of the Pearl Trident"); - setStopAt(3, Constants.PhaseStep.END_TURN); + setStopAt(3, PhaseStep.END_TURN); execute(); assertPermanentCount(playerA, "Master of the Pearl Trident", 1); @@ -35,22 +36,22 @@ public class MasterOfThePearlTridentTest extends CardTestPlayerBase { @Test public void testLordAbilityGone() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 2); - addCard(Constants.Zone.HAND, playerA, "Master of the Pearl Trident"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Merfolk of the Pearl Trident"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 2); + addCard(Zone.HAND, playerA, "Master of the Pearl Trident"); + addCard(Zone.BATTLEFIELD, playerA, "Merfolk of the Pearl Trident"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Swamp", 3); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Llanowar Elves"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Island"); - addCard(Constants.Zone.HAND, playerB, "Murder"); + addCard(Zone.BATTLEFIELD, playerB, "Swamp", 3); + addCard(Zone.BATTLEFIELD, playerB, "Llanowar Elves"); + addCard(Zone.BATTLEFIELD, playerB, "Island"); + addCard(Zone.HAND, playerB, "Murder"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Master of the Pearl Trident"); - castSpell(3, Constants.PhaseStep.DECLARE_ATTACKERS, playerB, "Murder", "Master of the Pearl Trident"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Master of the Pearl Trident"); + castSpell(3, PhaseStep.DECLARE_ATTACKERS, playerB, "Murder", "Master of the Pearl Trident"); attack(3, playerA, "Merfolk of the Pearl Trident"); block(3, playerB, "Llanowar Elves", "Merfolk of the Pearl Trident"); - setStopAt(3, Constants.PhaseStep.END_TURN); + setStopAt(3, PhaseStep.END_TURN); execute(); assertLife(playerB, 20); @@ -60,21 +61,21 @@ public class MasterOfThePearlTridentTest extends CardTestPlayerBase { @Test public void testTurnToFrog() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 2); - addCard(Constants.Zone.HAND, playerA, "Master of the Pearl Trident"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Merfolk of the Pearl Trident"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 2); + addCard(Zone.HAND, playerA, "Master of the Pearl Trident"); + addCard(Zone.BATTLEFIELD, playerA, "Merfolk of the Pearl Trident"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Island", 2); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Llanowar Elves"); - addCard(Constants.Zone.HAND, playerB, "Turn to Frog"); + addCard(Zone.BATTLEFIELD, playerB, "Island", 2); + addCard(Zone.BATTLEFIELD, playerB, "Llanowar Elves"); + addCard(Zone.HAND, playerB, "Turn to Frog"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Master of the Pearl Trident"); - castSpell(3, Constants.PhaseStep.DECLARE_ATTACKERS, playerB, "Turn to Frog", "Master of the Pearl Trident"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Master of the Pearl Trident"); + castSpell(3, PhaseStep.DECLARE_ATTACKERS, playerB, "Turn to Frog", "Master of the Pearl Trident"); attack(3, playerA, "Merfolk of the Pearl Trident"); block(3, playerB, "Llanowar Elves", "Merfolk of the Pearl Trident"); - setStopAt(3, Constants.PhaseStep.END_TURN); + setStopAt(3, PhaseStep.END_TURN); execute(); assertLife(playerB, 20); @@ -84,24 +85,24 @@ public class MasterOfThePearlTridentTest extends CardTestPlayerBase { @Test public void testTurnToFrogAndMurder() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 2); - addCard(Constants.Zone.HAND, playerA, "Master of the Pearl Trident"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Merfolk of the Pearl Trident"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 2); + addCard(Zone.HAND, playerA, "Master of the Pearl Trident"); + addCard(Zone.BATTLEFIELD, playerA, "Merfolk of the Pearl Trident"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Island", 2); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Swamp", 3); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Llanowar Elves"); - addCard(Constants.Zone.HAND, playerB, "Turn to Frog"); - addCard(Constants.Zone.HAND, playerB, "Murder"); + addCard(Zone.BATTLEFIELD, playerB, "Island", 2); + addCard(Zone.BATTLEFIELD, playerB, "Swamp", 3); + addCard(Zone.BATTLEFIELD, playerB, "Llanowar Elves"); + addCard(Zone.HAND, playerB, "Turn to Frog"); + addCard(Zone.HAND, playerB, "Murder"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Master of the Pearl Trident"); - castSpell(3, Constants.PhaseStep.BEGIN_COMBAT, playerB, "Turn to Frog", "Master of the Pearl Trident"); - castSpell(3, Constants.PhaseStep.DECLARE_ATTACKERS, playerB, "Murder", "Master of the Pearl Trident"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Master of the Pearl Trident"); + castSpell(3, PhaseStep.BEGIN_COMBAT, playerB, "Turn to Frog", "Master of the Pearl Trident"); + castSpell(3, PhaseStep.DECLARE_ATTACKERS, playerB, "Murder", "Master of the Pearl Trident"); attack(3, playerA, "Merfolk of the Pearl Trident"); block(3, playerB, "Llanowar Elves", "Merfolk of the Pearl Trident"); - setStopAt(3, Constants.PhaseStep.END_TURN); + setStopAt(3, PhaseStep.END_TURN); execute(); assertGraveyardCount(playerB, "Turn to Frog", 1); @@ -116,17 +117,17 @@ public class MasterOfThePearlTridentTest extends CardTestPlayerBase { */ @Test public void testLooseAndGainControl() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Master of the Pearl Trident"); - addCard(Constants.Zone.HAND, playerA, "Merfolk of the Pearl Trident"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 2); + addCard(Zone.BATTLEFIELD, playerA, "Master of the Pearl Trident"); + addCard(Zone.HAND, playerA, "Merfolk of the Pearl Trident"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Mountain", 5); - addCard(Constants.Zone.HAND, playerB, "Zealous Conscripts"); + addCard(Zone.BATTLEFIELD, playerB, "Mountain", 5); + addCard(Zone.HAND, playerB, "Zealous Conscripts"); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Zealous Conscripts"); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Zealous Conscripts"); - castSpell(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Merfolk of the Pearl Trident"); - setStopAt(3, Constants.PhaseStep.POSTCOMBAT_MAIN); + castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Merfolk of the Pearl Trident"); + setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/TwoHeadedSliverTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/TwoHeadedSliverTest.java index ca3b1423987..0a50747486a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/TwoHeadedSliverTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/TwoHeadedSliverTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.continuous; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -11,20 +12,20 @@ public class TwoHeadedSliverTest extends CardTestPlayerBase { @Test public void testCantBeBlockedByOneEffectAbility() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 2); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 2); // All Sliver creatures have "This creature can't be blocked except by two or more creatures." - addCard(Constants.Zone.HAND, playerA, "Two-Headed Sliver"); + addCard(Zone.HAND, playerA, "Two-Headed Sliver"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Silvercoat Lion"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Plains"); + addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion"); + addCard(Zone.BATTLEFIELD, playerB, "Plains"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Two-Headed Sliver"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Two-Headed Sliver"); attack(3, playerA, "Two-Headed Sliver"); // Block has to fail, because Two-Headed Sliver can't be blocked except by two or more creatures block(3, playerB, "Silvercoat Lion", "Two-Headed Sliver"); - setStopAt(3, Constants.PhaseStep.END_TURN); + setStopAt(3, PhaseStep.END_TURN); execute(); assertPermanentCount(playerA, "Two-Headed Sliver", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/WightOfPrecintSixTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/WightOfPrecintSixTest.java index 3af96a43f2c..260c562d436 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/WightOfPrecintSixTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/WightOfPrecintSixTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.continuous; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -17,13 +18,13 @@ public class WightOfPrecintSixTest extends CardTestPlayerBase { */ @Test public void testNoCreatureCardsInOpponentsGraveyard() { - addCard(Constants.Zone.GRAVEYARD, playerA, "Angelic Edict"); - addCard(Constants.Zone.GRAVEYARD, playerA, "Runeclaw Bear"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Wight of Precinct Six"); + addCard(Zone.GRAVEYARD, playerA, "Angelic Edict"); + addCard(Zone.GRAVEYARD, playerA, "Runeclaw Bear"); + addCard(Zone.BATTLEFIELD, playerA, "Wight of Precinct Six"); - addCard(Constants.Zone.GRAVEYARD, playerB, "Angelic Edict"); + addCard(Zone.GRAVEYARD, playerB, "Angelic Edict"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPowerToughness(playerA, "Wight of Precinct Six", 1, 1); @@ -35,15 +36,15 @@ public class WightOfPrecintSixTest extends CardTestPlayerBase { */ @Test public void testCreatureCardsInOpponentsGraveyard() { - addCard(Constants.Zone.GRAVEYARD, playerA, "Angelic Edict"); - addCard(Constants.Zone.GRAVEYARD, playerA, "Runeclaw Bear"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Wight of Precinct Six"); + addCard(Zone.GRAVEYARD, playerA, "Angelic Edict"); + addCard(Zone.GRAVEYARD, playerA, "Runeclaw Bear"); + addCard(Zone.BATTLEFIELD, playerA, "Wight of Precinct Six"); - addCard(Constants.Zone.GRAVEYARD, playerB, "Angelic Edict"); - addCard(Constants.Zone.GRAVEYARD, playerB, "Runeclaw Bear"); - addCard(Constants.Zone.GRAVEYARD, playerB, "Wight of Precinct Six"); + addCard(Zone.GRAVEYARD, playerB, "Angelic Edict"); + addCard(Zone.GRAVEYARD, playerB, "Runeclaw Bear"); + addCard(Zone.GRAVEYARD, playerB, "Wight of Precinct Six"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPowerToughness(playerA, "Wight of Precinct Six", 3, 3); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/WonderTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/WonderTest.java index 5166b3115d5..f6172358274 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/WonderTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/WonderTest.java @@ -1,8 +1,9 @@ package org.mage.test.cards.continuous; -import mage.Constants; import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -20,15 +21,15 @@ public class WonderTest extends CardTestPlayerBase { */ @Test public void testCardWithAllConditionsMet() { - addCard(Constants.Zone.GRAVEYARD, playerA, "Wonder"); - addCard(Constants.Zone.GRAVEYARD, playerA, "Runeclaw Bear"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Corpse Traders"); + addCard(Zone.GRAVEYARD, playerA, "Wonder"); + addCard(Zone.GRAVEYARD, playerA, "Runeclaw Bear"); + addCard(Zone.BATTLEFIELD, playerA, "Island"); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Corpse Traders"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Llanowar Elves"); + addCard(Zone.BATTLEFIELD, playerB, "Llanowar Elves"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertAbility(playerA, "Elite Vanguard", FlyingAbility.getInstance(), true); @@ -45,14 +46,14 @@ public class WonderTest extends CardTestPlayerBase { @Test public void testNoIsland() { - addCard(Constants.Zone.GRAVEYARD, playerA, "Wonder"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.GRAVEYARD, playerA, "Wonder"); + addCard(Zone.BATTLEFIELD, playerA, "Forest"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Zone.BATTLEFIELD, playerA, "Plains"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp"); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertAbility(playerA, "Elite Vanguard", FlyingAbility.getInstance(), false); @@ -60,14 +61,14 @@ public class WonderTest extends CardTestPlayerBase { @Test public void testOtherZones() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Wonder"); - addCard(Constants.Zone.HAND, playerA, "Wonder"); - addCard(Constants.Zone.LIBRARY, playerA, "Wonder"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island"); + addCard(Zone.BATTLEFIELD, playerA, "Wonder"); + addCard(Zone.HAND, playerA, "Wonder"); + addCard(Zone.LIBRARY, playerA, "Wonder"); + addCard(Zone.BATTLEFIELD, playerA, "Island"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertAbility(playerA, "Elite Vanguard", FlyingAbility.getInstance(), false); @@ -75,15 +76,15 @@ public class WonderTest extends CardTestPlayerBase { @Test public void testDestroyIsland() { - addCard(Constants.Zone.GRAVEYARD, playerA, "Wonder"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 4); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - addCard(Constants.Zone.HAND, playerA, "Demolish"); + addCard(Zone.GRAVEYARD, playerA, "Wonder"); + addCard(Zone.BATTLEFIELD, playerA, "Island"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.HAND, playerA, "Demolish"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Demolish", "Island"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Demolish", "Island"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertAbility(playerA, "Elite Vanguard", FlyingAbility.getInstance(), false); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/control/BattlefieldTriggeredAbilitiesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/control/BattlefieldTriggeredAbilitiesTest.java index 12c45802dfc..6a6359941b2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/control/BattlefieldTriggeredAbilitiesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/control/BattlefieldTriggeredAbilitiesTest.java @@ -1,6 +1,8 @@ package org.mage.test.cards.control; -import mage.Constants; +import mage.constants.CardType; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.game.permanent.Permanent; import org.junit.Assert; import org.junit.Test; @@ -13,17 +15,17 @@ public class BattlefieldTriggeredAbilitiesTest extends CardTestPlayerBase { @Test public void testBeguilerofWillsAndPrimevalTitan() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Primeval Titan"); - addCard(Constants.Zone.LIBRARY, playerA, "Mountain", 10); + addCard(Zone.BATTLEFIELD, playerA, "Primeval Titan"); + addCard(Zone.LIBRARY, playerA, "Mountain", 10); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Beguiler of Wills"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Arrogant Bloodlord", 5); - addCard(Constants.Zone.LIBRARY, playerB, "Mountain", 10); + addCard(Zone.BATTLEFIELD, playerB, "Beguiler of Wills"); + addCard(Zone.BATTLEFIELD, playerB, "Arrogant Bloodlord", 5); + addCard(Zone.LIBRARY, playerB, "Mountain", 10); - activateAbility(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "{T}: Gain control", "Primeval Titan"); + activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerB, "{T}: Gain control", "Primeval Titan"); attack(4, playerB, "Primeval Titan"); - setStopAt(4, Constants.PhaseStep.END_TURN); + setStopAt(4, PhaseStep.END_TURN); execute(); assertLife(playerA, 14); @@ -39,7 +41,7 @@ public class BattlefieldTriggeredAbilitiesTest extends CardTestPlayerBase { int playerACount = 0; int playerBCount = 0; for (Permanent p : currentGame.getBattlefield().getAllActivePermanents()) { - if (p.getCardType().contains(Constants.CardType.LAND)) { + if (p.getCardType().contains(CardType.LAND)) { if (p.getControllerId().equals(playerB.getId())) { playerBCount++; } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/control/ExchangeControlTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/control/ExchangeControlTest.java index be741ab8342..0ea98553a08 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/control/ExchangeControlTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/control/ExchangeControlTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.control; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -14,15 +15,15 @@ public class ExchangeControlTest extends CardTestPlayerBase { */ @Test public void testSimpleExchange() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 5); - addCard(Constants.Zone.HAND, playerA, "Switcheroo"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 5); + addCard(Zone.HAND, playerA, "Switcheroo"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Llanowar Elves"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Llanowar Elves"); + addCard(Zone.BATTLEFIELD, playerB, "Elite Vanguard"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Switcheroo", "Llanowar Elves^Elite Vanguard"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Switcheroo", "Llanowar Elves^Elite Vanguard"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); // check creatures changes their controllers @@ -37,15 +38,15 @@ public class ExchangeControlTest extends CardTestPlayerBase { */ @Test public void testOneSideExchange() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 5); - addCard(Constants.Zone.HAND, playerA, "Switcheroo"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 5); + addCard(Zone.HAND, playerA, "Switcheroo"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Llanowar Elves"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerB, "Llanowar Elves"); + addCard(Zone.BATTLEFIELD, playerB, "Elite Vanguard"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Switcheroo", "Llanowar Elves^Elite Vanguard"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Switcheroo", "Llanowar Elves^Elite Vanguard"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); // check spell was cast @@ -64,19 +65,19 @@ public class ExchangeControlTest extends CardTestPlayerBase { */ @Test public void testOneTargetBecomesIllegal() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 5); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 5); - addCard(Constants.Zone.HAND, playerA, "Switcheroo"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 5); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5); + addCard(Zone.HAND, playerA, "Switcheroo"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Llanowar Elves"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Llanowar Elves"); + addCard(Zone.BATTLEFIELD, playerB, "Elite Vanguard"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Switcheroo", "Llanowar Elves^Elite Vanguard"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Switcheroo", "Llanowar Elves^Elite Vanguard"); // cast in response - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Elite Vanguard"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Elite Vanguard"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertGraveyardCount(playerB, "Elite Vanguard", 1); @@ -93,19 +94,19 @@ public class ExchangeControlTest extends CardTestPlayerBase { */ @Test public void testOneTargetBecomesIllegal2() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 5); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 5); - addCard(Constants.Zone.HAND, playerA, "Switcheroo"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 5); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5); + addCard(Zone.HAND, playerA, "Switcheroo"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Llanowar Elves"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Llanowar Elves"); + addCard(Zone.BATTLEFIELD, playerB, "Elite Vanguard"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Switcheroo", "Llanowar Elves^Elite Vanguard"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Switcheroo", "Llanowar Elves^Elite Vanguard"); // cast in response - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Llanowar Elves"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Llanowar Elves"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertGraveyardCount(playerA, "Llanowar Elves", 1); @@ -122,26 +123,26 @@ public class ExchangeControlTest extends CardTestPlayerBase { */ @Test public void testInteractionWithOtherChangeControlEffect() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 5); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 5); - addCard(Constants.Zone.HAND, playerA, "Switcheroo"); - addCard(Constants.Zone.HAND, playerA, "Act of Treason"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 5); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5); + addCard(Zone.HAND, playerA, "Switcheroo"); + addCard(Zone.HAND, playerA, "Act of Treason"); // both creatures on opponent's side - addCard(Constants.Zone.BATTLEFIELD, playerB, "Llanowar Elves"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerB, "Llanowar Elves"); + addCard(Zone.BATTLEFIELD, playerB, "Elite Vanguard"); // get control - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Act of Treason", "Elite Vanguard"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Act of Treason", "Elite Vanguard"); // attack attack(1, playerA, "Elite Vanguard"); // exchange control after combat - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Switcheroo", "Llanowar Elves^Elite Vanguard"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Switcheroo", "Llanowar Elves^Elite Vanguard"); // check the control effect still works on second turn - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); // now it is our creature for ages @@ -155,19 +156,19 @@ public class ExchangeControlTest extends CardTestPlayerBase { */ @Test public void testRestrictionEffect() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 5); - addCard(Constants.Zone.HAND, playerA, "Switcheroo"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 5); + addCard(Zone.HAND, playerA, "Switcheroo"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "War Falcon"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "War Falcon"); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Llanowar Elves"); + addCard(Zone.BATTLEFIELD, playerB, "Llanowar Elves"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Switcheroo", "War Falcon^Llanowar Elves"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Switcheroo", "War Falcon^Llanowar Elves"); attack(2, playerB, "War Falcon"); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); // check creatures changes their controllers diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/control/ExileAndReturnUnderYourControl.java b/Mage.Tests/src/test/java/org/mage/test/cards/control/ExileAndReturnUnderYourControl.java index 94406ccf98c..99fa05fdb1e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/control/ExileAndReturnUnderYourControl.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/control/ExileAndReturnUnderYourControl.java @@ -1,6 +1,7 @@ package org.mage.test.cards.control; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -17,17 +18,17 @@ public class ExileAndReturnUnderYourControl extends CardTestPlayerBase { @Test public void testPermanentControlEffect() { - addCard(Constants.Zone.HAND, playerA, "Cloudshift"); - addCard(Constants.Zone.HAND, playerA, "Act of Treason"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 3); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 3); + addCard(Zone.HAND, playerA, "Cloudshift"); + addCard(Zone.HAND, playerA, "Act of Treason"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 3); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerB, "Elite Vanguard"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Act of Treason", "Elite Vanguard"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Cloudshift", "Elite Vanguard"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Act of Treason", "Elite Vanguard"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Cloudshift", "Elite Vanguard"); - setStopAt(2, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerA, "Elite Vanguard", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/control/TargetOpponentGainsControlTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/control/TargetOpponentGainsControlTest.java index cfbd11a38cc..327079c36d2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/control/TargetOpponentGainsControlTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/control/TargetOpponentGainsControlTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.control; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -14,13 +15,13 @@ public class TargetOpponentGainsControlTest extends CardTestPlayerBase { @Test public void testPermanentControlEffect() { - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt", 3); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Treacherous Pit-Dweller"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 3); + addCard(Zone.HAND, playerA, "Lightning Bolt", 3); + addCard(Zone.BATTLEFIELD, playerA, "Treacherous Pit-Dweller"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Treacherous Pit-Dweller"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Treacherous Pit-Dweller"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); // under opponent's control @@ -29,18 +30,18 @@ public class TargetOpponentGainsControlTest extends CardTestPlayerBase { @Test public void testChangeControlEffectFromTwoCards() { - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt", 3); - addCard(Constants.Zone.HAND, playerA, "Unhallowed Pact", 3); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Treacherous Pit-Dweller"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 5); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 1); + addCard(Zone.HAND, playerA, "Lightning Bolt", 3); + addCard(Zone.HAND, playerA, "Unhallowed Pact", 3); + addCard(Zone.BATTLEFIELD, playerA, "Treacherous Pit-Dweller"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 1); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Treacherous Pit-Dweller"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Unhallowed Pact", "Treacherous Pit-Dweller"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "Treacherous Pit-Dweller"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "Treacherous Pit-Dweller"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Treacherous Pit-Dweller"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Unhallowed Pact", "Treacherous Pit-Dweller"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "Treacherous Pit-Dweller"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "Treacherous Pit-Dweller"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); // went to graveyard diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CloneTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CloneTest.java index 2c6f7234d00..6b10053fe5a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CloneTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CloneTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.copy; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -14,14 +15,14 @@ public class CloneTest extends CardTestPlayerBase { */ @Test public void testCloneTriggered() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Bloodgift Demon", 1); + addCard(Zone.BATTLEFIELD, playerA, "Bloodgift Demon", 1); - addCard(Constants.Zone.HAND, playerB, "Clone"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Island", 4); + addCard(Zone.HAND, playerB, "Clone"); + addCard(Zone.BATTLEFIELD, playerB, "Island", 4); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Clone"); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Clone"); - setStopAt(4, Constants.PhaseStep.END_TURN); + setStopAt(4, PhaseStep.END_TURN); execute(); assertLife(playerA, 18); @@ -41,18 +42,18 @@ public class CloneTest extends CardTestPlayerBase { */ @Test public void testCloneSacrifice() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Bloodgift Demon", 1); + addCard(Zone.BATTLEFIELD, playerA, "Bloodgift Demon", 1); - addCard(Constants.Zone.HAND, playerA, "Diabolic Edict"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 2); + addCard(Zone.HAND, playerA, "Diabolic Edict"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 2); - addCard(Constants.Zone.HAND, playerB, "Clone"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Island", 4); + addCard(Zone.HAND, playerB, "Clone"); + addCard(Zone.BATTLEFIELD, playerB, "Island", 4); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Clone"); - castSpell(3, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Diabolic Edict", playerB); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Clone"); + castSpell(3, PhaseStep.POSTCOMBAT_MAIN, playerA, "Diabolic Edict", playerB); - setStopAt(4, Constants.PhaseStep.END_TURN); + setStopAt(4, PhaseStep.END_TURN); execute(); assertPermanentCount(playerA, "Bloodgift Demon", 1); @@ -71,18 +72,18 @@ public class CloneTest extends CardTestPlayerBase { @Test public void testCard3() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 6); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 6); - addCard(Constants.Zone.HAND, playerA, "Public Execution"); - addCard(Constants.Zone.HAND, playerA, "Clone"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 6); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 6); + addCard(Zone.HAND, playerA, "Public Execution"); + addCard(Zone.HAND, playerA, "Clone"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Llanowar Elves"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerB, "Llanowar Elves"); + addCard(Zone.BATTLEFIELD, playerB, "Craw Wurm"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Public Executio", "Llanowar Elves"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Clone"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Public Executio", "Llanowar Elves"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Clone"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertPermanentCount(playerB, "Llanowar Elves", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CryptoplasmTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CryptoplasmTest.java index 9dd2a57c332..1242402d45e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CryptoplasmTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CryptoplasmTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.copy; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -8,10 +9,10 @@ public class CryptoplasmTest extends CardTestPlayerBase { @Test public void testTransform() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Cryptoplasm", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Craw Wurm", 1); + addCard(Zone.BATTLEFIELD, playerA, "Cryptoplasm", 1); + addCard(Zone.BATTLEFIELD, playerA, "Craw Wurm", 1); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/LazavDimirMastermindTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/LazavDimirMastermindTest.java index 7c16415cfd5..89b6274d4c2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/LazavDimirMastermindTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/LazavDimirMastermindTest.java @@ -1,8 +1,9 @@ package org.mage.test.cards.copy; -import mage.Constants; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.FlyingAbility; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.game.permanent.Permanent; import org.junit.Assert; import org.junit.Test; @@ -28,15 +29,15 @@ public class LazavDimirMastermindTest extends CardTestPlayerBase { */ @Test public void testCopySimpleCreature() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Lazav, Dimir Mastermind", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Codex Shredder", 1); + addCard(Zone.BATTLEFIELD, playerA, "Lazav, Dimir Mastermind", 1); + addCard(Zone.BATTLEFIELD, playerA, "Codex Shredder", 1); - addCard(Constants.Zone.LIBRARY, playerB, "Assault Griffin",5); + addCard(Zone.LIBRARY, playerB, "Assault Griffin",5); skipInitShuffling(); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card of his or her library into his or her graveyard.", playerB); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card of his or her library into his or her graveyard.", playerB); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertPermanentCount(playerA, "Lazav, Dimir Mastermind", 1); @@ -52,18 +53,18 @@ public class LazavDimirMastermindTest extends CardTestPlayerBase { */ @Test public void testRatsHaveDeathtouch() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Lazav, Dimir Mastermind", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Gutter Skulk", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Codex Shredder", 1); + addCard(Zone.BATTLEFIELD, playerA, "Lazav, Dimir Mastermind", 1); + addCard(Zone.BATTLEFIELD, playerA, "Gutter Skulk", 1); + addCard(Zone.BATTLEFIELD, playerA, "Codex Shredder", 1); // Whenever another nontoken creature dies, you may put a 1/1 black Rat creature token onto the battlefield. // Rats you control have deathtouch. - addCard(Constants.Zone.LIBRARY, playerB, "Ogre Slumlord",5); + addCard(Zone.LIBRARY, playerB, "Ogre Slumlord",5); skipInitShuffling(); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card of his or her library into his or her graveyard.", playerB); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card of his or her library into his or her graveyard.", playerB); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertPermanentCount(playerA, "Lazav, Dimir Mastermind", 1); @@ -89,21 +90,21 @@ public class LazavDimirMastermindTest extends CardTestPlayerBase { */ @Test public void testCopyNightveilSpecter() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Lazav, Dimir Mastermind", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Codex Shredder", 1); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 2); + addCard(Zone.BATTLEFIELD, playerA, "Lazav, Dimir Mastermind", 1); + addCard(Zone.BATTLEFIELD, playerA, "Codex Shredder", 1); - addCard(Constants.Zone.LIBRARY, playerB, "Silvercoat Lion",2); - addCard(Constants.Zone.LIBRARY, playerB, "Nightveil Specter",1); + addCard(Zone.LIBRARY, playerB, "Silvercoat Lion",2); + addCard(Zone.LIBRARY, playerB, "Nightveil Specter",1); skipInitShuffling(); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card of his or her library into his or her graveyard.", playerB); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card of his or her library into his or her graveyard.", playerB); attack(3, playerA, "Lazav, Dimir Mastermind"); - castSpell(3, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Silvercoat Lion"); + castSpell(3, PhaseStep.POSTCOMBAT_MAIN, playerA, "Silvercoat Lion"); - setStopAt(3, Constants.PhaseStep.END_TURN); + setStopAt(3, PhaseStep.END_TURN); execute(); assertPermanentCount(playerA, "Lazav, Dimir Mastermind", 1); @@ -121,20 +122,20 @@ public class LazavDimirMastermindTest extends CardTestPlayerBase { @Test public void testCopyMultipleTimes() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Lazav, Dimir Mastermind", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Codex Shredder", 1); + addCard(Zone.BATTLEFIELD, playerA, "Lazav, Dimir Mastermind", 1); + addCard(Zone.BATTLEFIELD, playerA, "Codex Shredder", 1); - addCard(Constants.Zone.LIBRARY, playerB, "Silvercoat Lion",2); - addCard(Constants.Zone.LIBRARY, playerB, "Nightveil Specter",1); + addCard(Zone.LIBRARY, playerB, "Silvercoat Lion",2); + addCard(Zone.LIBRARY, playerB, "Nightveil Specter",1); skipInitShuffling(); // Lazav becomes a Nightveil Specter - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card of his or her library into his or her graveyard.", playerB); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card of his or her library into his or her graveyard.", playerB); // Lazav becomes a Silvercoat Lion - activateAbility(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card of his or her library into his or her graveyard.", playerB); + activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card of his or her library into his or her graveyard.", playerB); - setStopAt(3, Constants.PhaseStep.END_TURN); + setStopAt(3, PhaseStep.END_TURN); execute(); assertPermanentCount(playerA, "Lazav, Dimir Mastermind", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java index ea10065c9ea..c4db153102f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java @@ -1,9 +1,10 @@ package org.mage.test.cards.copy; import junit.framework.Assert; -import mage.Constants; import mage.abilities.keyword.IndestructibleAbility; import mage.abilities.keyword.LifelinkAbility; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.game.permanent.Permanent; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -17,13 +18,13 @@ public class PhantasmalImageTest extends CardTestPlayerBase { @Test public void testCopyCreature() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 2); - addCard(Constants.Zone.HAND, playerA, "Phantasmal Image"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 2); + addCard(Zone.HAND, playerA, "Phantasmal Image"); + addCard(Zone.BATTLEFIELD, playerB, "Craw Wurm"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Phantasmal Image"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Phantasmal Image"); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); @@ -37,13 +38,13 @@ public class PhantasmalImageTest extends CardTestPlayerBase { */ @Test public void testCopyEntersBattlefieldTriggeredAbility() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 2); - addCard(Constants.Zone.HAND, playerA, "Phantasmal Image"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Howling Banshee"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 2); + addCard(Zone.HAND, playerA, "Phantasmal Image"); + addCard(Zone.BATTLEFIELD, playerB, "Howling Banshee"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Phantasmal Image"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Phantasmal Image"); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); assertPermanentCount(playerA, "Howling Banshee", 1); @@ -58,20 +59,20 @@ public class PhantasmalImageTest extends CardTestPlayerBase { */ @Test public void testCopyCreatureWithLevelUpAbility() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Transcendent Master"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 12); + addCard(Zone.BATTLEFIELD, playerA, "Transcendent Master"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 12); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Island", 2); - addCard(Constants.Zone.HAND, playerB, "Phantasmal Image"); + addCard(Zone.BATTLEFIELD, playerB, "Island", 2); + addCard(Zone.HAND, playerB, "Phantasmal Image"); for (int i = 0; i < 12; i++) { - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Level up {1}"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Level up {1}"); } - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Phantasmal Image"); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Phantasmal Image"); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); assertPermanentCount(playerA, "Transcendent Master", 1); @@ -98,17 +99,17 @@ public class PhantasmalImageTest extends CardTestPlayerBase { */ @Test public void testCopyBecomesTargetTriggeredAbility() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 4); - addCard(Constants.Zone.HAND, playerA, "Phantasmal Image", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Illusionary Servant"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 4); + addCard(Zone.HAND, playerA, "Phantasmal Image", 2); + addCard(Zone.BATTLEFIELD, playerA, "Illusionary Servant"); setChoice(playerA, "Illusionary Servant"); setChoice(playerA, "Illusionary Servant-M10"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Phantasmal Image"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Phantasmal Image"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Phantasmal Image"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Phantasmal Image"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); @@ -124,16 +125,16 @@ public class PhantasmalImageTest extends CardTestPlayerBase { */ @Test public void testCopyAlreadyTransformed() { - addCard(Constants.Zone.BATTLEFIELD, playerB, "Island", 2); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Forest", 2); - addCard(Constants.Zone.HAND, playerB, "Phantasmal Image"); - addCard(Constants.Zone.HAND, playerB, "Titanic Growth"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Huntmaster of the Fells"); + addCard(Zone.BATTLEFIELD, playerB, "Island", 2); + addCard(Zone.BATTLEFIELD, playerB, "Forest", 2); + addCard(Zone.HAND, playerB, "Phantasmal Image"); + addCard(Zone.HAND, playerB, "Titanic Growth"); + addCard(Zone.BATTLEFIELD, playerA, "Huntmaster of the Fells"); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Phantasmal Image"); - castSpell(2, Constants.PhaseStep.POSTCOMBAT_MAIN, playerB, "Titanic Growth", "Ravager of the Fells-M12"); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Phantasmal Image"); + castSpell(2, PhaseStep.POSTCOMBAT_MAIN, playerB, "Titanic Growth", "Ravager of the Fells-M12"); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); // check opponent's creature wasn't chosen as a target for Titanic Growth @@ -149,13 +150,13 @@ public class PhantasmalImageTest extends CardTestPlayerBase { */ @Test public void testCopyEntersTapped() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 2); - addCard(Constants.Zone.HAND, playerA, "Phantasmal Image"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Geralf's Messenger"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 2); + addCard(Zone.HAND, playerA, "Phantasmal Image"); + addCard(Zone.BATTLEFIELD, playerB, "Geralf's Messenger"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Phantasmal Image"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Phantasmal Image"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); Permanent copy = getPermanent("Geralf's Messenger", playerA.getId()); @@ -173,17 +174,17 @@ public class PhantasmalImageTest extends CardTestPlayerBase { */ @Test public void testCopyAsEntersBattlefieldAbility() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 5); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Llanowar Elves"); - addCard(Constants.Zone.HAND, playerA, "Phantasmal Image"); - addCard(Constants.Zone.HAND, playerA, "Lurebound Scarecrow"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 5); + addCard(Zone.BATTLEFIELD, playerA, "Llanowar Elves"); + addCard(Zone.HAND, playerA, "Phantasmal Image"); + addCard(Zone.HAND, playerA, "Lurebound Scarecrow"); setChoice(playerA, "Green"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lurebound Scarecrow"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lurebound Scarecrow"); setChoice(playerA, "Red"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Phantasmal Image"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Phantasmal Image"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertPermanentCount(playerA, "Lurebound Scarecrow", 1); @@ -195,18 +196,18 @@ public class PhantasmalImageTest extends CardTestPlayerBase { */ @Test public void testCopyAsEntersBattlefieldAbility2() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 5); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Llanowar Elves"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Raging Goblin"); - addCard(Constants.Zone.HAND, playerA, "Phantasmal Image"); - addCard(Constants.Zone.HAND, playerA, "Lurebound Scarecrow"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 5); + addCard(Zone.BATTLEFIELD, playerA, "Llanowar Elves"); + addCard(Zone.BATTLEFIELD, playerA, "Raging Goblin"); + addCard(Zone.HAND, playerA, "Phantasmal Image"); + addCard(Zone.HAND, playerA, "Lurebound Scarecrow"); setChoice(playerA, "Green"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lurebound Scarecrow"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lurebound Scarecrow"); setChoice(playerA, "Red"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Phantasmal Image"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Phantasmal Image"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertPermanentCount(playerA, "Lurebound Scarecrow", 2); @@ -214,22 +215,22 @@ public class PhantasmalImageTest extends CardTestPlayerBase { @Test public void testCopiedFlyingWorks() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 2); - addCard(Constants.Zone.HAND, playerA, "Phantasmal Image"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Fervor"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 2); + addCard(Zone.HAND, playerA, "Phantasmal Image"); + addCard(Zone.BATTLEFIELD, playerA, "Fervor"); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Azure Drake"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Llanowar Elves"); + addCard(Zone.BATTLEFIELD, playerB, "Azure Drake"); + addCard(Zone.BATTLEFIELD, playerB, "Llanowar Elves"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Phantasmal Image"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Phantasmal Image"); attack(1, playerA, "Azure Drake"); block(1, playerB, "Llanowar Elves", "Azure Drake"); attack(2, playerB, "Azure Drake"); block(2, playerA, "Elite Vanguard", "Azure Drake"); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); assertLife(playerB, 18); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/additional/LivingDestinyTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/additional/LivingDestinyTest.java index 3aa501bf710..861301d8e3f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/additional/LivingDestinyTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/additional/LivingDestinyTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.cost.additional; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,13 +13,13 @@ public class LivingDestinyTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 4); - addCard(Constants.Zone.HAND, playerA, "Living Destiny"); - addCard(Constants.Zone.HAND, playerA, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 4); + addCard(Zone.HAND, playerA, "Living Destiny"); + addCard(Zone.HAND, playerA, "Craw Wurm"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Living Destiny"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Living Destiny"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertGraveyardCount(playerA, "Living Destiny", 1); @@ -31,12 +32,12 @@ public class LivingDestinyTest extends CardTestPlayerBase { */ @Test public void testCantCast() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 4); - addCard(Constants.Zone.HAND, playerA, "Living Destiny"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 4); + addCard(Zone.HAND, playerA, "Living Destiny"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Living Destiny"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Living Destiny"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); // card is still at hand @@ -48,13 +49,13 @@ public class LivingDestinyTest extends CardTestPlayerBase { */ @Test public void testNonCreatureCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 4); - addCard(Constants.Zone.HAND, playerA, "Living Destiny"); - addCard(Constants.Zone.HAND, playerA, "Divination"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 4); + addCard(Zone.HAND, playerA, "Living Destiny"); + addCard(Zone.HAND, playerA, "Divination"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Living Destiny"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Living Destiny"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); // cards are still at hand diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/custom/SerraAvengerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/custom/SerraAvengerTest.java index 940e8a71c5d..3ac1f027e4b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/custom/SerraAvengerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/custom/SerraAvengerTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.cost.custom; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -16,15 +17,15 @@ public class SerraAvengerTest extends CardTestPlayerBase { */ @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 2); - addCard(Constants.Zone.HAND, playerA, "Serra Avenger", 4); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 2); + addCard(Zone.HAND, playerA, "Serra Avenger", 4); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Serra Avenger"); - castSpell(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Serra Avenger"); - castSpell(5, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Serra Avenger"); - castSpell(7, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Serra Avenger"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Serra Avenger"); + castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Serra Avenger"); + castSpell(5, PhaseStep.PRECOMBAT_MAIN, playerA, "Serra Avenger"); + castSpell(7, PhaseStep.PRECOMBAT_MAIN, playerA, "Serra Avenger"); - setStopAt(7, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(7, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerA, "Serra Avenger", 1); // only the one that was cast on 4th turn @@ -35,17 +36,17 @@ public class SerraAvengerTest extends CardTestPlayerBase { */ @Test public void testWithExtraTurns() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 5); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 2); - addCard(Constants.Zone.HAND, playerA, "Time Warp", 3); - addCard(Constants.Zone.HAND, playerA, "Serra Avenger", 1); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 5); + addCard(Zone.BATTLEFIELD, playerA, "Island", 2); + addCard(Zone.HAND, playerA, "Time Warp", 3); + addCard(Zone.HAND, playerA, "Serra Avenger", 1); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Time Warp", playerA); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Time Warp", playerA); - castSpell(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Time Warp", playerA); - castSpell(4, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Serra Avenger"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Time Warp", playerA); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerA, "Time Warp", playerA); + castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Time Warp", playerA); + castSpell(4, PhaseStep.PRECOMBAT_MAIN, playerA, "Serra Avenger"); - setStopAt(4, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(4, PhaseStep.BEGIN_COMBAT); execute(); assertGraveyardCount(playerA, "Time Warp", 3); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/kicker/GatekeeperOfMalakirTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/kicker/GatekeeperOfMalakirTest.java index c10ece10dbd..322cc8f4201 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/kicker/GatekeeperOfMalakirTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/kicker/GatekeeperOfMalakirTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.cost.kicker; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,13 +13,13 @@ public class GatekeeperOfMalakirTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 3); - addCard(Constants.Zone.HAND, playerA, "Gatekeeper of Malakir"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Llanowar Elves"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 3); + addCard(Zone.HAND, playerA, "Gatekeeper of Malakir"); + addCard(Zone.BATTLEFIELD, playerB, "Llanowar Elves"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Gatekeeper of Malakir"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Gatekeeper of Malakir"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/ArcaneMeleeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/ArcaneMeleeTest.java index b39236fcfd8..78a08f63607 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/ArcaneMeleeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/ArcaneMeleeTest.java @@ -1,7 +1,8 @@ package org.mage.test.cards.cost.modification; -import mage.Constants; import mage.cards.Card; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -23,13 +24,13 @@ public class ArcaneMeleeTest extends CardTestPlayerBase { */ @Test public void testOnBattlefield() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 4); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Arcane Melee", 1); - addCard(Constants.Zone.HAND, playerA, "Flow of Ideas", 1); + addCard(Zone.BATTLEFIELD, playerA, "Island", 4); + addCard(Zone.BATTLEFIELD, playerA, "Arcane Melee", 1); + addCard(Zone.HAND, playerA, "Flow of Ideas", 1); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Flow of Ideas"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Flow of Ideas"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -45,13 +46,13 @@ public class ArcaneMeleeTest extends CardTestPlayerBase { */ @Test public void testInHand() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 4); - addCard(Constants.Zone.HAND, playerA, "Arcane Melee", 1); - addCard(Constants.Zone.HAND, playerA, "Flow of Ideas", 1); + addCard(Zone.BATTLEFIELD, playerA, "Island", 4); + addCard(Zone.HAND, playerA, "Arcane Melee", 1); + addCard(Zone.HAND, playerA, "Flow of Ideas", 1); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Flow of Ideas"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Flow of Ideas"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -66,13 +67,13 @@ public class ArcaneMeleeTest extends CardTestPlayerBase { */ @Test public void testMultiArcaneMelee() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Arcane Melee", 3); - addCard(Constants.Zone.HAND, playerA, "Flow of Ideas", 1); + addCard(Zone.BATTLEFIELD, playerA, "Island", 1); + addCard(Zone.BATTLEFIELD, playerA, "Arcane Melee", 3); + addCard(Zone.HAND, playerA, "Flow of Ideas", 1); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Flow of Ideas"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Flow of Ideas"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -98,13 +99,13 @@ public class ArcaneMeleeTest extends CardTestPlayerBase { */ @Test public void testNonInstantAndSorcery() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Arcane Melee", 1); - addCard(Constants.Zone.HAND, playerA, "Merfolk Looter", 1); + addCard(Zone.BATTLEFIELD, playerA, "Island", 1); + addCard(Zone.BATTLEFIELD, playerA, "Arcane Melee", 1); + addCard(Zone.HAND, playerA, "Merfolk Looter", 1); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Merfolk Looter"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Merfolk Looter"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/ThaliaGuardianOfThrabenTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/ThaliaGuardianOfThrabenTest.java index 2a5b931cff2..e616ff32f1f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/ThaliaGuardianOfThrabenTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/ThaliaGuardianOfThrabenTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.cost.modification; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -14,12 +15,12 @@ public class ThaliaGuardianOfThrabenTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Thalia, Guardian of Thraben"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Thalia, Guardian of Thraben"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -29,12 +30,12 @@ public class ThaliaGuardianOfThrabenTest extends CardTestPlayerBase { @Test public void testCard1() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Thalia, Guardian of Thraben"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 2); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Thalia, Guardian of Thraben"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 2); + addCard(Zone.HAND, playerA, "Lightning Bolt"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/sacrifice/MomentousFallTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/sacrifice/MomentousFallTest.java index 64219c07a9d..7a23d99e815 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/sacrifice/MomentousFallTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/sacrifice/MomentousFallTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.cost.sacrifice; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,14 +13,14 @@ public class MomentousFallTest extends CardTestPlayerBase { @Test public void testSacrificeCostAndLKI() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 4); - addCard(Constants.Zone.HAND, playerA, "Momentous Fall"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Geralf's Messenger", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Glorious Anthem", 1); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 4); + addCard(Zone.HAND, playerA, "Momentous Fall"); + addCard(Zone.BATTLEFIELD, playerA, "Geralf's Messenger", 1); + addCard(Zone.BATTLEFIELD, playerA, "Glorious Anthem", 1); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Momentous Fall"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Momentous Fall"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerA, "Geralf's Messenger", 1); @@ -30,13 +31,13 @@ public class MomentousFallTest extends CardTestPlayerBase { @Test public void testSacrificeCostForProGreen() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 4); - addCard(Constants.Zone.HAND, playerA, "Momentous Fall"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mirran Crusader"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 4); + addCard(Zone.HAND, playerA, "Momentous Fall"); + addCard(Zone.BATTLEFIELD, playerA, "Mirran Crusader"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Momentous Fall"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Momentous Fall"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerA, "Mirran Crusader", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/variable/MikaeusTheLunarchTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/variable/MikaeusTheLunarchTest.java index c3baf880bcf..297c2153357 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/variable/MikaeusTheLunarchTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/variable/MikaeusTheLunarchTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.cost.variable; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -15,12 +16,12 @@ public class MikaeusTheLunarchTest extends CardTestPlayerBase { */ @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 5); - addCard(Constants.Zone.HAND, playerA, "Mikaeus, the Lunarch"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 5); + addCard(Zone.HAND, playerA, "Mikaeus, the Lunarch"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Mikaeus, the Lunarch"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mikaeus, the Lunarch"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerA, "Mikaeus, the Lunarch", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/emblems/EmblemsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/emblems/EmblemsTest.java index b4104761aed..66b7aa73c35 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/emblems/EmblemsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/emblems/EmblemsTest.java @@ -1,7 +1,8 @@ package org.mage.test.cards.emblems; -import mage.Constants; import mage.cards.Card; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.counters.CounterType; import org.junit.Assert; import org.junit.Test; @@ -18,16 +19,16 @@ public class EmblemsTest extends CardTestPlayerBase { */ @Test public void testVenserTheSojournerEmblem() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Venser, the Sojourner"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 1); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt", 1); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Venser, the Sojourner"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1); + addCard(Zone.HAND, playerA, "Lightning Bolt", 1); + addCard(Zone.BATTLEFIELD, playerB, "Elite Vanguard"); - addCounters(1, Constants.PhaseStep.UPKEEP, playerA, "Venser, the Sojourner", CounterType.LOYALTY, 5); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "-8: You get an emblem"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", playerB); + addCounters(1, PhaseStep.UPKEEP, playerA, "Venser, the Sojourner", CounterType.LOYALTY, 5); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "-8: You get an emblem"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", playerB); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerB, 17); @@ -44,18 +45,18 @@ public class EmblemsTest extends CardTestPlayerBase { */ @Test public void testSorinLordOfInnistradEmblem() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Sorin, Lord of Innistrad"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 2); - addCard(Constants.Zone.HAND, playerA, "Elite Inquisitor"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Llanowar Elves"); + addCard(Zone.BATTLEFIELD, playerA, "Sorin, Lord of Innistrad"); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 2); + addCard(Zone.HAND, playerA, "Elite Inquisitor"); + addCard(Zone.BATTLEFIELD, playerB, "Llanowar Elves"); - addCounters(1, Constants.PhaseStep.UPKEEP, playerA, "Sorin, Lord of Innistrad", CounterType.LOYALTY, 1); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "-2: You get an emblem"); - activateAbility(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "-2: You get an emblem"); - castSpell(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Inquisitor"); + addCounters(1, PhaseStep.UPKEEP, playerA, "Sorin, Lord of Innistrad", CounterType.LOYALTY, 1); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "-2: You get an emblem"); + activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "-2: You get an emblem"); + castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Inquisitor"); - setStopAt(3, Constants.PhaseStep.END_COMBAT); + setStopAt(3, PhaseStep.END_COMBAT); execute(); assertGraveyardCount(playerA, "Sorin, Lord of Innistrad", 1); @@ -73,13 +74,13 @@ public class EmblemsTest extends CardTestPlayerBase { */ @Test public void testTamiyoTheMoonSageFirstEmblem() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Tamiyo, the Moon Sage"); - addCard(Constants.Zone.HAND, playerA, "Mountain", 10); + addCard(Zone.BATTLEFIELD, playerA, "Tamiyo, the Moon Sage"); + addCard(Zone.HAND, playerA, "Mountain", 10); - addCounters(1, Constants.PhaseStep.UPKEEP, playerA, "Tamiyo, the Moon Sage", CounterType.LOYALTY, 4); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "-8: You get an emblem"); + addCounters(1, PhaseStep.UPKEEP, playerA, "Tamiyo, the Moon Sage", CounterType.LOYALTY, 4); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "-8: You get an emblem"); - setStopAt(2, Constants.PhaseStep.UPKEEP); + setStopAt(2, PhaseStep.UPKEEP); execute(); assertEmblemCount(playerA, 1); @@ -94,16 +95,16 @@ public class EmblemsTest extends CardTestPlayerBase { */ @Test public void testTamiyoTheMoonSageSecondEmblem() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Tamiyo, the Moon Sage"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Mountain"); - addCard(Constants.Zone.HAND, playerB, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Tamiyo, the Moon Sage"); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerB, "Mountain"); + addCard(Zone.HAND, playerB, "Lightning Bolt"); - addCounters(1, Constants.PhaseStep.UPKEEP, playerA, "Tamiyo, the Moon Sage", CounterType.LOYALTY, 4); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "-8: You get an emblem"); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", "Elite Vanguard"); + addCounters(1, PhaseStep.UPKEEP, playerA, "Tamiyo, the Moon Sage", CounterType.LOYALTY, 4); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "-8: You get an emblem"); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", "Elite Vanguard"); - setStopAt(2, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); assertEmblemCount(playerA, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/filters/MassAppealTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/filters/MassAppealTest.java index a2eade048a8..beef4afe4e5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/filters/MassAppealTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/filters/MassAppealTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.filters; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,12 +13,12 @@ public class MassAppealTest extends CardTestPlayerBase { @Test public void testNoDraw() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 3); - addCard(Constants.Zone.HAND, playerA, "Mass Appeal"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 3); + addCard(Zone.HAND, playerA, "Mass Appeal"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Mass Appeal"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mass Appeal"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -32,15 +33,15 @@ public class MassAppealTest extends CardTestPlayerBase { */ @Test public void testDrawingCards() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 3); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Ana Disciple", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Alabaster Mage", 3); - addCard(Constants.Zone.HAND, playerA, "Mass Appeal"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Ana Disciple", 6); + addCard(Zone.BATTLEFIELD, playerA, "Island", 3); + addCard(Zone.BATTLEFIELD, playerA, "Ana Disciple", 2); + addCard(Zone.BATTLEFIELD, playerA, "Alabaster Mage", 3); + addCard(Zone.HAND, playerA, "Mass Appeal"); + addCard(Zone.BATTLEFIELD, playerB, "Ana Disciple", 6); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Mass Appeal"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mass Appeal"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/filters/OneEyedScarecrowTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/filters/OneEyedScarecrowTest.java index aa454977111..63b7548b620 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/filters/OneEyedScarecrowTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/filters/OneEyedScarecrowTest.java @@ -1,7 +1,8 @@ package org.mage.test.cards.filters; import junit.framework.Assert; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.game.permanent.Permanent; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -13,13 +14,13 @@ public class OneEyedScarecrowTest extends CardTestPlayerBase { @Test public void testBoost() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "One-Eyed Scarecrow"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Screeching Bat"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Runeclaw Bear"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Screeching Bat"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Runeclaw Bear"); + addCard(Zone.BATTLEFIELD, playerA, "One-Eyed Scarecrow"); + addCard(Zone.BATTLEFIELD, playerA, "Screeching Bat"); + addCard(Zone.BATTLEFIELD, playerA, "Runeclaw Bear"); + addCard(Zone.BATTLEFIELD, playerB, "Screeching Bat"); + addCard(Zone.BATTLEFIELD, playerB, "Runeclaw Bear"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); Permanent scarecrow = getPermanent("One-Eyed Scarecrow", playerA.getId()); @@ -54,11 +55,11 @@ public class OneEyedScarecrowTest extends CardTestPlayerBase { @Test public void testMultiEffects() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "One-Eyed Scarecrow", 3); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Screeching Bat"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Runeclaw Bear"); + addCard(Zone.BATTLEFIELD, playerA, "One-Eyed Scarecrow", 3); + addCard(Zone.BATTLEFIELD, playerB, "Screeching Bat"); + addCard(Zone.BATTLEFIELD, playerB, "Runeclaw Bear"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); // -1/2 diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/filters/WhipflareTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/filters/WhipflareTest.java index 8184a2292e2..1331bfbd5df 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/filters/WhipflareTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/filters/WhipflareTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.filters; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,17 +13,17 @@ public class WhipflareTest extends CardTestPlayerBase { @Test public void testDealDamage() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 2); - addCard(Constants.Zone.HAND, playerA, "Whipflare"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 2); + addCard(Zone.HAND, playerA, "Whipflare"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Myr Enforcer", 2); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Elite Vanguard", 2); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Myr Enforcer", 2); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard", 2); + addCard(Zone.BATTLEFIELD, playerA, "Myr Enforcer", 2); + addCard(Zone.BATTLEFIELD, playerB, "Elite Vanguard", 2); + addCard(Zone.BATTLEFIELD, playerB, "Myr Enforcer", 2); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Whipflare"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Whipflare"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/phyrexian/PhyrexianManaTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/phyrexian/PhyrexianManaTest.java index b8730f24c47..02d392b79b5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/phyrexian/PhyrexianManaTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/phyrexian/PhyrexianManaTest.java @@ -1,7 +1,7 @@ package org.mage.test.cards.mana.phyrexian; -import mage.Constants; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -13,9 +13,9 @@ public class PhyrexianManaTest extends CardTestPlayerBase { @Test public void testNoManaToCast() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 4); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - addCard(Constants.Zone.HAND, playerA, "Apostle's Blessing"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 4); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.HAND, playerA, "Apostle's Blessing"); setChoice(playerA, "Black"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Apostle's Blessing", "Elite Vanguard"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/protection/gain/GainProtectionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/protection/gain/GainProtectionTest.java index 950fb676acb..945d61b8325 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/protection/gain/GainProtectionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/protection/gain/GainProtectionTest.java @@ -1,7 +1,7 @@ package org.mage.test.cards.protection.gain; -import mage.Constants; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,11 +12,11 @@ public class GainProtectionTest extends CardTestPlayerBase { @Test public void testGainProtectionFromSpellColor() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - addCard(Constants.Zone.HAND, playerA, "Apostle's Blessing"); - addCard(Constants.Zone.HAND, playerA, "Titanic Growth"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 2); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 2); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.HAND, playerA, "Apostle's Blessing"); + addCard(Zone.HAND, playerA, "Titanic Growth"); setChoice(playerA, "Green"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Apostle's Blessing", "Elite Vanguard"); @@ -32,11 +32,11 @@ public class GainProtectionTest extends CardTestPlayerBase { @Test public void testGainProtectionFromAnotherColor() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - addCard(Constants.Zone.HAND, playerA, "Apostle's Blessing"); - addCard(Constants.Zone.HAND, playerA, "Titanic Growth"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 2); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 2); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.HAND, playerA, "Apostle's Blessing"); + addCard(Zone.HAND, playerA, "Titanic Growth"); setChoice(playerA, "Black"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Apostle's Blessing", "Elite Vanguard"); @@ -52,11 +52,11 @@ public class GainProtectionTest extends CardTestPlayerBase { @Test public void testGainProtectionFromArtifacts() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - addCard(Constants.Zone.HAND, playerA, "Apostle's Blessing"); - addCard(Constants.Zone.HAND, playerA, "Titanic Growth"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 2); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 2); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.HAND, playerA, "Apostle's Blessing"); + addCard(Zone.HAND, playerA, "Titanic Growth"); setChoice(playerA, "Artifacts"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Apostle's Blessing", "Elite Vanguard"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/PillarOfFlameTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/PillarOfFlameTest.java index 0329cdc55dd..6c1e294d57c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/PillarOfFlameTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/PillarOfFlameTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.replacement; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -17,23 +18,23 @@ public class PillarOfFlameTest extends CardTestPlayerBase { */ @Test public void testNotTriggeringExileItInstead() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Lightning Mauler"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Rakdos Cackler"); + addCard(Zone.BATTLEFIELD, playerA, "Lightning Mauler"); + addCard(Zone.BATTLEFIELD, playerA, "Rakdos Cackler"); - addCard(Constants.Zone.HAND, playerA, "Pillar of Flame"); - addCard(Constants.Zone.HAND, playerA, "Stonewright"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 3); + addCard(Zone.HAND, playerA, "Pillar of Flame"); + addCard(Zone.HAND, playerA, "Stonewright"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Dutiful Thrull"); + addCard(Zone.BATTLEFIELD, playerB, "Dutiful Thrull"); - castSpell(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Pillar of Flame", playerB); - castSpell(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Stonewright"); + castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Pillar of Flame", playerB); + castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Stonewright"); attack(3, playerA, "Rakdos Cackler"); attack(3, playerA, "Lightning Mauler"); block(3, playerB, "Dutiful Thrull", "Lightning Mauler"); - setStopAt(3, Constants.PhaseStep.END_TURN); + setStopAt(3, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); @@ -52,19 +53,19 @@ public class PillarOfFlameTest extends CardTestPlayerBase { */ @Test public void testTriggeringExileItInstead() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Lightning Mauler"); + addCard(Zone.BATTLEFIELD, playerA, "Lightning Mauler"); - addCard(Constants.Zone.HAND, playerA, "Pillar of Flame"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 1); + addCard(Zone.HAND, playerA, "Pillar of Flame"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Warmind Infantry"); + addCard(Zone.BATTLEFIELD, playerB, "Warmind Infantry"); - castSpell(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Pillar of Flame", "Warmind Infantry"); + castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Pillar of Flame", "Warmind Infantry"); attack(3, playerA, "Lightning Mauler"); block(3, playerB, "Warmind Infantry", "Lightning Mauler"); - setStopAt(3, Constants.PhaseStep.END_TURN); + setStopAt(3, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/SigardaHostOfHeronsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/SigardaHostOfHeronsTest.java index ee5037baa6c..e02c0c7ed97 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/SigardaHostOfHeronsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/SigardaHostOfHeronsTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.replacement; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -17,20 +18,20 @@ public class SigardaHostOfHeronsTest extends CardTestPlayerBase { */ @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Sigarda, Host of Herons"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Devout Chaplain"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Corpse Traders"); - addCard(Constants.Zone.HAND, playerA, "Diabolic Edict"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 2); + addCard(Zone.BATTLEFIELD, playerA, "Sigarda, Host of Herons"); + addCard(Zone.BATTLEFIELD, playerA, "Devout Chaplain"); + addCard(Zone.BATTLEFIELD, playerA, "Corpse Traders"); + addCard(Zone.HAND, playerA, "Diabolic Edict"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 2); - addCard(Constants.Zone.HAND, playerB, "Diabolic Edict"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Swamp", 2); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Sheoldred, Whispering One"); + addCard(Zone.HAND, playerB, "Diabolic Edict"); + addCard(Zone.BATTLEFIELD, playerB, "Swamp", 2); + addCard(Zone.BATTLEFIELD, playerB, "Sheoldred, Whispering One"); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Diabolic Edict", playerA); - castSpell(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Diabolic Edict", playerB); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Diabolic Edict", playerA); + castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Diabolic Edict", playerB); - setStopAt(3, Constants.PhaseStep.END_TURN); + setStopAt(3, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); @@ -50,14 +51,14 @@ public class SigardaHostOfHeronsTest extends CardTestPlayerBase { */ @Test public void testSacrificeCost() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Sigarda, Host of Herons"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Devout Chaplain"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Corpse Traders"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 3); + addCard(Zone.BATTLEFIELD, playerA, "Sigarda, Host of Herons"); + addCard(Zone.BATTLEFIELD, playerA, "Devout Chaplain"); + addCard(Zone.BATTLEFIELD, playerA, "Corpse Traders"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 3); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{2}{B}"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{2}{B}"); - setStopAt(1, Constants.PhaseStep.END_COMBAT); + setStopAt(1, PhaseStep.END_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/TorporOrbTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/TorporOrbTest.java index cfd59822048..49ccc89860c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/TorporOrbTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/TorporOrbTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.replacement; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -14,13 +15,13 @@ public class TorporOrbTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Torpor Orb"); - addCard(Constants.Zone.HAND, playerA, "Wall of Omens"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 2); + addCard(Zone.BATTLEFIELD, playerA, "Torpor Orb"); + addCard(Zone.HAND, playerA, "Wall of Omens"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 2); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Wall of Omens"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Wall of Omens"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/lifereduce/DamageSetToXLifeInsteadTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/lifereduce/DamageSetToXLifeInsteadTest.java index e96ef23a05d..b25fe7222f4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/lifereduce/DamageSetToXLifeInsteadTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/lifereduce/DamageSetToXLifeInsteadTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.replacement.lifereduce; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -17,16 +18,16 @@ public class DamageSetToXLifeInsteadTest extends CardTestPlayerBase { */ @Test public void testDirectDamage() { - addCard(Constants.Zone.HAND, playerA, "Lava Axe"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 5); + addCard(Zone.HAND, playerA, "Lava Axe"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Elderscale Wurm"); + addCard(Zone.BATTLEFIELD, playerB, "Elderscale Wurm"); setLife(playerB, 8); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lava Axe", playerB); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lava Axe", playerB); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); // 5 damage dealt but it reduces life only to 7 @@ -39,19 +40,19 @@ public class DamageSetToXLifeInsteadTest extends CardTestPlayerBase { */ @Test public void testLessLifeTotal() { - addCard(Constants.Zone.HAND, playerA, "Lava Axe"); - addCard(Constants.Zone.HAND, playerA, "Bump in the Night"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 5); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 5); + addCard(Zone.HAND, playerA, "Lava Axe"); + addCard(Zone.HAND, playerA, "Bump in the Night"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 5); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Elderscale Wurm"); + addCard(Zone.BATTLEFIELD, playerB, "Elderscale Wurm"); setLife(playerB, 8); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Bump in the Night", playerB); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lava Axe", playerB); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Bump in the Night", playerB); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lava Axe", playerB); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); // 5 damage dealt but it reduces life only to 7 @@ -64,17 +65,17 @@ public class DamageSetToXLifeInsteadTest extends CardTestPlayerBase { */ @Test public void testWorshipWithCreature() { - addCard(Constants.Zone.HAND, playerA, "Volcanic Hammer"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 2); + addCard(Zone.HAND, playerA, "Volcanic Hammer"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 2); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Worship"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerB, "Worship"); + addCard(Zone.BATTLEFIELD, playerB, "Elite Vanguard"); setLife(playerB, 2); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Volcanic Hammer", playerB); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Volcanic Hammer", playerB); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerB, 1); @@ -86,19 +87,19 @@ public class DamageSetToXLifeInsteadTest extends CardTestPlayerBase { */ @Test public void testWorshipWithoutCreature() { - addCard(Constants.Zone.HAND, playerA, "Volcanic Hammer", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 4); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Llanowar Elves"); + addCard(Zone.HAND, playerA, "Volcanic Hammer", 2); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4); + addCard(Zone.BATTLEFIELD, playerA, "Llanowar Elves"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Worship"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerB, "Worship"); + addCard(Zone.BATTLEFIELD, playerB, "Elite Vanguard"); setLife(playerB, 2); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Volcanic Hammer", "Elite Vanguard"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Volcanic Hammer", playerB); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Volcanic Hammer", "Elite Vanguard"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Volcanic Hammer", playerB); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerB, -1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/prevent/HarmsWayRedirectDamageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/prevent/HarmsWayRedirectDamageTest.java index dc265181368..917a629e075 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/prevent/HarmsWayRedirectDamageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/prevent/HarmsWayRedirectDamageTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.replacement.prevent; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Ignore; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -18,16 +19,16 @@ public class HarmsWayRedirectDamageTest extends CardTestPlayerBase { */ @Test public void testRedirectTwoDamage() { - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain"); - addCard(Constants.Zone.HAND, playerB, "Harm's Way"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Plains"); + addCard(Zone.HAND, playerB, "Harm's Way"); + addCard(Zone.BATTLEFIELD, playerB, "Plains"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Harm's Way", "Lightning Bolt^targetPlayer=PlayerA"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Harm's Way", "Lightning Bolt^targetPlayer=PlayerA"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); // 2 damage was redirected back @@ -42,15 +43,15 @@ public class HarmsWayRedirectDamageTest extends CardTestPlayerBase { */ @Test public void testRedirectCombatDamage() { - addCard(Constants.Zone.HAND, playerA, "Harm's Way"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains"); + addCard(Zone.HAND, playerA, "Harm's Way"); + addCard(Zone.BATTLEFIELD, playerA, "Plains"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerB, "Craw Wurm"); attack(2, playerB, "Craw Wurm"); - castSpell(2, Constants.PhaseStep.DECLARE_BLOCKERS, playerA, "Harm's Way", "Craw Wurm^targetPlayer=PlayerB"); + castSpell(2, PhaseStep.DECLARE_BLOCKERS, playerA, "Harm's Way", "Craw Wurm^targetPlayer=PlayerB"); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); // only 4 combat damage @@ -68,17 +69,17 @@ public class HarmsWayRedirectDamageTest extends CardTestPlayerBase { // This test doesn't work in test framework but the test case works fine in real game // -- this is because of no possibility to ask AI to play spell when triggered is in the stack public void testRedirectTriggeredAbilityDamage() { - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); - addCard(Constants.Zone.HAND, playerA, "Harm's Way"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.HAND, playerA, "Harm's Way"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Zone.BATTLEFIELD, playerA, "Plains"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Magma Phoenix"); + addCard(Zone.BATTLEFIELD, playerB, "Magma Phoenix"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Magma Phoenix"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Harm's Way", "Magma Phoenix^targetPlayer=PlayerB"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Magma Phoenix"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Harm's Way", "Magma Phoenix^targetPlayer=PlayerB"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 19); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/prevent/MalignusNoPreventDamageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/prevent/MalignusNoPreventDamageTest.java index bec7fb6791c..e1a0d24db82 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/prevent/MalignusNoPreventDamageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/prevent/MalignusNoPreventDamageTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.replacement.prevent; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -18,18 +19,18 @@ public class MalignusNoPreventDamageTest extends CardTestPlayerBase { */ @Test public void testBlockByCreatureWithProRed() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Vedalken Outlander"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Zone.BATTLEFIELD, playerA, "Vedalken Outlander"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Malignus"); + addCard(Zone.BATTLEFIELD, playerB, "Malignus"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerA); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerA); attack(2, playerB, "Malignus"); block(2, playerA, "Vedalken Outlander", "Malignus"); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); assertLife(playerA, 17); @@ -46,14 +47,14 @@ public class MalignusNoPreventDamageTest extends CardTestPlayerBase { */ @Test public void testBlockAnotherWithProRed() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Vedalken Outlander"); + addCard(Zone.BATTLEFIELD, playerA, "Vedalken Outlander"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Ogre Resister"); + addCard(Zone.BATTLEFIELD, playerB, "Ogre Resister"); attack(2, playerB, "Ogre Resister"); block(2, playerA, "Vedalken Outlander", "Ogre Resister"); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/restriction/ElvishChampionForestwalkTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/restriction/ElvishChampionForestwalkTest.java index 7e140d82009..277d4ae24d9 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/restriction/ElvishChampionForestwalkTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/restriction/ElvishChampionForestwalkTest.java @@ -28,7 +28,8 @@ package org.mage.test.cards.restriction; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -51,20 +52,20 @@ public class ElvishChampionForestwalkTest extends CardTestPlayerBase { @Test public void testCannotBlockCreatureWithForestwalk() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elvish Champion"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Arbor Elf"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Defiant Elf"); + addCard(Zone.BATTLEFIELD, playerA, "Elvish Champion"); + addCard(Zone.BATTLEFIELD, playerA, "Arbor Elf"); + addCard(Zone.BATTLEFIELD, playerA, "Defiant Elf"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Forest"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Silvercoat Lion"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Canyon Minotaur"); + addCard(Zone.BATTLEFIELD, playerB, "Forest"); + addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion"); + addCard(Zone.BATTLEFIELD, playerB, "Canyon Minotaur"); attack(3, playerA, "Arbor Elf"); attack(3, playerA, "Defiant Elf"); block(3, playerB, "Silvercoat Lion", "Arbor Elf"); block(3, playerB, "Canyon Minotaur", "Defiant Elf"); - setStopAt(3, Constants.PhaseStep.POSTCOMBAT_MAIN); + setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); execute(); assertPermanentCount(playerA, "Arbor Elf", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/rules/AdditionalCostRuleTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/rules/AdditionalCostRuleTest.java index e20eeae46ec..1166530da7c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/rules/AdditionalCostRuleTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/rules/AdditionalCostRuleTest.java @@ -1,7 +1,8 @@ package org.mage.test.cards.rules; -import mage.Constants; import mage.cards.Card; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -14,9 +15,9 @@ public class AdditionalCostRuleTest extends CardTestPlayerBase { @Test public void testAdditionalCostDisplayed() { - addCard(Constants.Zone.GRAVEYARD, playerA, "Silvergill Adept"); + addCard(Zone.GRAVEYARD, playerA, "Silvergill Adept"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); Card firewildBorderpost = playerA.getGraveyard().getCards(currentGame).iterator().next(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/rules/AlternativeCostRuleTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/rules/AlternativeCostRuleTest.java index e17f4556023..f5f3d2d7d60 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/rules/AlternativeCostRuleTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/rules/AlternativeCostRuleTest.java @@ -1,7 +1,8 @@ package org.mage.test.cards.rules; -import mage.Constants; import mage.cards.Card; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -14,9 +15,9 @@ public class AlternativeCostRuleTest extends CardTestPlayerBase { @Test public void testAlternativeCostDisplayed() { - addCard(Constants.Zone.GRAVEYARD, playerA, "Firewild Borderpost"); + addCard(Zone.GRAVEYARD, playerA, "Firewild Borderpost"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); Card firewildBorderpost = playerA.getGraveyard().getCards(currentGame).iterator().next(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/AlphaBrawlTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/AlphaBrawlTest.java index 08abc892c08..1beb30f7d4f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/AlphaBrawlTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/AlphaBrawlTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.filter.Filter; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -13,14 +14,14 @@ public class AlphaBrawlTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 8); - addCard(Constants.Zone.HAND, playerA, "Alpha Brawl"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Air Elemental", 1); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Horned Turtle", 4); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 8); + addCard(Zone.HAND, playerA, "Alpha Brawl"); + addCard(Zone.BATTLEFIELD, playerB, "Air Elemental", 1); + addCard(Zone.BATTLEFIELD, playerB, "Horned Turtle", 4); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Alpha Brawl", "Air Elemental"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Alpha Brawl", "Air Elemental"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -32,14 +33,14 @@ public class AlphaBrawlTest extends CardTestPlayerBase { @Test public void testCardWithInfect() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 8); - addCard(Constants.Zone.HAND, playerA, "Alpha Brawl"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Blackcleave Goblin", 1); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Air Elemental", 2); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 8); + addCard(Zone.HAND, playerA, "Alpha Brawl"); + addCard(Zone.BATTLEFIELD, playerB, "Blackcleave Goblin", 1); + addCard(Zone.BATTLEFIELD, playerB, "Air Elemental", 2); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Alpha Brawl", "Blackcleave Goblin"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Alpha Brawl", "Blackcleave Goblin"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/AltarOfTheLostTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/AltarOfTheLostTest.java index a49e1de8fbc..1fbda75a48c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/AltarOfTheLostTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/AltarOfTheLostTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,14 +13,14 @@ public class AltarOfTheLostTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Altar of the Lost"); - addCard(Constants.Zone.GRAVEYARD, playerA, "Lingering Souls"); + addCard(Zone.BATTLEFIELD, playerA, "Altar of the Lost"); + addCard(Zone.GRAVEYARD, playerA, "Lingering Souls"); setChoice(playerA, "Black"); setChoice(playerA, "Black"); - activateAbility(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Flashback {1}{B}"); - setStopAt(3, Constants.PhaseStep.BEGIN_COMBAT); + activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Flashback {1}{B}"); + setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -29,15 +30,15 @@ public class AltarOfTheLostTest extends CardTestPlayerBase { @Test public void testCard1() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Altar of the Lost"); - addCard(Constants.Zone.HAND, playerA, "Lingering Souls"); + addCard(Zone.BATTLEFIELD, playerA, "Plains"); + addCard(Zone.BATTLEFIELD, playerA, "Altar of the Lost"); + addCard(Zone.HAND, playerA, "Lingering Souls"); setChoice(playerA, "Black"); setChoice(playerA, "Black"); - castSpell(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lingering Souls"); - setStopAt(3, Constants.PhaseStep.BEGIN_COMBAT); + castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Lingering Souls"); + setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/ArbiterOfKnollridgeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/ArbiterOfKnollridgeTest.java index ad10dcbd499..ccb24a461b6 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/ArbiterOfKnollridgeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/ArbiterOfKnollridgeTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Ignore; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -10,15 +11,15 @@ public class ArbiterOfKnollridgeTest extends CardTestPlayerBase { @Test @Ignore public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 6); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 6); - addCard(Constants.Zone.HAND, playerA, "Shock"); - addCard(Constants.Zone.HAND, playerA, "Arbiter of Knollridge"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 6); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 6); + addCard(Zone.HAND, playerA, "Shock"); + addCard(Zone.HAND, playerA, "Arbiter of Knollridge"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Shock", playerB); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Arbiter of Knollridge"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Shock", playerB); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Arbiter of Knollridge"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/ArchangelsLightTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/ArchangelsLightTest.java index f61062005d1..630437381b1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/ArchangelsLightTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/ArchangelsLightTest.java @@ -1,7 +1,8 @@ package org.mage.test.cards.single; import junit.framework.Assert; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -13,13 +14,13 @@ public class ArchangelsLightTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 8); - addCard(Constants.Zone.GRAVEYARD, playerA, "Forest", 6); - addCard(Constants.Zone.HAND, playerA, "Archangel's Light"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 8); + addCard(Zone.GRAVEYARD, playerA, "Forest", 6); + addCard(Zone.HAND, playerA, "Archangel's Light"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Archangel's Light"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Archangel's Light"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 32); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/ArrogantBloodlordTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/ArrogantBloodlordTest.java index 19b345e960b..451eabfa2c9 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/ArrogantBloodlordTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/ArrogantBloodlordTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,13 +13,13 @@ public class ArrogantBloodlordTest extends CardTestPlayerBase { // blocked trigger @Test public void testCardBlocked() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Arrogant Bloodlord"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Wall of Air"); + addCard(Zone.BATTLEFIELD, playerA, "Arrogant Bloodlord"); + addCard(Zone.BATTLEFIELD, playerB, "Wall of Air"); attack(1, playerA, "Arrogant Bloodlord"); block(1, playerB, "Wall of Air", "Arrogant Bloodlord"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); @@ -29,13 +30,13 @@ public class ArrogantBloodlordTest extends CardTestPlayerBase { // blocks trigger @Test public void testCardBlocker() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Caravan Hurda"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Arrogant Bloodlord"); + addCard(Zone.BATTLEFIELD, playerA, "Caravan Hurda"); + addCard(Zone.BATTLEFIELD, playerB, "Arrogant Bloodlord"); attack(1, playerA, "Caravan Hurda"); block(1, playerB, "Arrogant Bloodlord", "Caravan Hurda"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerA, 21); @@ -46,13 +47,13 @@ public class ArrogantBloodlordTest extends CardTestPlayerBase { // blocked no trigger @Test public void testCardBlockedNonTrigger() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Arrogant Bloodlord"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Grizzly Bears"); + addCard(Zone.BATTLEFIELD, playerA, "Arrogant Bloodlord"); + addCard(Zone.BATTLEFIELD, playerB, "Grizzly Bears"); attack(1, playerA, "Arrogant Bloodlord"); block(1, playerB, "Grizzly Bears", "Arrogant Bloodlord"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); @@ -63,13 +64,13 @@ public class ArrogantBloodlordTest extends CardTestPlayerBase { // blocks no trigger @Test public void testCardBlocksNonTrigger() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Acid Web Spider"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Arrogant Bloodlord"); + addCard(Zone.BATTLEFIELD, playerA, "Acid Web Spider"); + addCard(Zone.BATTLEFIELD, playerB, "Arrogant Bloodlord"); attack(1, playerA, "Acid Web Spider"); block(1, playerB, "Arrogant Bloodlord", "Acid Web Spider"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/ClingingMistsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/ClingingMistsTest.java index 9c8cccd2bb2..8d045eb8416 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/ClingingMistsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/ClingingMistsTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -15,14 +16,14 @@ public class ClingingMistsTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "White Knight"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 3); - addCard(Constants.Zone.HAND, playerA, "Clinging Mists"); + addCard(Zone.BATTLEFIELD, playerA, "White Knight"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 3); + addCard(Zone.HAND, playerA, "Clinging Mists"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Clinging Mists"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Clinging Mists"); attack(1, playerA, "White Knight"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); @@ -32,14 +33,14 @@ public class ClingingMistsTest extends CardTestPlayerBase { @Test public void testCardExile1() { setLife(playerA, 5); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Abbey Griffin"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 3); - addCard(Constants.Zone.HAND, playerA, "Clinging Mists"); + addCard(Zone.BATTLEFIELD, playerA, "Abbey Griffin"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 3); + addCard(Zone.HAND, playerA, "Clinging Mists"); attack(1, playerA, "Abbey Griffin"); - castSpell(1, Constants.PhaseStep.DECLARE_BLOCKERS, playerA, "Clinging Mists"); + castSpell(1, PhaseStep.DECLARE_BLOCKERS, playerA, "Clinging Mists"); - setStopAt(3, Constants.PhaseStep.END_TURN); + setStopAt(3, PhaseStep.END_TURN); execute(); assertLife(playerA, 5); @@ -50,17 +51,17 @@ public class ClingingMistsTest extends CardTestPlayerBase { @Test public void testCardExile2() { setLife(playerA, 5); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 3); - addCard(Constants.Zone.HAND, playerA, "Clinging Mists"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Mountain"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Abbey Griffin"); - addCard(Constants.Zone.HAND, playerB, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 3); + addCard(Zone.HAND, playerA, "Clinging Mists"); + addCard(Zone.BATTLEFIELD, playerB, "Mountain"); + addCard(Zone.BATTLEFIELD, playerB, "Abbey Griffin"); + addCard(Zone.HAND, playerB, "Lightning Bolt"); attack(2, playerB, "Abbey Griffin"); - castSpell(2, Constants.PhaseStep.DECLARE_BLOCKERS, playerA, "Clinging Mists"); - castSpell(2, Constants.PhaseStep.POSTCOMBAT_MAIN, playerB, "Lightning Bolt", playerA); + castSpell(2, PhaseStep.DECLARE_BLOCKERS, playerA, "Clinging Mists"); + castSpell(2, PhaseStep.POSTCOMBAT_MAIN, playerB, "Lightning Bolt", playerA); - setStopAt(6, Constants.PhaseStep.DRAW); + setStopAt(6, PhaseStep.DRAW); execute(); assertLife(playerA, 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/CobraTrapTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/CobraTrapTest.java index ecadb443eae..a159e5c8d04 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/CobraTrapTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/CobraTrapTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,15 +13,15 @@ public class CobraTrapTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 2); - addCard(Constants.Zone.HAND, playerA, "Cobra Trap"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Mountain", 3); - addCard(Constants.Zone.HAND, playerB, "Stone Rain"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 2); + addCard(Zone.HAND, playerA, "Cobra Trap"); + addCard(Zone.BATTLEFIELD, playerB, "Mountain", 3); + addCard(Zone.HAND, playerB, "Stone Rain"); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Stone Rain", "Forest"); - castSpell(2, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Cobra Trap"); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Stone Rain", "Forest"); + castSpell(2, PhaseStep.POSTCOMBAT_MAIN, playerA, "Cobra Trap"); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); @@ -31,14 +32,14 @@ public class CobraTrapTest extends CardTestPlayerBase { @Test public void testCardNegative() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 2); - addCard(Constants.Zone.HAND, playerA, "Cobra Trap"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Mountain", 3); - addCard(Constants.Zone.HAND, playerB, "Stone Rain"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 2); + addCard(Zone.HAND, playerA, "Cobra Trap"); + addCard(Zone.BATTLEFIELD, playerB, "Mountain", 3); + addCard(Zone.HAND, playerB, "Stone Rain"); - castSpell(2, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Cobra Trap"); + castSpell(2, PhaseStep.POSTCOMBAT_MAIN, playerA, "Cobra Trap"); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/CounterlashTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/CounterlashTest.java index f711c26da0f..bf65a42577a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/CounterlashTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/CounterlashTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,16 +13,16 @@ public class CounterlashTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Island", 6); - addCard(Constants.Zone.HAND, playerB, "Counterlash"); - addCard(Constants.Zone.HAND, playerB, "Beacon of Immortality"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerB, "Island", 6); + addCard(Zone.HAND, playerB, "Counterlash"); + addCard(Zone.HAND, playerB, "Beacon of Immortality"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Counterlash", "Lightning Bolt"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Counterlash", "Lightning Bolt"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/DungeonGeistsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/DungeonGeistsTest.java index 914ec6a150a..6e53c7e1d13 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/DungeonGeistsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/DungeonGeistsTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,12 +13,12 @@ public class DungeonGeistsTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 4); - addCard(Constants.Zone.HAND, playerA, "Dungeon Geists"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 4); + addCard(Zone.HAND, playerA, "Dungeon Geists"); + addCard(Zone.BATTLEFIELD, playerB, "Craw Wurm"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Dungeon Geists"); - setStopAt(2, Constants.PhaseStep.DRAW); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Dungeon Geists"); + setStopAt(2, PhaseStep.DRAW); execute(); assertLife(playerA, 20); @@ -30,15 +31,15 @@ public class DungeonGeistsTest extends CardTestPlayerBase { @Test public void testCard1() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 4); - addCard(Constants.Zone.HAND, playerA, "Dungeon Geists"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Craw Wurm"); - addCard(Constants.Zone.HAND, playerB, "Act of Treason"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Mountain", 3); + addCard(Zone.BATTLEFIELD, playerA, "Island", 4); + addCard(Zone.HAND, playerA, "Dungeon Geists"); + addCard(Zone.BATTLEFIELD, playerB, "Craw Wurm"); + addCard(Zone.HAND, playerB, "Act of Treason"); + addCard(Zone.BATTLEFIELD, playerB, "Mountain", 3); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Dungeon Geists"); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Act of Treason", "Dungeon Geists"); - setStopAt(4, Constants.PhaseStep.DRAW); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Dungeon Geists"); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Act of Treason", "Dungeon Geists"); + setStopAt(4, PhaseStep.DRAW); execute(); assertLife(playerA, 20); @@ -51,14 +52,14 @@ public class DungeonGeistsTest extends CardTestPlayerBase { @Test public void testCard2() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 9); - addCard(Constants.Zone.HAND, playerA, "Dungeon Geists"); - addCard(Constants.Zone.HAND, playerA, "Mind Control"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 9); + addCard(Zone.HAND, playerA, "Dungeon Geists"); + addCard(Zone.HAND, playerA, "Mind Control"); + addCard(Zone.BATTLEFIELD, playerB, "Craw Wurm"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Dungeon Geists"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Mind Control", "Craw Wurm"); - setStopAt(3, Constants.PhaseStep.DRAW); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Dungeon Geists"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Mind Control", "Craw Wurm"); + setStopAt(3, PhaseStep.DRAW); execute(); assertLife(playerA, 20); @@ -71,19 +72,19 @@ public class DungeonGeistsTest extends CardTestPlayerBase { @Test public void testWithBlink() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 4); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 4); - addCard(Constants.Zone.HAND, playerA, "Dungeon Geists"); - addCard(Constants.Zone.HAND, playerA, "Cloudshift"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Craw Wurm"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 4); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 4); + addCard(Zone.HAND, playerA, "Dungeon Geists"); + addCard(Zone.HAND, playerA, "Cloudshift"); + addCard(Zone.BATTLEFIELD, playerB, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerB, "Elite Vanguard"); addTarget(playerA, "Craw Wurm"); // first target Craw Wurm addTarget(playerA, "Elite Vanguard"); // after Cloudshift effect (return back to battlefield) target Elite Vanguard - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Dungeon Geists"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Cloudshift", "Dungeon Geists"); - setStopAt(2, Constants.PhaseStep.DRAW); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Dungeon Geists"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Cloudshift", "Dungeon Geists"); + setStopAt(2, PhaseStep.DRAW); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/ElbrusTheBindingBladeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/ElbrusTheBindingBladeTest.java index e6229901bad..d814f82d543 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/ElbrusTheBindingBladeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/ElbrusTheBindingBladeTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,15 +13,15 @@ public class ElbrusTheBindingBladeTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Air Elemental"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elbrus, the Binding Blade"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Zone.BATTLEFIELD, playerA, "Air Elemental"); + addCard(Zone.BATTLEFIELD, playerA, "Elbrus, the Binding Blade"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Equip {1}", "Air Elemental"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Equip {1}", "Air Elemental"); attack(1, playerA, "Air Elemental"); - setStopAt(1, Constants.PhaseStep.END_COMBAT); + setStopAt(1, PhaseStep.END_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/ExquisiteBloodTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/ExquisiteBloodTest.java index d2ce0f8b096..509fec3e15c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/ExquisiteBloodTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/ExquisiteBloodTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,29 +13,29 @@ public class ExquisiteBloodTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 1); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 1); // card we test - addCard(Constants.Zone.BATTLEFIELD, playerA, "Exquisite Blood", 1); + addCard(Zone.BATTLEFIELD, playerA, "Exquisite Blood", 1); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); - addCard(Constants.Zone.HAND, playerA, "Bump in the Night"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Raging Goblin", 2); + addCard(Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.HAND, playerA, "Bump in the Night"); + addCard(Zone.BATTLEFIELD, playerA, "Raging Goblin", 2); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Mountain", 1); - addCard(Constants.Zone.HAND, playerB, "Shock"); + addCard(Zone.BATTLEFIELD, playerB, "Mountain", 1); + addCard(Zone.HAND, playerB, "Shock"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Bump in the Night", playerB); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Bump in the Night", playerB); attack(1, playerA, "Raging Goblin"); attack(1, playerA, "Raging Goblin"); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Shock", playerA); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Shock", playerA); - setStopAt(2, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerB, 12); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/FaithsRewardTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/FaithsRewardTest.java index c3d4490679b..a2c52f5001b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/FaithsRewardTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/FaithsRewardTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -11,16 +12,16 @@ public class FaithsRewardTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 5); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 5); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt", 1); - addCard(Constants.Zone.HAND, playerA, "Faith's Reward", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "White Knight"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 5); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5); + addCard(Zone.HAND, playerA, "Lightning Bolt", 1); + addCard(Zone.HAND, playerA, "Faith's Reward", 1); + addCard(Zone.BATTLEFIELD, playerA, "White Knight"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "White Knight"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Faith's Reward"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "White Knight"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Faith's Reward"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertPermanentCount(playerA, "White Knight", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/FaithsShieldTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/FaithsShieldTest.java index 924c0dd687d..26743357944 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/FaithsShieldTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/FaithsShieldTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -15,17 +16,17 @@ public class FaithsShieldTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "White Knight"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); - addCard(Constants.Zone.HAND, playerA, "Faith's Shield"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "White Knight"); + addCard(Zone.BATTLEFIELD, playerA, "Plains"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Zone.HAND, playerA, "Faith's Shield"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); setChoice(playerA, "Red"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Faith's Shield", "White Knight"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "White Knight"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Faith's Shield", "White Knight"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "White Knight"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); @@ -36,17 +37,17 @@ public class FaithsShieldTest extends CardTestPlayerBase { @Test public void testCardExile1() { setLife(playerA, 5); - addCard(Constants.Zone.BATTLEFIELD, playerA, "White Knight"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); - addCard(Constants.Zone.HAND, playerA, "Faith's Shield"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "White Knight"); + addCard(Zone.BATTLEFIELD, playerA, "Plains"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Zone.HAND, playerA, "Faith's Shield"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); setChoice(playerA, "Red"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Faith's Shield", "White Knight"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", playerA); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Faith's Shield", "White Knight"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", playerA); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerA, 5); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/FeedThePackTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/FeedThePackTest.java index 1a199584016..f798cdf37e0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/FeedThePackTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/FeedThePackTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,10 +13,10 @@ public class FeedThePackTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Feed the Pack"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerA, "Feed the Pack"); + addCard(Zone.BATTLEFIELD, playerA, "Craw Wurm"); - setStopAt(2, Constants.PhaseStep.DRAW); + setStopAt(2, PhaseStep.DRAW); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/FiendOfTheShadowsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/FiendOfTheShadowsTest.java index d8f6e72b6fd..d18134f1173 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/FiendOfTheShadowsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/FiendOfTheShadowsTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -15,15 +16,15 @@ public class FiendOfTheShadowsTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "White Knight"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Fiend of the Shadows"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Mountain"); - addCard(Constants.Zone.HAND, playerB, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "White Knight"); + addCard(Zone.BATTLEFIELD, playerA, "Fiend of the Shadows"); + addCard(Zone.BATTLEFIELD, playerB, "Mountain"); + addCard(Zone.HAND, playerB, "Lightning Bolt"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Sacrifice a human: Regenerate {this}. "); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerB, "Lightning Bolt", "Fiend of the Shadows"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Sacrifice a human: Regenerate {this}. "); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Lightning Bolt", "Fiend of the Shadows"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); @@ -34,14 +35,14 @@ public class FiendOfTheShadowsTest extends CardTestPlayerBase { @Test public void testCardExile1() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Fiend of the Shadows"); + addCard(Zone.BATTLEFIELD, playerA, "Fiend of the Shadows"); removeAllCardsFromHand(playerB); - addCard(Constants.Zone.HAND, playerB, "Swamp"); + addCard(Zone.HAND, playerB, "Swamp"); attack(1, playerA, "Fiend of the Shadows"); - playLand(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Swamp"); + playLand(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Swamp"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); @@ -53,15 +54,15 @@ public class FiendOfTheShadowsTest extends CardTestPlayerBase { @Test public void testCardExile2() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Fiend of the Shadows"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Zone.BATTLEFIELD, playerA, "Fiend of the Shadows"); removeAllCardsFromHand(playerB); - addCard(Constants.Zone.HAND, playerB, "Lightning Bolt"); + addCard(Zone.HAND, playerB, "Lightning Bolt"); attack(1, playerA, "Fiend of the Shadows"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", playerB); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", playerB); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/FlayerOfTheHateboundTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/FlayerOfTheHateboundTest.java index 1c0fe98c634..dcd58f8ba60 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/FlayerOfTheHateboundTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/FlayerOfTheHateboundTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.filter.Filter; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -15,13 +16,13 @@ public class FlayerOfTheHateboundTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Flayer of the Hatebound"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 1); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt", 1); + addCard(Zone.BATTLEFIELD, playerA, "Flayer of the Hatebound"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1); + addCard(Zone.HAND, playerA, "Lightning Bolt", 1); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Flayer of the Hatebound"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Flayer of the Hatebound"); - setStopAt(2, Constants.PhaseStep.DRAW); + setStopAt(2, PhaseStep.DRAW); execute(); assertLife(playerA, 20); @@ -32,12 +33,12 @@ public class FlayerOfTheHateboundTest extends CardTestPlayerBase { @Test public void testCard1() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Flayer of the Hatebound"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 2); - addCard(Constants.Zone.GRAVEYARD, playerA, "Reassembling Skeleton", 1); + addCard(Zone.BATTLEFIELD, playerA, "Flayer of the Hatebound"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 2); + addCard(Zone.GRAVEYARD, playerA, "Reassembling Skeleton", 1); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{1}{B}:"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{1}{B}:"); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -49,12 +50,12 @@ public class FlayerOfTheHateboundTest extends CardTestPlayerBase { @Test public void testCard2() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Flayer of the Hatebound"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Swamp", 2); - addCard(Constants.Zone.GRAVEYARD, playerB, "Reassembling Skeleton", 1); + addCard(Zone.BATTLEFIELD, playerA, "Flayer of the Hatebound"); + addCard(Zone.BATTLEFIELD, playerB, "Swamp", 2); + addCard(Zone.GRAVEYARD, playerB, "Reassembling Skeleton", 1); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "{1}{B}:"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerB, "{1}{B}:"); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/GiselaBladeOfGoldnightTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/GiselaBladeOfGoldnightTest.java index 38a7f141eba..087c19901b6 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/GiselaBladeOfGoldnightTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/GiselaBladeOfGoldnightTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -15,25 +16,25 @@ public class GiselaBladeOfGoldnightTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 5); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Gisela, Blade of Goldnight"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Devout Chaplain"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Corpse Traders"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt", 4); - addCard(Constants.Zone.HAND, playerA, "Shock"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5); + addCard(Zone.BATTLEFIELD, playerA, "Gisela, Blade of Goldnight"); + addCard(Zone.BATTLEFIELD, playerA, "Devout Chaplain"); + addCard(Zone.BATTLEFIELD, playerA, "Corpse Traders"); + addCard(Zone.HAND, playerA, "Lightning Bolt", 4); + addCard(Zone.HAND, playerA, "Shock"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Air Elemental", 1); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Elite Vanguard", 1); + addCard(Zone.BATTLEFIELD, playerB, "Air Elemental", 1); + addCard(Zone.BATTLEFIELD, playerB, "Elite Vanguard", 1); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Shock", "Air Elemental"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerA); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Devout Chaplain"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Llanowar Elves"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Shock", "Air Elemental"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerA); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Devout Chaplain"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Llanowar Elves"); attack(2, playerB, "Elite Vanguard"); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); // 1 from Lightning Bolt + 1 from Elite Vanguard diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/GrafdiggersCageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/GrafdiggersCageTest.java index e6bd1d774c2..da1fdc81a95 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/GrafdiggersCageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/GrafdiggersCageTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,12 +13,12 @@ public class GrafdiggersCageTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Grafdigger's Cage"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 2); - addCard(Constants.Zone.GRAVEYARD, playerA, "Lingering Souls"); + addCard(Zone.BATTLEFIELD, playerA, "Grafdigger's Cage"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 2); + addCard(Zone.GRAVEYARD, playerA, "Lingering Souls"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Flashback {1}{B}"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Flashback {1}{B}"); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -28,13 +29,13 @@ public class GrafdiggersCageTest extends CardTestPlayerBase { @Test public void testCard1() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Grafdigger's Cage"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 5); - addCard(Constants.Zone.HAND, playerA, "Rise from the Grave", 1); - addCard(Constants.Zone.GRAVEYARD, playerA, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerA, "Grafdigger's Cage"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 5); + addCard(Zone.HAND, playerA, "Rise from the Grave", 1); + addCard(Zone.GRAVEYARD, playerA, "Craw Wurm"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Rise from the Grave", "Craw Wurm"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Rise from the Grave", "Craw Wurm"); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/GravecrawlerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/GravecrawlerTest.java index e3a591a5e11..e6fd71b34e2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/GravecrawlerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/GravecrawlerTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,12 +13,12 @@ public class GravecrawlerTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.GRAVEYARD, playerA, "Gravecrawler"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Black Cat"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); + addCard(Zone.GRAVEYARD, playerA, "Gravecrawler"); + addCard(Zone.BATTLEFIELD, playerA, "Black Cat"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Gravecrawler"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Gravecrawler"); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -28,11 +29,11 @@ public class GravecrawlerTest extends CardTestPlayerBase { @Test public void testCard1() { - addCard(Constants.Zone.GRAVEYARD, playerA, "Gravecrawler"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); + addCard(Zone.GRAVEYARD, playerA, "Gravecrawler"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Gravecrawler"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Gravecrawler"); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -43,23 +44,23 @@ public class GravecrawlerTest extends CardTestPlayerBase { @Test public void testCopiedCantBlockAbilityWorks() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 3); - addCard(Constants.Zone.HAND, playerA, "Cryptoplasm"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Fervor"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 3); + addCard(Zone.HAND, playerA, "Cryptoplasm"); + addCard(Zone.BATTLEFIELD, playerA, "Fervor"); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Gravecrawler"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Llanowar Elves"); + addCard(Zone.BATTLEFIELD, playerB, "Gravecrawler"); + addCard(Zone.BATTLEFIELD, playerB, "Llanowar Elves"); addTarget(playerA, "Gravecrawler"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Cryptoplasm"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cryptoplasm"); attack(3, playerA, "Elite Vanguard"); block(3, playerB, "Gravecrawler", "Elite Vanguard"); attack(4, playerB, "Llanowar Elves"); block(4, playerA, "Gravecrawler", "Llanowar Elves"); - setStopAt(4, Constants.PhaseStep.END_TURN); + setStopAt(4, PhaseStep.END_TURN); execute(); assertPermanentCount(playerA, "Gravecrawler", 1); @@ -70,22 +71,22 @@ public class GravecrawlerTest extends CardTestPlayerBase { @Test public void testCantBlockAbilityAfterChangeZone() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Fervor"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1); + addCard(Zone.BATTLEFIELD, playerA, "Fervor"); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Swamp", 1); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Gravecrawler"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Walking Corpse"); + addCard(Zone.BATTLEFIELD, playerB, "Swamp", 1); + addCard(Zone.BATTLEFIELD, playerB, "Gravecrawler"); + addCard(Zone.BATTLEFIELD, playerB, "Walking Corpse"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Gravecrawler"); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Gravecrawler"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Gravecrawler"); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Gravecrawler"); attack(3, playerA, "Elite Vanguard"); block(3, playerB, "Gravecrawler", "Elite Vanguard"); - setStopAt(3, Constants.PhaseStep.END_TURN); + setStopAt(3, PhaseStep.END_TURN); execute(); assertPermanentCount(playerB, "Gravecrawler", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/GutterGrimeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/GutterGrimeTest.java index 213de062198..0dcf98fcc5d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/GutterGrimeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/GutterGrimeTest.java @@ -1,7 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants.PhaseStep; -import mage.Constants.Zone; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.filter.Filter; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/HavengulLichTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/HavengulLichTest.java index 81b86c733aa..5ae362a72fb 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/HavengulLichTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/HavengulLichTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,14 +13,14 @@ public class HavengulLichTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 4); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Havengul Lich"); - addCard(Constants.Zone.GRAVEYARD, playerA, "Prodigal Pyromancer"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4); + addCard(Zone.BATTLEFIELD, playerA, "Havengul Lich"); + addCard(Zone.GRAVEYARD, playerA, "Prodigal Pyromancer"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{1}", "Prodigal Pyromancer"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Prodigal Pyromancer"); - activateAbility(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "{T}", playerB); - setStopAt(1, Constants.PhaseStep.END_TURN); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{1}", "Prodigal Pyromancer"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Prodigal Pyromancer"); + activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "{T}", playerB); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); @@ -33,13 +34,13 @@ public class HavengulLichTest extends CardTestPlayerBase { @Test public void testCard1() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 3); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Havengul Lich"); - addCard(Constants.Zone.GRAVEYARD, playerA, "Black Cat"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 3); + addCard(Zone.BATTLEFIELD, playerA, "Havengul Lich"); + addCard(Zone.GRAVEYARD, playerA, "Black Cat"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{1}", "Black Cat"); - castSpell(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Black Cat"); - setStopAt(3, Constants.PhaseStep.BEGIN_COMBAT); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{1}", "Black Cat"); + castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Black Cat"); + setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -51,15 +52,15 @@ public class HavengulLichTest extends CardTestPlayerBase { @Test public void testCard2() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 4); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Havengul Lich"); - addCard(Constants.Zone.GRAVEYARD, playerA, "Prodigal Pyromancer"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4); + addCard(Zone.BATTLEFIELD, playerA, "Havengul Lich"); + addCard(Zone.GRAVEYARD, playerA, "Prodigal Pyromancer"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{1}", "Prodigal Pyromancer"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Prodigal Pyromancer"); - activateAbility(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{T}", playerB); - activateAbility(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{T}", playerB); - setStopAt(3, Constants.PhaseStep.BEGIN_COMBAT); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{1}", "Prodigal Pyromancer"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Prodigal Pyromancer"); + activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}", playerB); + activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}", playerB); + setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/HinterlandScourgeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/HinterlandScourgeTest.java index 46de48fc33f..bb5b69d360a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/HinterlandScourgeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/HinterlandScourgeTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,10 +13,10 @@ public class HinterlandScourgeTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Hinterland Hermit"); + addCard(Zone.BATTLEFIELD, playerA, "Hinterland Hermit"); // addCard(Constants.Zone.BATTLEFIELD, playerB, "Ornithopter"); - setStopAt(2, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -26,11 +27,11 @@ public class HinterlandScourgeTest extends CardTestPlayerBase { @Test public void testCard1() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Hinterland Hermit"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Ornithopter"); + addCard(Zone.BATTLEFIELD, playerA, "Hinterland Hermit"); + addCard(Zone.BATTLEFIELD, playerB, "Ornithopter"); attack(3, playerA, "Hinterland Scourge"); - setStopAt(3, Constants.PhaseStep.END_COMBAT); + setStopAt(3, PhaseStep.END_COMBAT); execute(); assertLife(playerA, 20); @@ -42,10 +43,10 @@ public class HinterlandScourgeTest extends CardTestPlayerBase { @Test public void testCard2() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Hinterland Hermit"); + addCard(Zone.BATTLEFIELD, playerA, "Hinterland Hermit"); attack(3, playerA, "Hinterland Scourge"); - setStopAt(3, Constants.PhaseStep.END_COMBAT); + setStopAt(3, PhaseStep.END_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/HollowhengeSpiritTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/HollowhengeSpiritTest.java index 700a2e77670..3175a3c029e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/HollowhengeSpiritTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/HollowhengeSpiritTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -14,13 +15,13 @@ public class HollowhengeSpiritTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 4); - addCard(Constants.Zone.HAND, playerA, "Hollowhenge Spirit"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 4); + addCard(Zone.HAND, playerA, "Hollowhenge Spirit"); + addCard(Zone.BATTLEFIELD, playerB, "Craw Wurm"); - castSpell(2, Constants.PhaseStep.DECLARE_BLOCKERS, playerA, "Hollowhenge Spirit"); + castSpell(2, PhaseStep.DECLARE_BLOCKERS, playerA, "Hollowhenge Spirit"); attack(2, playerB, "Craw Wurm"); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); @@ -33,13 +34,13 @@ public class HollowhengeSpiritTest extends CardTestPlayerBase { @Test public void testCard1() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 4); - addCard(Constants.Zone.HAND, playerA, "Hollowhenge Spirit"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 4); + addCard(Zone.HAND, playerA, "Hollowhenge Spirit"); + addCard(Zone.BATTLEFIELD, playerA, "Craw Wurm"); - castSpell(1, Constants.PhaseStep.DECLARE_BLOCKERS, playerA, "Hollowhenge Spirit"); + castSpell(1, PhaseStep.DECLARE_BLOCKERS, playerA, "Hollowhenge Spirit"); attack(1, playerA, "Craw Wurm"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); @@ -52,12 +53,12 @@ public class HollowhengeSpiritTest extends CardTestPlayerBase { @Test public void testCard2() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 4); - addCard(Constants.Zone.HAND, playerA, "Hollowhenge Spirit"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 4); + addCard(Zone.HAND, playerA, "Hollowhenge Spirit"); + addCard(Zone.BATTLEFIELD, playerA, "Craw Wurm"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Hollowhenge Spirit"); - setStopAt(1, Constants.PhaseStep.END_TURN); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Hollowhenge Spirit"); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/HomicidalBruteTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/HomicidalBruteTest.java index 2fb1b504853..cb8bf00b189 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/HomicidalBruteTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/HomicidalBruteTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -14,11 +15,11 @@ public class HomicidalBruteTest extends CardTestPlayerBase { public void testCard() { removeAllCardsFromHand(playerA); removeAllCardsFromLibrary(playerA); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Civilized Scholar"); - addCard(Constants.Zone.LIBRARY, playerA, "Sejiri Merfolk"); + addCard(Zone.BATTLEFIELD, playerA, "Civilized Scholar"); + addCard(Zone.LIBRARY, playerA, "Sejiri Merfolk"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Draw a card, then discard a card. "); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Draw a card, then discard a card. "); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -32,11 +33,11 @@ public class HomicidalBruteTest extends CardTestPlayerBase { public void testCardNegative() { removeAllCardsFromHand(playerA); removeAllCardsFromLibrary(playerA); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Civilized Scholar"); - addCard(Constants.Zone.LIBRARY, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Civilized Scholar"); + addCard(Zone.LIBRARY, playerA, "Lightning Bolt"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Draw a card, then discard a card. "); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Draw a card, then discard a card. "); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -50,11 +51,11 @@ public class HomicidalBruteTest extends CardTestPlayerBase { public void testCardTransform() { removeAllCardsFromHand(playerA); removeAllCardsFromLibrary(playerA); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Civilized Scholar"); - addCard(Constants.Zone.LIBRARY, playerA, "Sejiri Merfolk"); + addCard(Zone.BATTLEFIELD, playerA, "Civilized Scholar"); + addCard(Zone.LIBRARY, playerA, "Sejiri Merfolk"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Draw a card, then discard a card. "); - setStopAt(2, Constants.PhaseStep.UPKEEP); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Draw a card, then discard a card. "); + setStopAt(2, PhaseStep.UPKEEP); execute(); assertLife(playerA, 20); @@ -68,12 +69,12 @@ public class HomicidalBruteTest extends CardTestPlayerBase { public void testCardNotTransform() { removeAllCardsFromHand(playerA); removeAllCardsFromLibrary(playerA); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Civilized Scholar"); - addCard(Constants.Zone.LIBRARY, playerA, "Sejiri Merfolk", 2); + addCard(Zone.BATTLEFIELD, playerA, "Civilized Scholar"); + addCard(Zone.LIBRARY, playerA, "Sejiri Merfolk", 2); - activateAbility(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Draw a card, then discard a card. "); + activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Draw a card, then discard a card. "); attack(3, playerA, "Homicidal Brute"); - setStopAt(4, Constants.PhaseStep.UPKEEP); + setStopAt(4, PhaseStep.UPKEEP); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/HomicidalSeclusionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/HomicidalSeclusionTest.java index f05f68abad3..1a318dfb3cb 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/HomicidalSeclusionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/HomicidalSeclusionTest.java @@ -1,9 +1,10 @@ package org.mage.test.cards.single; -import mage.Constants; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; import mage.abilities.keyword.LifelinkAbility; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.filter.Filter; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -19,11 +20,11 @@ public class HomicidalSeclusionTest extends CardTestPlayerBase { */ @Test public void testNoSingleCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Homicidal Seclusion"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Air Elemental", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Horned Turtle", 1); + addCard(Zone.BATTLEFIELD, playerA, "Homicidal Seclusion"); + addCard(Zone.BATTLEFIELD, playerA, "Air Elemental", 1); + addCard(Zone.BATTLEFIELD, playerA, "Horned Turtle", 1); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -38,11 +39,11 @@ public class HomicidalSeclusionTest extends CardTestPlayerBase { */ @Test public void testSingleCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Homicidal Seclusion"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Horned Turtle", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Zone.BATTLEFIELD, playerA, "Homicidal Seclusion"); + addCard(Zone.BATTLEFIELD, playerA, "Horned Turtle", 1); + addCard(Zone.BATTLEFIELD, playerA, "Mountain"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -60,10 +61,10 @@ public class HomicidalSeclusionTest extends CardTestPlayerBase { */ @Test public void testMultiInstances() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Homicidal Seclusion", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Horned Turtle", 1); + addCard(Zone.BATTLEFIELD, playerA, "Homicidal Seclusion", 2); + addCard(Zone.BATTLEFIELD, playerA, "Horned Turtle", 1); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -77,15 +78,15 @@ public class HomicidalSeclusionTest extends CardTestPlayerBase { */ @Test public void testApplyInProgress() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Homicidal Seclusion"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Air Elemental"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Homicidal Seclusion"); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Air Elemental"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Elite Vanguard"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Elite Vanguard"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/HuntmasterOfTheFellsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/HuntmasterOfTheFellsTest.java index fee1451d238..67ab4aaba64 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/HuntmasterOfTheFellsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/HuntmasterOfTheFellsTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,13 +13,13 @@ public class HuntmasterOfTheFellsTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 3); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); - addCard(Constants.Zone.HAND, playerA, "Huntmaster of the Fells"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Ornithopter"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 3); + addCard(Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Zone.HAND, playerA, "Huntmaster of the Fells"); + addCard(Zone.BATTLEFIELD, playerB, "Ornithopter"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Huntmaster of the Fells"); - setStopAt(3, Constants.PhaseStep.DRAW); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Huntmaster of the Fells"); + setStopAt(3, PhaseStep.DRAW); execute(); assertLife(playerA, 22); @@ -34,18 +35,18 @@ public class HuntmasterOfTheFellsTest extends CardTestPlayerBase { */ @Test public void testCard2() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 3); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); - addCard(Constants.Zone.HAND, playerA, "Huntmaster of the Fells"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Ornithopter"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 3); + addCard(Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Zone.HAND, playerA, "Huntmaster of the Fells"); + addCard(Zone.BATTLEFIELD, playerB, "Ornithopter"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Mountain", 2); - addCard(Constants.Zone.HAND, playerB, "Lightning Bolt", 2); + addCard(Zone.BATTLEFIELD, playerB, "Mountain", 2); + addCard(Zone.HAND, playerB, "Lightning Bolt", 2); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Huntmaster of the Fells"); - castSpell(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", playerA); - castSpell(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", playerA); - setStopAt(4, Constants.PhaseStep.DRAW); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Huntmaster of the Fells"); + castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", playerA); + castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", playerA); + setStopAt(4, PhaseStep.DRAW); execute(); assertLife(playerA, 18); // -6 damage, +4 life diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/ImmerwolfTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/ImmerwolfTest.java index 6277b20bb6d..43910962944 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/ImmerwolfTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/ImmerwolfTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,11 +13,11 @@ public class ImmerwolfTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Afflicted Deserter"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Immerwolf"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Ornithopter"); + addCard(Zone.BATTLEFIELD, playerA, "Afflicted Deserter"); + addCard(Zone.BATTLEFIELD, playerA, "Immerwolf"); + addCard(Zone.BATTLEFIELD, playerB, "Ornithopter"); - setStopAt(2, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -28,15 +29,15 @@ public class ImmerwolfTest extends CardTestPlayerBase { @Test public void testCard1() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Afflicted Deserter"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Immerwolf"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Ornithopter"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Mountain", 2); - addCard(Constants.Zone.HAND, playerB, "Lightning Bolt", 2); + addCard(Zone.BATTLEFIELD, playerA, "Afflicted Deserter"); + addCard(Zone.BATTLEFIELD, playerA, "Immerwolf"); + addCard(Zone.BATTLEFIELD, playerB, "Ornithopter"); + addCard(Zone.BATTLEFIELD, playerB, "Mountain", 2); + addCard(Zone.HAND, playerB, "Lightning Bolt", 2); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", playerA); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", playerA); - setStopAt(3, Constants.PhaseStep.DRAW); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", playerA); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", playerA); + setStopAt(3, PhaseStep.DRAW); execute(); assertLife(playerA, 14); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/IncreasingCardsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/IncreasingCardsTest.java index df2cd36fd91..b7a70b17677 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/IncreasingCardsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/IncreasingCardsTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.filter.Filter; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -17,14 +18,14 @@ public class IncreasingCardsTest extends CardTestPlayerBase { public void testIncreasingAmbition() { removeAllCardsFromHand(playerA); removeAllCardsFromLibrary(playerA); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 8); - addCard(Constants.Zone.HAND, playerA, "Increasing Ambition"); - addCard(Constants.Zone.LIBRARY, playerA, "Swamp", 4); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 8); + addCard(Zone.HAND, playerA, "Increasing Ambition"); + addCard(Zone.LIBRARY, playerA, "Swamp", 4); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Increasing Ambition"); - activateAbility(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Flashback {7}{B}"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Increasing Ambition"); + activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Flashback {7}{B}"); - setStopAt(3, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -37,13 +38,13 @@ public class IncreasingCardsTest extends CardTestPlayerBase { @Test public void testIncreasingConfusion() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 4); - addCard(Constants.Zone.HAND, playerA, "Increasing Confusion"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 4); + addCard(Zone.HAND, playerA, "Increasing Confusion"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Increasing Confusion"); - activateAbility(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Flashback {X}{U}"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Increasing Confusion"); + activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Flashback {X}{U}"); - setStopAt(3, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -56,13 +57,13 @@ public class IncreasingCardsTest extends CardTestPlayerBase { @Test public void testIncreasingDevotion() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 9); - addCard(Constants.Zone.HAND, playerA, "Increasing Devotion"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 9); + addCard(Zone.HAND, playerA, "Increasing Devotion"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Increasing Devotion"); - activateAbility(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Flashback {7}{W}{W}"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Increasing Devotion"); + activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Flashback {7}{W}{W}"); - setStopAt(3, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -75,14 +76,14 @@ public class IncreasingCardsTest extends CardTestPlayerBase { @Test public void testIncreasingSavagery() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 7); - addCard(Constants.Zone.HAND, playerA, "Increasing Savagery"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Ornithopter"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 7); + addCard(Zone.HAND, playerA, "Increasing Savagery"); + addCard(Zone.BATTLEFIELD, playerA, "Ornithopter"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Increasing Savagery"); - activateAbility(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Flashback {5}{G}{G}"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Increasing Savagery"); + activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Flashback {5}{G}{G}"); - setStopAt(3, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -95,16 +96,16 @@ public class IncreasingCardsTest extends CardTestPlayerBase { @Test public void testIncreasingVengeance() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 6); - addCard(Constants.Zone.HAND, playerA, "Increasing Vengeance"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt", 2); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 6); + addCard(Zone.HAND, playerA, "Increasing Vengeance"); + addCard(Zone.HAND, playerA, "Lightning Bolt", 2); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Increasing Vengeance", "Lightning Bolt"); - castSpell(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); - activateAbility(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Flashback {3}{R}{R}"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Increasing Vengeance", "Lightning Bolt"); + castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); + activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Flashback {3}{R}{R}"); - setStopAt(3, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/NecroticPlagueTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/NecroticPlagueTest.java index bc8af1ccf61..5227b49a598 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/NecroticPlagueTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/NecroticPlagueTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -15,13 +16,13 @@ public class NecroticPlagueTest extends CardTestPlayerBase { @Test public void testCard1() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 4); - addCard(Constants.Zone.HAND, playerA, "Necrotic Plague"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Sejiri Merfolk"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 4); + addCard(Zone.HAND, playerA, "Necrotic Plague"); + addCard(Zone.BATTLEFIELD, playerB, "Sejiri Merfolk"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Necrotic Plague", "Sejiri Merfolk"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Necrotic Plague", "Sejiri Merfolk"); - setStopAt(2, Constants.PhaseStep.PRECOMBAT_MAIN); + setStopAt(2, PhaseStep.PRECOMBAT_MAIN); execute(); assertLife(playerA, 20); @@ -34,14 +35,14 @@ public class NecroticPlagueTest extends CardTestPlayerBase { @Test public void testCard2() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 4); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Goblin Deathraiders"); - addCard(Constants.Zone.HAND, playerA, "Necrotic Plague"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Sejiri Merfolk"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 4); + addCard(Zone.BATTLEFIELD, playerA, "Goblin Deathraiders"); + addCard(Zone.HAND, playerA, "Necrotic Plague"); + addCard(Zone.BATTLEFIELD, playerB, "Sejiri Merfolk"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Necrotic Plague", "Sejiri Merfolk"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Necrotic Plague", "Sejiri Merfolk"); - setStopAt(3, Constants.PhaseStep.PRECOMBAT_MAIN); + setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/SeanceTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/SeanceTest.java index 89923983a3d..41b07567d01 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/SeanceTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/SeanceTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,10 +13,10 @@ public class SeanceTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Seance"); - addCard(Constants.Zone.GRAVEYARD, playerA, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerA, "Seance"); + addCard(Zone.GRAVEYARD, playerA, "Craw Wurm"); - setStopAt(1, Constants.PhaseStep.DRAW); + setStopAt(1, PhaseStep.DRAW); execute(); assertLife(playerA, 20); @@ -26,10 +27,10 @@ public class SeanceTest extends CardTestPlayerBase { @Test public void testCard1() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Seance"); - addCard(Constants.Zone.GRAVEYARD, playerA, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerA, "Seance"); + addCard(Zone.GRAVEYARD, playerA, "Craw Wurm"); - setStopAt(2, Constants.PhaseStep.DRAW); + setStopAt(2, PhaseStep.DRAW); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/SecretsOfTheDeadTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/SecretsOfTheDeadTest.java index 3fb42e15d97..ca66849f491 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/SecretsOfTheDeadTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/SecretsOfTheDeadTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,12 +13,12 @@ public class SecretsOfTheDeadTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Secrets of the Dead"); - addCard(Constants.Zone.GRAVEYARD, playerA, "Lingering Souls"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 2); + addCard(Zone.BATTLEFIELD, playerA, "Secrets of the Dead"); + addCard(Zone.GRAVEYARD, playerA, "Lingering Souls"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Flashback {1}{B}"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Flashback {1}{B}"); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -28,11 +29,11 @@ public class SecretsOfTheDeadTest extends CardTestPlayerBase { @Test public void testCard1() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 2); - addCard(Constants.Zone.GRAVEYARD, playerA, "Lingering Souls"); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 2); + addCard(Zone.GRAVEYARD, playerA, "Lingering Souls"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Flashback {1}{B}"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Flashback {1}{B}"); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/SightlessGhoulTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/SightlessGhoulTest.java index bb3148ad9e8..17aec3c9ec2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/SightlessGhoulTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/SightlessGhoulTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.counters.CounterType; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,13 +13,13 @@ public class SightlessGhoulTest extends CardTestPlayerBase { @Test public void testUndying() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Sightless Ghoul"); + addCard(Zone.BATTLEFIELD, playerA, "Sightless Ghoul"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Mountain", 1); - addCard(Constants.Zone.HAND, playerB, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerB, "Mountain", 1); + addCard(Zone.HAND, playerB, "Lightning Bolt"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", "Sightless Ghoul"); - setStopAt(1, Constants.PhaseStep.END_TURN); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", "Sightless Ghoul"); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/SorinLordOfInnistradTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/SorinLordOfInnistradTest.java index 8101b16b6a1..902dd6fb882 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/SorinLordOfInnistradTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/SorinLordOfInnistradTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.Filter; import org.junit.Test; @@ -16,10 +17,10 @@ public class SorinLordOfInnistradTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Sorin, Lord of Innistrad"); + addCard(Zone.BATTLEFIELD, playerA, "Sorin, Lord of Innistrad"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "+1: Put a a 1/1 black Vampire creature token with lifelink onto the battlefield. "); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+1: Put a a 1/1 black Vampire creature token with lifelink onto the battlefield. "); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -31,13 +32,13 @@ public class SorinLordOfInnistradTest extends CardTestPlayerBase { @Test public void testCard2() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Sorin, Lord of Innistrad"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Sejiri Merfolk"); + addCard(Zone.BATTLEFIELD, playerA, "Sorin, Lord of Innistrad"); + addCard(Zone.BATTLEFIELD, playerA, "Sejiri Merfolk"); - addCounters(1, Constants.PhaseStep.UPKEEP, playerA, "Sorin, Lord of Innistrad", CounterType.LOYALTY, 1); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "-2: You get an emblem with "); - activateAbility(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "-2: You get an emblem with "); - setStopAt(3, Constants.PhaseStep.BEGIN_COMBAT); + addCounters(1, PhaseStep.UPKEEP, playerA, "Sorin, Lord of Innistrad", CounterType.LOYALTY, 1); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "-2: You get an emblem with "); + activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "-2: You get an emblem with "); + setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -49,13 +50,13 @@ public class SorinLordOfInnistradTest extends CardTestPlayerBase { @Test public void testCard3() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Sorin, Lord of Innistrad"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Craw Wurm"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Angel of Mercy"); + addCard(Zone.BATTLEFIELD, playerA, "Sorin, Lord of Innistrad"); + addCard(Zone.BATTLEFIELD, playerB, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerB, "Angel of Mercy"); - addCounters(1, Constants.PhaseStep.UPKEEP, playerA, "Sorin, Lord of Innistrad", CounterType.LOYALTY, 3); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "-6: ", "Craw Wurm^Angel of Mercy"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + addCounters(1, PhaseStep.UPKEEP, playerA, "Sorin, Lord of Innistrad", CounterType.LOYALTY, 3); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "-6: ", "Craw Wurm^Angel of Mercy"); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerA, "Craw Wurm", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/SoulSeizerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/SoulSeizerTest.java index 6ed8dcac016..dab1014827a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/SoulSeizerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/SoulSeizerTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.Filter; import org.junit.Ignore; @@ -16,11 +17,11 @@ public class SoulSeizerTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Soul Seizer"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerA, "Soul Seizer"); + addCard(Zone.BATTLEFIELD, playerB, "Craw Wurm"); attack(1, playerA, "Soul Seizer"); - setStopAt(1, Constants.PhaseStep.END_COMBAT); + setStopAt(1, PhaseStep.END_COMBAT); execute(); assertLife(playerA, 20); @@ -32,15 +33,15 @@ public class SoulSeizerTest extends CardTestPlayerBase { @Test public void testCard1() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Soul Seizer"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Craw Wurm"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Plains", 2); - addCard(Constants.Zone.HAND, playerB, "Clear"); + addCard(Zone.BATTLEFIELD, playerA, "Soul Seizer"); + addCard(Zone.BATTLEFIELD, playerB, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerB, "Plains", 2); + addCard(Zone.HAND, playerB, "Clear"); attack(1, playerA, "Soul Seizer"); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Clear", "Ghastly Haunting"); - setStopAt(2, Constants.PhaseStep.BEGIN_COMBAT); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Clear", "Ghastly Haunting"); + setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -53,14 +54,14 @@ public class SoulSeizerTest extends CardTestPlayerBase { @Test public void testCard2() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Soul Seizer"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 2); - addCard(Constants.Zone.HAND, playerA, "Battlegrowth"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerA, "Soul Seizer"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 2); + addCard(Zone.HAND, playerA, "Battlegrowth"); + addCard(Zone.BATTLEFIELD, playerB, "Craw Wurm"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Battlegrowth", "Soul Seizer"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Battlegrowth", "Soul Seizer"); attack(1, playerA, "Soul Seizer"); - setStopAt(1, Constants.PhaseStep.END_COMBAT); + setStopAt(1, PhaseStep.END_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/SuddenDisappearanceTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/SuddenDisappearanceTest.java index ea0f60a0790..30505016989 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/SuddenDisappearanceTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/SuddenDisappearanceTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,15 +13,15 @@ public class SuddenDisappearanceTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 6); - addCard(Constants.Zone.HAND, playerA, "Sudden Disappearance"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Air Elemental", 1); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Horned Turtle", 4); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Altar of the Lost", 1); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 6); + addCard(Zone.HAND, playerA, "Sudden Disappearance"); + addCard(Zone.BATTLEFIELD, playerB, "Air Elemental", 1); + addCard(Zone.BATTLEFIELD, playerB, "Horned Turtle", 4); + addCard(Zone.BATTLEFIELD, playerB, "Altar of the Lost", 1); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Sudden Disappearance", playerB); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Sudden Disappearance", playerB); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -36,15 +37,15 @@ public class SuddenDisappearanceTest extends CardTestPlayerBase { @Test public void testCard1() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 6); - addCard(Constants.Zone.HAND, playerA, "Sudden Disappearance"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Air Elemental", 1); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Horned Turtle", 4); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Altar of the Lost", 1); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 6); + addCard(Zone.HAND, playerA, "Sudden Disappearance"); + addCard(Zone.BATTLEFIELD, playerB, "Air Elemental", 1); + addCard(Zone.BATTLEFIELD, playerB, "Horned Turtle", 4); + addCard(Zone.BATTLEFIELD, playerB, "Altar of the Lost", 1); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Sudden Disappearance", playerB); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Sudden Disappearance", playerB); - setStopAt(2, Constants.PhaseStep.UPKEEP); + setStopAt(2, PhaseStep.UPKEEP); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/TurnToFrogTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/TurnToFrogTest.java index 96411698162..597dc87111d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/TurnToFrogTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/TurnToFrogTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.Filter; import org.junit.Test; @@ -16,17 +17,17 @@ public class TurnToFrogTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 3); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Raging Ravine"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Island", 2); - addCard(Constants.Zone.HAND, playerB, "Turn to Frog"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 1); + addCard(Zone.BATTLEFIELD, playerA, "Raging Ravine"); + addCard(Zone.BATTLEFIELD, playerB, "Island", 2); + addCard(Zone.HAND, playerB, "Turn to Frog"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{2}{R}{G}: Until end of turn {this} becomes a 3/3 red and green Elemental creature with \"Whenever this creature attacks, put a +1/+1 counter on it.\" that's still a land. "); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Turn to Frog", "Raging Ravine"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{2}{R}{G}: Until end of turn {this} becomes a 3/3 red and green Elemental creature with \"Whenever this creature attacks, put a +1/+1 counter on it.\" that's still a land. "); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Turn to Frog", "Raging Ravine"); attack(1, playerA, "Raging Ravine"); - setStopAt(1, Constants.PhaseStep.END_COMBAT); + setStopAt(1, PhaseStep.END_COMBAT); execute(); assertLife(playerA, 20); @@ -37,19 +38,19 @@ public class TurnToFrogTest extends CardTestPlayerBase { @Test public void testCard2() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 3); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Raging Ravine"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Island", 2); - addCard(Constants.Zone.HAND, playerB, "Turn to Frog"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 1); + addCard(Zone.BATTLEFIELD, playerA, "Raging Ravine"); + addCard(Zone.BATTLEFIELD, playerB, "Island", 2); + addCard(Zone.HAND, playerB, "Turn to Frog"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{2}{R}{G}: Until end of turn {this} becomes a 3/3 red and green Elemental creature with \"Whenever this creature attacks, put a +1/+1 counter on it.\" that's still a land. "); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Turn to Frog", "Raging Ravine"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{2}{R}{G}: Until end of turn {this} becomes a 3/3 red and green Elemental creature with \"Whenever this creature attacks, put a +1/+1 counter on it.\" that's still a land. "); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Turn to Frog", "Raging Ravine"); - activateAbility(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{2}{R}{G}: Until end of turn {this} becomes a 3/3 red and green Elemental creature with \"Whenever this creature attacks, put a +1/+1 counter on it.\" that's still a land. "); + activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{2}{R}{G}: Until end of turn {this} becomes a 3/3 red and green Elemental creature with \"Whenever this creature attacks, put a +1/+1 counter on it.\" that's still a land. "); attack(3, playerA, "Raging Ravine"); - setStopAt(3, Constants.PhaseStep.END_COMBAT); + setStopAt(3, PhaseStep.END_COMBAT); execute(); assertLife(playerA, 20); @@ -60,20 +61,20 @@ public class TurnToFrogTest extends CardTestPlayerBase { @Test public void testCard3() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 6); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 6); - addCard(Constants.Zone.HAND, playerA, "Public Execution"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 6); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 6); + addCard(Zone.HAND, playerA, "Public Execution"); // Turn to Frog - Instant, 1U - Target creature loses all abilities and becomes a 1/1 blue Frog until end of turn. - addCard(Constants.Zone.HAND, playerA, "Turn to Frog"); + addCard(Zone.HAND, playerA, "Turn to Frog"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Llanowar Elves"); + addCard(Zone.BATTLEFIELD, playerB, "Llanowar Elves"); // Craw Wurm - Creature — Wurm 6/4, 4GG - addCard(Constants.Zone.BATTLEFIELD, playerB, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerB, "Craw Wurm"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Public Execution", "Llanowar Elves"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Turn to Frog", "Craw Wurm"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Public Execution", "Llanowar Elves"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Turn to Frog", "Craw Wurm"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertPermanentCount(playerB, "Llanowar Elves", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/UnhallowedCatharTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/UnhallowedCatharTest.java index b0bc321e244..e7252ec6de4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/UnhallowedCatharTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/UnhallowedCatharTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,12 +13,12 @@ public class UnhallowedCatharTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Loyal Cathar"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Zone.BATTLEFIELD, playerA, "Loyal Cathar"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Loyal Cathar"); - setStopAt(2, Constants.PhaseStep.DRAW); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Loyal Cathar"); + setStopAt(2, PhaseStep.DRAW); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/WardenOfTheWallTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/WardenOfTheWallTest.java index 808dff71f72..68e2de3b723 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/WardenOfTheWallTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/WardenOfTheWallTest.java @@ -1,7 +1,8 @@ package org.mage.test.cards.single; -import mage.Constants; -import mage.Constants.CardType; +import mage.constants.CardType; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.filter.Filter; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -14,9 +15,9 @@ public class WardenOfTheWallTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Warden of the Wall"); + addCard(Zone.BATTLEFIELD, playerA, "Warden of the Wall"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -26,9 +27,9 @@ public class WardenOfTheWallTest extends CardTestPlayerBase { @Test public void testCard1() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Warden of the Wall"); + addCard(Zone.BATTLEFIELD, playerA, "Warden of the Wall"); - setStopAt(2, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/WerewolfRansackerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/WerewolfRansackerTest.java index cda697c9c0a..fce9925e2c2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/WerewolfRansackerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/WerewolfRansackerTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,10 +13,10 @@ public class WerewolfRansackerTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Afflicted Deserter"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Ornithopter"); + addCard(Zone.BATTLEFIELD, playerA, "Afflicted Deserter"); + addCard(Zone.BATTLEFIELD, playerB, "Ornithopter"); - setStopAt(2, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -27,14 +28,14 @@ public class WerewolfRansackerTest extends CardTestPlayerBase { @Test public void testCard1() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 3); - addCard(Constants.Zone.HAND, playerA, "Blade Splicer"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Mountain", 4); - addCard(Constants.Zone.HAND, playerB, "Afflicted Deserter"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 3); + addCard(Zone.HAND, playerA, "Blade Splicer"); + addCard(Zone.BATTLEFIELD, playerB, "Mountain", 4); + addCard(Zone.HAND, playerB, "Afflicted Deserter"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Blade Splicer"); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Afflicted Deserter"); - setStopAt(4, Constants.PhaseStep.DRAW); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Blade Splicer"); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Afflicted Deserter"); + setStopAt(4, PhaseStep.DRAW); execute(); assertLife(playerA, 20); @@ -47,14 +48,14 @@ public class WerewolfRansackerTest extends CardTestPlayerBase { @Test public void testCard2() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Afflicted Deserter"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Ornithopter"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Mountain", 2); - addCard(Constants.Zone.HAND, playerB, "Lightning Bolt", 2); + addCard(Zone.BATTLEFIELD, playerA, "Afflicted Deserter"); + addCard(Zone.BATTLEFIELD, playerB, "Ornithopter"); + addCard(Zone.BATTLEFIELD, playerB, "Mountain", 2); + addCard(Zone.HAND, playerB, "Lightning Bolt", 2); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", playerA); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", playerA); - setStopAt(3, Constants.PhaseStep.DRAW); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", playerA); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", playerA); + setStopAt(3, PhaseStep.DRAW); execute(); assertLife(playerA, 14); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/ZombieApocalypseTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/ZombieApocalypseTest.java index 38a8c26be39..7d94ad6ab92 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/ZombieApocalypseTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/ZombieApocalypseTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,16 +13,16 @@ public class ZombieApocalypseTest extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp", 6); - addCard(Constants.Zone.HAND, playerA, "Zombie Apocalypse"); - addCard(Constants.Zone.GRAVEYARD, playerA, "Bog Raiders", 2); - addCard(Constants.Zone.GRAVEYARD, playerA, "Toxic Nim", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "White Knight"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Black Knight", 2); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 6); + addCard(Zone.HAND, playerA, "Zombie Apocalypse"); + addCard(Zone.GRAVEYARD, playerA, "Bog Raiders", 2); + addCard(Zone.GRAVEYARD, playerA, "Toxic Nim", 1); + addCard(Zone.BATTLEFIELD, playerA, "White Knight"); + addCard(Zone.BATTLEFIELD, playerB, "Black Knight", 2); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Zombie Apocalypse"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Zombie Apocalypse"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertGraveyardCount(playerA, 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/avr/CavernOfSoulsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/avr/CavernOfSoulsTest.java index dca47210c4b..23610149f1f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/avr/CavernOfSoulsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/avr/CavernOfSoulsTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single.avr; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -15,17 +16,17 @@ public class CavernOfSoulsTest extends CardTestPlayerBase { */ @Test public void testCastDrake() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 3); - addCard(Constants.Zone.HAND, playerA, "Cavern of Souls"); - addCard(Constants.Zone.HAND, playerA, "Azure Drake"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3); + addCard(Zone.HAND, playerA, "Cavern of Souls"); + addCard(Zone.HAND, playerA, "Azure Drake"); setChoice(playerA, "Drake"); setChoice(playerA, "Blue"); - playLand(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Cavern of Souls"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Azure Drake"); + playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cavern of Souls"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Azure Drake"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerA, "Azure Drake", 1); @@ -37,20 +38,20 @@ public class CavernOfSoulsTest extends CardTestPlayerBase { */ @Test public void testNoCastBecauseOfCreatureType() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 1); - addCard(Constants.Zone.HAND, playerA, "Cavern of Souls"); - addCard(Constants.Zone.HAND, playerA, "Abuna Acolyte"); - addCard(Constants.Zone.HAND, playerA, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1); + addCard(Zone.HAND, playerA, "Cavern of Souls"); + addCard(Zone.HAND, playerA, "Abuna Acolyte"); + addCard(Zone.HAND, playerA, "Elite Vanguard"); setChoice(playerA, "Human"); setChoice(playerA, "White"); setChoice(playerA, "White"); - playLand(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Cavern of Souls"); // choose Human - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Abuna Acolyte"); // not Human but Cat Cleric - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Vanguard"); // Human + playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cavern of Souls"); // choose Human + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Abuna Acolyte"); // not Human but Cat Cleric + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Vanguard"); // Human - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerA, "Abuna Acolyte", 0); @@ -62,18 +63,18 @@ public class CavernOfSoulsTest extends CardTestPlayerBase { */ @Test public void testDrakeCountered() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 3); - addCard(Constants.Zone.HAND, playerA, "Island"); - addCard(Constants.Zone.HAND, playerA, "Azure Drake"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3); + addCard(Zone.HAND, playerA, "Island"); + addCard(Zone.HAND, playerA, "Azure Drake"); - addCard(Constants.Zone.HAND, playerB, "Remove Soul"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Island", 2); + addCard(Zone.HAND, playerB, "Remove Soul"); + addCard(Zone.BATTLEFIELD, playerB, "Island", 2); - playLand(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Island"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Azure Drake"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Remove Soul"); + playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Island"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Azure Drake"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Remove Soul"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertPermanentCount(playerA, "Azure Drake", 0); @@ -85,21 +86,21 @@ public class CavernOfSoulsTest extends CardTestPlayerBase { */ @Test public void testDrakeCantBeCountered() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 3); - addCard(Constants.Zone.HAND, playerA, "Cavern of Souls"); - addCard(Constants.Zone.HAND, playerA, "Azure Drake"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3); + addCard(Zone.HAND, playerA, "Cavern of Souls"); + addCard(Zone.HAND, playerA, "Azure Drake"); - addCard(Constants.Zone.HAND, playerB, "Remove Soul"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Island", 2); + addCard(Zone.HAND, playerB, "Remove Soul"); + addCard(Zone.BATTLEFIELD, playerB, "Island", 2); setChoice(playerA, "Drake"); setChoice(playerA, "Blue"); - playLand(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Cavern of Souls"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Azure Drake"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Remove Soul"); + playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cavern of Souls"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Azure Drake"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Remove Soul"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); // check wasn't countered diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/roe/CastThroughTimeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/roe/CastThroughTimeTest.java index 61ba865ed94..eaf025e30ca 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/roe/CastThroughTimeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/roe/CastThroughTimeTest.java @@ -1,7 +1,8 @@ package org.mage.test.cards.single.roe; -import mage.Constants; import mage.cards.Card; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -17,18 +18,18 @@ public class CastThroughTimeTest extends CardTestPlayerBase { */ @Test public void testCastWithRebound() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 1); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1); /* * Instant and sorcery spells you control have rebound. (Exile the spell as * it resolves if you cast it from your hand. At the beginning of your next * upkeep, you may cast that card from exile without paying its mana cost.) * */ - addCard(Constants.Zone.BATTLEFIELD, playerA, "Cast Through Time"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Cast Through Time"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); - setStopAt(3, Constants.PhaseStep.BEGIN_COMBAT); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); + setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerB, 14); @@ -40,12 +41,12 @@ public class CastThroughTimeTest extends CardTestPlayerBase { */ @Test public void testCastWithDoubleRebound() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Cast Through Time", 2); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1); + addCard(Zone.BATTLEFIELD, playerA, "Cast Through Time", 2); + addCard(Zone.HAND, playerA, "Lightning Bolt"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); - setStopAt(3, Constants.PhaseStep.BEGIN_COMBAT); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); + setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerB, 14); @@ -56,10 +57,10 @@ public class CastThroughTimeTest extends CardTestPlayerBase { */ @Test public void testReboundTooltipExists() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Cast Through Time"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Cast Through Time"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); boolean found = false; @@ -81,15 +82,15 @@ public class CastThroughTimeTest extends CardTestPlayerBase { */ @Test public void testCastWithoutRebound() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Cast Through Time"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); - addCard(Constants.Zone.HAND, playerA, "Naturalize"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 2); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 2); + addCard(Zone.BATTLEFIELD, playerA, "Cast Through Time"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.HAND, playerA, "Naturalize"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Naturalize", "Cast Through Time"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", playerB); - setStopAt(3, Constants.PhaseStep.BEGIN_COMBAT); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Naturalize", "Cast Through Time"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", playerB); + setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerB, 17); @@ -100,12 +101,12 @@ public class CastThroughTimeTest extends CardTestPlayerBase { */ @Test public void testInAnotherZone() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 1); - addCard(Constants.Zone.GRAVEYARD, playerA, "Cast Through Time"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1); + addCard(Zone.GRAVEYARD, playerA, "Cast Through Time"); + addCard(Zone.HAND, playerA, "Lightning Bolt"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", playerB); - setStopAt(3, Constants.PhaseStep.BEGIN_COMBAT); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", playerB); + setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerB, 17); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/roe/WorldAtWarTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/roe/WorldAtWarTest.java index 2ba33291607..2a1675f3d57 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/roe/WorldAtWarTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/roe/WorldAtWarTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.single.roe; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.game.permanent.Permanent; import org.junit.Assert; import org.junit.Test; @@ -17,20 +18,20 @@ public class WorldAtWarTest extends CardTestPlayerBase { */ @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 5); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Fervor"); - addCard(Constants.Zone.HAND, playerA, "World at War"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Warclamp Mastiff"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5); + addCard(Zone.BATTLEFIELD, playerA, "Fervor"); + addCard(Zone.HAND, playerA, "World at War"); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Warclamp Mastiff"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "World at War"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "World at War"); attack(1, playerA, "Elite Vanguard"); attack(1, playerA, "Elite Vanguard"); attack(1, playerA, "Warclamp Mastiff"); attack(1, playerA, "Warclamp Mastiff"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerB, 14); @@ -43,13 +44,13 @@ public class WorldAtWarTest extends CardTestPlayerBase { */ @Test public void testCardWithRebound() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 5); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Fervor"); - addCard(Constants.Zone.HAND, playerA, "World at War"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Warclamp Mastiff"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5); + addCard(Zone.BATTLEFIELD, playerA, "Fervor"); + addCard(Zone.HAND, playerA, "World at War"); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Warclamp Mastiff"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "World at War"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "World at War"); attack(1, playerA, "Elite Vanguard"); attack(1, playerA, "Elite Vanguard"); @@ -61,7 +62,7 @@ public class WorldAtWarTest extends CardTestPlayerBase { attack(3, playerA, "Warclamp Mastiff"); attack(3, playerA, "Warclamp Mastiff"); - setStopAt(3, Constants.PhaseStep.END_TURN); + setStopAt(3, PhaseStep.END_TURN); execute(); assertLife(playerB, 8); @@ -74,14 +75,14 @@ public class WorldAtWarTest extends CardTestPlayerBase { */ @Test public void testDoubleCast() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 10); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Fervor"); - addCard(Constants.Zone.HAND, playerA, "World at War", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Warclamp Mastiff"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 10); + addCard(Zone.BATTLEFIELD, playerA, "Fervor"); + addCard(Zone.HAND, playerA, "World at War", 2); + addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Warclamp Mastiff"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "World at War"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "World at War"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "World at War"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "World at War"); attack(1, playerA, "Elite Vanguard"); attack(1, playerA, "Elite Vanguard"); @@ -90,7 +91,7 @@ public class WorldAtWarTest extends CardTestPlayerBase { attack(1, playerA, "Warclamp Mastiff"); attack(1, playerA, "Warclamp Mastiff"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerB, 11); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/targets/attacking/CondemnTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/targets/attacking/CondemnTest.java index 64d55930302..f42414c9557 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/targets/attacking/CondemnTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/targets/attacking/CondemnTest.java @@ -1,8 +1,8 @@ package org.mage.test.cards.targets.attacking; import junit.framework.Assert; -import mage.Constants; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -13,14 +13,14 @@ public class CondemnTest extends CardTestPlayerBase { @Test public void testIllegalTarget() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains"); - addCard(Constants.Zone.HAND, playerA, "Condemn"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Sejiri Merfolk"); + addCard(Zone.BATTLEFIELD, playerA, "Plains"); + addCard(Zone.HAND, playerA, "Condemn"); + addCard(Zone.BATTLEFIELD, playerB, "Sejiri Merfolk"); // check with illegal target castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Condemn", "Sejiri Merfolk"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); // spell shouldn't work assertPermanentCount(playerB, "Sejiri Merfolk", 1); @@ -30,14 +30,14 @@ public class CondemnTest extends CardTestPlayerBase { @Test public void testLegalTarget() { - addCard(Constants.Zone.BATTLEFIELD, playerB, "Plains"); - addCard(Constants.Zone.HAND, playerB, "Condemn"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Sejiri Merfolk"); + addCard(Zone.BATTLEFIELD, playerB, "Plains"); + addCard(Zone.HAND, playerB, "Condemn"); + addCard(Zone.BATTLEFIELD, playerA, "Sejiri Merfolk"); attack(1, playerA, "Sejiri Merfolk"); castSpell(1, PhaseStep.DECLARE_ATTACKERS, playerB, "Condemn", "Sejiri Merfolk"); - setStopAt(1, Constants.PhaseStep.END_COMBAT); + setStopAt(1, PhaseStep.END_COMBAT); execute(); assertPermanentCount(playerA, "Sejiri Merfolk", 0); assertLife(playerB, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/targets/attacking/DivineVerdictTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/targets/attacking/DivineVerdictTest.java index 915edad41a7..a8f48c280d8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/targets/attacking/DivineVerdictTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/targets/attacking/DivineVerdictTest.java @@ -1,7 +1,7 @@ package org.mage.test.cards.targets.attacking; -import mage.Constants; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,11 +12,11 @@ public class DivineVerdictTest extends CardTestPlayerBase { @Test public void testAfterAttack() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 4); - addCard(Constants.Zone.HAND, playerA, "Divine Verdict"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 4); + addCard(Zone.HAND, playerA, "Divine Verdict"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Sejiri Merfolk"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Plains"); + addCard(Zone.BATTLEFIELD, playerB, "Sejiri Merfolk"); + addCard(Zone.BATTLEFIELD, playerB, "Plains"); attack(2, playerB, "Sejiri Merfolk"); castSpell(2, PhaseStep.POSTCOMBAT_MAIN, playerA, "Divine Verdict", "Sejiri Merfolk"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BloodbraidElfTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BloodbraidElfTest.java index a0f17cea236..e969449725d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BloodbraidElfTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BloodbraidElfTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.triggers; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -10,18 +11,18 @@ import org.mage.test.serverside.base.CardTestPlayerBase; public class BloodbraidElfTest extends CardTestPlayerBase { @Test public void testCascade() { - addCard(Constants.Zone.HAND, playerA, "Bloodbraid Elf"); - addCard(Constants.Zone.HAND, playerA, "Terminus"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Goblin Wardriver", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 6); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 6); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 6); + addCard(Zone.HAND, playerA, "Bloodbraid Elf"); + addCard(Zone.HAND, playerA, "Terminus"); + addCard(Zone.BATTLEFIELD, playerA, "Goblin Wardriver", 1); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 6); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 6); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 6); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Terminus"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Terminus"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Bloodbraid Elf"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Bloodbraid Elf"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertPermanentCount(playerA, "Bloodbraid Elf", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/FathomMageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/FathomMageTest.java index dd8d4dd9391..5d8f468f12c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/FathomMageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/FathomMageTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.triggers; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -21,13 +22,13 @@ public class FathomMageTest extends CardTestPlayerBase { public void testDrawCardsAddedCounters() { // card draw triggered ability will trigger once for each of those counters from Blessings of Nature. - addCard(Constants.Zone.HAND, playerA, "Blessings of Nature"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Fathom Mage", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 5); + addCard(Zone.HAND, playerA, "Blessings of Nature"); + addCard(Zone.BATTLEFIELD, playerA, "Fathom Mage", 1); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 5); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Blessings of Nature", "Fathom Mage"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Blessings of Nature", "Fathom Mage"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertPermanentCount(playerA, "Fathom Mage", 1); @@ -39,14 +40,14 @@ public class FathomMageTest extends CardTestPlayerBase { public void testDrawCardsEntersTheBattlefield() { // card draw triggered ability will trigger once for each of those counters from Master Biomancer. - addCard(Constants.Zone.HAND, playerA, "Fathom Mage"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Master Biomancer", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 4); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 4); + addCard(Zone.HAND, playerA, "Fathom Mage"); + addCard(Zone.BATTLEFIELD, playerA, "Master Biomancer", 1); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 4); + addCard(Zone.BATTLEFIELD, playerA, "Island", 4); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Fathom Mage"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Fathom Mage"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertPermanentCount(playerA, "Fathom Mage", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ManabarbsTest2.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ManabarbsTest2.java index d3e49c61250..a288536878b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ManabarbsTest2.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ManabarbsTest2.java @@ -1,7 +1,7 @@ package org.mage.test.cards.triggers; -import mage.Constants; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -22,17 +22,17 @@ public class ManabarbsTest2 extends CardTestPlayerBase { */ @Test public void testMultiTriggers() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Manabarbs"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 7); - addCard(Constants.Zone.HAND, playerA, "Lightning Elemental"); - addCard(Constants.Zone.HAND, playerA, "Ball Lightning"); + addCard(Zone.BATTLEFIELD, playerA, "Manabarbs"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 7); + addCard(Zone.HAND, playerA, "Lightning Elemental"); + addCard(Zone.HAND, playerA, "Ball Lightning"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Ball Lightning"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Elemental"); attack(1, playerA, "Ball Lightning"); attack(1, playerA, "Lightning Elemental"); - setStopAt(2, Constants.PhaseStep.UNTAP); + setStopAt(2, PhaseStep.UNTAP); execute(); assertLife(playerA, 13); // burns from Manabarbs diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/OblivionRingTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/OblivionRingTest.java index b3812ce8ad2..8ff5563c5b8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/OblivionRingTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/OblivionRingTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.triggers; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -17,13 +18,13 @@ public class OblivionRingTest extends CardTestPlayerBase { */ @Test public void testFirstTriggeredAbility() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 3); - addCard(Constants.Zone.HAND, playerA, "Oblivion Ring"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 3); + addCard(Zone.HAND, playerA, "Oblivion Ring"); + addCard(Zone.BATTLEFIELD, playerB, "Craw Wurm"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Oblivion Ring"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Oblivion Ring"); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); @@ -37,17 +38,17 @@ public class OblivionRingTest extends CardTestPlayerBase { */ @Test public void testSecondTriggeredAbility() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 3); - addCard(Constants.Zone.HAND, playerA, "Oblivion Ring"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 3); + addCard(Zone.HAND, playerA, "Oblivion Ring"); + addCard(Zone.BATTLEFIELD, playerB, "Craw Wurm"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Forest", 2); - addCard(Constants.Zone.HAND, playerB, "Naturalize"); + addCard(Zone.BATTLEFIELD, playerB, "Forest", 2); + addCard(Zone.HAND, playerB, "Naturalize"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Oblivion Ring"); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Naturalize", "Oblivion Ring"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Oblivion Ring"); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Naturalize", "Oblivion Ring"); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); @@ -58,17 +59,17 @@ public class OblivionRingTest extends CardTestPlayerBase { @Test public void testWithOblivionRingExile() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 3); - addCard(Constants.Zone.HAND, playerA, "Oblivion Ring"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 3); + addCard(Zone.HAND, playerA, "Oblivion Ring"); + addCard(Zone.BATTLEFIELD, playerB, "Craw Wurm"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Plains", 3); - addCard(Constants.Zone.HAND, playerB, "Revoke Existence"); + addCard(Zone.BATTLEFIELD, playerB, "Plains", 3); + addCard(Zone.HAND, playerB, "Revoke Existence"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Oblivion Ring"); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Revoke Existence", "Oblivion Ring"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Oblivion Ring"); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Revoke Existence", "Oblivion Ring"); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); @@ -82,17 +83,17 @@ public class OblivionRingTest extends CardTestPlayerBase { */ @Test public void testExilePlaneswalker() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 5); - addCard(Constants.Zone.HAND, playerA, "Oblivion Ring"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Jace Beleren"); - addCard(Constants.Zone.HAND, playerA, "Revoke Existence"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 5); + addCard(Zone.HAND, playerA, "Oblivion Ring"); + addCard(Zone.BATTLEFIELD, playerA, "Jace Beleren"); + addCard(Zone.HAND, playerA, "Revoke Existence"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "-1: Target player draws one card", playerA); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Oblivion Ring"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Revoke Existence", "Oblivion Ring"); - activateAbility(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "-1: Target player draws one card", playerA); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "-1: Target player draws one card", playerA); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Oblivion Ring"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Revoke Existence", "Oblivion Ring"); + activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "-1: Target player draws one card", playerA); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertPermanentCount(playerA, "Oblivion Ring", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SoulWardenTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SoulWardenTest.java index 0b018a66d34..8efda10359b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SoulWardenTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SoulWardenTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.triggers; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -18,17 +19,17 @@ public class SoulWardenTest extends CardTestPlayerBase { */ @Test public void testDisabledEffectOnChangeZone() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 1); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 2); - addCard(Constants.Zone.HAND, playerA, "Elite Vanguard", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Soul Warden", 1); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1); + addCard(Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 2); + addCard(Zone.HAND, playerA, "Elite Vanguard", 2); + addCard(Zone.BATTLEFIELD, playerA, "Soul Warden", 1); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Vanguard"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "Soul Warden"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Elite Vanguard"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Vanguard"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "Soul Warden"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Elite Vanguard"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerA, 21); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/combat/damage/HuntersInsightTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/combat/damage/HuntersInsightTest.java index d9beeedabb7..bc3680730b8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/combat/damage/HuntersInsightTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/combat/damage/HuntersInsightTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.triggers.combat.damage; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -14,14 +15,14 @@ public class HuntersInsightTest extends CardTestPlayerBase { @Test public void testDrawingCards() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 3); - addCard(Constants.Zone.HAND, playerA, "Hunter's Insight", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Stampeding Rhino", 1); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 3); + addCard(Zone.HAND, playerA, "Hunter's Insight", 1); + addCard(Zone.BATTLEFIELD, playerA, "Stampeding Rhino", 1); attack(3, playerA, "Stampeding Rhino"); - castSpell(3, Constants.PhaseStep.DECLARE_BLOCKERS, playerA, "Hunter's Insight", "Stampeding Rhino"); + castSpell(3, PhaseStep.DECLARE_BLOCKERS, playerA, "Hunter's Insight", "Stampeding Rhino"); - setStopAt(3, Constants.PhaseStep.POSTCOMBAT_MAIN); + setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/BloodArtistTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/BloodArtistTest.java index 2438a71fefe..ae5d9ab002c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/BloodArtistTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/BloodArtistTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.triggers.dies; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -18,17 +19,17 @@ public class BloodArtistTest extends CardTestPlayerBase { */ @Test public void testDisabledEffectOnChangeZone() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 2); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Blood Artist", 2); - addCard(Constants.Zone.GRAVEYARD, playerA, "Blood Artist", 1); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 2); + addCard(Zone.HAND, playerA, "Lightning Bolt", 2); + addCard(Zone.BATTLEFIELD, playerA, "Blood Artist", 2); + addCard(Zone.GRAVEYARD, playerA, "Blood Artist", 1); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Bloodflow Connoisseur", 1); + addCard(Zone.BATTLEFIELD, playerB, "Bloodflow Connoisseur", 1); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Blood Artist"); - castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "Bloodflow Connoisseur"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Blood Artist"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "Bloodflow Connoisseur"); - setStopAt(1, Constants.PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerA, 23); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/HarvesterOfSoulsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/HarvesterOfSoulsTest.java index aeb5bd99461..750a0b7c824 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/HarvesterOfSoulsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/HarvesterOfSoulsTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.triggers.dies; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -18,19 +19,19 @@ public class HarvesterOfSoulsTest extends CardTestPlayerBase { */ @Test public void testDisabledEffectOnChangeZone() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 4); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 3); - addCard(Constants.Zone.HAND, playerA, "Day of Judgment", 1); - addCard(Constants.Zone.HAND, playerA, "Thatcher Revolt", 1); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 4); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3); + addCard(Zone.HAND, playerA, "Day of Judgment", 1); + addCard(Zone.HAND, playerA, "Thatcher Revolt", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Harvester of Souls", 1); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Craw Wurm", 1); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Arrogant Bloodlord", 1); + addCard(Zone.BATTLEFIELD, playerA, "Harvester of Souls", 1); + addCard(Zone.BATTLEFIELD, playerA, "Craw Wurm", 1); + addCard(Zone.BATTLEFIELD, playerB, "Arrogant Bloodlord", 1); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Thatcher Revolt"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Day of Judgment"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Thatcher Revolt"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Day of Judgment"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/RotcrownGhoulTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/RotcrownGhoulTest.java index 6a28c9ffdfd..76bb43b39ec 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/RotcrownGhoulTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/RotcrownGhoulTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.triggers.dies; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -14,14 +15,14 @@ public class RotcrownGhoulTest extends CardTestPlayerBase { @Test public void testDiesTriggeredAbility() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 1); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1); + addCard(Zone.HAND, playerA, "Lightning Bolt"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Rotcrown Ghoul", 1); + addCard(Zone.BATTLEFIELD, playerB, "Rotcrown Ghoul", 1); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Rotcrown Ghoul"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Rotcrown Ghoul"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -34,14 +35,14 @@ public class RotcrownGhoulTest extends CardTestPlayerBase { @Test public void testDiesTriggeredAbilityForTwoCopies() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 1); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1); + addCard(Zone.HAND, playerA, "Lightning Bolt"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Rotcrown Ghoul", 2); + addCard(Zone.BATTLEFIELD, playerB, "Rotcrown Ghoul", 2); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Rotcrown Ghoul"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Rotcrown Ghoul"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/SelhoffOccultistTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/SelhoffOccultistTest.java index 82faf8a60e9..4066be98e4d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/SelhoffOccultistTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/SelhoffOccultistTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.triggers.dies; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -17,14 +18,14 @@ public class SelhoffOccultistTest extends CardTestPlayerBase { */ @Test public void testDiesTriggeredAbility() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 1); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1); + addCard(Zone.HAND, playerA, "Lightning Bolt"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Selhoff Occultist", 1); + addCard(Zone.BATTLEFIELD, playerB, "Selhoff Occultist", 1); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Selhoff Occultist"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Selhoff Occultist"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -40,15 +41,15 @@ public class SelhoffOccultistTest extends CardTestPlayerBase { */ @Test public void testDiesTriggeredAbilityForTwoCopies() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 1); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1); + addCard(Zone.HAND, playerA, "Lightning Bolt"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Selhoff Occultist", 2); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Ana Disciple", 1); + addCard(Zone.BATTLEFIELD, playerB, "Selhoff Occultist", 2); + addCard(Zone.BATTLEFIELD, playerB, "Ana Disciple", 1); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Ana Disciple"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Ana Disciple"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -64,17 +65,17 @@ public class SelhoffOccultistTest extends CardTestPlayerBase { */ @Test public void testDiesTriggeredAbilityInOtherZone() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 1); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1); + addCard(Zone.HAND, playerA, "Lightning Bolt"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Selhoff Occultist", 2); - addCard(Constants.Zone.HAND, playerB, "Selhoff Occultist", 1); - addCard(Constants.Zone.GRAVEYARD, playerB, "Selhoff Occultist", 1); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Ana Disciple", 1); + addCard(Zone.BATTLEFIELD, playerB, "Selhoff Occultist", 2); + addCard(Zone.HAND, playerB, "Selhoff Occultist", 1); + addCard(Zone.GRAVEYARD, playerB, "Selhoff Occultist", 1); + addCard(Zone.BATTLEFIELD, playerB, "Ana Disciple", 1); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Ana Disciple"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Ana Disciple"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/events/SearchShuffleTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/events/SearchShuffleTest.java index e8235416c37..b04039b99dd 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/events/SearchShuffleTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/events/SearchShuffleTest.java @@ -1,6 +1,7 @@ package org.mage.test.cards.triggers.events; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.counters.CounterType; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -18,13 +19,13 @@ public class SearchShuffleTest extends CardTestPlayerBase { */ @Test public void testEvent() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Cosi's Trickster"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Leonin Arbiter"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Arid Mesa"); + addCard(Zone.BATTLEFIELD, playerA, "Cosi's Trickster"); + addCard(Zone.BATTLEFIELD, playerA, "Leonin Arbiter"); + addCard(Zone.BATTLEFIELD, playerA, "Arid Mesa"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{T}, Pay 1 life"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}, Pay 1 life"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 19); diff --git a/Mage.Tests/src/test/java/org/mage/test/combat/AttackBlockRestrictionsTest.java b/Mage.Tests/src/test/java/org/mage/test/combat/AttackBlockRestrictionsTest.java index 94fbbb015e7..3acc3d81cfe 100644 --- a/Mage.Tests/src/test/java/org/mage/test/combat/AttackBlockRestrictionsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/combat/AttackBlockRestrictionsTest.java @@ -1,7 +1,8 @@ package org.mage.test.combat; import junit.framework.Assert; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.permanent.Permanent; import org.junit.Test; @@ -16,13 +17,13 @@ public class AttackBlockRestrictionsTest extends CardTestPlayerBase { @Test public void testFlyingVsNonFlying() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Captain of the Mists"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Mist Raven"); + addCard(Zone.BATTLEFIELD, playerA, "Captain of the Mists"); + addCard(Zone.BATTLEFIELD, playerB, "Mist Raven"); attack(2, playerB, "Mist Raven"); block(2, playerA, "Captain of the Mists", "Mist Raven"); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); assertLife(playerA, 18); @@ -37,13 +38,13 @@ public class AttackBlockRestrictionsTest extends CardTestPlayerBase { */ @Test public void testWallofWrost() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Wall of Frost"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerA, "Wall of Frost"); + addCard(Zone.BATTLEFIELD, playerB, "Craw Wurm"); attack(2, playerB, "Craw Wurm"); block(2, playerA, "Wall of Frost", "Craw Wurm"); - setStopAt(4, Constants.PhaseStep.END_TURN); + setStopAt(4, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); @@ -60,13 +61,13 @@ public class AttackBlockRestrictionsTest extends CardTestPlayerBase { */ @Test public void testFilteredBlocking() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Hunted Ghoul"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Hunted Ghoul"); + addCard(Zone.BATTLEFIELD, playerB, "Elite Vanguard"); attack(2, playerB, "Elite Vanguard"); block(2, playerA, "Hunted Ghoul", "Elite Vanguard"); - setStopAt(4, Constants.PhaseStep.END_TURN); + setStopAt(4, PhaseStep.END_TURN); execute(); assertLife(playerA, 18); @@ -80,13 +81,13 @@ public class AttackBlockRestrictionsTest extends CardTestPlayerBase { */ @Test public void testFilteredBlocking2() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Hunted Ghoul"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Craw Wurm"); + addCard(Zone.BATTLEFIELD, playerA, "Hunted Ghoul"); + addCard(Zone.BATTLEFIELD, playerB, "Craw Wurm"); attack(2, playerB, "Craw Wurm"); block(2, playerA, "Hunted Ghoul", "Craw Wurm"); - setStopAt(4, Constants.PhaseStep.END_TURN); + setStopAt(4, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); @@ -100,17 +101,17 @@ public class AttackBlockRestrictionsTest extends CardTestPlayerBase { */ @Test public void testBowerPassage() { - addCard(Constants.Zone.BATTLEFIELD, playerB, "Bower Passage"); + addCard(Zone.BATTLEFIELD, playerB, "Bower Passage"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Elite Vanguard"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Arbor Elf"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Assault Griffin"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Sky Ruin Drake"); + addCard(Zone.BATTLEFIELD, playerB, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerB, "Arbor Elf"); + addCard(Zone.BATTLEFIELD, playerB, "Assault Griffin"); + addCard(Zone.BATTLEFIELD, playerB, "Sky Ruin Drake"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Angelic Wall"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Air Elemental"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Llanowar Elves"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Sentinel Spider"); + addCard(Zone.BATTLEFIELD, playerA, "Angelic Wall"); + addCard(Zone.BATTLEFIELD, playerA, "Air Elemental"); + addCard(Zone.BATTLEFIELD, playerA, "Llanowar Elves"); + addCard(Zone.BATTLEFIELD, playerA, "Sentinel Spider"); // attacker vs. blocker: // non flying vs. flying @@ -126,7 +127,7 @@ public class AttackBlockRestrictionsTest extends CardTestPlayerBase { attack(2, playerB, "Sky Ruin Drake"); block(2, playerA, "Sentinel Spider", "Sky Ruin Drake"); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); assertLife(playerA, 15); @@ -138,18 +139,18 @@ public class AttackBlockRestrictionsTest extends CardTestPlayerBase { */ @Test public void testBowerPassageDestroyed() { - addCard(Constants.Zone.BATTLEFIELD, playerB, "Bower Passage"); + addCard(Zone.BATTLEFIELD, playerB, "Bower Passage"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Elite Vanguard"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Arbor Elf"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Assault Griffin"); + addCard(Zone.BATTLEFIELD, playerB, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerB, "Arbor Elf"); + addCard(Zone.BATTLEFIELD, playerB, "Assault Griffin"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Angelic Wall"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Air Elemental"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Llanowar Elves"); + addCard(Zone.BATTLEFIELD, playerA, "Angelic Wall"); + addCard(Zone.BATTLEFIELD, playerA, "Air Elemental"); + addCard(Zone.BATTLEFIELD, playerA, "Llanowar Elves"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 2); - addCard(Constants.Zone.HAND, playerA, "Naturalize"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 2); + addCard(Zone.HAND, playerA, "Naturalize"); // attacker vs. blocker: // non flying vs. flying @@ -162,9 +163,9 @@ public class AttackBlockRestrictionsTest extends CardTestPlayerBase { attack(2, playerB, "Assault Griffin"); block(2, playerA, "Air Elemental", "Assault Griffin"); - castSpell(2, Constants.PhaseStep.DECLARE_ATTACKERS, playerA, "Naturalize", "Bower Passage"); + castSpell(2, PhaseStep.DECLARE_ATTACKERS, playerA, "Naturalize", "Bower Passage"); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); assertPermanentCount(playerB, "Bower Passage", 0); @@ -181,26 +182,26 @@ public class AttackBlockRestrictionsTest extends CardTestPlayerBase { // Champion of Lambholt: Creature — Human Warrior 1/1, 1GG // - Creatures with power less than Champion of Lambholt's power can't block creatures you control. // - Whenever another creature enters the battlefield under your control, put a +1/+1 counter on Champion of Lambholt. - addCard(Constants.Zone.BATTLEFIELD, playerB, "Champion of Lambholt"); + addCard(Zone.BATTLEFIELD, playerB, "Champion of Lambholt"); // Elite Vanguard: Creature — Human Soldier 2/1, W - addCard(Constants.Zone.BATTLEFIELD, playerB, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerB, "Elite Vanguard"); // Arbor Elf: Creature — Elf Druid 1/1, G - {T}: Untap target Forest. - addCard(Constants.Zone.BATTLEFIELD, playerB, "Arbor Elf"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Assault Griffin"); + addCard(Zone.BATTLEFIELD, playerB, "Arbor Elf"); + addCard(Zone.BATTLEFIELD, playerB, "Assault Griffin"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Plains", 5); + addCard(Zone.BATTLEFIELD, playerB, "Plains", 5); // Baneslayer Angel: Creature — Angel 5/5, 3WW - Flying, first strike, lifelink, protection from Demons and from Dragons - addCard(Constants.Zone.HAND, playerB, "Baneslayer Angel"); + addCard(Zone.HAND, playerB, "Baneslayer Angel"); // Angelic Wall: Creature — Wall 0/4, 1W - Defender, flying - addCard(Constants.Zone.BATTLEFIELD, playerA, "Angelic Wall"); + addCard(Zone.BATTLEFIELD, playerA, "Angelic Wall"); // Air Elemental: Creature — Elemental 4/4, 3UU - Flying - addCard(Constants.Zone.BATTLEFIELD, playerA, "Air Elemental"); + addCard(Zone.BATTLEFIELD, playerA, "Air Elemental"); // Llanowar Elves: Creature — Elf Druid 1/1, G - {T}: Add {G} to your mana pool. - addCard(Constants.Zone.BATTLEFIELD, playerA, "Llanowar Elves"); + addCard(Zone.BATTLEFIELD, playerA, "Llanowar Elves"); - castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerB, "Baneslayer Angel"); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Baneslayer Angel"); // non flying vs. flying attack(2, playerB, "Elite Vanguard"); @@ -212,7 +213,7 @@ public class AttackBlockRestrictionsTest extends CardTestPlayerBase { attack(2, playerB, "Assault Griffin"); block(2, playerA, "Air Elemental", "Assault Griffin"); // can block - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); assertPowerToughness(playerB, "Champion of Lambholt", 2, 2); @@ -226,18 +227,18 @@ public class AttackBlockRestrictionsTest extends CardTestPlayerBase { */ @Test public void testUnblockable() { - addCard(Constants.Zone.BATTLEFIELD, playerB, "Blighted Agent"); + addCard(Zone.BATTLEFIELD, playerB, "Blighted Agent"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Blighted Agent"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Llanowar Elves"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Birds of Paradise"); + addCard(Zone.BATTLEFIELD, playerA, "Blighted Agent"); + addCard(Zone.BATTLEFIELD, playerA, "Llanowar Elves"); + addCard(Zone.BATTLEFIELD, playerA, "Birds of Paradise"); attack(2, playerB, "Blighted Agent"); block(2, playerA, "Blighted Agent", "Blighted Agent"); block(2, playerA, "Llanowar Elves", "Blighted Agent"); block(2, playerA, "Birds of Paradise", "Blighted Agent"); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); assertCounterCount(playerA, CounterType.POISON, 1); @@ -245,14 +246,14 @@ public class AttackBlockRestrictionsTest extends CardTestPlayerBase { @Test public void testUnblockableTormentedSoul() { - addCard(Constants.Zone.BATTLEFIELD, playerB, "Tormented Soul"); + addCard(Zone.BATTLEFIELD, playerB, "Tormented Soul"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Memnite"); + addCard(Zone.BATTLEFIELD, playerA, "Memnite"); attack(2, playerB, "Tormented Soul"); block(2, playerA, "Tormented Soul", "Memnite"); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); assertPermanentCount(playerA, "Memnite", 1); @@ -266,17 +267,17 @@ public class AttackBlockRestrictionsTest extends CardTestPlayerBase { */ @Test public void testFlyingVsNonFlying2() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 2); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Savannah Lions"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Azure Drake"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Aven Squire"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Llanowar Elves"); - addCard(Constants.Zone.HAND, playerA, "Turn to Frog"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 2); + addCard(Zone.BATTLEFIELD, playerA, "Savannah Lions"); + addCard(Zone.BATTLEFIELD, playerA, "Azure Drake"); + addCard(Zone.BATTLEFIELD, playerA, "Aven Squire"); + addCard(Zone.BATTLEFIELD, playerA, "Llanowar Elves"); + addCard(Zone.HAND, playerA, "Turn to Frog"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Walking Corpse"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Llanowar Elves"); + addCard(Zone.BATTLEFIELD, playerB, "Walking Corpse"); + addCard(Zone.BATTLEFIELD, playerB, "Llanowar Elves"); - castSpell(3, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Turn to Frog", "Aven Squire"); + castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Turn to Frog", "Aven Squire"); attack(3, playerA, "Llanowar Elves"); attack(3, playerA, "Azure Drake"); @@ -286,7 +287,7 @@ public class AttackBlockRestrictionsTest extends CardTestPlayerBase { block(3, playerB, "Llanowar Elves", "Azure Drake"); // won't be able to block block(3, playerB, "Walking Corpse", "Aven Squire"); // able to block because of Turn to Frog - setStopAt(3, Constants.PhaseStep.END_TURN); + setStopAt(3, PhaseStep.END_TURN); execute(); assertLife(playerB, 15); diff --git a/Mage.Tests/src/test/java/org/mage/test/combat/CantAttackOrBlockAloneTest.java b/Mage.Tests/src/test/java/org/mage/test/combat/CantAttackOrBlockAloneTest.java index 5292173bf7b..d1e7be80dc1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/combat/CantAttackOrBlockAloneTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/combat/CantAttackOrBlockAloneTest.java @@ -1,7 +1,8 @@ package org.mage.test.combat; import junit.framework.Assert; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.game.permanent.Permanent; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -16,12 +17,12 @@ public class CantAttackOrBlockAloneTest extends CardTestPlayerBase { */ @Test public void testCantAttackAlone() { - addCard(Constants.Zone.BATTLEFIELD, playerB, "Mogg Flunkies"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerB, "Mogg Flunkies"); + addCard(Zone.BATTLEFIELD, playerB, "Elite Vanguard"); attack(2, playerB, "Mogg Flunkies"); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); @@ -35,13 +36,13 @@ public class CantAttackOrBlockAloneTest extends CardTestPlayerBase { */ @Test public void testCantAttackAlone2() { - addCard(Constants.Zone.BATTLEFIELD, playerB, "Mogg Flunkies"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerB, "Mogg Flunkies"); + addCard(Zone.BATTLEFIELD, playerB, "Elite Vanguard"); attack(2, playerB, "Mogg Flunkies"); attack(2, playerB, "Elite Vanguard"); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); assertLife(playerA, 15); @@ -52,13 +53,13 @@ public class CantAttackOrBlockAloneTest extends CardTestPlayerBase { */ @Test public void testCantBlockAlone() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mogg Flunkies"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Mogg Flunkies"); + addCard(Zone.BATTLEFIELD, playerB, "Elite Vanguard"); attack(2, playerB, "Elite Vanguard"); block(2, playerA, "Mogg Flunkies", "Elite Vanguard"); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); assertLife(playerA, 18); @@ -69,15 +70,15 @@ public class CantAttackOrBlockAloneTest extends CardTestPlayerBase { */ @Test public void testCantBlockAlone2() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mogg Flunkies"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Llanowar Elves"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Elite Vanguard"); + addCard(Zone.BATTLEFIELD, playerA, "Mogg Flunkies"); + addCard(Zone.BATTLEFIELD, playerA, "Llanowar Elves"); + addCard(Zone.BATTLEFIELD, playerB, "Elite Vanguard"); attack(2, playerB, "Elite Vanguard"); block(2, playerA, "Mogg Flunkies", "Elite Vanguard"); block(2, playerA, "Llanowar Elves", "Elite Vanguard"); - setStopAt(2, Constants.PhaseStep.END_TURN); + setStopAt(2, PhaseStep.END_TURN); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/combat/DamageDistributionTest.java b/Mage.Tests/src/test/java/org/mage/test/combat/DamageDistributionTest.java index d684810153f..b1978ef2fa1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/combat/DamageDistributionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/combat/DamageDistributionTest.java @@ -1,7 +1,8 @@ package org.mage.test.combat; import junit.framework.Assert; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.game.permanent.Permanent; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -14,13 +15,13 @@ public class DamageDistributionTest extends CardTestPlayerBase { @Test public void testDoubleStrike() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Warren Instigator"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Merfolk Looter"); + addCard(Zone.BATTLEFIELD, playerA, "Warren Instigator"); + addCard(Zone.BATTLEFIELD, playerB, "Merfolk Looter"); setLife(playerB, 4); attack(1, playerA, "Warren Instigator"); block(1, playerB, "Merfolk Looter", "Warren Instigator"); - setStopAt(1, Constants.PhaseStep.END_COMBAT); + setStopAt(1, PhaseStep.END_COMBAT); execute(); Permanent instigator = getPermanent("Warren Instigator", playerA.getId()); @@ -37,11 +38,11 @@ public class DamageDistributionTest extends CardTestPlayerBase { @Test public void testDoubleStrikeUnblocked() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Warren Instigator"); + addCard(Zone.BATTLEFIELD, playerA, "Warren Instigator"); setLife(playerB, 4); attack(1, playerA, "Warren Instigator"); - setStopAt(1, Constants.PhaseStep.END_COMBAT); + setStopAt(1, PhaseStep.END_COMBAT); execute(); assertLife(playerB, 2); @@ -49,11 +50,11 @@ public class DamageDistributionTest extends CardTestPlayerBase { @Test public void testNotAttackingVersusDoubleStrike() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Merfolk Looter"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Warren Instigator"); + addCard(Zone.BATTLEFIELD, playerA, "Merfolk Looter"); + addCard(Zone.BATTLEFIELD, playerB, "Warren Instigator"); setLife(playerB, 4); - setStopAt(1, Constants.PhaseStep.END_COMBAT); + setStopAt(1, PhaseStep.END_COMBAT); execute(); // should block and die diff --git a/Mage.Tests/src/test/java/org/mage/test/load/LoadTest.java b/Mage.Tests/src/test/java/org/mage/test/load/LoadTest.java index 70ddc440b35..f6d9424a3d0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/load/LoadTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/load/LoadTest.java @@ -1,11 +1,13 @@ package org.mage.test.load; -import mage.Constants; import mage.cards.Card; import mage.cards.decks.Deck; import mage.cards.decks.DeckCardLists; import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; +import mage.constants.ColoredManaSymbol; +import mage.constants.MultiplayerAttackOption; +import mage.constants.RangeOfInfluence; import mage.game.match.MatchOptions; import mage.player.ai.ComputerPlayer; import mage.remote.Connection; @@ -271,8 +273,8 @@ public class LoadTest { options.setDeckType(session.getDeckTypes()[0]); options.setLimited(false); - options.setAttackOption(Constants.MultiplayerAttackOption.MULTIPLE); - options.setRange(Constants.RangeOfInfluence.ALL); + options.setAttackOption(MultiplayerAttackOption.MULTIPLE); + options.setRange(RangeOfInfluence.ALL); options.setWinsNeeded(1); return options; } @@ -285,11 +287,11 @@ public class LoadTest { */ private Deck generateRandomDeck() { String selectedColors = "BR"; - List allowedColors = new ArrayList(); + List allowedColors = new ArrayList(); log.info("Building deck with colors: " + selectedColors); for (int i = 0; i < selectedColors.length(); i++) { char c = selectedColors.charAt(i); - allowedColors.add(Constants.ColoredManaSymbol.lookup(c)); + allowedColors.add(ColoredManaSymbol.lookup(c)); } List cardPool = Sets.generateRandomCardPool(45, allowedColors); return ComputerPlayer.buildDeck(cardPool, allowedColors); diff --git a/Mage.Tests/src/test/java/org/mage/test/multiplayer/SimpleGameTest.java b/Mage.Tests/src/test/java/org/mage/test/multiplayer/SimpleGameTest.java index 573c11a1b55..afc664c8f03 100644 --- a/Mage.Tests/src/test/java/org/mage/test/multiplayer/SimpleGameTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/multiplayer/SimpleGameTest.java @@ -1,6 +1,7 @@ package org.mage.test.multiplayer; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -20,12 +21,12 @@ public class SimpleGameTest extends CardTestMultiPlayerBase { @Test public void testSimple() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Forest"); - addCard(Constants.Zone.BATTLEFIELD, playerC, "Forest"); - addCard(Constants.Zone.BATTLEFIELD, playerD, "Forest"); + addCard(Zone.BATTLEFIELD, playerA, "Forest"); + addCard(Zone.BATTLEFIELD, playerB, "Forest"); + addCard(Zone.BATTLEFIELD, playerC, "Forest"); + addCard(Zone.BATTLEFIELD, playerD, "Forest"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/player/PlayerAction.java b/Mage.Tests/src/test/java/org/mage/test/player/PlayerAction.java index 4bfc6c066ef..0ae65c12880 100644 --- a/Mage.Tests/src/test/java/org/mage/test/player/PlayerAction.java +++ b/Mage.Tests/src/test/java/org/mage/test/player/PlayerAction.java @@ -28,7 +28,7 @@ package org.mage.test.player; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; /** * diff --git a/Mage.Tests/src/test/java/org/mage/test/player/RandomPlayer.java b/Mage.Tests/src/test/java/org/mage/test/player/RandomPlayer.java index 8ba06036cbf..389cd57ea1a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/player/RandomPlayer.java +++ b/Mage.Tests/src/test/java/org/mage/test/player/RandomPlayer.java @@ -27,8 +27,8 @@ */ package org.mage.test.player; -import mage.Constants.Outcome; -import mage.Constants.RangeOfInfluence; +import mage.constants.Outcome; +import mage.constants.RangeOfInfluence; import mage.abilities.*; import mage.abilities.common.PassAbility; import mage.abilities.costs.mana.GenericManaCost; diff --git a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java index b10c8d683b6..81ebd28f324 100644 --- a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java +++ b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java @@ -28,12 +28,13 @@ package org.mage.test.player; -import mage.Constants; -import mage.Constants.PhaseStep; +import mage.constants.Outcome; +import mage.constants.PhaseStep; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.ActivatedAbility; import mage.choices.Choice; +import mage.constants.RangeOfInfluence; import mage.counters.Counter; import mage.filter.FilterPermanent; import mage.filter.common.FilterAttackingCreature; @@ -65,7 +66,7 @@ public class TestPlayer extends ComputerPlayer { private List choices = new ArrayList(); private List targets = new ArrayList(); - public TestPlayer(String name, Constants.RangeOfInfluence range) { + public TestPlayer(String name, RangeOfInfluence range) { super(name, range); human = false; } @@ -169,7 +170,7 @@ public class TestPlayer extends ComputerPlayer { } @Override - public boolean choose(Constants.Outcome outcome, Choice choice, Game game) { + public boolean choose(Outcome outcome, Choice choice, Game game) { if (!choices.isEmpty()) { for (String choose2: choices) { for (String choose1: choice.getChoices()) { @@ -185,7 +186,7 @@ public class TestPlayer extends ComputerPlayer { } @Override - public boolean choose(Constants.Outcome outcome, Target target, UUID sourceId, Game game, Map options) { + public boolean choose(Outcome outcome, Target target, UUID sourceId, Game game, Map options) { if (!choices.isEmpty()) { if (target instanceof TargetPermanent) { for (Permanent permanent : game.getBattlefield().getAllActivePermanents((FilterPermanent)target.getFilter(), game)) { @@ -211,7 +212,7 @@ public class TestPlayer extends ComputerPlayer { } @Override - public boolean chooseTarget(Constants.Outcome outcome, Target target, Ability source, Game game) { + public boolean chooseTarget(Outcome outcome, Target target, Ability source, Game game) { if (!targets.isEmpty()) { if (target instanceof TargetPermanent) { for (Permanent permanent : game.getBattlefield().getAllActivePermanents((FilterPermanent)target.getFilter(), game)) { @@ -237,7 +238,7 @@ public class TestPlayer extends ComputerPlayer { } @Override - public boolean chooseUse(Constants.Outcome outcome, String message, Game game) { + public boolean chooseUse(Outcome outcome, String message, Game game) { if (!choices.isEmpty()) { if (choices.get(0).equals("No")) { choices.remove(0); diff --git a/Mage.Tests/src/test/java/org/mage/test/sba/PlaneswalkerRuleTest.java b/Mage.Tests/src/test/java/org/mage/test/sba/PlaneswalkerRuleTest.java index 4a5cb3952f1..44287943f60 100644 --- a/Mage.Tests/src/test/java/org/mage/test/sba/PlaneswalkerRuleTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/sba/PlaneswalkerRuleTest.java @@ -1,6 +1,7 @@ package org.mage.test.sba; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -14,14 +15,14 @@ public class PlaneswalkerRuleTest extends CardTestPlayerBase { */ @Test public void testDestroySamePlaneswalkers() { - addCard(Constants.Zone.HAND, playerA, "Jace, Memory Adept"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 5); + addCard(Zone.HAND, playerA, "Jace, Memory Adept"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 5); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Jace, Memory Adept"); + addCard(Zone.BATTLEFIELD, playerB, "Jace, Memory Adept"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Jace, Memory Adept"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Jace, Memory Adept"); - setStopAt(1, Constants.PhaseStep.END_COMBAT); + setStopAt(1, PhaseStep.END_COMBAT); execute(); assertPermanentCount(playerA, "Jace, Memory Adept", 0); @@ -33,14 +34,14 @@ public class PlaneswalkerRuleTest extends CardTestPlayerBase { */ @Test public void testDestroySameSubtype() { - addCard(Constants.Zone.HAND, playerA, "Jace Beleren"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 3); + addCard(Zone.HAND, playerA, "Jace Beleren"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 3); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Jace, Memory Adept"); + addCard(Zone.BATTLEFIELD, playerB, "Jace, Memory Adept"); - castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Jace Beleren"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Jace Beleren"); - setStopAt(1, Constants.PhaseStep.END_COMBAT); + setStopAt(1, PhaseStep.END_COMBAT); execute(); assertPermanentCount(playerA, "Jace Beleren", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/PlayGameTest.java b/Mage.Tests/src/test/java/org/mage/test/serverside/PlayGameTest.java index 34908bdc3e1..2678f0a75cf 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/PlayGameTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/PlayGameTest.java @@ -1,9 +1,10 @@ package org.mage.test.serverside; -import mage.Constants; -import mage.Constants.ColoredManaSymbol; +import mage.constants.ColoredManaSymbol; import mage.cards.Card; import mage.cards.decks.Deck; +import mage.constants.MultiplayerAttackOption; +import mage.constants.RangeOfInfluence; import mage.game.Game; import mage.game.GameException; import mage.game.GameOptions; @@ -31,7 +32,7 @@ public class PlayGameTest extends MageTestBase { @Ignore @Test public void playOneGame() throws GameException, FileNotFoundException, IllegalArgumentException { - Game game = new TwoPlayerDuel(Constants.MultiplayerAttackOption.LEFT, Constants.RangeOfInfluence.ALL, 0); + Game game = new TwoPlayerDuel(MultiplayerAttackOption.LEFT, RangeOfInfluence.ALL, 0); Player computerA = createPlayer("ComputerA", "Computer - minimax hybrid"); // Player playerA = createPlayer("ComputerA", "Computer - mad"); diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/TestPlayRandomGame.java b/Mage.Tests/src/test/java/org/mage/test/serverside/TestPlayRandomGame.java index 05a2daf6fad..4f8c56d0243 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/TestPlayRandomGame.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/TestPlayRandomGame.java @@ -1,9 +1,10 @@ package org.mage.test.serverside; -import mage.Constants; -import mage.Constants.ColoredManaSymbol; +import mage.constants.ColoredManaSymbol; import mage.cards.Card; import mage.cards.decks.Deck; +import mage.constants.MultiplayerAttackOption; +import mage.constants.RangeOfInfluence; import mage.game.Game; import mage.game.GameException; import mage.game.GameOptions; @@ -38,7 +39,7 @@ public class TestPlayRandomGame extends MageTestBase { } private void playOneGame() throws GameException, FileNotFoundException, IllegalArgumentException { - Game game = new TwoPlayerDuel(Constants.MultiplayerAttackOption.LEFT, Constants.RangeOfInfluence.ALL, 0); + Game game = new TwoPlayerDuel(MultiplayerAttackOption.LEFT, RangeOfInfluence.ALL, 0); Player computerA = createRandomPlayer("ComputerA"); Deck deck = generateRandomDeck(); diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/base/CardTestAPI.java b/Mage.Tests/src/test/java/org/mage/test/serverside/base/CardTestAPI.java index 99aa840697f..6369627bbc1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/base/CardTestAPI.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/base/CardTestAPI.java @@ -1,8 +1,8 @@ package org.mage.test.serverside.base; -import mage.Constants; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; import mage.abilities.Ability; +import mage.constants.Zone; import mage.filter.Filter; import mage.players.Player; import org.mage.test.player.TestPlayer; @@ -41,33 +41,33 @@ public interface CardTestAPI { /** * Add a card to specified zone of specified player. * - * @param gameZone {@link Constants.Zone} to add cards to. + * @param gameZone {@link mage.constants.Zone} to add cards to. * @param player {@link Player} to add cards for. Use either playerA or playerB. * @param cardName Card name in string format. */ - void addCard(Constants.Zone gameZone, TestPlayer player, String cardName); + void addCard(Zone gameZone, TestPlayer player, String cardName); /** * Add any amount of cards to specified zone of specified player. * - * @param gameZone {@link Constants.Zone} to add cards to. + * @param gameZone {@link mage.constants.Zone} to add cards to. * @param player {@link Player} to add cards for. Use either playerA or playerB. * @param cardName Card name in string format. * @param count Amount of cards to be added. */ - void addCard(Constants.Zone gameZone, TestPlayer player, String cardName, int count); + void addCard(Zone gameZone, TestPlayer player, String cardName, int count); /** * Add any amount of cards to specified zone of specified player. * - * @param gameZone {@link Constants.Zone} to add cards to. + * @param gameZone {@link mage.constants.Zone} to add cards to. * @param player {@link Player} to add cards for. Use either playerA or playerB. * @param cardName Card name in string format. * @param count Amount of cards to be added. * @param tapped In case gameZone is Battlefield, determines whether permanent should be tapped. * In case gameZone is other than Battlefield, {@link IllegalArgumentException} is thrown */ - void addCard(Constants.Zone gameZone, TestPlayer player, String cardName, int count, boolean tapped); + void addCard(Zone gameZone, TestPlayer player, String cardName, int count, boolean tapped); /** * Set player's initial life count. diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/base/CardTestMultiPlayerBase.java b/Mage.Tests/src/test/java/org/mage/test/serverside/base/CardTestMultiPlayerBase.java index 1334263ae66..9cf90c90344 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/base/CardTestMultiPlayerBase.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/base/CardTestMultiPlayerBase.java @@ -1,10 +1,11 @@ package org.mage.test.serverside.base; -import mage.Constants; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; import mage.cards.Card; import mage.cards.decks.Deck; import mage.cards.decks.importer.DeckImporterUtil; +import mage.constants.MultiplayerAttackOption; +import mage.constants.RangeOfInfluence; import mage.filter.Filter; import mage.game.*; import mage.game.permanent.Permanent; @@ -44,7 +45,7 @@ public abstract class CardTestMultiPlayerBase extends CardTestPlayerAPIImpl { System.gc(); } - Game game = new FreeForAll(Constants.MultiplayerAttackOption.LEFT, Constants.RangeOfInfluence.ONE, 0); + Game game = new FreeForAll(MultiplayerAttackOption.LEFT, RangeOfInfluence.ONE, 0); playerA = createPlayer(game, playerA, "PlayerA"); playerB = createPlayer(game, playerB, "PlayerB"); @@ -85,7 +86,7 @@ public abstract class CardTestMultiPlayerBase extends CardTestPlayerAPIImpl { System.gc(); } - Game game = new TwoPlayerDuel(Constants.MultiplayerAttackOption.LEFT, Constants.RangeOfInfluence.ALL, 0); + Game game = new TwoPlayerDuel(MultiplayerAttackOption.LEFT, RangeOfInfluence.ALL, 0); playerA = createNewPlayer("ComputerA"); playerA.setTestMode(true); diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/base/CardTestPlayerBase.java b/Mage.Tests/src/test/java/org/mage/test/serverside/base/CardTestPlayerBase.java index 6abbe6eea15..083541ccead 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/base/CardTestPlayerBase.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/base/CardTestPlayerBase.java @@ -1,10 +1,11 @@ package org.mage.test.serverside.base; -import mage.Constants; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; import mage.cards.Card; import mage.cards.decks.Deck; import mage.cards.decks.importer.DeckImporterUtil; +import mage.constants.MultiplayerAttackOption; +import mage.constants.RangeOfInfluence; import mage.filter.Filter; import mage.game.Game; import mage.game.GameException; @@ -53,7 +54,7 @@ public abstract class CardTestPlayerBase extends CardTestPlayerAPIImpl { System.gc(); } - Game game = new TwoPlayerDuel(Constants.MultiplayerAttackOption.LEFT, Constants.RangeOfInfluence.ONE, 0); + Game game = new TwoPlayerDuel(MultiplayerAttackOption.LEFT, RangeOfInfluence.ONE, 0); playerA = createNewPlayer("PlayerA"); playerA.setTestMode(true); @@ -108,7 +109,7 @@ public abstract class CardTestPlayerBase extends CardTestPlayerAPIImpl { System.gc(); } - Game game = new TwoPlayerDuel(Constants.MultiplayerAttackOption.LEFT, Constants.RangeOfInfluence.ALL, 0); + Game game = new TwoPlayerDuel(MultiplayerAttackOption.LEFT, RangeOfInfluence.ALL, 0); playerA = createNewPlayer("ComputerA"); playerA.setTestMode(true); diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestBase.java b/Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestBase.java index cc953515238..f9eb3e1b42b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestBase.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestBase.java @@ -1,10 +1,11 @@ package org.mage.test.serverside.base; -import mage.Constants; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; import mage.cards.Card; import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; +import mage.constants.RangeOfInfluence; +import mage.constants.Zone; import mage.game.Game; import mage.game.match.MatchType; import mage.game.permanent.PermanentCard; @@ -54,8 +55,8 @@ public abstract class MageTestBase { protected List libraryCardsA = new ArrayList(); protected List libraryCardsB = new ArrayList(); - protected Map commandsA = new HashMap(); - protected Map commandsB = new HashMap(); + protected Map commandsA = new HashMap(); + protected Map commandsB = new HashMap(); protected TestPlayer playerA; protected TestPlayer playerB; @@ -215,26 +216,26 @@ public abstract class MageTestBase { if (nickname.equals("ComputerA") || nickname.equals("ComputerB")) { List cards = null; List perms = null; - Constants.Zone gameZone; + Zone gameZone; if ("hand".equalsIgnoreCase(zone)) { - gameZone = Constants.Zone.HAND; + gameZone = Zone.HAND; cards = nickname.equals("ComputerA") ? handCardsA : handCardsB; } else if ("battlefield".equalsIgnoreCase(zone)) { - gameZone = Constants.Zone.BATTLEFIELD; + gameZone = Zone.BATTLEFIELD; perms = nickname.equals("ComputerA") ? battlefieldCardsA : battlefieldCardsB; } else if ("graveyard".equalsIgnoreCase(zone)) { - gameZone = Constants.Zone.GRAVEYARD; + gameZone = Zone.GRAVEYARD; cards = nickname.equals("ComputerA") ? graveyardCardsA : graveyardCardsB; } else if ("library".equalsIgnoreCase(zone)) { - gameZone = Constants.Zone.LIBRARY; + gameZone = Zone.LIBRARY; cards = nickname.equals("ComputerA") ? libraryCardsA : libraryCardsB; } else if ("player".equalsIgnoreCase(zone)) { String command = m.group(3); if ("life".equals(command)) { if (nickname.equals("ComputerA")) { - commandsA.put(Constants.Zone.OUTSIDE, "life:" + m.group(4)); + commandsA.put(Zone.OUTSIDE, "life:" + m.group(4)); } else { - commandsB.put(Constants.Zone.OUTSIDE, "life:" + m.group(4)); + commandsB.put(Zone.OUTSIDE, "life:" + m.group(4)); } } return; @@ -257,7 +258,7 @@ public abstract class MageTestBase { CardInfo cardInfo = CardRepository.instance.findCard(cardName); Card card = cardInfo != null ? cardInfo.getCard() : null; if (card != null) { - if (gameZone.equals(Constants.Zone.BATTLEFIELD)) { + if (gameZone.equals(Zone.BATTLEFIELD)) { PermanentCard p = new PermanentCard(card, null); p.setTapped(tapped); perms.add(p); @@ -299,7 +300,7 @@ public abstract class MageTestBase { } protected Player createPlayer(String name, String playerType) { - return PlayerFactory.getInstance().createPlayer(playerType, name, Constants.RangeOfInfluence.ALL, 5); + return PlayerFactory.getInstance().createPlayer(playerType, name, RangeOfInfluence.ALL, 5); } protected Player createRandomPlayer(String name) { diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestPlayerBase.java b/Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestPlayerBase.java index c84e691a84d..fa63d725c85 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestPlayerBase.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestPlayerBase.java @@ -1,10 +1,11 @@ package org.mage.test.serverside.base; -import mage.Constants; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; import mage.cards.Card; import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; +import mage.constants.RangeOfInfluence; +import mage.constants.Zone; import mage.game.Game; import mage.game.match.MatchType; import mage.game.permanent.PermanentCard; @@ -47,7 +48,7 @@ public abstract class MageTestPlayerBase { protected Map> graveyardCards = new HashMap>(); protected Map> libraryCards = new HashMap>(); - protected Map> commands = new HashMap>(); + protected Map> commands = new HashMap>(); protected TestPlayer playerA; protected TestPlayer playerB; @@ -200,23 +201,23 @@ public abstract class MageTestPlayerBase { if (nickname.startsWith("Computer")) { List cards = null; List perms = null; - Constants.Zone gameZone; + Zone gameZone; if ("hand".equalsIgnoreCase(zone)) { - gameZone = Constants.Zone.HAND; + gameZone = Zone.HAND; cards = getHandCards(getPlayer(nickname)); } else if ("battlefield".equalsIgnoreCase(zone)) { - gameZone = Constants.Zone.BATTLEFIELD; + gameZone = Zone.BATTLEFIELD; perms = getBattlefieldCards(getPlayer(nickname)); } else if ("graveyard".equalsIgnoreCase(zone)) { - gameZone = Constants.Zone.GRAVEYARD; + gameZone = Zone.GRAVEYARD; cards = getGraveCards(getPlayer(nickname)); } else if ("library".equalsIgnoreCase(zone)) { - gameZone = Constants.Zone.LIBRARY; + gameZone = Zone.LIBRARY; cards = getLibraryCards(getPlayer(nickname)); } else if ("player".equalsIgnoreCase(zone)) { String command = m.group(3); if ("life".equals(command)) { - getCommands(getPlayer(nickname)).put(Constants.Zone.OUTSIDE, "life:" + m.group(4)); + getCommands(getPlayer(nickname)).put(Zone.OUTSIDE, "life:" + m.group(4)); } return; } else { @@ -234,7 +235,7 @@ public abstract class MageTestPlayerBase { CardInfo cardInfo = CardRepository.instance.findCard(cardName); Card card = cardInfo != null ? cardInfo.getCard() : null; if (card != null) { - if (gameZone.equals(Constants.Zone.BATTLEFIELD)) { + if (gameZone.equals(Zone.BATTLEFIELD)) { PermanentCard p = new PermanentCard(card, null); p.setTapped(tapped); perms.add(p); @@ -304,11 +305,11 @@ public abstract class MageTestPlayerBase { return battlefield; } - protected Map getCommands(TestPlayer player) { + protected Map getCommands(TestPlayer player) { if (commands.containsKey(player)) { return commands.get(player); } - Map command = new HashMap(); + Map command = new HashMap(); commands.put(player, command); return command; } @@ -335,6 +336,6 @@ public abstract class MageTestPlayerBase { } protected TestPlayer createPlayer(String name) { - return new TestPlayer(name, Constants.RangeOfInfluence.ONE); + return new TestPlayer(name, RangeOfInfluence.ONE); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestAPIImpl.java b/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestAPIImpl.java index 4d597decc11..40ab458f495 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestAPIImpl.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestAPIImpl.java @@ -1,11 +1,11 @@ package org.mage.test.serverside.base.impl; -import mage.Constants; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; import mage.abilities.Ability; import mage.cards.Card; import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; +import mage.constants.Zone; import mage.filter.Filter; import mage.game.permanent.Permanent; import mage.game.permanent.PermanentCard; @@ -31,23 +31,23 @@ public abstract class CardTestAPIImpl extends MageTestBase implements CardTestAP public void useRedDefault() { // *** ComputerA *** // battlefield:ComputerA:Mountain:5 - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 5); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5); // hand:ComputerA:Mountain:4 - addCard(Constants.Zone.HAND, playerA, "Mountain", 5); + addCard(Zone.HAND, playerA, "Mountain", 5); // library:ComputerA:clear:0 removeAllCardsFromLibrary(playerA); // library:ComputerA:Mountain:10 - addCard(Constants.Zone.LIBRARY, playerA, "Mountain", 10); + addCard(Zone.LIBRARY, playerA, "Mountain", 10); // *** ComputerB *** // battlefield:ComputerB:Plains:2 - addCard(Constants.Zone.BATTLEFIELD, playerB, "Plains", 2); + addCard(Zone.BATTLEFIELD, playerB, "Plains", 2); // hand:ComputerB:Plains:2 - addCard(Constants.Zone.HAND, playerB, "Plains", 2); + addCard(Zone.HAND, playerB, "Plains", 2); // library:ComputerB:clear:0 removeAllCardsFromLibrary(playerB); // library:ComputerB:Plains:10 - addCard(Constants.Zone.LIBRARY, playerB, "Plains", 10); + addCard(Zone.LIBRARY, playerB, "Plains", 10); } /** @@ -55,16 +55,16 @@ public abstract class CardTestAPIImpl extends MageTestBase implements CardTestAP */ public void useWhiteDefault() { // *** ComputerA *** - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 5); - addCard(Constants.Zone.HAND, playerA, "Plains", 5); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 5); + addCard(Zone.HAND, playerA, "Plains", 5); removeAllCardsFromLibrary(playerA); - addCard(Constants.Zone.LIBRARY, playerA, "Plains", 10); + addCard(Zone.LIBRARY, playerA, "Plains", 10); // *** ComputerB *** - addCard(Constants.Zone.BATTLEFIELD, playerB, "Plains", 2); - addCard(Constants.Zone.HAND, playerB, "Plains", 2); + addCard(Zone.BATTLEFIELD, playerB, "Plains", 2); + addCard(Zone.HAND, playerB, "Plains", 2); removeAllCardsFromLibrary(playerB); - addCard(Constants.Zone.LIBRARY, playerB, "Plains", 10); + addCard(Zone.LIBRARY, playerB, "Plains", 10); } /** @@ -75,49 +75,49 @@ public abstract class CardTestAPIImpl extends MageTestBase implements CardTestAP */ public void removeAllCardsFromLibrary(Player player) { if (player.equals(playerA)) { - commandsA.put(Constants.Zone.LIBRARY, "clear"); + commandsA.put(Zone.LIBRARY, "clear"); } else if (player.equals(playerB)) { - commandsB.put(Constants.Zone.LIBRARY, "clear"); + commandsB.put(Zone.LIBRARY, "clear"); } } /** * Add a card to specified zone of specified player. * - * @param gameZone {@link Constants.Zone} to add cards to. + * @param gameZone {@link mage.constants.Zone} to add cards to. * @param player {@link Player} to add cards for. Use either playerA or playerB. * @param cardName Card name in string format. */ - public void addCard(Constants.Zone gameZone, TestPlayer player, String cardName) { + public void addCard(Zone gameZone, TestPlayer player, String cardName) { addCard(gameZone, player, cardName, 1, false); } /** * Add any amount of cards to specified zone of specified player. * - * @param gameZone {@link Constants.Zone} to add cards to. + * @param gameZone {@link mage.constants.Zone} to add cards to. * @param player {@link Player} to add cards for. Use either playerA or playerB. * @param cardName Card name in string format. * @param count Amount of cards to be added. */ - public void addCard(Constants.Zone gameZone, TestPlayer player, String cardName, int count) { + public void addCard(Zone gameZone, TestPlayer player, String cardName, int count) { addCard(gameZone, player, cardName, count, false); } /** * Add any amount of cards to specified zone of specified player. * - * @param gameZone {@link Constants.Zone} to add cards to. + * @param gameZone {@link mage.constants.Zone} to add cards to. * @param player {@link Player} to add cards for. Use either playerA or playerB. * @param cardName Card name in string format. * @param count Amount of cards to be added. * @param tapped In case gameZone is Battlefield, determines whether permanent should be tapped. * In case gameZone is other than Battlefield, {@link IllegalArgumentException} is thrown */ - public void addCard(Constants.Zone gameZone, TestPlayer player, String cardName, int count, boolean tapped) { + public void addCard(Zone gameZone, TestPlayer player, String cardName, int count, boolean tapped) { - if (gameZone.equals(Constants.Zone.BATTLEFIELD)) { + if (gameZone.equals(Zone.BATTLEFIELD)) { for (int i = 0; i < count; i++) { CardInfo cardInfo = CardRepository.instance.findCard(cardName); Card card = cardInfo != null ? cardInfo.getCard() : null; @@ -152,21 +152,21 @@ public abstract class CardTestAPIImpl extends MageTestBase implements CardTestAP * @param player * @return */ - private List getCardList(Constants.Zone gameZone, Player player) { + private List getCardList(Zone gameZone, Player player) { if (player.equals(playerA)) { - if (gameZone.equals(Constants.Zone.HAND)) { + if (gameZone.equals(Zone.HAND)) { return handCardsA; - } else if (gameZone.equals(Constants.Zone.GRAVEYARD)) { + } else if (gameZone.equals(Zone.GRAVEYARD)) { return graveyardCardsA; - } else if (gameZone.equals(Constants.Zone.LIBRARY)) { + } else if (gameZone.equals(Zone.LIBRARY)) { return libraryCardsA; } } else if (player.equals(playerB)) { - if (gameZone.equals(Constants.Zone.HAND)) { + if (gameZone.equals(Zone.HAND)) { return handCardsB; - } else if (gameZone.equals(Constants.Zone.GRAVEYARD)) { + } else if (gameZone.equals(Zone.GRAVEYARD)) { return graveyardCardsB; - } else if (gameZone.equals(Constants.Zone.LIBRARY)) { + } else if (gameZone.equals(Zone.LIBRARY)) { return libraryCardsB; } } @@ -181,9 +181,9 @@ public abstract class CardTestAPIImpl extends MageTestBase implements CardTestAP */ public void setLife(TestPlayer player, int life) { if (player.equals(playerA)) { - commandsA.put(Constants.Zone.OUTSIDE, "life:" + String.valueOf(life)); + commandsA.put(Zone.OUTSIDE, "life:" + String.valueOf(life)); } else if (player.equals(playerB)) { - commandsB.put(Constants.Zone.OUTSIDE, "life:" + String.valueOf(life)); + commandsB.put(Zone.OUTSIDE, "life:" + String.valueOf(life)); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java b/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java index 8e61184c6bd..a60f1910f3f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java @@ -1,8 +1,7 @@ package org.mage.test.serverside.base.impl; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.PhaseStep; +import mage.constants.CardType; +import mage.constants.PhaseStep; import mage.abilities.Ability; import mage.cards.Card; import mage.cards.decks.Deck; @@ -10,6 +9,7 @@ import mage.cards.decks.importer.DeckImporterUtil; import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; import mage.cards.repository.CardScanner; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.Filter; import mage.game.ExileZone; @@ -44,23 +44,23 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement public void useRedDefault() { // *** ComputerA *** // battlefield:ComputerA:Mountain:5 - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 5); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5); // hand:ComputerA:Mountain:4 - addCard(Constants.Zone.HAND, playerA, "Mountain", 5); + addCard(Zone.HAND, playerA, "Mountain", 5); // library:ComputerA:clear:0 removeAllCardsFromLibrary(playerA); // library:ComputerA:Mountain:10 - addCard(Constants.Zone.LIBRARY, playerA, "Mountain", 10); + addCard(Zone.LIBRARY, playerA, "Mountain", 10); // *** ComputerB *** // battlefield:ComputerB:Plains:2 - addCard(Constants.Zone.BATTLEFIELD, playerB, "Plains", 2); + addCard(Zone.BATTLEFIELD, playerB, "Plains", 2); // hand:ComputerB:Plains:2 - addCard(Constants.Zone.HAND, playerB, "Plains", 2); + addCard(Zone.HAND, playerB, "Plains", 2); // library:ComputerB:clear:0 removeAllCardsFromLibrary(playerB); // library:ComputerB:Plains:10 - addCard(Constants.Zone.LIBRARY, playerB, "Plains", 10); + addCard(Zone.LIBRARY, playerB, "Plains", 10); } /** @@ -68,16 +68,16 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement */ public void useWhiteDefault() { // *** ComputerA *** - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains", 5); - addCard(Constants.Zone.HAND, playerA, "Plains", 5); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 5); + addCard(Zone.HAND, playerA, "Plains", 5); removeAllCardsFromLibrary(playerA); - addCard(Constants.Zone.LIBRARY, playerA, "Plains", 10); + addCard(Zone.LIBRARY, playerA, "Plains", 10); // *** ComputerB *** - addCard(Constants.Zone.BATTLEFIELD, playerB, "Plains", 2); - addCard(Constants.Zone.HAND, playerB, "Plains", 2); + addCard(Zone.BATTLEFIELD, playerB, "Plains", 2); + addCard(Zone.HAND, playerB, "Plains", 2); removeAllCardsFromLibrary(playerB); - addCard(Constants.Zone.LIBRARY, playerB, "Plains", 10); + addCard(Zone.LIBRARY, playerB, "Plains", 10); } protected TestPlayer createPlayer(Game game, TestPlayer player, String name) throws GameException { @@ -106,7 +106,7 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement * @param player {@link Player} to remove all library cards from. */ public void removeAllCardsFromLibrary(TestPlayer player) { - getCommands(player).put(Constants.Zone.LIBRARY, "clear"); + getCommands(player).put(Zone.LIBRARY, "clear"); } /** @@ -116,45 +116,45 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement * @param player {@link Player} to remove all cards from hand. */ public void removeAllCardsFromHand(TestPlayer player) { - getCommands(player).put(Constants.Zone.HAND, "clear"); + getCommands(player).put(Zone.HAND, "clear"); } /** * Add a card to specified zone of specified player. * - * @param gameZone {@link Constants.Zone} to add cards to. + * @param gameZone {@link mage.constants.Zone} to add cards to. * @param player {@link Player} to add cards for. Use either playerA or playerB. * @param cardName Card name in string format. */ - public void addCard(Constants.Zone gameZone, TestPlayer player, String cardName) { + public void addCard(Zone gameZone, TestPlayer player, String cardName) { addCard(gameZone, player, cardName, 1, false); } /** * Add any amount of cards to specified zone of specified player. * - * @param gameZone {@link Constants.Zone} to add cards to. + * @param gameZone {@link mage.constants.Zone} to add cards to. * @param player {@link Player} to add cards for. Use either playerA or playerB. * @param cardName Card name in string format. * @param count Amount of cards to be added. */ - public void addCard(Constants.Zone gameZone, TestPlayer player, String cardName, int count) { + public void addCard(Zone gameZone, TestPlayer player, String cardName, int count) { addCard(gameZone, player, cardName, count, false); } /** * Add any amount of cards to specified zone of specified player. * - * @param gameZone {@link Constants.Zone} to add cards to. + * @param gameZone {@link mage.constants.Zone} to add cards to. * @param player {@link Player} to add cards for. Use either playerA or playerB. * @param cardName Card name in string format. * @param count Amount of cards to be added. * @param tapped In case gameZone is Battlefield, determines whether permanent should be tapped. * In case gameZone is other than Battlefield, {@link IllegalArgumentException} is thrown */ - public void addCard(Constants.Zone gameZone, TestPlayer player, String cardName, int count, boolean tapped) { + public void addCard(Zone gameZone, TestPlayer player, String cardName, int count, boolean tapped) { - if (gameZone.equals(Constants.Zone.BATTLEFIELD)) { + if (gameZone.equals(Zone.BATTLEFIELD)) { for (int i = 0; i < count; i++) { CardInfo cardInfo = CardRepository.instance.findCard(cardName); Card card = cardInfo != null ? cardInfo.getCard() : null; @@ -188,12 +188,12 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement * @param player * @return */ - private List getCardList(Constants.Zone gameZone, TestPlayer player) { - if (gameZone.equals(Constants.Zone.HAND)) { + private List getCardList(Zone gameZone, TestPlayer player) { + if (gameZone.equals(Zone.HAND)) { return getHandCards(player); - } else if (gameZone.equals(Constants.Zone.GRAVEYARD)) { + } else if (gameZone.equals(Zone.GRAVEYARD)) { return getGraveCards(player); - } else if (gameZone.equals(Constants.Zone.LIBRARY)) { + } else if (gameZone.equals(Zone.LIBRARY)) { return getLibraryCards(player); } @@ -207,7 +207,7 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement * @param life Life count to set. */ public void setLife(TestPlayer player, int life) { - getCommands(player).put(Constants.Zone.OUTSIDE, "life:" + String.valueOf(life)); + getCommands(player).put(Zone.OUTSIDE, "life:" + String.valueOf(life)); } /** diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/cards/abilities/ProtectionFromColorTest.java b/Mage.Tests/src/test/java/org/mage/test/serverside/cards/abilities/ProtectionFromColorTest.java index 0db9390362d..a03c04598cf 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/cards/abilities/ProtectionFromColorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/cards/abilities/ProtectionFromColorTest.java @@ -1,7 +1,7 @@ package org.mage.test.serverside.cards.abilities; -import mage.Constants; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,10 +12,10 @@ public class ProtectionFromColorTest extends CardTestPlayerBase { @Test public void testAgainstAbilityInTheStack() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Royal Assassin"); + addCard(Zone.BATTLEFIELD, playerA, "Royal Assassin"); // tapped White Knight with Protection from Black - addCard(Constants.Zone.BATTLEFIELD, playerB, "White Knight", 1, true); + addCard(Zone.BATTLEFIELD, playerB, "White Knight", 1, true); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Destroy target tapped creature. ", "White Knight"); setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -27,9 +27,9 @@ public class ProtectionFromColorTest extends CardTestPlayerBase { @Test public void testAgainstAbilityInTheStackNoProtection() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Royal Assassin"); + addCard(Zone.BATTLEFIELD, playerA, "Royal Assassin"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Runeclaw Bear", 1, true); + addCard(Zone.BATTLEFIELD, playerB, "Runeclaw Bear", 1, true); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Destroy target tapped creature. ", "Runeclaw Bear"); setStopAt(1, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/cards/abilities/ProtectionFromTypeTest.java b/Mage.Tests/src/test/java/org/mage/test/serverside/cards/abilities/ProtectionFromTypeTest.java index 5e29ebecaea..685f2a296c1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/cards/abilities/ProtectionFromTypeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/cards/abilities/ProtectionFromTypeTest.java @@ -1,6 +1,7 @@ package org.mage.test.serverside.cards.abilities; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,12 +13,12 @@ public class ProtectionFromTypeTest extends CardTestPlayerBase { @Test public void testProtectionFromArtifacts() { useRedDefault(); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Trigon of Corruption"); + addCard(Zone.BATTLEFIELD, playerA, "Trigon of Corruption"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Tel-Jilad Fallen"); + addCard(Zone.BATTLEFIELD, playerB, "Tel-Jilad Fallen"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{2},Remove a Charge counter from {this}, {T}: put a -1/-1 counter on target creature. ", "Tel-Jilad Fallen"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{2},Remove a Charge counter from {this}, {T}: put a -1/-1 counter on target creature. ", "Tel-Jilad Fallen"); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); // no one should be destroyed @@ -27,12 +28,12 @@ public class ProtectionFromTypeTest extends CardTestPlayerBase { @Test public void testNoProtection() { useRedDefault(); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Trigon of Corruption"); + addCard(Zone.BATTLEFIELD, playerA, "Trigon of Corruption"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Coral Merfolk"); + addCard(Zone.BATTLEFIELD, playerB, "Coral Merfolk"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{2},Remove a Charge counter from {this}, {T}: Put a -1/-1 counter on target creature. ", "Coral Merfolk"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{2},Remove a Charge counter from {this}, {T}: Put a -1/-1 counter on target creature. ", "Coral Merfolk"); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); // Coral Merfolk should be destroyed diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/cards/effects/TestActivatedContinuousEffect.java b/Mage.Tests/src/test/java/org/mage/test/serverside/cards/effects/TestActivatedContinuousEffect.java index 82206689018..cf125d38b59 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/cards/effects/TestActivatedContinuousEffect.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/cards/effects/TestActivatedContinuousEffect.java @@ -1,6 +1,7 @@ package org.mage.test.serverside.cards.effects; -import mage.Constants; +import mage.constants.PhaseStep; +import mage.constants.Zone; import mage.filter.Filter; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -13,13 +14,13 @@ public class TestActivatedContinuousEffect extends CardTestPlayerBase { @Test public void testCard() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 3); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Captive Flame"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "White Knight"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3); + addCard(Zone.BATTLEFIELD, playerA, "Captive Flame"); + addCard(Zone.BATTLEFIELD, playerA, "White Knight"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{R}:", "White Knight"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{R}:", "White Knight"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); @@ -31,14 +32,14 @@ public class TestActivatedContinuousEffect extends CardTestPlayerBase { @Test public void testCard2() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 3); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Captive Flame"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "White Knight"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3); + addCard(Zone.BATTLEFIELD, playerA, "Captive Flame"); + addCard(Zone.BATTLEFIELD, playerA, "White Knight"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{R}:", "White Knight"); - activateAbility(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{R}:", "White Knight"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{R}:", "White Knight"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{R}:", "White Knight"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); diff --git a/Mage/src/mage/Constants.java b/Mage/src/mage/Constants.java index 21d76f621d2..c7c61c10ad8 100644 --- a/Mage/src/mage/Constants.java +++ b/Mage/src/mage/Constants.java @@ -32,444 +32,7 @@ public final class Constants { public static final String MSG_TIP_HOT_KEYS_CODE = "MSG_TIPS_0001"; - public enum ColoredManaSymbol { - W("W"), U("U"), B("B"), R("R"), G("G"); - - private String text; - - ColoredManaSymbol(String text) { - this.text = text; - } - - @Override - public String toString() { - return text; - } - - public static ColoredManaSymbol lookup(char c) { - switch (c) { - case 'W': - return W; - case 'R': - return R; - case 'G': - return G; - case 'B': - return B; - case 'U': - return U; - } - return null; - } - - } - - public enum ManaType { - BLACK, BLUE, GREEN, RED, WHITE, COLORLESS - } - - public enum CardType { - ARTIFACT ("Artifact"), - CREATURE ("Creature"), - ENCHANTMENT ("Enchantment"), - INSTANT ("Instant"), - LAND ("Land"), - PLANESWALKER ("Planeswalker"), - SORCERY ("Sorcery"), - TRIBAL ("Tribal"); - - private String text; - - CardType(String text) { - this.text = text; - } - - @Override - public String toString() { - return text; - } - - } - - public enum Rarity { - - NA ("na", "na", "N", 0), - LAND ("Land", "common", "C", 1), - COMMON ("Common", "common", "C", 1), - UNCOMMON ("Uncommon", "uncommon", "U", 2), - RARE ("Rare", "rare", "R", 3), - MYTHIC ("Mythic", "mythic", "M", 3), - SPECIAL ("Special", "special", "SP", 3); - - private String text; - private String symbolCode; - private String code; - private int rating; - - Rarity(String text, String symbolCode, String code, int rating) { - this.text = text; - this.symbolCode = symbolCode; - this.code = code; - this.rating = rating; - } - - @Override - public String toString() { - return text; - } - - public String getSymbolCode() { - return symbolCode; - } - - public String getCode() { - return code; - } - - public int getRating() { - return rating; - } - } - - public enum AbilityType { - PLAY_LAND("Play land"), - MANA("Mana"), - SPELL("Spell"), - ACTIVATED("Activated"), - STATIC("Static"), - TRIGGERED("Triggered"), - EVASION("Evasion"), - LOYALTY("Loyalty"), - SPECIAL_ACTION("Special Action"); - - private String text; - - AbilityType(String text) { - this.text = text; - } - - @Override - public String toString() { - return text; - } - } - - public enum SpellAbilityType { - BASE("Basic SpellAbility"), - SPLIT("Split SpellAbility"), - SPLIT_FUSED("Split SpellAbility"), - SPLIT_LEFT("LeftSplit SpellAbility"), - SPLIT_RIGHT("RightSplit SpellAbility"), - MODE("Mode SpellAbility"), - SPLICE("Spliced SpellAbility"); - - private String text; - - SpellAbilityType(String text) { - this.text = text; - } - - @Override - public String toString() { - return text; - } - } - - public enum EffectType { - - ONESHOT("One Shot Effect"), - CONTINUOUS("Continuous Effect"), - REPLACEMENT("Replacement Effect"), - PREVENTION("Prevention Effect"), - REDIRECTION("Redirection Effect"), - ASTHOUGH("As Though Effect"), - RESTRICTION("Restriction Effect"), - REQUIREMENT("Requirement Effect"), - COSTMODIFICATION("Cost Modification Effect"); - - private String text; - - EffectType(String text) { - this.text = text; - } - - @Override - public String toString() { - return text; - } - } - - public enum AsThoughEffectType { - BLOCK, - BE_BLOCKED, - ATTACK, - CAST, - TARGET, - PAY, - DAMAGE, - HEXPROOF, - REVEAL_FACE_DOWN - } - - public enum Duration { - OneUse(""), - EndOfGame("for the rest of the game"), - WhileOnBattlefield(""), - WhileOnStack(""), - WhileInGraveyard(""), - EndOfTurn("until end of turn"), - EndOfCombat("until end of combat"), - Custom(""); - - private String text; - - Duration(String text) { - this.text = text; - } - - @Override - public String toString() { - return text; - } - - } - - public enum Layer { - CopyEffects_1, - ControlChangingEffects_2, - TextChangingEffects_3, - TypeChangingEffects_4, - ColorChangingEffects_5, - AbilityAddingRemovingEffects_6, - PTChangingEffects_7, - PlayerEffects, - RulesEffects - } - - public enum SubLayer { - CharacteristicDefining_7a, - SetPT_7b, - ModifyPT_7c, - Counters_7d, - SwitchPT_e, - NA - } - - public enum TableState { - WAITING ("Waiting for players"), - STARTING ("Waiting to start"), - DRAFTING ("Drafting"), - DUELING ("Dueling"), - SIDEBOARDING ("Sideboarding"), - CONSTRUCTING ("Constructing"), - FINISHED ("Finished"); - - private String text; - - TableState(String text) { - this.text = text; - } - - @Override - public String toString() { - return text; - } - - } - - public enum TurnPhase { - BEGINNING ("Beginning"), - PRECOMBAT_MAIN ("Precombat Main"), - COMBAT ("Combat"), - POSTCOMBAT_MAIN ("Postcombat Main"), - END ("End"); - - private String text; - - TurnPhase(String text) { - this.text = text; - } - - @Override - public String toString() { - return text; - } - - } - - public enum PhaseStep { - UNTAP ("Untap", 0), - UPKEEP ("Upkeep", 1), - DRAW ("Draw", 2), - PRECOMBAT_MAIN ("Precombat Main", 3), - BEGIN_COMBAT ("Begin Combat", 4), - DECLARE_ATTACKERS ("Declare Attackers", 5), - DECLARE_BLOCKERS ("Declare Blockers", 6), - FIRST_COMBAT_DAMAGE ("First Combat Damage", 7), - COMBAT_DAMAGE ("Combat Damage", 8), - END_COMBAT ("End Combat", 9), - POSTCOMBAT_MAIN ("Postcombat Main", 10), - END_TURN ("End Turn", 11), - CLEANUP ("Cleanup", 12); - - private String text; - - /** - * Index is used for game state scoring system. - */ - private int index; - - PhaseStep(String text, int index) { - this.text = text; - this.index = index; - } - - public int getIndex() { - return index; - } - - @Override - public String toString() { - return text; - } - - } - - public enum Outcome { - Damage(false), - DestroyPermanent(false), - BoostCreature(true), - UnboostCreature(false), - AddAbility(true), - LoseAbility(false), - GainLife(true), - LoseLife(false), - ExtraTurn(true), - BecomeCreature(true), - PutCreatureInPlay(true), - PutCardInPlay(true), - PutLandInPlay(true), - GainControl(false), - DrawCard(true), - Discard(false), - Sacrifice(false), - PlayForFree(true), - ReturnToHand(false), - Exile(false), - Protect(true), - PutManaInPool(true), - Regenerate(true), - PreventDamage(true), - RedirectDamage(true), - Tap(false), - Transform(true), - Untap(true), - Win(true), - Copy(true, true), - Benefit(true), - Detriment(false), - Neutral(true), - Removal(false); - - private boolean good; - private boolean canTargetAll; - - Outcome(boolean good) { - this.good = good; - } - - Outcome(boolean good, boolean canTargetAll) { - this.good = good; - this.canTargetAll = canTargetAll; - } - - public boolean isGood() { - return good; - } - - public boolean isCanTargetAll() { - return canTargetAll; - } - } - - public enum Zone { - HAND, GRAVEYARD, LIBRARY, BATTLEFIELD, STACK, EXILED, ALL, OUTSIDE, PICK, COMMAND; - - public boolean match(Zone zone) { - return (this == zone || this == ALL || zone == ALL); - } - } - - public enum TimingRule { - INSTANT, SORCERY - } - - public enum TargetController { - ANY, YOU, NOT_YOU, OPPONENT, CONTROLLER_ATTACHED_TO - } - - public enum RangeOfInfluence { - ONE(1), - TWO(2), - ALL(0); - - private int range; - - RangeOfInfluence(int range) { - this.range = range; - } - - public int getRange() { - return range; - } - } - - public enum MultiplayerAttackOption { - MULTIPLE("Attack Multiple Players"), - LEFT("Attack Left"), - RIGHT("Attack Right"); - - private String text; - - MultiplayerAttackOption(String text) { - this.text = text; - } - - @Override - public String toString() { - return text; - } - } - - public enum SetType { - CORE("Core"), - EXPANSION("Expansion"), - REPRINT("Reprint"); - - private String text; - - SetType(String text) { - this.text = text; - } - - @Override - public String toString() { - return text; - } - } - - public enum AttachmentType { - EQUIPMENT, - AURA - } - - public enum WatcherScope { - GAME, - PLAYER, - CARD - } - -/* public static final List PlaneswalkerTypes = new ArrayList() + /* public static final List PlaneswalkerTypes = new ArrayList() {{add("Ajani"); add("Bolas"); add("Chandra"); add("Elspeth"); add("Garruk"); add("Jace"); add("Liliana"); add("Nissa"); add("Sarkhan"); add("Sorin"); add("Tezzeret"); add("Karn"); diff --git a/Mage/src/mage/MageObject.java b/Mage/src/mage/MageObject.java index c017fcd11cf..dd80ea3b0e1 100644 --- a/Mage/src/mage/MageObject.java +++ b/Mage/src/mage/MageObject.java @@ -1,6 +1,6 @@ package mage; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.abilities.Abilities; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCost; diff --git a/Mage/src/mage/MageObjectImpl.java b/Mage/src/mage/MageObjectImpl.java index 11538584520..29d164df0a4 100644 --- a/Mage/src/mage/MageObjectImpl.java +++ b/Mage/src/mage/MageObjectImpl.java @@ -28,7 +28,7 @@ package mage; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; import mage.abilities.Ability; diff --git a/Mage/src/mage/Mana.java b/Mage/src/mage/Mana.java index d7216812d65..6e5d6cfc16f 100644 --- a/Mage/src/mage/Mana.java +++ b/Mage/src/mage/Mana.java @@ -28,8 +28,8 @@ package mage; -import mage.Constants.ColoredManaSymbol; -import mage.Constants.ManaType; +import mage.constants.ColoredManaSymbol; +import mage.constants.ManaType; import mage.filter.FilterMana; import mage.util.Copyable; diff --git a/Mage/src/mage/abilities/Abilities.java b/Mage/src/mage/abilities/Abilities.java index 578852dc162..804874017fa 100644 --- a/Mage/src/mage/abilities/Abilities.java +++ b/Mage/src/mage/abilities/Abilities.java @@ -31,7 +31,7 @@ package mage.abilities; import java.io.Serializable; import java.util.List; import java.util.UUID; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.keyword.ProtectionAbility; import mage.abilities.mana.ManaAbility; import mage.game.Game; @@ -105,7 +105,7 @@ public interface Abilities extends List, Serializable { * @see mage.abilities.effects.ContinuousEffects#getApplicableRequirementEffects(mage.game.permanent.Permanent, mage.game.Game) * @see mage.abilities.effects.ContinuousEffects#getApplicableRestrictionEffects(mage.game.permanent.Permanent, mage.game.Game) * @see mage.abilities.effects.ContinuousEffects#getApplicableReplacementEffects(mage.game.events.GameEvent, mage.game.Game) - * @see mage.abilities.effects.ContinuousEffects#asThough(java.util.UUID, mage.Constants.AsThoughEffectType, mage.game.Game) + * @see mage.abilities.effects.ContinuousEffects#asThough(java.util.UUID, mage.constants.AsThoughEffectType, mage.game.Game) * @see mage.abilities.effects.ContinuousEffects#costModification(mage.abilities.Ability, mage.game.Game) */ Abilities getStaticAbilities(Zone zone); @@ -124,7 +124,7 @@ public interface Abilities extends List, Serializable { * @param zone The {@link Zone} to search for {@link TriggeredAbility triggered abilities} * @return All found {@link TriggeredAbility triggered abilities}. * - * @see mage.cards.CardImpl#checkTriggers(mage.Constants.Zone, mage.game.events.GameEvent, mage.game.Game) + * @see mage.cards.CardImpl#checkTriggers(mage.constants.Zone, mage.game.events.GameEvent, mage.game.Game) * @see mage.game.permanent.PermanentImpl#checkTriggers(mage.game.events.GameEvent, mage.game.Game) * @see mage.game.permanent.PermanentCard#checkPermanentOnlyTriggers(mage.game.events.ZoneChangeEvent, mage.game.Game) */ diff --git a/Mage/src/mage/abilities/AbilitiesImpl.java b/Mage/src/mage/abilities/AbilitiesImpl.java index b5a9163ebdb..11acbca584a 100644 --- a/Mage/src/mage/abilities/AbilitiesImpl.java +++ b/Mage/src/mage/abilities/AbilitiesImpl.java @@ -32,7 +32,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.UUID; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.common.ZoneChangeTriggeredAbility; import mage.abilities.costs.AlternativeCost; import mage.abilities.costs.Cost; diff --git a/Mage/src/mage/abilities/Ability.java b/Mage/src/mage/abilities/Ability.java index 486b220dbde..3d34746b6d9 100644 --- a/Mage/src/mage/abilities/Ability.java +++ b/Mage/src/mage/abilities/Ability.java @@ -28,9 +28,9 @@ package mage.abilities; -import mage.Constants.AbilityType; -import mage.Constants.EffectType; -import mage.Constants.Zone; +import mage.constants.AbilityType; +import mage.constants.EffectType; +import mage.constants.Zone; import mage.MageObject; import mage.abilities.costs.AlternativeCost; import mage.abilities.costs.Cost; diff --git a/Mage/src/mage/abilities/AbilityImpl.java b/Mage/src/mage/abilities/AbilityImpl.java index 1a851a19d8b..7bc757f7e05 100644 --- a/Mage/src/mage/abilities/AbilityImpl.java +++ b/Mage/src/mage/abilities/AbilityImpl.java @@ -28,10 +28,10 @@ package mage.abilities; -import mage.Constants.AbilityType; -import mage.Constants.EffectType; -import mage.Constants.Outcome; -import mage.Constants.Zone; +import mage.constants.AbilityType; +import mage.constants.EffectType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.MageObject; import mage.abilities.costs.*; import mage.abilities.costs.mana.ManaCost; diff --git a/Mage/src/mage/abilities/ActivatedAbilityImpl.java b/Mage/src/mage/abilities/ActivatedAbilityImpl.java index 137dbc05f23..eb0e95f2da5 100644 --- a/Mage/src/mage/abilities/ActivatedAbilityImpl.java +++ b/Mage/src/mage/abilities/ActivatedAbilityImpl.java @@ -29,10 +29,11 @@ package mage.abilities; import java.util.UUID; -import mage.Constants; -import mage.Constants.AbilityType; -import mage.Constants.TimingRule; -import mage.Constants.Zone; + +import mage.constants.AbilityType; +import mage.constants.SpellAbilityType; +import mage.constants.TimingRule; +import mage.constants.Zone; import mage.MageObject; import mage.abilities.costs.AlternativeSourceCosts; import mage.abilities.costs.Cost; @@ -43,6 +44,7 @@ import mage.abilities.costs.mana.PhyrexianManaCost; import mage.abilities.effects.Effect; import mage.abilities.effects.Effects; import mage.cards.Card; +import mage.constants.TargetController; import mage.game.Game; import mage.game.stack.Spell; import mage.game.stack.StackAbility; @@ -56,7 +58,7 @@ import mage.target.Target; public abstract class ActivatedAbilityImpl> extends AbilityImpl implements ActivatedAbility { protected TimingRule timing = TimingRule.INSTANT; - protected Constants.TargetController mayActivate = Constants.TargetController.YOU; + protected TargetController mayActivate = TargetController.YOU; protected UUID activatorId; protected ActivatedAbilityImpl(AbilityType abilityType, Zone zone) { @@ -241,7 +243,7 @@ public abstract class ActivatedAbilityImpl> ex } else { sb.append("unknown"); } - if (object instanceof Spell && ((Spell) object).getSpellAbility().getSpellAbilityType().equals(Constants.SpellAbilityType.SPLIT_FUSED)) { + if (object instanceof Spell && ((Spell) object).getSpellAbility().getSpellAbilityType().equals(SpellAbilityType.SPLIT_FUSED)) { Spell spell = (Spell) object; int i = 0; for (SpellAbility spellAbility : spell.getSpellAbilities()) { @@ -283,7 +285,7 @@ public abstract class ActivatedAbilityImpl> ex return sb.toString(); } - public void setMayActivate(Constants.TargetController mayActivate) { + public void setMayActivate(TargetController mayActivate) { this.mayActivate = mayActivate; } diff --git a/Mage/src/mage/abilities/DelayedTriggeredAbilities.java b/Mage/src/mage/abilities/DelayedTriggeredAbilities.java index db8045a749b..26047226d87 100644 --- a/Mage/src/mage/abilities/DelayedTriggeredAbilities.java +++ b/Mage/src/mage/abilities/DelayedTriggeredAbilities.java @@ -29,7 +29,7 @@ package mage.abilities; import java.util.Iterator; -import mage.Constants.Duration; +import mage.constants.Duration; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage/src/mage/abilities/DelayedTriggeredAbility.java b/Mage/src/mage/abilities/DelayedTriggeredAbility.java index 4339fa4bfb2..3a313ea72bf 100644 --- a/Mage/src/mage/abilities/DelayedTriggeredAbility.java +++ b/Mage/src/mage/abilities/DelayedTriggeredAbility.java @@ -28,8 +28,8 @@ package mage.abilities; -import mage.Constants.Duration; -import mage.Constants.Zone; +import mage.constants.Duration; +import mage.constants.Zone; import mage.abilities.effects.Effect; /** diff --git a/Mage/src/mage/abilities/EvasionAbility.java b/Mage/src/mage/abilities/EvasionAbility.java index 59839fec0ff..acacf37351b 100644 --- a/Mage/src/mage/abilities/EvasionAbility.java +++ b/Mage/src/mage/abilities/EvasionAbility.java @@ -28,8 +28,8 @@ package mage.abilities; -import mage.Constants.AbilityType; -import mage.Constants.Zone; +import mage.constants.AbilityType; +import mage.constants.Zone; /** * diff --git a/Mage/src/mage/abilities/LoyaltyAbility.java b/Mage/src/mage/abilities/LoyaltyAbility.java index b23e7dcf067..0b59850b093 100644 --- a/Mage/src/mage/abilities/LoyaltyAbility.java +++ b/Mage/src/mage/abilities/LoyaltyAbility.java @@ -28,8 +28,8 @@ package mage.abilities; -import mage.Constants.TimingRule; -import mage.Constants.Zone; +import mage.constants.TimingRule; +import mage.constants.Zone; import mage.abilities.costs.common.PayLoyaltyCost; import mage.abilities.costs.common.PayVariableLoyaltyCost; import mage.abilities.effects.Effect; diff --git a/Mage/src/mage/abilities/PlayLandAbility.java b/Mage/src/mage/abilities/PlayLandAbility.java index c52652d99cc..9ac748c6b5c 100644 --- a/Mage/src/mage/abilities/PlayLandAbility.java +++ b/Mage/src/mage/abilities/PlayLandAbility.java @@ -29,8 +29,8 @@ package mage.abilities; import java.util.UUID; -import mage.Constants.AbilityType; -import mage.Constants.Zone; +import mage.constants.AbilityType; +import mage.constants.Zone; import mage.game.Game; /** diff --git a/Mage/src/mage/abilities/SpecialAction.java b/Mage/src/mage/abilities/SpecialAction.java index c9ca81ab39c..77c77611003 100644 --- a/Mage/src/mage/abilities/SpecialAction.java +++ b/Mage/src/mage/abilities/SpecialAction.java @@ -28,8 +28,8 @@ package mage.abilities; -import mage.Constants.AbilityType; -import mage.Constants.Zone; +import mage.constants.AbilityType; +import mage.constants.Zone; /** * diff --git a/Mage/src/mage/abilities/SpellAbility.java b/Mage/src/mage/abilities/SpellAbility.java index f33359100e2..138088c73bc 100644 --- a/Mage/src/mage/abilities/SpellAbility.java +++ b/Mage/src/mage/abilities/SpellAbility.java @@ -28,17 +28,17 @@ package mage.abilities; -import mage.Constants.AbilityType; -import mage.Constants.AsThoughEffectType; -import mage.Constants.CardType; -import mage.Constants.Zone; +import mage.constants.AbilityType; +import mage.constants.AsThoughEffectType; +import mage.constants.CardType; +import mage.constants.Zone; import mage.MageObject; import mage.abilities.costs.mana.ManaCost; import mage.abilities.keyword.FlashAbility; import mage.game.Game; import java.util.UUID; -import mage.Constants.SpellAbilityType; +import mage.constants.SpellAbilityType; import mage.cards.SplitCard; /** diff --git a/Mage/src/mage/abilities/StateTriggeredAbility.java b/Mage/src/mage/abilities/StateTriggeredAbility.java index ea3fdf7108e..83d3ebbf70f 100644 --- a/Mage/src/mage/abilities/StateTriggeredAbility.java +++ b/Mage/src/mage/abilities/StateTriggeredAbility.java @@ -29,7 +29,7 @@ package mage.abilities; import java.util.UUID; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.effects.Effect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/StaticAbility.java b/Mage/src/mage/abilities/StaticAbility.java index 5d950e8f2fd..2a3bb373ccd 100644 --- a/Mage/src/mage/abilities/StaticAbility.java +++ b/Mage/src/mage/abilities/StaticAbility.java @@ -28,8 +28,8 @@ package mage.abilities; -import mage.Constants.AbilityType; -import mage.Constants.Zone; +import mage.constants.AbilityType; +import mage.constants.Zone; import mage.abilities.effects.Effect; /** diff --git a/Mage/src/mage/abilities/TriggeredAbilityImpl.java b/Mage/src/mage/abilities/TriggeredAbilityImpl.java index 77d66b6ee5c..7b426ef0aad 100644 --- a/Mage/src/mage/abilities/TriggeredAbilityImpl.java +++ b/Mage/src/mage/abilities/TriggeredAbilityImpl.java @@ -29,8 +29,8 @@ package mage.abilities; import java.util.UUID; -import mage.Constants.AbilityType; -import mage.Constants.Zone; +import mage.constants.AbilityType; +import mage.constants.Zone; import mage.MageObject; import mage.abilities.effects.Effect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/common/ActivateAsSorceryActivatedAbility.java b/Mage/src/mage/abilities/common/ActivateAsSorceryActivatedAbility.java index 10007c05c0a..b3ed3110b63 100644 --- a/Mage/src/mage/abilities/common/ActivateAsSorceryActivatedAbility.java +++ b/Mage/src/mage/abilities/common/ActivateAsSorceryActivatedAbility.java @@ -27,15 +27,16 @@ */ package mage.abilities.common; -import mage.Constants; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.Cost; import mage.abilities.effects.Effect; +import mage.constants.TimingRule; +import mage.constants.Zone; public class ActivateAsSorceryActivatedAbility extends ActivatedAbilityImpl { - public ActivateAsSorceryActivatedAbility(Constants.Zone zone, Effect effect, Cost cost) { + public ActivateAsSorceryActivatedAbility(Zone zone, Effect effect, Cost cost) { super(zone, effect, cost); - timing = Constants.TimingRule.SORCERY; + timing = TimingRule.SORCERY; } public ActivateAsSorceryActivatedAbility(final ActivateAsSorceryActivatedAbility ability) { diff --git a/Mage/src/mage/abilities/common/ActivateIfConditionActivatedAbility.java b/Mage/src/mage/abilities/common/ActivateIfConditionActivatedAbility.java index 87f811ca9cf..eb375eb8087 100644 --- a/Mage/src/mage/abilities/common/ActivateIfConditionActivatedAbility.java +++ b/Mage/src/mage/abilities/common/ActivateIfConditionActivatedAbility.java @@ -29,7 +29,7 @@ package mage.abilities.common; import java.util.UUID; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.condition.Condition; import mage.abilities.costs.Cost; diff --git a/Mage/src/mage/abilities/common/ActivateOncePerTurnActivatedAbility.java b/Mage/src/mage/abilities/common/ActivateOncePerTurnActivatedAbility.java index 8dc017919df..ba94df9aef5 100644 --- a/Mage/src/mage/abilities/common/ActivateOncePerTurnActivatedAbility.java +++ b/Mage/src/mage/abilities/common/ActivateOncePerTurnActivatedAbility.java @@ -29,7 +29,7 @@ package mage.abilities.common; import java.util.UUID; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.Cost; import mage.abilities.effects.Effect; diff --git a/Mage/src/mage/abilities/common/AllyEntersBattlefieldTriggeredAbility.java b/Mage/src/mage/abilities/common/AllyEntersBattlefieldTriggeredAbility.java index 08f444e57a2..de3ea82fc16 100644 --- a/Mage/src/mage/abilities/common/AllyEntersBattlefieldTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/AllyEntersBattlefieldTriggeredAbility.java @@ -28,7 +28,7 @@ package mage.abilities.common; import java.util.UUID; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/common/AnotherCreatureEntersBattlefieldTriggeredAbility.java b/Mage/src/mage/abilities/common/AnotherCreatureEntersBattlefieldTriggeredAbility.java index 0b687558b0a..be8861e3b28 100644 --- a/Mage/src/mage/abilities/common/AnotherCreatureEntersBattlefieldTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/AnotherCreatureEntersBattlefieldTriggeredAbility.java @@ -1,8 +1,9 @@ package mage.abilities.common; -import mage.Constants; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; +import mage.constants.CardType; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -14,7 +15,7 @@ public class AnotherCreatureEntersBattlefieldTriggeredAbility extends TriggeredA } public AnotherCreatureEntersBattlefieldTriggeredAbility(Effect effect, boolean optional) { - super(Constants.Zone.BATTLEFIELD, effect, optional); + super(Zone.BATTLEFIELD, effect, optional); } public AnotherCreatureEntersBattlefieldTriggeredAbility(AnotherCreatureEntersBattlefieldTriggeredAbility ability) { @@ -25,7 +26,7 @@ public class AnotherCreatureEntersBattlefieldTriggeredAbility extends TriggeredA public boolean checkTrigger(GameEvent event, Game game) { if (event.getType() == GameEvent.EventType.ENTERS_THE_BATTLEFIELD && event.getTargetId() != this.getSourceId()) { Permanent permanent = game.getPermanent(event.getTargetId()); - if (permanent.getCardType().contains(Constants.CardType.CREATURE)) { + if (permanent.getCardType().contains(CardType.CREATURE)) { return true; } } diff --git a/Mage/src/mage/abilities/common/AsEntersBattlefieldAbility.java b/Mage/src/mage/abilities/common/AsEntersBattlefieldAbility.java index 426e02c5eff..d2a690bca75 100644 --- a/Mage/src/mage/abilities/common/AsEntersBattlefieldAbility.java +++ b/Mage/src/mage/abilities/common/AsEntersBattlefieldAbility.java @@ -27,10 +27,10 @@ */ package mage.abilities.common; -import mage.Constants; import mage.abilities.StaticAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.EntersBattlefieldEffect; +import mage.constants.Zone; /** * @@ -39,11 +39,11 @@ import mage.abilities.effects.EntersBattlefieldEffect; public class AsEntersBattlefieldAbility extends StaticAbility { public AsEntersBattlefieldAbility(Effect effect) { - super(Constants.Zone.BATTLEFIELD, new EntersBattlefieldEffect(effect)); + super(Zone.BATTLEFIELD, new EntersBattlefieldEffect(effect)); } public AsEntersBattlefieldAbility(Effect effect, String text) { - super(Constants.Zone.BATTLEFIELD, new EntersBattlefieldEffect(effect, text)); + super(Zone.BATTLEFIELD, new EntersBattlefieldEffect(effect, text)); } public AsEntersBattlefieldAbility(AsEntersBattlefieldAbility ability) { diff --git a/Mage/src/mage/abilities/common/AttacksCreatureYourControlTriggeredAbility.java b/Mage/src/mage/abilities/common/AttacksCreatureYourControlTriggeredAbility.java index eb2cf3fa984..05062d1713b 100644 --- a/Mage/src/mage/abilities/common/AttacksCreatureYourControlTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/AttacksCreatureYourControlTriggeredAbility.java @@ -28,7 +28,7 @@ package mage.abilities.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.filter.common.FilterControlledCreaturePermanent; diff --git a/Mage/src/mage/abilities/common/AttacksEachTurnStaticAbility.java b/Mage/src/mage/abilities/common/AttacksEachTurnStaticAbility.java index 26074208453..38e463ff62d 100644 --- a/Mage/src/mage/abilities/common/AttacksEachTurnStaticAbility.java +++ b/Mage/src/mage/abilities/common/AttacksEachTurnStaticAbility.java @@ -28,8 +28,8 @@ package mage.abilities.common; -import mage.Constants.Duration; -import mage.Constants.Zone; +import mage.constants.Duration; +import mage.constants.Zone; import mage.abilities.StaticAbility; import mage.abilities.effects.common.AttacksIfAbleSourceEffect; diff --git a/Mage/src/mage/abilities/common/AttacksEquippedTriggeredAbility.java b/Mage/src/mage/abilities/common/AttacksEquippedTriggeredAbility.java index 3717eb5b686..99b98606454 100644 --- a/Mage/src/mage/abilities/common/AttacksEquippedTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/AttacksEquippedTriggeredAbility.java @@ -1,19 +1,19 @@ package mage.abilities.common; -import mage.Constants; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; public class AttacksEquippedTriggeredAbility extends TriggeredAbilityImpl { public AttacksEquippedTriggeredAbility(Effect effect) { - super(Constants.Zone.BATTLEFIELD, effect); + super(Zone.BATTLEFIELD, effect); } public AttacksEquippedTriggeredAbility(Effect effect, boolean optional) { - super(Constants.Zone.BATTLEFIELD, effect, optional); + super(Zone.BATTLEFIELD, effect, optional); } public AttacksEquippedTriggeredAbility(final AttacksEquippedTriggeredAbility abiltity) { diff --git a/Mage/src/mage/abilities/common/AttacksOrBlocksEnchantedTriggeredAbility.java b/Mage/src/mage/abilities/common/AttacksOrBlocksEnchantedTriggeredAbility.java index c7823443b48..d8b15e5f578 100644 --- a/Mage/src/mage/abilities/common/AttacksOrBlocksEnchantedTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/AttacksOrBlocksEnchantedTriggeredAbility.java @@ -2,16 +2,16 @@ package mage.abilities.common; -import mage.Constants; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; public class AttacksOrBlocksEnchantedTriggeredAbility extends TriggeredAbilityImpl { - public AttacksOrBlocksEnchantedTriggeredAbility(Constants.Zone zone, Effect effect) { + public AttacksOrBlocksEnchantedTriggeredAbility(Zone zone, Effect effect) { super(zone, effect); } diff --git a/Mage/src/mage/abilities/common/AttacksOrBlocksTriggeredAbility.java b/Mage/src/mage/abilities/common/AttacksOrBlocksTriggeredAbility.java index bb1966d806b..f1047532c97 100644 --- a/Mage/src/mage/abilities/common/AttacksOrBlocksTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/AttacksOrBlocksTriggeredAbility.java @@ -1,14 +1,14 @@ package mage.abilities.common; -import mage.Constants; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; public class AttacksOrBlocksTriggeredAbility extends TriggeredAbilityImpl { public AttacksOrBlocksTriggeredAbility(Effect effect, boolean optional) { - super(Constants.Zone.BATTLEFIELD, effect, optional); + super(Zone.BATTLEFIELD, effect, optional); } public AttacksOrBlocksTriggeredAbility(final AttacksOrBlocksTriggeredAbility ability) { diff --git a/Mage/src/mage/abilities/common/AttacksTriggeredAbility.java b/Mage/src/mage/abilities/common/AttacksTriggeredAbility.java index ee857b0f127..ab2ef7f2b3d 100644 --- a/Mage/src/mage/abilities/common/AttacksTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/AttacksTriggeredAbility.java @@ -28,7 +28,7 @@ package mage.abilities.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/common/BecomesBlockedByCreatureTriggeredAbility.java b/Mage/src/mage/abilities/common/BecomesBlockedByCreatureTriggeredAbility.java index 613594b9766..8bd648281e2 100644 --- a/Mage/src/mage/abilities/common/BecomesBlockedByCreatureTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/BecomesBlockedByCreatureTriggeredAbility.java @@ -27,7 +27,7 @@ */ package mage.abilities.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/common/BecomesBlockedTriggeredAbility.java b/Mage/src/mage/abilities/common/BecomesBlockedTriggeredAbility.java index ef2c9426e12..9f650b90964 100644 --- a/Mage/src/mage/abilities/common/BecomesBlockedTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/BecomesBlockedTriggeredAbility.java @@ -27,7 +27,7 @@ */ package mage.abilities.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/common/BecomesTappedCreatureControlledTriggeredAbility.java b/Mage/src/mage/abilities/common/BecomesTappedCreatureControlledTriggeredAbility.java index 77482127b19..1e25d1a4656 100644 --- a/Mage/src/mage/abilities/common/BecomesTappedCreatureControlledTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/BecomesTappedCreatureControlledTriggeredAbility.java @@ -4,10 +4,10 @@ */ package mage.abilities.common; -import mage.Constants; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -19,7 +19,7 @@ import mage.game.permanent.Permanent; public class BecomesTappedCreatureControlledTriggeredAbility extends TriggeredAbilityImpl{ public BecomesTappedCreatureControlledTriggeredAbility(Effect effect, boolean optional) { - super(Constants.Zone.BATTLEFIELD, effect, optional); + super(Zone.BATTLEFIELD, effect, optional); } public BecomesTappedCreatureControlledTriggeredAbility(final BecomesTappedCreatureControlledTriggeredAbility ability) { diff --git a/Mage/src/mage/abilities/common/BecomesTappedTriggeredAbility.java b/Mage/src/mage/abilities/common/BecomesTappedTriggeredAbility.java index bd86765ed7e..908d1f48011 100644 --- a/Mage/src/mage/abilities/common/BecomesTappedTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/BecomesTappedTriggeredAbility.java @@ -27,7 +27,7 @@ */ package mage.abilities.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/common/BecomesTargetControllerSpellTriggeredAbility.java b/Mage/src/mage/abilities/common/BecomesTargetControllerSpellTriggeredAbility.java index 39a2e1a36b1..f00d71da55c 100644 --- a/Mage/src/mage/abilities/common/BecomesTargetControllerSpellTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/BecomesTargetControllerSpellTriggeredAbility.java @@ -32,7 +32,7 @@ import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.game.Game; import mage.game.stack.Spell; diff --git a/Mage/src/mage/abilities/common/BecomesTargetTriggeredAbility.java b/Mage/src/mage/abilities/common/BecomesTargetTriggeredAbility.java index fb67afbd7e2..51bcf5ce3f1 100644 --- a/Mage/src/mage/abilities/common/BecomesTargetTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/BecomesTargetTriggeredAbility.java @@ -27,7 +27,7 @@ */ package mage.abilities.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/common/BeginningOfCombatTriggeredAbility.java b/Mage/src/mage/abilities/common/BeginningOfCombatTriggeredAbility.java index c1947e76904..ffb57c372f5 100644 --- a/Mage/src/mage/abilities/common/BeginningOfCombatTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/BeginningOfCombatTriggeredAbility.java @@ -1,22 +1,23 @@ package mage.abilities.common; -import mage.Constants; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.targetpointer.FixedTarget; public class BeginningOfCombatTriggeredAbility extends TriggeredAbilityImpl { - private Constants.TargetController targetController; + private TargetController targetController; private boolean setTargetPointer; - public BeginningOfCombatTriggeredAbility(Effect effect, Constants.TargetController targetController, boolean isOptional) { - this(Constants.Zone.BATTLEFIELD, effect, targetController, isOptional, false); + public BeginningOfCombatTriggeredAbility(Effect effect, TargetController targetController, boolean isOptional) { + this(Zone.BATTLEFIELD, effect, targetController, isOptional, false); } - public BeginningOfCombatTriggeredAbility(Constants.Zone zone, Effect effect, Constants.TargetController targetController, boolean isOptional, boolean setTargetPointer) { + public BeginningOfCombatTriggeredAbility(Zone zone, Effect effect, TargetController targetController, boolean isOptional, boolean setTargetPointer) { super(zone, effect, isOptional); this.targetController = targetController; this.setTargetPointer = setTargetPointer; diff --git a/Mage/src/mage/abilities/common/BeginningOfDrawTriggeredAbility.java b/Mage/src/mage/abilities/common/BeginningOfDrawTriggeredAbility.java index 86fe3b77486..ca045ea8409 100644 --- a/Mage/src/mage/abilities/common/BeginningOfDrawTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/BeginningOfDrawTriggeredAbility.java @@ -1,7 +1,7 @@ package mage.abilities.common; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java b/Mage/src/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java index 20ae723bd6b..7a16b042aaa 100644 --- a/Mage/src/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java @@ -28,24 +28,25 @@ package mage.abilities.common; -import mage.Constants; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.condition.Condition; import mage.abilities.effects.Effect; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; public class BeginningOfEndStepTriggeredAbility extends TriggeredAbilityImpl { - private Constants.TargetController targetController; + private TargetController targetController; private Condition interveningIfClauseCondition; - public BeginningOfEndStepTriggeredAbility(Effect effect, Constants.TargetController targetController, boolean isOptional) { - this(Constants.Zone.BATTLEFIELD, effect, targetController, null, isOptional); + public BeginningOfEndStepTriggeredAbility(Effect effect, TargetController targetController, boolean isOptional) { + this(Zone.BATTLEFIELD, effect, targetController, null, isOptional); } - public BeginningOfEndStepTriggeredAbility(Constants.Zone zone, Effect effect, Constants.TargetController targetController, Condition interveningIfClauseCondition, boolean isOptional) { + public BeginningOfEndStepTriggeredAbility(Zone zone, Effect effect, TargetController targetController, Condition interveningIfClauseCondition, boolean isOptional) { super(zone, effect, isOptional); this.targetController = targetController; this.interveningIfClauseCondition = interveningIfClauseCondition; diff --git a/Mage/src/mage/abilities/common/BeginningOfUntapTriggeredAbility.java b/Mage/src/mage/abilities/common/BeginningOfUntapTriggeredAbility.java index 4d38f65c4e8..58f17a27d54 100644 --- a/Mage/src/mage/abilities/common/BeginningOfUntapTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/BeginningOfUntapTriggeredAbility.java @@ -4,9 +4,10 @@ */ package mage.abilities.common; -import mage.Constants; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.targetpointer.FixedTarget; @@ -17,13 +18,13 @@ import mage.target.targetpointer.FixedTarget; */ public class BeginningOfUntapTriggeredAbility extends TriggeredAbilityImpl { - private Constants.TargetController targetController; + private TargetController targetController; - public BeginningOfUntapTriggeredAbility(Effect effect, Constants.TargetController targetController, boolean isOptional) { - this(Constants.Zone.BATTLEFIELD, effect, targetController, isOptional); + public BeginningOfUntapTriggeredAbility(Effect effect, TargetController targetController, boolean isOptional) { + this(Zone.BATTLEFIELD, effect, targetController, isOptional); } - public BeginningOfUntapTriggeredAbility(Constants.Zone zone, Effect effect, Constants.TargetController targetController, boolean isOptional) { + public BeginningOfUntapTriggeredAbility(Zone zone, Effect effect, TargetController targetController, boolean isOptional) { super(zone, effect, isOptional); this.targetController = targetController; } diff --git a/Mage/src/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java b/Mage/src/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java index 9d453c8f460..8ae7be5db0b 100644 --- a/Mage/src/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java @@ -28,9 +28,10 @@ package mage.abilities.common; -import mage.Constants; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -42,18 +43,18 @@ import mage.target.targetpointer.FixedTarget; */ public class BeginningOfUpkeepTriggeredAbility extends TriggeredAbilityImpl { - private Constants.TargetController targetController; + private TargetController targetController; private boolean setTargetPointer; - public BeginningOfUpkeepTriggeredAbility(Effect effect, Constants.TargetController targetController, boolean isOptional) { - this(Constants.Zone.BATTLEFIELD, effect, targetController, isOptional); + public BeginningOfUpkeepTriggeredAbility(Effect effect, TargetController targetController, boolean isOptional) { + this(Zone.BATTLEFIELD, effect, targetController, isOptional); } - public BeginningOfUpkeepTriggeredAbility(Constants.Zone zone, Effect effect, Constants.TargetController targetController, boolean isOptional) { + public BeginningOfUpkeepTriggeredAbility(Zone zone, Effect effect, TargetController targetController, boolean isOptional) { this(zone, effect, targetController, isOptional, true); } - public BeginningOfUpkeepTriggeredAbility(Constants.Zone zone, Effect effect, Constants.TargetController targetController, boolean isOptional, boolean setTargetPointer) { + public BeginningOfUpkeepTriggeredAbility(Zone zone, Effect effect, TargetController targetController, boolean isOptional, boolean setTargetPointer) { super(zone, effect, isOptional); this.targetController = targetController; this.setTargetPointer = setTargetPointer; diff --git a/Mage/src/mage/abilities/common/BeginningOfYourEndStepTriggeredAbility.java b/Mage/src/mage/abilities/common/BeginningOfYourEndStepTriggeredAbility.java index 6ae9115c5cb..db00b4a76cf 100644 --- a/Mage/src/mage/abilities/common/BeginningOfYourEndStepTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/BeginningOfYourEndStepTriggeredAbility.java @@ -1,8 +1,8 @@ package mage.abilities.common; -import mage.Constants; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -12,7 +12,7 @@ import mage.game.events.GameEvent; */ public class BeginningOfYourEndStepTriggeredAbility extends TriggeredAbilityImpl { public BeginningOfYourEndStepTriggeredAbility(Effect effect, boolean optional) { - super(Constants.Zone.BATTLEFIELD, effect, optional); + super(Zone.BATTLEFIELD, effect, optional); } public BeginningOfYourEndStepTriggeredAbility(final BeginningOfYourEndStepTriggeredAbility ability) { diff --git a/Mage/src/mage/abilities/common/BlocksAttachedTriggeredAbility.java b/Mage/src/mage/abilities/common/BlocksAttachedTriggeredAbility.java index f9dd8f5058e..8b9b87db34b 100644 --- a/Mage/src/mage/abilities/common/BlocksAttachedTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/BlocksAttachedTriggeredAbility.java @@ -4,9 +4,9 @@ */ package mage.abilities.common; -import mage.Constants; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -25,7 +25,7 @@ public class BlocksAttachedTriggeredAbility extends TriggeredAbilityImpl { public CycleTriggeredAbility(Effect effect, boolean optional) { - super(Constants.Zone.ALL, effect, "When you cycle {this}, ", optional); + super(Zone.ALL, effect, "When you cycle {this}, ", optional); } public CycleTriggeredAbility(Effect effect) { diff --git a/Mage/src/mage/abilities/common/DamageAsThoughNotBlockedAbility.java b/Mage/src/mage/abilities/common/DamageAsThoughNotBlockedAbility.java index 03e9524c64f..309441f23d5 100644 --- a/Mage/src/mage/abilities/common/DamageAsThoughNotBlockedAbility.java +++ b/Mage/src/mage/abilities/common/DamageAsThoughNotBlockedAbility.java @@ -32,8 +32,8 @@ import mage.abilities.StaticAbility; import java.io.ObjectStreamException; -import static mage.Constants.AbilityType; -import static mage.Constants.Zone; +import mage.constants.AbilityType; +import mage.constants.Zone; /** * @author BetaSteward diff --git a/Mage/src/mage/abilities/common/DealsCombatDamageToACreatureTriggeredAbility.java b/Mage/src/mage/abilities/common/DealsCombatDamageToACreatureTriggeredAbility.java index 560774df0d6..22a9044f5ce 100644 --- a/Mage/src/mage/abilities/common/DealsCombatDamageToACreatureTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/DealsCombatDamageToACreatureTriggeredAbility.java @@ -28,7 +28,7 @@ package mage.abilities.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/common/DealsCombatDamageToAPlayerAttachedTriggeredAbility.java b/Mage/src/mage/abilities/common/DealsCombatDamageToAPlayerAttachedTriggeredAbility.java index 3148066918e..a136b4795dd 100644 --- a/Mage/src/mage/abilities/common/DealsCombatDamageToAPlayerAttachedTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/DealsCombatDamageToAPlayerAttachedTriggeredAbility.java @@ -1,8 +1,8 @@ package mage.abilities.common; -import mage.Constants; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; @@ -21,7 +21,7 @@ public class DealsCombatDamageToAPlayerAttachedTriggeredAbility extends Triggere } public DealsCombatDamageToAPlayerAttachedTriggeredAbility(Effect effect, String attachedDescription, boolean optional, boolean setFixedTargetPointer) { - super(Constants.Zone.BATTLEFIELD, effect, optional); + super(Zone.BATTLEFIELD, effect, optional); this.setFixedTargetPointer = setFixedTargetPointer; this.attachedDescription = attachedDescription; } diff --git a/Mage/src/mage/abilities/common/DealsCombatDamageToAPlayerTriggeredAbility.java b/Mage/src/mage/abilities/common/DealsCombatDamageToAPlayerTriggeredAbility.java index a61a2dc6cdb..f2c4a258070 100644 --- a/Mage/src/mage/abilities/common/DealsCombatDamageToAPlayerTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/DealsCombatDamageToAPlayerTriggeredAbility.java @@ -28,7 +28,7 @@ package mage.abilities.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/common/DealsDamageToAPlayerTriggeredAbility.java b/Mage/src/mage/abilities/common/DealsDamageToAPlayerTriggeredAbility.java index 3f3abc15586..b3d55c3ec7f 100644 --- a/Mage/src/mage/abilities/common/DealsDamageToAPlayerTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/DealsDamageToAPlayerTriggeredAbility.java @@ -28,7 +28,7 @@ package mage.abilities.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/common/DealtDamageToSourceTriggeredAbility.java b/Mage/src/mage/abilities/common/DealtDamageToSourceTriggeredAbility.java index 8169fcdeab4..3b3bb018248 100644 --- a/Mage/src/mage/abilities/common/DealtDamageToSourceTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/DealtDamageToSourceTriggeredAbility.java @@ -28,7 +28,7 @@ package mage.abilities.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/common/DiesAndDealtDamageThisTurnTriggeredAbility.java b/Mage/src/mage/abilities/common/DiesAndDealtDamageThisTurnTriggeredAbility.java index cb68c4b7a14..6e7bf5ba0cf 100644 --- a/Mage/src/mage/abilities/common/DiesAndDealtDamageThisTurnTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/DiesAndDealtDamageThisTurnTriggeredAbility.java @@ -1,9 +1,9 @@ package mage.abilities.common; -import mage.Constants; import mage.MageObject; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -17,7 +17,7 @@ public class DiesAndDealtDamageThisTurnTriggeredAbility extends TriggeredAbility } public DiesAndDealtDamageThisTurnTriggeredAbility(Effect effect, boolean optional) { - super(Constants.Zone.ALL, effect, optional); + super(Zone.ALL, effect, optional); } public DiesAndDealtDamageThisTurnTriggeredAbility(final DiesAndDealtDamageThisTurnTriggeredAbility ability) { @@ -32,7 +32,7 @@ public class DiesAndDealtDamageThisTurnTriggeredAbility extends TriggeredAbility @Override public boolean checkTrigger(GameEvent event, Game game) { if (event.getType() == GameEvent.EventType.ZONE_CHANGE && ((ZoneChangeEvent)event).isDiesEvent()) { - MageObject object = game.getLastKnownInformation(event.getTargetId(), Constants.Zone.BATTLEFIELD); + MageObject object = game.getLastKnownInformation(event.getTargetId(), Zone.BATTLEFIELD); if (object instanceof Permanent && ((Permanent)object).getDealtDamageByThisTurn().contains(this.sourceId)) { for (Effect effect : getEffects()) { effect.setTargetPointer(new FixedTarget(event.getTargetId())); diff --git a/Mage/src/mage/abilities/common/DiesAttachedTriggeredAbility.java b/Mage/src/mage/abilities/common/DiesAttachedTriggeredAbility.java index a311200399a..9cee95795eb 100644 --- a/Mage/src/mage/abilities/common/DiesAttachedTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/DiesAttachedTriggeredAbility.java @@ -1,6 +1,6 @@ package mage.abilities.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/common/DiesCreatureTriggeredAbility.java b/Mage/src/mage/abilities/common/DiesCreatureTriggeredAbility.java index db2e4566846..8dd2a34c2ac 100644 --- a/Mage/src/mage/abilities/common/DiesCreatureTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/DiesCreatureTriggeredAbility.java @@ -1,6 +1,6 @@ package mage.abilities.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage/src/mage/abilities/common/DiesThisOrAnotherCreatureTriggeredAbility.java b/Mage/src/mage/abilities/common/DiesThisOrAnotherCreatureTriggeredAbility.java index 5638471cd53..4fe55e69817 100644 --- a/Mage/src/mage/abilities/common/DiesThisOrAnotherCreatureTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/DiesThisOrAnotherCreatureTriggeredAbility.java @@ -27,7 +27,7 @@ */ package mage.abilities.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage/src/mage/abilities/common/DiesTriggeredAbility.java b/Mage/src/mage/abilities/common/DiesTriggeredAbility.java index 9b50b9a5d7d..71e39b176dc 100644 --- a/Mage/src/mage/abilities/common/DiesTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/DiesTriggeredAbility.java @@ -28,8 +28,7 @@ package mage.abilities.common; -import mage.Constants; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.MageObject; import mage.abilities.effects.Effect; import mage.game.Game; @@ -55,7 +54,7 @@ public class DiesTriggeredAbility extends ZoneChangeTriggeredAbility { public EmptyEffect(String rule) { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); staticText = rule; } diff --git a/Mage/src/mage/abilities/common/EntersAnotherCreatureYourControlTriggeredAbility.java b/Mage/src/mage/abilities/common/EntersAnotherCreatureYourControlTriggeredAbility.java index 2a18a401388..17516c9a8f3 100644 --- a/Mage/src/mage/abilities/common/EntersAnotherCreatureYourControlTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/EntersAnotherCreatureYourControlTriggeredAbility.java @@ -28,9 +28,9 @@ package mage.abilities.common; -import mage.Constants; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.effects.Effect; +import mage.constants.CardType; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -57,7 +57,7 @@ public class EntersAnotherCreatureYourControlTriggeredAbility extends ZoneChange public boolean checkTrigger(GameEvent event, Game game) { if (event.getType() == GameEvent.EventType.ENTERS_THE_BATTLEFIELD && !event.getTargetId().equals(this.getSourceId())) { Permanent permanent = game.getPermanent(event.getTargetId()); - if (permanent != null && permanent.getCardType().contains(Constants.CardType.CREATURE) && permanent.getControllerId().equals(this.getControllerId())) { + if (permanent != null && permanent.getCardType().contains(CardType.CREATURE) && permanent.getControllerId().equals(this.getControllerId())) { return true; } } diff --git a/Mage/src/mage/abilities/common/EntersBattlefieldAbility.java b/Mage/src/mage/abilities/common/EntersBattlefieldAbility.java index 09b1135be9d..d91976c1458 100644 --- a/Mage/src/mage/abilities/common/EntersBattlefieldAbility.java +++ b/Mage/src/mage/abilities/common/EntersBattlefieldAbility.java @@ -28,7 +28,7 @@ package mage.abilities.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.StaticAbility; import mage.abilities.condition.Condition; import mage.abilities.effects.Effect; diff --git a/Mage/src/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java b/Mage/src/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java index 030107bd5a8..2518a34f4a4 100644 --- a/Mage/src/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java @@ -28,7 +28,7 @@ package mage.abilities.common; import java.util.UUID; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.filter.FilterPermanent; diff --git a/Mage/src/mage/abilities/common/EntersBattlefieldControlledTriggeredAbility.java b/Mage/src/mage/abilities/common/EntersBattlefieldControlledTriggeredAbility.java index 1c83b0bab73..4c1cc0b2428 100644 --- a/Mage/src/mage/abilities/common/EntersBattlefieldControlledTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/EntersBattlefieldControlledTriggeredAbility.java @@ -29,7 +29,7 @@ package mage.abilities.common; import java.util.UUID; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.effects.Effect; import mage.filter.FilterPermanent; import mage.game.Game; diff --git a/Mage/src/mage/abilities/common/EntersBattlefieldTappedAbility.java b/Mage/src/mage/abilities/common/EntersBattlefieldTappedAbility.java index cfb176776f6..ec516e2883e 100644 --- a/Mage/src/mage/abilities/common/EntersBattlefieldTappedAbility.java +++ b/Mage/src/mage/abilities/common/EntersBattlefieldTappedAbility.java @@ -28,7 +28,7 @@ package mage.abilities.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.StaticAbility; import mage.abilities.effects.EntersBattlefieldEffect; import mage.abilities.effects.common.TapSourceEffect; diff --git a/Mage/src/mage/abilities/common/EntersBattlefieldTriggeredAbility.java b/Mage/src/mage/abilities/common/EntersBattlefieldTriggeredAbility.java index bf063c61965..6807e9d60f0 100644 --- a/Mage/src/mage/abilities/common/EntersBattlefieldTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/EntersBattlefieldTriggeredAbility.java @@ -28,7 +28,7 @@ package mage.abilities.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/common/FetchLandActivatedAbility.java b/Mage/src/mage/abilities/common/FetchLandActivatedAbility.java index c61eb6fd670..1400f02f8ce 100644 --- a/Mage/src/mage/abilities/common/FetchLandActivatedAbility.java +++ b/Mage/src/mage/abilities/common/FetchLandActivatedAbility.java @@ -29,9 +29,9 @@ package mage.abilities.common; import java.util.ArrayList; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.MageObject; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.common.PayLifeCost; diff --git a/Mage/src/mage/abilities/common/LandfallAbility.java b/Mage/src/mage/abilities/common/LandfallAbility.java index feb6204dd10..a5ba9c084a1 100644 --- a/Mage/src/mage/abilities/common/LandfallAbility.java +++ b/Mage/src/mage/abilities/common/LandfallAbility.java @@ -28,8 +28,8 @@ package mage.abilities.common; -import mage.Constants.CardType; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/common/LeavesBattlefieldTriggeredAbility.java b/Mage/src/mage/abilities/common/LeavesBattlefieldTriggeredAbility.java index 0d7c909066e..381cf22c86a 100644 --- a/Mage/src/mage/abilities/common/LeavesBattlefieldTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/LeavesBattlefieldTriggeredAbility.java @@ -28,7 +28,7 @@ package mage.abilities.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.effects.Effect; /** diff --git a/Mage/src/mage/abilities/common/MetalcraftActivatedAbility.java b/Mage/src/mage/abilities/common/MetalcraftActivatedAbility.java index 4c6708cfb90..e9c546be198 100644 --- a/Mage/src/mage/abilities/common/MetalcraftActivatedAbility.java +++ b/Mage/src/mage/abilities/common/MetalcraftActivatedAbility.java @@ -28,7 +28,7 @@ package mage.abilities.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.Cost; import mage.abilities.costs.Costs; diff --git a/Mage/src/mage/abilities/common/OnEventTriggeredAbility.java b/Mage/src/mage/abilities/common/OnEventTriggeredAbility.java index 980e7b065eb..89c1f5d1795 100644 --- a/Mage/src/mage/abilities/common/OnEventTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/OnEventTriggeredAbility.java @@ -28,7 +28,7 @@ package mage.abilities.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/common/OpponentCastsSpellTriggeredAbility.java b/Mage/src/mage/abilities/common/OpponentCastsSpellTriggeredAbility.java index 4149d133f79..c10a7b3d097 100644 --- a/Mage/src/mage/abilities/common/OpponentCastsSpellTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/OpponentCastsSpellTriggeredAbility.java @@ -27,7 +27,7 @@ */ package mage.abilities.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.filter.FilterCard; diff --git a/Mage/src/mage/abilities/common/OpponentSacrificesNonTokenPermanentTriggeredAbility.java b/Mage/src/mage/abilities/common/OpponentSacrificesNonTokenPermanentTriggeredAbility.java index ef31ed7d696..26e1f399962 100644 --- a/Mage/src/mage/abilities/common/OpponentSacrificesNonTokenPermanentTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/OpponentSacrificesNonTokenPermanentTriggeredAbility.java @@ -27,10 +27,10 @@ */ package mage.abilities.common; -import mage.Constants; import mage.MageObject; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -40,7 +40,7 @@ import mage.game.permanent.PermanentToken; public class OpponentSacrificesNonTokenPermanentTriggeredAbility extends TriggeredAbilityImpl { public OpponentSacrificesNonTokenPermanentTriggeredAbility(Effect effect) { - super(Constants.Zone.BATTLEFIELD, effect, false); + super(Zone.BATTLEFIELD, effect, false); } public OpponentSacrificesNonTokenPermanentTriggeredAbility(final OpponentSacrificesNonTokenPermanentTriggeredAbility ability) { @@ -50,7 +50,7 @@ public class OpponentSacrificesNonTokenPermanentTriggeredAbility extends Trigger @Override public boolean checkTrigger(GameEvent event, Game game) { if (event.getType() == GameEvent.EventType.SACRIFICED_PERMANENT && game.getOpponents(controllerId).contains(event.getPlayerId())) { - MageObject object = game.getLastKnownInformation(event.getTargetId(), Constants.Zone.BATTLEFIELD); + MageObject object = game.getLastKnownInformation(event.getTargetId(), Zone.BATTLEFIELD); if (object instanceof Permanent && !(object instanceof PermanentToken) ) { for (Effect effect : getEffects()) { effect.setTargetPointer(new FixedTarget(event.getTargetId())); diff --git a/Mage/src/mage/abilities/common/OpponentSacrificesPermanentTriggeredAbility.java b/Mage/src/mage/abilities/common/OpponentSacrificesPermanentTriggeredAbility.java index 240d6ad79da..68e50c80628 100644 --- a/Mage/src/mage/abilities/common/OpponentSacrificesPermanentTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/OpponentSacrificesPermanentTriggeredAbility.java @@ -27,10 +27,10 @@ */ package mage.abilities.common; -import mage.Constants; import mage.MageObject; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -39,7 +39,7 @@ import mage.target.targetpointer.FixedTarget; public class OpponentSacrificesPermanentTriggeredAbility extends TriggeredAbilityImpl { public OpponentSacrificesPermanentTriggeredAbility(Effect effect) { - super(Constants.Zone.BATTLEFIELD, effect, false); + super(Zone.BATTLEFIELD, effect, false); } public OpponentSacrificesPermanentTriggeredAbility(final OpponentSacrificesPermanentTriggeredAbility ability) { @@ -49,7 +49,7 @@ public class OpponentSacrificesPermanentTriggeredAbility extends TriggeredAbilit @Override public boolean checkTrigger(GameEvent event, Game game) { if (event.getType() == GameEvent.EventType.SACRIFICED_PERMANENT && game.getOpponents(controllerId).contains(event.getPlayerId())) { - MageObject object = game.getLastKnownInformation(event.getTargetId(), Constants.Zone.BATTLEFIELD); + MageObject object = game.getLastKnownInformation(event.getTargetId(), Zone.BATTLEFIELD); if (object instanceof Permanent) { for (Effect effect : getEffects()) { effect.setTargetPointer(new FixedTarget(event.getTargetId())); diff --git a/Mage/src/mage/abilities/common/PassAbility.java b/Mage/src/mage/abilities/common/PassAbility.java index ad5e24b65c3..fb5080c8c1c 100644 --- a/Mage/src/mage/abilities/common/PassAbility.java +++ b/Mage/src/mage/abilities/common/PassAbility.java @@ -29,7 +29,7 @@ package mage.abilities.common; import java.util.UUID; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.effects.common.PassEffect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/common/PutIntoGraveFromAnywhereTriggeredAbility.java b/Mage/src/mage/abilities/common/PutIntoGraveFromAnywhereTriggeredAbility.java index 80be7481b2b..e2eb280b882 100644 --- a/Mage/src/mage/abilities/common/PutIntoGraveFromAnywhereTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/PutIntoGraveFromAnywhereTriggeredAbility.java @@ -1,14 +1,14 @@ package mage.abilities.common; -import mage.Constants; import mage.abilities.effects.Effect; +import mage.constants.Zone; /** * @author Loki */ public class PutIntoGraveFromAnywhereTriggeredAbility extends ZoneChangeTriggeredAbility { public PutIntoGraveFromAnywhereTriggeredAbility(Effect effect, boolean optional) { - super(Constants.Zone.GRAVEYARD, effect, "When {this} is put into a graveyard from anywhere, ", optional); + super(Zone.GRAVEYARD, effect, "When {this} is put into a graveyard from anywhere, ", optional); } public PutIntoGraveFromAnywhereTriggeredAbility(Effect effect) { diff --git a/Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldTriggeredAbility.java b/Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldTriggeredAbility.java index 4151ffb99a8..b4174a5f1de 100644 --- a/Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldTriggeredAbility.java @@ -1,8 +1,8 @@ package mage.abilities.common; -import mage.Constants; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -18,7 +18,7 @@ public class PutIntoGraveFromBattlefieldTriggeredAbility extends TriggeredAbilit } public PutIntoGraveFromBattlefieldTriggeredAbility(Effect effect, boolean optional) { - super(Constants.Zone.ALL, effect, optional); + super(Zone.ALL, effect, optional); } PutIntoGraveFromBattlefieldTriggeredAbility(PutIntoGraveFromBattlefieldTriggeredAbility ability) { @@ -38,8 +38,8 @@ public class PutIntoGraveFromBattlefieldTriggeredAbility extends TriggeredAbilit Permanent permanent = zEvent.getTarget(); if (permanent != null && - zEvent.getToZone() == Constants.Zone.GRAVEYARD && - zEvent.getFromZone() == Constants.Zone.BATTLEFIELD && + zEvent.getToZone() == Zone.GRAVEYARD && + zEvent.getFromZone() == Zone.BATTLEFIELD && permanent.getId().equals(this.getSourceId())) { return true; } diff --git a/Mage/src/mage/abilities/common/SimpleActivatedAbility.java b/Mage/src/mage/abilities/common/SimpleActivatedAbility.java index 753597e1590..62268163f88 100644 --- a/Mage/src/mage/abilities/common/SimpleActivatedAbility.java +++ b/Mage/src/mage/abilities/common/SimpleActivatedAbility.java @@ -28,7 +28,7 @@ package mage.abilities.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.Cost; import mage.abilities.costs.Costs; diff --git a/Mage/src/mage/abilities/common/SimpleStaticAbility.java b/Mage/src/mage/abilities/common/SimpleStaticAbility.java index 41ef8f3ae1c..0b9939fd442 100644 --- a/Mage/src/mage/abilities/common/SimpleStaticAbility.java +++ b/Mage/src/mage/abilities/common/SimpleStaticAbility.java @@ -28,7 +28,7 @@ package mage.abilities.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.StaticAbility; import mage.abilities.effects.Effect; diff --git a/Mage/src/mage/abilities/common/SimpleTriggeredAbility.java b/Mage/src/mage/abilities/common/SimpleTriggeredAbility.java index b62221f531a..e5939e98c4c 100644 --- a/Mage/src/mage/abilities/common/SimpleTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/SimpleTriggeredAbility.java @@ -28,7 +28,7 @@ package mage.abilities.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/common/SkipUntapOptionalAbility.java b/Mage/src/mage/abilities/common/SkipUntapOptionalAbility.java index a75c8854596..7cd2254438f 100644 --- a/Mage/src/mage/abilities/common/SkipUntapOptionalAbility.java +++ b/Mage/src/mage/abilities/common/SkipUntapOptionalAbility.java @@ -27,7 +27,7 @@ */ package mage.abilities.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.effects.common.SkipUntapOptionalSourceEffect; /** diff --git a/Mage/src/mage/abilities/common/SpellCastTriggeredAbility.java b/Mage/src/mage/abilities/common/SpellCastTriggeredAbility.java index 9ea18836ac3..77d4fbc3096 100644 --- a/Mage/src/mage/abilities/common/SpellCastTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/SpellCastTriggeredAbility.java @@ -27,7 +27,7 @@ */ package mage.abilities.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.filter.FilterSpell; diff --git a/Mage/src/mage/abilities/common/UnattachedTriggeredAbility.java b/Mage/src/mage/abilities/common/UnattachedTriggeredAbility.java index 1fec5b72e6d..e8b2e9e92ed 100644 --- a/Mage/src/mage/abilities/common/UnattachedTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/UnattachedTriggeredAbility.java @@ -28,7 +28,7 @@ package mage.abilities.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/common/ZoneChangeAllTriggeredAbility.java b/Mage/src/mage/abilities/common/ZoneChangeAllTriggeredAbility.java index f50ca1d935d..0003cfb4d19 100644 --- a/Mage/src/mage/abilities/common/ZoneChangeAllTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/ZoneChangeAllTriggeredAbility.java @@ -28,7 +28,7 @@ package mage.abilities.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.filter.FilterPermanent; diff --git a/Mage/src/mage/abilities/common/ZoneChangeTriggeredAbility.java b/Mage/src/mage/abilities/common/ZoneChangeTriggeredAbility.java index 60a0f2ebf0e..60d49c03a77 100644 --- a/Mage/src/mage/abilities/common/ZoneChangeTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/ZoneChangeTriggeredAbility.java @@ -28,7 +28,7 @@ package mage.abilities.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/common/delayed/AtEndOfTurnDelayedTriggeredAbility.java b/Mage/src/mage/abilities/common/delayed/AtEndOfTurnDelayedTriggeredAbility.java index ba6ad16056c..9c7d43f7308 100644 --- a/Mage/src/mage/abilities/common/delayed/AtEndOfTurnDelayedTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/delayed/AtEndOfTurnDelayedTriggeredAbility.java @@ -27,7 +27,7 @@ */ package mage.abilities.common.delayed; -import mage.Constants.TargetController; +import mage.constants.TargetController; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.effects.Effect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/common/delayed/AtTheBeginOfPreCombatMainPhaseTriggeredAbility.java b/Mage/src/mage/abilities/common/delayed/AtTheBeginOfPreCombatMainPhaseTriggeredAbility.java index 48d822fd833..418679bc967 100644 --- a/Mage/src/mage/abilities/common/delayed/AtTheBeginOfPreCombatMainPhaseTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/delayed/AtTheBeginOfPreCombatMainPhaseTriggeredAbility.java @@ -28,11 +28,7 @@ package mage.abilities.common.delayed; -import mage.Constants.TargetController; -import static mage.Constants.TargetController.ANY; -import static mage.Constants.TargetController.CONTROLLER_ATTACHED_TO; -import static mage.Constants.TargetController.OPPONENT; -import static mage.Constants.TargetController.YOU; +import mage.constants.TargetController; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.effects.Effect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/common/delayed/PactDelayedTriggeredAbility.java b/Mage/src/mage/abilities/common/delayed/PactDelayedTriggeredAbility.java index 2d6e506c090..44a6038aca1 100644 --- a/Mage/src/mage/abilities/common/delayed/PactDelayedTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/delayed/PactDelayedTriggeredAbility.java @@ -27,8 +27,7 @@ */ package mage.abilities.common.delayed; -import mage.Constants; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.costs.mana.ManaCosts; @@ -76,7 +75,7 @@ class PactEffect extends OneShotEffect { public PactEffect(ManaCosts cost) { - super(Constants.Outcome.Neutral); + super(Outcome.Neutral); this.cost = cost; staticText = "pay " + cost.getText() + ". If you don't, you lose the game"; } diff --git a/Mage/src/mage/abilities/condition/common/EnchantedCondition.java b/Mage/src/mage/abilities/condition/common/EnchantedCondition.java index d15f2676958..19d33148ede 100644 --- a/Mage/src/mage/abilities/condition/common/EnchantedCondition.java +++ b/Mage/src/mage/abilities/condition/common/EnchantedCondition.java @@ -28,7 +28,7 @@ package mage.abilities.condition.common; import java.util.UUID; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.game.Game; diff --git a/Mage/src/mage/abilities/condition/common/EnchantedTargetCondition.java b/Mage/src/mage/abilities/condition/common/EnchantedTargetCondition.java index a8b612d9d8e..ccdc65b27aa 100644 --- a/Mage/src/mage/abilities/condition/common/EnchantedTargetCondition.java +++ b/Mage/src/mage/abilities/condition/common/EnchantedTargetCondition.java @@ -2,9 +2,10 @@ package mage.abilities.condition.common; import java.util.UUID; -import mage.Constants; + import mage.abilities.Ability; import mage.abilities.condition.Condition; +import mage.constants.CardType; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.Target; @@ -29,7 +30,7 @@ public class EnchantedTargetCondition implements Condition { if (targetPermanent != null) { for (UUID uuid : targetPermanent.getAttachments()) { Permanent attached = game.getBattlefield().getPermanent(uuid); - if (attached != null && attached.getCardType().contains(Constants.CardType.ENCHANTMENT)) { + if (attached != null && attached.getCardType().contains(CardType.ENCHANTMENT)) { return true; } } diff --git a/Mage/src/mage/abilities/condition/common/EquippedHasSubtypeCondition.java b/Mage/src/mage/abilities/condition/common/EquippedHasSubtypeCondition.java index 05ae7c261d6..4a06baeb869 100644 --- a/Mage/src/mage/abilities/condition/common/EquippedHasSubtypeCondition.java +++ b/Mage/src/mage/abilities/condition/common/EquippedHasSubtypeCondition.java @@ -27,9 +27,9 @@ */ package mage.abilities.condition.common; -import mage.Constants; import mage.abilities.Ability; import mage.abilities.condition.Condition; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; @@ -57,7 +57,7 @@ public class EquippedHasSubtypeCondition implements Condition { if (permanent != null && permanent.getAttachedTo() != null) { Permanent attachedTo = game.getBattlefield().getPermanent(permanent.getAttachedTo()); if (attachedTo == null) { - attachedTo = (Permanent) game.getLastKnownInformation(permanent.getAttachedTo(), Constants.Zone.BATTLEFIELD); + attachedTo = (Permanent) game.getLastKnownInformation(permanent.getAttachedTo(), Zone.BATTLEFIELD); } if (attachedTo != null) { if (subType != null) { diff --git a/Mage/src/mage/abilities/condition/common/ManaWasSpentCondition.java b/Mage/src/mage/abilities/condition/common/ManaWasSpentCondition.java index 78db006356b..dc4868443ea 100644 --- a/Mage/src/mage/abilities/condition/common/ManaWasSpentCondition.java +++ b/Mage/src/mage/abilities/condition/common/ManaWasSpentCondition.java @@ -28,7 +28,7 @@ package mage.abilities.condition.common; -import mage.Constants.ManaType; +import mage.constants.ManaType; import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.game.Game; diff --git a/Mage/src/mage/abilities/condition/common/MetalcraftCondition.java b/Mage/src/mage/abilities/condition/common/MetalcraftCondition.java index 248486aa763..5d25319a7f1 100644 --- a/Mage/src/mage/abilities/condition/common/MetalcraftCondition.java +++ b/Mage/src/mage/abilities/condition/common/MetalcraftCondition.java @@ -1,8 +1,8 @@ package mage.abilities.condition.common; -import mage.Constants; import mage.abilities.Ability; import mage.abilities.condition.Condition; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; @@ -17,7 +17,7 @@ public class MetalcraftCondition implements Condition { private static final FilterPermanent filter = new FilterPermanent("artifact"); static { - filter.add(new CardTypePredicate(Constants.CardType.ARTIFACT)); + filter.add(new CardTypePredicate(CardType.ARTIFACT)); } private static MetalcraftCondition fInstance = new MetalcraftCondition(); diff --git a/Mage/src/mage/abilities/condition/common/MyMainPhaseCondition.java b/Mage/src/mage/abilities/condition/common/MyMainPhaseCondition.java index 923df1b9303..b621db0a0c4 100644 --- a/Mage/src/mage/abilities/condition/common/MyMainPhaseCondition.java +++ b/Mage/src/mage/abilities/condition/common/MyMainPhaseCondition.java @@ -29,7 +29,7 @@ package mage.abilities.condition.common; import java.util.HashSet; import java.util.Set; -import mage.Constants.TurnPhase; +import mage.constants.TurnPhase; import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.game.Game; diff --git a/Mage/src/mage/abilities/condition/common/SuspendedCondition.java b/Mage/src/mage/abilities/condition/common/SuspendedCondition.java index f0fc1049a58..361b45879f9 100644 --- a/Mage/src/mage/abilities/condition/common/SuspendedCondition.java +++ b/Mage/src/mage/abilities/condition/common/SuspendedCondition.java @@ -28,7 +28,7 @@ package mage.abilities.condition.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.abilities.keyword.SuspendAbility; diff --git a/Mage/src/mage/abilities/condition/common/TopLibraryCardTypeCondition.java b/Mage/src/mage/abilities/condition/common/TopLibraryCardTypeCondition.java index f28bf095b41..0a87dad7c93 100644 --- a/Mage/src/mage/abilities/condition/common/TopLibraryCardTypeCondition.java +++ b/Mage/src/mage/abilities/condition/common/TopLibraryCardTypeCondition.java @@ -27,7 +27,7 @@ */ package mage.abilities.condition.common; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.game.Game; diff --git a/Mage/src/mage/abilities/costs/OrCost.java b/Mage/src/mage/abilities/costs/OrCost.java index 9200279d288..d40b06fa647 100644 --- a/Mage/src/mage/abilities/costs/OrCost.java +++ b/Mage/src/mage/abilities/costs/OrCost.java @@ -29,9 +29,10 @@ package mage.abilities.costs; import java.util.UUID; -import mage.Constants; + import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCost; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; import mage.target.Targets; @@ -96,7 +97,7 @@ public class OrCost implements Cost { sb.append("Pay "); } sb.append(firstCost.getText()).append("?"); - if (controller.chooseUse(Constants.Outcome.Detriment, sb.toString(), game)) { + if (controller.chooseUse(Outcome.Detriment, sb.toString(), game)) { selectedCost = firstCost; } else { selectedCost = secondCost; diff --git a/Mage/src/mage/abilities/costs/common/DiscardTargetCost.java b/Mage/src/mage/abilities/costs/common/DiscardTargetCost.java index a9d7358e2f6..346b705e8a9 100644 --- a/Mage/src/mage/abilities/costs/common/DiscardTargetCost.java +++ b/Mage/src/mage/abilities/costs/common/DiscardTargetCost.java @@ -31,7 +31,7 @@ package mage.abilities.costs.common; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.costs.CostImpl; import mage.cards.Card; diff --git a/Mage/src/mage/abilities/costs/common/ExileFromGraveCost.java b/Mage/src/mage/abilities/costs/common/ExileFromGraveCost.java index df1439f37a6..053c9f0f295 100644 --- a/Mage/src/mage/abilities/costs/common/ExileFromGraveCost.java +++ b/Mage/src/mage/abilities/costs/common/ExileFromGraveCost.java @@ -28,11 +28,11 @@ package mage.abilities.costs.common; -import mage.Constants; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.costs.CostImpl; import mage.cards.Card; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; @@ -77,7 +77,7 @@ public class ExileFromGraveCost extends CostImpl { if (card == null) { return false; } - paid |= card.moveToZone(Constants.Zone.EXILED, sourceId, game, false); + paid |= card.moveToZone(Zone.EXILED, sourceId, game, false); } } return paid; diff --git a/Mage/src/mage/abilities/costs/common/ExileFromHandCost.java b/Mage/src/mage/abilities/costs/common/ExileFromHandCost.java index 8f1c2468a6c..f0553648281 100644 --- a/Mage/src/mage/abilities/costs/common/ExileFromHandCost.java +++ b/Mage/src/mage/abilities/costs/common/ExileFromHandCost.java @@ -31,10 +31,11 @@ package mage.abilities.costs.common; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import mage.Constants; + import mage.abilities.Ability; import mage.abilities.costs.CostImpl; import mage.cards.Card; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInHand; @@ -61,7 +62,7 @@ public class ExileFromHandCost extends CostImpl { @Override public boolean pay(Ability ability, Game game, UUID sourceId, UUID controllerId, boolean noMana) { - if (targets.choose(Constants.Outcome.Exile, controllerId, sourceId, game)) { + if (targets.choose(Outcome.Exile, controllerId, sourceId, game)) { Player player = game.getPlayer(controllerId); for (UUID targetId: targets.get(0).getTargets()) { Card card = player.getHand().get(targetId, game); diff --git a/Mage/src/mage/abilities/costs/common/ExileFromStackCost.java b/Mage/src/mage/abilities/costs/common/ExileFromStackCost.java index 37e397b013f..f6860e8c94f 100644 --- a/Mage/src/mage/abilities/costs/common/ExileFromStackCost.java +++ b/Mage/src/mage/abilities/costs/common/ExileFromStackCost.java @@ -29,9 +29,10 @@ package mage.abilities.costs.common; import java.util.UUID; -import mage.Constants; + import mage.abilities.Ability; import mage.abilities.costs.CostImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.stack.Spell; import mage.players.Player; @@ -54,7 +55,7 @@ public class ExileFromStackCost extends CostImpl { @Override public boolean pay(Ability ability, Game game, UUID sourceId, UUID controllerId, boolean noMana) { - if (targets.choose(Constants.Outcome.Exile, controllerId, sourceId, game)) { + if (targets.choose(Outcome.Exile, controllerId, sourceId, game)) { Player player = game.getPlayer(controllerId); for (UUID targetId: targets.get(0).getTargets()) { Spell spellToExile = game.getStack().getSpell(targetId); diff --git a/Mage/src/mage/abilities/costs/common/FlashbackCost.java b/Mage/src/mage/abilities/costs/common/FlashbackCost.java index b1d13d0fb7f..0fad090225f 100644 --- a/Mage/src/mage/abilities/costs/common/FlashbackCost.java +++ b/Mage/src/mage/abilities/costs/common/FlashbackCost.java @@ -28,10 +28,10 @@ package mage.abilities.costs.common; -import mage.Constants; import mage.abilities.Ability; import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.mana.ManaCost; +import mage.constants.Zone; import mage.game.Game; /** @@ -53,9 +53,9 @@ public class FlashbackCost extends AlternativeCostImpl { @Override public boolean isAvailable(Game game, Ability source) { - Constants.Zone zone = game.getState().getZone(source.getSourceId()); + Zone zone = game.getState().getZone(source.getSourceId()); if (zone != null) { - return zone.equals(Constants.Zone.GRAVEYARD); + return zone.equals(Zone.GRAVEYARD); } return false; } diff --git a/Mage/src/mage/abilities/costs/common/MetalcraftCost.java b/Mage/src/mage/abilities/costs/common/MetalcraftCost.java index 7e0fd0d6551..621f2c36bb5 100644 --- a/Mage/src/mage/abilities/costs/common/MetalcraftCost.java +++ b/Mage/src/mage/abilities/costs/common/MetalcraftCost.java @@ -29,7 +29,7 @@ package mage.abilities.costs.common; import java.util.UUID; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.costs.CostImpl; import mage.filter.FilterPermanent; diff --git a/Mage/src/mage/abilities/costs/common/OnlyDuringUpkeepCost.java b/Mage/src/mage/abilities/costs/common/OnlyDuringUpkeepCost.java index fc87209bccc..b828ae724bd 100644 --- a/Mage/src/mage/abilities/costs/common/OnlyDuringUpkeepCost.java +++ b/Mage/src/mage/abilities/costs/common/OnlyDuringUpkeepCost.java @@ -28,7 +28,7 @@ package mage.abilities.costs.common; import java.util.UUID; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; import mage.abilities.Ability; import mage.abilities.costs.CostImpl; import mage.game.Game; diff --git a/Mage/src/mage/abilities/costs/common/PutTopCardOfYourLibraryToGraveyardCost.java b/Mage/src/mage/abilities/costs/common/PutTopCardOfYourLibraryToGraveyardCost.java index 01d2435e10d..c4868044f11 100644 --- a/Mage/src/mage/abilities/costs/common/PutTopCardOfYourLibraryToGraveyardCost.java +++ b/Mage/src/mage/abilities/costs/common/PutTopCardOfYourLibraryToGraveyardCost.java @@ -29,7 +29,7 @@ package mage.abilities.costs.common; import java.util.UUID; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.costs.CostImpl; import mage.cards.Card; diff --git a/Mage/src/mage/abilities/costs/common/RemoveCounterCost.java b/Mage/src/mage/abilities/costs/common/RemoveCounterCost.java index 4ec5de3f3df..2f2a7d56537 100644 --- a/Mage/src/mage/abilities/costs/common/RemoveCounterCost.java +++ b/Mage/src/mage/abilities/costs/common/RemoveCounterCost.java @@ -32,7 +32,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.UUID; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.costs.CostImpl; import mage.choices.Choice; diff --git a/Mage/src/mage/abilities/costs/common/RemoveVariableCountersTargetCost.java b/Mage/src/mage/abilities/costs/common/RemoveVariableCountersTargetCost.java index bf0fc121ab3..b94b8c35f85 100644 --- a/Mage/src/mage/abilities/costs/common/RemoveVariableCountersTargetCost.java +++ b/Mage/src/mage/abilities/costs/common/RemoveVariableCountersTargetCost.java @@ -32,7 +32,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.UUID; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.costs.CostImpl; import mage.abilities.costs.VariableCost; diff --git a/Mage/src/mage/abilities/costs/common/ReturnToHandSourceCost.java b/Mage/src/mage/abilities/costs/common/ReturnToHandSourceCost.java index 34325050047..0cb9e5d5d8b 100644 --- a/Mage/src/mage/abilities/costs/common/ReturnToHandSourceCost.java +++ b/Mage/src/mage/abilities/costs/common/ReturnToHandSourceCost.java @@ -30,7 +30,7 @@ package mage.abilities.costs.common; import java.util.UUID; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.costs.CostImpl; import mage.game.Game; diff --git a/Mage/src/mage/abilities/costs/common/ReturnToHandTargetCost.java b/Mage/src/mage/abilities/costs/common/ReturnToHandTargetCost.java index 94eda4a6e5a..f45966f4a6a 100644 --- a/Mage/src/mage/abilities/costs/common/ReturnToHandTargetCost.java +++ b/Mage/src/mage/abilities/costs/common/ReturnToHandTargetCost.java @@ -29,8 +29,8 @@ package mage.abilities.costs.common; import java.util.UUID; -import mage.Constants.Outcome; -import mage.Constants.Zone; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.costs.CostImpl; import mage.game.Game; diff --git a/Mage/src/mage/abilities/costs/common/RevealTargetFromHandCost.java b/Mage/src/mage/abilities/costs/common/RevealTargetFromHandCost.java index e845f5feb1e..5de06babaa4 100644 --- a/Mage/src/mage/abilities/costs/common/RevealTargetFromHandCost.java +++ b/Mage/src/mage/abilities/costs/common/RevealTargetFromHandCost.java @@ -32,7 +32,7 @@ package mage.abilities.costs.common; import java.util.UUID; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.costs.CostImpl; import mage.cards.Card; diff --git a/Mage/src/mage/abilities/costs/common/SacrificeTargetCost.java b/Mage/src/mage/abilities/costs/common/SacrificeTargetCost.java index 14d4d0cd602..883cdfa534d 100644 --- a/Mage/src/mage/abilities/costs/common/SacrificeTargetCost.java +++ b/Mage/src/mage/abilities/costs/common/SacrificeTargetCost.java @@ -28,7 +28,7 @@ package mage.abilities.costs.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.costs.CostImpl; import mage.game.Game; diff --git a/Mage/src/mage/abilities/costs/common/TapSourceCost.java b/Mage/src/mage/abilities/costs/common/TapSourceCost.java index 539a21a80dc..086c308fb87 100644 --- a/Mage/src/mage/abilities/costs/common/TapSourceCost.java +++ b/Mage/src/mage/abilities/costs/common/TapSourceCost.java @@ -29,7 +29,7 @@ package mage.abilities.costs.common; import java.util.UUID; -import mage.Constants.AbilityType; +import mage.constants.AbilityType; import mage.abilities.Ability; import mage.abilities.costs.CostImpl; import mage.game.Game; diff --git a/Mage/src/mage/abilities/costs/common/TapTargetCost.java b/Mage/src/mage/abilities/costs/common/TapTargetCost.java index 9af3e6b1014..8e95d2ea609 100644 --- a/Mage/src/mage/abilities/costs/common/TapTargetCost.java +++ b/Mage/src/mage/abilities/costs/common/TapTargetCost.java @@ -28,7 +28,7 @@ package mage.abilities.costs.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.costs.CostImpl; import mage.game.Game; diff --git a/Mage/src/mage/abilities/costs/common/TapVariableTargetCost.java b/Mage/src/mage/abilities/costs/common/TapVariableTargetCost.java index ac2ad3f61e2..dc4aaaefecf 100644 --- a/Mage/src/mage/abilities/costs/common/TapVariableTargetCost.java +++ b/Mage/src/mage/abilities/costs/common/TapVariableTargetCost.java @@ -30,7 +30,7 @@ package mage.abilities.costs.common; import java.util.Iterator; import java.util.UUID; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.costs.CostImpl; import mage.abilities.costs.VariableCost; diff --git a/Mage/src/mage/abilities/costs/mana/ColoredManaCost.java b/Mage/src/mage/abilities/costs/mana/ColoredManaCost.java index caa4f5b0f47..e30ff57072a 100644 --- a/Mage/src/mage/abilities/costs/mana/ColoredManaCost.java +++ b/Mage/src/mage/abilities/costs/mana/ColoredManaCost.java @@ -28,7 +28,7 @@ package mage.abilities.costs.mana; -import mage.Constants.ColoredManaSymbol; +import mage.constants.ColoredManaSymbol; import mage.Mana; import mage.abilities.Ability; import mage.game.Game; diff --git a/Mage/src/mage/abilities/costs/mana/HybridManaCost.java b/Mage/src/mage/abilities/costs/mana/HybridManaCost.java index 691f77b6301..fb04238ead8 100644 --- a/Mage/src/mage/abilities/costs/mana/HybridManaCost.java +++ b/Mage/src/mage/abilities/costs/mana/HybridManaCost.java @@ -28,7 +28,7 @@ package mage.abilities.costs.mana; -import mage.Constants.ColoredManaSymbol; +import mage.constants.ColoredManaSymbol; import mage.Mana; import mage.abilities.Ability; import mage.game.Game; diff --git a/Mage/src/mage/abilities/costs/mana/ManaCostImpl.java b/Mage/src/mage/abilities/costs/mana/ManaCostImpl.java index 38bed215e7f..f8b8e88da0c 100644 --- a/Mage/src/mage/abilities/costs/mana/ManaCostImpl.java +++ b/Mage/src/mage/abilities/costs/mana/ManaCostImpl.java @@ -29,8 +29,8 @@ package mage.abilities.costs.mana; import java.util.UUID; -import mage.Constants.ColoredManaSymbol; -import mage.Constants.ManaType; +import mage.constants.ColoredManaSymbol; +import mage.constants.ManaType; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/mage/abilities/costs/mana/ManaCostsImpl.java b/Mage/src/mage/abilities/costs/mana/ManaCostsImpl.java index e5100462183..9a0e53ee0f2 100644 --- a/Mage/src/mage/abilities/costs/mana/ManaCostsImpl.java +++ b/Mage/src/mage/abilities/costs/mana/ManaCostsImpl.java @@ -29,7 +29,7 @@ package mage.abilities.costs.mana; import java.util.*; -import mage.Constants.ColoredManaSymbol; +import mage.constants.ColoredManaSymbol; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.VariableCost; diff --git a/Mage/src/mage/abilities/costs/mana/MonoHybridManaCost.java b/Mage/src/mage/abilities/costs/mana/MonoHybridManaCost.java index 10d31b7ce64..caf1daa281d 100644 --- a/Mage/src/mage/abilities/costs/mana/MonoHybridManaCost.java +++ b/Mage/src/mage/abilities/costs/mana/MonoHybridManaCost.java @@ -28,7 +28,7 @@ package mage.abilities.costs.mana; -import mage.Constants.ColoredManaSymbol; +import mage.constants.ColoredManaSymbol; import mage.Mana; import mage.abilities.Ability; import mage.game.Game; diff --git a/Mage/src/mage/abilities/costs/mana/PhyrexianManaCost.java b/Mage/src/mage/abilities/costs/mana/PhyrexianManaCost.java index e4248e5962a..65786ce9592 100644 --- a/Mage/src/mage/abilities/costs/mana/PhyrexianManaCost.java +++ b/Mage/src/mage/abilities/costs/mana/PhyrexianManaCost.java @@ -29,7 +29,7 @@ package mage.abilities.costs.mana; import java.util.UUID; -import mage.Constants.ColoredManaSymbol; +import mage.constants.ColoredManaSymbol; import mage.Mana; import mage.abilities.Ability; import mage.game.Game; diff --git a/Mage/src/mage/abilities/decorator/ConditionalActivatedAbility.java b/Mage/src/mage/abilities/decorator/ConditionalActivatedAbility.java index 4ea378b3c72..7eac034cbcf 100644 --- a/Mage/src/mage/abilities/decorator/ConditionalActivatedAbility.java +++ b/Mage/src/mage/abilities/decorator/ConditionalActivatedAbility.java @@ -6,8 +6,7 @@ package mage.abilities.decorator; import java.util.UUID; -import mage.Constants; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.condition.Condition; import mage.abilities.costs.Cost; @@ -15,6 +14,7 @@ import mage.abilities.costs.Costs; import mage.abilities.costs.mana.ManaCosts; import mage.abilities.effects.Effect; import mage.abilities.effects.Effects; +import mage.constants.EffectType; import mage.game.Game; /** @@ -53,7 +53,7 @@ public class ConditionalActivatedAbility extends ActivatedAbilityImpl> extends ContinuousEffectImpl { protected Condition condition; - public WhileConditionContiniousEffect(Constants.Duration duration, Constants.Layer layer, Constants.SubLayer sublayer, Condition condition, Constants.Outcome outcome) { + public WhileConditionContiniousEffect(Duration duration, Layer layer, SubLayer sublayer, Condition condition, Outcome outcome) { super(duration, outcome); this.condition = condition; this.layer = layer; diff --git a/Mage/src/mage/abilities/effects/common/AddContinuousEffectToGame.java b/Mage/src/mage/abilities/effects/common/AddContinuousEffectToGame.java index 6f42166d887..a72bd6d1dac 100644 --- a/Mage/src/mage/abilities/effects/common/AddContinuousEffectToGame.java +++ b/Mage/src/mage/abilities/effects/common/AddContinuousEffectToGame.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/mage/abilities/effects/common/AffinityEffect.java b/Mage/src/mage/abilities/effects/common/AffinityEffect.java index aad22369801..08c1a9b666b 100644 --- a/Mage/src/mage/abilities/effects/common/AffinityEffect.java +++ b/Mage/src/mage/abilities/effects/common/AffinityEffect.java @@ -1,10 +1,11 @@ package mage.abilities.effects.common; -import mage.Constants; import mage.Mana; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.effects.CostModificationEffectImpl; +import mage.constants.Duration; +import mage.constants.Outcome; import mage.filter.common.FilterControlledPermanent; import mage.game.Game; @@ -12,7 +13,7 @@ public class AffinityEffect extends CostModificationEffectImpl { private FilterControlledPermanent filter; public AffinityEffect(FilterControlledPermanent affinityFilter) { - super(Constants.Duration.Custom, Constants.Outcome.Benefit); + super(Duration.Custom, Outcome.Benefit); this.filter = affinityFilter; staticText = "Affinity for " + filter.getMessage(); } diff --git a/Mage/src/mage/abilities/effects/common/AttachEffect.java b/Mage/src/mage/abilities/effects/common/AttachEffect.java index a4eb3d8ffdf..d5b503fafbe 100644 --- a/Mage/src/mage/abilities/effects/common/AttachEffect.java +++ b/Mage/src/mage/abilities/effects/common/AttachEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/effects/common/AttacksIfAbleSourceEffect.java b/Mage/src/mage/abilities/effects/common/AttacksIfAbleSourceEffect.java index 62e2a6b12e9..9b32fd20871 100644 --- a/Mage/src/mage/abilities/effects/common/AttacksIfAbleSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/AttacksIfAbleSourceEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Duration; +import mage.constants.Duration; import mage.abilities.Ability; import mage.abilities.effects.RequirementEffect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/effects/common/AttacksIfAbleTargetEffect.java b/Mage/src/mage/abilities/effects/common/AttacksIfAbleTargetEffect.java index 6af6b06d8d2..de793c6a400 100644 --- a/Mage/src/mage/abilities/effects/common/AttacksIfAbleTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/AttacksIfAbleTargetEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Duration; +import mage.constants.Duration; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.RequirementEffect; diff --git a/Mage/src/mage/abilities/effects/common/BlocksIfAbleTargetEffect.java b/Mage/src/mage/abilities/effects/common/BlocksIfAbleTargetEffect.java index 22431a3fe01..7f12dc988a4 100644 --- a/Mage/src/mage/abilities/effects/common/BlocksIfAbleTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/BlocksIfAbleTargetEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Duration; +import mage.constants.Duration; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.RequirementEffect; diff --git a/Mage/src/mage/abilities/effects/common/CantAttackBlockAttachedEffect.java b/Mage/src/mage/abilities/effects/common/CantAttackBlockAttachedEffect.java index 4e1ea406ea9..790ce53860a 100644 --- a/Mage/src/mage/abilities/effects/common/CantAttackBlockAttachedEffect.java +++ b/Mage/src/mage/abilities/effects/common/CantAttackBlockAttachedEffect.java @@ -27,8 +27,8 @@ */ package mage.abilities.effects.common; -import mage.Constants.AttachmentType; -import mage.Constants.Duration; +import mage.constants.AttachmentType; +import mage.constants.Duration; import mage.abilities.Ability; import mage.abilities.effects.RestrictionEffect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/effects/common/CantAttackSourceEffect.java b/Mage/src/mage/abilities/effects/common/CantAttackSourceEffect.java index a1c3b2c7c71..04ae27052fc 100644 --- a/Mage/src/mage/abilities/effects/common/CantAttackSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/CantAttackSourceEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Duration; +import mage.constants.Duration; import mage.abilities.Ability; import mage.abilities.effects.RestrictionEffect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/effects/common/CantAttackTargetEffect.java b/Mage/src/mage/abilities/effects/common/CantAttackTargetEffect.java index a9913861683..569c95f74f3 100644 --- a/Mage/src/mage/abilities/effects/common/CantAttackTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/CantAttackTargetEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Duration; +import mage.constants.Duration; import mage.abilities.Ability; import mage.abilities.effects.RestrictionEffect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/effects/common/CantBlockAllEffect.java b/Mage/src/mage/abilities/effects/common/CantBlockAllEffect.java index 218e11ebd8c..0605ba7c727 100644 --- a/Mage/src/mage/abilities/effects/common/CantBlockAllEffect.java +++ b/Mage/src/mage/abilities/effects/common/CantBlockAllEffect.java @@ -27,7 +27,7 @@ */ package mage.abilities.effects.common; -import mage.Constants.Duration; +import mage.constants.Duration; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.RestrictionEffect; diff --git a/Mage/src/mage/abilities/effects/common/CantBlockAttachedEffect.java b/Mage/src/mage/abilities/effects/common/CantBlockAttachedEffect.java index 6617f8de169..a00da28bab0 100644 --- a/Mage/src/mage/abilities/effects/common/CantBlockAttachedEffect.java +++ b/Mage/src/mage/abilities/effects/common/CantBlockAttachedEffect.java @@ -27,8 +27,8 @@ */ package mage.abilities.effects.common; -import mage.Constants.AttachmentType; -import mage.Constants.Duration; +import mage.constants.AttachmentType; +import mage.constants.Duration; import mage.abilities.Ability; import mage.abilities.effects.RestrictionEffect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/effects/common/CantBlockAttackActivateAttachedEffect.java b/Mage/src/mage/abilities/effects/common/CantBlockAttackActivateAttachedEffect.java index c3766946ff7..cf27c06049b 100644 --- a/Mage/src/mage/abilities/effects/common/CantBlockAttackActivateAttachedEffect.java +++ b/Mage/src/mage/abilities/effects/common/CantBlockAttackActivateAttachedEffect.java @@ -27,10 +27,10 @@ */ package mage.abilities.effects.common; -import mage.Constants; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.ReplacementEffectImpl; +import mage.constants.Duration; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -43,7 +43,7 @@ import mage.game.permanent.Permanent; public class CantBlockAttackActivateAttachedEffect extends ReplacementEffectImpl { public CantBlockAttackActivateAttachedEffect() { - super(Constants.Duration.WhileOnBattlefield, Outcome.Detriment); + super(Duration.WhileOnBattlefield, Outcome.Detriment); staticText = "Enchanted creature can't attack or block, and its activated abilities can't be activated"; } diff --git a/Mage/src/mage/abilities/effects/common/CantBlockSourceEffect.java b/Mage/src/mage/abilities/effects/common/CantBlockSourceEffect.java index b7e3488b8e8..e7415edcbed 100644 --- a/Mage/src/mage/abilities/effects/common/CantBlockSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/CantBlockSourceEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Duration; +import mage.constants.Duration; import mage.abilities.Ability; import mage.abilities.effects.RestrictionEffect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/effects/common/CantBlockTargetEffect.java b/Mage/src/mage/abilities/effects/common/CantBlockTargetEffect.java index 770fc925909..5dc4d195ef1 100644 --- a/Mage/src/mage/abilities/effects/common/CantBlockTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/CantBlockTargetEffect.java @@ -27,7 +27,7 @@ */ package mage.abilities.effects.common; -import mage.Constants.Duration; +import mage.constants.Duration; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.RestrictionEffect; diff --git a/Mage/src/mage/abilities/effects/common/CantCounterControlledEffect.java b/Mage/src/mage/abilities/effects/common/CantCounterControlledEffect.java index 5e84c72c1d5..a1a86882d95 100644 --- a/Mage/src/mage/abilities/effects/common/CantCounterControlledEffect.java +++ b/Mage/src/mage/abilities/effects/common/CantCounterControlledEffect.java @@ -28,8 +28,8 @@ package mage.abilities.effects.common; -import mage.Constants.Duration; -import mage.Constants.Outcome; +import mage.constants.Duration; +import mage.constants.Outcome; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.ReplacementEffectImpl; diff --git a/Mage/src/mage/abilities/effects/common/CantCounterSourceEffect.java b/Mage/src/mage/abilities/effects/common/CantCounterSourceEffect.java index 5326892a04f..4f3a8139ccf 100644 --- a/Mage/src/mage/abilities/effects/common/CantCounterSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/CantCounterSourceEffect.java @@ -29,8 +29,8 @@ package mage.abilities.effects.common; import java.util.UUID; -import mage.Constants.Duration; -import mage.Constants.Outcome; +import mage.constants.Duration; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.ReplacementEffectImpl; import mage.game.Game; diff --git a/Mage/src/mage/abilities/effects/common/CantTargetControlledEffect.java b/Mage/src/mage/abilities/effects/common/CantTargetControlledEffect.java index 9a4c2151241..f7fd9672c6f 100644 --- a/Mage/src/mage/abilities/effects/common/CantTargetControlledEffect.java +++ b/Mage/src/mage/abilities/effects/common/CantTargetControlledEffect.java @@ -28,9 +28,9 @@ package mage.abilities.effects.common; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.TargetController; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.abilities.Ability; import mage.abilities.effects.ReplacementEffectImpl; import mage.filter.FilterPermanent; diff --git a/Mage/src/mage/abilities/effects/common/CantTargetSourceEffect.java b/Mage/src/mage/abilities/effects/common/CantTargetSourceEffect.java index 291f8c0e885..bc5850928cb 100644 --- a/Mage/src/mage/abilities/effects/common/CantTargetSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/CantTargetSourceEffect.java @@ -28,8 +28,8 @@ package mage.abilities.effects.common; -import mage.Constants.Duration; -import mage.Constants.Outcome; +import mage.constants.Duration; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.ReplacementEffectImpl; import mage.filter.FilterStackObject; diff --git a/Mage/src/mage/abilities/effects/common/CastCardFromOutsideTheGameEffect.java b/Mage/src/mage/abilities/effects/common/CastCardFromOutsideTheGameEffect.java index 9d02e155663..0d8f17e9d5a 100644 --- a/Mage/src/mage/abilities/effects/common/CastCardFromOutsideTheGameEffect.java +++ b/Mage/src/mage/abilities/effects/common/CastCardFromOutsideTheGameEffect.java @@ -27,12 +27,13 @@ */ package mage.abilities.effects.common; -import mage.Constants; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.game.Game; import mage.players.Player; @@ -50,7 +51,7 @@ public class CastCardFromOutsideTheGameEffect extends OneShotEffect { protected Token token; public CopyTokenEffect(Token token) { - super(Constants.Duration.WhileOnBattlefield, Constants.Layer.CopyEffects_1, Constants.SubLayer.NA, Constants.Outcome.BecomeCreature); + super(Duration.WhileOnBattlefield, Layer.CopyEffects_1, SubLayer.NA, Outcome.BecomeCreature); this.token = token.copy(); staticText = "You may have {this} enter the battlefield as a copy of " + token.getDescription() + " on the battlefield"; } @@ -27,7 +27,7 @@ public class CopyTokenEffect extends ContinuousEffectImpl { permanent.setName(token.getName()); permanent.getColor().setColor(token.getColor()); permanent.getCardType().clear(); - for (Constants.CardType type: token.getCardType()) { + for (CardType type: token.getCardType()) { permanent.getCardType().add(type); } permanent.getSubtype().clear(); diff --git a/Mage/src/mage/abilities/effects/common/CounterTargetEffect.java b/Mage/src/mage/abilities/effects/common/CounterTargetEffect.java index f01747e92a0..a756b4b819d 100644 --- a/Mage/src/mage/abilities/effects/common/CounterTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/CounterTargetEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/mage/abilities/effects/common/CounterTargetWithReplacementEffect.java b/Mage/src/mage/abilities/effects/common/CounterTargetWithReplacementEffect.java index c1acdd8a8da..1bae00f7314 100644 --- a/Mage/src/mage/abilities/effects/common/CounterTargetWithReplacementEffect.java +++ b/Mage/src/mage/abilities/effects/common/CounterTargetWithReplacementEffect.java @@ -39,8 +39,8 @@ import mage.game.stack.StackObject; import java.util.UUID; -import static mage.Constants.Outcome; -import static mage.Constants.Zone; +import mage.constants.Outcome; +import mage.constants.Zone; /** * @author nantuko, North diff --git a/Mage/src/mage/abilities/effects/common/CounterUnlessPaysEffect.java b/Mage/src/mage/abilities/effects/common/CounterUnlessPaysEffect.java index 70c6287043c..3cde85730e5 100644 --- a/Mage/src/mage/abilities/effects/common/CounterUnlessPaysEffect.java +++ b/Mage/src/mage/abilities/effects/common/CounterUnlessPaysEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.costs.Cost; diff --git a/Mage/src/mage/abilities/effects/common/CreateDelayedTriggeredAbilityEffect.java b/Mage/src/mage/abilities/effects/common/CreateDelayedTriggeredAbilityEffect.java index 4c408d15d87..0e75989241c 100644 --- a/Mage/src/mage/abilities/effects/common/CreateDelayedTriggeredAbilityEffect.java +++ b/Mage/src/mage/abilities/effects/common/CreateDelayedTriggeredAbilityEffect.java @@ -1,75 +1,78 @@ -/* - * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation are those of the - * authors and should not be interpreted as representing official policies, either expressed - * or implied, of BetaSteward_at_googlemail.com. - */ - -package mage.abilities.effects.common; - -import mage.abilities.Ability; -import mage.abilities.DelayedTriggeredAbility; -import mage.abilities.Mode; -import mage.abilities.effects.OneShotEffect; -import mage.game.Game; - -/** - * - * @author BetaSteward_at_googlemail.com - */ -public class CreateDelayedTriggeredAbilityEffect extends OneShotEffect { - - protected DelayedTriggeredAbility ability; - - public CreateDelayedTriggeredAbilityEffect(DelayedTriggeredAbility ability) { - super(ability.getEffects().get(0).getOutcome()); - this.ability = ability; - } - - public CreateDelayedTriggeredAbilityEffect(final CreateDelayedTriggeredAbilityEffect effect) { - super(effect); - this.ability = effect.ability.copy(); - } - - @Override - public CreateDelayedTriggeredAbilityEffect copy() { - return new CreateDelayedTriggeredAbilityEffect(this); - } - - @Override - public boolean apply(Game game, Ability source) { - DelayedTriggeredAbility delayedAbility = (DelayedTriggeredAbility) ability.copy(); - delayedAbility.setSourceId(source.getSourceId()); - delayedAbility.setControllerId(source.getControllerId()); - delayedAbility.getTargets().addAll(source.getTargets()); - game.addDelayedTriggeredAbility(delayedAbility); - return true; - } - - @Override - public String getText(Mode mode) { - return ability.getRule(); - } - -} +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ + +package mage.abilities.effects.common; + +import mage.constants.AttachmentType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.abilities.Ability; +import mage.abilities.DelayedTriggeredAbility; +import mage.abilities.Mode; +import mage.abilities.effects.OneShotEffect; +import mage.game.Game; + +/** + * + * @author BetaSteward_at_googlemail.com + */ +public class CreateDelayedTriggeredAbilityEffect extends OneShotEffect { + + protected DelayedTriggeredAbility ability; + + public CreateDelayedTriggeredAbilityEffect(DelayedTriggeredAbility ability) { + super(ability.getEffects().get(0).getOutcome()); + this.ability = ability; + } + + public CreateDelayedTriggeredAbilityEffect(final CreateDelayedTriggeredAbilityEffect effect) { + super(effect); + this.ability = effect.ability.copy(); + } + + @Override + public CreateDelayedTriggeredAbilityEffect copy() { + return new CreateDelayedTriggeredAbilityEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + DelayedTriggeredAbility delayedAbility = (DelayedTriggeredAbility) ability.copy(); + delayedAbility.setSourceId(source.getSourceId()); + delayedAbility.setControllerId(source.getControllerId()); + delayedAbility.getTargets().addAll(source.getTargets()); + game.addDelayedTriggeredAbility(delayedAbility); + return true; + } + + @Override + public String getText(Mode mode) { + return ability.getRule(); + } + +} diff --git a/Mage/src/mage/abilities/effects/common/CreateSpecialActionEffect.java b/Mage/src/mage/abilities/effects/common/CreateSpecialActionEffect.java index 6994cc0371e..0b1a39494a9 100644 --- a/Mage/src/mage/abilities/effects/common/CreateSpecialActionEffect.java +++ b/Mage/src/mage/abilities/effects/common/CreateSpecialActionEffect.java @@ -1,75 +1,77 @@ -/* - * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation are those of the - * authors and should not be interpreted as representing official policies, either expressed - * or implied, of BetaSteward_at_googlemail.com. - */ - -package mage.abilities.effects.common; - -import mage.abilities.Ability; -import mage.abilities.Mode; -import mage.abilities.SpecialAction; -import mage.abilities.effects.OneShotEffect; -import mage.game.Game; - -/** - * - * @author BetaSteward_at_googlemail.com - */ -public class CreateSpecialActionEffect extends OneShotEffect { - - protected SpecialAction action; - - public CreateSpecialActionEffect(SpecialAction action) { - super(action.getEffects().get(0).getOutcome()); - this.action = action; - } - - public CreateSpecialActionEffect(final CreateSpecialActionEffect effect) { - super(effect); - this.action = (SpecialAction) effect.action.copy(); - } - - @Override - public CreateSpecialActionEffect copy() { - return new CreateSpecialActionEffect(this); - } - - @Override - public boolean apply(Game game, Ability source) { - SpecialAction newAction = (SpecialAction) action.copy(); - newAction.setSourceId(source.getSourceId()); - newAction.setControllerId(source.getControllerId()); - newAction.getTargets().addAll(source.getTargets()); - game.getState().getSpecialActions().add(newAction); - return true; - } - - @Override - public String getText(Mode mode) { - return action.getRule(); - } - -} +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ + +package mage.abilities.effects.common; + +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.abilities.Ability; +import mage.abilities.Mode; +import mage.abilities.SpecialAction; +import mage.abilities.effects.OneShotEffect; +import mage.game.Game; + +/** + * + * @author BetaSteward_at_googlemail.com + */ +public class CreateSpecialActionEffect extends OneShotEffect { + + protected SpecialAction action; + + public CreateSpecialActionEffect(SpecialAction action) { + super(action.getEffects().get(0).getOutcome()); + this.action = action; + } + + public CreateSpecialActionEffect(final CreateSpecialActionEffect effect) { + super(effect); + this.action = (SpecialAction) effect.action.copy(); + } + + @Override + public CreateSpecialActionEffect copy() { + return new CreateSpecialActionEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + SpecialAction newAction = (SpecialAction) action.copy(); + newAction.setSourceId(source.getSourceId()); + newAction.setControllerId(source.getControllerId()); + newAction.getTargets().addAll(source.getTargets()); + game.getState().getSpecialActions().add(newAction); + return true; + } + + @Override + public String getText(Mode mode) { + return action.getRule(); + } + +} diff --git a/Mage/src/mage/abilities/effects/common/CreateTokenEffect.java b/Mage/src/mage/abilities/effects/common/CreateTokenEffect.java index 9cc79862410..33a9dabd3d5 100644 --- a/Mage/src/mage/abilities/effects/common/CreateTokenEffect.java +++ b/Mage/src/mage/abilities/effects/common/CreateTokenEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; diff --git a/Mage/src/mage/abilities/effects/common/CreateTokenTargetEffect.java b/Mage/src/mage/abilities/effects/common/CreateTokenTargetEffect.java index 0f85670e744..a071b5e1711 100644 --- a/Mage/src/mage/abilities/effects/common/CreateTokenTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/CreateTokenTargetEffect.java @@ -1,11 +1,11 @@ package mage.abilities.effects.common; -import mage.Constants; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.token.Token; @@ -25,7 +25,7 @@ public class CreateTokenTargetEffect extends OneShotEffect { public DealsDamageToOpponentTriggeredAbility(Effect effect) { - super(Constants.Zone.BATTLEFIELD, effect); + super(Zone.BATTLEFIELD, effect); } public DealsDamageToOpponentTriggeredAbility(Effect effect, boolean optional) { - super(Constants.Zone.BATTLEFIELD, effect, optional); + super(Zone.BATTLEFIELD, effect, optional); } public DealsDamageToOpponentTriggeredAbility(final DealsDamageToOpponentTriggeredAbility ability) { diff --git a/Mage/src/mage/abilities/effects/common/DestroyAllControlledTargetEffect.java b/Mage/src/mage/abilities/effects/common/DestroyAllControlledTargetEffect.java index 54c9bb04754..7022e093c63 100644 --- a/Mage/src/mage/abilities/effects/common/DestroyAllControlledTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/DestroyAllControlledTargetEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.filter.FilterPermanent; diff --git a/Mage/src/mage/abilities/effects/common/DestroyAllEffect.java b/Mage/src/mage/abilities/effects/common/DestroyAllEffect.java index 3022b8c386f..f260c120fe0 100644 --- a/Mage/src/mage/abilities/effects/common/DestroyAllEffect.java +++ b/Mage/src/mage/abilities/effects/common/DestroyAllEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.filter.FilterPermanent; diff --git a/Mage/src/mage/abilities/effects/common/DestroyAllNamedPermanentsEffect.java b/Mage/src/mage/abilities/effects/common/DestroyAllNamedPermanentsEffect.java index f0f3ac1c90b..fbdd3212d17 100644 --- a/Mage/src/mage/abilities/effects/common/DestroyAllNamedPermanentsEffect.java +++ b/Mage/src/mage/abilities/effects/common/DestroyAllNamedPermanentsEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/mage/abilities/effects/common/DestroyMultiTargetEffect.java b/Mage/src/mage/abilities/effects/common/DestroyMultiTargetEffect.java index 18ee0812ef8..8ac97233ddb 100644 --- a/Mage/src/mage/abilities/effects/common/DestroyMultiTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/DestroyMultiTargetEffect.java @@ -29,7 +29,7 @@ package mage.abilities.effects.common; import java.util.Iterator; import java.util.UUID; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/mage/abilities/effects/common/DestroySourceEffect.java b/Mage/src/mage/abilities/effects/common/DestroySourceEffect.java index e0b8e20a263..88b97511c17 100644 --- a/Mage/src/mage/abilities/effects/common/DestroySourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/DestroySourceEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/effects/common/DestroyTargetEffect.java b/Mage/src/mage/abilities/effects/common/DestroyTargetEffect.java index 0ea96b7adef..944254c350c 100644 --- a/Mage/src/mage/abilities/effects/common/DestroyTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/DestroyTargetEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/mage/abilities/effects/common/DetainAllEffect.java b/Mage/src/mage/abilities/effects/common/DetainAllEffect.java index 30937a00243..d14f4ace982 100644 --- a/Mage/src/mage/abilities/effects/common/DetainAllEffect.java +++ b/Mage/src/mage/abilities/effects/common/DetainAllEffect.java @@ -31,11 +31,13 @@ package mage.abilities.effects.common; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.Outcome; + +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.RestrictionEffect; +import mage.constants.Duration; +import mage.constants.PhaseStep; import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -87,7 +89,7 @@ class DetainAllRestrictionEffect extends RestrictionEffect detainedObjects; public DetainAllRestrictionEffect(List detainedObjects) { - super(Constants.Duration.Custom); + super(Duration.Custom); this.detainedObjects = detainedObjects; staticText = ""; } @@ -110,7 +112,7 @@ class DetainAllRestrictionEffect extends RestrictionEffect { public DetainTargetEffect() { - super(Constants.Outcome.LoseAbility); + super(Outcome.LoseAbility); } public DetainTargetEffect(String ruleText) { - super(Constants.Outcome.LoseAbility); + super(Outcome.LoseAbility); staticText = ruleText; } @@ -126,7 +129,7 @@ public class DetainTargetEffect extends OneShotEffect { class DetainRestrictionEffect extends RestrictionEffect { public DetainRestrictionEffect() { - super(Constants.Duration.Custom); + super(Duration.Custom); staticText = ""; } @@ -147,7 +150,7 @@ class DetainRestrictionEffect extends RestrictionEffect @Override public boolean isInactive(Ability source, Game game) { - if (game.getPhase().getStep().getType() == Constants.PhaseStep.UNTAP && game.getStep().getStepPart() == Step.StepPart.PRE) + if (game.getPhase().getStep().getType() == PhaseStep.UNTAP && game.getStep().getStepPart() == Step.StepPart.PRE) { if (game.getActivePlayerId().equals(source.getControllerId())) { for(UUID targetId :this.getTargetPointer().getTargets(game, source)) { diff --git a/Mage/src/mage/abilities/effects/common/DevourEffect.java b/Mage/src/mage/abilities/effects/common/DevourEffect.java index f6427d8e4b9..21eb1bedd61 100644 --- a/Mage/src/mage/abilities/effects/common/DevourEffect.java +++ b/Mage/src/mage/abilities/effects/common/DevourEffect.java @@ -30,11 +30,12 @@ package mage.abilities.effects.common; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.Outcome; + +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.ReplacementEffectImpl; +import mage.constants.Duration; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; @@ -89,7 +90,7 @@ public class DevourEffect extends ReplacementEffectImpl { } public DevourEffect(DevourFactor devourFactor) { - super(Constants.Duration.EndOfGame, Outcome.Detriment); + super(Duration.EndOfGame, Outcome.Detriment); this.devourFactor = devourFactor; } diff --git a/Mage/src/mage/abilities/effects/common/DiscardControllerEffect.java b/Mage/src/mage/abilities/effects/common/DiscardControllerEffect.java index e2ec8dfd442..465087b4797 100644 --- a/Mage/src/mage/abilities/effects/common/DiscardControllerEffect.java +++ b/Mage/src/mage/abilities/effects/common/DiscardControllerEffect.java @@ -27,7 +27,7 @@ */ package mage.abilities.effects.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; diff --git a/Mage/src/mage/abilities/effects/common/DiscardEachPlayerEffect.java b/Mage/src/mage/abilities/effects/common/DiscardEachPlayerEffect.java index 893fbe50434..4df0f5d66a8 100644 --- a/Mage/src/mage/abilities/effects/common/DiscardEachPlayerEffect.java +++ b/Mage/src/mage/abilities/effects/common/DiscardEachPlayerEffect.java @@ -1,13 +1,14 @@ package mage.abilities.effects.common; import java.util.UUID; -import mage.Constants; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; import mage.util.CardUtil; @@ -27,7 +28,7 @@ public class DiscardEachPlayerEffect extends OneShotEffect { private Cost cost; public DoIfCostPaid(OneShotEffect effect, Cost cost) { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); this.executingEffect = effect; this.cost = cost; } diff --git a/Mage/src/mage/abilities/effects/common/DrawCardAllEffect.java b/Mage/src/mage/abilities/effects/common/DrawCardAllEffect.java index dcd1f28444e..c34ccd7db54 100644 --- a/Mage/src/mage/abilities/effects/common/DrawCardAllEffect.java +++ b/Mage/src/mage/abilities/effects/common/DrawCardAllEffect.java @@ -29,7 +29,7 @@ package mage.abilities.effects.common; import java.util.UUID; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/effects/common/DrawCardControllerEffect.java b/Mage/src/mage/abilities/effects/common/DrawCardControllerEffect.java index 3065a31ca91..25265f7b901 100644 --- a/Mage/src/mage/abilities/effects/common/DrawCardControllerEffect.java +++ b/Mage/src/mage/abilities/effects/common/DrawCardControllerEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; diff --git a/Mage/src/mage/abilities/effects/common/DrawCardTargetEffect.java b/Mage/src/mage/abilities/effects/common/DrawCardTargetEffect.java index ef1cd97cda6..76b9a4838e1 100644 --- a/Mage/src/mage/abilities/effects/common/DrawCardTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/DrawCardTargetEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.dynamicvalue.DynamicValue; diff --git a/Mage/src/mage/abilities/effects/common/DrawDiscardControllerEffect.java b/Mage/src/mage/abilities/effects/common/DrawDiscardControllerEffect.java index ce6a392b714..c37d692d13e 100644 --- a/Mage/src/mage/abilities/effects/common/DrawDiscardControllerEffect.java +++ b/Mage/src/mage/abilities/effects/common/DrawDiscardControllerEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/effects/common/EndTurnEffect.java b/Mage/src/mage/abilities/effects/common/EndTurnEffect.java index 73911aabdb6..5b34ace961d 100644 --- a/Mage/src/mage/abilities/effects/common/EndTurnEffect.java +++ b/Mage/src/mage/abilities/effects/common/EndTurnEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/effects/common/ExileAllEffect.java b/Mage/src/mage/abilities/effects/common/ExileAllEffect.java index bed64374c23..56b901eef40 100644 --- a/Mage/src/mage/abilities/effects/common/ExileAllEffect.java +++ b/Mage/src/mage/abilities/effects/common/ExileAllEffect.java @@ -30,7 +30,7 @@ package mage.abilities.effects.common; import java.util.List; import java.util.UUID; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.filter.FilterPermanent; diff --git a/Mage/src/mage/abilities/effects/common/ExileFromZoneTargetEffect.java b/Mage/src/mage/abilities/effects/common/ExileFromZoneTargetEffect.java index 674f5b95982..c9088bcd2db 100644 --- a/Mage/src/mage/abilities/effects/common/ExileFromZoneTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/ExileFromZoneTargetEffect.java @@ -28,8 +28,8 @@ package mage.abilities.effects.common; import java.util.UUID; -import mage.Constants.Outcome; -import mage.Constants.Zone; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage/src/mage/abilities/effects/common/ExileSourceEffect.java b/Mage/src/mage/abilities/effects/common/ExileSourceEffect.java index 5261154cddb..a4e1f246565 100644 --- a/Mage/src/mage/abilities/effects/common/ExileSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/ExileSourceEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage/src/mage/abilities/effects/common/ExileTargetEffect.java b/Mage/src/mage/abilities/effects/common/ExileTargetEffect.java index c20c148bb63..a44313c76d6 100644 --- a/Mage/src/mage/abilities/effects/common/ExileTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/ExileTargetEffect.java @@ -29,7 +29,7 @@ package mage.abilities.effects.common; import java.util.UUID; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/mage/abilities/effects/common/ExileTargetForSourceEffect.java b/Mage/src/mage/abilities/effects/common/ExileTargetForSourceEffect.java index 9101ecb6e50..79d1f123ee2 100644 --- a/Mage/src/mage/abilities/effects/common/ExileTargetForSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/ExileTargetForSourceEffect.java @@ -29,7 +29,7 @@ package mage.abilities.effects.common; import java.util.UUID; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/mage/abilities/effects/common/FightTargetsEffect.java b/Mage/src/mage/abilities/effects/common/FightTargetsEffect.java index 7fdbe13edc6..a6b82f01586 100644 --- a/Mage/src/mage/abilities/effects/common/FightTargetsEffect.java +++ b/Mage/src/mage/abilities/effects/common/FightTargetsEffect.java @@ -27,8 +27,8 @@ */ package mage.abilities.effects.common; -import mage.Constants.CardType; -import mage.Constants.Outcome; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/mage/abilities/effects/common/FlipSourceEffect.java b/Mage/src/mage/abilities/effects/common/FlipSourceEffect.java index 95f696c80d7..5bf7a1b705d 100644 --- a/Mage/src/mage/abilities/effects/common/FlipSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/FlipSourceEffect.java @@ -1,8 +1,8 @@ package mage.abilities.effects.common; -import mage.Constants; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; @@ -13,7 +13,7 @@ import mage.game.permanent.Permanent; public class FlipSourceEffect extends OneShotEffect { public FlipSourceEffect() { - super(Constants.Outcome.BecomeCreature); + super(Outcome.BecomeCreature); staticText = "flip it"; } diff --git a/Mage/src/mage/abilities/effects/common/GainLifeEffect.java b/Mage/src/mage/abilities/effects/common/GainLifeEffect.java index 3d06f72a52b..c2747c43ae8 100644 --- a/Mage/src/mage/abilities/effects/common/GainLifeEffect.java +++ b/Mage/src/mage/abilities/effects/common/GainLifeEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; diff --git a/Mage/src/mage/abilities/effects/common/GainLifeTargetEffect.java b/Mage/src/mage/abilities/effects/common/GainLifeTargetEffect.java index c9907fd5902..f11edd042df 100644 --- a/Mage/src/mage/abilities/effects/common/GainLifeTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/GainLifeTargetEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.dynamicvalue.DynamicValue; diff --git a/Mage/src/mage/abilities/effects/common/GetEmblemEffect.java b/Mage/src/mage/abilities/effects/common/GetEmblemEffect.java index a04532dd9fb..2adc21d148a 100644 --- a/Mage/src/mage/abilities/effects/common/GetEmblemEffect.java +++ b/Mage/src/mage/abilities/effects/common/GetEmblemEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/effects/common/ImprintTargetEffect.java b/Mage/src/mage/abilities/effects/common/ImprintTargetEffect.java index b336ac8eaea..7e48f0c902f 100644 --- a/Mage/src/mage/abilities/effects/common/ImprintTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/ImprintTargetEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java b/Mage/src/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java index 4ce868a7d3b..5efd8dc95bf 100644 --- a/Mage/src/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java +++ b/Mage/src/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java @@ -31,8 +31,8 @@ package mage.abilities.effects.common; import java.util.List; import java.util.UUID; -import mage.Constants.Outcome; -import mage.Constants.Zone; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.dynamicvalue.DynamicValue; diff --git a/Mage/src/mage/abilities/effects/common/LookLibraryControllerEffect.java b/Mage/src/mage/abilities/effects/common/LookLibraryControllerEffect.java index 6d65e986f46..80f0cbf11e7 100644 --- a/Mage/src/mage/abilities/effects/common/LookLibraryControllerEffect.java +++ b/Mage/src/mage/abilities/effects/common/LookLibraryControllerEffect.java @@ -27,9 +27,8 @@ */ package mage.abilities.effects.common; -import mage.Constants; -import mage.Constants.Outcome; -import mage.Constants.Zone; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.SpellAbility; @@ -196,7 +195,7 @@ public class LookLibraryControllerEffect extends OneShotEffect { } public LoseLifeAllEffect(DynamicValue amount) { - super(Constants.Outcome.Damage); + super(Outcome.Damage); this.amount = amount; staticText = "Each player loses " + amount + " life"; } diff --git a/Mage/src/mage/abilities/effects/common/LoseLifeControllerEffect.java b/Mage/src/mage/abilities/effects/common/LoseLifeControllerEffect.java index a7a833dee48..a1502d55541 100644 --- a/Mage/src/mage/abilities/effects/common/LoseLifeControllerEffect.java +++ b/Mage/src/mage/abilities/effects/common/LoseLifeControllerEffect.java @@ -27,8 +27,8 @@ */ package mage.abilities.effects.common; -import mage.Constants.Outcome; -import mage.Constants.Zone; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/mage/abilities/effects/common/LoseLifeOpponentsEffect.java b/Mage/src/mage/abilities/effects/common/LoseLifeOpponentsEffect.java index 2c333405696..25d07351207 100644 --- a/Mage/src/mage/abilities/effects/common/LoseLifeOpponentsEffect.java +++ b/Mage/src/mage/abilities/effects/common/LoseLifeOpponentsEffect.java @@ -28,12 +28,13 @@ package mage.abilities.effects.common; import java.util.UUID; -import mage.Constants; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; @@ -50,7 +51,7 @@ public class LoseLifeOpponentsEffect extends OneShotEffect String text; public LoseLifePlayersEffect(int amount) { - super(Constants.Outcome.Damage); + super(Outcome.Damage); this.amount = new StaticValue(amount); staticText = "each player loses " + amount + " life"; } public LoseLifePlayersEffect(DynamicValue amount) { - super(Constants.Outcome.Damage); + super(Outcome.Damage); this.amount = amount; staticText = "each player loses " + amount + " life"; } public LoseLifePlayersEffect(DynamicValue amount, String text) { - super(Constants.Outcome.Damage); + super(Outcome.Damage); this.amount = amount; staticText = text; } diff --git a/Mage/src/mage/abilities/effects/common/LoseLifeSourceEffect.java b/Mage/src/mage/abilities/effects/common/LoseLifeSourceEffect.java index a20163ec560..a829c535c31 100644 --- a/Mage/src/mage/abilities/effects/common/LoseLifeSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/LoseLifeSourceEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; diff --git a/Mage/src/mage/abilities/effects/common/LoseLifeTargetEffect.java b/Mage/src/mage/abilities/effects/common/LoseLifeTargetEffect.java index aa72e85741e..863e5031c40 100644 --- a/Mage/src/mage/abilities/effects/common/LoseLifeTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/LoseLifeTargetEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.dynamicvalue.DynamicValue; diff --git a/Mage/src/mage/abilities/effects/common/ManaEffect.java b/Mage/src/mage/abilities/effects/common/ManaEffect.java index a223dd3b7a7..4b31c121b76 100644 --- a/Mage/src/mage/abilities/effects/common/ManaEffect.java +++ b/Mage/src/mage/abilities/effects/common/ManaEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.effects.OneShotEffect; /** diff --git a/Mage/src/mage/abilities/effects/common/MayTapOrUntapTargetEffect.java b/Mage/src/mage/abilities/effects/common/MayTapOrUntapTargetEffect.java index be8edf8c21e..6a7ea21cd7b 100644 --- a/Mage/src/mage/abilities/effects/common/MayTapOrUntapTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/MayTapOrUntapTargetEffect.java @@ -1,9 +1,9 @@ package mage.abilities.effects.common; -import mage.Constants; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -13,7 +13,7 @@ import mage.players.Player; */ public class MayTapOrUntapTargetEffect extends OneShotEffect { public MayTapOrUntapTargetEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); } public MayTapOrUntapTargetEffect(final MayTapOrUntapTargetEffect effect) { @@ -26,11 +26,11 @@ public class MayTapOrUntapTargetEffect extends OneShotEffect private FilterPermanent filter; public ReturnToHandAllEffect(FilterPermanent filter) { - super(Constants.Outcome.ReturnToHand); + super(Outcome.ReturnToHand); this.filter = filter; staticText = "Return all " + filter.getMessage() + " to their owners' hands"; } @@ -59,7 +60,7 @@ public class ReturnToHandAllEffect extends OneShotEffect @Override public boolean apply(Game game, Ability source) { for (Permanent permanent : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { - permanent.moveToZone(Constants.Zone.HAND, source.getSourceId(), game, true); + permanent.moveToZone(Zone.HAND, source.getSourceId(), game, true); } return true; } diff --git a/Mage/src/mage/abilities/effects/common/ReturnToHandAttachedEffect.java b/Mage/src/mage/abilities/effects/common/ReturnToHandAttachedEffect.java index 6d6038253b2..9c6078d0a03 100644 --- a/Mage/src/mage/abilities/effects/common/ReturnToHandAttachedEffect.java +++ b/Mage/src/mage/abilities/effects/common/ReturnToHandAttachedEffect.java @@ -28,11 +28,11 @@ package mage.abilities.effects.common; -import mage.Constants; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; @@ -62,7 +62,7 @@ public class ReturnToHandAttachedEffect extends OneShotEffect{ return false; } - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); + filter.add(new ControllerPredicate(TargetController.YOU)); int amount = count.calculate(game, source); int realCount = game.getBattlefield().countAll(filter, player.getId(), game); diff --git a/Mage/src/mage/abilities/effects/common/SacrificeEquippedEffect.java b/Mage/src/mage/abilities/effects/common/SacrificeEquippedEffect.java index 3fb4b85332f..c8daba8b0c0 100644 --- a/Mage/src/mage/abilities/effects/common/SacrificeEquippedEffect.java +++ b/Mage/src/mage/abilities/effects/common/SacrificeEquippedEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/effects/common/SacrificeSourceEffect.java b/Mage/src/mage/abilities/effects/common/SacrificeSourceEffect.java index a6a42a7b878..d9d73e4457f 100644 --- a/Mage/src/mage/abilities/effects/common/SacrificeSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/SacrificeSourceEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/effects/common/SacrificeSourceUnlessPaysEffect.java b/Mage/src/mage/abilities/effects/common/SacrificeSourceUnlessPaysEffect.java index 583151de3bd..57b90b343cd 100644 --- a/Mage/src/mage/abilities/effects/common/SacrificeSourceUnlessPaysEffect.java +++ b/Mage/src/mage/abilities/effects/common/SacrificeSourceUnlessPaysEffect.java @@ -1,6 +1,6 @@ package mage.abilities.effects.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.costs.Cost; diff --git a/Mage/src/mage/abilities/effects/common/SacrificeTargetEffect.java b/Mage/src/mage/abilities/effects/common/SacrificeTargetEffect.java index c1af03777f3..4611df4260f 100644 --- a/Mage/src/mage/abilities/effects/common/SacrificeTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/SacrificeTargetEffect.java @@ -29,7 +29,7 @@ package mage.abilities.effects.common; import java.util.UUID; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/mage/abilities/effects/common/ScryEffect.java b/Mage/src/mage/abilities/effects/common/ScryEffect.java index 3d368e1bfec..bc53ffaadb5 100644 --- a/Mage/src/mage/abilities/effects/common/ScryEffect.java +++ b/Mage/src/mage/abilities/effects/common/ScryEffect.java @@ -28,8 +28,8 @@ package mage.abilities.effects.common; -import mage.Constants.Outcome; -import mage.Constants.Zone; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage/src/mage/abilities/effects/common/ShuffleSpellEffect.java b/Mage/src/mage/abilities/effects/common/ShuffleSpellEffect.java index 944d3f014ce..ab2675bf465 100644 --- a/Mage/src/mage/abilities/effects/common/ShuffleSpellEffect.java +++ b/Mage/src/mage/abilities/effects/common/ShuffleSpellEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.MageSingleton; import mage.abilities.effects.PostResolveEffect; diff --git a/Mage/src/mage/abilities/effects/common/SkipEnchantedUntapEffect.java b/Mage/src/mage/abilities/effects/common/SkipEnchantedUntapEffect.java index 8f85b4e2a0f..a917821b891 100644 --- a/Mage/src/mage/abilities/effects/common/SkipEnchantedUntapEffect.java +++ b/Mage/src/mage/abilities/effects/common/SkipEnchantedUntapEffect.java @@ -1,8 +1,10 @@ package mage.abilities.effects.common; -import mage.Constants; import mage.abilities.Ability; import mage.abilities.effects.ReplacementEffectImpl; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.PhaseStep; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -13,7 +15,7 @@ import mage.game.permanent.Permanent; public class SkipEnchantedUntapEffect extends ReplacementEffectImpl { public SkipEnchantedUntapEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Detriment); + super(Duration.WhileOnBattlefield, Outcome.Detriment); staticText = "Enchanted permanent doesn't untap during its controller's untap step"; } @@ -38,7 +40,7 @@ public class SkipEnchantedUntapEffect extends ReplacementEffectImpl { public SkipNextUntapSourceEffect() { - super(Constants.Duration.OneUse, Constants.Outcome.Detriment); + super(Duration.OneUse, Outcome.Detriment); staticText = "{this} doesn't untap during your next untap step"; } @@ -35,7 +37,7 @@ public class SkipNextUntapSourceEffect extends ReplacementEffectImpl { private int amount; public UntapLandsEffect(int amount) { - super(Constants.Outcome.Untap); + super(Outcome.Untap); this.amount = amount; staticText = "Untap up to " + amount + " lands"; } @@ -31,7 +31,7 @@ public class UntapLandsEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { TargetLandPermanent target = new TargetLandPermanent(0, amount, new FilterLandPermanent(), true); if (target.canChoose(source.getControllerId(), game)) { - if (target.choose(Constants.Outcome.Untap, source.getControllerId(), source.getSourceId(), game)) { + if (target.choose(Outcome.Untap, source.getControllerId(), source.getSourceId(), game)) { for (Object targetId : target.getTargets()) { Permanent p = game.getPermanent((UUID) targetId); if (p.isTapped()) diff --git a/Mage/src/mage/abilities/effects/common/UntapSourceEffect.java b/Mage/src/mage/abilities/effects/common/UntapSourceEffect.java index f6740a4160b..3e53b601969 100644 --- a/Mage/src/mage/abilities/effects/common/UntapSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/UntapSourceEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/effects/common/UntapTargetEffect.java b/Mage/src/mage/abilities/effects/common/UntapTargetEffect.java index 99184cbe4cd..8ce62af09d0 100644 --- a/Mage/src/mage/abilities/effects/common/UntapTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/UntapTargetEffect.java @@ -29,7 +29,7 @@ package mage.abilities.effects.common; import java.util.UUID; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/mage/abilities/effects/common/WinGameEffect.java b/Mage/src/mage/abilities/effects/common/WinGameEffect.java index 790779946a4..031f3ba0292 100644 --- a/Mage/src/mage/abilities/effects/common/WinGameEffect.java +++ b/Mage/src/mage/abilities/effects/common/WinGameEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/effects/common/continious/AddCardColorAttachedEffect.java b/Mage/src/mage/abilities/effects/common/continious/AddCardColorAttachedEffect.java index 05f00c30b6a..86a93fc3b04 100644 --- a/Mage/src/mage/abilities/effects/common/continious/AddCardColorAttachedEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/AddCardColorAttachedEffect.java @@ -28,10 +28,10 @@ package mage.abilities.effects.common.continious; -import mage.Constants; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; @@ -41,10 +41,10 @@ import mage.game.permanent.Permanent; public class AddCardColorAttachedEffect extends ContinuousEffectImpl { private ObjectColor addedColor; - private Constants.AttachmentType attachmentType; + private AttachmentType attachmentType; - public AddCardColorAttachedEffect(ObjectColor addedColor, Constants.Duration duration, Constants.AttachmentType attachmentType) { - super(duration, Constants.Layer.TypeChangingEffects_4, Constants.SubLayer.NA, Constants.Outcome.Benefit); + public AddCardColorAttachedEffect(ObjectColor addedColor, Duration duration, AttachmentType attachmentType) { + super(duration, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Benefit); this.addedColor = addedColor; this.attachmentType = attachmentType; setText(); @@ -84,9 +84,9 @@ public class AddCardColorAttachedEffect extends ContinuousEffectImpl { private String addedSubType; - public AddCardSubTypeTargetEffect(String addedSubType, Constants.Duration duration) { - super(duration, Constants.Layer.TypeChangingEffects_4, Constants.SubLayer.NA, Constants.Outcome.Benefit); + public AddCardSubTypeTargetEffect(String addedSubType, Duration duration) { + super(duration, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Benefit); this.addedSubType = addedSubType; } diff --git a/Mage/src/mage/abilities/effects/common/continious/AddCardSubtypeAttachedEffect.java b/Mage/src/mage/abilities/effects/common/continious/AddCardSubtypeAttachedEffect.java index 2d56405a305..b5333a99349 100644 --- a/Mage/src/mage/abilities/effects/common/continious/AddCardSubtypeAttachedEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/AddCardSubtypeAttachedEffect.java @@ -28,9 +28,9 @@ package mage.abilities.effects.common.continious; -import mage.Constants; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; @@ -39,10 +39,10 @@ import mage.game.permanent.Permanent; */ public class AddCardSubtypeAttachedEffect extends ContinuousEffectImpl { private String addedSubtype; - private Constants.AttachmentType attachmentType; + private AttachmentType attachmentType; - public AddCardSubtypeAttachedEffect(String addedSubtype, Constants.Duration duration, Constants.AttachmentType attachmentType) { - super(duration, Constants.Layer.TypeChangingEffects_4, Constants.SubLayer.NA, Constants.Outcome.Benefit); + public AddCardSubtypeAttachedEffect(String addedSubtype, Duration duration, AttachmentType attachmentType) { + super(duration, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Benefit); this.addedSubtype = addedSubtype; this.attachmentType = attachmentType; setText(); @@ -72,9 +72,9 @@ public class AddCardSubtypeAttachedEffect extends ContinuousEffectImpl { - private Constants.CardType addedCardType; - private Constants.AttachmentType attachmentType; + private CardType addedCardType; + private AttachmentType attachmentType; - public AddCardTypeAttachedEffect(Constants.CardType addedCardType, Constants.Duration duration, Constants.AttachmentType attachmentType) { - super(duration, Constants.Layer.TypeChangingEffects_4, Constants.SubLayer.NA, Constants.Outcome.Benefit); + public AddCardTypeAttachedEffect(CardType addedCardType, Duration duration, AttachmentType attachmentType) { + super(duration, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Benefit); this.addedCardType = addedCardType; this.attachmentType = attachmentType; setText(); @@ -72,9 +72,9 @@ public class AddCardTypeAttachedEffect extends ContinuousEffectImpl { - private Constants.CardType addedCardType; + private CardType addedCardType; - public AddCardTypeTargetEffect(Constants.CardType addedCardType, Constants.Duration duration) { - super(duration, Constants.Layer.TypeChangingEffects_4, Constants.SubLayer.NA, Constants.Outcome.Benefit); + public AddCardTypeTargetEffect(CardType addedCardType, Duration duration) { + super(duration, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Benefit); this.addedCardType = addedCardType; } diff --git a/Mage/src/mage/abilities/effects/common/continious/BecomesBasicLandEnchantedEffect.java b/Mage/src/mage/abilities/effects/common/continious/BecomesBasicLandEnchantedEffect.java index fd2f02e9765..2bb77017b09 100644 --- a/Mage/src/mage/abilities/effects/common/continious/BecomesBasicLandEnchantedEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/BecomesBasicLandEnchantedEffect.java @@ -30,11 +30,11 @@ package mage.abilities.effects.common.continious; import java.util.ArrayList; import java.util.Arrays; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.SubLayer; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.mana.BlackManaAbility; diff --git a/Mage/src/mage/abilities/effects/common/continious/BecomesCreatureAllEffect.java b/Mage/src/mage/abilities/effects/common/continious/BecomesCreatureAllEffect.java index 868886783f8..0889543ec87 100644 --- a/Mage/src/mage/abilities/effects/common/continious/BecomesCreatureAllEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/BecomesCreatureAllEffect.java @@ -27,11 +27,11 @@ */ package mage.abilities.effects.common.continious; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.SubLayer; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.ContinuousEffectImpl; diff --git a/Mage/src/mage/abilities/effects/common/continious/BecomesCreatureAttachedEffect.java b/Mage/src/mage/abilities/effects/common/continious/BecomesCreatureAttachedEffect.java index af4cd9cffd5..facefadb6a6 100644 --- a/Mage/src/mage/abilities/effects/common/continious/BecomesCreatureAttachedEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/BecomesCreatureAttachedEffect.java @@ -28,11 +28,7 @@ package mage.abilities.effects.common.continious; -import mage.Constants; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.SubLayer; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.game.Game; @@ -82,7 +78,7 @@ public class BecomesCreatureAttachedEffect extends ContinuousEffectImpl 0) { - for (Constants.CardType t : token.getCardType()) { + for (CardType t : token.getCardType()) { if (!permanent.getCardType().contains(t)) { permanent.getCardType().add(t); } diff --git a/Mage/src/mage/abilities/effects/common/continious/BecomesCreatureSourceEffect.java b/Mage/src/mage/abilities/effects/common/continious/BecomesCreatureSourceEffect.java index fb2e0389b6a..1cbb77152a2 100644 --- a/Mage/src/mage/abilities/effects/common/continious/BecomesCreatureSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/BecomesCreatureSourceEffect.java @@ -28,11 +28,7 @@ package mage.abilities.effects.common.continious; -import mage.Constants; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.SubLayer; +import mage.constants.*; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.game.Game; @@ -80,7 +76,7 @@ public class BecomesCreatureSourceEffect extends ContinuousEffectImpl 0) { - for (Constants.CardType t : token.getCardType()) { + for (CardType t : token.getCardType()) { if (!permanent.getCardType().contains(t)) { permanent.getCardType().add(t); } diff --git a/Mage/src/mage/abilities/effects/common/continious/BecomesCreatureTargetEffect.java b/Mage/src/mage/abilities/effects/common/continious/BecomesCreatureTargetEffect.java index f0c6fcf9dae..dca8422c4c4 100644 --- a/Mage/src/mage/abilities/effects/common/continious/BecomesCreatureTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/BecomesCreatureTargetEffect.java @@ -28,11 +28,11 @@ package mage.abilities.effects.common.continious; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.SubLayer; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.ContinuousEffectImpl; diff --git a/Mage/src/mage/abilities/effects/common/continious/BoostAllEffect.java b/Mage/src/mage/abilities/effects/common/continious/BoostAllEffect.java index a636e5afc37..4614af190bd 100644 --- a/Mage/src/mage/abilities/effects/common/continious/BoostAllEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/BoostAllEffect.java @@ -28,10 +28,10 @@ package mage.abilities.effects.common.continious; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.SubLayer; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; diff --git a/Mage/src/mage/abilities/effects/common/continious/BoostControlledEffect.java b/Mage/src/mage/abilities/effects/common/continious/BoostControlledEffect.java index e7e9899d712..ade1888acac 100644 --- a/Mage/src/mage/abilities/effects/common/continious/BoostControlledEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/BoostControlledEffect.java @@ -28,10 +28,10 @@ package mage.abilities.effects.common.continious; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.SubLayer; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; diff --git a/Mage/src/mage/abilities/effects/common/continious/BoostEnchantedEffect.java b/Mage/src/mage/abilities/effects/common/continious/BoostEnchantedEffect.java index 11eadec39af..94290459a2b 100644 --- a/Mage/src/mage/abilities/effects/common/continious/BoostEnchantedEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/BoostEnchantedEffect.java @@ -28,10 +28,10 @@ package mage.abilities.effects.common.continious; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.SubLayer; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; diff --git a/Mage/src/mage/abilities/effects/common/continious/BoostEquippedEffect.java b/Mage/src/mage/abilities/effects/common/continious/BoostEquippedEffect.java index 7811a00a70a..b3e53ad8300 100644 --- a/Mage/src/mage/abilities/effects/common/continious/BoostEquippedEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/BoostEquippedEffect.java @@ -28,10 +28,10 @@ package mage.abilities.effects.common.continious; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.SubLayer; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; diff --git a/Mage/src/mage/abilities/effects/common/continious/BoostOpponentsEffect.java b/Mage/src/mage/abilities/effects/common/continious/BoostOpponentsEffect.java index 119d8f77a63..4bb6c599282 100644 --- a/Mage/src/mage/abilities/effects/common/continious/BoostOpponentsEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/BoostOpponentsEffect.java @@ -1,8 +1,11 @@ package mage.abilities.effects.common.continious; -import mage.Constants; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -15,12 +18,12 @@ public class BoostOpponentsEffect extends ContinuousEffectImpl { public ControlEnchantedEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.GainControl); + super(Duration.WhileOnBattlefield, Outcome.GainControl); staticText = "You control enchanted creature"; } @@ -26,14 +29,14 @@ public class ControlEnchantedEffect extends ContinuousEffectImpl { - - protected Ability ability; - - public GainAbilityTargetEffect(Ability ability, Duration duration) { - super(duration, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, - ability.getEffects().size() > 0 ? ability.getEffects().get(0).getOutcome() : Outcome.AddAbility); - this.ability = ability; - } - - public GainAbilityTargetEffect(Ability ability, Duration duration, String rule) { - super(duration, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, - ability.getEffects().size() > 0 ? ability.getEffects().get(0).getOutcome() : Outcome.AddAbility); - this.ability = ability; - staticText = rule; - } - - public GainAbilityTargetEffect(final GainAbilityTargetEffect effect) { - super(effect); - this.ability = effect.ability.copy(); - } - - @Override - public GainAbilityTargetEffect copy() { - return new GainAbilityTargetEffect(this); - } - - @Override - public void init(Ability source, Game game) { - super.init(source, game); - targetPointer.init(game, source); - } - - @Override - public boolean apply(Game game, Ability source) { - int affectedTargets = 0; - for (UUID permanentId : targetPointer.getTargets(game, source)) { - Permanent permanent = game.getPermanent(permanentId); - if (permanent != null) { - permanent.addAbility(ability, source.getSourceId(), game); - affectedTargets++; - } - } - return affectedTargets > 0; - } - - @Override - public String getText(Mode mode) { - if (staticText != null && !staticText.isEmpty()) { - return staticText; - } - StringBuilder sb = new StringBuilder(); - Target target = mode.getTargets().get(0); - if(target.getNumberOfTargets() > 1){ - if (target.getNumberOfTargets() < target.getMaxNumberOfTargets()) { - sb.append("Up to"); - } - sb.append(target.getMaxNumberOfTargets()).append(" target ").append(target.getTargetName()).append(" gain "); - } else { - sb.append("Target ").append(target.getTargetName()).append(" gains "); - } - sb.append(ability.getRule()).append(" ").append(duration.toString()); - return sb.toString(); - } - -} +/* +* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. +* +* Redistribution and use in source and binary forms, with or without modification, are +* permitted provided that the following conditions are met: +* +* 1. Redistributions of source code must retain the above copyright notice, this list of +* conditions and the following disclaimer. +* +* 2. Redistributions in binary form must reproduce the above copyright notice, this list +* of conditions and the following disclaimer in the documentation and/or other materials +* provided with the distribution. +* +* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED +* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR +* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +* +* The views and conclusions contained in the software and documentation are those of the +* authors and should not be interpreted as representing official policies, either expressed +* or implied, of BetaSteward_at_googlemail.com. +*/ + +package mage.abilities.effects.common.continious; + +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.abilities.Ability; +import mage.abilities.Mode; +import mage.abilities.effects.ContinuousEffectImpl; +import mage.game.Game; +import mage.game.permanent.Permanent; +import mage.target.Target; + +import java.util.UUID; + +/** + * + * @author BetaSteward_at_googlemail.com + */ +public class GainAbilityTargetEffect extends ContinuousEffectImpl { + + protected Ability ability; + + public GainAbilityTargetEffect(Ability ability, Duration duration) { + super(duration, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, + ability.getEffects().size() > 0 ? ability.getEffects().get(0).getOutcome() : Outcome.AddAbility); + this.ability = ability; + } + + public GainAbilityTargetEffect(Ability ability, Duration duration, String rule) { + super(duration, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, + ability.getEffects().size() > 0 ? ability.getEffects().get(0).getOutcome() : Outcome.AddAbility); + this.ability = ability; + staticText = rule; + } + + public GainAbilityTargetEffect(final GainAbilityTargetEffect effect) { + super(effect); + this.ability = effect.ability.copy(); + } + + @Override + public GainAbilityTargetEffect copy() { + return new GainAbilityTargetEffect(this); + } + + @Override + public void init(Ability source, Game game) { + super.init(source, game); + targetPointer.init(game, source); + } + + @Override + public boolean apply(Game game, Ability source) { + int affectedTargets = 0; + for (UUID permanentId : targetPointer.getTargets(game, source)) { + Permanent permanent = game.getPermanent(permanentId); + if (permanent != null) { + permanent.addAbility(ability, source.getSourceId(), game); + affectedTargets++; + } + } + return affectedTargets > 0; + } + + @Override + public String getText(Mode mode) { + if (staticText != null && !staticText.isEmpty()) { + return staticText; + } + StringBuilder sb = new StringBuilder(); + Target target = mode.getTargets().get(0); + if(target.getNumberOfTargets() > 1){ + if (target.getNumberOfTargets() < target.getMaxNumberOfTargets()) { + sb.append("Up to"); + } + sb.append(target.getMaxNumberOfTargets()).append(" target ").append(target.getTargetName()).append(" gain "); + } else { + sb.append("Target ").append(target.getTargetName()).append(" gains "); + } + sb.append(ability.getRule()).append(" ").append(duration.toString()); + return sb.toString(); + } + +} diff --git a/Mage/src/mage/abilities/effects/common/continious/GainControlTargetEffect.java b/Mage/src/mage/abilities/effects/common/continious/GainControlTargetEffect.java index cabb190186f..fdc137f49b7 100644 --- a/Mage/src/mage/abilities/effects/common/continious/GainControlTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/GainControlTargetEffect.java @@ -28,10 +28,10 @@ package mage.abilities.effects.common.continious; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.SubLayer; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.ContinuousEffectImpl; diff --git a/Mage/src/mage/abilities/effects/common/continious/GainProtectionFromColorTargetEffect.java b/Mage/src/mage/abilities/effects/common/continious/GainProtectionFromColorTargetEffect.java index 53ec16aef3d..2fe8370f2e7 100644 --- a/Mage/src/mage/abilities/effects/common/continious/GainProtectionFromColorTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/GainProtectionFromColorTargetEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common.continious; -import mage.Constants.Duration; +import mage.constants.Duration; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.keyword.ProtectionAbility; diff --git a/Mage/src/mage/abilities/effects/common/continious/GainProtectionFromTypeTargetEffect.java b/Mage/src/mage/abilities/effects/common/continious/GainProtectionFromTypeTargetEffect.java index 662277236c3..ba44668e95d 100644 --- a/Mage/src/mage/abilities/effects/common/continious/GainProtectionFromTypeTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/GainProtectionFromTypeTargetEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common.continious; -import mage.Constants.Duration; +import mage.constants.Duration; import mage.abilities.Ability; import mage.abilities.keyword.ProtectionAbility; import mage.filter.FilterCard; diff --git a/Mage/src/mage/abilities/effects/common/continious/LifeTotalCantChangeControllerEffect.java b/Mage/src/mage/abilities/effects/common/continious/LifeTotalCantChangeControllerEffect.java index e200a56bb14..ff1b46c5b32 100644 --- a/Mage/src/mage/abilities/effects/common/continious/LifeTotalCantChangeControllerEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/LifeTotalCantChangeControllerEffect.java @@ -28,10 +28,10 @@ package mage.abilities.effects.common.continious; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.SubLayer; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.game.Game; diff --git a/Mage/src/mage/abilities/effects/common/continious/LoseAbilityAttachedEffect.java b/Mage/src/mage/abilities/effects/common/continious/LoseAbilityAttachedEffect.java index f9822241fbc..fd7467b8a39 100644 --- a/Mage/src/mage/abilities/effects/common/continious/LoseAbilityAttachedEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/LoseAbilityAttachedEffect.java @@ -28,9 +28,9 @@ package mage.abilities.effects.common.continious; -import mage.Constants.*; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import org.apache.log4j.Logger; diff --git a/Mage/src/mage/abilities/effects/common/continious/LoseAllAbilitiesAllEffect.java b/Mage/src/mage/abilities/effects/common/continious/LoseAllAbilitiesAllEffect.java index 447d678228c..d7bd354c498 100644 --- a/Mage/src/mage/abilities/effects/common/continious/LoseAllAbilitiesAllEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/LoseAllAbilitiesAllEffect.java @@ -28,10 +28,10 @@ package mage.abilities.effects.common.continious; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.SubLayer; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.ContinuousEffectImpl; diff --git a/Mage/src/mage/abilities/effects/common/continious/LoseAllAbilitiesTargetEffect.java b/Mage/src/mage/abilities/effects/common/continious/LoseAllAbilitiesTargetEffect.java index b3e354473f4..b0afd2ad3fc 100644 --- a/Mage/src/mage/abilities/effects/common/continious/LoseAllAbilitiesTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/LoseAllAbilitiesTargetEffect.java @@ -28,10 +28,10 @@ package mage.abilities.effects.common.continious; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.SubLayer; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.ContinuousEffectImpl; diff --git a/Mage/src/mage/abilities/effects/common/continious/MaximumHandSizeControllerEffect.java b/Mage/src/mage/abilities/effects/common/continious/MaximumHandSizeControllerEffect.java index 11af4f310b8..bea14ee8e65 100644 --- a/Mage/src/mage/abilities/effects/common/continious/MaximumHandSizeControllerEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/MaximumHandSizeControllerEffect.java @@ -28,11 +28,11 @@ package mage.abilities.effects.common.continious; import java.util.UUID; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.SubLayer; -import mage.Constants.TargetController; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.constants.TargetController; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.game.Game; diff --git a/Mage/src/mage/abilities/effects/common/continious/PlayAdditionalLandsAllEffect.java b/Mage/src/mage/abilities/effects/common/continious/PlayAdditionalLandsAllEffect.java index 96819b1fae6..fe3b7eb9365 100644 --- a/Mage/src/mage/abilities/effects/common/continious/PlayAdditionalLandsAllEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/PlayAdditionalLandsAllEffect.java @@ -28,9 +28,12 @@ package mage.abilities.effects.common.continious; -import mage.Constants; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.game.Game; import mage.players.Player; @@ -42,7 +45,7 @@ import mage.players.Player; public class PlayAdditionalLandsAllEffect extends ContinuousEffectImpl { public PlayAdditionalLandsAllEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Layer.PlayerEffects, Constants.SubLayer.NA, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Layer.PlayerEffects, SubLayer.NA, Outcome.Benefit); staticText = "Each player may play an additional land on each of his or her turns"; } diff --git a/Mage/src/mage/abilities/effects/common/continious/PlayAdditionalLandsControllerEffect.java b/Mage/src/mage/abilities/effects/common/continious/PlayAdditionalLandsControllerEffect.java index 87fe4009cff..c4ec0e1e5c3 100644 --- a/Mage/src/mage/abilities/effects/common/continious/PlayAdditionalLandsControllerEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/PlayAdditionalLandsControllerEffect.java @@ -28,10 +28,10 @@ package mage.abilities.effects.common.continious; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.SubLayer; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.game.Game; diff --git a/Mage/src/mage/abilities/effects/common/continious/PlayTheTopCardEffect.java b/Mage/src/mage/abilities/effects/common/continious/PlayTheTopCardEffect.java index 0f3d35ca1f9..e27529c81f7 100644 --- a/Mage/src/mage/abilities/effects/common/continious/PlayTheTopCardEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/PlayTheTopCardEffect.java @@ -30,14 +30,15 @@ package mage.abilities.effects.common.continious; import mage.abilities.Ability; import mage.abilities.effects.AsThoughEffectImpl; import mage.cards.Card; +import mage.constants.AsThoughEffectType; +import mage.constants.Duration; +import mage.constants.Outcome; import mage.filter.FilterCard; import mage.game.Game; import mage.players.Player; import java.util.UUID; -import static mage.Constants.*; - /** * @author nantuko */ diff --git a/Mage/src/mage/abilities/effects/common/continious/PlayWithTheTopCardRevealedEffect.java b/Mage/src/mage/abilities/effects/common/continious/PlayWithTheTopCardRevealedEffect.java index 912d50e1e25..39c4996195f 100644 --- a/Mage/src/mage/abilities/effects/common/continious/PlayWithTheTopCardRevealedEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/PlayWithTheTopCardRevealedEffect.java @@ -27,10 +27,12 @@ */ package mage.abilities.effects.common.continious; -import static mage.Constants.*; - import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.game.Game; import mage.players.Player; diff --git a/Mage/src/mage/abilities/effects/common/continious/SetCardColorAttachedEffect.java b/Mage/src/mage/abilities/effects/common/continious/SetCardColorAttachedEffect.java index 99698a7fde6..36986f21540 100644 --- a/Mage/src/mage/abilities/effects/common/continious/SetCardColorAttachedEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/SetCardColorAttachedEffect.java @@ -27,10 +27,10 @@ */ package mage.abilities.effects.common.continious; -import mage.Constants; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; @@ -40,10 +40,10 @@ import mage.game.permanent.Permanent; public class SetCardColorAttachedEffect extends ContinuousEffectImpl { private ObjectColor setColor; - private Constants.AttachmentType attachmentType; + private AttachmentType attachmentType; - public SetCardColorAttachedEffect(ObjectColor setColor, Constants.Duration duration, Constants.AttachmentType attachmentType) { - super(duration, Constants.Layer.ColorChangingEffects_5, Constants.SubLayer.NA, Constants.Outcome.Benefit); + public SetCardColorAttachedEffect(ObjectColor setColor, Duration duration, AttachmentType attachmentType) { + super(duration, Layer.ColorChangingEffects_5, SubLayer.NA, Outcome.Benefit); this.setColor = setColor; this.attachmentType = attachmentType; setText(); @@ -75,9 +75,9 @@ public class SetCardColorAttachedEffect extends ContinuousEffectImpl { private List setSubtypes = new ArrayList(); - private Constants.AttachmentType attachmentType; + private AttachmentType attachmentType; - public SetCardSubtypeAttachedEffect(String setSubtype, Constants.Duration duration, Constants.AttachmentType attachmentType) { - super(duration, Constants.Layer.TypeChangingEffects_4, Constants.SubLayer.NA, Constants.Outcome.Benefit); + public SetCardSubtypeAttachedEffect(String setSubtype, Duration duration, AttachmentType attachmentType) { + super(duration, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Benefit); this.setSubtypes.add(setSubtype); this.attachmentType = attachmentType; setText(); } - public SetCardSubtypeAttachedEffect(List setSubtypes, Constants.Duration duration, Constants.AttachmentType attachmentType) { - super(duration, Constants.Layer.TypeChangingEffects_4, Constants.SubLayer.NA, Constants.Outcome.Benefit); + public SetCardSubtypeAttachedEffect(List setSubtypes, Duration duration, AttachmentType attachmentType) { + super(duration, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Benefit); this.setSubtypes.addAll(setSubtypes); this.attachmentType = attachmentType; setText(); @@ -83,9 +84,9 @@ public class SetCardSubtypeAttachedEffect extends ContinuousEffectImpl { public DiscardCardYouChooseTargetOpponentEffect() { - super(Constants.Outcome.Discard); + super(Outcome.Discard); staticText = "Target opponent reveals his or her hand. You choose a card from it. That player discards that card"; } @@ -58,9 +59,9 @@ public class DiscardCardYouChooseTargetOpponentEffect extends OneShotEffect { public AddExtraTurnControllerEffect() { - super(Constants.Outcome.ExtraTurn); + super(Outcome.ExtraTurn); staticText = "Take an extra turn after this one"; } diff --git a/Mage/src/mage/abilities/effects/common/turn/AddExtraTurnTargetEffect.java b/Mage/src/mage/abilities/effects/common/turn/AddExtraTurnTargetEffect.java index bf21242823e..3bcc157be9c 100644 --- a/Mage/src/mage/abilities/effects/common/turn/AddExtraTurnTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/turn/AddExtraTurnTargetEffect.java @@ -27,9 +27,9 @@ */ package mage.abilities.effects.common.turn; -import mage.Constants; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.game.Game; import mage.game.turn.TurnMod; @@ -39,7 +39,7 @@ import mage.game.turn.TurnMod; public class AddExtraTurnTargetEffect extends OneShotEffect { public AddExtraTurnTargetEffect() { - super(Constants.Outcome.ExtraTurn); + super(Outcome.ExtraTurn); staticText = "Target player takes an extra turn after this one"; } diff --git a/Mage/src/mage/abilities/effects/common/turn/ControlTargetPlayerNextTurnEffect.java b/Mage/src/mage/abilities/effects/common/turn/ControlTargetPlayerNextTurnEffect.java index e2a89693638..659da6b9434 100644 --- a/Mage/src/mage/abilities/effects/common/turn/ControlTargetPlayerNextTurnEffect.java +++ b/Mage/src/mage/abilities/effects/common/turn/ControlTargetPlayerNextTurnEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common.turn; import java.util.UUID; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/keyword/AffinityForArtifactsAbility.java b/Mage/src/mage/abilities/keyword/AffinityForArtifactsAbility.java index 99b8fdb6ff9..c04b2d41ff3 100644 --- a/Mage/src/mage/abilities/keyword/AffinityForArtifactsAbility.java +++ b/Mage/src/mage/abilities/keyword/AffinityForArtifactsAbility.java @@ -27,12 +27,13 @@ */ package mage.abilities.keyword; -import mage.Constants; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.AdjustingSourceCosts; import mage.abilities.effects.common.AffinityEffect; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; @@ -45,11 +46,11 @@ public class AffinityForArtifactsAbility extends SimpleStaticAbility implements private static final FilterControlledPermanent filter = new FilterControlledPermanent(); static { - filter.add(new CardTypePredicate(Constants.CardType.ARTIFACT)); + filter.add(new CardTypePredicate(CardType.ARTIFACT)); } public AffinityForArtifactsAbility() { - super(Constants.Zone.OUTSIDE, new AffinityEffect(filter)); + super(Zone.OUTSIDE, new AffinityEffect(filter)); setRuleAtTheTop(true); } diff --git a/Mage/src/mage/abilities/keyword/AnnihilatorAbility.java b/Mage/src/mage/abilities/keyword/AnnihilatorAbility.java index 7cfb26a9e9a..3e18e1c5505 100644 --- a/Mage/src/mage/abilities/keyword/AnnihilatorAbility.java +++ b/Mage/src/mage/abilities/keyword/AnnihilatorAbility.java @@ -28,9 +28,9 @@ package mage.abilities.keyword; -import mage.Constants.Outcome; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.Outcome; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/mage/abilities/keyword/AttacksThisTurnMarkerAbility.java b/Mage/src/mage/abilities/keyword/AttacksThisTurnMarkerAbility.java index 5b251ba3b29..81d955dfdab 100644 --- a/Mage/src/mage/abilities/keyword/AttacksThisTurnMarkerAbility.java +++ b/Mage/src/mage/abilities/keyword/AttacksThisTurnMarkerAbility.java @@ -28,7 +28,7 @@ package mage.abilities.keyword; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; diff --git a/Mage/src/mage/abilities/keyword/BattalionAbility.java b/Mage/src/mage/abilities/keyword/BattalionAbility.java index d79e84722d4..3d2859a296f 100644 --- a/Mage/src/mage/abilities/keyword/BattalionAbility.java +++ b/Mage/src/mage/abilities/keyword/BattalionAbility.java @@ -28,7 +28,7 @@ package mage.abilities.keyword; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/keyword/BattleCryAbility.java b/Mage/src/mage/abilities/keyword/BattleCryAbility.java index bfd16837f69..9331cace1a9 100644 --- a/Mage/src/mage/abilities/keyword/BattleCryAbility.java +++ b/Mage/src/mage/abilities/keyword/BattleCryAbility.java @@ -1,13 +1,13 @@ package mage.abilities.keyword; -import mage.Constants; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; +import mage.constants.Duration; import mage.filter.common.FilterAttackingCreature; public class BattleCryAbility extends AttacksTriggeredAbility { public BattleCryAbility() { - super(new BoostControlledEffect(1, 0, Constants.Duration.EndOfTurn, new FilterAttackingCreature(), true), false); + super(new BoostControlledEffect(1, 0, Duration.EndOfTurn, new FilterAttackingCreature(), true), false); } public BattleCryAbility(final BattleCryAbility ability) { diff --git a/Mage/src/mage/abilities/keyword/BlocksThisTurnMarkerAbility.java b/Mage/src/mage/abilities/keyword/BlocksThisTurnMarkerAbility.java index 81e3b4bd30e..dc822ab4fa2 100644 --- a/Mage/src/mage/abilities/keyword/BlocksThisTurnMarkerAbility.java +++ b/Mage/src/mage/abilities/keyword/BlocksThisTurnMarkerAbility.java @@ -28,7 +28,7 @@ package mage.abilities.keyword; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; diff --git a/Mage/src/mage/abilities/keyword/BloodrushAbility.java b/Mage/src/mage/abilities/keyword/BloodrushAbility.java index a6a34da5715..fc127ac0f80 100644 --- a/Mage/src/mage/abilities/keyword/BloodrushAbility.java +++ b/Mage/src/mage/abilities/keyword/BloodrushAbility.java @@ -28,7 +28,7 @@ package mage.abilities.keyword; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.common.DiscardSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; diff --git a/Mage/src/mage/abilities/keyword/BloodthirstAbility.java b/Mage/src/mage/abilities/keyword/BloodthirstAbility.java index 71d96361754..a0d45d0619e 100644 --- a/Mage/src/mage/abilities/keyword/BloodthirstAbility.java +++ b/Mage/src/mage/abilities/keyword/BloodthirstAbility.java @@ -1,9 +1,9 @@ package mage.abilities.keyword; -import mage.Constants; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -42,7 +42,7 @@ class BloodthirstEffect extends OneShotEffect { private int amount; BloodthirstEffect(int amount) { - super(Constants.Outcome.BoostCreature); + super(Outcome.BoostCreature); this.amount = amount; staticText = "this permanent comes into play with " + amount + " +1/+1 counters on it"; } diff --git a/Mage/src/mage/abilities/keyword/BushidoAbility.java b/Mage/src/mage/abilities/keyword/BushidoAbility.java index 3e43c1e0abf..3dcc226e349 100644 --- a/Mage/src/mage/abilities/keyword/BushidoAbility.java +++ b/Mage/src/mage/abilities/keyword/BushidoAbility.java @@ -27,7 +27,7 @@ */ package mage.abilities.keyword; -import mage.Constants.Duration; +import mage.constants.Duration; import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; diff --git a/Mage/src/mage/abilities/keyword/BuybackAbility.java b/Mage/src/mage/abilities/keyword/BuybackAbility.java index 8c55a5d8660..3986d589527 100644 --- a/Mage/src/mage/abilities/keyword/BuybackAbility.java +++ b/Mage/src/mage/abilities/keyword/BuybackAbility.java @@ -28,8 +28,8 @@ package mage.abilities.keyword; import java.util.Iterator; -import mage.Constants; -import mage.Constants.Zone; + +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.StaticAbility; @@ -41,6 +41,8 @@ import mage.abilities.costs.OptionalAdditionalSourceCosts; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.Card; +import mage.constants.Duration; +import mage.constants.Outcome; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -115,7 +117,7 @@ public class BuybackAbility extends StaticAbility implements Opt if (player != null) { this.resetBuyback(); if (buybackCost != null) { - if (player.chooseUse(Constants.Outcome.Benefit,new StringBuilder("Pay ").append(buybackCost.getText(false)).append(" ?").toString(), game)) { + if (player.chooseUse(Outcome.Benefit,new StringBuilder("Pay ").append(buybackCost.getText(false)).append(" ?").toString(), game)) { buybackCost.activate(); for (Iterator it = ((Costs) buybackCost).iterator(); it.hasNext();) { Cost cost = (Cost) it.next(); @@ -163,7 +165,7 @@ public class BuybackAbility extends StaticAbility implements Opt class BuybackEffect extends ReplacementEffectImpl { public BuybackEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Exile); + super(Duration.WhileOnBattlefield, Outcome.Exile); staticText = "When {this} resolves and you payed buyback costs, put it back to hand instead"; } diff --git a/Mage/src/mage/abilities/keyword/CanAttackOnlyAloneAbility.java b/Mage/src/mage/abilities/keyword/CanAttackOnlyAloneAbility.java index 87cf42cefc3..c8bc10eecf8 100644 --- a/Mage/src/mage/abilities/keyword/CanAttackOnlyAloneAbility.java +++ b/Mage/src/mage/abilities/keyword/CanAttackOnlyAloneAbility.java @@ -29,7 +29,7 @@ package mage.abilities.keyword; import java.io.ObjectStreamException; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; diff --git a/Mage/src/mage/abilities/keyword/CantAttackAloneAbility.java b/Mage/src/mage/abilities/keyword/CantAttackAloneAbility.java index 09773196888..7f075834dfb 100644 --- a/Mage/src/mage/abilities/keyword/CantAttackAloneAbility.java +++ b/Mage/src/mage/abilities/keyword/CantAttackAloneAbility.java @@ -28,7 +28,7 @@ package mage.abilities.keyword; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; diff --git a/Mage/src/mage/abilities/keyword/CantBlockAloneAbility.java b/Mage/src/mage/abilities/keyword/CantBlockAloneAbility.java index 24f875c4bd3..1ac85f4b6aa 100644 --- a/Mage/src/mage/abilities/keyword/CantBlockAloneAbility.java +++ b/Mage/src/mage/abilities/keyword/CantBlockAloneAbility.java @@ -28,7 +28,7 @@ package mage.abilities.keyword; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; diff --git a/Mage/src/mage/abilities/keyword/CascadeAbility.java b/Mage/src/mage/abilities/keyword/CascadeAbility.java index e1d2b6278b3..66a8c2b6391 100644 --- a/Mage/src/mage/abilities/keyword/CascadeAbility.java +++ b/Mage/src/mage/abilities/keyword/CascadeAbility.java @@ -28,9 +28,9 @@ package mage.abilities.keyword; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/mage/abilities/keyword/ChampionAbility.java b/Mage/src/mage/abilities/keyword/ChampionAbility.java index 69f11020ee4..843515c4264 100644 --- a/Mage/src/mage/abilities/keyword/ChampionAbility.java +++ b/Mage/src/mage/abilities/keyword/ChampionAbility.java @@ -29,9 +29,9 @@ package mage.abilities.keyword; import java.util.ArrayList; import java.util.UUID; -import mage.Constants; -import mage.Constants.Outcome; -import mage.Constants.Zone; + +import mage.constants.Outcome; +import mage.constants.Zone; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.StaticAbility; @@ -107,7 +107,7 @@ public class ChampionAbility extends StaticAbility { card.addAbility(ability1); // When this permanent leaves the battlefield, return the exiled card to the battlefield under its owner's control. - Ability ability2 = new LeavesBattlefieldTriggeredAbility(new ReturnFromExileForSourceEffect(Constants.Zone.BATTLEFIELD), false); + Ability ability2 = new LeavesBattlefieldTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.BATTLEFIELD), false); ability2.setRuleVisible(false); card.addAbility(ability2); } diff --git a/Mage/src/mage/abilities/keyword/ChangelingAbility.java b/Mage/src/mage/abilities/keyword/ChangelingAbility.java index d43496e37bb..f926362c67e 100644 --- a/Mage/src/mage/abilities/keyword/ChangelingAbility.java +++ b/Mage/src/mage/abilities/keyword/ChangelingAbility.java @@ -29,7 +29,7 @@ package mage.abilities.keyword; import java.io.ObjectStreamException; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; diff --git a/Mage/src/mage/abilities/keyword/ConvokeAbility.java b/Mage/src/mage/abilities/keyword/ConvokeAbility.java index 378b789e5d0..103826f1ea1 100644 --- a/Mage/src/mage/abilities/keyword/ConvokeAbility.java +++ b/Mage/src/mage/abilities/keyword/ConvokeAbility.java @@ -29,8 +29,8 @@ package mage.abilities.keyword; import java.util.UUID; -import mage.Constants.Outcome; -import mage.Constants.Zone; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage/src/mage/abilities/keyword/CumulativeUpkeepAbility.java b/Mage/src/mage/abilities/keyword/CumulativeUpkeepAbility.java index 2b57078b8fa..470aaf7b698 100644 --- a/Mage/src/mage/abilities/keyword/CumulativeUpkeepAbility.java +++ b/Mage/src/mage/abilities/keyword/CumulativeUpkeepAbility.java @@ -29,7 +29,6 @@ package mage.abilities.keyword; -import mage.Constants; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.costs.Cost; @@ -38,6 +37,8 @@ import mage.abilities.costs.mana.ManaCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -54,7 +55,7 @@ public class CumulativeUpkeepAbility extends BeginningOfUpkeepTriggeredAbility { private Cost cumulativeCost; public CumulativeUpkeepAbility(Cost cumulativeCost) { - super(new AddCountersSourceEffect(CounterType.AGE.createInstance()), Constants.TargetController.YOU, false); + super(new AddCountersSourceEffect(CounterType.AGE.createInstance()), TargetController.YOU, false); this.addEffect(new CumulativeUpkeepEffect(cumulativeCost)); this.cumulativeCost = cumulativeCost; } @@ -88,7 +89,7 @@ class CumulativeUpkeepEffect extends OneShotEffect { private Cost cumulativeCost; CumulativeUpkeepEffect(Cost cumulativeCost) { - super(Constants.Outcome.Sacrifice); + super(Outcome.Sacrifice); this.cumulativeCost = cumulativeCost; } @@ -109,7 +110,7 @@ class CumulativeUpkeepEffect extends OneShotEffect { for(int i = 0 ; i < ageCounter; i++){ totalCost.add(cumulativeCost.copy()); } - if (player.chooseUse(Constants.Outcome.Benefit, "Pay " + totalCost.getText() + "?", game)) { + if (player.chooseUse(Outcome.Benefit, "Pay " + totalCost.getText() + "?", game)) { totalCost.clearPaid(); if (totalCost.payOrRollback(source, game, source.getId(), source.getControllerId())){ return true; @@ -123,7 +124,7 @@ class CumulativeUpkeepEffect extends OneShotEffect { for(int i = 0 ; i < ageCounter; i++){ totalCost.add(cumulativeCost.copy()); } - if (player.chooseUse(Constants.Outcome.Benefit, totalCost.getText() + "?", game)) { + if (player.chooseUse(Outcome.Benefit, totalCost.getText() + "?", game)) { totalCost.clearPaid(); int bookmark = game.bookmarkState(); if (totalCost.pay(source, game, source.getId(), source.getControllerId(), false)){ diff --git a/Mage/src/mage/abilities/keyword/CyclingAbility.java b/Mage/src/mage/abilities/keyword/CyclingAbility.java index ff9cc747a91..8fc5d1f3b63 100644 --- a/Mage/src/mage/abilities/keyword/CyclingAbility.java +++ b/Mage/src/mage/abilities/keyword/CyclingAbility.java @@ -28,7 +28,7 @@ package mage.abilities.keyword; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.Cost; import mage.abilities.costs.common.DiscardSourceCost; diff --git a/Mage/src/mage/abilities/keyword/DeathtouchAbility.java b/Mage/src/mage/abilities/keyword/DeathtouchAbility.java index 15f60a2c9c8..5dbc80fba81 100644 --- a/Mage/src/mage/abilities/keyword/DeathtouchAbility.java +++ b/Mage/src/mage/abilities/keyword/DeathtouchAbility.java @@ -28,7 +28,7 @@ package mage.abilities.keyword; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; diff --git a/Mage/src/mage/abilities/keyword/DefenderAbility.java b/Mage/src/mage/abilities/keyword/DefenderAbility.java index eb6cbbc192a..9619061e143 100644 --- a/Mage/src/mage/abilities/keyword/DefenderAbility.java +++ b/Mage/src/mage/abilities/keyword/DefenderAbility.java @@ -28,7 +28,7 @@ package mage.abilities.keyword; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; diff --git a/Mage/src/mage/abilities/keyword/DevourAbility.java b/Mage/src/mage/abilities/keyword/DevourAbility.java index bde3a81c05f..1d4cdcfa822 100644 --- a/Mage/src/mage/abilities/keyword/DevourAbility.java +++ b/Mage/src/mage/abilities/keyword/DevourAbility.java @@ -27,7 +27,7 @@ */ package mage.abilities.keyword; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.DevourEffect; import mage.abilities.effects.common.DevourEffect.DevourFactor; diff --git a/Mage/src/mage/abilities/keyword/DoubleStrikeAbility.java b/Mage/src/mage/abilities/keyword/DoubleStrikeAbility.java index 7269ff81546..40549b25d91 100644 --- a/Mage/src/mage/abilities/keyword/DoubleStrikeAbility.java +++ b/Mage/src/mage/abilities/keyword/DoubleStrikeAbility.java @@ -28,7 +28,7 @@ package mage.abilities.keyword; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; diff --git a/Mage/src/mage/abilities/keyword/DredgeAbility.java b/Mage/src/mage/abilities/keyword/DredgeAbility.java index 87c225ff2c5..73456291c8f 100644 --- a/Mage/src/mage/abilities/keyword/DredgeAbility.java +++ b/Mage/src/mage/abilities/keyword/DredgeAbility.java @@ -27,9 +27,9 @@ */ package mage.abilities.keyword; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Zone; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; diff --git a/Mage/src/mage/abilities/keyword/EchoAbility.java b/Mage/src/mage/abilities/keyword/EchoAbility.java index 81d4d53095c..ccd2eee72ed 100644 --- a/Mage/src/mage/abilities/keyword/EchoAbility.java +++ b/Mage/src/mage/abilities/keyword/EchoAbility.java @@ -29,14 +29,15 @@ package mage.abilities.keyword; import java.util.UUID; -import mage.Constants; -import mage.Constants.Outcome; + +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.Cost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.EntersTheBattlefieldEvent; import mage.game.events.GameEvent; @@ -54,7 +55,7 @@ public class EchoAbility extends TriggeredAbilityImpl { protected String manaString; public EchoAbility(String manaString) { - super(Constants.Zone.BATTLEFIELD, new EchoEffect(new ManaCostsImpl(manaString)), false); + super(Zone.BATTLEFIELD, new EchoEffect(new ManaCostsImpl(manaString)), false); this.echoPaid = false; this.manaString = manaString; } diff --git a/Mage/src/mage/abilities/keyword/EnchantAbility.java b/Mage/src/mage/abilities/keyword/EnchantAbility.java index df5a0553854..3aa929ff920 100644 --- a/Mage/src/mage/abilities/keyword/EnchantAbility.java +++ b/Mage/src/mage/abilities/keyword/EnchantAbility.java @@ -27,7 +27,7 @@ */ package mage.abilities.keyword; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.StaticAbility; /** diff --git a/Mage/src/mage/abilities/keyword/EquipAbility.java b/Mage/src/mage/abilities/keyword/EquipAbility.java index 4bcaf8570c4..ff1ea606342 100644 --- a/Mage/src/mage/abilities/keyword/EquipAbility.java +++ b/Mage/src/mage/abilities/keyword/EquipAbility.java @@ -28,9 +28,9 @@ package mage.abilities.keyword; -import mage.Constants.Outcome; -import mage.Constants.TimingRule; -import mage.Constants.Zone; +import mage.constants.Outcome; +import mage.constants.TimingRule; +import mage.constants.Zone; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.Cost; import mage.abilities.effects.common.AttachEffect; diff --git a/Mage/src/mage/abilities/keyword/EvokeAbility.java b/Mage/src/mage/abilities/keyword/EvokeAbility.java index 41834644254..0d08d4e9370 100644 --- a/Mage/src/mage/abilities/keyword/EvokeAbility.java +++ b/Mage/src/mage/abilities/keyword/EvokeAbility.java @@ -31,8 +31,8 @@ package mage.abilities.keyword; import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import mage.Constants; -import mage.Constants.Zone; + +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.StaticAbility; @@ -47,6 +47,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.cards.Card; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; @@ -111,7 +112,7 @@ public class EvokeAbility extends StaticAbility implements Alterna this.resetEvoke(); for (AlternativeCost2 evokeCost: evokeCosts) { if (evokeCost.canPay(sourceId, controllerId, game) && - player.chooseUse(Constants.Outcome.Benefit, new StringBuilder(EVOKE_KEYWORD).append(" the creature for ").append(evokeCost.getText(true)).append(" ?").toString(), game)) { + player.chooseUse(Outcome.Benefit, new StringBuilder(EVOKE_KEYWORD).append(" the creature for ").append(evokeCost.getText(true)).append(" ?").toString(), game)) { evokeCost.activate(); ability.getManaCostsToPay().clear(); ability.getCosts().clear(); diff --git a/Mage/src/mage/abilities/keyword/EvolveAbility.java b/Mage/src/mage/abilities/keyword/EvolveAbility.java index 313f72136e8..c2537fa2222 100644 --- a/Mage/src/mage/abilities/keyword/EvolveAbility.java +++ b/Mage/src/mage/abilities/keyword/EvolveAbility.java @@ -29,9 +29,9 @@ package mage.abilities.keyword; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/mage/abilities/keyword/ExaltedAbility.java b/Mage/src/mage/abilities/keyword/ExaltedAbility.java index e7e4ad9c665..5cc7d7ad930 100644 --- a/Mage/src/mage/abilities/keyword/ExaltedAbility.java +++ b/Mage/src/mage/abilities/keyword/ExaltedAbility.java @@ -28,8 +28,8 @@ package mage.abilities.keyword; -import mage.Constants.Duration; -import mage.Constants.Zone; +import mage.constants.Duration; +import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/keyword/ExtortAbility.java b/Mage/src/mage/abilities/keyword/ExtortAbility.java index d4f4f8134a5..7182cecce62 100644 --- a/Mage/src/mage/abilities/keyword/ExtortAbility.java +++ b/Mage/src/mage/abilities/keyword/ExtortAbility.java @@ -29,13 +29,14 @@ package mage.abilities.keyword; import java.util.UUID; -import mage.Constants; -import mage.Constants.Zone; + +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.Cost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -85,7 +86,7 @@ public class ExtortAbility extends TriggeredAbilityImpl { class ExtortEffect extends OneShotEffect { public ExtortEffect() { - super(Constants.Outcome.Damage); + super(Outcome.Damage); staticText = "each opponent loses 1 life and you gain that much life"; } @@ -98,7 +99,7 @@ class ExtortEffect extends OneShotEffect { Player player = game.getPlayer(source.getControllerId()); Permanent permanent = game.getPermanent(source.getSourceId()); if (player != null && permanent != null) { - if (player.chooseUse(Constants.Outcome.Damage, new StringBuilder("Extort opponents? (").append(permanent.getName()).append(")").toString(), game)) { + if (player.chooseUse(Outcome.Damage, new StringBuilder("Extort opponents? (").append(permanent.getName()).append(")").toString(), game)) { Cost cost = new ManaCostsImpl("{W/B}"); if (cost.pay(source, game, source.getSourceId(), player.getId(), false)) { int loseLife = 0; diff --git a/Mage/src/mage/abilities/keyword/FearAbility.java b/Mage/src/mage/abilities/keyword/FearAbility.java index ab9e6c6ccbe..041d7c6d0eb 100644 --- a/Mage/src/mage/abilities/keyword/FearAbility.java +++ b/Mage/src/mage/abilities/keyword/FearAbility.java @@ -28,8 +28,8 @@ package mage.abilities.keyword; -import mage.Constants; -import mage.Constants.Duration; +import mage.constants.CardType; +import mage.constants.Duration; import mage.abilities.Ability; import mage.abilities.EvasionAbility; import mage.abilities.MageSingleton; @@ -91,7 +91,7 @@ class FearEffect extends RestrictionEffect implements MageSingleton @Override public boolean canBeBlocked(Permanent attacker, Permanent blocker, Ability source, Game game) { - if (blocker.getCardType().contains(Constants.CardType.ARTIFACT) || blocker.getColor().isBlack()) { + if (blocker.getCardType().contains(CardType.ARTIFACT) || blocker.getColor().isBlack()) { return true; } return false; diff --git a/Mage/src/mage/abilities/keyword/FirstStrikeAbility.java b/Mage/src/mage/abilities/keyword/FirstStrikeAbility.java index 6863ec49a10..267c0731fe8 100644 --- a/Mage/src/mage/abilities/keyword/FirstStrikeAbility.java +++ b/Mage/src/mage/abilities/keyword/FirstStrikeAbility.java @@ -28,7 +28,7 @@ package mage.abilities.keyword; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; diff --git a/Mage/src/mage/abilities/keyword/FlankingAbility.java b/Mage/src/mage/abilities/keyword/FlankingAbility.java index e5b0efb77c4..025d64dcf49 100644 --- a/Mage/src/mage/abilities/keyword/FlankingAbility.java +++ b/Mage/src/mage/abilities/keyword/FlankingAbility.java @@ -1,11 +1,12 @@ package mage.abilities.keyword; -import mage.Constants; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continious.BoostTargetEffect; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -21,7 +22,7 @@ import mage.target.targetpointer.FixedTarget; public class FlankingAbility extends TriggeredAbilityImpl { public FlankingAbility() { - super(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Constants.Duration.EndOfTurn), false); + super(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), false); } public FlankingAbility(final FlankingAbility ability) { diff --git a/Mage/src/mage/abilities/keyword/FlashAbility.java b/Mage/src/mage/abilities/keyword/FlashAbility.java index 51d52d64ba4..2a208a6a382 100644 --- a/Mage/src/mage/abilities/keyword/FlashAbility.java +++ b/Mage/src/mage/abilities/keyword/FlashAbility.java @@ -28,7 +28,7 @@ package mage.abilities.keyword; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; diff --git a/Mage/src/mage/abilities/keyword/FlashbackAbility.java b/Mage/src/mage/abilities/keyword/FlashbackAbility.java index b33156ec7de..3e1febeb538 100644 --- a/Mage/src/mage/abilities/keyword/FlashbackAbility.java +++ b/Mage/src/mage/abilities/keyword/FlashbackAbility.java @@ -27,9 +27,8 @@ */ package mage.abilities.keyword; -import mage.Constants; -import mage.Constants.SpellAbilityType; -import static mage.Constants.SpellAbilityType.SPLIT_LEFT; +import mage.constants.Outcome; +import mage.constants.SpellAbilityType; import mage.abilities.Ability; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.DelayedTriggeredAbility; @@ -40,6 +39,8 @@ import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.ExileSourceEffect; import mage.cards.Card; import mage.cards.SplitCard; +import mage.constants.TimingRule; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -52,12 +53,12 @@ import mage.target.Target; */ public class FlashbackAbility extends /*SpellAbility*/ ActivatedAbilityImpl { - private Constants.SpellAbilityType spellAbilityType; + private SpellAbilityType spellAbilityType; private String abilityName; - public FlashbackAbility(Cost cost, Constants.TimingRule timingRule) { + public FlashbackAbility(Cost cost, TimingRule timingRule) { //super(cost, "", new FlashbackEffect(), Constants.Zone.GRAVEYARD); - super(Constants.Zone.GRAVEYARD, new FlashbackEffect(), cost); + super(Zone.GRAVEYARD, new FlashbackEffect(), cost); this.timing = timingRule; this.usesStack = false; this.spellAbilityType = SpellAbilityType.BASE; @@ -120,7 +121,7 @@ public class FlashbackAbility extends /*SpellAbility*/ ActivatedAbilityImpl { public FlashbackEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = ""; } @@ -184,7 +185,7 @@ class FlashbackTriggeredAbility extends DelayedTriggeredAbility { private boolean usedFromExile = false; public HauntAbility(Card card, Effect effect) { - super(Constants.Zone.ALL, effect , false); + super(Zone.ALL, effect , false); card.addAbility(new HauntExileAbility()); } @@ -85,12 +84,12 @@ public class HauntAbility extends TriggeredAbilityImpl { public boolean checkTrigger(GameEvent event, Game game) { switch (event.getType()) { case ENTERS_THE_BATTLEFIELD: - if (game.getState().getZone(getSourceId()).equals(Constants.Zone.BATTLEFIELD)) { + if (game.getState().getZone(getSourceId()).equals(Zone.BATTLEFIELD)) { return event.getTargetId().equals(getSourceId()); } break; case ZONE_CHANGE: - if (!usedFromExile &&game.getState().getZone(getSourceId()).equals(Constants.Zone.EXILED)) { + if (!usedFromExile &&game.getState().getZone(getSourceId()).equals(Zone.EXILED)) { ZoneChangeEvent zEvent = (ZoneChangeEvent) event; if (zEvent.isDiesEvent()) { Card card = game.getCard(getSourceId()); @@ -124,7 +123,7 @@ class HauntExileAbility extends ZoneChangeTriggeredAbility { private final static String RULE_TEXT_CREATURE = "Haunt (When this creature dies, exile it haunting target creature.)"; public HauntExileAbility() { - super(Constants.Zone.BATTLEFIELD, Constants.Zone.GRAVEYARD, new HauntEffect(), null, false); + super(Zone.BATTLEFIELD, Zone.GRAVEYARD, new HauntEffect(), null, false); this.setRuleAtTheTop(true); this.addTarget(new TargetCreaturePermanent(true)); @@ -137,10 +136,10 @@ class HauntExileAbility extends ZoneChangeTriggeredAbility { @Override public boolean isInUseableZone(Game game, MageObject source, boolean checkLKI) { // check it was previously on battlefield - MageObject before = game.getLastKnownInformation(sourceId, Constants.Zone.BATTLEFIELD); + MageObject before = game.getLastKnownInformation(sourceId, Zone.BATTLEFIELD); // check now it is in graveyard - Constants.Zone after = game.getState().getZone(sourceId); - return before != null && after != null && Constants.Zone.GRAVEYARD.match(after); + Zone after = game.getState().getZone(sourceId); + return before != null && after != null && Zone.GRAVEYARD.match(after); } @Override @@ -157,7 +156,7 @@ class HauntExileAbility extends ZoneChangeTriggeredAbility { class HauntEffect extends OneShotEffect { public HauntEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); this.staticText = "exile it haunting target creature"; } diff --git a/Mage/src/mage/abilities/keyword/HexproofAbility.java b/Mage/src/mage/abilities/keyword/HexproofAbility.java index 164fb7827d9..900f9eba621 100644 --- a/Mage/src/mage/abilities/keyword/HexproofAbility.java +++ b/Mage/src/mage/abilities/keyword/HexproofAbility.java @@ -1,9 +1,10 @@ package mage.abilities.keyword; import java.io.ObjectStreamException; -import mage.Constants; + import mage.abilities.MageSingleton; import mage.abilities.common.SimpleStaticAbility; +import mage.constants.Zone; /** * Hexproof @@ -28,7 +29,7 @@ public class HexproofAbility extends SimpleStaticAbility implements MageSingleto } private HexproofAbility() { - super(Constants.Zone.BATTLEFIELD, null); + super(Zone.BATTLEFIELD, null); } @Override diff --git a/Mage/src/mage/abilities/keyword/IndestructibleAbility.java b/Mage/src/mage/abilities/keyword/IndestructibleAbility.java index c21d2e2ed76..a0a859ff437 100644 --- a/Mage/src/mage/abilities/keyword/IndestructibleAbility.java +++ b/Mage/src/mage/abilities/keyword/IndestructibleAbility.java @@ -1,85 +1,85 @@ -/* - * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation are those of the - * authors and should not be interpreted as representing official policies, either expressed - * or implied, of BetaSteward_at_googlemail.com. - */ -package mage.abilities.keyword; - -import java.io.ObjectStreamException; -import mage.Constants.Zone; -import mage.abilities.StaticAbility; - -/** - * OLD RULES: - * 700.4. If a permanent is indestructible, rules and effects can't destroy it. (See rule 701.6, "Destroy.") - * Such permanents are not destroyed by lethal damage, and they ignore the lethal-damage state-based action - * (see rule 704.5g). Rules or effects may cause an indestructible permanent to be sacrificed, put into a - * graveyard, or exiled. # - * - * 700.4a Although the text "[This permanent] is indestructible" is an ability, actually being - * indestructible is neither an ability nor a characteristic. It's just something that's true - * about a permanent. - * - * NEW RULES - * - * - * - * - * - * - * @author BetaSteward_at_googlemail.com - */ - -public class IndestructibleAbility extends StaticAbility { - - private static final IndestructibleAbility fINSTANCE; - - static { - fINSTANCE = new IndestructibleAbility(); - } - - private Object readResolve() throws ObjectStreamException { - return fINSTANCE; - } - - public static IndestructibleAbility getInstance() { - return fINSTANCE; - } - - private IndestructibleAbility() { - super(Zone.BATTLEFIELD, null); - } - - @Override - public IndestructibleAbility copy() { - return fINSTANCE; - } - - @Override - public String getRule() { - return "{this} is indestructible."; - } - -} +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.abilities.keyword; + +import java.io.ObjectStreamException; +import mage.constants.Zone; +import mage.abilities.StaticAbility; + +/** + * OLD RULES: + * 700.4. If a permanent is indestructible, rules and effects can't destroy it. (See rule 701.6, "Destroy.") + * Such permanents are not destroyed by lethal damage, and they ignore the lethal-damage state-based action + * (see rule 704.5g). Rules or effects may cause an indestructible permanent to be sacrificed, put into a + * graveyard, or exiled. # + * + * 700.4a Although the text "[This permanent] is indestructible" is an ability, actually being + * indestructible is neither an ability nor a characteristic. It's just something that's true + * about a permanent. + * + * NEW RULES + * + * + * + * + * + * + * @author BetaSteward_at_googlemail.com + */ + +public class IndestructibleAbility extends StaticAbility { + + private static final IndestructibleAbility fINSTANCE; + + static { + fINSTANCE = new IndestructibleAbility(); + } + + private Object readResolve() throws ObjectStreamException { + return fINSTANCE; + } + + public static IndestructibleAbility getInstance() { + return fINSTANCE; + } + + private IndestructibleAbility() { + super(Zone.BATTLEFIELD, null); + } + + @Override + public IndestructibleAbility copy() { + return fINSTANCE; + } + + @Override + public String getRule() { + return "{this} is indestructible."; + } + +} diff --git a/Mage/src/mage/abilities/keyword/InfectAbility.java b/Mage/src/mage/abilities/keyword/InfectAbility.java index d4d008d5239..9b60d0a33dc 100644 --- a/Mage/src/mage/abilities/keyword/InfectAbility.java +++ b/Mage/src/mage/abilities/keyword/InfectAbility.java @@ -28,7 +28,7 @@ package mage.abilities.keyword; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; diff --git a/Mage/src/mage/abilities/keyword/IntimidateAbility.java b/Mage/src/mage/abilities/keyword/IntimidateAbility.java index 19879b0a0ef..ce03ce63a06 100644 --- a/Mage/src/mage/abilities/keyword/IntimidateAbility.java +++ b/Mage/src/mage/abilities/keyword/IntimidateAbility.java @@ -1,10 +1,11 @@ package mage.abilities.keyword; -import mage.Constants; import mage.abilities.Ability; import mage.abilities.EvasionAbility; import mage.abilities.MageSingleton; import mage.abilities.effects.RestrictionEffect; +import mage.constants.CardType; +import mage.constants.Duration; import mage.game.Game; import mage.game.permanent.Permanent; @@ -32,7 +33,7 @@ public class IntimidateAbility extends EvasionAbility impleme class IntimidateEffect extends RestrictionEffect implements MageSingleton { public IntimidateEffect() { - super(Constants.Duration.WhileOnBattlefield); + super(Duration.WhileOnBattlefield); } public IntimidateEffect(final IntimidateEffect effect) { @@ -50,7 +51,7 @@ class IntimidateEffect extends RestrictionEffect implements Ma @Override public boolean canBeBlocked(Permanent attacker, Permanent blocker, Ability source, Game game) { boolean result = false; - if (blocker.getCardType().contains(Constants.CardType.ARTIFACT) && (blocker.getCardType().contains(Constants.CardType.CREATURE))) + if (blocker.getCardType().contains(CardType.ARTIFACT) && (blocker.getCardType().contains(CardType.CREATURE))) result = true; if (attacker.getColor().shares(blocker.getColor())) result = true; diff --git a/Mage/src/mage/abilities/keyword/KickerAbility.java b/Mage/src/mage/abilities/keyword/KickerAbility.java index 2364a62529a..12e08e9e6f3 100644 --- a/Mage/src/mage/abilities/keyword/KickerAbility.java +++ b/Mage/src/mage/abilities/keyword/KickerAbility.java @@ -31,8 +31,8 @@ package mage.abilities.keyword; import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import mage.Constants; -import mage.Constants.Zone; + +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.StaticAbility; @@ -42,6 +42,7 @@ import mage.abilities.costs.OptionalAdditionalCost; import mage.abilities.costs.OptionalAdditionalCostImpl; import mage.abilities.costs.OptionalAdditionalSourceCosts; import mage.abilities.costs.mana.ManaCostsImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; @@ -172,7 +173,7 @@ public class KickerAbility extends StaticAbility implements Optio times = Integer.toString(activated + 1) + (activated == 0 ? " time ":" times "); } if (kickerCost.canPay(sourceId, controllerId, game) && - player.chooseUse(Constants.Outcome.Benefit, new StringBuilder("Pay ").append(times).append(kickerCost.getText(false)).append(" ?").toString(), game)) { + player.chooseUse(Outcome.Benefit, new StringBuilder("Pay ").append(times).append(kickerCost.getText(false)).append(" ?").toString(), game)) { kickerCost.activate(); for (Iterator it = ((Costs) kickerCost).iterator(); it.hasNext();) { Cost cost = (Cost) it.next(); diff --git a/Mage/src/mage/abilities/keyword/LandwalkAbility.java b/Mage/src/mage/abilities/keyword/LandwalkAbility.java index d7c17086f63..96061ec5f55 100644 --- a/Mage/src/mage/abilities/keyword/LandwalkAbility.java +++ b/Mage/src/mage/abilities/keyword/LandwalkAbility.java @@ -28,7 +28,7 @@ package mage.abilities.keyword; -import mage.Constants.Duration; +import mage.constants.Duration; import mage.abilities.Ability; import mage.abilities.EvasionAbility; import mage.abilities.effects.RestrictionEffect; diff --git a/Mage/src/mage/abilities/keyword/LevelUpAbility.java b/Mage/src/mage/abilities/keyword/LevelUpAbility.java index d171a78f3ea..1a4a3872fbd 100644 --- a/Mage/src/mage/abilities/keyword/LevelUpAbility.java +++ b/Mage/src/mage/abilities/keyword/LevelUpAbility.java @@ -28,8 +28,8 @@ package mage.abilities.keyword; -import mage.Constants.TimingRule; -import mage.Constants.Zone; +import mage.constants.TimingRule; +import mage.constants.Zone; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.mana.ManaCosts; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage/src/mage/abilities/keyword/LevelerCardBuilder.java b/Mage/src/mage/abilities/keyword/LevelerCardBuilder.java index eb986474c01..6c6d73bf5a0 100644 --- a/Mage/src/mage/abilities/keyword/LevelerCardBuilder.java +++ b/Mage/src/mage/abilities/keyword/LevelerCardBuilder.java @@ -28,8 +28,7 @@ package mage.abilities.keyword; -import mage.Constants; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; import mage.abilities.Ability; @@ -42,6 +41,7 @@ import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect; import mage.cards.Card; import mage.cards.LevelerCard; +import mage.constants.Duration; import mage.counters.CounterType; import java.util.ArrayList; @@ -80,7 +80,7 @@ public class LevelerCardBuilder { constructed.add(new SimpleStaticAbility(Zone.BATTLEFIELD, abEffect)); } - ContinuousEffect effect = new SetPowerToughnessSourceEffect(power, toughness, Constants.Duration.WhileOnBattlefield); + ContinuousEffect effect = new SetPowerToughnessSourceEffect(power, toughness, Duration.WhileOnBattlefield); ConditionalContinousEffect ptEffect = new ConditionalContinousEffect(effect, condition, rule); constructed.add(new SimpleStaticAbility(Zone.BATTLEFIELD, ptEffect)); diff --git a/Mage/src/mage/abilities/keyword/LeylineAbility.java b/Mage/src/mage/abilities/keyword/LeylineAbility.java index 4ab1dfda592..7453b93775a 100644 --- a/Mage/src/mage/abilities/keyword/LeylineAbility.java +++ b/Mage/src/mage/abilities/keyword/LeylineAbility.java @@ -28,7 +28,7 @@ package mage.abilities.keyword; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; diff --git a/Mage/src/mage/abilities/keyword/LifelinkAbility.java b/Mage/src/mage/abilities/keyword/LifelinkAbility.java index fab7d6da70c..1a32d24c9be 100644 --- a/Mage/src/mage/abilities/keyword/LifelinkAbility.java +++ b/Mage/src/mage/abilities/keyword/LifelinkAbility.java @@ -28,7 +28,7 @@ package mage.abilities.keyword; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; diff --git a/Mage/src/mage/abilities/keyword/LivingWeaponAbility.java b/Mage/src/mage/abilities/keyword/LivingWeaponAbility.java index 4e3bbe3a713..7cf153e2aa7 100644 --- a/Mage/src/mage/abilities/keyword/LivingWeaponAbility.java +++ b/Mage/src/mage/abilities/keyword/LivingWeaponAbility.java @@ -1,11 +1,12 @@ package mage.abilities.keyword; -import mage.Constants; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; @@ -32,7 +33,7 @@ public class LivingWeaponAbility extends EntersBattlefieldTriggeredAbility { class LivingWeaponEffect extends OneShotEffect { LivingWeaponEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); } LivingWeaponEffect(final LivingWeaponEffect effect) { @@ -59,7 +60,7 @@ class LivingWeaponEffect extends OneShotEffect { class GermToken extends Token { public GermToken() { super("Germ", "a 0/0 black Germ creature token"); - cardType.add(Constants.CardType.CREATURE); + cardType.add(CardType.CREATURE); color = ObjectColor.BLACK; subtype.add("Germ"); power = new MageInt(0); diff --git a/Mage/src/mage/abilities/keyword/MadnessAbility.java b/Mage/src/mage/abilities/keyword/MadnessAbility.java index 0311794fc81..3f7555d9ffb 100644 --- a/Mage/src/mage/abilities/keyword/MadnessAbility.java +++ b/Mage/src/mage/abilities/keyword/MadnessAbility.java @@ -1,6 +1,5 @@ package mage.abilities.keyword; -import mage.Constants; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.Mode; @@ -12,6 +11,7 @@ import mage.abilities.costs.mana.ManaCost; import mage.abilities.effects.AsThoughEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; @@ -40,9 +40,9 @@ public class MadnessAbility extends StaticAbility { private Cost madnessCost; public MadnessAbility(Card card, Cost cost) { - super(Constants.Zone.STACK, null); + super(Zone.STACK, null); this.madnessCost = cost; - card.addAbility(new SimpleStaticAbility(Constants.Zone.EXILED, new MadnessPlayEffect(cost))); + card.addAbility(new SimpleStaticAbility(Zone.EXILED, new MadnessPlayEffect(cost))); card.addAbility(new MadnessTriggeredAbility()); card.addWatcher(new MadnessCleanUpWatcher()); } @@ -79,7 +79,7 @@ class MadnessPlayEffect extends AsThoughEffectImpl { private Cost cost; public MadnessPlayEffect(Cost cost) { - super(Constants.AsThoughEffectType.CAST, Constants.Duration.EndOfGame, Constants.Outcome.Benefit); + super(AsThoughEffectType.CAST, Duration.EndOfGame, Outcome.Benefit); staticText = null; this.cost = cost; } @@ -103,7 +103,7 @@ class MadnessPlayEffect extends AsThoughEffectImpl { public boolean applies(UUID sourceId, Ability source, Game game) { if (sourceId.equals(source.getSourceId())) { Card card = game.getCard(source.getSourceId()); - if (card != null && card.getOwnerId().equals(source.getControllerId()) && game.getState().getZone(source.getSourceId()) == Constants.Zone.EXILED) { + if (card != null && card.getOwnerId().equals(source.getControllerId()) && game.getState().getZone(source.getSourceId()) == Zone.EXILED) { Object object = game.getState().getValue("madness_" + card.getId()); if (object != null && object.equals(true)) { Object alfreadyConfirmed = game.getState().getValue("madness_ok_" + card.getId()); @@ -112,7 +112,7 @@ class MadnessPlayEffect extends AsThoughEffectImpl { } Player player = game.getPlayer(card.getOwnerId()); String message = "Cast " + card.getName() + " by its madness cost?"; - if (player != null && player.chooseUse(Constants.Outcome.Benefit, message, game)) { + if (player != null && player.chooseUse(Outcome.Benefit, message, game)) { Cost costToPay = cost.copy(); card.getSpellAbility().getManaCostsToPay().clear(); card.getSpellAbility().getManaCostsToPay().add((ManaCost)costToPay); @@ -135,7 +135,7 @@ class MadnessPlayEffect extends AsThoughEffectImpl { class MadnessTriggeredAbility extends TriggeredAbilityImpl { MadnessTriggeredAbility() { - super(Constants.Zone.GRAVEYARD, new MadnessExileEffect(), true); + super(Zone.GRAVEYARD, new MadnessExileEffect(), true); } MadnessTriggeredAbility(final MadnessTriggeredAbility ability) { @@ -175,7 +175,7 @@ class MadnessTriggeredAbility extends TriggeredAbilityImpl { public MadnessExileEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); } public MadnessExileEffect(final MadnessExileEffect effect) { @@ -217,7 +217,7 @@ class MadnessExileEffect extends OneShotEffect { class MadnessCleanUpWatcher extends WatcherImpl { public MadnessCleanUpWatcher() { - super("MadnessPlayWasCanceled", Constants.WatcherScope.GAME); + super("MadnessPlayWasCanceled", WatcherScope.GAME); } public MadnessCleanUpWatcher(final MadnessCleanUpWatcher watcher) { @@ -239,7 +239,7 @@ class MadnessCleanUpWatcher extends WatcherImpl { // reset game.getState().setValue("madness_" + card.getId(), null); game.getState().setValue("madness_ok_" + card.getId(), null); - card.moveToZone(Constants.Zone.GRAVEYARD, sourceId, game, true); + card.moveToZone(Zone.GRAVEYARD, sourceId, game, true); } } } diff --git a/Mage/src/mage/abilities/keyword/MiracleAbility.java b/Mage/src/mage/abilities/keyword/MiracleAbility.java index 41c0d779c1f..fe2e658edeb 100644 --- a/Mage/src/mage/abilities/keyword/MiracleAbility.java +++ b/Mage/src/mage/abilities/keyword/MiracleAbility.java @@ -28,7 +28,7 @@ package mage.abilities.keyword; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.StaticAbility; import mage.abilities.costs.Cost; diff --git a/Mage/src/mage/abilities/keyword/ModularAbility.java b/Mage/src/mage/abilities/keyword/ModularAbility.java index d2e2af48c0c..216c55a71dd 100644 --- a/Mage/src/mage/abilities/keyword/ModularAbility.java +++ b/Mage/src/mage/abilities/keyword/ModularAbility.java @@ -1,9 +1,8 @@ package mage.abilities.keyword; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.StaticAbility; @@ -58,7 +57,7 @@ public class ModularAbility extends DiesTriggeredAbility { @Override public boolean checkTrigger(GameEvent event, Game game) { - MageObject before = game.getLastKnownInformation(sourceId, Constants.Zone.BATTLEFIELD); + MageObject before = game.getLastKnownInformation(sourceId, Zone.BATTLEFIELD); if (before != null && ((Permanent) before).getCounters().getCount(CounterType.P1P1) > 0) { return super.checkTrigger(event, game); } @@ -80,7 +79,7 @@ public class ModularAbility extends DiesTriggeredAbility { class ModularStaticAbility extends StaticAbility { public ModularStaticAbility(int amount) { - super(Constants.Zone.BATTLEFIELD, new EntersBattlefieldEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance(amount)))); + super(Zone.BATTLEFIELD, new EntersBattlefieldEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance(amount)))); } public ModularStaticAbility(final ModularStaticAbility ability) { diff --git a/Mage/src/mage/abilities/keyword/NinjutsuAbility.java b/Mage/src/mage/abilities/keyword/NinjutsuAbility.java index 27dd017d284..010de9c6807 100644 --- a/Mage/src/mage/abilities/keyword/NinjutsuAbility.java +++ b/Mage/src/mage/abilities/keyword/NinjutsuAbility.java @@ -29,8 +29,8 @@ package mage.abilities.keyword; import java.util.UUID; -import mage.Constants; -import mage.Constants.Zone; + +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.Cost; @@ -40,6 +40,7 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.UnblockedPredicate; import mage.game.Game; @@ -101,7 +102,7 @@ public class NinjutsuAbility extends ActivatedAbilityImpl { class NinjutsuEffect extends OneShotEffect { public NinjutsuEffect() { - super(Constants.Outcome.PutCreatureInPlay); + super(Outcome.PutCreatureInPlay); this.staticText = "Put this card onto the battlefield from your hand tapped and attacking"; } @@ -118,7 +119,7 @@ class NinjutsuEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Card card = game.getCard(source.getSourceId()); if (card != null) { - card.putOntoBattlefield(game, Constants.Zone.HAND, source.getId(), source.getControllerId()); + card.putOntoBattlefield(game, Zone.HAND, source.getId(), source.getControllerId()); Permanent permanent = game.getPermanent(source.getSourceId()); if (permanent != null) { UUID defendingPlayerId = null; @@ -154,7 +155,7 @@ class ReturnAttackerToHandTargetCost extends CostImpl manaCostsToReduce; OfferingCostReductionEffect (UUID spellAbilityId, ManaCosts manaCostsToReduce, UUID activationId) { - super(Constants.Duration.OneUse, Constants.Outcome.Benefit); + super(Duration.OneUse, Outcome.Benefit); this.spellAbilityId = spellAbilityId; this.manaCostsToReduce = manaCostsToReduce; this.activationId = activationId; diff --git a/Mage/src/mage/abilities/keyword/PersistAbility.java b/Mage/src/mage/abilities/keyword/PersistAbility.java index a50ce33fdcc..e1bdbfa8aeb 100644 --- a/Mage/src/mage/abilities/keyword/PersistAbility.java +++ b/Mage/src/mage/abilities/keyword/PersistAbility.java @@ -1,13 +1,13 @@ package mage.abilities.keyword; -import mage.Constants; -import mage.Constants.Duration; -import mage.Constants.Outcome; +import mage.constants.Duration; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffect; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; @@ -32,7 +32,7 @@ public class PersistAbility extends DiesTriggeredAbility { @Override public boolean checkTrigger(GameEvent event, Game game) { if (super.checkTrigger(event, game)) { - Permanent p = (Permanent) game.getLastKnownInformation(event.getTargetId(), Constants.Zone.BATTLEFIELD); + Permanent p = (Permanent) game.getLastKnownInformation(event.getTargetId(), Zone.BATTLEFIELD); if (p.getCounters().getCount(CounterType.M1M1) == 0) { game.getState().setValue(new StringBuilder("persist").append(getSourceId()).toString(), new FixedTarget(p.getId())); return true; diff --git a/Mage/src/mage/abilities/keyword/PhasingAbility.java b/Mage/src/mage/abilities/keyword/PhasingAbility.java index 952abfc51b7..87ac969f53d 100644 --- a/Mage/src/mage/abilities/keyword/PhasingAbility.java +++ b/Mage/src/mage/abilities/keyword/PhasingAbility.java @@ -28,7 +28,7 @@ package mage.abilities.keyword; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; diff --git a/Mage/src/mage/abilities/keyword/ProtectionAbility.java b/Mage/src/mage/abilities/keyword/ProtectionAbility.java index 40f7b2b15fd..05cff8cd1b9 100644 --- a/Mage/src/mage/abilities/keyword/ProtectionAbility.java +++ b/Mage/src/mage/abilities/keyword/ProtectionAbility.java @@ -28,7 +28,7 @@ package mage.abilities.keyword; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.MageObject; import mage.abilities.StaticAbility; import mage.cards.Card; diff --git a/Mage/src/mage/abilities/keyword/ReachAbility.java b/Mage/src/mage/abilities/keyword/ReachAbility.java index 91536bd1d63..aa310f6afbf 100644 --- a/Mage/src/mage/abilities/keyword/ReachAbility.java +++ b/Mage/src/mage/abilities/keyword/ReachAbility.java @@ -28,7 +28,7 @@ package mage.abilities.keyword; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; diff --git a/Mage/src/mage/abilities/keyword/ReboundAbility.java b/Mage/src/mage/abilities/keyword/ReboundAbility.java index 6a22ccee1f7..b6b6010ede6 100644 --- a/Mage/src/mage/abilities/keyword/ReboundAbility.java +++ b/Mage/src/mage/abilities/keyword/ReboundAbility.java @@ -28,9 +28,9 @@ package mage.abilities.keyword; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Zone; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; diff --git a/Mage/src/mage/abilities/keyword/ReinforceAbility.java b/Mage/src/mage/abilities/keyword/ReinforceAbility.java index 873eab6a283..a1a634d8af1 100644 --- a/Mage/src/mage/abilities/keyword/ReinforceAbility.java +++ b/Mage/src/mage/abilities/keyword/ReinforceAbility.java @@ -1,11 +1,11 @@ package mage.abilities.keyword; -import mage.Constants; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.Cost; import mage.abilities.costs.common.DiscardSourceCost; import mage.abilities.effects.common.counter.AddCountersTargetEffect; +import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; @@ -14,7 +14,7 @@ public class ReinforceAbility extends SimpleActivatedAbility { private Cost cost; public ReinforceAbility(int count, Cost cost) { - super(Constants.Zone.HAND, new AddCountersTargetEffect(CounterType.P1P1.createInstance(count)), cost); + super(Zone.HAND, new AddCountersTargetEffect(CounterType.P1P1.createInstance(count)), cost); this.addCost(new DiscardSourceCost()); this.addTarget(new TargetCreaturePermanent()); this.cost = cost.copy(); diff --git a/Mage/src/mage/abilities/keyword/RetraceAbility.java b/Mage/src/mage/abilities/keyword/RetraceAbility.java index fd3142b5571..cb15ed79647 100644 --- a/Mage/src/mage/abilities/keyword/RetraceAbility.java +++ b/Mage/src/mage/abilities/keyword/RetraceAbility.java @@ -27,13 +27,15 @@ */ package mage.abilities.keyword; -import mage.Constants; import mage.abilities.Ability; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.Cost; import mage.abilities.costs.common.DiscardTargetCost; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; +import mage.constants.Outcome; +import mage.constants.TimingRule; +import mage.constants.Zone; import mage.filter.common.FilterLandCard; import mage.game.Game; import mage.players.Player; @@ -47,8 +49,8 @@ import mage.target.common.TargetCardInHand; */ public class RetraceAbility extends ActivatedAbilityImpl { - public RetraceAbility(Cost cost, Constants.TimingRule timingRule) { - super(Constants.Zone.GRAVEYARD, new RetraceEffect(), cost); + public RetraceAbility(Cost cost, TimingRule timingRule) { + super(Zone.GRAVEYARD, new RetraceEffect(), cost); super.addCost(new DiscardTargetCost(new TargetCardInHand(new FilterLandCard()))); this.timing = timingRule; this.usesStack = false; @@ -73,7 +75,7 @@ public class RetraceAbility extends ActivatedAbilityImpl { class RetraceEffect extends OneShotEffect { public RetraceEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = ""; } diff --git a/Mage/src/mage/abilities/keyword/ScavengeAbility.java b/Mage/src/mage/abilities/keyword/ScavengeAbility.java index e5e1075a03e..b07f0a4ee87 100644 --- a/Mage/src/mage/abilities/keyword/ScavengeAbility.java +++ b/Mage/src/mage/abilities/keyword/ScavengeAbility.java @@ -28,9 +28,9 @@ package mage.abilities.keyword; -import mage.Constants; -import mage.Constants.TimingRule; -import mage.Constants.Zone; +import mage.constants.Outcome; +import mage.constants.TimingRule; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.common.ExileSourceFromGraveCost; @@ -85,7 +85,7 @@ public class ScavengeAbility extends ActivatedAbilityImpl { class ScavengeEffect extends OneShotEffect { ScavengeEffect() { - super(Constants.Outcome.BoostCreature); + super(Outcome.BoostCreature); } ScavengeEffect(final ScavengeEffect effect) { diff --git a/Mage/src/mage/abilities/keyword/ShadowAbility.java b/Mage/src/mage/abilities/keyword/ShadowAbility.java index c0922bc6001..b1db9ec2169 100644 --- a/Mage/src/mage/abilities/keyword/ShadowAbility.java +++ b/Mage/src/mage/abilities/keyword/ShadowAbility.java @@ -1,10 +1,10 @@ package mage.abilities.keyword; -import mage.Constants; import mage.abilities.Ability; import mage.abilities.EvasionAbility; import mage.abilities.MageSingleton; import mage.abilities.effects.RestrictionEffect; +import mage.constants.Duration; import mage.game.Game; import mage.game.permanent.Permanent; @@ -44,7 +44,7 @@ public class ShadowAbility extends EvasionAbility implements Mage class ShadowEffect extends RestrictionEffect implements MageSingleton { public ShadowEffect() { - super(Constants.Duration.EndOfGame); + super(Duration.EndOfGame); } public ShadowEffect(final ShadowEffect effect) { diff --git a/Mage/src/mage/abilities/keyword/ShroudAbility.java b/Mage/src/mage/abilities/keyword/ShroudAbility.java index a8b964ed87d..5d02956085f 100644 --- a/Mage/src/mage/abilities/keyword/ShroudAbility.java +++ b/Mage/src/mage/abilities/keyword/ShroudAbility.java @@ -28,7 +28,7 @@ package mage.abilities.keyword; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; diff --git a/Mage/src/mage/abilities/keyword/SoulbondAbility.java b/Mage/src/mage/abilities/keyword/SoulbondAbility.java index 87918aa20b4..14dd67319d2 100644 --- a/Mage/src/mage/abilities/keyword/SoulbondAbility.java +++ b/Mage/src/mage/abilities/keyword/SoulbondAbility.java @@ -28,7 +28,7 @@ package mage.abilities.keyword; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; diff --git a/Mage/src/mage/abilities/keyword/SplitSecondAbility.java b/Mage/src/mage/abilities/keyword/SplitSecondAbility.java index baaa76674e3..a06e9d3c7e5 100644 --- a/Mage/src/mage/abilities/keyword/SplitSecondAbility.java +++ b/Mage/src/mage/abilities/keyword/SplitSecondAbility.java @@ -1,11 +1,13 @@ package mage.abilities.keyword; -import mage.Constants; import mage.abilities.Ability; import mage.abilities.MageSingleton; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.mana.ManaAbility; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -23,7 +25,7 @@ public class SplitSecondAbility extends SimpleStaticAbility implements MageSingl } private SplitSecondAbility() { - super(Constants.Zone.STACK, new SplitSecondEffect()); + super(Zone.STACK, new SplitSecondEffect()); this.setRuleAtTheTop(true); } @@ -40,7 +42,7 @@ public class SplitSecondAbility extends SimpleStaticAbility implements MageSingl class SplitSecondEffect extends ReplacementEffectImpl implements MageSingleton { SplitSecondEffect() { - super(Constants.Duration.WhileOnStack, Constants.Outcome.Detriment); + super(Duration.WhileOnStack, Outcome.Detriment); } SplitSecondEffect(final SplitSecondEffect effect) { diff --git a/Mage/src/mage/abilities/keyword/StormAbility.java b/Mage/src/mage/abilities/keyword/StormAbility.java index 323797f1f78..700b1128705 100644 --- a/Mage/src/mage/abilities/keyword/StormAbility.java +++ b/Mage/src/mage/abilities/keyword/StormAbility.java @@ -28,11 +28,12 @@ package mage.abilities.keyword; -import mage.Constants; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.stack.Spell; @@ -48,7 +49,7 @@ import mage.watchers.common.CastSpellLastTurnWatcher; public class StormAbility extends TriggeredAbilityImpl { public StormAbility() { - super(Constants.Zone.STACK, new StormEffect()); + super(Zone.STACK, new StormEffect()); } private StormAbility(final StormAbility ability) { @@ -82,7 +83,7 @@ public class StormAbility extends TriggeredAbilityImpl { class StormEffect extends OneShotEffect { public StormEffect() { - super(Constants.Outcome.Copy); + super(Outcome.Copy); } public StormEffect(final StormEffect effect) { diff --git a/Mage/src/mage/abilities/keyword/SunburstAbility.java b/Mage/src/mage/abilities/keyword/SunburstAbility.java index 5653f2ca313..c399361a14a 100644 --- a/Mage/src/mage/abilities/keyword/SunburstAbility.java +++ b/Mage/src/mage/abilities/keyword/SunburstAbility.java @@ -28,12 +28,13 @@ package mage.abilities.keyword; -import mage.Constants; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.SunburstCount; import mage.abilities.effects.OneShotEffect; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.counters.Counter; import mage.counters.CounterType; import mage.game.Game; @@ -76,7 +77,7 @@ class SunburstEffect extends OneShotEffect { public SunburstEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "Sunburst"; } @@ -89,7 +90,7 @@ class SunburstEffect extends OneShotEffect { Permanent permanent = game.getPermanent(source.getSourceId()); if (permanent != null) { Counter counter; - if(permanent.getCardType().contains(Constants.CardType.CREATURE)){ + if(permanent.getCardType().contains(CardType.CREATURE)){ counter = CounterType.P1P1.createInstance(amount.calculate(game, source)); } else{ diff --git a/Mage/src/mage/abilities/keyword/SuspendAbility.java b/Mage/src/mage/abilities/keyword/SuspendAbility.java index f76a9866b2c..0510cbe2d42 100644 --- a/Mage/src/mage/abilities/keyword/SuspendAbility.java +++ b/Mage/src/mage/abilities/keyword/SuspendAbility.java @@ -29,14 +29,14 @@ package mage.abilities.keyword; import java.util.UUID; -import mage.Constants.AsThoughEffectType; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; -import mage.Constants.Outcome; -import mage.Constants.SubLayer; -import mage.Constants.TargetController; -import mage.Constants.Zone; +import mage.constants.AsThoughEffectType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.ActivatedAbilityImpl; diff --git a/Mage/src/mage/abilities/keyword/TotemArmorAbility.java b/Mage/src/mage/abilities/keyword/TotemArmorAbility.java index aada14d9627..118c2a78dc3 100644 --- a/Mage/src/mage/abilities/keyword/TotemArmorAbility.java +++ b/Mage/src/mage/abilities/keyword/TotemArmorAbility.java @@ -28,10 +28,12 @@ package mage.abilities.keyword; -import mage.Constants; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -49,7 +51,7 @@ import mage.game.permanent.Permanent; public class TotemArmorAbility extends SimpleStaticAbility { public TotemArmorAbility() { - super(Constants.Zone.BATTLEFIELD, new TotemArmorEffect()); + super(Zone.BATTLEFIELD, new TotemArmorEffect()); } public TotemArmorAbility(final TotemArmorAbility ability) { @@ -69,7 +71,7 @@ public class TotemArmorAbility extends SimpleStaticAbility { class TotemArmorEffect extends ReplacementEffectImpl { TotemArmorEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); } TotemArmorEffect(final TotemArmorEffect effect) { diff --git a/Mage/src/mage/abilities/keyword/TrampleAbility.java b/Mage/src/mage/abilities/keyword/TrampleAbility.java index 737d6728163..478460aebeb 100644 --- a/Mage/src/mage/abilities/keyword/TrampleAbility.java +++ b/Mage/src/mage/abilities/keyword/TrampleAbility.java @@ -28,7 +28,7 @@ package mage.abilities.keyword; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; diff --git a/Mage/src/mage/abilities/keyword/TransformAbility.java b/Mage/src/mage/abilities/keyword/TransformAbility.java index 01f9da3c200..ef8be147c5c 100644 --- a/Mage/src/mage/abilities/keyword/TransformAbility.java +++ b/Mage/src/mage/abilities/keyword/TransformAbility.java @@ -27,12 +27,12 @@ */ package mage.abilities.keyword; -import mage.Constants; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.Card; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; @@ -45,7 +45,7 @@ public class TransformAbility extends SimpleStaticAbility { public static final String TWO_OR_MORE_SPELLS_TRANSFORM_RULE = "At the beginning of each upkeep, if a player cast two or more spells last turn, transform {this}."; public TransformAbility() { - super(Constants.Zone.BATTLEFIELD, new TransformEffect()); + super(Zone.BATTLEFIELD, new TransformEffect()); } public TransformAbility(final TransformAbility ability) { @@ -73,7 +73,7 @@ public class TransformAbility extends SimpleStaticAbility { permanent.getManaCost().clear(); permanent.getManaCost().add(sourceCard.getManaCost()); permanent.getCardType().clear(); - for (Constants.CardType type : sourceCard.getCardType()) { + for (CardType type : sourceCard.getCardType()) { permanent.getCardType().add(type); } permanent.getSubtype().clear(); @@ -97,7 +97,7 @@ public class TransformAbility extends SimpleStaticAbility { class TransformEffect extends ContinuousEffectImpl { public TransformEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Layer.CopyEffects_1, Constants.SubLayer.NA, Constants.Outcome.BecomeCreature); + super(Duration.WhileOnBattlefield, Layer.CopyEffects_1, SubLayer.NA, Outcome.BecomeCreature); staticText = ""; } diff --git a/Mage/src/mage/abilities/keyword/TransmuteAbility.java b/Mage/src/mage/abilities/keyword/TransmuteAbility.java index 4b742725354..73451cad389 100644 --- a/Mage/src/mage/abilities/keyword/TransmuteAbility.java +++ b/Mage/src/mage/abilities/keyword/TransmuteAbility.java @@ -1,6 +1,5 @@ package mage.abilities.keyword; -import mage.Constants; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.DiscardSourceCost; @@ -9,6 +8,8 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.Filter; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; @@ -23,7 +24,7 @@ import java.util.UUID; */ public class TransmuteAbility extends SimpleActivatedAbility { public TransmuteAbility(String manaCost) { - super(Constants.Zone.HAND, new TransmuteEffect(), new ManaCostsImpl(manaCost)); + super(Zone.HAND, new TransmuteEffect(), new ManaCostsImpl(manaCost)); this.addCost(new DiscardSourceCost()); } @@ -46,7 +47,7 @@ public class TransmuteAbility extends SimpleActivatedAbility { class TransmuteEffect extends OneShotEffect { TransmuteEffect() { - super(Constants.Outcome.Benefit); + super(Outcome.Benefit); staticText = "Transmute"; } @@ -69,7 +70,7 @@ class TransmuteEffect extends OneShotEffect { for (UUID cardId : target.getTargets()) { Card card = player.getLibrary().remove(cardId, game); if (card != null) { - card.moveToZone(Constants.Zone.HAND, source.getId(), game, false); + card.moveToZone(Zone.HAND, source.getId(), game, false); revealed.add(card); } } diff --git a/Mage/src/mage/abilities/keyword/UndyingAbility.java b/Mage/src/mage/abilities/keyword/UndyingAbility.java index e4c4141a4a2..88b20d6d017 100644 --- a/Mage/src/mage/abilities/keyword/UndyingAbility.java +++ b/Mage/src/mage/abilities/keyword/UndyingAbility.java @@ -1,13 +1,13 @@ package mage.abilities.keyword; -import mage.Constants; -import mage.Constants.Duration; -import mage.Constants.Outcome; +import mage.constants.Duration; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffect; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; @@ -36,7 +36,7 @@ public class UndyingAbility extends DiesTriggeredAbility { @Override public boolean checkTrigger(GameEvent event, Game game) { if (super.checkTrigger(event, game)) { - Permanent p = (Permanent) game.getLastKnownInformation(event.getTargetId(), Constants.Zone.BATTLEFIELD); + Permanent p = (Permanent) game.getLastKnownInformation(event.getTargetId(), Zone.BATTLEFIELD); if (!p.getCounters().containsKey(CounterType.P1P1) || p.getCounters().getCount(CounterType.P1P1) == 0) { game.getState().setValue(new StringBuilder("undying").append(getSourceId()).toString(), new FixedTarget(p.getId())); return true; diff --git a/Mage/src/mage/abilities/keyword/UnearthAbility.java b/Mage/src/mage/abilities/keyword/UnearthAbility.java index 3636ae087fa..4d08f2ca605 100644 --- a/Mage/src/mage/abilities/keyword/UnearthAbility.java +++ b/Mage/src/mage/abilities/keyword/UnearthAbility.java @@ -28,10 +28,10 @@ package mage.abilities.keyword; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.TimingRule; -import mage.Constants.Zone; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.TimingRule; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.DelayedTriggeredAbility; diff --git a/Mage/src/mage/abilities/keyword/UnleashAbility.java b/Mage/src/mage/abilities/keyword/UnleashAbility.java index 1de4346ed26..9720261e6de 100644 --- a/Mage/src/mage/abilities/keyword/UnleashAbility.java +++ b/Mage/src/mage/abilities/keyword/UnleashAbility.java @@ -27,14 +27,14 @@ */ package mage.abilities.keyword; -import mage.Constants; -import mage.Constants.Duration; -import mage.Constants.Outcome; +import mage.constants.Duration; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.RestrictionEffect; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; @@ -58,7 +58,7 @@ import mage.players.Player; public class UnleashAbility extends SimpleStaticAbility { public UnleashAbility() { - super(Constants.Zone.ALL, new UnleashReplacementEffect()); + super(Zone.ALL, new UnleashReplacementEffect()); this.addEffect(new UnleashRestrictionEffect()); } @@ -80,7 +80,7 @@ import mage.players.Player; class UnleashReplacementEffect extends ReplacementEffectImpl { public UnleashReplacementEffect() { - super(Constants.Duration.EndOfGame, Outcome.Detriment); + super(Duration.EndOfGame, Outcome.Detriment); } public UnleashReplacementEffect(UnleashReplacementEffect effect) { diff --git a/Mage/src/mage/abilities/keyword/VanishingSacrificeAbility.java b/Mage/src/mage/abilities/keyword/VanishingSacrificeAbility.java index 89ee4c9038c..007649b33a4 100644 --- a/Mage/src/mage/abilities/keyword/VanishingSacrificeAbility.java +++ b/Mage/src/mage/abilities/keyword/VanishingSacrificeAbility.java @@ -1,8 +1,8 @@ package mage.abilities.keyword; -import mage.Constants; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.SacrificeSourceEffect; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; @@ -10,7 +10,7 @@ import mage.game.permanent.Permanent; public class VanishingSacrificeAbility extends TriggeredAbilityImpl { public VanishingSacrificeAbility() { - super(Constants.Zone.BATTLEFIELD, new SacrificeSourceEffect()); + super(Zone.BATTLEFIELD, new SacrificeSourceEffect()); } public VanishingSacrificeAbility(final VanishingSacrificeAbility ability) { diff --git a/Mage/src/mage/abilities/keyword/VanishingUpkeepAbility.java b/Mage/src/mage/abilities/keyword/VanishingUpkeepAbility.java index 10b87bef001..ab4791132bc 100644 --- a/Mage/src/mage/abilities/keyword/VanishingUpkeepAbility.java +++ b/Mage/src/mage/abilities/keyword/VanishingUpkeepAbility.java @@ -1,16 +1,17 @@ package mage.abilities.keyword; -import mage.Constants; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; public class VanishingUpkeepAbility extends BeginningOfUpkeepTriggeredAbility { public VanishingUpkeepAbility() { - super(new VanishingEffect(), Constants.TargetController.YOU, false); + super(new VanishingEffect(), TargetController.YOU, false); } public VanishingUpkeepAbility(final VanishingUpkeepAbility ability) { @@ -30,7 +31,7 @@ public class VanishingUpkeepAbility extends BeginningOfUpkeepTriggeredAbility { class VanishingEffect extends OneShotEffect { VanishingEffect() { - super(Constants.Outcome.Sacrifice); + super(Outcome.Sacrifice); } VanishingEffect(final VanishingEffect effect) { diff --git a/Mage/src/mage/abilities/keyword/VigilanceAbility.java b/Mage/src/mage/abilities/keyword/VigilanceAbility.java index 38e8d2d4d2b..33e4a035f8b 100644 --- a/Mage/src/mage/abilities/keyword/VigilanceAbility.java +++ b/Mage/src/mage/abilities/keyword/VigilanceAbility.java @@ -28,7 +28,7 @@ package mage.abilities.keyword; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; diff --git a/Mage/src/mage/abilities/keyword/WitherAbility.java b/Mage/src/mage/abilities/keyword/WitherAbility.java index 5d57f487987..7ce1431b28e 100644 --- a/Mage/src/mage/abilities/keyword/WitherAbility.java +++ b/Mage/src/mage/abilities/keyword/WitherAbility.java @@ -28,7 +28,7 @@ package mage.abilities.keyword; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; diff --git a/Mage/src/mage/abilities/mana/ActivateIfConditionManaAbility.java b/Mage/src/mage/abilities/mana/ActivateIfConditionManaAbility.java index dc3aa3cd7ea..e393e76cb2d 100644 --- a/Mage/src/mage/abilities/mana/ActivateIfConditionManaAbility.java +++ b/Mage/src/mage/abilities/mana/ActivateIfConditionManaAbility.java @@ -29,7 +29,7 @@ package mage.abilities.mana; import java.util.UUID; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.condition.Condition; import mage.abilities.costs.Cost; import mage.abilities.effects.common.BasicManaEffect; diff --git a/Mage/src/mage/abilities/mana/ActivateOncePerTurnManaAbility.java b/Mage/src/mage/abilities/mana/ActivateOncePerTurnManaAbility.java index 02724abe91d..915cdb1e2e1 100644 --- a/Mage/src/mage/abilities/mana/ActivateOncePerTurnManaAbility.java +++ b/Mage/src/mage/abilities/mana/ActivateOncePerTurnManaAbility.java @@ -29,7 +29,7 @@ package mage.abilities.mana; import java.util.UUID; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.costs.Cost; import mage.abilities.effects.common.ManaEffect; import mage.game.Game; diff --git a/Mage/src/mage/abilities/mana/AnyColorManaAbility.java b/Mage/src/mage/abilities/mana/AnyColorManaAbility.java index a2c5040a007..c0ca0396518 100644 --- a/Mage/src/mage/abilities/mana/AnyColorManaAbility.java +++ b/Mage/src/mage/abilities/mana/AnyColorManaAbility.java @@ -27,11 +27,11 @@ */ package mage.abilities.mana; -import mage.Constants; import mage.abilities.costs.Cost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.AddManaOfAnyColorEffect; import mage.choices.ChoiceColor; +import mage.constants.Zone; public class AnyColorManaAbility extends ManaAbility { public AnyColorManaAbility() { @@ -39,7 +39,7 @@ public class AnyColorManaAbility extends ManaAbility { } public AnyColorManaAbility(Cost cost) { - super(Constants.Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(), cost); + super(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(), cost); this.addChoice(new ChoiceColor()); this.netMana.setAny(1); } diff --git a/Mage/src/mage/abilities/mana/BasicManaAbility.java b/Mage/src/mage/abilities/mana/BasicManaAbility.java index de90457779e..888e03a6d3c 100644 --- a/Mage/src/mage/abilities/mana/BasicManaAbility.java +++ b/Mage/src/mage/abilities/mana/BasicManaAbility.java @@ -28,7 +28,7 @@ package mage.abilities.mana; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.ManaEffect; diff --git a/Mage/src/mage/abilities/mana/ConditionalAnyColorManaAbility.java b/Mage/src/mage/abilities/mana/ConditionalAnyColorManaAbility.java index cd98f201a45..909be98504d 100644 --- a/Mage/src/mage/abilities/mana/ConditionalAnyColorManaAbility.java +++ b/Mage/src/mage/abilities/mana/ConditionalAnyColorManaAbility.java @@ -27,12 +27,12 @@ */ package mage.abilities.mana; -import mage.Constants; import mage.abilities.costs.Cost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.AddConditionalManaOfAnyColorEffect; import mage.abilities.mana.builder.ConditionalManaBuilder; import mage.choices.ChoiceColor; +import mage.constants.Zone; /** * For cards like: @@ -51,7 +51,7 @@ public class ConditionalAnyColorManaAbility extends ManaAbility> extends MageObjectImpl implements Card { diff --git a/Mage/src/mage/cards/CardsImpl.java b/Mage/src/mage/cards/CardsImpl.java index 8d9e804ec88..e895d501495 100644 --- a/Mage/src/mage/cards/CardsImpl.java +++ b/Mage/src/mage/cards/CardsImpl.java @@ -37,7 +37,7 @@ import java.util.Map; import java.util.Random; import java.util.Set; import java.util.UUID; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.game.Game; diff --git a/Mage/src/mage/cards/ExpansionSet.java b/Mage/src/mage/cards/ExpansionSet.java index 6c0193dd29b..1b1e05309df 100644 --- a/Mage/src/mage/cards/ExpansionSet.java +++ b/Mage/src/mage/cards/ExpansionSet.java @@ -28,33 +28,30 @@ package mage.cards; -import mage.Constants.Rarity; -import mage.Constants.SetType; +import mage.constants.Rarity; +import mage.constants.SetType; import mage.cards.repository.CardCriteria; import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; -import org.apache.log4j.Logger; -import java.io.*; -import java.util.*; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Random; /** * @author BetaSteward_at_googlemail.com */ public abstract class ExpansionSet implements Serializable { - private static final Logger logger = Logger.getLogger(ExpansionSet.class); - protected static Random rnd = new Random(); protected String name; protected String code; - protected String symbolCode; protected Date releaseDate; protected ExpansionSet parentSet; - protected List cards; protected SetType setType; - protected Map> rarities; protected boolean hasBasicLands = true; protected String blockName; @@ -69,10 +66,9 @@ public abstract class ExpansionSet implements Serializable { protected String packageName; - public ExpansionSet(String name, String code, String symbolCode, String packageName, Date releaseDate, SetType setType) { + public ExpansionSet(String name, String code, String packageName, Date releaseDate, SetType setType) { this.name = name; this.code = code; - this.symbolCode = symbolCode; this.releaseDate = releaseDate; this.setType = setType; this.packageName = packageName; @@ -86,10 +82,6 @@ public abstract class ExpansionSet implements Serializable { return code; } - public String getSymbolCode() { - return symbolCode; - } - public Date getReleaseDate() { return releaseDate; } diff --git a/Mage/src/mage/cards/LevelerCard.java b/Mage/src/mage/cards/LevelerCard.java index 7e2e4fbbba7..368fa16c1f5 100644 --- a/Mage/src/mage/cards/LevelerCard.java +++ b/Mage/src/mage/cards/LevelerCard.java @@ -28,8 +28,8 @@ package mage.cards; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import java.util.UUID; diff --git a/Mage/src/mage/cards/Sets.java b/Mage/src/mage/cards/Sets.java index 9566f233dab..77a090cb7d7 100644 --- a/Mage/src/mage/cards/Sets.java +++ b/Mage/src/mage/cards/Sets.java @@ -31,8 +31,8 @@ package mage.cards; import java.io.FileNotFoundException; import java.io.PrintWriter; import java.util.*; -import mage.Constants.CardType; -import mage.Constants.ColoredManaSymbol; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; import mage.cards.decks.DeckCardLists; import mage.cards.repository.CardCriteria; import mage.cards.repository.CardInfo; diff --git a/Mage/src/mage/cards/SplitCard.java b/Mage/src/mage/cards/SplitCard.java index 545dc2240f1..26d6f94f5ed 100644 --- a/Mage/src/mage/cards/SplitCard.java +++ b/Mage/src/mage/cards/SplitCard.java @@ -31,11 +31,11 @@ package mage.cards; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.SpellAbilityType; -import mage.Constants.Zone; + +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.SpellAbilityType; +import mage.constants.Zone; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; import mage.abilities.Ability; @@ -93,7 +93,7 @@ public abstract class SplitCard> extends CardImpl { } @Override - public boolean cast(Game game, Constants.Zone fromZone, SpellAbility ability, UUID controllerId) { + public boolean cast(Game game, Zone fromZone, SpellAbility ability, UUID controllerId) { switch(ability.getSpellAbilityType()) { case SPLIT_LEFT: return this.getLeftHalfCard().cast(game, fromZone, ability, controllerId); diff --git a/Mage/src/mage/cards/basiclands/BasicLand.java b/Mage/src/mage/cards/basiclands/BasicLand.java index 793d1db668f..478096d602a 100644 --- a/Mage/src/mage/cards/basiclands/BasicLand.java +++ b/Mage/src/mage/cards/basiclands/BasicLand.java @@ -29,8 +29,8 @@ package mage.cards.basiclands; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.abilities.mana.ManaAbility; import mage.cards.CardImpl; diff --git a/Mage/src/mage/cards/repository/CardCriteria.java b/Mage/src/mage/cards/repository/CardCriteria.java index 090783bc75c..4db23e12205 100644 --- a/Mage/src/mage/cards/repository/CardCriteria.java +++ b/Mage/src/mage/cards/repository/CardCriteria.java @@ -34,8 +34,8 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; /** * diff --git a/Mage/src/mage/cards/repository/CardInfo.java b/Mage/src/mage/cards/repository/CardInfo.java index b11a6980930..e95b0575d72 100644 --- a/Mage/src/mage/cards/repository/CardInfo.java +++ b/Mage/src/mage/cards/repository/CardInfo.java @@ -33,8 +33,8 @@ import com.j256.ormlite.table.DatabaseTable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import mage.Constants.CardType; -import mage.Constants.Rarity; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.ObjectColor; import mage.cards.Card; import mage.cards.CardImpl; diff --git a/Mage/src/mage/cards/repository/CardRepository.java b/Mage/src/mage/cards/repository/CardRepository.java index 7fe43f647df..cbcbc6926cd 100644 --- a/Mage/src/mage/cards/repository/CardRepository.java +++ b/Mage/src/mage/cards/repository/CardRepository.java @@ -43,7 +43,7 @@ import java.util.Random; import java.util.Set; import java.util.TreeSet; import java.util.concurrent.Callable; -import mage.Constants.CardType; +import mage.constants.CardType; /** * diff --git a/Mage/src/mage/choices/Choices.java b/Mage/src/mage/choices/Choices.java index af3b59257da..5d4ebbcfe73 100644 --- a/Mage/src/mage/choices/Choices.java +++ b/Mage/src/mage/choices/Choices.java @@ -30,7 +30,7 @@ package mage.choices; import java.util.ArrayList; import java.util.List; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.game.Game; import mage.players.Player; diff --git a/Mage/src/mage/constants/AbilityType.java b/Mage/src/mage/constants/AbilityType.java new file mode 100644 index 00000000000..5a24e3bf3b3 --- /dev/null +++ b/Mage/src/mage/constants/AbilityType.java @@ -0,0 +1,28 @@ +package mage.constants; + +/** + * + * @author North + */ +public enum AbilityType { + PLAY_LAND("Play land"), + MANA("Mana"), + SPELL("Spell"), + ACTIVATED("Activated"), + STATIC("Static"), + TRIGGERED("Triggered"), + EVASION("Evasion"), + LOYALTY("Loyalty"), + SPECIAL_ACTION("Special Action"); + + private String text; + + AbilityType(String text) { + this.text = text; + } + + @Override + public String toString() { + return text; + } +} diff --git a/Mage/src/mage/constants/AsThoughEffectType.java b/Mage/src/mage/constants/AsThoughEffectType.java new file mode 100644 index 00000000000..d8f0e8070dc --- /dev/null +++ b/Mage/src/mage/constants/AsThoughEffectType.java @@ -0,0 +1,17 @@ +package mage.constants; + +/** + * + * @author North + */ +public enum AsThoughEffectType { + BLOCK, + BE_BLOCKED, + ATTACK, + CAST, + TARGET, + PAY, + DAMAGE, + HEXPROOF, + REVEAL_FACE_DOWN +} diff --git a/Mage/src/mage/constants/AttachmentType.java b/Mage/src/mage/constants/AttachmentType.java new file mode 100644 index 00000000000..0e072454281 --- /dev/null +++ b/Mage/src/mage/constants/AttachmentType.java @@ -0,0 +1,10 @@ +package mage.constants; + +/** + * + * @author North + */ +public enum AttachmentType { + EQUIPMENT, + AURA +} diff --git a/Mage/src/mage/constants/CardType.java b/Mage/src/mage/constants/CardType.java new file mode 100644 index 00000000000..c3bf4f42e63 --- /dev/null +++ b/Mage/src/mage/constants/CardType.java @@ -0,0 +1,28 @@ +package mage.constants; + +/** + * + * @author North + */ +public enum CardType { + ARTIFACT ("Artifact"), + CREATURE ("Creature"), + ENCHANTMENT ("Enchantment"), + INSTANT ("Instant"), + LAND ("Land"), + PLANESWALKER ("Planeswalker"), + SORCERY ("Sorcery"), + TRIBAL ("Tribal"); + + private String text; + + CardType(String text) { + this.text = text; + } + + @Override + public String toString() { + return text; + } + +} diff --git a/Mage/src/mage/constants/ColoredManaSymbol.java b/Mage/src/mage/constants/ColoredManaSymbol.java new file mode 100644 index 00000000000..4520826e585 --- /dev/null +++ b/Mage/src/mage/constants/ColoredManaSymbol.java @@ -0,0 +1,37 @@ +package mage.constants; + +/** + * + * @author North + */ +public enum ColoredManaSymbol { + W("W"), U("U"), B("B"), R("R"), G("G"); + + private String text; + + ColoredManaSymbol(String text) { + this.text = text; + } + + @Override + public String toString() { + return text; + } + + public static ColoredManaSymbol lookup(char c) { + switch (c) { + case 'W': + return W; + case 'R': + return R; + case 'G': + return G; + case 'B': + return B; + case 'U': + return U; + } + return null; + } + +} diff --git a/Mage/src/mage/constants/Duration.java b/Mage/src/mage/constants/Duration.java new file mode 100644 index 00000000000..3fa393e6492 --- /dev/null +++ b/Mage/src/mage/constants/Duration.java @@ -0,0 +1,28 @@ +package mage.constants; + +/** + * + * @author North + */ +public enum Duration { + OneUse(""), + EndOfGame("for the rest of the game"), + WhileOnBattlefield(""), + WhileOnStack(""), + WhileInGraveyard(""), + EndOfTurn("until end of turn"), + EndOfCombat("until end of combat"), + Custom(""); + + private String text; + + Duration(String text) { + this.text = text; + } + + @Override + public String toString() { + return text; + } + +} diff --git a/Mage/src/mage/constants/EffectType.java b/Mage/src/mage/constants/EffectType.java new file mode 100644 index 00000000000..b83b5f3891c --- /dev/null +++ b/Mage/src/mage/constants/EffectType.java @@ -0,0 +1,29 @@ +package mage.constants; + +/** + * + * @author North + */ +public enum EffectType { + + ONESHOT("One Shot Effect"), + CONTINUOUS("Continuous Effect"), + REPLACEMENT("Replacement Effect"), + PREVENTION("Prevention Effect"), + REDIRECTION("Redirection Effect"), + ASTHOUGH("As Though Effect"), + RESTRICTION("Restriction Effect"), + REQUIREMENT("Requirement Effect"), + COSTMODIFICATION("Cost Modification Effect"); + + private String text; + + EffectType(String text) { + this.text = text; + } + + @Override + public String toString() { + return text; + } +} diff --git a/Mage/src/mage/constants/Layer.java b/Mage/src/mage/constants/Layer.java new file mode 100644 index 00000000000..81dc3399451 --- /dev/null +++ b/Mage/src/mage/constants/Layer.java @@ -0,0 +1,17 @@ +package mage.constants; + +/** + * + * @author North + */ +public enum Layer { + CopyEffects_1, + ControlChangingEffects_2, + TextChangingEffects_3, + TypeChangingEffects_4, + ColorChangingEffects_5, + AbilityAddingRemovingEffects_6, + PTChangingEffects_7, + PlayerEffects, + RulesEffects +} diff --git a/Mage/src/mage/constants/ManaType.java b/Mage/src/mage/constants/ManaType.java new file mode 100644 index 00000000000..31348363935 --- /dev/null +++ b/Mage/src/mage/constants/ManaType.java @@ -0,0 +1,9 @@ +package mage.constants; + +/** + * + * @author North + */ +public enum ManaType { + BLACK, BLUE, GREEN, RED, WHITE, COLORLESS +} diff --git a/Mage/src/mage/constants/MultiplayerAttackOption.java b/Mage/src/mage/constants/MultiplayerAttackOption.java new file mode 100644 index 00000000000..f29a5f236e0 --- /dev/null +++ b/Mage/src/mage/constants/MultiplayerAttackOption.java @@ -0,0 +1,22 @@ +package mage.constants; + +/** + * + * @author North + */ +public enum MultiplayerAttackOption { + MULTIPLE("Attack Multiple Players"), + LEFT("Attack Left"), + RIGHT("Attack Right"); + + private String text; + + MultiplayerAttackOption(String text) { + this.text = text; + } + + @Override + public String toString() { + return text; + } +} diff --git a/Mage/src/mage/constants/Outcome.java b/Mage/src/mage/constants/Outcome.java new file mode 100644 index 00000000000..f7c8f2f4a55 --- /dev/null +++ b/Mage/src/mage/constants/Outcome.java @@ -0,0 +1,62 @@ +package mage.constants; + +/** + * + * @author North + */ +public enum Outcome { + Damage(false), + DestroyPermanent(false), + BoostCreature(true), + UnboostCreature(false), + AddAbility(true), + LoseAbility(false), + GainLife(true), + LoseLife(false), + ExtraTurn(true), + BecomeCreature(true), + PutCreatureInPlay(true), + PutCardInPlay(true), + PutLandInPlay(true), + GainControl(false), + DrawCard(true), + Discard(false), + Sacrifice(false), + PlayForFree(true), + ReturnToHand(false), + Exile(false), + Protect(true), + PutManaInPool(true), + Regenerate(true), + PreventDamage(true), + RedirectDamage(true), + Tap(false), + Transform(true), + Untap(true), + Win(true), + Copy(true, true), + Benefit(true), + Detriment(false), + Neutral(true), + Removal(false); + + private boolean good; + private boolean canTargetAll; + + Outcome(boolean good) { + this.good = good; + } + + Outcome(boolean good, boolean canTargetAll) { + this.good = good; + this.canTargetAll = canTargetAll; + } + + public boolean isGood() { + return good; + } + + public boolean isCanTargetAll() { + return canTargetAll; + } +} diff --git a/Mage/src/mage/constants/PhaseStep.java b/Mage/src/mage/constants/PhaseStep.java new file mode 100644 index 00000000000..3e1abd5ed69 --- /dev/null +++ b/Mage/src/mage/constants/PhaseStep.java @@ -0,0 +1,43 @@ +package mage.constants; + +/** + * + * @author North + */ +public enum PhaseStep { + UNTAP ("Untap", 0), + UPKEEP ("Upkeep", 1), + DRAW ("Draw", 2), + PRECOMBAT_MAIN ("Precombat Main", 3), + BEGIN_COMBAT ("Begin Combat", 4), + DECLARE_ATTACKERS ("Declare Attackers", 5), + DECLARE_BLOCKERS ("Declare Blockers", 6), + FIRST_COMBAT_DAMAGE ("First Combat Damage", 7), + COMBAT_DAMAGE ("Combat Damage", 8), + END_COMBAT ("End Combat", 9), + POSTCOMBAT_MAIN ("Postcombat Main", 10), + END_TURN ("End Turn", 11), + CLEANUP ("Cleanup", 12); + + private String text; + + /** + * Index is used for game state scoring system. + */ + private int index; + + PhaseStep(String text, int index) { + this.text = text; + this.index = index; + } + + public int getIndex() { + return index; + } + + @Override + public String toString() { + return text; + } + +} diff --git a/Mage/src/mage/constants/RangeOfInfluence.java b/Mage/src/mage/constants/RangeOfInfluence.java new file mode 100644 index 00000000000..84ef0a67895 --- /dev/null +++ b/Mage/src/mage/constants/RangeOfInfluence.java @@ -0,0 +1,21 @@ +package mage.constants; + +/** + * + * @author North + */ +public enum RangeOfInfluence { + ONE(1), + TWO(2), + ALL(0); + + private int range; + + RangeOfInfluence(int range) { + this.range = range; + } + + public int getRange() { + return range; + } +} diff --git a/Mage/src/mage/constants/Rarity.java b/Mage/src/mage/constants/Rarity.java new file mode 100644 index 00000000000..12b7de845f3 --- /dev/null +++ b/Mage/src/mage/constants/Rarity.java @@ -0,0 +1,45 @@ +package mage.constants; + +/** + * + * @author North + */ +public enum Rarity { + + NA ("na", "na", "N", 0), + LAND ("Land", "common", "C", 1), + COMMON ("Common", "common", "C", 1), + UNCOMMON ("Uncommon", "uncommon", "U", 2), + RARE ("Rare", "rare", "R", 3), + MYTHIC ("Mythic", "mythic", "M", 3), + SPECIAL ("Special", "special", "SP", 3); + + private String text; + private String symbolCode; + private String code; + private int rating; + + Rarity(String text, String symbolCode, String code, int rating) { + this.text = text; + this.symbolCode = symbolCode; + this.code = code; + this.rating = rating; + } + + @Override + public String toString() { + return text; + } + + public String getSymbolCode() { + return symbolCode; + } + + public String getCode() { + return code; + } + + public int getRating() { + return rating; + } +} diff --git a/Mage/src/mage/constants/SetType.java b/Mage/src/mage/constants/SetType.java new file mode 100644 index 00000000000..256915545ff --- /dev/null +++ b/Mage/src/mage/constants/SetType.java @@ -0,0 +1,22 @@ +package mage.constants; + +/** + * + * @author North + */ +public enum SetType { + CORE("Core"), + EXPANSION("Expansion"), + REPRINT("Reprint"); + + private String text; + + SetType(String text) { + this.text = text; + } + + @Override + public String toString() { + return text; + } +} diff --git a/Mage/src/mage/constants/SpellAbilityType.java b/Mage/src/mage/constants/SpellAbilityType.java new file mode 100644 index 00000000000..37733359c69 --- /dev/null +++ b/Mage/src/mage/constants/SpellAbilityType.java @@ -0,0 +1,26 @@ +package mage.constants; + +/** + * + * @author North + */ +public enum SpellAbilityType { + BASE("Basic SpellAbility"), + SPLIT("Split SpellAbility"), + SPLIT_FUSED("Split SpellAbility"), + SPLIT_LEFT("LeftSplit SpellAbility"), + SPLIT_RIGHT("RightSplit SpellAbility"), + MODE("Mode SpellAbility"), + SPLICE("Spliced SpellAbility"); + + private String text; + + SpellAbilityType(String text) { + this.text = text; + } + + @Override + public String toString() { + return text; + } +} diff --git a/Mage/src/mage/constants/SubLayer.java b/Mage/src/mage/constants/SubLayer.java new file mode 100644 index 00000000000..eab3499bb19 --- /dev/null +++ b/Mage/src/mage/constants/SubLayer.java @@ -0,0 +1,14 @@ +package mage.constants; + +/** + * + * @author North + */ +public enum SubLayer { + CharacteristicDefining_7a, + SetPT_7b, + ModifyPT_7c, + Counters_7d, + SwitchPT_e, + NA +} diff --git a/Mage/src/mage/constants/TableState.java b/Mage/src/mage/constants/TableState.java new file mode 100644 index 00000000000..3d8a21bf6d2 --- /dev/null +++ b/Mage/src/mage/constants/TableState.java @@ -0,0 +1,27 @@ +package mage.constants; + +/** + * + * @author North + */ +public enum TableState { + WAITING ("Waiting for players"), + STARTING ("Waiting to start"), + DRAFTING ("Drafting"), + DUELING ("Dueling"), + SIDEBOARDING ("Sideboarding"), + CONSTRUCTING ("Constructing"), + FINISHED ("Finished"); + + private String text; + + TableState(String text) { + this.text = text; + } + + @Override + public String toString() { + return text; + } + +} diff --git a/Mage/src/mage/constants/TargetController.java b/Mage/src/mage/constants/TargetController.java new file mode 100644 index 00000000000..8c10feb9591 --- /dev/null +++ b/Mage/src/mage/constants/TargetController.java @@ -0,0 +1,9 @@ +package mage.constants; + +/** + * + * @author North + */ +public enum TargetController { + ANY, YOU, NOT_YOU, OPPONENT, CONTROLLER_ATTACHED_TO +} diff --git a/Mage/src/mage/constants/TimingRule.java b/Mage/src/mage/constants/TimingRule.java new file mode 100644 index 00000000000..7c07af19856 --- /dev/null +++ b/Mage/src/mage/constants/TimingRule.java @@ -0,0 +1,9 @@ +package mage.constants; + +/** + * + * @author North + */ +public enum TimingRule { + INSTANT, SORCERY +} diff --git a/Mage/src/mage/constants/TurnPhase.java b/Mage/src/mage/constants/TurnPhase.java new file mode 100644 index 00000000000..4ec0953e0c6 --- /dev/null +++ b/Mage/src/mage/constants/TurnPhase.java @@ -0,0 +1,25 @@ +package mage.constants; + +/** + * + * @author North + */ +public enum TurnPhase { + BEGINNING ("Beginning"), + PRECOMBAT_MAIN ("Precombat Main"), + COMBAT ("Combat"), + POSTCOMBAT_MAIN ("Postcombat Main"), + END ("End"); + + private String text; + + TurnPhase(String text) { + this.text = text; + } + + @Override + public String toString() { + return text; + } + +} diff --git a/Mage/src/mage/constants/WatcherScope.java b/Mage/src/mage/constants/WatcherScope.java new file mode 100644 index 00000000000..1fbde531ecc --- /dev/null +++ b/Mage/src/mage/constants/WatcherScope.java @@ -0,0 +1,11 @@ +package mage.constants; + +/** + * + * @author North + */ +public enum WatcherScope { + GAME, + PLAYER, + CARD +} diff --git a/Mage/src/mage/constants/Zone.java b/Mage/src/mage/constants/Zone.java new file mode 100644 index 00000000000..52e6164223d --- /dev/null +++ b/Mage/src/mage/constants/Zone.java @@ -0,0 +1,13 @@ +package mage.constants; + +/** + * + * @author North + */ +public enum Zone { + HAND, GRAVEYARD, LIBRARY, BATTLEFIELD, STACK, EXILED, ALL, OUTSIDE, PICK, COMMAND; + + public boolean match(Zone zone) { + return (this == zone || this == ALL || zone == ALL); + } +} diff --git a/Mage/src/mage/filter/FilterAbility.java b/Mage/src/mage/filter/FilterAbility.java index 13c763a013c..49ce90ad542 100644 --- a/Mage/src/mage/filter/FilterAbility.java +++ b/Mage/src/mage/filter/FilterAbility.java @@ -27,8 +27,8 @@ */ package mage.filter; -import mage.Constants.AbilityType; -import mage.Constants.Zone; +import mage.constants.AbilityType; +import mage.constants.Zone; import mage.abilities.Ability; import mage.filter.predicate.Predicate; import mage.game.Game; diff --git a/Mage/src/mage/filter/common/FilterArtifactCard.java b/Mage/src/mage/filter/common/FilterArtifactCard.java index c0d2b7724e9..6974d29811b 100644 --- a/Mage/src/mage/filter/common/FilterArtifactCard.java +++ b/Mage/src/mage/filter/common/FilterArtifactCard.java @@ -28,7 +28,7 @@ package mage.filter.common; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; diff --git a/Mage/src/mage/filter/common/FilterArtifactPermanent.java b/Mage/src/mage/filter/common/FilterArtifactPermanent.java index 4fb7d596194..5679f3ec956 100644 --- a/Mage/src/mage/filter/common/FilterArtifactPermanent.java +++ b/Mage/src/mage/filter/common/FilterArtifactPermanent.java @@ -28,7 +28,7 @@ package mage.filter.common; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; diff --git a/Mage/src/mage/filter/common/FilterBasicLandCard.java b/Mage/src/mage/filter/common/FilterBasicLandCard.java index af2d41d20fb..87ed9fcf95e 100644 --- a/Mage/src/mage/filter/common/FilterBasicLandCard.java +++ b/Mage/src/mage/filter/common/FilterBasicLandCard.java @@ -28,7 +28,7 @@ package mage.filter.common; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; diff --git a/Mage/src/mage/filter/common/FilterControlledArtifactPermanent.java b/Mage/src/mage/filter/common/FilterControlledArtifactPermanent.java index ebb5219d70a..6fc4419e65e 100644 --- a/Mage/src/mage/filter/common/FilterControlledArtifactPermanent.java +++ b/Mage/src/mage/filter/common/FilterControlledArtifactPermanent.java @@ -27,7 +27,7 @@ */ package mage.filter.common; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.filter.predicate.mageobject.CardTypePredicate; /** diff --git a/Mage/src/mage/filter/common/FilterControlledCreaturePermanent.java b/Mage/src/mage/filter/common/FilterControlledCreaturePermanent.java index d84c1234f69..4d69b6393db 100644 --- a/Mage/src/mage/filter/common/FilterControlledCreaturePermanent.java +++ b/Mage/src/mage/filter/common/FilterControlledCreaturePermanent.java @@ -28,7 +28,7 @@ package mage.filter.common; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.filter.predicate.mageobject.CardTypePredicate; /** diff --git a/Mage/src/mage/filter/common/FilterControlledLandPermanent.java b/Mage/src/mage/filter/common/FilterControlledLandPermanent.java index 075f049db43..c25ffe249a6 100644 --- a/Mage/src/mage/filter/common/FilterControlledLandPermanent.java +++ b/Mage/src/mage/filter/common/FilterControlledLandPermanent.java @@ -28,7 +28,7 @@ package mage.filter.common; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.filter.predicate.mageobject.CardTypePredicate; /** diff --git a/Mage/src/mage/filter/common/FilterControlledPermanent.java b/Mage/src/mage/filter/common/FilterControlledPermanent.java index 05c4ef6eb35..a38e8d70ca5 100644 --- a/Mage/src/mage/filter/common/FilterControlledPermanent.java +++ b/Mage/src/mage/filter/common/FilterControlledPermanent.java @@ -28,7 +28,7 @@ package mage.filter.common; -import mage.Constants.TargetController; +import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.permanent.ControllerPredicate; diff --git a/Mage/src/mage/filter/common/FilterCreatureCard.java b/Mage/src/mage/filter/common/FilterCreatureCard.java index 519fd8d8c6f..94f434aadd2 100644 --- a/Mage/src/mage/filter/common/FilterCreatureCard.java +++ b/Mage/src/mage/filter/common/FilterCreatureCard.java @@ -28,7 +28,7 @@ package mage.filter.common; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; diff --git a/Mage/src/mage/filter/common/FilterCreaturePermanent.java b/Mage/src/mage/filter/common/FilterCreaturePermanent.java index 959954b0d81..b23a54be977 100644 --- a/Mage/src/mage/filter/common/FilterCreaturePermanent.java +++ b/Mage/src/mage/filter/common/FilterCreaturePermanent.java @@ -28,7 +28,7 @@ package mage.filter.common; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; diff --git a/Mage/src/mage/filter/common/FilterEnchantment.java b/Mage/src/mage/filter/common/FilterEnchantment.java index 409fc65d672..af5050e7d7e 100644 --- a/Mage/src/mage/filter/common/FilterEnchantment.java +++ b/Mage/src/mage/filter/common/FilterEnchantment.java @@ -28,7 +28,7 @@ package mage.filter.common; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; diff --git a/Mage/src/mage/filter/common/FilterEnchantmentPermanent.java b/Mage/src/mage/filter/common/FilterEnchantmentPermanent.java index 6c54fda31ce..6ff4833d59f 100644 --- a/Mage/src/mage/filter/common/FilterEnchantmentPermanent.java +++ b/Mage/src/mage/filter/common/FilterEnchantmentPermanent.java @@ -28,7 +28,7 @@ */ package mage.filter.common; -import mage.Constants; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -44,7 +44,7 @@ public class FilterEnchantmentPermanent extends FilterPermanent { public FilterEnchantmentPermanent(String name) { super(name); - this.add(new CardTypePredicate(Constants.CardType.ENCHANTMENT)); + this.add(new CardTypePredicate(CardType.ENCHANTMENT)); } public FilterEnchantmentPermanent(final FilterEnchantmentPermanent filter) { diff --git a/Mage/src/mage/filter/common/FilterLandCard.java b/Mage/src/mage/filter/common/FilterLandCard.java index a0c52ca3bde..b488debb58c 100644 --- a/Mage/src/mage/filter/common/FilterLandCard.java +++ b/Mage/src/mage/filter/common/FilterLandCard.java @@ -28,7 +28,7 @@ package mage.filter.common; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; diff --git a/Mage/src/mage/filter/common/FilterLandPermanent.java b/Mage/src/mage/filter/common/FilterLandPermanent.java index 6499ec7782b..15c674f41b8 100644 --- a/Mage/src/mage/filter/common/FilterLandPermanent.java +++ b/Mage/src/mage/filter/common/FilterLandPermanent.java @@ -28,7 +28,7 @@ package mage.filter.common; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; diff --git a/Mage/src/mage/filter/common/FilterNonlandCard.java b/Mage/src/mage/filter/common/FilterNonlandCard.java index 844bddd08dd..46087e55bd8 100644 --- a/Mage/src/mage/filter/common/FilterNonlandCard.java +++ b/Mage/src/mage/filter/common/FilterNonlandCard.java @@ -28,7 +28,7 @@ package mage.filter.common; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; diff --git a/Mage/src/mage/filter/common/FilterNonlandPermanent.java b/Mage/src/mage/filter/common/FilterNonlandPermanent.java index b227082b8f5..be4eb7cfd42 100644 --- a/Mage/src/mage/filter/common/FilterNonlandPermanent.java +++ b/Mage/src/mage/filter/common/FilterNonlandPermanent.java @@ -28,7 +28,7 @@ package mage.filter.common; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; diff --git a/Mage/src/mage/filter/common/FilterOwnedCard.java b/Mage/src/mage/filter/common/FilterOwnedCard.java index d2c21985024..d0640561dd1 100644 --- a/Mage/src/mage/filter/common/FilterOwnedCard.java +++ b/Mage/src/mage/filter/common/FilterOwnedCard.java @@ -28,7 +28,7 @@ package mage.filter.common; -import mage.Constants; +import mage.constants.TargetController; import mage.filter.FilterCard; import mage.filter.predicate.other.OwnerPredicate; @@ -44,7 +44,7 @@ public class FilterOwnedCard extends FilterCard { public FilterOwnedCard(String name) { super(name); - this.add(new OwnerPredicate(Constants.TargetController.YOU)); + this.add(new OwnerPredicate(TargetController.YOU)); } public FilterOwnedCard(final FilterOwnedCard filter) { diff --git a/Mage/src/mage/filter/common/FilterPermanentCard.java b/Mage/src/mage/filter/common/FilterPermanentCard.java index e6cf58c6206..9887ccc172b 100644 --- a/Mage/src/mage/filter/common/FilterPermanentCard.java +++ b/Mage/src/mage/filter/common/FilterPermanentCard.java @@ -28,7 +28,7 @@ package mage.filter.common; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; diff --git a/Mage/src/mage/filter/common/FilterPlaneswalkerPermanent.java b/Mage/src/mage/filter/common/FilterPlaneswalkerPermanent.java index e69566bea43..38e6fc3e1be 100644 --- a/Mage/src/mage/filter/common/FilterPlaneswalkerPermanent.java +++ b/Mage/src/mage/filter/common/FilterPlaneswalkerPermanent.java @@ -28,7 +28,7 @@ package mage.filter.common; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; diff --git a/Mage/src/mage/filter/predicate/mageobject/CardTypePredicate.java b/Mage/src/mage/filter/predicate/mageobject/CardTypePredicate.java index a9774d766eb..b1c5bab7867 100644 --- a/Mage/src/mage/filter/predicate/mageobject/CardTypePredicate.java +++ b/Mage/src/mage/filter/predicate/mageobject/CardTypePredicate.java @@ -27,7 +27,7 @@ */ package mage.filter.predicate.mageobject; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.MageObject; import mage.filter.predicate.Predicate; import mage.game.Game; diff --git a/Mage/src/mage/filter/predicate/mageobject/NamePredicate.java b/Mage/src/mage/filter/predicate/mageobject/NamePredicate.java index 07e789827b4..76711913559 100644 --- a/Mage/src/mage/filter/predicate/mageobject/NamePredicate.java +++ b/Mage/src/mage/filter/predicate/mageobject/NamePredicate.java @@ -27,7 +27,7 @@ */ package mage.filter.predicate.mageobject; -import mage.Constants.SpellAbilityType; +import mage.constants.SpellAbilityType; import mage.MageObject; import mage.cards.SplitCard; import mage.filter.predicate.Predicate; diff --git a/Mage/src/mage/filter/predicate/other/OwnerPredicate.java b/Mage/src/mage/filter/predicate/other/OwnerPredicate.java index 4b600024b4b..1a25059df2b 100644 --- a/Mage/src/mage/filter/predicate/other/OwnerPredicate.java +++ b/Mage/src/mage/filter/predicate/other/OwnerPredicate.java @@ -28,7 +28,7 @@ package mage.filter.predicate.other; import java.util.UUID; -import mage.Constants.TargetController; +import mage.constants.TargetController; import mage.cards.Card; import mage.filter.predicate.ObjectPlayer; import mage.filter.predicate.ObjectPlayerPredicate; diff --git a/Mage/src/mage/filter/predicate/other/PlayerPredicate.java b/Mage/src/mage/filter/predicate/other/PlayerPredicate.java index e12133e7e47..6945ead3583 100644 --- a/Mage/src/mage/filter/predicate/other/PlayerPredicate.java +++ b/Mage/src/mage/filter/predicate/other/PlayerPredicate.java @@ -28,7 +28,7 @@ package mage.filter.predicate.other; import java.util.UUID; -import mage.Constants.TargetController; +import mage.constants.TargetController; import mage.filter.predicate.ObjectSourcePlayer; import mage.filter.predicate.ObjectSourcePlayerPredicate; import mage.game.Game; diff --git a/Mage/src/mage/filter/predicate/permanent/ControllerPredicate.java b/Mage/src/mage/filter/predicate/permanent/ControllerPredicate.java index 7e94995de33..ab4614dbb90 100644 --- a/Mage/src/mage/filter/predicate/permanent/ControllerPredicate.java +++ b/Mage/src/mage/filter/predicate/permanent/ControllerPredicate.java @@ -27,7 +27,7 @@ */ package mage.filter.predicate.permanent; -import mage.Constants.TargetController; +import mage.constants.TargetController; import mage.filter.predicate.ObjectPlayer; import mage.filter.predicate.ObjectPlayerPredicate; import mage.game.Controllable; diff --git a/Mage/src/mage/filter/predicate/permanent/UnblockedPredicate.java b/Mage/src/mage/filter/predicate/permanent/UnblockedPredicate.java index f2391fe5ae7..12cae8c7a20 100644 --- a/Mage/src/mage/filter/predicate/permanent/UnblockedPredicate.java +++ b/Mage/src/mage/filter/predicate/permanent/UnblockedPredicate.java @@ -27,7 +27,7 @@ */ package mage.filter.predicate.permanent; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; import mage.filter.predicate.Predicate; import mage.game.Game; import mage.game.combat.CombatGroup; diff --git a/Mage/src/mage/game/ExileZone.java b/Mage/src/mage/game/ExileZone.java index 0c0c9c85854..ce1234008a0 100644 --- a/Mage/src/mage/game/ExileZone.java +++ b/Mage/src/mage/game/ExileZone.java @@ -30,7 +30,7 @@ package mage.game; import java.io.Serializable; import java.util.UUID; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.cards.CardsImpl; /** diff --git a/Mage/src/mage/game/Game.java b/Mage/src/mage/game/Game.java index 05ab8d9552f..c4f2b06bd81 100644 --- a/Mage/src/mage/game/Game.java +++ b/Mage/src/mage/game/Game.java @@ -28,9 +28,9 @@ package mage.game; -import mage.Constants.MultiplayerAttackOption; -import mage.Constants.RangeOfInfluence; -import mage.Constants.Zone; +import mage.constants.MultiplayerAttackOption; +import mage.constants.RangeOfInfluence; +import mage.constants.Zone; import mage.MageItem; import mage.MageObject; import mage.abilities.Ability; @@ -65,7 +65,7 @@ import mage.util.functions.ApplyToPermanent; import java.io.Serializable; import java.util.*; -import mage.Constants.Duration; +import mage.constants.Duration; public interface Game extends MageItem, Serializable { diff --git a/Mage/src/mage/game/GameImpl.java b/Mage/src/mage/game/GameImpl.java index ff79d57165c..f7fa2fc9758 100644 --- a/Mage/src/mage/game/GameImpl.java +++ b/Mage/src/mage/game/GameImpl.java @@ -29,7 +29,7 @@ package mage.game; import mage.Constants; -import mage.Constants.*; +import mage.constants.CardType; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.ActivatedAbility; @@ -51,6 +51,7 @@ import mage.cards.Cards; import mage.cards.CardsImpl; import mage.cards.decks.Deck; import mage.choices.Choice; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.Filter; import mage.filter.FilterPermanent; diff --git a/Mage/src/mage/game/GameOptions.java b/Mage/src/mage/game/GameOptions.java index a5c388160ee..85d60e4f0cb 100644 --- a/Mage/src/mage/game/GameOptions.java +++ b/Mage/src/mage/game/GameOptions.java @@ -1,7 +1,7 @@ package mage.game; import java.io.Serializable; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; /** * Game options for Mage game. diff --git a/Mage/src/mage/game/GameState.java b/Mage/src/mage/game/GameState.java index 1129ab63f16..2361f7bd71b 100644 --- a/Mage/src/mage/game/GameState.java +++ b/Mage/src/mage/game/GameState.java @@ -30,7 +30,7 @@ package mage.game; import java.io.Serializable; import java.util.*; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.MageObject; import mage.abilities.*; import mage.abilities.effects.ContinuousEffect; diff --git a/Mage/src/mage/game/Table.java b/Mage/src/mage/game/Table.java index e7a34109e53..6713c36b30a 100644 --- a/Mage/src/mage/game/Table.java +++ b/Mage/src/mage/game/Table.java @@ -32,7 +32,7 @@ import java.io.Serializable; import java.util.Date; import java.util.List; import java.util.UUID; -import mage.Constants.TableState; +import mage.constants.TableState; import mage.cards.decks.DeckValidator; import mage.game.events.Listener; import mage.game.events.TableEvent; diff --git a/Mage/src/mage/game/combat/Combat.java b/Mage/src/mage/game/combat/Combat.java index 1a989148dd8..c28631fc451 100644 --- a/Mage/src/mage/game/combat/Combat.java +++ b/Mage/src/mage/game/combat/Combat.java @@ -30,7 +30,7 @@ package mage.game.combat; import java.io.Serializable; import java.util.*; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.RequirementEffect; import mage.abilities.keyword.CanAttackOnlyAloneAbility; diff --git a/Mage/src/mage/game/combat/CombatGroup.java b/Mage/src/mage/game/combat/CombatGroup.java index 8f7a0e3bf40..ad617d158e9 100644 --- a/Mage/src/mage/game/combat/CombatGroup.java +++ b/Mage/src/mage/game/combat/CombatGroup.java @@ -30,7 +30,7 @@ package mage.game.combat; import java.io.Serializable; import java.util.*; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.common.DamageAsThoughNotBlockedAbility; import mage.abilities.keyword.*; import mage.game.Game; diff --git a/Mage/src/mage/game/command/Emblem.java b/Mage/src/mage/game/command/Emblem.java index 8c0ec2ddd09..a7ea369671a 100644 --- a/Mage/src/mage/game/command/Emblem.java +++ b/Mage/src/mage/game/command/Emblem.java @@ -27,7 +27,6 @@ */ package mage.game.command; -import mage.Constants; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Abilities; @@ -36,6 +35,7 @@ import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCost; import mage.abilities.costs.mana.ManaCosts; import mage.abilities.costs.mana.ManaCostsImpl; +import mage.constants.CardType; import mage.game.Game; import java.util.ArrayList; @@ -106,7 +106,7 @@ public class Emblem implements CommandObject { public void setName(String name) {} @Override - public List getCardType() { + public List getCardType() { return emptyList; } diff --git a/Mage/src/mage/game/events/EntersTheBattlefieldEvent.java b/Mage/src/mage/game/events/EntersTheBattlefieldEvent.java index 0321e70e95e..b2e139e27bc 100644 --- a/Mage/src/mage/game/events/EntersTheBattlefieldEvent.java +++ b/Mage/src/mage/game/events/EntersTheBattlefieldEvent.java @@ -30,7 +30,7 @@ package mage.game.events; import java.util.ArrayList; import java.util.UUID; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.game.permanent.Permanent; /** diff --git a/Mage/src/mage/game/events/GameEvent.java b/Mage/src/mage/game/events/GameEvent.java index 0869bee074a..87fc546ded0 100644 --- a/Mage/src/mage/game/events/GameEvent.java +++ b/Mage/src/mage/game/events/GameEvent.java @@ -30,7 +30,7 @@ package mage.game.events; import java.util.ArrayList; import java.util.UUID; -import mage.Constants.Zone; +import mage.constants.Zone; /** * diff --git a/Mage/src/mage/game/events/ZoneChangeEvent.java b/Mage/src/mage/game/events/ZoneChangeEvent.java index 4b89d16245a..1832d5aeb8b 100644 --- a/Mage/src/mage/game/events/ZoneChangeEvent.java +++ b/Mage/src/mage/game/events/ZoneChangeEvent.java @@ -30,7 +30,7 @@ package mage.game.events; import java.util.ArrayList; import java.util.UUID; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.game.permanent.Permanent; /** diff --git a/Mage/src/mage/game/match/MatchOptions.java b/Mage/src/mage/game/match/MatchOptions.java index cfd5a66d8bf..72aee136ee6 100644 --- a/Mage/src/mage/game/match/MatchOptions.java +++ b/Mage/src/mage/game/match/MatchOptions.java @@ -31,8 +31,8 @@ package mage.game.match; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import mage.Constants.MultiplayerAttackOption; -import mage.Constants.RangeOfInfluence; +import mage.constants.MultiplayerAttackOption; +import mage.constants.RangeOfInfluence; /** * diff --git a/Mage/src/mage/game/permanent/Battlefield.java b/Mage/src/mage/game/permanent/Battlefield.java index dacbaa6bb9a..2d149ab4af0 100644 --- a/Mage/src/mage/game/permanent/Battlefield.java +++ b/Mage/src/mage/game/permanent/Battlefield.java @@ -31,8 +31,8 @@ package mage.game.permanent; import java.io.Serializable; import java.util.*; import java.util.Map.Entry; -import mage.Constants.CardType; -import mage.Constants.RangeOfInfluence; +import mage.constants.CardType; +import mage.constants.RangeOfInfluence; import mage.abilities.keyword.PhasingAbility; import mage.filter.FilterPermanent; import mage.game.Game; diff --git a/Mage/src/mage/game/permanent/Permanent.java b/Mage/src/mage/game/permanent/Permanent.java index 8f33b49d4a8..76a47103b49 100644 --- a/Mage/src/mage/game/permanent/Permanent.java +++ b/Mage/src/mage/game/permanent/Permanent.java @@ -37,8 +37,7 @@ import mage.game.Game; import java.util.List; import java.util.UUID; -import mage.Constants.Zone; -import mage.abilities.ActivatedAbility; +import mage.constants.Zone; public interface Permanent extends Card, Controllable { diff --git a/Mage/src/mage/game/permanent/PermanentCard.java b/Mage/src/mage/game/permanent/PermanentCard.java index aafe9e315fd..0e5c9c7adfd 100644 --- a/Mage/src/mage/game/permanent/PermanentCard.java +++ b/Mage/src/mage/game/permanent/PermanentCard.java @@ -29,7 +29,7 @@ package mage.game.permanent; import java.util.ArrayList; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.cards.Card; import mage.cards.LevelerCard; import mage.game.Game; diff --git a/Mage/src/mage/game/permanent/PermanentImpl.java b/Mage/src/mage/game/permanent/PermanentImpl.java index 8a3cd714bf5..df786d35bc0 100644 --- a/Mage/src/mage/game/permanent/PermanentImpl.java +++ b/Mage/src/mage/game/permanent/PermanentImpl.java @@ -28,10 +28,9 @@ package mage.game.permanent; -import mage.Constants; -import mage.Constants.AsThoughEffectType; -import mage.Constants.CardType; -import mage.Constants.Zone; +import mage.constants.AsThoughEffectType; +import mage.constants.CardType; +import mage.constants.Zone; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; @@ -39,6 +38,7 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.RestrictionEffect; import mage.abilities.keyword.*; import mage.cards.CardImpl; +import mage.constants.EffectType; import mage.counters.Counter; import mage.counters.CounterType; import mage.game.Game; @@ -575,7 +575,7 @@ public abstract class PermanentImpl> extends CardImpl */ for (Iterator it = this.getAbilities().iterator(); it.hasNext();) { Ability ability = it.next(); - for (Iterator ite = ability.getEffects(game, Constants.EffectType.CONTINUOUS).iterator(); ite.hasNext();) { + for (Iterator ite = ability.getEffects(game, EffectType.CONTINUOUS).iterator(); ite.hasNext();) { ContinuousEffect effect = (ContinuousEffect) ite.next(); game.getContinuousEffects().setUniqueTimesstamp(effect); // It's important is to update timestamp of the copied effect in ContinuousEffects because it does the action diff --git a/Mage/src/mage/game/permanent/PermanentToken.java b/Mage/src/mage/game/permanent/PermanentToken.java index 9ee4a069ecf..8416d15611b 100644 --- a/Mage/src/mage/game/permanent/PermanentToken.java +++ b/Mage/src/mage/game/permanent/PermanentToken.java @@ -29,7 +29,7 @@ package mage.game.permanent; import java.util.UUID; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCost; import mage.game.Game; diff --git a/Mage/src/mage/game/permanent/token/AngelToken.java b/Mage/src/mage/game/permanent/token/AngelToken.java index aec6564f596..1f5dccf2767 100644 --- a/Mage/src/mage/game/permanent/token/AngelToken.java +++ b/Mage/src/mage/game/permanent/token/AngelToken.java @@ -1,14 +1,14 @@ package mage.game.permanent.token; -import mage.Constants; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; public class AngelToken extends Token { public AngelToken() { super("Angel", "4/4 white Angel creature token with flying"); - cardType.add(Constants.CardType.CREATURE); + cardType.add(CardType.CREATURE); color = ObjectColor.WHITE; subtype.add("Angel"); power = new MageInt(4); diff --git a/Mage/src/mage/game/permanent/token/BeastToken.java b/Mage/src/mage/game/permanent/token/BeastToken.java index f83ef3dcd3c..7c47236254e 100644 --- a/Mage/src/mage/game/permanent/token/BeastToken.java +++ b/Mage/src/mage/game/permanent/token/BeastToken.java @@ -28,7 +28,7 @@ package mage.game.permanent.token; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; diff --git a/Mage/src/mage/game/permanent/token/CentaurToken.java b/Mage/src/mage/game/permanent/token/CentaurToken.java index ffe1e99570e..c4d04138e8e 100644 --- a/Mage/src/mage/game/permanent/token/CentaurToken.java +++ b/Mage/src/mage/game/permanent/token/CentaurToken.java @@ -28,7 +28,7 @@ package mage.game.permanent.token; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; diff --git a/Mage/src/mage/game/permanent/token/DragonToken.java b/Mage/src/mage/game/permanent/token/DragonToken.java index ee973efd4ae..a67fd512db8 100644 --- a/Mage/src/mage/game/permanent/token/DragonToken.java +++ b/Mage/src/mage/game/permanent/token/DragonToken.java @@ -28,7 +28,7 @@ package mage.game.permanent.token; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage/src/mage/game/permanent/token/DrakeToken.java b/Mage/src/mage/game/permanent/token/DrakeToken.java index c19f890edfc..732763c0a0d 100644 --- a/Mage/src/mage/game/permanent/token/DrakeToken.java +++ b/Mage/src/mage/game/permanent/token/DrakeToken.java @@ -27,7 +27,7 @@ */ package mage.game.permanent.token; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage/src/mage/game/permanent/token/EldraziSpawnToken.java b/Mage/src/mage/game/permanent/token/EldraziSpawnToken.java index a1e6f242104..a6e9dc961fd 100644 --- a/Mage/src/mage/game/permanent/token/EldraziSpawnToken.java +++ b/Mage/src/mage/game/permanent/token/EldraziSpawnToken.java @@ -28,8 +28,8 @@ package mage.game.permanent.token; -import mage.Constants.CardType; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Zone; import mage.MageInt; import mage.Mana; import mage.abilities.costs.common.SacrificeSourceCost; diff --git a/Mage/src/mage/game/permanent/token/ElephantToken.java b/Mage/src/mage/game/permanent/token/ElephantToken.java index 057b8b5420c..3363a6f0628 100644 --- a/Mage/src/mage/game/permanent/token/ElephantToken.java +++ b/Mage/src/mage/game/permanent/token/ElephantToken.java @@ -28,7 +28,7 @@ package mage.game.permanent.token; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; diff --git a/Mage/src/mage/game/permanent/token/ElfToken.java b/Mage/src/mage/game/permanent/token/ElfToken.java index 5a1b5060e23..11807debd70 100644 --- a/Mage/src/mage/game/permanent/token/ElfToken.java +++ b/Mage/src/mage/game/permanent/token/ElfToken.java @@ -28,8 +28,8 @@ package mage.game.permanent.token; -import mage.Constants; import mage.MageInt; +import mage.constants.CardType; /** * @@ -39,7 +39,7 @@ public class ElfToken extends Token { public ElfToken() { super("Elf Warrior", "1/1 green Elf Warrior creature token"); - cardType.add(Constants.CardType.CREATURE); + cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add("Elf"); subtype.add("Warrior"); diff --git a/Mage/src/mage/game/permanent/token/FrogToken.java b/Mage/src/mage/game/permanent/token/FrogToken.java index ae994d8e2a9..3943d6bfb9b 100644 --- a/Mage/src/mage/game/permanent/token/FrogToken.java +++ b/Mage/src/mage/game/permanent/token/FrogToken.java @@ -28,7 +28,7 @@ package mage.game.permanent.token; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; diff --git a/Mage/src/mage/game/permanent/token/GoblinToken.java b/Mage/src/mage/game/permanent/token/GoblinToken.java index eb3349d7085..5d54b94730b 100644 --- a/Mage/src/mage/game/permanent/token/GoblinToken.java +++ b/Mage/src/mage/game/permanent/token/GoblinToken.java @@ -27,7 +27,7 @@ */ package mage.game.permanent.token; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; diff --git a/Mage/src/mage/game/permanent/token/GolemToken.java b/Mage/src/mage/game/permanent/token/GolemToken.java index 227d33fa1fd..0c967c6dd0d 100644 --- a/Mage/src/mage/game/permanent/token/GolemToken.java +++ b/Mage/src/mage/game/permanent/token/GolemToken.java @@ -27,7 +27,7 @@ */ package mage.game.permanent.token; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.MageInt; /** diff --git a/Mage/src/mage/game/permanent/token/InsectInfectToken.java b/Mage/src/mage/game/permanent/token/InsectInfectToken.java index e4f3dfcfdd8..37032daa41e 100644 --- a/Mage/src/mage/game/permanent/token/InsectInfectToken.java +++ b/Mage/src/mage/game/permanent/token/InsectInfectToken.java @@ -28,7 +28,7 @@ package mage.game.permanent.token; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.InfectAbility; diff --git a/Mage/src/mage/game/permanent/token/InsectToken.java b/Mage/src/mage/game/permanent/token/InsectToken.java index 8a476215e97..c02738ea19b 100644 --- a/Mage/src/mage/game/permanent/token/InsectToken.java +++ b/Mage/src/mage/game/permanent/token/InsectToken.java @@ -28,7 +28,7 @@ package mage.game.permanent.token; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; diff --git a/Mage/src/mage/game/permanent/token/KithkinToken.java b/Mage/src/mage/game/permanent/token/KithkinToken.java index c22426f8a3d..459ee6216e2 100644 --- a/Mage/src/mage/game/permanent/token/KithkinToken.java +++ b/Mage/src/mage/game/permanent/token/KithkinToken.java @@ -1,7 +1,7 @@ package mage.game.permanent.token; -import mage.Constants; import mage.MageInt; +import mage.constants.CardType; /** * @@ -11,7 +11,7 @@ public class KithkinToken extends Token{ public KithkinToken() { super("Kithkin", "1/1 white Kithkin Soldier creature token"); - cardType.add(Constants.CardType.CREATURE); + cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add("Kithkin"); subtype.add("Soldier"); diff --git a/Mage/src/mage/game/permanent/token/KnightToken.java b/Mage/src/mage/game/permanent/token/KnightToken.java index 14ba86e7dd6..d512352bd95 100644 --- a/Mage/src/mage/game/permanent/token/KnightToken.java +++ b/Mage/src/mage/game/permanent/token/KnightToken.java @@ -1,6 +1,6 @@ package mage.game.permanent.token; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.VigilanceAbility; diff --git a/Mage/src/mage/game/permanent/token/MerfolkToken.java b/Mage/src/mage/game/permanent/token/MerfolkToken.java index 17657594894..ee97ff82a86 100644 --- a/Mage/src/mage/game/permanent/token/MerfolkToken.java +++ b/Mage/src/mage/game/permanent/token/MerfolkToken.java @@ -1,7 +1,7 @@ package mage.game.permanent.token; -import mage.Constants; import mage.MageInt; +import mage.constants.CardType; /** * @@ -11,7 +11,7 @@ public class MerfolkToken extends Token { public MerfolkToken() { super("Merfolk", "1/1 blue Merfolk Wizard creature token"); - cardType.add(Constants.CardType.CREATURE); + cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add("Merfolk"); subtype.add("Wizard"); diff --git a/Mage/src/mage/game/permanent/token/MyrToken.java b/Mage/src/mage/game/permanent/token/MyrToken.java index 7e6cba449cc..bef737e5d7d 100644 --- a/Mage/src/mage/game/permanent/token/MyrToken.java +++ b/Mage/src/mage/game/permanent/token/MyrToken.java @@ -1,13 +1,13 @@ package mage.game.permanent.token; -import mage.Constants; import mage.MageInt; +import mage.constants.CardType; public class MyrToken extends Token { public MyrToken() { super("Myr", "1/1 colorless Myr artifact creature token"); - cardType.add(Constants.CardType.CREATURE); - cardType.add(Constants.CardType.ARTIFACT); + cardType.add(CardType.CREATURE); + cardType.add(CardType.ARTIFACT); subtype.add("Myr"); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage/src/mage/game/permanent/token/PlantToken.java b/Mage/src/mage/game/permanent/token/PlantToken.java index 35bae0195e4..5eb29d1d586 100644 --- a/Mage/src/mage/game/permanent/token/PlantToken.java +++ b/Mage/src/mage/game/permanent/token/PlantToken.java @@ -1,6 +1,6 @@ package mage.game.permanent.token; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.MageInt; public class PlantToken extends Token { diff --git a/Mage/src/mage/game/permanent/token/SaprolingToken.java b/Mage/src/mage/game/permanent/token/SaprolingToken.java index 6200b2e6b53..be3196933e4 100644 --- a/Mage/src/mage/game/permanent/token/SaprolingToken.java +++ b/Mage/src/mage/game/permanent/token/SaprolingToken.java @@ -28,7 +28,7 @@ package mage.game.permanent.token; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; diff --git a/Mage/src/mage/game/permanent/token/SnakeToken.java b/Mage/src/mage/game/permanent/token/SnakeToken.java index 52660718dda..035bae756b3 100644 --- a/Mage/src/mage/game/permanent/token/SnakeToken.java +++ b/Mage/src/mage/game/permanent/token/SnakeToken.java @@ -28,7 +28,7 @@ package mage.game.permanent.token; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; diff --git a/Mage/src/mage/game/permanent/token/SoldierToken.java b/Mage/src/mage/game/permanent/token/SoldierToken.java index a4619990b75..5de4109ae98 100644 --- a/Mage/src/mage/game/permanent/token/SoldierToken.java +++ b/Mage/src/mage/game/permanent/token/SoldierToken.java @@ -28,7 +28,7 @@ package mage.game.permanent.token; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; diff --git a/Mage/src/mage/game/permanent/token/SpiritToken.java b/Mage/src/mage/game/permanent/token/SpiritToken.java index 0cc7b8f41af..995b16139c3 100644 --- a/Mage/src/mage/game/permanent/token/SpiritToken.java +++ b/Mage/src/mage/game/permanent/token/SpiritToken.java @@ -27,8 +27,8 @@ */ package mage.game.permanent.token; -import mage.Constants; import mage.MageInt; +import mage.constants.CardType; /** * @author Loki @@ -36,7 +36,7 @@ import mage.MageInt; public class SpiritToken extends Token { public SpiritToken() { super("Spirit", "1/1 colorless Spirit creature token"); - cardType.add(Constants.CardType.CREATURE); + cardType.add(CardType.CREATURE); subtype.add("Spirit"); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage/src/mage/game/permanent/token/SpiritWhiteToken.java b/Mage/src/mage/game/permanent/token/SpiritWhiteToken.java index 8c9a6944178..064538581a7 100644 --- a/Mage/src/mage/game/permanent/token/SpiritWhiteToken.java +++ b/Mage/src/mage/game/permanent/token/SpiritWhiteToken.java @@ -27,9 +27,9 @@ */ package mage.game.permanent.token; -import mage.Constants; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; /** * @author nantuko @@ -38,7 +38,7 @@ public class SpiritWhiteToken extends Token { public SpiritWhiteToken() { super("Spirit", "1/1 white Spirit creature token with flying"); - cardType.add(Constants.CardType.CREATURE); + cardType.add(CardType.CREATURE); subtype.add("Spirit"); color.setWhite(true); power = new MageInt(1); diff --git a/Mage/src/mage/game/permanent/token/SquirrelToken.java b/Mage/src/mage/game/permanent/token/SquirrelToken.java index 394ec111177..b72897bd158 100644 --- a/Mage/src/mage/game/permanent/token/SquirrelToken.java +++ b/Mage/src/mage/game/permanent/token/SquirrelToken.java @@ -27,7 +27,7 @@ */ package mage.game.permanent.token; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; diff --git a/Mage/src/mage/game/permanent/token/Token.java b/Mage/src/mage/game/permanent/token/Token.java index 393f654c0c7..75355cecb6f 100644 --- a/Mage/src/mage/game/permanent/token/Token.java +++ b/Mage/src/mage/game/permanent/token/Token.java @@ -30,8 +30,8 @@ package mage.game.permanent.token; import java.util.List; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Zone; import mage.MageObjectImpl; import mage.ObjectColor; import mage.abilities.Abilities; diff --git a/Mage/src/mage/game/permanent/token/WolfToken.java b/Mage/src/mage/game/permanent/token/WolfToken.java index 96e0a038e74..16cc09d5613 100644 --- a/Mage/src/mage/game/permanent/token/WolfToken.java +++ b/Mage/src/mage/game/permanent/token/WolfToken.java @@ -28,7 +28,7 @@ package mage.game.permanent.token; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; diff --git a/Mage/src/mage/game/permanent/token/WolfTokenWithDeathtouch.java b/Mage/src/mage/game/permanent/token/WolfTokenWithDeathtouch.java index 625f8b6a336..46aa8c6f8e2 100644 --- a/Mage/src/mage/game/permanent/token/WolfTokenWithDeathtouch.java +++ b/Mage/src/mage/game/permanent/token/WolfTokenWithDeathtouch.java @@ -28,7 +28,7 @@ package mage.game.permanent.token; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.DeathtouchAbility; diff --git a/Mage/src/mage/game/permanent/token/WurmToken.java b/Mage/src/mage/game/permanent/token/WurmToken.java index d10d450865d..429ee66b7f6 100644 --- a/Mage/src/mage/game/permanent/token/WurmToken.java +++ b/Mage/src/mage/game/permanent/token/WurmToken.java @@ -27,9 +27,9 @@ */ package mage.game.permanent.token; -import mage.Constants; import mage.MageInt; import mage.ObjectColor; +import mage.constants.CardType; /** * @author magenoxx_at_gmail.com @@ -38,7 +38,7 @@ public class WurmToken extends Token { public WurmToken() { super("Wurm", "a 6/6 green Wurm creature token"); - cardType.add(Constants.CardType.CREATURE); + cardType.add(CardType.CREATURE); color = ObjectColor.GREEN; subtype.add("Wurm"); power = new MageInt(6); diff --git a/Mage/src/mage/game/permanent/token/ZombieToken.java b/Mage/src/mage/game/permanent/token/ZombieToken.java index 95ec1db1e3e..3e1943a94e5 100644 --- a/Mage/src/mage/game/permanent/token/ZombieToken.java +++ b/Mage/src/mage/game/permanent/token/ZombieToken.java @@ -28,7 +28,7 @@ package mage.game.permanent.token; -import mage.Constants.CardType; +import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; diff --git a/Mage/src/mage/game/stack/Spell.java b/Mage/src/mage/game/stack/Spell.java index 82acbba7d47..006ea540017 100644 --- a/Mage/src/mage/game/stack/Spell.java +++ b/Mage/src/mage/game/stack/Spell.java @@ -28,9 +28,9 @@ package mage.game.stack; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.MageObject; import mage.Mana; @@ -44,6 +44,7 @@ import mage.abilities.costs.mana.ManaCosts; import mage.abilities.effects.Effect; import mage.abilities.effects.PostResolveEffect; import mage.cards.Card; +import mage.constants.SpellAbilityType; import mage.counters.Counter; import mage.counters.Counters; import mage.game.Game; @@ -55,7 +56,7 @@ import mage.watchers.Watcher; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import mage.Constants; + import mage.cards.SplitCard; /** @@ -79,7 +80,7 @@ public class Spell> implements StackObject, Card { id = ability.getId(); this.ability = ability; this.ability.setControllerId(controllerId); - if (ability.getSpellAbilityType().equals(Constants.SpellAbilityType.SPLIT_FUSED)) { + if (ability.getSpellAbilityType().equals(SpellAbilityType.SPLIT_FUSED)) { spellCards.add(((SplitCard) card).getLeftHalfCard()); spellAbilities.add(((SplitCard) card).getLeftHalfCard().getSpellAbility().copy()); spellCards.add(((SplitCard) card).getRightHalfCard()); diff --git a/Mage/src/mage/game/stack/SpellStack.java b/Mage/src/mage/game/stack/SpellStack.java index b8c5f352576..570290fe4d9 100644 --- a/Mage/src/mage/game/stack/SpellStack.java +++ b/Mage/src/mage/game/stack/SpellStack.java @@ -30,7 +30,7 @@ package mage.game.stack; import java.util.ArrayDeque; import java.util.UUID; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage/src/mage/game/stack/StackAbility.java b/Mage/src/mage/game/stack/StackAbility.java index c5f3d30cdcc..fa93d08d940 100644 --- a/Mage/src/mage/game/stack/StackAbility.java +++ b/Mage/src/mage/game/stack/StackAbility.java @@ -28,10 +28,10 @@ package mage.game.stack; -import mage.Constants.AbilityType; -import mage.Constants.CardType; -import mage.Constants.EffectType; -import mage.Constants.Zone; +import mage.constants.AbilityType; +import mage.constants.CardType; +import mage.constants.EffectType; +import mage.constants.Zone; import mage.MageInt; import mage.MageObject; import mage.ObjectColor; diff --git a/Mage/src/mage/game/turn/BeginCombatStep.java b/Mage/src/mage/game/turn/BeginCombatStep.java index eadc8594ec3..2f5d739e13c 100644 --- a/Mage/src/mage/game/turn/BeginCombatStep.java +++ b/Mage/src/mage/game/turn/BeginCombatStep.java @@ -29,7 +29,7 @@ package mage.game.turn; import java.util.UUID; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; import mage.game.Game; import mage.game.events.GameEvent.EventType; diff --git a/Mage/src/mage/game/turn/BeginningPhase.java b/Mage/src/mage/game/turn/BeginningPhase.java index 8c1df77332e..9e0311f5297 100644 --- a/Mage/src/mage/game/turn/BeginningPhase.java +++ b/Mage/src/mage/game/turn/BeginningPhase.java @@ -29,7 +29,7 @@ package mage.game.turn; import java.util.UUID; -import mage.Constants.TurnPhase; +import mage.constants.TurnPhase; import mage.game.Game; import mage.game.events.GameEvent.EventType; diff --git a/Mage/src/mage/game/turn/CleanupStep.java b/Mage/src/mage/game/turn/CleanupStep.java index 237c5153a22..a0a3b37a38a 100644 --- a/Mage/src/mage/game/turn/CleanupStep.java +++ b/Mage/src/mage/game/turn/CleanupStep.java @@ -29,7 +29,7 @@ package mage.game.turn; import java.util.UUID; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; import mage.game.Game; import mage.game.events.GameEvent.EventType; import mage.players.Player; diff --git a/Mage/src/mage/game/turn/CombatDamageStep.java b/Mage/src/mage/game/turn/CombatDamageStep.java index 3ee5faab92c..8f6f27a2c5b 100644 --- a/Mage/src/mage/game/turn/CombatDamageStep.java +++ b/Mage/src/mage/game/turn/CombatDamageStep.java @@ -29,7 +29,7 @@ package mage.game.turn; import java.util.UUID; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; import mage.game.Game; import mage.game.combat.CombatGroup; import mage.game.events.GameEvent.EventType; diff --git a/Mage/src/mage/game/turn/CombatPhase.java b/Mage/src/mage/game/turn/CombatPhase.java index 3a954f93e80..4973bcfa4cb 100644 --- a/Mage/src/mage/game/turn/CombatPhase.java +++ b/Mage/src/mage/game/turn/CombatPhase.java @@ -28,7 +28,7 @@ package mage.game.turn; -import mage.Constants.TurnPhase; +import mage.constants.TurnPhase; import mage.game.events.GameEvent.EventType; /** diff --git a/Mage/src/mage/game/turn/DeclareAttackersStep.java b/Mage/src/mage/game/turn/DeclareAttackersStep.java index d15aba39b34..0e1041380c3 100644 --- a/Mage/src/mage/game/turn/DeclareAttackersStep.java +++ b/Mage/src/mage/game/turn/DeclareAttackersStep.java @@ -29,7 +29,7 @@ package mage.game.turn; import java.util.UUID; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; import mage.game.Game; import mage.game.events.GameEvent.EventType; diff --git a/Mage/src/mage/game/turn/DeclareBlockersStep.java b/Mage/src/mage/game/turn/DeclareBlockersStep.java index 5900edb6d2f..1de6b3ba35a 100644 --- a/Mage/src/mage/game/turn/DeclareBlockersStep.java +++ b/Mage/src/mage/game/turn/DeclareBlockersStep.java @@ -28,7 +28,7 @@ package mage.game.turn; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; import mage.game.Game; import mage.game.events.GameEvent.EventType; diff --git a/Mage/src/mage/game/turn/DrawStep.java b/Mage/src/mage/game/turn/DrawStep.java index ac36c4d2dc4..a8100515c58 100644 --- a/Mage/src/mage/game/turn/DrawStep.java +++ b/Mage/src/mage/game/turn/DrawStep.java @@ -29,7 +29,7 @@ package mage.game.turn; import java.util.UUID; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; import mage.game.Game; import mage.game.events.GameEvent.EventType; import mage.players.Player; diff --git a/Mage/src/mage/game/turn/EndOfCombatStep.java b/Mage/src/mage/game/turn/EndOfCombatStep.java index 68a34ca155b..eef63a56a94 100644 --- a/Mage/src/mage/game/turn/EndOfCombatStep.java +++ b/Mage/src/mage/game/turn/EndOfCombatStep.java @@ -29,7 +29,7 @@ package mage.game.turn; import java.util.UUID; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; import mage.game.Game; import mage.game.events.GameEvent.EventType; diff --git a/Mage/src/mage/game/turn/EndPhase.java b/Mage/src/mage/game/turn/EndPhase.java index ef079e49fd1..55a77823493 100644 --- a/Mage/src/mage/game/turn/EndPhase.java +++ b/Mage/src/mage/game/turn/EndPhase.java @@ -28,8 +28,8 @@ package mage.game.turn; -import mage.Constants.PhaseStep; -import mage.Constants.TurnPhase; +import mage.constants.PhaseStep; +import mage.constants.TurnPhase; import mage.game.Game; import mage.game.events.GameEvent.EventType; diff --git a/Mage/src/mage/game/turn/EndStep.java b/Mage/src/mage/game/turn/EndStep.java index 30c0adfb7ec..a6a4811c319 100644 --- a/Mage/src/mage/game/turn/EndStep.java +++ b/Mage/src/mage/game/turn/EndStep.java @@ -28,7 +28,7 @@ package mage.game.turn; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; import mage.game.events.GameEvent.EventType; /** diff --git a/Mage/src/mage/game/turn/FirstCombatDamageStep.java b/Mage/src/mage/game/turn/FirstCombatDamageStep.java index 3767453d73a..71abdc9457a 100644 --- a/Mage/src/mage/game/turn/FirstCombatDamageStep.java +++ b/Mage/src/mage/game/turn/FirstCombatDamageStep.java @@ -29,7 +29,7 @@ package mage.game.turn; import java.util.UUID; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; import mage.game.Game; import mage.game.combat.CombatGroup; import mage.game.events.GameEvent.EventType; diff --git a/Mage/src/mage/game/turn/Phase.java b/Mage/src/mage/game/turn/Phase.java index eb5093907f5..545854fb56e 100644 --- a/Mage/src/mage/game/turn/Phase.java +++ b/Mage/src/mage/game/turn/Phase.java @@ -33,8 +33,8 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.UUID; -import mage.Constants.PhaseStep; -import mage.Constants.TurnPhase; +import mage.constants.PhaseStep; +import mage.constants.TurnPhase; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; diff --git a/Mage/src/mage/game/turn/PostCombatMainPhase.java b/Mage/src/mage/game/turn/PostCombatMainPhase.java index a0dfc8c80ac..f20676c6072 100644 --- a/Mage/src/mage/game/turn/PostCombatMainPhase.java +++ b/Mage/src/mage/game/turn/PostCombatMainPhase.java @@ -28,7 +28,7 @@ package mage.game.turn; -import mage.Constants.TurnPhase; +import mage.constants.TurnPhase; import mage.game.events.GameEvent.EventType; /** diff --git a/Mage/src/mage/game/turn/PostCombatMainStep.java b/Mage/src/mage/game/turn/PostCombatMainStep.java index 88f8896327d..6b9e81f73e7 100644 --- a/Mage/src/mage/game/turn/PostCombatMainStep.java +++ b/Mage/src/mage/game/turn/PostCombatMainStep.java @@ -28,7 +28,7 @@ package mage.game.turn; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; import mage.game.events.GameEvent.EventType; /** diff --git a/Mage/src/mage/game/turn/PreCombatMainPhase.java b/Mage/src/mage/game/turn/PreCombatMainPhase.java index 4851f44c209..0ac9a3ca344 100644 --- a/Mage/src/mage/game/turn/PreCombatMainPhase.java +++ b/Mage/src/mage/game/turn/PreCombatMainPhase.java @@ -28,7 +28,7 @@ package mage.game.turn; -import mage.Constants.TurnPhase; +import mage.constants.TurnPhase; import mage.game.events.GameEvent.EventType; /** diff --git a/Mage/src/mage/game/turn/PreCombatMainStep.java b/Mage/src/mage/game/turn/PreCombatMainStep.java index 7bfa9d843b5..ca5455a7880 100644 --- a/Mage/src/mage/game/turn/PreCombatMainStep.java +++ b/Mage/src/mage/game/turn/PreCombatMainStep.java @@ -28,7 +28,7 @@ package mage.game.turn; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; import mage.game.events.GameEvent.EventType; /** diff --git a/Mage/src/mage/game/turn/Step.java b/Mage/src/mage/game/turn/Step.java index 1b2382e4e5a..3cd53a79a2f 100644 --- a/Mage/src/mage/game/turn/Step.java +++ b/Mage/src/mage/game/turn/Step.java @@ -30,7 +30,7 @@ package mage.game.turn; import java.io.Serializable; import java.util.UUID; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; diff --git a/Mage/src/mage/game/turn/Turn.java b/Mage/src/mage/game/turn/Turn.java index cbc0992b831..9c94d004e9d 100644 --- a/Mage/src/mage/game/turn/Turn.java +++ b/Mage/src/mage/game/turn/Turn.java @@ -28,8 +28,8 @@ package mage.game.turn; -import mage.Constants.PhaseStep; -import mage.Constants.TurnPhase; +import mage.constants.PhaseStep; +import mage.constants.TurnPhase; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; diff --git a/Mage/src/mage/game/turn/TurnMod.java b/Mage/src/mage/game/turn/TurnMod.java index bd6cff31c27..687fd517b06 100644 --- a/Mage/src/mage/game/turn/TurnMod.java +++ b/Mage/src/mage/game/turn/TurnMod.java @@ -30,8 +30,8 @@ package mage.game.turn; import java.io.Serializable; import java.util.UUID; -import mage.Constants.PhaseStep; -import mage.Constants.TurnPhase; +import mage.constants.PhaseStep; +import mage.constants.TurnPhase; /** diff --git a/Mage/src/mage/game/turn/TurnMods.java b/Mage/src/mage/game/turn/TurnMods.java index 94ae099ac15..068f09747db 100644 --- a/Mage/src/mage/game/turn/TurnMods.java +++ b/Mage/src/mage/game/turn/TurnMods.java @@ -28,8 +28,8 @@ package mage.game.turn; -import mage.Constants.PhaseStep; -import mage.Constants.TurnPhase; +import mage.constants.PhaseStep; +import mage.constants.TurnPhase; import java.util.ArrayList; import java.util.ListIterator; diff --git a/Mage/src/mage/game/turn/UntapStep.java b/Mage/src/mage/game/turn/UntapStep.java index 3faf2d1900e..a17d8371d70 100644 --- a/Mage/src/mage/game/turn/UntapStep.java +++ b/Mage/src/mage/game/turn/UntapStep.java @@ -29,7 +29,7 @@ package mage.game.turn; import java.util.UUID; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; import mage.game.Game; import mage.game.events.GameEvent.EventType; import mage.players.Player; diff --git a/Mage/src/mage/game/turn/UpkeepStep.java b/Mage/src/mage/game/turn/UpkeepStep.java index 2f004a31e17..5d93043e50d 100644 --- a/Mage/src/mage/game/turn/UpkeepStep.java +++ b/Mage/src/mage/game/turn/UpkeepStep.java @@ -28,7 +28,7 @@ package mage.game.turn; -import mage.Constants.PhaseStep; +import mage.constants.PhaseStep; import mage.game.events.GameEvent.EventType; /** diff --git a/Mage/src/mage/players/Library.java b/Mage/src/mage/players/Library.java index 090367b5d25..1efb204f894 100644 --- a/Mage/src/mage/players/Library.java +++ b/Mage/src/mage/players/Library.java @@ -28,7 +28,7 @@ package mage.players; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.cards.Card; import mage.filter.FilterCard; import mage.game.Game; diff --git a/Mage/src/mage/players/ManaPool.java b/Mage/src/mage/players/ManaPool.java index 09e909eda75..a636d937991 100644 --- a/Mage/src/mage/players/ManaPool.java +++ b/Mage/src/mage/players/ManaPool.java @@ -29,7 +29,7 @@ package mage.players; import mage.ConditionalMana; -import mage.Constants.ManaType; +import mage.constants.ManaType; import mage.Mana; import mage.abilities.Ability; import mage.filter.Filter; diff --git a/Mage/src/mage/players/ManaPoolItem.java b/Mage/src/mage/players/ManaPoolItem.java index 738d3b2d201..64485d9277a 100644 --- a/Mage/src/mage/players/ManaPoolItem.java +++ b/Mage/src/mage/players/ManaPoolItem.java @@ -28,7 +28,7 @@ package mage.players; import mage.ConditionalMana; -import mage.Constants.ManaType; +import mage.constants.ManaType; import mage.Mana; import java.io.Serializable; diff --git a/Mage/src/mage/players/Player.java b/Mage/src/mage/players/Player.java index 2fa6d6a1372..b755ad8cc69 100644 --- a/Mage/src/mage/players/Player.java +++ b/Mage/src/mage/players/Player.java @@ -28,8 +28,8 @@ package mage.players; -import mage.Constants.Outcome; -import mage.Constants.RangeOfInfluence; +import mage.constants.Outcome; +import mage.constants.RangeOfInfluence; import mage.MageItem; import mage.MageObject; import mage.abilities.*; diff --git a/Mage/src/mage/players/PlayerImpl.java b/Mage/src/mage/players/PlayerImpl.java index cf589802f54..9ba6065ec4b 100644 --- a/Mage/src/mage/players/PlayerImpl.java +++ b/Mage/src/mage/players/PlayerImpl.java @@ -28,10 +28,8 @@ package mage.players; -import mage.Constants.AsThoughEffectType; -import mage.Constants.Outcome; -import mage.Constants.RangeOfInfluence; -import mage.Constants.Zone; +import mage.constants.*; +import mage.constants.Zone; import mage.MageObject; import mage.Mana; import mage.abilities.*; @@ -73,8 +71,7 @@ import org.apache.log4j.Logger; import java.io.Serializable; import java.util.*; -import mage.Constants; -import mage.Constants.SpellAbilityType; + import mage.cards.SplitCard; import mage.filter.FilterCard; import mage.game.stack.Spell; @@ -614,24 +611,24 @@ public abstract class PlayerImpl> implements Player, Ser for (UUID cardId : cards) { Card card =game.getCard(cardId); if (card != null) { - card.moveToZone(Constants.Zone.LIBRARY, source.getSourceId(), game, false); + card.moveToZone(Zone.LIBRARY, source.getSourceId(), game, false); } } } else { - TargetCard target = new TargetCard(Constants.Zone.PICK, new FilterCard("card to put on the bottom of your library")); + TargetCard target = new TargetCard(Zone.PICK, new FilterCard("card to put on the bottom of your library")); target.setRequired(true); while (cards.size() > 1) { - this.choose(Constants.Outcome.Neutral, cards, target, game); + this.choose(Outcome.Neutral, cards, target, game); Card chosenCard = cards.get(target.getFirstTarget(), game); if (chosenCard != null) { cards.remove(chosenCard); - chosenCard.moveToZone(Constants.Zone.LIBRARY, source.getSourceId(), game, false); + chosenCard.moveToZone(Zone.LIBRARY, source.getSourceId(), game, false); } target.clearChosen(); } if (cards.size() == 1) { Card chosenCard = cards.get(cards.iterator().next(), game); - chosenCard.moveToZone(Constants.Zone.LIBRARY, source.getSourceId(), game, false); + chosenCard.moveToZone(Zone.LIBRARY, source.getSourceId(), game, false); } } } @@ -877,22 +874,22 @@ public abstract class PlayerImpl> implements Player, Ser Card card = game.getCard(ability.getSourceId()); if (card.isSplitCard() && ability instanceof FlashbackAbility) { FlashbackAbility flashbackAbility; - if (card.getCardType().contains(Constants.CardType.INSTANT)) { - flashbackAbility = new FlashbackAbility(((SplitCard) card).getLeftHalfCard().getManaCost(), Constants.TimingRule.INSTANT); + if (card.getCardType().contains(CardType.INSTANT)) { + flashbackAbility = new FlashbackAbility(((SplitCard) card).getLeftHalfCard().getManaCost(), TimingRule.INSTANT); } else { - flashbackAbility = new FlashbackAbility(((SplitCard) card).getLeftHalfCard().getManaCost(), Constants.TimingRule.SORCERY); + flashbackAbility = new FlashbackAbility(((SplitCard) card).getLeftHalfCard().getManaCost(), TimingRule.SORCERY); } flashbackAbility.setSourceId(card.getId()); flashbackAbility.setControllerId(card.getOwnerId()); flashbackAbility.setSpellAbilityType(SpellAbilityType.SPLIT_LEFT); flashbackAbility.setAbilityName(((SplitCard) card).getLeftHalfCard().getName()); useable.put(flashbackAbility.getId(), flashbackAbility); - if (card.getCardType().contains(Constants.CardType.INSTANT)) { - flashbackAbility = new FlashbackAbility(((SplitCard) card).getRightHalfCard().getManaCost(), Constants.TimingRule.INSTANT); + if (card.getCardType().contains(CardType.INSTANT)) { + flashbackAbility = new FlashbackAbility(((SplitCard) card).getRightHalfCard().getManaCost(), TimingRule.INSTANT); } else { - flashbackAbility = new FlashbackAbility(((SplitCard) card).getRightHalfCard().getManaCost(), Constants.TimingRule.SORCERY); + flashbackAbility = new FlashbackAbility(((SplitCard) card).getRightHalfCard().getManaCost(), TimingRule.SORCERY); } flashbackAbility.setSourceId(card.getId()); flashbackAbility.setControllerId(card.getOwnerId()); diff --git a/Mage/src/mage/target/Target.java b/Mage/src/mage/target/Target.java index 86fd91be9db..b5b7ea92dee 100644 --- a/Mage/src/mage/target/Target.java +++ b/Mage/src/mage/target/Target.java @@ -28,8 +28,8 @@ package mage.target; -import mage.Constants.Outcome; -import mage.Constants.Zone; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.abilities.Ability; import mage.filter.Filter; import mage.game.Game; diff --git a/Mage/src/mage/target/TargetAmount.java b/Mage/src/mage/target/TargetAmount.java index 2896abbcf94..8d2da2c4456 100644 --- a/Mage/src/mage/target/TargetAmount.java +++ b/Mage/src/mage/target/TargetAmount.java @@ -29,7 +29,7 @@ package mage.target; import java.util.*; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; diff --git a/Mage/src/mage/target/TargetCard.java b/Mage/src/mage/target/TargetCard.java index c2db1f832de..558a3fe4a48 100644 --- a/Mage/src/mage/target/TargetCard.java +++ b/Mage/src/mage/target/TargetCard.java @@ -28,7 +28,7 @@ package mage.target; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.cards.Card; import mage.cards.Cards; import mage.filter.FilterCard; diff --git a/Mage/src/mage/target/TargetImpl.java b/Mage/src/mage/target/TargetImpl.java index c25e13d36c9..07b4b8a7dfa 100644 --- a/Mage/src/mage/target/TargetImpl.java +++ b/Mage/src/mage/target/TargetImpl.java @@ -28,8 +28,8 @@ package mage.target; -import mage.Constants.Outcome; -import mage.Constants.Zone; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.abilities.Ability; import mage.cards.Card; import mage.game.Game; diff --git a/Mage/src/mage/target/TargetObject.java b/Mage/src/mage/target/TargetObject.java index 0879c7c1b5c..4d1775705f6 100644 --- a/Mage/src/mage/target/TargetObject.java +++ b/Mage/src/mage/target/TargetObject.java @@ -28,7 +28,7 @@ package mage.target; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.MageObject; import mage.abilities.Ability; import mage.game.Game; diff --git a/Mage/src/mage/target/TargetPermanent.java b/Mage/src/mage/target/TargetPermanent.java index 152577a018f..dc05844bdb5 100644 --- a/Mage/src/mage/target/TargetPermanent.java +++ b/Mage/src/mage/target/TargetPermanent.java @@ -31,7 +31,7 @@ package mage.target; import java.util.HashSet; import java.util.Set; import java.util.UUID; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.MageObject; import mage.abilities.Ability; import mage.filter.FilterPermanent; diff --git a/Mage/src/mage/target/TargetSource.java b/Mage/src/mage/target/TargetSource.java index 5a5bd9b5b02..c6f9a06cfe3 100644 --- a/Mage/src/mage/target/TargetSource.java +++ b/Mage/src/mage/target/TargetSource.java @@ -28,7 +28,7 @@ package mage.target; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.MageObject; import mage.abilities.Ability; import mage.cards.Card; diff --git a/Mage/src/mage/target/TargetSpell.java b/Mage/src/mage/target/TargetSpell.java index a4ce9823cdc..2d69c7070cb 100644 --- a/Mage/src/mage/target/TargetSpell.java +++ b/Mage/src/mage/target/TargetSpell.java @@ -28,7 +28,7 @@ package mage.target; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.Ability; import mage.filter.FilterSpell; import mage.game.Game; diff --git a/Mage/src/mage/target/TargetStackObject.java b/Mage/src/mage/target/TargetStackObject.java index d2b4583a510..3ed4045c448 100644 --- a/Mage/src/mage/target/TargetStackObject.java +++ b/Mage/src/mage/target/TargetStackObject.java @@ -28,7 +28,7 @@ package mage.target; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.Ability; import mage.filter.FilterStackObject; import mage.game.Game; diff --git a/Mage/src/mage/target/Targets.java b/Mage/src/mage/target/Targets.java index cceb05ca44e..ebdbba8da83 100644 --- a/Mage/src/mage/target/Targets.java +++ b/Mage/src/mage/target/Targets.java @@ -31,7 +31,7 @@ package mage.target; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import mage.Constants.Outcome; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.game.Game; diff --git a/Mage/src/mage/target/common/TargetActivatedOrTriggeredAbility.java b/Mage/src/mage/target/common/TargetActivatedOrTriggeredAbility.java index 4ea52909d3a..80af554fbd2 100644 --- a/Mage/src/mage/target/common/TargetActivatedOrTriggeredAbility.java +++ b/Mage/src/mage/target/common/TargetActivatedOrTriggeredAbility.java @@ -31,7 +31,7 @@ package mage.target.common; import java.util.HashSet; import java.util.Set; import java.util.UUID; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.ActivatedAbility; import mage.abilities.TriggeredAbility; diff --git a/Mage/src/mage/target/common/TargetBasicLandCard.java b/Mage/src/mage/target/common/TargetBasicLandCard.java index 0bfbb55bc0c..af6ad774cb4 100644 --- a/Mage/src/mage/target/common/TargetBasicLandCard.java +++ b/Mage/src/mage/target/common/TargetBasicLandCard.java @@ -28,8 +28,8 @@ package mage.target.common; -import mage.Constants.CardType; -import mage.Constants.Zone; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.TargetCard; diff --git a/Mage/src/mage/target/common/TargetCardInExile.java b/Mage/src/mage/target/common/TargetCardInExile.java index 9ae9d7aef04..4322d0dd586 100644 --- a/Mage/src/mage/target/common/TargetCardInExile.java +++ b/Mage/src/mage/target/common/TargetCardInExile.java @@ -27,7 +27,7 @@ */ package mage.target.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.Ability; import mage.cards.Card; import mage.filter.FilterCard; diff --git a/Mage/src/mage/target/common/TargetCardInGraveyard.java b/Mage/src/mage/target/common/TargetCardInGraveyard.java index a795458a9ef..471d44b111f 100644 --- a/Mage/src/mage/target/common/TargetCardInGraveyard.java +++ b/Mage/src/mage/target/common/TargetCardInGraveyard.java @@ -28,7 +28,7 @@ package mage.target.common; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.Ability; import mage.cards.Card; import mage.filter.FilterCard; diff --git a/Mage/src/mage/target/common/TargetCardInHand.java b/Mage/src/mage/target/common/TargetCardInHand.java index 1f6f5d310d9..f5a490494c9 100644 --- a/Mage/src/mage/target/common/TargetCardInHand.java +++ b/Mage/src/mage/target/common/TargetCardInHand.java @@ -29,7 +29,7 @@ package mage.target.common; import java.util.UUID; -import mage.Constants.Zone; +import mage.constants.Zone; import mage.abilities.Ability; import mage.cards.Card; import mage.filter.FilterCard; diff --git a/Mage/src/mage/target/common/TargetCardInLibrary.java b/Mage/src/mage/target/common/TargetCardInLibrary.java index b2abe2d097a..82415cad9cc 100644 --- a/Mage/src/mage/target/common/TargetCardInLibrary.java +++ b/Mage/src/mage/target/common/TargetCardInLibrary.java @@ -29,8 +29,8 @@ package mage.target.common; import java.util.List; -import mage.Constants.Outcome; -import mage.Constants.Zone; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.abilities.Ability; import mage.cards.Card; import mage.cards.CardsImpl; diff --git a/Mage/src/mage/target/common/TargetCardInOpponentsGraveyard.java b/Mage/src/mage/target/common/TargetCardInOpponentsGraveyard.java index d09e46b7748..7f4be51a35f 100644 --- a/Mage/src/mage/target/common/TargetCardInOpponentsGraveyard.java +++ b/Mage/src/mage/target/common/TargetCardInOpponentsGraveyard.java @@ -1,8 +1,8 @@ package mage.target.common; -import mage.Constants; import mage.abilities.Ability; import mage.cards.Card; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.game.Game; import mage.target.TargetCard; @@ -23,7 +23,7 @@ public class TargetCardInOpponentsGraveyard extends TargetCard { target.getManaCost().clear(); target.getManaCost().add(source.getManaCost()); target.getCardType().clear(); - for (Constants.CardType type : source.getCardType()) { + for (CardType type : source.getCardType()) { target.getCardType().add(type); } target.getSubtype().clear(); diff --git a/Mage/src/mage/util/functions/CopyTokenFunction.java b/Mage/src/mage/util/functions/CopyTokenFunction.java index c4883582195..4943f498e56 100644 --- a/Mage/src/mage/util/functions/CopyTokenFunction.java +++ b/Mage/src/mage/util/functions/CopyTokenFunction.java @@ -27,10 +27,10 @@ */ package mage.util.functions; -import mage.Constants; import mage.MageObject; import mage.abilities.Ability; import mage.cards.Card; +import mage.constants.CardType; import mage.game.permanent.PermanentCard; import mage.game.permanent.PermanentToken; import mage.game.permanent.token.Token; @@ -68,7 +68,7 @@ public class CopyTokenFunction implements Function { target.getManaCost().clear(); target.getManaCost().add(sourceObj.getManaCost()); target.getCardType().clear(); - for (Constants.CardType type : sourceObj.getCardType()) { + for (CardType type : sourceObj.getCardType()) { target.getCardType().add(type); } target.getSubtype().clear(); diff --git a/Mage/src/mage/util/trace/TraceUtil.java b/Mage/src/mage/util/trace/TraceUtil.java index 14874d109bd..1e879fe4089 100644 --- a/Mage/src/mage/util/trace/TraceUtil.java +++ b/Mage/src/mage/util/trace/TraceUtil.java @@ -1,6 +1,5 @@ package mage.util.trace; -import mage.Constants; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.StaticAbility; @@ -9,6 +8,7 @@ import mage.abilities.effects.RestrictionEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.ReachAbility; import mage.abilities.keyword.UnblockableAbility; +import mage.constants.Zone; import mage.game.Game; import mage.game.combat.Combat; import mage.game.combat.CombatGroup; @@ -139,14 +139,14 @@ public class TraceUtil { log.error(uuid+" instanceof: " + (ability instanceof StaticAbility) + ", ability=" + ability); log.error(uuid+" usable: " + usable + ", ability=" + ability); if (!usable) { - Constants.Zone zone = ability.getZone(); + Zone zone = ability.getZone(); log.error(uuid+" zone: " + zone); MageObject object = game.getObject(ability.getSourceId()); log.error(uuid+" object: " + object); if (object != null) { log.error(uuid + " contains:" + object.getAbilities().contains(ability)); } - Constants.Zone test = game.getState().getZone(ability.getSourceId()); + Zone test = game.getState().getZone(ability.getSourceId()); log.error(uuid+" test_zone: " + test); } } diff --git a/Mage/src/mage/watchers/WatcherImpl.java b/Mage/src/mage/watchers/WatcherImpl.java index 16f9db0f1f9..9e4fd8ec8c6 100644 --- a/Mage/src/mage/watchers/WatcherImpl.java +++ b/Mage/src/mage/watchers/WatcherImpl.java @@ -29,7 +29,7 @@ package mage.watchers; import java.util.UUID; -import mage.Constants.WatcherScope; +import mage.constants.WatcherScope; /** * diff --git a/Mage/src/mage/watchers/common/AttackedThisTurnWatcher.java b/Mage/src/mage/watchers/common/AttackedThisTurnWatcher.java index dfcbd3425dd..94a74728d5b 100644 --- a/Mage/src/mage/watchers/common/AttackedThisTurnWatcher.java +++ b/Mage/src/mage/watchers/common/AttackedThisTurnWatcher.java @@ -27,7 +27,7 @@ */ package mage.watchers.common; -import mage.Constants; +import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.watchers.WatcherImpl; @@ -44,7 +44,7 @@ public class AttackedThisTurnWatcher extends WatcherImpl attackedThisTurnCreatures = new HashSet(); public AttackedThisTurnWatcher() { - super("AttackedThisTurn", Constants.WatcherScope.GAME); + super("AttackedThisTurn", WatcherScope.GAME); } public AttackedThisTurnWatcher(final AttackedThisTurnWatcher watcher) { diff --git a/Mage/src/mage/watchers/common/BloodthirstWatcher.java b/Mage/src/mage/watchers/common/BloodthirstWatcher.java index 25080ca3a97..10471891c64 100644 --- a/Mage/src/mage/watchers/common/BloodthirstWatcher.java +++ b/Mage/src/mage/watchers/common/BloodthirstWatcher.java @@ -27,7 +27,7 @@ */ package mage.watchers.common; -import mage.Constants.WatcherScope; +import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; diff --git a/Mage/src/mage/watchers/common/CardsPutIntoGraveyardWatcher.java b/Mage/src/mage/watchers/common/CardsPutIntoGraveyardWatcher.java index 02387c167da..0fe7d901e8b 100644 --- a/Mage/src/mage/watchers/common/CardsPutIntoGraveyardWatcher.java +++ b/Mage/src/mage/watchers/common/CardsPutIntoGraveyardWatcher.java @@ -32,8 +32,9 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; import java.util.UUID; -import mage.Constants; -import mage.Constants.WatcherScope; + +import mage.constants.WatcherScope; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -68,7 +69,7 @@ public class CardsPutIntoGraveyardWatcher extends WatcherImpl { @Override public void watch(GameEvent event, Game game) { - if (event.getType() == GameEvent.EventType.SPELL_CAST && event.getZone() == Constants.Zone.HAND) { + if (event.getType() == GameEvent.EventType.SPELL_CAST && event.getZone() == Zone.HAND) { Spell spell = (Spell) game.getObject(event.getTargetId()); if (this.getSourceId().equals(spell.getSourceId())) { condition = true; diff --git a/Mage/src/mage/watchers/common/CastSpellLastTurnWatcher.java b/Mage/src/mage/watchers/common/CastSpellLastTurnWatcher.java index cadf9e64180..ddbe9ad9154 100644 --- a/Mage/src/mage/watchers/common/CastSpellLastTurnWatcher.java +++ b/Mage/src/mage/watchers/common/CastSpellLastTurnWatcher.java @@ -30,7 +30,7 @@ package mage.watchers.common; import java.util.*; import java.util.Map.Entry; -import mage.Constants.WatcherScope; +import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.stack.Spell; diff --git a/Mage/src/mage/watchers/common/DamagedByWatcher.java b/Mage/src/mage/watchers/common/DamagedByWatcher.java index 316f6170dd3..59095ff40cf 100644 --- a/Mage/src/mage/watchers/common/DamagedByWatcher.java +++ b/Mage/src/mage/watchers/common/DamagedByWatcher.java @@ -27,7 +27,7 @@ */ package mage.watchers.common; -import mage.Constants.WatcherScope; +import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; diff --git a/Mage/src/mage/watchers/common/LandfallWatcher.java b/Mage/src/mage/watchers/common/LandfallWatcher.java index 291ce3254ee..a51201bfad5 100644 --- a/Mage/src/mage/watchers/common/LandfallWatcher.java +++ b/Mage/src/mage/watchers/common/LandfallWatcher.java @@ -1,6 +1,7 @@ package mage.watchers.common; -import mage.Constants; +import mage.constants.CardType; +import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -13,7 +14,7 @@ import mage.watchers.WatcherImpl; public class LandfallWatcher extends WatcherImpl { public LandfallWatcher() { - super("LandPlayed", Constants.WatcherScope.PLAYER); + super("LandPlayed", WatcherScope.PLAYER); } public LandfallWatcher(final LandfallWatcher watcher) { @@ -32,7 +33,7 @@ public class LandfallWatcher extends WatcherImpl { } if (event.getType() == GameEvent.EventType.ENTERS_THE_BATTLEFIELD) { Permanent permanent = game.getPermanent(event.getTargetId()); - if (permanent.getCardType().contains(Constants.CardType.LAND) && permanent.getControllerId().equals(this.controllerId)) { + if (permanent.getCardType().contains(CardType.LAND) && permanent.getControllerId().equals(this.controllerId)) { condition = true; } } diff --git a/Mage/src/mage/watchers/common/MiracleWatcher.java b/Mage/src/mage/watchers/common/MiracleWatcher.java index d20c1ea845d..00521cee4a1 100644 --- a/Mage/src/mage/watchers/common/MiracleWatcher.java +++ b/Mage/src/mage/watchers/common/MiracleWatcher.java @@ -32,9 +32,9 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; import java.util.UUID; -import mage.Constants.Outcome; -import mage.Constants.WatcherScope; -import mage.Constants.Zone; +import mage.constants.Outcome; +import mage.constants.WatcherScope; +import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCost; import mage.abilities.costs.mana.ManaCosts; diff --git a/Mage/src/mage/watchers/common/MorbidWatcher.java b/Mage/src/mage/watchers/common/MorbidWatcher.java index d1cf2e01371..d14dd6b501d 100644 --- a/Mage/src/mage/watchers/common/MorbidWatcher.java +++ b/Mage/src/mage/watchers/common/MorbidWatcher.java @@ -28,9 +28,9 @@ package mage.watchers.common; -import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.WatcherScope; +import mage.constants.CardType; +import mage.constants.WatcherScope; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -56,7 +56,7 @@ public class MorbidWatcher extends WatcherImpl { if (condition == true) //no need to check - condition has already occured return; if (event.getType() == GameEvent.EventType.ZONE_CHANGE && ((ZoneChangeEvent)event).isDiesEvent()) { - Permanent p = (Permanent) game.getLastKnownInformation(event.getTargetId(), Constants.Zone.BATTLEFIELD); + Permanent p = (Permanent) game.getLastKnownInformation(event.getTargetId(), Zone.BATTLEFIELD); if (p != null && p.getCardType().contains(CardType.CREATURE)) { condition = true; } diff --git a/Mage/src/mage/watchers/common/PlayerDamagedBySourceWatcher.java b/Mage/src/mage/watchers/common/PlayerDamagedBySourceWatcher.java index 71a1925825c..9aa5394fd19 100644 --- a/Mage/src/mage/watchers/common/PlayerDamagedBySourceWatcher.java +++ b/Mage/src/mage/watchers/common/PlayerDamagedBySourceWatcher.java @@ -27,7 +27,7 @@ */ package mage.watchers.common; -import mage.Constants.WatcherScope; +import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; diff --git a/Mage/src/mage/watchers/common/PlayerGainedLifeWatcher.java b/Mage/src/mage/watchers/common/PlayerGainedLifeWatcher.java index eeec415a847..97bc0d5851d 100644 --- a/Mage/src/mage/watchers/common/PlayerGainedLifeWatcher.java +++ b/Mage/src/mage/watchers/common/PlayerGainedLifeWatcher.java @@ -32,7 +32,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; import java.util.UUID; -import mage.Constants.WatcherScope; +import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.watchers.WatcherImpl; diff --git a/Mage/src/mage/watchers/common/PlayerLostLifeWatcher.java b/Mage/src/mage/watchers/common/PlayerLostLifeWatcher.java index c4f69955398..57fce027538 100644 --- a/Mage/src/mage/watchers/common/PlayerLostLifeWatcher.java +++ b/Mage/src/mage/watchers/common/PlayerLostLifeWatcher.java @@ -32,7 +32,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; import java.util.UUID; -import mage.Constants.WatcherScope; +import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.watchers.WatcherImpl; diff --git a/Mage/src/mage/watchers/common/SoulbondWatcher.java b/Mage/src/mage/watchers/common/SoulbondWatcher.java index 088baf23997..352a7dd470f 100644 --- a/Mage/src/mage/watchers/common/SoulbondWatcher.java +++ b/Mage/src/mage/watchers/common/SoulbondWatcher.java @@ -28,11 +28,13 @@ package mage.watchers.common; -import mage.Constants; -import mage.Constants.WatcherScope; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.WatcherScope; import mage.abilities.keyword.SoulbondAbility; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; @@ -70,18 +72,18 @@ public class SoulbondWatcher extends WatcherImpl { public void watch(GameEvent event, Game game) { if (event.getType() == GameEvent.EventType.ENTERS_THE_BATTLEFIELD) { Permanent permanent = game.getPermanent(event.getTargetId()); - if (permanent != null && permanent.getCardType().contains(Constants.CardType.CREATURE)) { + if (permanent != null && permanent.getCardType().contains(CardType.CREATURE)) { if (permanent.getAbilities().contains(SoulbondAbility.getInstance())) { Player controller = game.getPlayer(permanent.getControllerId()); if (controller != null) { - Cards cards = new CardsImpl(Constants.Zone.PICK); + Cards cards = new CardsImpl(Zone.PICK); cards.add(permanent); controller.lookAtCards("Soulbond", cards, game); - if (controller.chooseUse(Constants.Outcome.Benefit, "Use Soulbond?", game)) { + if (controller.chooseUse(Outcome.Benefit, "Use Soulbond?", game)) { TargetControlledPermanent target = new TargetControlledPermanent(filter); target.setNotTarget(true); if (target.canChoose(permanent.getId(), controller.getId(), game)) { - if (controller.choose(Constants.Outcome.Benefit, target, permanent.getId(), game)) { + if (controller.choose(Outcome.Benefit, target, permanent.getId(), game)) { Permanent chosen = game.getPermanent(target.getFirstTarget()); if (chosen != null) { chosen.setPairedCard(permanent.getId()); @@ -103,10 +105,10 @@ public class SoulbondWatcher extends WatcherImpl { controller = game.getPlayer(permanent.getControllerId()); } if (controller != null) { - Cards cards = new CardsImpl(Constants.Zone.PICK); + Cards cards = new CardsImpl(Zone.PICK); cards.add(chosen); controller.lookAtCards("Soulbond", cards, game); - if (controller.chooseUse(Constants.Outcome.Benefit, "Use Soulbond for recent " + permanent.getName() + "?", game)) { + if (controller.chooseUse(Outcome.Benefit, "Use Soulbond for recent " + permanent.getName() + "?", game)) { chosen.setPairedCard(permanent.getId()); permanent.setPairedCard(chosen.getId()); break; diff --git a/Mage/src/mage/watchers/common/SourceDidDamageWatcher.java b/Mage/src/mage/watchers/common/SourceDidDamageWatcher.java index b99cc933dff..42ccee335da 100644 --- a/Mage/src/mage/watchers/common/SourceDidDamageWatcher.java +++ b/Mage/src/mage/watchers/common/SourceDidDamageWatcher.java @@ -27,7 +27,7 @@ */ package mage.watchers.common; -import mage.Constants.WatcherScope; +import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; diff --git a/Utils/cardClass.tmpl b/Utils/cardClass.tmpl index 03f8ef15780..7f0588dc645 100644 --- a/Utils/cardClass.tmpl +++ b/Utils/cardClass.tmpl @@ -28,8 +28,8 @@ package mage.sets.[=$set=]; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity;[= +import mage.constants.CardType; +import mage.constants.Rarity;[= if ($power || $power eq 0) { $OUT .= "\nimport mage.MageInt;" } diff --git a/Utils/cardExtendedClass.tmpl b/Utils/cardExtendedClass.tmpl index 205deeeb8f3..90e7dab3b1e 100644 --- a/Utils/cardExtendedClass.tmpl +++ b/Utils/cardExtendedClass.tmpl @@ -27,7 +27,7 @@ */ package mage.sets.[=$set=]; -import java.util.UUID;[= if ($rarityExtended) {$OUT .= "\nimport mage.Constants.Rarity;"}=] +import java.util.UUID;[= if ($rarityExtended) {$OUT .= "\nimport mage.constants.Rarity;"}=] /** *