diff --git a/Mage.Common/src/mage/view/PlayerView.java b/Mage.Common/src/mage/view/PlayerView.java index 359e359428c..645ce9c25f9 100644 --- a/Mage.Common/src/mage/view/PlayerView.java +++ b/Mage.Common/src/mage/view/PlayerView.java @@ -94,7 +94,7 @@ public class PlayerView implements Serializable { this.hasLeft = player.hasLeft(); for (Card card: player.getGraveyard().getCards(game)) { - graveyard.put(card.getId(), new CardView(card)); + graveyard.put(card.getId(), new CardView(card, game, card.getId(), false)); } for (ExileZone exileZone : game.getExile().getExileZones()) { for (Card card : exileZone.getCards(game)) { 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 e99d22fea6e..e036a3f8200 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 @@ -82,6 +82,7 @@ import mage.cards.repository.CardRepository; import mage.cards.repository.ExpansionInfo; import mage.cards.repository.ExpansionRepository; import mage.choices.Choice; +import mage.choices.ChoiceColor; import mage.constants.CardType; import mage.constants.ColoredManaSymbol; import mage.constants.Outcome; @@ -166,6 +167,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { private transient List pickedCards; private transient List chosenColors; + private transient ManaCost currentUnpaidMana; public ComputerPlayer(String name, RangeOfInfluence range) { super(name, range); human = false; @@ -1091,7 +1093,9 @@ public class ComputerPlayer extends PlayerImpl implements Player { @Override public boolean playMana(ManaCost unpaid, String promptText, Game game) { payManaMode = true; + currentUnpaidMana = unpaid; boolean result = playManaHandling(unpaid, game); + currentUnpaidMana = null; payManaMode = false; return result; } @@ -1275,6 +1279,30 @@ public class ComputerPlayer extends PlayerImpl implements Player { if (choice.getMessage() != null && choice.getMessage().equals("Choose creature type")) { chooseCreatureType(outcome, choice, game); } + // choose the correct color to pay a spell + if(outcome.equals(Outcome.PutManaInPool) && choice instanceof ChoiceColor && currentUnpaidMana != null) { + if (currentUnpaidMana.containsColor(ColoredManaSymbol.W) && choice.getChoices().contains("White")) { + choice.setChoice("White"); + return true; + } + if (currentUnpaidMana.containsColor(ColoredManaSymbol.R) && choice.getChoices().contains("Red")) { + choice.setChoice("Red"); + return true; + } + if (currentUnpaidMana.containsColor(ColoredManaSymbol.G) && choice.getChoices().contains("Green")) { + choice.setChoice("Green"); + return true; + } + if (currentUnpaidMana.containsColor(ColoredManaSymbol.U) && choice.getChoices().contains("Blue")) { + choice.setChoice("Blue"); + return true; + } + if (currentUnpaidMana.containsColor(ColoredManaSymbol.B) && choice.getChoices().contains("Black")) { + choice.setChoice("Black"); + return true; + } + } + // choose by random if (!choice.isChosen()) { int choiceIdx = (int) (Math.random()*choice.getChoices().size()+1); for (String next : choice.getChoices()) { @@ -1349,10 +1377,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { public boolean chooseTarget(Outcome outcome, Cards cards, TargetCard target, Ability source, Game game) { log.debug("chooseTarget"); if (cards == null || cards.isEmpty()) { - if (!target.isRequired(source)) { - return false; - } - return true; + return target.isRequired(source); } ArrayList cardChoices = new ArrayList<>(cards.getCards(target.getFilter(), game)); @@ -1812,7 +1837,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { log.debug("[DEBUG] AI picked: " + bestCard.getName() + ", score=" + maxScore + ", deck colors=" + colors); draft.addPick(playerId, bestCard.getId(), null); } catch (Exception e) { - e.printStackTrace(); + log.debug("Exception during AI pick card for draft playerId= " +getId()); draft.addPick(playerId, cards.get(0).getId(), null); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OtherworldlyJourney.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OtherworldlyJourney.java index d8a0daeb564..35f6d792be0 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/OtherworldlyJourney.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OtherworldlyJourney.java @@ -29,21 +29,28 @@ package mage.sets.championsofkamigawa; import java.util.UUID; +import mage.MageObjectReference; import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.Ability; +import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.ReturnFromExileEffect; +import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.counter.AddCountersTargetEffect; +import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; import mage.counters.CounterType; import mage.game.ExileZone; import mage.game.Game; +import mage.game.events.GameEvent; +import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; +import mage.players.Player; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; @@ -56,7 +63,7 @@ public class OtherworldlyJourney extends CardImpl { super(ownerId, 37, "Otherworldly Journey", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); - this.color.setWhite(true); + // 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. this.getSpellAbility().addEffect(new OtherworldlyJourneyEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); @@ -94,16 +101,16 @@ class OtherworldlyJourneyEffect extends OneShotEffect { ExileZone exile = game.getExile().getExileZone(source.getSourceId()); // only if permanent is in exile (tokens would be stop to exist) if (exile != null && !exile.isEmpty()) { - //create delayed triggered ability - AtTheBeginOfNextEndStepDelayedTriggeredAbility delayedAbility = new AtTheBeginOfNextEndStepDelayedTriggeredAbility( - 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()); - delayedAbility.setSourceObject(source.getSourceObject(game), game); - AddCountersTargetEffect effect = new AddCountersTargetEffect(CounterType.P1P1.createInstance()); - effect.setTargetPointer(new FixedTarget(source.getFirstTarget())); - delayedAbility.addEffect(effect); - game.addDelayedTriggeredAbility(delayedAbility); + Card card = game.getCard(permanent.getId()); + if (card != null) { + //create delayed triggered ability + DelayedTriggeredAbility delayedAbility = + new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new OtherworldlyJourneyReturnFromExileEffect(new MageObjectReference(card, game))); + delayedAbility.setSourceId(source.getSourceId()); + delayedAbility.setControllerId(source.getControllerId()); + delayedAbility.setSourceObject(source.getSourceObject(game), game); + game.addDelayedTriggeredAbility(delayedAbility); + } } return true; } @@ -117,3 +124,83 @@ class OtherworldlyJourneyEffect extends OneShotEffect { } } + +class OtherworldlyJourneyReturnFromExileEffect extends OneShotEffect { + + MageObjectReference objectToReturn; + public OtherworldlyJourneyReturnFromExileEffect(MageObjectReference objectToReturn) { + super(Outcome.PutCardInPlay); + this.objectToReturn = objectToReturn; + staticText = "return that card to the battlefield under its owner's control with a +1/+1 counter on it"; + } + + public OtherworldlyJourneyReturnFromExileEffect(final OtherworldlyJourneyReturnFromExileEffect effect) { + super(effect); + this.objectToReturn = effect.objectToReturn; + } + + @Override + public OtherworldlyJourneyReturnFromExileEffect copy() { + return new OtherworldlyJourneyReturnFromExileEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Player controller = game.getPlayer(source.getControllerId()); + if (controller != null) { + Card card = game.getCard(objectToReturn.getSourceId()); + if (card != null && objectToReturn.refersTo(card, game)) { + game.addEffect(new OtherworldlyJourneyEntersBattlefieldEffect(objectToReturn), source); + controller.putOntoBattlefieldWithInfo(card, game, Zone.EXILED, source.getSourceId()); + } + return true; + } + return false; + } +} + + +class OtherworldlyJourneyEntersBattlefieldEffect extends ReplacementEffectImpl { + + MageObjectReference objectToReturn; + + public OtherworldlyJourneyEntersBattlefieldEffect(MageObjectReference objectToReturn) { + super(Duration.Custom, Outcome.BoostCreature); + this.objectToReturn = objectToReturn; + staticText = "that card returns to the battlefield with a +1/+1 counter on it"; + } + + public OtherworldlyJourneyEntersBattlefieldEffect(OtherworldlyJourneyEntersBattlefieldEffect effect) { + super(effect); + this.objectToReturn = effect.objectToReturn; + } + + @Override + public boolean checksEventType(GameEvent event, Game game) { + return EventType.ENTERS_THE_BATTLEFIELD.equals(event.getType()); + } + + @Override + public boolean applies(GameEvent event, Ability source, Game game) { + if (event.getType() == EventType.ENTERS_THE_BATTLEFIELD) { + return event.getTargetId().equals(objectToReturn.getSourceId()); + } + return false; + } + + @Override + public boolean replaceEvent(GameEvent event, Ability source, Game game) { + Permanent permanent = game.getPermanent(event.getTargetId()); + if (permanent != null) { + permanent.addCounters(CounterType.P1P1.createInstance(), game); + discard(); // use only once + } + return false; + } + + @Override + public OtherworldlyJourneyEntersBattlefieldEffect copy() { + return new OtherworldlyJourneyEntersBattlefieldEffect(this); + } + +} diff --git a/Mage.Sets/src/mage/sets/sixthedition/AEtherFlash.java b/Mage.Sets/src/mage/sets/classicsixthedition/AEtherFlash.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/AEtherFlash.java rename to Mage.Sets/src/mage/sets/classicsixthedition/AEtherFlash.java index 91fbb0decf5..32dd245ba75 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/AEtherFlash.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/AEtherFlash.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Abduction.java b/Mage.Sets/src/mage/sets/classicsixthedition/Abduction.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Abduction.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Abduction.java index 1c1489a96cb..d5f052383fc 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Abduction.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Abduction.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/AbyssalHunter.java b/Mage.Sets/src/mage/sets/classicsixthedition/AbyssalHunter.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/AbyssalHunter.java rename to Mage.Sets/src/mage/sets/classicsixthedition/AbyssalHunter.java index d5c98634b75..ba268590195 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/AbyssalHunter.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/AbyssalHunter.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/AbyssalSpecter.java b/Mage.Sets/src/mage/sets/classicsixthedition/AbyssalSpecter.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/AbyssalSpecter.java rename to Mage.Sets/src/mage/sets/classicsixthedition/AbyssalSpecter.java index d7d83de9136..2a116008fcd 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/AbyssalSpecter.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/AbyssalSpecter.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/AdarkarWastes.java b/Mage.Sets/src/mage/sets/classicsixthedition/AdarkarWastes.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/AdarkarWastes.java rename to Mage.Sets/src/mage/sets/classicsixthedition/AdarkarWastes.java index a9c898945ab..cd146e7c4a3 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/AdarkarWastes.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/AdarkarWastes.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/AgonizingMemories.java b/Mage.Sets/src/mage/sets/classicsixthedition/AgonizingMemories.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/AgonizingMemories.java rename to Mage.Sets/src/mage/sets/classicsixthedition/AgonizingMemories.java index 663cb0250f2..d82df1d76c3 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/AgonizingMemories.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/AgonizingMemories.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/AirElemental.java b/Mage.Sets/src/mage/sets/classicsixthedition/AirElemental.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/AirElemental.java rename to Mage.Sets/src/mage/sets/classicsixthedition/AirElemental.java index 299f7fb8c01..35fd1263b1f 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/AirElemental.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/AirElemental.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/AladdinsRing.java b/Mage.Sets/src/mage/sets/classicsixthedition/AladdinsRing.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/AladdinsRing.java rename to Mage.Sets/src/mage/sets/classicsixthedition/AladdinsRing.java index 880448a608e..8a8cb9130dc 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/AladdinsRing.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/AladdinsRing.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/AmberPrison.java b/Mage.Sets/src/mage/sets/classicsixthedition/AmberPrison.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/AmberPrison.java rename to Mage.Sets/src/mage/sets/classicsixthedition/AmberPrison.java index 4c9d81f17ad..3ff970522a7 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/AmberPrison.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/AmberPrison.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/AnabaBodyguard.java b/Mage.Sets/src/mage/sets/classicsixthedition/AnabaBodyguard.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/AnabaBodyguard.java rename to Mage.Sets/src/mage/sets/classicsixthedition/AnabaBodyguard.java index 98f4cf029e1..8b138667ee8 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/AnabaBodyguard.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/AnabaBodyguard.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/AnabaShaman.java b/Mage.Sets/src/mage/sets/classicsixthedition/AnabaShaman.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/AnabaShaman.java rename to Mage.Sets/src/mage/sets/classicsixthedition/AnabaShaman.java index 5c55c4210e5..6658384d836 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/AnabaShaman.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/AnabaShaman.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/AncestralMemories.java b/Mage.Sets/src/mage/sets/classicsixthedition/AncestralMemories.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/AncestralMemories.java rename to Mage.Sets/src/mage/sets/classicsixthedition/AncestralMemories.java index 4d70a014603..b55497e212a 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/AncestralMemories.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/AncestralMemories.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/AnimateWall.java b/Mage.Sets/src/mage/sets/classicsixthedition/AnimateWall.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/AnimateWall.java rename to Mage.Sets/src/mage/sets/classicsixthedition/AnimateWall.java index 6bf7e9491bb..fef7715b794 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/AnimateWall.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/AnimateWall.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/AnkhOfMishra.java b/Mage.Sets/src/mage/sets/classicsixthedition/AnkhOfMishra.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/AnkhOfMishra.java rename to Mage.Sets/src/mage/sets/classicsixthedition/AnkhOfMishra.java index 669c46794cd..57a623a83ab 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/AnkhOfMishra.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/AnkhOfMishra.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Archangel.java b/Mage.Sets/src/mage/sets/classicsixthedition/Archangel.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Archangel.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Archangel.java index 5abb1025136..7625fc9c5a7 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Archangel.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Archangel.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/sixthedition/ArdentMilitia.java b/Mage.Sets/src/mage/sets/classicsixthedition/ArdentMilitia.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/ArdentMilitia.java rename to Mage.Sets/src/mage/sets/classicsixthedition/ArdentMilitia.java index 121129b291f..7a494dcba38 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/ArdentMilitia.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/ArdentMilitia.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Armageddon.java b/Mage.Sets/src/mage/sets/classicsixthedition/Armageddon.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Armageddon.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Armageddon.java index bbaf917985a..b5452a6ed66 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Armageddon.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Armageddon.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/ArmoredPegasus.java b/Mage.Sets/src/mage/sets/classicsixthedition/ArmoredPegasus.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/ArmoredPegasus.java rename to Mage.Sets/src/mage/sets/classicsixthedition/ArmoredPegasus.java index 07240e2c1e7..95c694e8c81 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/ArmoredPegasus.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/ArmoredPegasus.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/AshenPowder.java b/Mage.Sets/src/mage/sets/classicsixthedition/AshenPowder.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/AshenPowder.java rename to Mage.Sets/src/mage/sets/classicsixthedition/AshenPowder.java index 7f05fc403d6..2c506e696b9 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/AshenPowder.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/AshenPowder.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/AshnodsAltar.java b/Mage.Sets/src/mage/sets/classicsixthedition/AshnodsAltar.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/AshnodsAltar.java rename to Mage.Sets/src/mage/sets/classicsixthedition/AshnodsAltar.java index e44727137ef..4a5e6f4da5b 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/AshnodsAltar.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/AshnodsAltar.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/BalduvianBarbarians.java b/Mage.Sets/src/mage/sets/classicsixthedition/BalduvianBarbarians.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/BalduvianBarbarians.java rename to Mage.Sets/src/mage/sets/classicsixthedition/BalduvianBarbarians.java index 539568888c7..177e7dd0474 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/BalduvianBarbarians.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/BalduvianBarbarians.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/BalduvianHorde.java b/Mage.Sets/src/mage/sets/classicsixthedition/BalduvianHorde.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/BalduvianHorde.java rename to Mage.Sets/src/mage/sets/classicsixthedition/BalduvianHorde.java index ea3d4d843ab..84a0db6a2f7 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/BalduvianHorde.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/BalduvianHorde.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/BirdsOfParadise.java b/Mage.Sets/src/mage/sets/classicsixthedition/BirdsOfParadise.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/BirdsOfParadise.java rename to Mage.Sets/src/mage/sets/classicsixthedition/BirdsOfParadise.java index baeeac290d4..57c6c02fe3e 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/BirdsOfParadise.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/BirdsOfParadise.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Blaze.java b/Mage.Sets/src/mage/sets/classicsixthedition/Blaze.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Blaze.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Blaze.java index 6844efdec10..5ea9438019a 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Blaze.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Blaze.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Blight.java b/Mage.Sets/src/mage/sets/classicsixthedition/Blight.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Blight.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Blight.java index 48e624c47cf..c5ce793c06e 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Blight.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Blight.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/BlightedShaman.java b/Mage.Sets/src/mage/sets/classicsixthedition/BlightedShaman.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/BlightedShaman.java rename to Mage.Sets/src/mage/sets/classicsixthedition/BlightedShaman.java index d800d50c448..0b31baf2f05 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/BlightedShaman.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/BlightedShaman.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/BloodPet.java b/Mage.Sets/src/mage/sets/classicsixthedition/BloodPet.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/BloodPet.java rename to Mage.Sets/src/mage/sets/classicsixthedition/BloodPet.java index 228f47c2c2f..f20836603c7 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/BloodPet.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/BloodPet.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/BogImp.java b/Mage.Sets/src/mage/sets/classicsixthedition/BogImp.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/BogImp.java rename to Mage.Sets/src/mage/sets/classicsixthedition/BogImp.java index ec2dab7c730..b387a4e21da 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/BogImp.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/BogImp.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/BogRats.java b/Mage.Sets/src/mage/sets/classicsixthedition/BogRats.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/BogRats.java rename to Mage.Sets/src/mage/sets/classicsixthedition/BogRats.java index 064b7ad3be5..92e9a214eb3 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/BogRats.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/BogRats.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/BogWraith.java b/Mage.Sets/src/mage/sets/classicsixthedition/BogWraith.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/BogWraith.java rename to Mage.Sets/src/mage/sets/classicsixthedition/BogWraith.java index 418a0628bb3..1495092a55e 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/BogWraith.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/BogWraith.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Boil.java b/Mage.Sets/src/mage/sets/classicsixthedition/Boil.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Boil.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Boil.java index e2abead9e88..eb45a44b3db 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Boil.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Boil.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Boomerang.java b/Mage.Sets/src/mage/sets/classicsixthedition/Boomerang.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Boomerang.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Boomerang.java index 06ed37cbfd8..7582e15b849 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Boomerang.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Boomerang.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/BottleOfSuleiman.java b/Mage.Sets/src/mage/sets/classicsixthedition/BottleOfSuleiman.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/BottleOfSuleiman.java rename to Mage.Sets/src/mage/sets/classicsixthedition/BottleOfSuleiman.java index be99518e520..8a26d9a7ea3 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/BottleOfSuleiman.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/BottleOfSuleiman.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Browse.java b/Mage.Sets/src/mage/sets/classicsixthedition/Browse.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Browse.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Browse.java index 6a4c160155e..56c0a76a39b 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Browse.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Browse.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Brushland.java b/Mage.Sets/src/mage/sets/classicsixthedition/Brushland.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Brushland.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Brushland.java index 71e539387a2..506f1e5921b 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Brushland.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Brushland.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Burrowing.java b/Mage.Sets/src/mage/sets/classicsixthedition/Burrowing.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Burrowing.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Burrowing.java index 352bba965ee..d0f17a30904 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Burrowing.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Burrowing.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/CallOfTheWild.java b/Mage.Sets/src/mage/sets/classicsixthedition/CallOfTheWild.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/CallOfTheWild.java rename to Mage.Sets/src/mage/sets/classicsixthedition/CallOfTheWild.java index 0daba18eec4..e81a3f92b8c 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/CallOfTheWild.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/CallOfTheWild.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Castle.java b/Mage.Sets/src/mage/sets/classicsixthedition/Castle.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Castle.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Castle.java index 8a00b28208a..1c507e1e087 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Castle.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Castle.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/CatWarriors.java b/Mage.Sets/src/mage/sets/classicsixthedition/CatWarriors.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/CatWarriors.java rename to Mage.Sets/src/mage/sets/classicsixthedition/CatWarriors.java index 3f266a609cc..707fd29939c 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/CatWarriors.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/CatWarriors.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/CharcoalDiamond.java b/Mage.Sets/src/mage/sets/classicsixthedition/CharcoalDiamond.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/CharcoalDiamond.java rename to Mage.Sets/src/mage/sets/classicsixthedition/CharcoalDiamond.java index 7ce4d1b31d9..84b273169cd 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/CharcoalDiamond.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/CharcoalDiamond.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Chill.java b/Mage.Sets/src/mage/sets/classicsixthedition/Chill.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Chill.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Chill.java index 6d789343be5..b2dfd8715a2 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Chill.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Chill.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/CircleOfProtectionBlack.java b/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionBlack.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/CircleOfProtectionBlack.java rename to Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionBlack.java index 692cb25ecd2..77872f6c190 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/CircleOfProtectionBlack.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionBlack.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/CircleOfProtectionBlue.java b/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionBlue.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/CircleOfProtectionBlue.java rename to Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionBlue.java index 6ee103b6a45..ca48e68b64b 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/CircleOfProtectionBlue.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionBlue.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/CircleOfProtectionGreen.java b/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionGreen.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/CircleOfProtectionGreen.java rename to Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionGreen.java index 1d0e2bf3b40..f520fceee24 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/CircleOfProtectionGreen.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionGreen.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/CircleOfProtectionRed.java b/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionRed.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/CircleOfProtectionRed.java rename to Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionRed.java index b387ec76732..d56d883b7c9 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/CircleOfProtectionRed.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionRed.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/CircleOfProtectionWhite.java b/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionWhite.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/CircleOfProtectionWhite.java rename to Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionWhite.java index c81a7953bcd..c98a36e973b 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/CircleOfProtectionWhite.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionWhite.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/CityOfBrass.java b/Mage.Sets/src/mage/sets/classicsixthedition/CityOfBrass.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/CityOfBrass.java rename to Mage.Sets/src/mage/sets/classicsixthedition/CityOfBrass.java index 87d82dfde8a..87aaf7f788e 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/CityOfBrass.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/CityOfBrass.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Coercion.java b/Mage.Sets/src/mage/sets/classicsixthedition/Coercion.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Coercion.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Coercion.java index 154f4ca6b38..a745513f9a0 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Coercion.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Coercion.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Conquer.java b/Mage.Sets/src/mage/sets/classicsixthedition/Conquer.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Conquer.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Conquer.java index ea0b55d3d20..c3dc73d9513 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Conquer.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Conquer.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Counterspell.java b/Mage.Sets/src/mage/sets/classicsixthedition/Counterspell.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Counterspell.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Counterspell.java index 1a8cbf62fb5..c5e2fe43567 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Counterspell.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Counterspell.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/CreepingMold.java b/Mage.Sets/src/mage/sets/classicsixthedition/CreepingMold.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/CreepingMold.java rename to Mage.Sets/src/mage/sets/classicsixthedition/CreepingMold.java index dd175a483a9..691a281cc26 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/CreepingMold.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/CreepingMold.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/CrimsonHellkite.java b/Mage.Sets/src/mage/sets/classicsixthedition/CrimsonHellkite.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/CrimsonHellkite.java rename to Mage.Sets/src/mage/sets/classicsixthedition/CrimsonHellkite.java index e56decf20a3..d964d5299ac 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/CrimsonHellkite.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/CrimsonHellkite.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Crusade.java b/Mage.Sets/src/mage/sets/classicsixthedition/Crusade.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Crusade.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Crusade.java index 78fcbf9378a..52f5dddd6fb 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Crusade.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Crusade.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/CrystalRod.java b/Mage.Sets/src/mage/sets/classicsixthedition/CrystalRod.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/CrystalRod.java rename to Mage.Sets/src/mage/sets/classicsixthedition/CrystalRod.java index ce5c139afb6..f6281bd9f97 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/CrystalRod.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/CrystalRod.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/CrystalVein.java b/Mage.Sets/src/mage/sets/classicsixthedition/CrystalVein.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/CrystalVein.java rename to Mage.Sets/src/mage/sets/classicsixthedition/CrystalVein.java index 2127f18c1f7..ad099347dca 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/CrystalVein.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/CrystalVein.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/CursedTotem.java b/Mage.Sets/src/mage/sets/classicsixthedition/CursedTotem.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/CursedTotem.java rename to Mage.Sets/src/mage/sets/classicsixthedition/CursedTotem.java index cd229ac1ae1..3c3964bdf49 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/CursedTotem.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/CursedTotem.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/DAvenantArcher.java b/Mage.Sets/src/mage/sets/classicsixthedition/DAvenantArcher.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/DAvenantArcher.java rename to Mage.Sets/src/mage/sets/classicsixthedition/DAvenantArcher.java index f5c39e32aff..0aee8112536 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/DAvenantArcher.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/DAvenantArcher.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/DancingScimitar.java b/Mage.Sets/src/mage/sets/classicsixthedition/DancingScimitar.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/DancingScimitar.java rename to Mage.Sets/src/mage/sets/classicsixthedition/DancingScimitar.java index f4cad3eb299..e8d967e76ef 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/DancingScimitar.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/DancingScimitar.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/sixthedition/DarajaGriffin.java b/Mage.Sets/src/mage/sets/classicsixthedition/DarajaGriffin.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/DarajaGriffin.java rename to Mage.Sets/src/mage/sets/classicsixthedition/DarajaGriffin.java index d96882ae046..0a061a75a63 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/DarajaGriffin.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/DarajaGriffin.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/DaringApprentice.java b/Mage.Sets/src/mage/sets/classicsixthedition/DaringApprentice.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/DaringApprentice.java rename to Mage.Sets/src/mage/sets/classicsixthedition/DaringApprentice.java index ed9d11ddf4d..9cf1103f565 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/DaringApprentice.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/DaringApprentice.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Deflection.java b/Mage.Sets/src/mage/sets/classicsixthedition/Deflection.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Deflection.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Deflection.java index 186fc50ea80..cd40c3ee767 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Deflection.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Deflection.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/DenseFoliage.java b/Mage.Sets/src/mage/sets/classicsixthedition/DenseFoliage.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/DenseFoliage.java rename to Mage.Sets/src/mage/sets/classicsixthedition/DenseFoliage.java index 8081ae1a486..7e3545f262d 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/DenseFoliage.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/DenseFoliage.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Derelor.java b/Mage.Sets/src/mage/sets/classicsixthedition/Derelor.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Derelor.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Derelor.java index 93d8340288b..797a6cdea91 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Derelor.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Derelor.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Desertion.java b/Mage.Sets/src/mage/sets/classicsixthedition/Desertion.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Desertion.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Desertion.java index 6522dde513a..e56a3259e72 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Desertion.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Desertion.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/DiminishingReturns.java b/Mage.Sets/src/mage/sets/classicsixthedition/DiminishingReturns.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/DiminishingReturns.java rename to Mage.Sets/src/mage/sets/classicsixthedition/DiminishingReturns.java index d179e4b093b..711ac285aed 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/DiminishingReturns.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/DiminishingReturns.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/DingusEgg.java b/Mage.Sets/src/mage/sets/classicsixthedition/DingusEgg.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/DingusEgg.java rename to Mage.Sets/src/mage/sets/classicsixthedition/DingusEgg.java index e0317d366e3..5e139e88241 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/DingusEgg.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/DingusEgg.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Disenchant.java b/Mage.Sets/src/mage/sets/classicsixthedition/Disenchant.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Disenchant.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Disenchant.java index ed854710d1e..bd3f65e6815 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Disenchant.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Disenchant.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/DisruptingScepter.java b/Mage.Sets/src/mage/sets/classicsixthedition/DisruptingScepter.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/DisruptingScepter.java rename to Mage.Sets/src/mage/sets/classicsixthedition/DisruptingScepter.java index 26a6c08601b..aa81028b397 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/DisruptingScepter.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/DisruptingScepter.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/DivineTransformation.java b/Mage.Sets/src/mage/sets/classicsixthedition/DivineTransformation.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/DivineTransformation.java rename to Mage.Sets/src/mage/sets/classicsixthedition/DivineTransformation.java index cce56383caa..d6f14e59c20 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/DivineTransformation.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/DivineTransformation.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Doomsday.java b/Mage.Sets/src/mage/sets/classicsixthedition/Doomsday.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Doomsday.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Doomsday.java index f9c9753d046..103a1aa61ee 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Doomsday.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Doomsday.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/DragonEngine.java b/Mage.Sets/src/mage/sets/classicsixthedition/DragonEngine.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/DragonEngine.java rename to Mage.Sets/src/mage/sets/classicsixthedition/DragonEngine.java index 76f68633046..450e1d26758 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/DragonEngine.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/DragonEngine.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/DragonMask.java b/Mage.Sets/src/mage/sets/classicsixthedition/DragonMask.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/DragonMask.java rename to Mage.Sets/src/mage/sets/classicsixthedition/DragonMask.java index c410a0d960c..16d096b9735 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/DragonMask.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/DragonMask.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/DreadOfNight.java b/Mage.Sets/src/mage/sets/classicsixthedition/DreadOfNight.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/DreadOfNight.java rename to Mage.Sets/src/mage/sets/classicsixthedition/DreadOfNight.java index d317f241fe4..ddfa85d32a6 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/DreadOfNight.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/DreadOfNight.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/DreamCache.java b/Mage.Sets/src/mage/sets/classicsixthedition/DreamCache.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/DreamCache.java rename to Mage.Sets/src/mage/sets/classicsixthedition/DreamCache.java index 47e755eb13b..4611509aeaf 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/DreamCache.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/DreamCache.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/DrudgeSkeletons.java b/Mage.Sets/src/mage/sets/classicsixthedition/DrudgeSkeletons.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/DrudgeSkeletons.java rename to Mage.Sets/src/mage/sets/classicsixthedition/DrudgeSkeletons.java index 7c8bfe77c12..6643e745950 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/DrudgeSkeletons.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/DrudgeSkeletons.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/DrySpell.java b/Mage.Sets/src/mage/sets/classicsixthedition/DrySpell.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/DrySpell.java rename to Mage.Sets/src/mage/sets/classicsixthedition/DrySpell.java index fe95fd5889c..67c46c74ad5 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/DrySpell.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/DrySpell.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/DwarvenRuins.java b/Mage.Sets/src/mage/sets/classicsixthedition/DwarvenRuins.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/DwarvenRuins.java rename to Mage.Sets/src/mage/sets/classicsixthedition/DwarvenRuins.java index 8647cf9d01f..46a33979fbe 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/DwarvenRuins.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/DwarvenRuins.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/EarlyHarvest.java b/Mage.Sets/src/mage/sets/classicsixthedition/EarlyHarvest.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/EarlyHarvest.java rename to Mage.Sets/src/mage/sets/classicsixthedition/EarlyHarvest.java index a6da55f486e..cea148dae0e 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/EarlyHarvest.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/EarlyHarvest.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Earthquake.java b/Mage.Sets/src/mage/sets/classicsixthedition/Earthquake.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Earthquake.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Earthquake.java index b9ad588cfa8..24912fbb047 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Earthquake.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Earthquake.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/EbonStronghold.java b/Mage.Sets/src/mage/sets/classicsixthedition/EbonStronghold.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/EbonStronghold.java rename to Mage.Sets/src/mage/sets/classicsixthedition/EbonStronghold.java index a0503fdf410..165df7ed1c9 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/EbonStronghold.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/EbonStronghold.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/EkunduGriffin.java b/Mage.Sets/src/mage/sets/classicsixthedition/EkunduGriffin.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/EkunduGriffin.java rename to Mage.Sets/src/mage/sets/classicsixthedition/EkunduGriffin.java index 0a6424c9fa2..e2031decda6 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/EkunduGriffin.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/EkunduGriffin.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/ElderDruid.java b/Mage.Sets/src/mage/sets/classicsixthedition/ElderDruid.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/ElderDruid.java rename to Mage.Sets/src/mage/sets/classicsixthedition/ElderDruid.java index 55dfdd4b959..579bce918ad 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/ElderDruid.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/ElderDruid.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/ElvenCache.java b/Mage.Sets/src/mage/sets/classicsixthedition/ElvenCache.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/ElvenCache.java rename to Mage.Sets/src/mage/sets/classicsixthedition/ElvenCache.java index 4ff98b68d84..b06cda8f1ea 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/ElvenCache.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/ElvenCache.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/ElvenRiders.java b/Mage.Sets/src/mage/sets/classicsixthedition/ElvenRiders.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/ElvenRiders.java rename to Mage.Sets/src/mage/sets/classicsixthedition/ElvenRiders.java index 871eacdaccd..a7415039bcb 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/ElvenRiders.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/ElvenRiders.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/ElvishArchers.java b/Mage.Sets/src/mage/sets/classicsixthedition/ElvishArchers.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/ElvishArchers.java rename to Mage.Sets/src/mage/sets/classicsixthedition/ElvishArchers.java index 24bd9477497..eb8907a9db8 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/ElvishArchers.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/ElvishArchers.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Enfeeblement.java b/Mage.Sets/src/mage/sets/classicsixthedition/Enfeeblement.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Enfeeblement.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Enfeeblement.java index 09d4d15014b..892f39715e8 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Enfeeblement.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Enfeeblement.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/EnlightenedTutor.java b/Mage.Sets/src/mage/sets/classicsixthedition/EnlightenedTutor.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/EnlightenedTutor.java rename to Mage.Sets/src/mage/sets/classicsixthedition/EnlightenedTutor.java index 8a3d740bf65..1fae522c615 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/EnlightenedTutor.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/EnlightenedTutor.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/EtherealChampion.java b/Mage.Sets/src/mage/sets/classicsixthedition/EtherealChampion.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/EtherealChampion.java rename to Mage.Sets/src/mage/sets/classicsixthedition/EtherealChampion.java index b6dc52d6470..b765fd4e576 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/EtherealChampion.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/EtherealChampion.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/EvilEyeOfOrmsByGore.java b/Mage.Sets/src/mage/sets/classicsixthedition/EvilEyeOfOrmsByGore.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/EvilEyeOfOrmsByGore.java rename to Mage.Sets/src/mage/sets/classicsixthedition/EvilEyeOfOrmsByGore.java index 67c18636158..fb228c3ab4b 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/EvilEyeOfOrmsByGore.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/EvilEyeOfOrmsByGore.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Exile.java b/Mage.Sets/src/mage/sets/classicsixthedition/Exile.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Exile.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Exile.java index 3f6b721f352..354938a0664 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Exile.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Exile.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/FallenAngel.java b/Mage.Sets/src/mage/sets/classicsixthedition/FallenAngel.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/FallenAngel.java rename to Mage.Sets/src/mage/sets/classicsixthedition/FallenAngel.java index 1184400b322..f292643fff7 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/FallenAngel.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/FallenAngel.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/FallowEarth.java b/Mage.Sets/src/mage/sets/classicsixthedition/FallowEarth.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/FallowEarth.java rename to Mage.Sets/src/mage/sets/classicsixthedition/FallowEarth.java index a033123caa5..04587e6c10f 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/FallowEarth.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/FallowEarth.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/FamiliarGround.java b/Mage.Sets/src/mage/sets/classicsixthedition/FamiliarGround.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/FamiliarGround.java rename to Mage.Sets/src/mage/sets/classicsixthedition/FamiliarGround.java index 7951162321c..b1731dc502c 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/FamiliarGround.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/FamiliarGround.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/FatalBlow.java b/Mage.Sets/src/mage/sets/classicsixthedition/FatalBlow.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/FatalBlow.java rename to Mage.Sets/src/mage/sets/classicsixthedition/FatalBlow.java index d896c279a08..4f7d7457f98 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/FatalBlow.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/FatalBlow.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Fear.java b/Mage.Sets/src/mage/sets/classicsixthedition/Fear.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Fear.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Fear.java index 1a1e124fc82..d9e22453fd9 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Fear.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Fear.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/FeastOfTheUnicorn.java b/Mage.Sets/src/mage/sets/classicsixthedition/FeastOfTheUnicorn.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/FeastOfTheUnicorn.java rename to Mage.Sets/src/mage/sets/classicsixthedition/FeastOfTheUnicorn.java index 114a51fcbeb..dd0d65dca41 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/FeastOfTheUnicorn.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/FeastOfTheUnicorn.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/FemerefArchers.java b/Mage.Sets/src/mage/sets/classicsixthedition/FemerefArchers.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/FemerefArchers.java rename to Mage.Sets/src/mage/sets/classicsixthedition/FemerefArchers.java index 761e129d157..28c1ff14e65 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/FemerefArchers.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/FemerefArchers.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/FeralShadow.java b/Mage.Sets/src/mage/sets/classicsixthedition/FeralShadow.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/FeralShadow.java rename to Mage.Sets/src/mage/sets/classicsixthedition/FeralShadow.java index 07233fcc0e4..6d0125e3e16 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/FeralShadow.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/FeralShadow.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Fervor.java b/Mage.Sets/src/mage/sets/classicsixthedition/Fervor.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Fervor.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Fervor.java index 58c609b5141..ce62785287b 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Fervor.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Fervor.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/FinalFortune.java b/Mage.Sets/src/mage/sets/classicsixthedition/FinalFortune.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/FinalFortune.java rename to Mage.Sets/src/mage/sets/classicsixthedition/FinalFortune.java index ba0469bbcdc..ebc93592e32 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/FinalFortune.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/FinalFortune.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/FireDiamond.java b/Mage.Sets/src/mage/sets/classicsixthedition/FireDiamond.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/FireDiamond.java rename to Mage.Sets/src/mage/sets/classicsixthedition/FireDiamond.java index d5ce9dd8d18..c1c61914c05 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/FireDiamond.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/FireDiamond.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/FireElemental.java b/Mage.Sets/src/mage/sets/classicsixthedition/FireElemental.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/FireElemental.java rename to Mage.Sets/src/mage/sets/classicsixthedition/FireElemental.java index dc621e6b45a..e1fcaaed80b 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/FireElemental.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/FireElemental.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Firebreathing.java b/Mage.Sets/src/mage/sets/classicsixthedition/Firebreathing.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Firebreathing.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Firebreathing.java index a867d2209ce..2bc771194ce 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Firebreathing.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Firebreathing.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/FitOfRage.java b/Mage.Sets/src/mage/sets/classicsixthedition/FitOfRage.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/FitOfRage.java rename to Mage.Sets/src/mage/sets/classicsixthedition/FitOfRage.java index 8c37131ae07..67a44213c49 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/FitOfRage.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/FitOfRage.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/FlameSpirit.java b/Mage.Sets/src/mage/sets/classicsixthedition/FlameSpirit.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/FlameSpirit.java rename to Mage.Sets/src/mage/sets/classicsixthedition/FlameSpirit.java index 8a28b36f279..2622800b275 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/FlameSpirit.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/FlameSpirit.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Flash.java b/Mage.Sets/src/mage/sets/classicsixthedition/Flash.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Flash.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Flash.java index 8926a43ad24..039e26358c6 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Flash.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Flash.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Flashfires.java b/Mage.Sets/src/mage/sets/classicsixthedition/Flashfires.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Flashfires.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Flashfires.java index b8555aef73a..772dd06962d 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Flashfires.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Flashfires.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Flight.java b/Mage.Sets/src/mage/sets/classicsixthedition/Flight.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Flight.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Flight.java index 831869cecca..0d8de58780f 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Flight.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Flight.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/FlyingCarpet.java b/Mage.Sets/src/mage/sets/classicsixthedition/FlyingCarpet.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/FlyingCarpet.java rename to Mage.Sets/src/mage/sets/classicsixthedition/FlyingCarpet.java index a8827283e5a..f63a9e9eb64 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/FlyingCarpet.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/FlyingCarpet.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Fog.java b/Mage.Sets/src/mage/sets/classicsixthedition/Fog.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Fog.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Fog.java index fb3534b6797..a08a5b0639e 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Fog.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Fog.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/FogElemental.java b/Mage.Sets/src/mage/sets/classicsixthedition/FogElemental.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/FogElemental.java rename to Mage.Sets/src/mage/sets/classicsixthedition/FogElemental.java index f51abf9526c..f0b716e4f18 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/FogElemental.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/FogElemental.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/sixthedition/ForbiddenCrypt.java b/Mage.Sets/src/mage/sets/classicsixthedition/ForbiddenCrypt.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/ForbiddenCrypt.java rename to Mage.Sets/src/mage/sets/classicsixthedition/ForbiddenCrypt.java index 444c5040ea1..5fbba0bd7ea 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/ForbiddenCrypt.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/ForbiddenCrypt.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Forest1.java b/Mage.Sets/src/mage/sets/classicsixthedition/Forest1.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Forest1.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Forest1.java index 5ebc5be62fe..922f713ed14 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Forest1.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Forest1.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Forest2.java b/Mage.Sets/src/mage/sets/classicsixthedition/Forest2.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Forest2.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Forest2.java index 6df0453aec3..5a7a19bd6d8 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Forest2.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Forest2.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Forest3.java b/Mage.Sets/src/mage/sets/classicsixthedition/Forest3.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Forest3.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Forest3.java index d1ccbe58f74..4e1c709cc88 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Forest3.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Forest3.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Forest4.java b/Mage.Sets/src/mage/sets/classicsixthedition/Forest4.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Forest4.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Forest4.java index 16a5107fa63..cd6a94ce832 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Forest4.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Forest4.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Forget.java b/Mage.Sets/src/mage/sets/classicsixthedition/Forget.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Forget.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Forget.java index 6128ef54ef2..6f0b08e96b8 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Forget.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Forget.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/FountainOfYouth.java b/Mage.Sets/src/mage/sets/classicsixthedition/FountainOfYouth.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/FountainOfYouth.java rename to Mage.Sets/src/mage/sets/classicsixthedition/FountainOfYouth.java index 5b0ab7bccbd..9a291f61845 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/FountainOfYouth.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/FountainOfYouth.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/FyndhornBrownie.java b/Mage.Sets/src/mage/sets/classicsixthedition/FyndhornBrownie.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/FyndhornBrownie.java rename to Mage.Sets/src/mage/sets/classicsixthedition/FyndhornBrownie.java index 240ea98821d..7d2e2d193d8 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/FyndhornBrownie.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/FyndhornBrownie.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/FyndhornElder.java b/Mage.Sets/src/mage/sets/classicsixthedition/FyndhornElder.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/FyndhornElder.java rename to Mage.Sets/src/mage/sets/classicsixthedition/FyndhornElder.java index 7748543e159..11d762ae9ee 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/FyndhornElder.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/FyndhornElder.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/GaseousForm.java b/Mage.Sets/src/mage/sets/classicsixthedition/GaseousForm.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/GaseousForm.java rename to Mage.Sets/src/mage/sets/classicsixthedition/GaseousForm.java index 80c91defa81..c509e71c7bc 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/GaseousForm.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/GaseousForm.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/GiantGrowth.java b/Mage.Sets/src/mage/sets/classicsixthedition/GiantGrowth.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/GiantGrowth.java rename to Mage.Sets/src/mage/sets/classicsixthedition/GiantGrowth.java index f7c011256f4..c3c42652152 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/GiantGrowth.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/GiantGrowth.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/GiantSpider.java b/Mage.Sets/src/mage/sets/classicsixthedition/GiantSpider.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/GiantSpider.java rename to Mage.Sets/src/mage/sets/classicsixthedition/GiantSpider.java index e2fe4add905..7e156787305 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/GiantSpider.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/GiantSpider.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/GiantStrength.java b/Mage.Sets/src/mage/sets/classicsixthedition/GiantStrength.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/GiantStrength.java rename to Mage.Sets/src/mage/sets/classicsixthedition/GiantStrength.java index f33816e91a9..27dfdbfa654 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/GiantStrength.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/GiantStrength.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/GlacialWall.java b/Mage.Sets/src/mage/sets/classicsixthedition/GlacialWall.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/GlacialWall.java rename to Mage.Sets/src/mage/sets/classicsixthedition/GlacialWall.java index c807631c21d..afc233eb281 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/GlacialWall.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/GlacialWall.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/GlassesOfUrza.java b/Mage.Sets/src/mage/sets/classicsixthedition/GlassesOfUrza.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/GlassesOfUrza.java rename to Mage.Sets/src/mage/sets/classicsixthedition/GlassesOfUrza.java index ab8692e89c6..efcf78542c0 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/GlassesOfUrza.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/GlassesOfUrza.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/GoblinDiggingTeam.java b/Mage.Sets/src/mage/sets/classicsixthedition/GoblinDiggingTeam.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/GoblinDiggingTeam.java rename to Mage.Sets/src/mage/sets/classicsixthedition/GoblinDiggingTeam.java index 3b47508680f..574fb9ae106 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/GoblinDiggingTeam.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/GoblinDiggingTeam.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/GoblinEliteInfantry.java b/Mage.Sets/src/mage/sets/classicsixthedition/GoblinEliteInfantry.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/GoblinEliteInfantry.java rename to Mage.Sets/src/mage/sets/classicsixthedition/GoblinEliteInfantry.java index a5f96dded22..0c1f00ecced 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/GoblinEliteInfantry.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/GoblinEliteInfantry.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/GoblinHero.java b/Mage.Sets/src/mage/sets/classicsixthedition/GoblinHero.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/GoblinHero.java rename to Mage.Sets/src/mage/sets/classicsixthedition/GoblinHero.java index c2359a318c8..3825e428996 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/GoblinHero.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/GoblinHero.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/GoblinKing.java b/Mage.Sets/src/mage/sets/classicsixthedition/GoblinKing.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/GoblinKing.java rename to Mage.Sets/src/mage/sets/classicsixthedition/GoblinKing.java index 54db821a511..55bcff52e87 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/GoblinKing.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/GoblinKing.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/GoblinRecruiter.java b/Mage.Sets/src/mage/sets/classicsixthedition/GoblinRecruiter.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/GoblinRecruiter.java rename to Mage.Sets/src/mage/sets/classicsixthedition/GoblinRecruiter.java index 323c838b3ed..f0be7ef51ee 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/GoblinRecruiter.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/GoblinRecruiter.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/GoblinWarrens.java b/Mage.Sets/src/mage/sets/classicsixthedition/GoblinWarrens.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/GoblinWarrens.java rename to Mage.Sets/src/mage/sets/classicsixthedition/GoblinWarrens.java index e66d882ac8d..909693ca28a 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/GoblinWarrens.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/GoblinWarrens.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/GorillaChieftain.java b/Mage.Sets/src/mage/sets/classicsixthedition/GorillaChieftain.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/GorillaChieftain.java rename to Mage.Sets/src/mage/sets/classicsixthedition/GorillaChieftain.java index 43ba1c55d16..9705fc3bd2c 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/GorillaChieftain.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/GorillaChieftain.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/GravebaneZombie.java b/Mage.Sets/src/mage/sets/classicsixthedition/GravebaneZombie.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/GravebaneZombie.java rename to Mage.Sets/src/mage/sets/classicsixthedition/GravebaneZombie.java index 8a8032ce5d5..b26dc735476 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/GravebaneZombie.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/GravebaneZombie.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Gravedigger.java b/Mage.Sets/src/mage/sets/classicsixthedition/Gravedigger.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Gravedigger.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Gravedigger.java index 277853d83d3..e19774083d7 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Gravedigger.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Gravedigger.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Greed.java b/Mage.Sets/src/mage/sets/classicsixthedition/Greed.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Greed.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Greed.java index 043e1b41570..44ae0aa440d 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Greed.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Greed.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/GrinningTotem.java b/Mage.Sets/src/mage/sets/classicsixthedition/GrinningTotem.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/GrinningTotem.java rename to Mage.Sets/src/mage/sets/classicsixthedition/GrinningTotem.java index 99953931819..8f9a51b17e5 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/GrinningTotem.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/GrinningTotem.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/sixthedition/GrizzlyBears.java b/Mage.Sets/src/mage/sets/classicsixthedition/GrizzlyBears.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/GrizzlyBears.java rename to Mage.Sets/src/mage/sets/classicsixthedition/GrizzlyBears.java index 91cace53ae4..32ea0ff444d 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/GrizzlyBears.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/GrizzlyBears.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/HammerOfBogardan.java b/Mage.Sets/src/mage/sets/classicsixthedition/HammerOfBogardan.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/HammerOfBogardan.java rename to Mage.Sets/src/mage/sets/classicsixthedition/HammerOfBogardan.java index ce228b4200d..6ea8e285761 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/HammerOfBogardan.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/HammerOfBogardan.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/HarmattanEfreet.java b/Mage.Sets/src/mage/sets/classicsixthedition/HarmattanEfreet.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/HarmattanEfreet.java rename to Mage.Sets/src/mage/sets/classicsixthedition/HarmattanEfreet.java index af30a85187a..23abb20461c 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/HarmattanEfreet.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/HarmattanEfreet.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/HavenwoodBattleground.java b/Mage.Sets/src/mage/sets/classicsixthedition/HavenwoodBattleground.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/HavenwoodBattleground.java rename to Mage.Sets/src/mage/sets/classicsixthedition/HavenwoodBattleground.java index 27576a7616e..6c31654821a 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/HavenwoodBattleground.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/HavenwoodBattleground.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/HealingSalve.java b/Mage.Sets/src/mage/sets/classicsixthedition/HealingSalve.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/HealingSalve.java rename to Mage.Sets/src/mage/sets/classicsixthedition/HealingSalve.java index cba3104cf84..b47853b2a2e 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/HealingSalve.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/HealingSalve.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/HeavyBallista.java b/Mage.Sets/src/mage/sets/classicsixthedition/HeavyBallista.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/HeavyBallista.java rename to Mage.Sets/src/mage/sets/classicsixthedition/HeavyBallista.java index 8965ccb659f..8569fb936fb 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/HeavyBallista.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/HeavyBallista.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Hecatomb.java b/Mage.Sets/src/mage/sets/classicsixthedition/Hecatomb.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Hecatomb.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Hecatomb.java index 5d307960b23..e811781da26 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Hecatomb.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Hecatomb.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/HerosResolve.java b/Mage.Sets/src/mage/sets/classicsixthedition/HerosResolve.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/HerosResolve.java rename to Mage.Sets/src/mage/sets/classicsixthedition/HerosResolve.java index 4a647eb34a0..32b57a8db60 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/HerosResolve.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/HerosResolve.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/HiddenHorror.java b/Mage.Sets/src/mage/sets/classicsixthedition/HiddenHorror.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/HiddenHorror.java rename to Mage.Sets/src/mage/sets/classicsixthedition/HiddenHorror.java index d7257702510..5e1088c9980 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/HiddenHorror.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/HiddenHorror.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/HornedTurtle.java b/Mage.Sets/src/mage/sets/classicsixthedition/HornedTurtle.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/HornedTurtle.java rename to Mage.Sets/src/mage/sets/classicsixthedition/HornedTurtle.java index ba1227475b2..c224d5a6395 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/HornedTurtle.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/HornedTurtle.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/HowlFromBeyond.java b/Mage.Sets/src/mage/sets/classicsixthedition/HowlFromBeyond.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/HowlFromBeyond.java rename to Mage.Sets/src/mage/sets/classicsixthedition/HowlFromBeyond.java index 4e7046dc2e4..844a78c8640 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/HowlFromBeyond.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/HowlFromBeyond.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/HowlingMine.java b/Mage.Sets/src/mage/sets/classicsixthedition/HowlingMine.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/HowlingMine.java rename to Mage.Sets/src/mage/sets/classicsixthedition/HowlingMine.java index 2b947706e43..7f9a5162b64 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/HowlingMine.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/HowlingMine.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/HulkingCyclops.java b/Mage.Sets/src/mage/sets/classicsixthedition/HulkingCyclops.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/HulkingCyclops.java rename to Mage.Sets/src/mage/sets/classicsixthedition/HulkingCyclops.java index 13f4514f8d6..67f5f677f02 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/HulkingCyclops.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/HulkingCyclops.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Hurricane.java b/Mage.Sets/src/mage/sets/classicsixthedition/Hurricane.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Hurricane.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Hurricane.java index 208d802898b..53e5ffa909a 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Hurricane.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Hurricane.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/sixthedition/IcatianTown.java b/Mage.Sets/src/mage/sets/classicsixthedition/IcatianTown.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/IcatianTown.java rename to Mage.Sets/src/mage/sets/classicsixthedition/IcatianTown.java index 3fad6b73fae..f358e338690 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/IcatianTown.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/IcatianTown.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/IllicitAuction.java b/Mage.Sets/src/mage/sets/classicsixthedition/IllicitAuction.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/IllicitAuction.java rename to Mage.Sets/src/mage/sets/classicsixthedition/IllicitAuction.java index e90e44bd0a1..d05c2c2eab9 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/IllicitAuction.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/IllicitAuction.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/InfantryVeteran.java b/Mage.Sets/src/mage/sets/classicsixthedition/InfantryVeteran.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/InfantryVeteran.java rename to Mage.Sets/src/mage/sets/classicsixthedition/InfantryVeteran.java index 7e405e753bf..6147b08359b 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/InfantryVeteran.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/InfantryVeteran.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/InfernalContract.java b/Mage.Sets/src/mage/sets/classicsixthedition/InfernalContract.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/InfernalContract.java rename to Mage.Sets/src/mage/sets/classicsixthedition/InfernalContract.java index 96efec32caf..7917ad254cc 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/InfernalContract.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/InfernalContract.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Inferno.java b/Mage.Sets/src/mage/sets/classicsixthedition/Inferno.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Inferno.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Inferno.java index 0ac94b93d34..73262809793 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Inferno.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Inferno.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Insight.java b/Mage.Sets/src/mage/sets/classicsixthedition/Insight.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Insight.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Insight.java index 7a12d9cf3c5..af2beb8910f 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Insight.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Insight.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Inspiration.java b/Mage.Sets/src/mage/sets/classicsixthedition/Inspiration.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Inspiration.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Inspiration.java index 1ff2d703f4b..b6b3a4e85c0 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Inspiration.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Inspiration.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/IronStar.java b/Mage.Sets/src/mage/sets/classicsixthedition/IronStar.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/IronStar.java rename to Mage.Sets/src/mage/sets/classicsixthedition/IronStar.java index 2b16db72f44..cdfebf478d6 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/IronStar.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/IronStar.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Island1.java b/Mage.Sets/src/mage/sets/classicsixthedition/Island1.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Island1.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Island1.java index 7588c870524..c5d13481f4a 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Island1.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Island1.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Island2.java b/Mage.Sets/src/mage/sets/classicsixthedition/Island2.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Island2.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Island2.java index 7ac4d523988..4efd609ed02 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Island2.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Island2.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Island3.java b/Mage.Sets/src/mage/sets/classicsixthedition/Island3.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Island3.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Island3.java index eb5d2d1106d..5b7bfaa481d 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Island3.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Island3.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Island4.java b/Mage.Sets/src/mage/sets/classicsixthedition/Island4.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Island4.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Island4.java index 81aa7928758..a1790c9a02e 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Island4.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Island4.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/IvoryCup.java b/Mage.Sets/src/mage/sets/classicsixthedition/IvoryCup.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/IvoryCup.java rename to Mage.Sets/src/mage/sets/classicsixthedition/IvoryCup.java index 0b546c8d8c9..98fb5cc60c4 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/IvoryCup.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/IvoryCup.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/JadeMonolith.java b/Mage.Sets/src/mage/sets/classicsixthedition/JadeMonolith.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/JadeMonolith.java rename to Mage.Sets/src/mage/sets/classicsixthedition/JadeMonolith.java index 2fd15c7fb3d..7f878fb83f3 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/JadeMonolith.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/JadeMonolith.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/JalumTome.java b/Mage.Sets/src/mage/sets/classicsixthedition/JalumTome.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/JalumTome.java rename to Mage.Sets/src/mage/sets/classicsixthedition/JalumTome.java index 8b1b1d0a01f..3f2c923e394 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/JalumTome.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/JalumTome.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/JayemdaeTome.java b/Mage.Sets/src/mage/sets/classicsixthedition/JayemdaeTome.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/JayemdaeTome.java rename to Mage.Sets/src/mage/sets/classicsixthedition/JayemdaeTome.java index 3a7121cc020..2eef6e5424d 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/JayemdaeTome.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/JayemdaeTome.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Jokulhaups.java b/Mage.Sets/src/mage/sets/classicsixthedition/Jokulhaups.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Jokulhaups.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Jokulhaups.java index d61804a3de4..ebcc04a3db3 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Jokulhaups.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Jokulhaups.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Juxtapose.java b/Mage.Sets/src/mage/sets/classicsixthedition/Juxtapose.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Juxtapose.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Juxtapose.java index b6b8d69bd00..64266f569c8 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Juxtapose.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Juxtapose.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/KarplusanForest.java b/Mage.Sets/src/mage/sets/classicsixthedition/KarplusanForest.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/KarplusanForest.java rename to Mage.Sets/src/mage/sets/classicsixthedition/KarplusanForest.java index cc40a92658c..f4d8d5f63a3 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/KarplusanForest.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/KarplusanForest.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Kismet.java b/Mage.Sets/src/mage/sets/classicsixthedition/Kismet.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Kismet.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Kismet.java index c837abee2be..ddece83c08e 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Kismet.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Kismet.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/KjeldoranDead.java b/Mage.Sets/src/mage/sets/classicsixthedition/KjeldoranDead.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/KjeldoranDead.java rename to Mage.Sets/src/mage/sets/classicsixthedition/KjeldoranDead.java index 6e65486fac6..ca3fd6e0b41 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/KjeldoranDead.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/KjeldoranDead.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/KjeldoranRoyalGuard.java b/Mage.Sets/src/mage/sets/classicsixthedition/KjeldoranRoyalGuard.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/KjeldoranRoyalGuard.java rename to Mage.Sets/src/mage/sets/classicsixthedition/KjeldoranRoyalGuard.java index 0db738a825d..55020159aef 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/KjeldoranRoyalGuard.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/KjeldoranRoyalGuard.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/LeadGolem.java b/Mage.Sets/src/mage/sets/classicsixthedition/LeadGolem.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/LeadGolem.java rename to Mage.Sets/src/mage/sets/classicsixthedition/LeadGolem.java index 6de3771ee72..59d652fc052 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/LeadGolem.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/LeadGolem.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/LeshracsRite.java b/Mage.Sets/src/mage/sets/classicsixthedition/LeshracsRite.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/LeshracsRite.java rename to Mage.Sets/src/mage/sets/classicsixthedition/LeshracsRite.java index b8b3e84d97b..0fcaa54e021 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/LeshracsRite.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/LeshracsRite.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/LibraryOfLatNam.java b/Mage.Sets/src/mage/sets/classicsixthedition/LibraryOfLatNam.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/LibraryOfLatNam.java rename to Mage.Sets/src/mage/sets/classicsixthedition/LibraryOfLatNam.java index 8ed9e538886..98e0bc34ff0 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/LibraryOfLatNam.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/LibraryOfLatNam.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/LightOfDay.java b/Mage.Sets/src/mage/sets/classicsixthedition/LightOfDay.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/LightOfDay.java rename to Mage.Sets/src/mage/sets/classicsixthedition/LightOfDay.java index 4994737a1c9..5e73b2e9156 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/LightOfDay.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/LightOfDay.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/LightningBlast.java b/Mage.Sets/src/mage/sets/classicsixthedition/LightningBlast.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/LightningBlast.java rename to Mage.Sets/src/mage/sets/classicsixthedition/LightningBlast.java index 4b6c2510e2e..bcccd9310a7 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/LightningBlast.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/LightningBlast.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/LivingLands.java b/Mage.Sets/src/mage/sets/classicsixthedition/LivingLands.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/LivingLands.java rename to Mage.Sets/src/mage/sets/classicsixthedition/LivingLands.java index ba7690cfb2e..569f037eddc 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/LivingLands.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/LivingLands.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/LlanowarElves.java b/Mage.Sets/src/mage/sets/classicsixthedition/LlanowarElves.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/LlanowarElves.java rename to Mage.Sets/src/mage/sets/classicsixthedition/LlanowarElves.java index 3f5ad93b4c3..8f5a2fdc9fc 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/LlanowarElves.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/LlanowarElves.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/LongbowArcher.java b/Mage.Sets/src/mage/sets/classicsixthedition/LongbowArcher.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/LongbowArcher.java rename to Mage.Sets/src/mage/sets/classicsixthedition/LongbowArcher.java index 907a4889667..54070c790b2 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/LongbowArcher.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/LongbowArcher.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/LordOfAtlantis.java b/Mage.Sets/src/mage/sets/classicsixthedition/LordOfAtlantis.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/LordOfAtlantis.java rename to Mage.Sets/src/mage/sets/classicsixthedition/LordOfAtlantis.java index 0df900b7ac2..a8f0ebbf7cc 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/LordOfAtlantis.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/LordOfAtlantis.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/LostSoul.java b/Mage.Sets/src/mage/sets/classicsixthedition/LostSoul.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/LostSoul.java rename to Mage.Sets/src/mage/sets/classicsixthedition/LostSoul.java index ecb22883494..6d6a4107883 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/LostSoul.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/LostSoul.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Lure.java b/Mage.Sets/src/mage/sets/classicsixthedition/Lure.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Lure.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Lure.java index c6065b14031..78cdd77e152 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Lure.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Lure.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/ManaPrism.java b/Mage.Sets/src/mage/sets/classicsixthedition/ManaPrism.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/ManaPrism.java rename to Mage.Sets/src/mage/sets/classicsixthedition/ManaPrism.java index c602423249b..94be01eda6e 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/ManaPrism.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/ManaPrism.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/ManaShort.java b/Mage.Sets/src/mage/sets/classicsixthedition/ManaShort.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/ManaShort.java rename to Mage.Sets/src/mage/sets/classicsixthedition/ManaShort.java index 4c22bcdd382..91ba80fc10e 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/ManaShort.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/ManaShort.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Manabarbs.java b/Mage.Sets/src/mage/sets/classicsixthedition/Manabarbs.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Manabarbs.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Manabarbs.java index 48bd1765d6e..923c5e114de 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Manabarbs.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Manabarbs.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/MarbleDiamond.java b/Mage.Sets/src/mage/sets/classicsixthedition/MarbleDiamond.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/MarbleDiamond.java rename to Mage.Sets/src/mage/sets/classicsixthedition/MarbleDiamond.java index 65cf29937d5..22e86d4af9c 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/MarbleDiamond.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/MarbleDiamond.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Maro.java b/Mage.Sets/src/mage/sets/classicsixthedition/Maro.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Maro.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Maro.java index 21f08a0afa2..2c0532999b0 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Maro.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Maro.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Meekstone.java b/Mage.Sets/src/mage/sets/classicsixthedition/Meekstone.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Meekstone.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Meekstone.java index c6599905cdc..232abd59244 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Meekstone.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Meekstone.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/MemoryLapse.java b/Mage.Sets/src/mage/sets/classicsixthedition/MemoryLapse.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/MemoryLapse.java rename to Mage.Sets/src/mage/sets/classicsixthedition/MemoryLapse.java index 593c928c33d..accb9867ee9 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/MemoryLapse.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/MemoryLapse.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/MerfolkOfThePearlTrident.java b/Mage.Sets/src/mage/sets/classicsixthedition/MerfolkOfThePearlTrident.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/MerfolkOfThePearlTrident.java rename to Mage.Sets/src/mage/sets/classicsixthedition/MerfolkOfThePearlTrident.java index 133afe8432d..3a97fdb7afe 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/MerfolkOfThePearlTrident.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/MerfolkOfThePearlTrident.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/MesaFalcon.java b/Mage.Sets/src/mage/sets/classicsixthedition/MesaFalcon.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/MesaFalcon.java rename to Mage.Sets/src/mage/sets/classicsixthedition/MesaFalcon.java index 285cd884648..186d069012f 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/MesaFalcon.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/MesaFalcon.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Millstone.java b/Mage.Sets/src/mage/sets/classicsixthedition/Millstone.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Millstone.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Millstone.java index 944ff2a4dad..ce21cf392e9 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Millstone.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Millstone.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/MindWarp.java b/Mage.Sets/src/mage/sets/classicsixthedition/MindWarp.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/MindWarp.java rename to Mage.Sets/src/mage/sets/classicsixthedition/MindWarp.java index c99e1f3c2ae..8a91422c301 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/MindWarp.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/MindWarp.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/MischievousPoltergeist.java b/Mage.Sets/src/mage/sets/classicsixthedition/MischievousPoltergeist.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/MischievousPoltergeist.java rename to Mage.Sets/src/mage/sets/classicsixthedition/MischievousPoltergeist.java index 9842af9ff25..3a68b35e982 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/MischievousPoltergeist.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/MischievousPoltergeist.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/MossDiamond.java b/Mage.Sets/src/mage/sets/classicsixthedition/MossDiamond.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/MossDiamond.java rename to Mage.Sets/src/mage/sets/classicsixthedition/MossDiamond.java index 4304dbf76f2..6a1ca5bcbf6 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/MossDiamond.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/MossDiamond.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Mountain1.java b/Mage.Sets/src/mage/sets/classicsixthedition/Mountain1.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Mountain1.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Mountain1.java index d34800b328f..ad97ecfb2d1 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Mountain1.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Mountain1.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Mountain2.java b/Mage.Sets/src/mage/sets/classicsixthedition/Mountain2.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Mountain2.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Mountain2.java index ba6e71d5114..2759306239e 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Mountain2.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Mountain2.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Mountain3.java b/Mage.Sets/src/mage/sets/classicsixthedition/Mountain3.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Mountain3.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Mountain3.java index e99b4769394..edd1bf9a608 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Mountain3.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Mountain3.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Mountain4.java b/Mage.Sets/src/mage/sets/classicsixthedition/Mountain4.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Mountain4.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Mountain4.java index fceda02c96d..da85a52a968 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Mountain4.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Mountain4.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/MountainGoat.java b/Mage.Sets/src/mage/sets/classicsixthedition/MountainGoat.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/MountainGoat.java rename to Mage.Sets/src/mage/sets/classicsixthedition/MountainGoat.java index e96f7d45411..6d5f02c3c1f 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/MountainGoat.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/MountainGoat.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/MysticCompass.java b/Mage.Sets/src/mage/sets/classicsixthedition/MysticCompass.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/MysticCompass.java rename to Mage.Sets/src/mage/sets/classicsixthedition/MysticCompass.java index 6faab7baa64..ed3f488ac26 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/MysticCompass.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/MysticCompass.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/MysticalTutor.java b/Mage.Sets/src/mage/sets/classicsixthedition/MysticalTutor.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/MysticalTutor.java rename to Mage.Sets/src/mage/sets/classicsixthedition/MysticalTutor.java index 4dc93eab0f1..96971352899 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/MysticalTutor.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/MysticalTutor.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/NaturesResurgence.java b/Mage.Sets/src/mage/sets/classicsixthedition/NaturesResurgence.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/NaturesResurgence.java rename to Mage.Sets/src/mage/sets/classicsixthedition/NaturesResurgence.java index 3b0c1b2054f..0f621094ace 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/NaturesResurgence.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/NaturesResurgence.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Necrosavant.java b/Mage.Sets/src/mage/sets/classicsixthedition/Necrosavant.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Necrosavant.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Necrosavant.java index 189064e55fc..378070e604f 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Necrosavant.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Necrosavant.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Nightmare.java b/Mage.Sets/src/mage/sets/classicsixthedition/Nightmare.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Nightmare.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Nightmare.java index 4e3aa07f9a1..a3fd33f472c 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Nightmare.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Nightmare.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/ObsianusGolem.java b/Mage.Sets/src/mage/sets/classicsixthedition/ObsianusGolem.java similarity index 96% rename from Mage.Sets/src/mage/sets/sixthedition/ObsianusGolem.java rename to Mage.Sets/src/mage/sets/classicsixthedition/ObsianusGolem.java index 5dc8d779765..c09b1972b9d 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/ObsianusGolem.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/ObsianusGolem.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/sixthedition/OrcishArtillery.java b/Mage.Sets/src/mage/sets/classicsixthedition/OrcishArtillery.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/OrcishArtillery.java rename to Mage.Sets/src/mage/sets/classicsixthedition/OrcishArtillery.java index 9f2119024d0..11f4bab1f80 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/OrcishArtillery.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/OrcishArtillery.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/OrcishOriflamme.java b/Mage.Sets/src/mage/sets/classicsixthedition/OrcishOriflamme.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/OrcishOriflamme.java rename to Mage.Sets/src/mage/sets/classicsixthedition/OrcishOriflamme.java index d8c38c3274d..84cae28e794 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/OrcishOriflamme.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/OrcishOriflamme.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/OrderOfTheSacredTorch.java b/Mage.Sets/src/mage/sets/classicsixthedition/OrderOfTheSacredTorch.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/OrderOfTheSacredTorch.java rename to Mage.Sets/src/mage/sets/classicsixthedition/OrderOfTheSacredTorch.java index 201a0824812..bea819eebfc 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/OrderOfTheSacredTorch.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/OrderOfTheSacredTorch.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Ornithopter.java b/Mage.Sets/src/mage/sets/classicsixthedition/Ornithopter.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Ornithopter.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Ornithopter.java index 2641af1cf81..0d4218a3bb2 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Ornithopter.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Ornithopter.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Pacifism.java b/Mage.Sets/src/mage/sets/classicsixthedition/Pacifism.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Pacifism.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Pacifism.java index 799f7ecd619..bd6759bdf10 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Pacifism.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Pacifism.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/PainfulMemories.java b/Mage.Sets/src/mage/sets/classicsixthedition/PainfulMemories.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/PainfulMemories.java rename to Mage.Sets/src/mage/sets/classicsixthedition/PainfulMemories.java index 53871584695..18c3016f41d 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/PainfulMemories.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/PainfulMemories.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/sixthedition/PantherWarriors.java b/Mage.Sets/src/mage/sets/classicsixthedition/PantherWarriors.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/PantherWarriors.java rename to Mage.Sets/src/mage/sets/classicsixthedition/PantherWarriors.java index 7b220b7e5cd..9840f62dea1 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/PantherWarriors.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/PantherWarriors.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/PatagiaGolem.java b/Mage.Sets/src/mage/sets/classicsixthedition/PatagiaGolem.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/PatagiaGolem.java rename to Mage.Sets/src/mage/sets/classicsixthedition/PatagiaGolem.java index 2301e1d4eaa..8645df1e3d5 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/PatagiaGolem.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/PatagiaGolem.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/PearlDragon.java b/Mage.Sets/src/mage/sets/classicsixthedition/PearlDragon.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/PearlDragon.java rename to Mage.Sets/src/mage/sets/classicsixthedition/PearlDragon.java index 97c4fca0a52..b1266147a61 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/PearlDragon.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/PearlDragon.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/PentagramOfTheAges.java b/Mage.Sets/src/mage/sets/classicsixthedition/PentagramOfTheAges.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/PentagramOfTheAges.java rename to Mage.Sets/src/mage/sets/classicsixthedition/PentagramOfTheAges.java index 2fc5a3e2a50..f8386d0d77e 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/PentagramOfTheAges.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/PentagramOfTheAges.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Perish.java b/Mage.Sets/src/mage/sets/classicsixthedition/Perish.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Perish.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Perish.java index 0750b856627..a6abe09df76 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Perish.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Perish.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Pestilence.java b/Mage.Sets/src/mage/sets/classicsixthedition/Pestilence.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Pestilence.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Pestilence.java index 20075e11315..5916f045f60 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Pestilence.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Pestilence.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/PhantasmalTerrain.java b/Mage.Sets/src/mage/sets/classicsixthedition/PhantasmalTerrain.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/PhantasmalTerrain.java rename to Mage.Sets/src/mage/sets/classicsixthedition/PhantasmalTerrain.java index ad3b7639817..6d96284a1cd 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/PhantasmalTerrain.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/PhantasmalTerrain.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/PhantomWarrior.java b/Mage.Sets/src/mage/sets/classicsixthedition/PhantomWarrior.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/PhantomWarrior.java rename to Mage.Sets/src/mage/sets/classicsixthedition/PhantomWarrior.java index 70ece1e777b..34f53272177 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/PhantomWarrior.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/PhantomWarrior.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/PhyrexianVault.java b/Mage.Sets/src/mage/sets/classicsixthedition/PhyrexianVault.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/PhyrexianVault.java rename to Mage.Sets/src/mage/sets/classicsixthedition/PhyrexianVault.java index e9a0a040cbf..a58254fbf61 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/PhyrexianVault.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/PhyrexianVault.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Pillage.java b/Mage.Sets/src/mage/sets/classicsixthedition/Pillage.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Pillage.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Pillage.java index 9355246082a..e28011491f5 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Pillage.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Pillage.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Plains1.java b/Mage.Sets/src/mage/sets/classicsixthedition/Plains1.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Plains1.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Plains1.java index b1f0120e3fb..1f274dd95c1 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Plains1.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Plains1.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Plains2.java b/Mage.Sets/src/mage/sets/classicsixthedition/Plains2.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Plains2.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Plains2.java index 1358ff6d36c..878daa27203 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Plains2.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Plains2.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Plains3.java b/Mage.Sets/src/mage/sets/classicsixthedition/Plains3.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Plains3.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Plains3.java index f175c1bbc1e..4fcde710b16 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Plains3.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Plains3.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Plains4.java b/Mage.Sets/src/mage/sets/classicsixthedition/Plains4.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Plains4.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Plains4.java index d076e0761ef..6ccf2bf0991 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Plains4.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Plains4.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Polymorph.java b/Mage.Sets/src/mage/sets/classicsixthedition/Polymorph.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Polymorph.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Polymorph.java index a806abbba84..50353d36b95 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Polymorph.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Polymorph.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/PowerSink.java b/Mage.Sets/src/mage/sets/classicsixthedition/PowerSink.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/PowerSink.java rename to Mage.Sets/src/mage/sets/classicsixthedition/PowerSink.java index 229266fdba8..4e14fd0afd7 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/PowerSink.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/PowerSink.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/sixthedition/PradeshGypsies.java b/Mage.Sets/src/mage/sets/classicsixthedition/PradeshGypsies.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/PradeshGypsies.java rename to Mage.Sets/src/mage/sets/classicsixthedition/PradeshGypsies.java index cd102f91d1a..dcb3f789d0c 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/PradeshGypsies.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/PradeshGypsies.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/PrimalClay.java b/Mage.Sets/src/mage/sets/classicsixthedition/PrimalClay.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/PrimalClay.java rename to Mage.Sets/src/mage/sets/classicsixthedition/PrimalClay.java index b97364339d2..81f1547eafe 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/PrimalClay.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/PrimalClay.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/ProdigalSorcerer.java b/Mage.Sets/src/mage/sets/classicsixthedition/ProdigalSorcerer.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/ProdigalSorcerer.java rename to Mage.Sets/src/mage/sets/classicsixthedition/ProdigalSorcerer.java index 76b5e4d7287..89a4c9e3e7e 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/ProdigalSorcerer.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/ProdigalSorcerer.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Prosperity.java b/Mage.Sets/src/mage/sets/classicsixthedition/Prosperity.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Prosperity.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Prosperity.java index 080bedcdf66..dc758591a92 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Prosperity.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Prosperity.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/PsychicTransfer.java b/Mage.Sets/src/mage/sets/classicsixthedition/PsychicTransfer.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/PsychicTransfer.java rename to Mage.Sets/src/mage/sets/classicsixthedition/PsychicTransfer.java index 48f2af73cc3..7bd131cc2d6 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/PsychicTransfer.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/PsychicTransfer.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/PsychicVenom.java b/Mage.Sets/src/mage/sets/classicsixthedition/PsychicVenom.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/PsychicVenom.java rename to Mage.Sets/src/mage/sets/classicsixthedition/PsychicVenom.java index 9a447183f28..05a4b6fd50a 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/PsychicVenom.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/PsychicVenom.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Pyrotechnics.java b/Mage.Sets/src/mage/sets/classicsixthedition/Pyrotechnics.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Pyrotechnics.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Pyrotechnics.java index 965e22c5c47..edd5b3ab350 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Pyrotechnics.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Pyrotechnics.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Python.java b/Mage.Sets/src/mage/sets/classicsixthedition/Python.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Python.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Python.java index c6155ab95ef..6533331f2d4 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Python.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Python.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/RadjanSpirit.java b/Mage.Sets/src/mage/sets/classicsixthedition/RadjanSpirit.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/RadjanSpirit.java rename to Mage.Sets/src/mage/sets/classicsixthedition/RadjanSpirit.java index d9ada66f6f1..abf0695dd7b 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/RadjanSpirit.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/RadjanSpirit.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/RagMan.java b/Mage.Sets/src/mage/sets/classicsixthedition/RagMan.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/RagMan.java rename to Mage.Sets/src/mage/sets/classicsixthedition/RagMan.java index d1d0058ee7b..5a718621224 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/RagMan.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/RagMan.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/RagingGoblin.java b/Mage.Sets/src/mage/sets/classicsixthedition/RagingGoblin.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/RagingGoblin.java rename to Mage.Sets/src/mage/sets/classicsixthedition/RagingGoblin.java index fad450ec2fb..19695537773 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/RagingGoblin.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/RagingGoblin.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/RaiseDead.java b/Mage.Sets/src/mage/sets/classicsixthedition/RaiseDead.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/RaiseDead.java rename to Mage.Sets/src/mage/sets/classicsixthedition/RaiseDead.java index 8e33213bfb7..f4ceb1e0c41 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/RaiseDead.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/RaiseDead.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/RampantGrowth.java b/Mage.Sets/src/mage/sets/classicsixthedition/RampantGrowth.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/RampantGrowth.java rename to Mage.Sets/src/mage/sets/classicsixthedition/RampantGrowth.java index 5a2fe70712a..2ca36e1371c 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/RampantGrowth.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/RampantGrowth.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/RazortoothRats.java b/Mage.Sets/src/mage/sets/classicsixthedition/RazortoothRats.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/RazortoothRats.java rename to Mage.Sets/src/mage/sets/classicsixthedition/RazortoothRats.java index f1079e4edf6..b18554347de 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/RazortoothRats.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/RazortoothRats.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Recall.java b/Mage.Sets/src/mage/sets/classicsixthedition/Recall.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Recall.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Recall.java index deb03576a8b..88ab427ec0f 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Recall.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Recall.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/RecklessEmbermage.java b/Mage.Sets/src/mage/sets/classicsixthedition/RecklessEmbermage.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/RecklessEmbermage.java rename to Mage.Sets/src/mage/sets/classicsixthedition/RecklessEmbermage.java index 2128224b2b8..69369703d27 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/RecklessEmbermage.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/RecklessEmbermage.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/RedwoodTreefolk.java b/Mage.Sets/src/mage/sets/classicsixthedition/RedwoodTreefolk.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/RedwoodTreefolk.java rename to Mage.Sets/src/mage/sets/classicsixthedition/RedwoodTreefolk.java index bb204b13bf9..d67783c0bcf 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/RedwoodTreefolk.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/RedwoodTreefolk.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/RegalUnicorn.java b/Mage.Sets/src/mage/sets/classicsixthedition/RegalUnicorn.java similarity index 96% rename from Mage.Sets/src/mage/sets/sixthedition/RegalUnicorn.java rename to Mage.Sets/src/mage/sets/classicsixthedition/RegalUnicorn.java index a87f97b7fb3..749d9992e3a 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/RegalUnicorn.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/RegalUnicorn.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Regeneration.java b/Mage.Sets/src/mage/sets/classicsixthedition/Regeneration.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Regeneration.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Regeneration.java index 725f5d9c206..899baf68343 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Regeneration.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Regeneration.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Relearn.java b/Mage.Sets/src/mage/sets/classicsixthedition/Relearn.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Relearn.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Relearn.java index 80062f2c43b..54b3d9a9d50 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Relearn.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Relearn.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/RelentlessAssault.java b/Mage.Sets/src/mage/sets/classicsixthedition/RelentlessAssault.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/RelentlessAssault.java rename to Mage.Sets/src/mage/sets/classicsixthedition/RelentlessAssault.java index 8b643c5ab07..7e6f1041423 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/RelentlessAssault.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/RelentlessAssault.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Remedy.java b/Mage.Sets/src/mage/sets/classicsixthedition/Remedy.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Remedy.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Remedy.java index 7e92093234e..de5d033f08e 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Remedy.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Remedy.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/RemoveSoul.java b/Mage.Sets/src/mage/sets/classicsixthedition/RemoveSoul.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/RemoveSoul.java rename to Mage.Sets/src/mage/sets/classicsixthedition/RemoveSoul.java index e7e1c477692..21fe247a575 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/RemoveSoul.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/RemoveSoul.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Reprisal.java b/Mage.Sets/src/mage/sets/classicsixthedition/Reprisal.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Reprisal.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Reprisal.java index 0a04af1791b..9ea2507c286 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Reprisal.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Reprisal.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/ResistanceFighter.java b/Mage.Sets/src/mage/sets/classicsixthedition/ResistanceFighter.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/ResistanceFighter.java rename to Mage.Sets/src/mage/sets/classicsixthedition/ResistanceFighter.java index 6855ec9dcfd..9dfbe67369b 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/ResistanceFighter.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/ResistanceFighter.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/ReverseDamage.java b/Mage.Sets/src/mage/sets/classicsixthedition/ReverseDamage.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/ReverseDamage.java rename to Mage.Sets/src/mage/sets/classicsixthedition/ReverseDamage.java index 6912226a690..cf004d75610 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/ReverseDamage.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/ReverseDamage.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/RiverBoa.java b/Mage.Sets/src/mage/sets/classicsixthedition/RiverBoa.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/RiverBoa.java rename to Mage.Sets/src/mage/sets/classicsixthedition/RiverBoa.java index ad82d5de96d..d9e323d89b5 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/RiverBoa.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/RiverBoa.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/RodOfRuin.java b/Mage.Sets/src/mage/sets/classicsixthedition/RodOfRuin.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/RodOfRuin.java rename to Mage.Sets/src/mage/sets/classicsixthedition/RodOfRuin.java index 2bbffd570ce..49eaf743f37 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/RodOfRuin.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/RodOfRuin.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Rowen.java b/Mage.Sets/src/mage/sets/classicsixthedition/Rowen.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Rowen.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Rowen.java index 2c57c25ac8e..adf4f24ed94 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Rowen.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Rowen.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/RuinsOfTrokair.java b/Mage.Sets/src/mage/sets/classicsixthedition/RuinsOfTrokair.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/RuinsOfTrokair.java rename to Mage.Sets/src/mage/sets/classicsixthedition/RuinsOfTrokair.java index bf473ae0712..2945a588062 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/RuinsOfTrokair.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/RuinsOfTrokair.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/SabretoothTiger.java b/Mage.Sets/src/mage/sets/classicsixthedition/SabretoothTiger.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/SabretoothTiger.java rename to Mage.Sets/src/mage/sets/classicsixthedition/SabretoothTiger.java index 58cf00407ab..9736b535581 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/SabretoothTiger.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/SabretoothTiger.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/SageOwl.java b/Mage.Sets/src/mage/sets/classicsixthedition/SageOwl.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/SageOwl.java rename to Mage.Sets/src/mage/sets/classicsixthedition/SageOwl.java index 447d839ef0b..9437c7343e2 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/SageOwl.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/SageOwl.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/SamiteHealer.java b/Mage.Sets/src/mage/sets/classicsixthedition/SamiteHealer.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/SamiteHealer.java rename to Mage.Sets/src/mage/sets/classicsixthedition/SamiteHealer.java index 77a8e99caa9..15428b65437 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/SamiteHealer.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/SamiteHealer.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/ScaledWurm.java b/Mage.Sets/src/mage/sets/classicsixthedition/ScaledWurm.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/ScaledWurm.java rename to Mage.Sets/src/mage/sets/classicsixthedition/ScaledWurm.java index 4067e9a0d43..c554bc0297f 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/ScaledWurm.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/ScaledWurm.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/ScatheZombies.java b/Mage.Sets/src/mage/sets/classicsixthedition/ScatheZombies.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/ScatheZombies.java rename to Mage.Sets/src/mage/sets/classicsixthedition/ScatheZombies.java index c1def53c871..732ef613215 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/ScatheZombies.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/ScatheZombies.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/SeaMonster.java b/Mage.Sets/src/mage/sets/classicsixthedition/SeaMonster.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/SeaMonster.java rename to Mage.Sets/src/mage/sets/classicsixthedition/SeaMonster.java index 70c668ac2cc..7fd1efae89e 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/SeaMonster.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/SeaMonster.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/SegovianLeviathan.java b/Mage.Sets/src/mage/sets/classicsixthedition/SegovianLeviathan.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/SegovianLeviathan.java rename to Mage.Sets/src/mage/sets/classicsixthedition/SegovianLeviathan.java index 6976ab56acd..6670db8a1b0 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/SegovianLeviathan.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/SegovianLeviathan.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/SengirAutocrat.java b/Mage.Sets/src/mage/sets/classicsixthedition/SengirAutocrat.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/SengirAutocrat.java rename to Mage.Sets/src/mage/sets/classicsixthedition/SengirAutocrat.java index 1c34ec8f669..11d5aa1a359 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/SengirAutocrat.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/SengirAutocrat.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Serenity.java b/Mage.Sets/src/mage/sets/classicsixthedition/Serenity.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Serenity.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Serenity.java index 1e8c4588ec9..e54794a55ea 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Serenity.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Serenity.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/SerrasBlessing.java b/Mage.Sets/src/mage/sets/classicsixthedition/SerrasBlessing.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/SerrasBlessing.java rename to Mage.Sets/src/mage/sets/classicsixthedition/SerrasBlessing.java index 9d6896f5536..73141dbcc8f 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/SerrasBlessing.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/SerrasBlessing.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/ShanodinDryads.java b/Mage.Sets/src/mage/sets/classicsixthedition/ShanodinDryads.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/ShanodinDryads.java rename to Mage.Sets/src/mage/sets/classicsixthedition/ShanodinDryads.java index 369d097d2f4..b27eb50343b 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/ShanodinDryads.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/ShanodinDryads.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Shatter.java b/Mage.Sets/src/mage/sets/classicsixthedition/Shatter.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Shatter.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Shatter.java index d8e55891435..cc42f17e76f 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Shatter.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Shatter.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Shatterstorm.java b/Mage.Sets/src/mage/sets/classicsixthedition/Shatterstorm.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Shatterstorm.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Shatterstorm.java index 3fa304fd124..411f10786f4 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Shatterstorm.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Shatterstorm.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Shock.java b/Mage.Sets/src/mage/sets/classicsixthedition/Shock.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Shock.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Shock.java index 3ab9d02fcfc..756e0ff6781 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Shock.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Shock.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/SibilantSpirit.java b/Mage.Sets/src/mage/sets/classicsixthedition/SibilantSpirit.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/SibilantSpirit.java rename to Mage.Sets/src/mage/sets/classicsixthedition/SibilantSpirit.java index 97a0c2d5a3f..b60f3d14dcb 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/SibilantSpirit.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/SibilantSpirit.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/SkullCatapult.java b/Mage.Sets/src/mage/sets/classicsixthedition/SkullCatapult.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/SkullCatapult.java rename to Mage.Sets/src/mage/sets/classicsixthedition/SkullCatapult.java index b5c6356b19f..4d92067779a 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/SkullCatapult.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/SkullCatapult.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/SkyDiamond.java b/Mage.Sets/src/mage/sets/classicsixthedition/SkyDiamond.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/SkyDiamond.java rename to Mage.Sets/src/mage/sets/classicsixthedition/SkyDiamond.java index dd265b08745..8fbd8032e1a 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/SkyDiamond.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/SkyDiamond.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/SnakeBasket.java b/Mage.Sets/src/mage/sets/classicsixthedition/SnakeBasket.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/SnakeBasket.java rename to Mage.Sets/src/mage/sets/classicsixthedition/SnakeBasket.java index 1d40da38874..bb0edb74791 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/SnakeBasket.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/SnakeBasket.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/SoldeviSage.java b/Mage.Sets/src/mage/sets/classicsixthedition/SoldeviSage.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/SoldeviSage.java rename to Mage.Sets/src/mage/sets/classicsixthedition/SoldeviSage.java index 11fe8259eed..67da756257b 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/SoldeviSage.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/SoldeviSage.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/sixthedition/SoulNet.java b/Mage.Sets/src/mage/sets/classicsixthedition/SoulNet.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/SoulNet.java rename to Mage.Sets/src/mage/sets/classicsixthedition/SoulNet.java index 0ec6fd0d915..ae1d33e5665 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/SoulNet.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/SoulNet.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/SpellBlast.java b/Mage.Sets/src/mage/sets/classicsixthedition/SpellBlast.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/SpellBlast.java rename to Mage.Sets/src/mage/sets/classicsixthedition/SpellBlast.java index 5481814045a..79464b92709 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/SpellBlast.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/SpellBlast.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/SpiritLink.java b/Mage.Sets/src/mage/sets/classicsixthedition/SpiritLink.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/SpiritLink.java rename to Mage.Sets/src/mage/sets/classicsixthedition/SpiritLink.java index 50208a23e66..d66267b6e0d 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/SpiritLink.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/SpiritLink.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/SpittingDrake.java b/Mage.Sets/src/mage/sets/classicsixthedition/SpittingDrake.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/SpittingDrake.java rename to Mage.Sets/src/mage/sets/classicsixthedition/SpittingDrake.java index 0db48f66c8a..eb87d17eb48 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/SpittingDrake.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/SpittingDrake.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/SpittingEarth.java b/Mage.Sets/src/mage/sets/classicsixthedition/SpittingEarth.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/SpittingEarth.java rename to Mage.Sets/src/mage/sets/classicsixthedition/SpittingEarth.java index fa79bd55f82..f0116764d5f 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/SpittingEarth.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/SpittingEarth.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/StalkingTiger.java b/Mage.Sets/src/mage/sets/classicsixthedition/StalkingTiger.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/StalkingTiger.java rename to Mage.Sets/src/mage/sets/classicsixthedition/StalkingTiger.java index 83e5b31d4d2..f7ccf24096e 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/StalkingTiger.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/StalkingTiger.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/StandingTroops.java b/Mage.Sets/src/mage/sets/classicsixthedition/StandingTroops.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/StandingTroops.java rename to Mage.Sets/src/mage/sets/classicsixthedition/StandingTroops.java index ad4568d0b8e..87d222fedef 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/StandingTroops.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/StandingTroops.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/StaunchDefenders.java b/Mage.Sets/src/mage/sets/classicsixthedition/StaunchDefenders.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/StaunchDefenders.java rename to Mage.Sets/src/mage/sets/classicsixthedition/StaunchDefenders.java index 0acbf604b8c..a9237fb8706 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/StaunchDefenders.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/StaunchDefenders.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/StoneRain.java b/Mage.Sets/src/mage/sets/classicsixthedition/StoneRain.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/StoneRain.java rename to Mage.Sets/src/mage/sets/classicsixthedition/StoneRain.java index 516bedf320d..ad98a275ed6 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/StoneRain.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/StoneRain.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/StormCauldron.java b/Mage.Sets/src/mage/sets/classicsixthedition/StormCauldron.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/StormCauldron.java rename to Mage.Sets/src/mage/sets/classicsixthedition/StormCauldron.java index b0c0d731181..dc5a9657381 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/StormCauldron.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/StormCauldron.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/StormCrow.java b/Mage.Sets/src/mage/sets/classicsixthedition/StormCrow.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/StormCrow.java rename to Mage.Sets/src/mage/sets/classicsixthedition/StormCrow.java index a3537b4048a..b20e45cd854 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/StormCrow.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/StormCrow.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/StrandsOfNight.java b/Mage.Sets/src/mage/sets/classicsixthedition/StrandsOfNight.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/StrandsOfNight.java rename to Mage.Sets/src/mage/sets/classicsixthedition/StrandsOfNight.java index 46bb771f5e1..b0bf70910f7 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/StrandsOfNight.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/StrandsOfNight.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/StreamOfLife.java b/Mage.Sets/src/mage/sets/classicsixthedition/StreamOfLife.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/StreamOfLife.java rename to Mage.Sets/src/mage/sets/classicsixthedition/StreamOfLife.java index f0e77118a2b..ad3f4aea2e4 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/StreamOfLife.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/StreamOfLife.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/StromgaldCabal.java b/Mage.Sets/src/mage/sets/classicsixthedition/StromgaldCabal.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/StromgaldCabal.java rename to Mage.Sets/src/mage/sets/classicsixthedition/StromgaldCabal.java index 3f3ddbbaaab..88cfa299d24 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/StromgaldCabal.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/StromgaldCabal.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Stupor.java b/Mage.Sets/src/mage/sets/classicsixthedition/Stupor.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Stupor.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Stupor.java index 505e56e2ce2..6ce69fcf41e 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Stupor.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Stupor.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/sixthedition/SulfurousSprings.java b/Mage.Sets/src/mage/sets/classicsixthedition/SulfurousSprings.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/SulfurousSprings.java rename to Mage.Sets/src/mage/sets/classicsixthedition/SulfurousSprings.java index 845aeb2e49d..e5ba59a3293 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/SulfurousSprings.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/SulfurousSprings.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/SummerBloom.java b/Mage.Sets/src/mage/sets/classicsixthedition/SummerBloom.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/SummerBloom.java rename to Mage.Sets/src/mage/sets/classicsixthedition/SummerBloom.java index fec09c181a8..b7ebb609b3b 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/SummerBloom.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/SummerBloom.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Sunweb.java b/Mage.Sets/src/mage/sets/classicsixthedition/Sunweb.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Sunweb.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Sunweb.java index f47e5bd86e0..8aaa2435691 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Sunweb.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Sunweb.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/SvyeluniteTemple.java b/Mage.Sets/src/mage/sets/classicsixthedition/SvyeluniteTemple.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/SvyeluniteTemple.java rename to Mage.Sets/src/mage/sets/classicsixthedition/SvyeluniteTemple.java index 1f871e8e3c6..d76270ab48a 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/SvyeluniteTemple.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/SvyeluniteTemple.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Swamp1.java b/Mage.Sets/src/mage/sets/classicsixthedition/Swamp1.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Swamp1.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Swamp1.java index 83bde50d1ad..f1c24f8af43 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Swamp1.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Swamp1.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Swamp2.java b/Mage.Sets/src/mage/sets/classicsixthedition/Swamp2.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Swamp2.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Swamp2.java index a7115d039c0..d6c032aa4c5 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Swamp2.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Swamp2.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Swamp3.java b/Mage.Sets/src/mage/sets/classicsixthedition/Swamp3.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Swamp3.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Swamp3.java index 937ab96932d..ad6c06db016 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Swamp3.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Swamp3.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Swamp4.java b/Mage.Sets/src/mage/sets/classicsixthedition/Swamp4.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Swamp4.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Swamp4.java index 1057442aa5c..36ba4e29ef7 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Swamp4.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Swamp4.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/SyphonSoul.java b/Mage.Sets/src/mage/sets/classicsixthedition/SyphonSoul.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/SyphonSoul.java rename to Mage.Sets/src/mage/sets/classicsixthedition/SyphonSoul.java index 9dc18a91e4e..cf854519635 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/SyphonSoul.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/SyphonSoul.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/TalruumMinotaur.java b/Mage.Sets/src/mage/sets/classicsixthedition/TalruumMinotaur.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/TalruumMinotaur.java rename to Mage.Sets/src/mage/sets/classicsixthedition/TalruumMinotaur.java index a11a5976c8f..2405520db34 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/TalruumMinotaur.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/TalruumMinotaur.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Tariff.java b/Mage.Sets/src/mage/sets/classicsixthedition/Tariff.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Tariff.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Tariff.java index 1ec37144978..633134ca304 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Tariff.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Tariff.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/TeferisPuzzleBox.java b/Mage.Sets/src/mage/sets/classicsixthedition/TeferisPuzzleBox.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/TeferisPuzzleBox.java rename to Mage.Sets/src/mage/sets/classicsixthedition/TeferisPuzzleBox.java index 022d2ae8af2..096f8656554 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/TeferisPuzzleBox.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/TeferisPuzzleBox.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Terror.java b/Mage.Sets/src/mage/sets/classicsixthedition/Terror.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Terror.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Terror.java index d20b69df5a8..39d30940e26 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Terror.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Terror.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/TheHive.java b/Mage.Sets/src/mage/sets/classicsixthedition/TheHive.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/TheHive.java rename to Mage.Sets/src/mage/sets/classicsixthedition/TheHive.java index 8b6cc1f9e21..0d1f8d8fd66 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/TheHive.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/TheHive.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/ThicketBasilisk.java b/Mage.Sets/src/mage/sets/classicsixthedition/ThicketBasilisk.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/ThicketBasilisk.java rename to Mage.Sets/src/mage/sets/classicsixthedition/ThicketBasilisk.java index 8a53d98e7a5..a877d203b54 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/ThicketBasilisk.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/ThicketBasilisk.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/ThroneOfBone.java b/Mage.Sets/src/mage/sets/classicsixthedition/ThroneOfBone.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/ThroneOfBone.java rename to Mage.Sets/src/mage/sets/classicsixthedition/ThroneOfBone.java index fa02268003d..07d64a9a1d2 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/ThroneOfBone.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/ThroneOfBone.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/TidalSurge.java b/Mage.Sets/src/mage/sets/classicsixthedition/TidalSurge.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/TidalSurge.java rename to Mage.Sets/src/mage/sets/classicsixthedition/TidalSurge.java index 1cbe564ae45..b01c216837f 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/TidalSurge.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/TidalSurge.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/TrainedArmodon.java b/Mage.Sets/src/mage/sets/classicsixthedition/TrainedArmodon.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/TrainedArmodon.java rename to Mage.Sets/src/mage/sets/classicsixthedition/TrainedArmodon.java index 0921a79f0f8..ec14a0948e0 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/TrainedArmodon.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/TrainedArmodon.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/TranquilGrove.java b/Mage.Sets/src/mage/sets/classicsixthedition/TranquilGrove.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/TranquilGrove.java rename to Mage.Sets/src/mage/sets/classicsixthedition/TranquilGrove.java index 7b39052bef0..6da015fb628 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/TranquilGrove.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/TranquilGrove.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Tranquility.java b/Mage.Sets/src/mage/sets/classicsixthedition/Tranquility.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Tranquility.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Tranquility.java index 9f9c10aad50..d3d36ce738f 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Tranquility.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Tranquility.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Tremor.java b/Mage.Sets/src/mage/sets/classicsixthedition/Tremor.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Tremor.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Tremor.java index d6b2a694c2a..553f1c220b3 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Tremor.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Tremor.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/TundraWolves.java b/Mage.Sets/src/mage/sets/classicsixthedition/TundraWolves.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/TundraWolves.java rename to Mage.Sets/src/mage/sets/classicsixthedition/TundraWolves.java index 4121cbe0ebc..22c6ff96daf 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/TundraWolves.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/TundraWolves.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/UktabiOrangutan.java b/Mage.Sets/src/mage/sets/classicsixthedition/UktabiOrangutan.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/UktabiOrangutan.java rename to Mage.Sets/src/mage/sets/classicsixthedition/UktabiOrangutan.java index 44aa052f416..64053e12621 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/UktabiOrangutan.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/UktabiOrangutan.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/UktabiWildcats.java b/Mage.Sets/src/mage/sets/classicsixthedition/UktabiWildcats.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/UktabiWildcats.java rename to Mage.Sets/src/mage/sets/classicsixthedition/UktabiWildcats.java index d7b5fc00b84..bf76a02ce6b 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/UktabiWildcats.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/UktabiWildcats.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/UndergroundRiver.java b/Mage.Sets/src/mage/sets/classicsixthedition/UndergroundRiver.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/UndergroundRiver.java rename to Mage.Sets/src/mage/sets/classicsixthedition/UndergroundRiver.java index b8df2f22927..c42c2e2a072 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/UndergroundRiver.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/UndergroundRiver.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/UnseenWalker.java b/Mage.Sets/src/mage/sets/classicsixthedition/UnseenWalker.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/UnseenWalker.java rename to Mage.Sets/src/mage/sets/classicsixthedition/UnseenWalker.java index 7d0ccc6ebb0..e3efa2be5c3 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/UnseenWalker.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/UnseenWalker.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Unsummon.java b/Mage.Sets/src/mage/sets/classicsixthedition/Unsummon.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Unsummon.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Unsummon.java index bec4d7c78c9..ed861528912 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Unsummon.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Unsummon.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/UntamedWilds.java b/Mage.Sets/src/mage/sets/classicsixthedition/UntamedWilds.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/UntamedWilds.java rename to Mage.Sets/src/mage/sets/classicsixthedition/UntamedWilds.java index 5f2f1496d33..cd54dd2ab22 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/UntamedWilds.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/UntamedWilds.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/UnyaroGriffin.java b/Mage.Sets/src/mage/sets/classicsixthedition/UnyaroGriffin.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/UnyaroGriffin.java rename to Mage.Sets/src/mage/sets/classicsixthedition/UnyaroGriffin.java index 4cadf4aa7ae..dba5d262093 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/UnyaroGriffin.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/UnyaroGriffin.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/VampiricTutor.java b/Mage.Sets/src/mage/sets/classicsixthedition/VampiricTutor.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/VampiricTutor.java rename to Mage.Sets/src/mage/sets/classicsixthedition/VampiricTutor.java index e8ce884907a..96acb1b3289 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/VampiricTutor.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/VampiricTutor.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/VenerableMonk.java b/Mage.Sets/src/mage/sets/classicsixthedition/VenerableMonk.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/VenerableMonk.java rename to Mage.Sets/src/mage/sets/classicsixthedition/VenerableMonk.java index a60d0f36f5a..4d26a473ba0 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/VenerableMonk.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/VenerableMonk.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/VerduranEnchantress.java b/Mage.Sets/src/mage/sets/classicsixthedition/VerduranEnchantress.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/VerduranEnchantress.java rename to Mage.Sets/src/mage/sets/classicsixthedition/VerduranEnchantress.java index 4e8d789fcbf..82334193d35 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/VerduranEnchantress.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/VerduranEnchantress.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Vertigo.java b/Mage.Sets/src/mage/sets/classicsixthedition/Vertigo.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Vertigo.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Vertigo.java index 6ea0d1ae6c4..45542dd1af3 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Vertigo.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Vertigo.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/ViashinoWarrior.java b/Mage.Sets/src/mage/sets/classicsixthedition/ViashinoWarrior.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/ViashinoWarrior.java rename to Mage.Sets/src/mage/sets/classicsixthedition/ViashinoWarrior.java index 9e51e11510e..dbe64ad72d4 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/ViashinoWarrior.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/ViashinoWarrior.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Vitalize.java b/Mage.Sets/src/mage/sets/classicsixthedition/Vitalize.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Vitalize.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Vitalize.java index 6155afe9152..27376345e76 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Vitalize.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Vitalize.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/VodalianSoldiers.java b/Mage.Sets/src/mage/sets/classicsixthedition/VodalianSoldiers.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/VodalianSoldiers.java rename to Mage.Sets/src/mage/sets/classicsixthedition/VodalianSoldiers.java index 769ef2346fe..eb93216d263 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/VodalianSoldiers.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/VodalianSoldiers.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/VolcanicDragon.java b/Mage.Sets/src/mage/sets/classicsixthedition/VolcanicDragon.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/VolcanicDragon.java rename to Mage.Sets/src/mage/sets/classicsixthedition/VolcanicDragon.java index 5dee80cd555..73238c5a445 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/VolcanicDragon.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/VolcanicDragon.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/sixthedition/VolcanicGeyser.java b/Mage.Sets/src/mage/sets/classicsixthedition/VolcanicGeyser.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/VolcanicGeyser.java rename to Mage.Sets/src/mage/sets/classicsixthedition/VolcanicGeyser.java index b82f3b5e523..2671cc92efb 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/VolcanicGeyser.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/VolcanicGeyser.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/WaitingInTheWeeds.java b/Mage.Sets/src/mage/sets/classicsixthedition/WaitingInTheWeeds.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/WaitingInTheWeeds.java rename to Mage.Sets/src/mage/sets/classicsixthedition/WaitingInTheWeeds.java index 5f533647476..e60f1988613 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/WaitingInTheWeeds.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/WaitingInTheWeeds.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/WallOfAir.java b/Mage.Sets/src/mage/sets/classicsixthedition/WallOfAir.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/WallOfAir.java rename to Mage.Sets/src/mage/sets/classicsixthedition/WallOfAir.java index fa09256974c..e38fa01d71b 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/WallOfAir.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/WallOfAir.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/WallOfFire.java b/Mage.Sets/src/mage/sets/classicsixthedition/WallOfFire.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/WallOfFire.java rename to Mage.Sets/src/mage/sets/classicsixthedition/WallOfFire.java index ce247d0d743..aa73ba7b6f1 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/WallOfFire.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/WallOfFire.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/WallOfSwords.java b/Mage.Sets/src/mage/sets/classicsixthedition/WallOfSwords.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/WallOfSwords.java rename to Mage.Sets/src/mage/sets/classicsixthedition/WallOfSwords.java index ebd21125879..0c593269fdb 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/WallOfSwords.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/WallOfSwords.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/WandOfDenial.java b/Mage.Sets/src/mage/sets/classicsixthedition/WandOfDenial.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/WandOfDenial.java rename to Mage.Sets/src/mage/sets/classicsixthedition/WandOfDenial.java index dbe6af6797b..9c3fb157b99 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/WandOfDenial.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/WandOfDenial.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Warmth.java b/Mage.Sets/src/mage/sets/classicsixthedition/Warmth.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/Warmth.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Warmth.java index 2861d3540a7..ee78f8c60e8 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Warmth.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Warmth.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/WarriorsHonor.java b/Mage.Sets/src/mage/sets/classicsixthedition/WarriorsHonor.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/WarriorsHonor.java rename to Mage.Sets/src/mage/sets/classicsixthedition/WarriorsHonor.java index 36df8d2fd74..05926f968db 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/WarriorsHonor.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/WarriorsHonor.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/Warthog.java b/Mage.Sets/src/mage/sets/classicsixthedition/Warthog.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/Warthog.java rename to Mage.Sets/src/mage/sets/classicsixthedition/Warthog.java index 8a73057c4c4..f18d69e9630 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/Warthog.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/Warthog.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/sixthedition/WildGrowth.java b/Mage.Sets/src/mage/sets/classicsixthedition/WildGrowth.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/WildGrowth.java rename to Mage.Sets/src/mage/sets/classicsixthedition/WildGrowth.java index 2401b1af400..49b3e558828 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/WildGrowth.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/WildGrowth.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/WindDrake.java b/Mage.Sets/src/mage/sets/classicsixthedition/WindDrake.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/WindDrake.java rename to Mage.Sets/src/mage/sets/classicsixthedition/WindDrake.java index dfd5d979784..10e263a2105 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/WindDrake.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/WindDrake.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/WindSpirit.java b/Mage.Sets/src/mage/sets/classicsixthedition/WindSpirit.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/WindSpirit.java rename to Mage.Sets/src/mage/sets/classicsixthedition/WindSpirit.java index 9381beefc2b..c556a9a8099 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/WindSpirit.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/WindSpirit.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/WoodenSphere.java b/Mage.Sets/src/mage/sets/classicsixthedition/WoodenSphere.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/WoodenSphere.java rename to Mage.Sets/src/mage/sets/classicsixthedition/WoodenSphere.java index 7a04951710c..398c5b82988 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/WoodenSphere.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/WoodenSphere.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/WorldlyTutor.java b/Mage.Sets/src/mage/sets/classicsixthedition/WorldlyTutor.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/WorldlyTutor.java rename to Mage.Sets/src/mage/sets/classicsixthedition/WorldlyTutor.java index 61d909e8a27..f05e25adcb6 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/WorldlyTutor.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/WorldlyTutor.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/WrathOfGod.java b/Mage.Sets/src/mage/sets/classicsixthedition/WrathOfGod.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/WrathOfGod.java rename to Mage.Sets/src/mage/sets/classicsixthedition/WrathOfGod.java index dfd63a737ce..aea2226aaef 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/WrathOfGod.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/WrathOfGod.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/WyluliWolf.java b/Mage.Sets/src/mage/sets/classicsixthedition/WyluliWolf.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/WyluliWolf.java rename to Mage.Sets/src/mage/sets/classicsixthedition/WyluliWolf.java index f3fae1babe9..9d1e1f1b35f 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/WyluliWolf.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/WyluliWolf.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/ZombieMaster.java b/Mage.Sets/src/mage/sets/classicsixthedition/ZombieMaster.java similarity index 95% rename from Mage.Sets/src/mage/sets/sixthedition/ZombieMaster.java rename to Mage.Sets/src/mage/sets/classicsixthedition/ZombieMaster.java index 020573197fa..453c9614053 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/ZombieMaster.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/ZombieMaster.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/sixthedition/ZursWeirding.java b/Mage.Sets/src/mage/sets/classicsixthedition/ZursWeirding.java similarity index 98% rename from Mage.Sets/src/mage/sets/sixthedition/ZursWeirding.java rename to Mage.Sets/src/mage/sets/classicsixthedition/ZursWeirding.java index 414d8df5a40..526041d1df8 100644 --- a/Mage.Sets/src/mage/sets/sixthedition/ZursWeirding.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/ZursWeirding.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.sixthedition; +package mage.sets.classicsixthedition; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/dissension/PillarOfTheParuns.java b/Mage.Sets/src/mage/sets/dissension/PillarOfTheParuns.java index 9b44a9a48a7..c1be32d897e 100644 --- a/Mage.Sets/src/mage/sets/dissension/PillarOfTheParuns.java +++ b/Mage.Sets/src/mage/sets/dissension/PillarOfTheParuns.java @@ -54,7 +54,7 @@ public class PillarOfTheParuns extends CardImpl { super(ownerId, 176, "Pillar of the Paruns", Rarity.RARE, new CardType[]{CardType.LAND}, ""); this.expansionSetCode = "DIS"; - // {tap}: Add one mana of any color to your mana pool. Spend this mana only to cast a multicolored spell. + // {T}: Add one mana of any color to your mana pool. Spend this mana only to cast a multicolored spell. this.addAbility(new ConditionalAnyColorManaAbility(1, new PillarOfTheParunsManaBuilder())); } @@ -92,17 +92,11 @@ class PillarOfTheParunsConditionalMana extends ConditionalMana { class MultiColoredSpellCastManaCondition extends ManaCondition implements Condition { - private static final MulticoloredPredicate multicolored = new MulticoloredPredicate(); - - private static class LazyHolder { - private static final MulticoloredPredicate multicolored = new MulticoloredPredicate(); - } - @Override public boolean apply(Game game, Ability source) { if (source instanceof SpellAbility) { MageObject object = game.getObject(source.getSourceId()); - if (object != null && LazyHolder.multicolored.apply(object, game)) { + if (object != null && object.getColor().getColorCount() > 1) { return true; } } @@ -113,4 +107,4 @@ class MultiColoredSpellCastManaCondition extends ManaCondition implements Condit public boolean apply(Game game, Ability source, UUID originalId) { return apply(game, source); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/sets/fourthedition/ObsianusGolem.java b/Mage.Sets/src/mage/sets/fourthedition/ObsianusGolem.java index 04788a38f4f..5778e7beb17 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/ObsianusGolem.java +++ b/Mage.Sets/src/mage/sets/fourthedition/ObsianusGolem.java @@ -33,7 +33,7 @@ import java.util.UUID; * * @author North */ -public class ObsianusGolem extends mage.sets.sixthedition.ObsianusGolem { +public class ObsianusGolem extends mage.sets.classicsixthedition.ObsianusGolem { public ObsianusGolem(UUID ownerId) { super(ownerId); diff --git a/Mage.Sets/src/mage/sets/futuresight/BitterOrdeal.java b/Mage.Sets/src/mage/sets/futuresight/BitterOrdeal.java new file mode 100644 index 00000000000..e11657f27df --- /dev/null +++ b/Mage.Sets/src/mage/sets/futuresight/BitterOrdeal.java @@ -0,0 +1,107 @@ +/* + * 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.futuresight; + +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.effects.OneShotEffect; +import mage.abilities.keyword.GravestormAbility; +import mage.cards.Card; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.game.Game; +import mage.players.Player; +import mage.target.TargetPlayer; +import mage.target.common.TargetCardInLibrary; +import mage.watchers.common.GravestormWatcher; + +/** + * + * @author emerald000 + */ +public class BitterOrdeal extends CardImpl { + + public BitterOrdeal(UUID ownerId) { + super(ownerId, 80, "Bitter Ordeal", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{B}"); + this.expansionSetCode = "FUT"; + + // Search target player's library for a card and exile it. Then that player shuffles his or her library. + this.getSpellAbility().addEffect(new BitterOrdealEffect()); + this.getSpellAbility().addTarget(new TargetPlayer()); + + // Gravestorm + this.addAbility(new GravestormAbility(), new GravestormWatcher()); + } + + public BitterOrdeal(final BitterOrdeal card) { + super(card); + } + + @Override + public BitterOrdeal copy() { + return new BitterOrdeal(this); + } +} + +class BitterOrdealEffect extends OneShotEffect { + + BitterOrdealEffect() { + super(Outcome.Exile); + staticText = "Search target player's library for a card and exile it. Then that player shuffles his or her library."; + } + + BitterOrdealEffect(final BitterOrdealEffect effect) { + super(effect); + } + + @Override + public BitterOrdealEffect copy() { + return new BitterOrdealEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Player targetPlayer = game.getPlayer(this.getTargetPointer().getFirst(game, source)); + Player controller = game.getPlayer(source.getControllerId()); + if (controller != null && targetPlayer != null) { + TargetCardInLibrary target = new TargetCardInLibrary(); + if (controller.searchLibrary(target, game, targetPlayer.getId())) { + Card card = targetPlayer.getLibrary().getCard(target.getFirstTarget(), game); + if (card != null) { + controller.moveCardToExileWithInfo(card, null, null, source.getSourceId(), game, Zone.LIBRARY, true); + } + } + targetPlayer.shuffleLibrary(game); + return true; + } + return false; + } +} diff --git a/Mage.Sets/src/mage/sets/limitedalpha/ObsianusGolem.java b/Mage.Sets/src/mage/sets/limitedalpha/ObsianusGolem.java index 704febead7a..f0b0a1ed7af 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/ObsianusGolem.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/ObsianusGolem.java @@ -33,7 +33,7 @@ import java.util.UUID; * * @author North */ -public class ObsianusGolem extends mage.sets.sixthedition.ObsianusGolem { +public class ObsianusGolem extends mage.sets.classicsixthedition.ObsianusGolem { public ObsianusGolem(UUID ownerId) { super(ownerId); diff --git a/Mage.Sets/src/mage/sets/limitedbeta/ObsianusGolem.java b/Mage.Sets/src/mage/sets/limitedbeta/ObsianusGolem.java index c80b069bafa..2c4ebe47e68 100644 --- a/Mage.Sets/src/mage/sets/limitedbeta/ObsianusGolem.java +++ b/Mage.Sets/src/mage/sets/limitedbeta/ObsianusGolem.java @@ -33,7 +33,7 @@ import java.util.UUID; * * @author North */ -public class ObsianusGolem extends mage.sets.sixthedition.ObsianusGolem { +public class ObsianusGolem extends mage.sets.classicsixthedition.ObsianusGolem { public ObsianusGolem(UUID ownerId) { super(ownerId); diff --git a/Mage.Sets/src/mage/sets/magic2012/AngelicDestiny.java b/Mage.Sets/src/mage/sets/magic2012/AngelicDestiny.java index f9604ea6f25..99a439abdc7 100644 --- a/Mage.Sets/src/mage/sets/magic2012/AngelicDestiny.java +++ b/Mage.Sets/src/mage/sets/magic2012/AngelicDestiny.java @@ -82,7 +82,7 @@ public class AngelicDestiny extends CardImpl { this.addAbility(ability); // When enchanted creature dies, return Angelic Destiny to its owner's hand. - this.addAbility(new DiesAttachedTriggeredAbility(new ReturnToHandSourceEffect(), "enchanted creature")); + this.addAbility(new DiesAttachedTriggeredAbility(new ReturnToHandSourceEffect(false, true), "enchanted creature")); } public AngelicDestiny(final AngelicDestiny card) { diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/ObsianusGolem.java b/Mage.Sets/src/mage/sets/masterseditioniv/ObsianusGolem.java index 0fa8e2bbed8..efef869259a 100644 --- a/Mage.Sets/src/mage/sets/masterseditioniv/ObsianusGolem.java +++ b/Mage.Sets/src/mage/sets/masterseditioniv/ObsianusGolem.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; * * @author LevelX2 */ -public class ObsianusGolem extends mage.sets.sixthedition.ObsianusGolem { +public class ObsianusGolem extends mage.sets.classicsixthedition.ObsianusGolem { public ObsianusGolem(UUID ownerId) { super(ownerId); diff --git a/Mage.Sets/src/mage/sets/mirrodin/PsychogenicProbe.java b/Mage.Sets/src/mage/sets/mirrodin/PsychogenicProbe.java new file mode 100644 index 00000000000..9ce7f410cf2 --- /dev/null +++ b/Mage.Sets/src/mage/sets/mirrodin/PsychogenicProbe.java @@ -0,0 +1,99 @@ +/* + * 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.mirrodin; + +import java.util.UUID; +import mage.abilities.TriggeredAbilityImpl; +import mage.abilities.effects.Effect; +import mage.abilities.effects.common.DamageTargetEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.game.events.GameEvent.EventType; +import mage.target.targetpointer.FixedTarget; + +/** + * + * @author emerald000 + */ +public class PsychogenicProbe extends CardImpl { + + public PsychogenicProbe(UUID ownerId) { + super(ownerId, 231, "Psychogenic Probe", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{2}"); + this.expansionSetCode = "MRD"; + + // Whenever a spell or ability causes a player to shuffle his or her library, Psychogenic Probe deals 2 damage to him or her. + this.addAbility(new PsychogenicProbeTriggeredAbility()); + } + + public PsychogenicProbe(final PsychogenicProbe card) { + super(card); + } + + @Override + public PsychogenicProbe copy() { + return new PsychogenicProbe(this); + } +} + +class PsychogenicProbeTriggeredAbility extends TriggeredAbilityImpl { + + PsychogenicProbeTriggeredAbility() { + super(Zone.BATTLEFIELD, new DamageTargetEffect(2), false); + } + + PsychogenicProbeTriggeredAbility(final PsychogenicProbeTriggeredAbility ability) { + super(ability); + } + + @Override + public PsychogenicProbeTriggeredAbility copy() { + return new PsychogenicProbeTriggeredAbility(this); + } + + @Override + public boolean checkEventType(GameEvent event, Game game) { + return event.getType().equals(EventType.LIBRARY_SHUFFLED); + } + + @Override + public boolean checkTrigger(GameEvent event, Game game) { + for (Effect effect : this.getEffects()) { + effect.setTargetPointer(new FixedTarget(event.getPlayerId())); + } + return true; + } + + @Override + public String getRule() { + return "Whenever a spell or ability causes a player to shuffle his or her library, Psychogenic Probe deals 2 damage to him or her."; + } +} diff --git a/Mage.Sets/src/mage/sets/mirrodin/TajNarSwordsmith.java b/Mage.Sets/src/mage/sets/mirrodin/TajNarSwordsmith.java index 7d2f6ddd78c..355c3c258fe 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TajNarSwordsmith.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TajNarSwordsmith.java @@ -34,7 +34,7 @@ import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.Cost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; +import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Outcome; @@ -101,7 +101,7 @@ class TajNarSwordsmithEffect extends OneShotEffect { FilterCard filter = new FilterCard("Equipment card with converted mana cost " + costX + " or less"); filter.add(new SubtypePredicate("Equipment")); filter.add(new ConvertedManaCostPredicate(ComparisonType.LessThan, costX + 1)); - new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 1, filter), true, true).apply(game, source); + new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 1, filter), false, true).apply(game, source); return true; } } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Spellskite.java b/Mage.Sets/src/mage/sets/newphyrexia/Spellskite.java index b2d1733d1a7..1c8d098634c 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Spellskite.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Spellskite.java @@ -116,8 +116,7 @@ class SpellskiteEffect extends OneShotEffect { // The source is still the spell on the stack target.addTarget(source.getSourceId(), stackObject.getStackAbility(), game); } - } - else { + } else { Player player = game.getPlayer(source.getControllerId()); for (Target target: targets) { for (UUID targetId: target.getTargets()) { @@ -147,7 +146,7 @@ class SpellskiteEffect extends OneShotEffect { } } if (oldTarget != null) { - game.informPlayers(new StringBuilder(sourceObject.getName()).append(": Changed target of ").append(stackObject.getName()).append(" from ").append(oldTarget.getName()).append(" to ").append(sourceObject.getName()).toString()); + game.informPlayers(sourceObject.getLogName() + ": Changed target of " +stackObject.getLogName() + " from " + oldTarget.getLogName() + " to " + sourceObject.getLogName()); } else { if (twoTimesTarget) { game.informPlayers(sourceObject.getLogName() + ": Target not changed to " + sourceObject.getLogName() + " because its not valid to target it twice for " + stackObject.getName()); diff --git a/Mage.Sets/src/mage/sets/portal/RegalUnicorn.java b/Mage.Sets/src/mage/sets/portal/RegalUnicorn.java index 8be4b2508b0..b20f2ccef6f 100644 --- a/Mage.Sets/src/mage/sets/portal/RegalUnicorn.java +++ b/Mage.Sets/src/mage/sets/portal/RegalUnicorn.java @@ -33,7 +33,7 @@ import java.util.UUID; * * @author Plopman */ -public class RegalUnicorn extends mage.sets.sixthedition.RegalUnicorn { +public class RegalUnicorn extends mage.sets.classicsixthedition.RegalUnicorn { public RegalUnicorn(UUID ownerId) { super(ownerId); diff --git a/Mage.Sets/src/mage/sets/revisededition/ObsianusGolem.java b/Mage.Sets/src/mage/sets/revisededition/ObsianusGolem.java index a61359332eb..1227143c6e9 100644 --- a/Mage.Sets/src/mage/sets/revisededition/ObsianusGolem.java +++ b/Mage.Sets/src/mage/sets/revisededition/ObsianusGolem.java @@ -33,7 +33,7 @@ import java.util.UUID; * * @author North */ -public class ObsianusGolem extends mage.sets.sixthedition.ObsianusGolem { +public class ObsianusGolem extends mage.sets.classicsixthedition.ObsianusGolem { public ObsianusGolem(UUID ownerId) { super(ownerId); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Narcolepsy.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Narcolepsy.java index 1a0e389c0b7..0ddc350317b 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Narcolepsy.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Narcolepsy.java @@ -28,17 +28,15 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; - -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.CardType; import mage.constants.Outcome; +import mage.constants.Rarity; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -68,7 +66,7 @@ public class Narcolepsy extends CardImpl { this.addAbility(ability); // At the beginning of each upkeep, if enchanted creature is untapped, tap it. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new NarcolepsyEffect(), TargetController.ANY, false)); + this.addAbility(new NarcolepsyTriggeredAbility()); } public Narcolepsy(final Narcolepsy card) { @@ -81,14 +79,46 @@ public class Narcolepsy extends CardImpl { } } -class NarcolepsyEffect extends OneShotEffect { - - public NarcolepsyEffect() { - super(Outcome.Detriment); - this.staticText = "if enchanted creature is untapped, tap it"; +class NarcolepsyTriggeredAbility extends BeginningOfUpkeepTriggeredAbility { + + NarcolepsyTriggeredAbility() { + super(new NarcolepsyEffect(), TargetController.ANY, false); + } + + NarcolepsyTriggeredAbility(final NarcolepsyTriggeredAbility ability) { + super(ability); } - public NarcolepsyEffect(final NarcolepsyEffect effect) { + @Override + public boolean checkInterveningIfClause(Game game) { + Permanent narcolepsy = game.getPermanent(this.getSourceId()); + if (narcolepsy != null) { + Permanent enchanted = game.getPermanent(narcolepsy.getAttachedTo()); + if (enchanted != null && !enchanted.isTapped()) { + return true; + } + } + return false; + } + + @Override + public NarcolepsyTriggeredAbility copy() { + return new NarcolepsyTriggeredAbility(this); + } + + @Override + public String getRule() { + return "At the beginning of each upkeep, if enchanted creature is untapped, tap it."; + } +} + +class NarcolepsyEffect extends OneShotEffect { + + NarcolepsyEffect() { + super(Outcome.Tap); + } + + NarcolepsyEffect(final NarcolepsyEffect effect) { super(effect); } @@ -97,7 +127,7 @@ class NarcolepsyEffect extends OneShotEffect { Permanent narcolepsy = game.getPermanent(source.getSourceId()); if (narcolepsy != null) { Permanent enchanted = game.getPermanent(narcolepsy.getAttachedTo()); - if (enchanted != null && !enchanted.isTapped()) { + if (enchanted != null) { enchanted.tap(game); return true; } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Hollowsage.java b/Mage.Sets/src/mage/sets/shadowmoor/Hollowsage.java index 7707c4d1d82..d196c7db06d 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Hollowsage.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Hollowsage.java @@ -54,7 +54,6 @@ public class Hollowsage extends CardImpl { this.subtype.add("Merfolk"); this.subtype.add("Wizard"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); @@ -94,12 +93,14 @@ class BecomesUntappedTriggeredAbility extends TriggeredAbilityImpl { return new BecomesUntappedTriggeredAbility(this); } + @Override + public boolean checkEventType(GameEvent event, Game game) { + return event.getType() == EventType.UNTAPPED; + } + @Override public boolean checkTrigger(GameEvent event, Game game) { - if (event.getType() == EventType.TAPPED && event.getTargetId().equals(sourceId)) { - return true; - } - return false; + return event.getTargetId().equals(sourceId); } @Override diff --git a/Mage.Sets/src/mage/sets/shadowmoor/IntimidatorInitiate.java b/Mage.Sets/src/mage/sets/shadowmoor/IntimidatorInitiate.java index 4fce9d48f41..4c6ecff3c48 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/IntimidatorInitiate.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/IntimidatorInitiate.java @@ -30,6 +30,7 @@ package mage.sets.shadowmoor; import java.util.UUID; import mage.MageInt; import mage.ObjectColor; +import mage.abilities.Ability; import mage.abilities.common.SpellCastAllTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DoIfCostPaid; @@ -40,6 +41,7 @@ import mage.constants.Duration; import mage.constants.Rarity; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; +import mage.target.common.TargetCreaturePermanent; /** * @@ -53,7 +55,7 @@ public class IntimidatorInitiate extends CardImpl { filter.add(new ColorPredicate(ObjectColor.RED)); } - private static final String rule = "Whenever a player casts a red spell, you may pay {1}. If you do, target creature can't block this turn"; + private static final String rule = "Whenever a player casts a red spell, you may pay {1}. If you do, target creature can't block this turn."; public IntimidatorInitiate(UUID ownerId) { super(ownerId, 96, "Intimidator Initiate", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{R}"); @@ -64,7 +66,9 @@ public class IntimidatorInitiate extends CardImpl { this.toughness = new MageInt(1); // Whenever a player casts a red spell, you may pay {1}. If you do, target creature can't block this turn. - this.addAbility(new SpellCastAllTriggeredAbility(new DoIfCostPaid(new CantBlockTargetEffect(Duration.EndOfTurn), new GenericManaCost(1)), filter, true, rule)); + Ability ability = new SpellCastAllTriggeredAbility(new DoIfCostPaid(new CantBlockTargetEffect(Duration.EndOfTurn), new GenericManaCost(1)), filter, true, rule); + ability.addTarget(new TargetCreaturePermanent()); + this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SigilBlessing.java b/Mage.Sets/src/mage/sets/shardsofalara/SigilBlessing.java index 04488e47a2b..5c4a9631200 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SigilBlessing.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SigilBlessing.java @@ -27,14 +27,21 @@ */ package mage.sets.shardsofalara; +import java.util.Iterator; import java.util.UUID; - +import mage.MageObjectReference; +import mage.abilities.Ability; +import mage.abilities.effects.ContinuousEffectImpl; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.effects.common.continuous.BoostControlledEffect; -import mage.abilities.effects.common.continuous.BoostTargetEffect; 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.game.Game; +import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -48,13 +55,9 @@ public class SigilBlessing extends CardImpl { super(ownerId, 195, "Sigil Blessing", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}{W}"); this.expansionSetCode = "ALA"; - this.color.setGreen(true); - this.color.setWhite(true); - // 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, Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new BoostControlledEffect(1, 1, Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new SigilBlessingBoostControlledEffect()); } public SigilBlessing(final SigilBlessing card) { @@ -66,3 +69,46 @@ public class SigilBlessing extends CardImpl { return new SigilBlessing(this); } } + +class SigilBlessingBoostControlledEffect extends ContinuousEffectImpl { + public SigilBlessingBoostControlledEffect() { + super(Duration.EndOfTurn, Layer.PTChangingEffects_7, SubLayer.ModifyPT_7c, Outcome.BoostCreature); + staticText = "Until end of turn, target creature you control gets +3/+3 and other creatures you control get +1/+1"; + } + + public SigilBlessingBoostControlledEffect(final SigilBlessingBoostControlledEffect effect) { + super(effect); + } + + @Override + public SigilBlessingBoostControlledEffect copy() { + return new SigilBlessingBoostControlledEffect(this); + } + + @Override + public void init(Ability source, Game game) { + super.init(source, game); + for (Permanent perm : game.getBattlefield().getAllActivePermanents(new FilterCreaturePermanent(), source.getControllerId(), game)) { + affectedObjectList.add(new MageObjectReference(perm, game)); + } + } + + @Override + public boolean apply(Game game, Ability source) { + for (Iterator it = affectedObjectList.iterator(); it.hasNext();) { + Permanent permanent = it.next().getPermanent(game); + if (permanent != null) { + int boost = 1; + if (getTargetPointer().getFirst(game, source).equals(permanent.getId())) { + boost = 3; + } + permanent.addPower(boost); + permanent.addToughness(boost); + } else { + it.remove(); // no longer on the battlefield, remove reference to object + } + } + return true; + } + +} diff --git a/Mage.Sets/src/mage/sets/starter2000/ObsianusGolem.java b/Mage.Sets/src/mage/sets/starter2000/ObsianusGolem.java index d77e4ebd02d..f0496d3b57d 100644 --- a/Mage.Sets/src/mage/sets/starter2000/ObsianusGolem.java +++ b/Mage.Sets/src/mage/sets/starter2000/ObsianusGolem.java @@ -33,7 +33,7 @@ import java.util.UUID; * * @author LevelX2 */ -public class ObsianusGolem extends mage.sets.sixthedition.ObsianusGolem { +public class ObsianusGolem extends mage.sets.classicsixthedition.ObsianusGolem { public ObsianusGolem(UUID ownerId) { super(ownerId); diff --git a/Mage.Sets/src/mage/sets/unlimitededition/ObsianusGolem.java b/Mage.Sets/src/mage/sets/unlimitededition/ObsianusGolem.java index fa9abc221a3..e3a1c0c60c4 100644 --- a/Mage.Sets/src/mage/sets/unlimitededition/ObsianusGolem.java +++ b/Mage.Sets/src/mage/sets/unlimitededition/ObsianusGolem.java @@ -33,7 +33,7 @@ import java.util.UUID; * * @author North */ -public class ObsianusGolem extends mage.sets.sixthedition.ObsianusGolem { +public class ObsianusGolem extends mage.sets.classicsixthedition.ObsianusGolem { public ObsianusGolem(UUID ownerId) { super(ownerId); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ManifestTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ManifestTest.java index 8fed441a115..775d820ec24 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ManifestTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ManifestTest.java @@ -295,12 +295,12 @@ public class ManifestTest extends CardTestPlayerBase { public void testManifestMegamorph() { addCard(Zone.BATTLEFIELD, playerB, "Swamp", 2); - addCard(Zone.BATTLEFIELD, playerB, "Plains", 5); + addCard(Zone.BATTLEFIELD, playerB, "Forest", 6); // {1}{B}, {T}, Sacrifice another creature: Manifest the top card of your library. addCard(Zone.BATTLEFIELD, playerB, "Qarsi High Priest", 1); addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion", 1); - addCard(Zone.LIBRARY, playerB, "Sandstorm Charger", 1); + addCard(Zone.LIBRARY, playerB, "Aerie Bowmasters", 1); addCard(Zone.LIBRARY, playerB, "Mountain", 1); skipInitShuffling(); @@ -308,7 +308,7 @@ public class ManifestTest extends CardTestPlayerBase { activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerB, "{1}{B},{T}, Sacrifice another creature"); addTarget(playerB, "Silvercoat Lion"); - activateAbility(2, PhaseStep.POSTCOMBAT_MAIN, playerB, "{4}{W}: Turn"); + activateAbility(2, PhaseStep.POSTCOMBAT_MAIN, playerB, "{5}{G}: Turn"); setStopAt(2, PhaseStep.END_TURN); execute(); @@ -320,8 +320,8 @@ public class ManifestTest extends CardTestPlayerBase { assertGraveyardCount(playerB, "Silvercoat Lion", 1); assertPermanentCount(playerB, "", 0); - assertPermanentCount(playerB, "Sandstorm Charger", 1); - assertPowerToughness(playerB, "Sandstorm Charger", 4, 5); // 3/4 and the +1/+1 counter from Megamorph + assertPermanentCount(playerB, "Aerie Bowmasters", 1); + assertPowerToughness(playerB, "Aerie Bowmasters", 4, 5); // 3/4 and the +1/+1 counter from Megamorph } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/ConditionalManaTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/ConditionalManaTest.java new file mode 100644 index 00000000000..197b794d575 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/ConditionalManaTest.java @@ -0,0 +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 org.mage.test.cards.mana; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Assert; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author LevelX2 + */ + +public class ConditionalManaTest extends CardTestPlayerBase { + + @Test + public void testNormalUse() { + // {T}: Add one mana of any color to your mana pool. Spend this mana only to cast a multicolored spell. + addCard(Zone.BATTLEFIELD, playerA, "Pillar of the Paruns", 2); + // Instant {G}{W} + // Target player gains 7 life. + addCard(Zone.HAND, playerA, "Heroes' Reunion", 1); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Heroes' Reunion", playerA); + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + execute(); + + assertGraveyardCount(playerA, "Heroes' Reunion", 1); + assertHandCount(playerA, "Heroes' Reunion", 0); // player A could not cast it + assertLife(playerA, 27); + } + + @Test + public void testNotAllowedUse() { + // {T}: Add one mana of any color to your mana pool. Spend this mana only to cast a multicolored spell. + addCard(Zone.BATTLEFIELD, playerA, "Pillar of the Paruns", 2); + addCard(Zone.HAND, playerA, "Silvercoat Lion", 1); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Silvercoat Lion"); + playerA.addChoice("White"); + playerA.addChoice("White"); + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + execute(); + + assertHandCount(playerA, "Silvercoat Lion", 1); // player A could not cast Silvercoat Lion because the conditional mana is not available + } + +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/DelayedTriggerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/DelayedTriggerTest.java new file mode 100644 index 00000000000..49aebd4b326 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/DelayedTriggerTest.java @@ -0,0 +1,88 @@ +/* + * 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 org.mage.test.cards.triggers; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author LevelX2 + */ + +public class DelayedTriggerTest extends CardTestPlayerBase { + + /** + * Activated Sunforger's unequip ability and cast Otherworldly Journey for free, targeting Cathodion. + * When Cathodion returned to the battlefield, it did not get a +1/+1 counter. * + * + */ + @Test + public void testOtherworldlyJourney1() { + // 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. + addCard(Zone.HAND, playerA, "Otherworldly Journey"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 2); + + addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion", 1); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Otherworldly Journey", "Silvercoat Lion"); + + setStopAt(2, PhaseStep.DRAW); + execute(); + + assertGraveyardCount(playerA, "Otherworldly Journey", 1); + assertPermanentCount(playerA, "Silvercoat Lion", 1); + assertPowerToughness(playerA, "Silvercoat Lion", 3, 3); + + } + + @Test + public void testOtherworldlyJourney2() { + // 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. + addCard(Zone.HAND, playerA, "Otherworldly Journey"); + addCard(Zone.HAND, playerA, "Cloudshift"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 2); + + addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion", 1); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Otherworldly Journey", "Silvercoat Lion"); + + castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Cloudshift", "Silvercoat Lion"); + + setStopAt(3, PhaseStep.BEGIN_COMBAT); + execute(); + + assertGraveyardCount(playerA, "Otherworldly Journey", 1); + assertGraveyardCount(playerA, "Cloudshift", 1); + assertPermanentCount(playerA, "Silvercoat Lion", 1); + assertPowerToughness(playerA, "Silvercoat Lion", 2, 2); // one one use of +1/+1 + + } +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SpellskiteTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SpellskiteTest.java index 679b733870e..7884d15402b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SpellskiteTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SpellskiteTest.java @@ -76,11 +76,12 @@ public class SpellskiteTest extends CardTestPlayerBase { * */ /** - * TODO: This test fails sometimes when building the complete Tets Project -> Find reason + * TODO: This test fails sometimes when building the complete Test Project -> Find the reason */ @Test public void testAfterChangeOfController() { - addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1); + // {T}: Add one mana of any color to your mana pool. Spend this mana only to cast a multicolored spell. + addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion", 1); addCard(Zone.BATTLEFIELD, playerA, "Island", 3); // {2}, {tap}: Gain control of target creature with power less than or equal to the number of Islands you control for as long as Vedalken Shackles remains tapped. addCard(Zone.BATTLEFIELD, playerA, "Vedalken Shackles", 1); @@ -96,7 +97,7 @@ public class SpellskiteTest extends CardTestPlayerBase { activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{2},{T}: Gain control", "Spellskite"); castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Frost Titan"); - addTarget(playerB, "Mountain"); + addTarget(playerB, "Silvercoat Lion"); activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerA, "{UP}: Change a target", "stack ability (Whenever {this} enters "); @@ -107,7 +108,8 @@ public class SpellskiteTest extends CardTestPlayerBase { assertPermanentCount(playerB, "Frost Titan", 1); assertTapped("Spellskite", true); - assertTapped("Mountain", false); + // (Battlefield) Tapped state is not equal (Silvercoat Lion) expected: but was: + assertTapped("Silvercoat Lion", false); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/AngelicDestinyTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/AngelicDestinyTest.java new file mode 100644 index 00000000000..985b6bbf536 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/AngelicDestinyTest.java @@ -0,0 +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 org.mage.test.cards.triggers.dies; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * + * @author LevelX2 + */ + +public class AngelicDestinyTest extends CardTestPlayerBase { + + /** + * I killed my opponent's Champion of the Parish, which was enchanted with Angelic Destiny. + * However the Angelic Destiny went to the graveyard instead of returning his hand. + * + */ + @Test + public void testDisabledEffectOnChangeZone() { + addCard(Zone.BATTLEFIELD, playerA, "Plains", 4); + // Enchantment - Aura {2}{W}{W} + // Enchant creature + // Enchanted creature gets +4/+4, has flying and first strike, and is an Angel in addition to its other types. + // When enchanted creature dies, return Angelic Destiny to its owner's hand. + addCard(Zone.HAND, playerA, "Angelic Destiny", 1); + // Champion of the Parish + // Whenever another Human enters the battlefield under your control, put a +1/+1 counter on Champion of the Parish. + addCard(Zone.BATTLEFIELD, playerA, "Champion of the Parish", 1); + + addCard(Zone.BATTLEFIELD, playerB, "Mountain", 1); + addCard(Zone.BATTLEFIELD, playerB, "Swamp", 1); + addCard(Zone.HAND, playerB, "Terminate", 1); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Angelic Destiny", "Champion of the Parish"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Terminate", "Champion of the Parish"); + + setStopAt(1, PhaseStep.END_TURN); + execute(); + + assertGraveyardCount(playerA, "Champion of the Parish", 1); + assertGraveyardCount(playerB, "Terminate", 1); + + assertGraveyardCount(playerA, "Angelic Destiny", 0); + assertHandCount(playerA, "Angelic Destiny", 1); + + } + +} \ No newline at end of file diff --git a/Mage/src/mage/abilities/common/DiesAttachedTriggeredAbility.java b/Mage/src/mage/abilities/common/DiesAttachedTriggeredAbility.java index c48b9d33637..78fc74d57c1 100644 --- a/Mage/src/mage/abilities/common/DiesAttachedTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/DiesAttachedTriggeredAbility.java @@ -6,7 +6,6 @@ import mage.abilities.effects.Effect; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; -import mage.game.permanent.Permanent; /** * "When enchanted/equipped creature dies" triggered ability diff --git a/Mage/src/mage/abilities/effects/common/ReturnToHandSourceEffect.java b/Mage/src/mage/abilities/effects/common/ReturnToHandSourceEffect.java index 4da3a673399..624fcf86de6 100644 --- a/Mage/src/mage/abilities/effects/common/ReturnToHandSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/ReturnToHandSourceEffect.java @@ -44,21 +44,33 @@ import mage.players.Player; */ public class ReturnToHandSourceEffect extends OneShotEffect { - boolean fromBattlefieldOnly = false; - + boolean fromBattlefieldOnly; + boolean returnFromNextZone ; + public ReturnToHandSourceEffect() { this(false); } - + public ReturnToHandSourceEffect(boolean fromBattlefieldOnly) { + this(fromBattlefieldOnly, false); + } + + /** + * + * @param fromBattlefieldOnly the object is only returned if it's on the battlefield as the effect resolves + * @param returnFromNextZone the object is only returned, if it has changed the zone one time after the source ability triggered or was activated (e.g. Angelic Destiny) + */ + public ReturnToHandSourceEffect(boolean fromBattlefieldOnly, boolean returnFromNextZone) { super(Outcome.ReturnToHand); this.fromBattlefieldOnly = fromBattlefieldOnly; + this.returnFromNextZone = returnFromNextZone; staticText = "return {this} to it's owner's hand"; } public ReturnToHandSourceEffect(final ReturnToHandSourceEffect effect) { super(effect); this.fromBattlefieldOnly = effect.fromBattlefieldOnly; + this.returnFromNextZone = effect.returnFromNextZone; } @Override @@ -70,7 +82,13 @@ public class ReturnToHandSourceEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { - MageObject mageObject = source.getSourceObjectIfItStillExists(game); + MageObject mageObject; + if (returnFromNextZone && + game.getState().getZoneChangeCounter(source.getSourceId()) == source.getSourceObjectZoneChangeCounter() + 1) { + mageObject = game.getObject(source.getSourceId()); + } else { + mageObject = source.getSourceObjectIfItStillExists(game); + } if (mageObject != null) { switch (game.getState().getZone(mageObject.getId())) { case BATTLEFIELD: diff --git a/Mage/src/mage/abilities/effects/common/counter/AddCountersTargetEffect.java b/Mage/src/mage/abilities/effects/common/counter/AddCountersTargetEffect.java index 922f5a03dd2..25df790451c 100644 --- a/Mage/src/mage/abilities/effects/common/counter/AddCountersTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/counter/AddCountersTargetEffect.java @@ -107,11 +107,10 @@ public class AddCountersTargetEffect extends OneShotEffect { newCounter.add(amount.calculate(game, source, this)); player.addCounters(newCounter, game); affectedTargets ++; - if (!game.isSimulation()) - game.informPlayers(new StringBuilder(sourceObject.getLogName()).append(": ") - .append(controller.getLogName()).append(" puts ") - .append(counter.getCount()).append(" ").append(counter.getName().toLowerCase()) - .append(" counter on ").append(player.getLogName()).toString()); + if (!game.isSimulation()) { + game.informPlayers(sourceObject.getLogName() +": " + controller.getLogName() + " puts " + + counter.getCount() + " " + counter.getName().toLowerCase() + " counter on " + player.getLogName()); + } } } } diff --git a/Mage/src/mage/abilities/keyword/GravestormAbility.java b/Mage/src/mage/abilities/keyword/GravestormAbility.java new file mode 100644 index 00000000000..109a7d02318 --- /dev/null +++ b/Mage/src/mage/abilities/keyword/GravestormAbility.java @@ -0,0 +1,131 @@ +/* +* 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 mage.MageObjectReference; +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.events.GameEvent.EventType; +import mage.game.stack.Spell; +import mage.game.stack.StackObject; +import mage.watchers.common.GravestormWatcher; + + + +/** + * + * @author emerald000 + */ +public class GravestormAbility extends TriggeredAbilityImpl { + + public GravestormAbility() { + super(Zone.STACK, new GravestormEffect()); + } + + private GravestormAbility(final GravestormAbility ability) { + super(ability); + } + @Override + public GravestormAbility copy() { + return new GravestormAbility(this); + } + + @Override + public boolean checkEventType(GameEvent event, Game game) { + return event.getType() == EventType.SPELL_CAST; + } + + @Override + public boolean checkTrigger(GameEvent event, Game game) { + if (event.getSourceId().equals(this.getSourceId())) { + StackObject spell = game.getStack().getStackObject(this.getSourceId()); + if (spell instanceof Spell) { + for (Effect effect : this.getEffects()) { + effect.setValue("GravestormSpell", spell); + effect.setValue("GravestormSpellRef", new MageObjectReference(spell.getId(), game)); + } + return true; + } + } + return false; + } + + @Override + public String getRule() { + return "Gravestorm (When you cast this spell, copy it for each permanent put into a graveyard this turn. You may choose new targets for the copies.)" ; + } +} + +class GravestormEffect extends OneShotEffect { + + GravestormEffect() { + super(Outcome.Copy); + } + + GravestormEffect(final GravestormEffect effect) { + super(effect); + } + + @Override + public boolean apply(Game game, Ability source) { + MageObjectReference spellRef = (MageObjectReference) this.getValue("GravestormSpellRef"); + if (spellRef != null) { + GravestormWatcher watcher = (GravestormWatcher) game.getState().getWatchers().get("GravestormWatcher"); + int gravestormCount = watcher.getGravestormCount(); + if (gravestormCount > 0) { + Spell spell = (Spell) this.getValue("GravestormSpell"); + if (spell != null) { + if (!game.isSimulation()) { + game.informPlayers("Gravestorm: " + spell.getName() + " will be copied " + gravestormCount + " time" + (gravestormCount > 1 ? "s" : "")); + } + for (int i = 0; i < gravestormCount; i++) { + Spell copy = spell.copySpell(); + copy.setControllerId(source.getControllerId()); + copy.setCopiedSpell(true); + game.getStack().push(copy); + copy.chooseNewTargets(game, source.getControllerId()); + } + } + } + return true; + } + return false; + } + + @Override + public GravestormEffect copy() { + return new GravestormEffect(this); + } +} diff --git a/Mage/src/mage/watchers/common/GravestormWatcher.java b/Mage/src/mage/watchers/common/GravestormWatcher.java new file mode 100644 index 00000000000..5d8d1014213 --- /dev/null +++ b/Mage/src/mage/watchers/common/GravestormWatcher.java @@ -0,0 +1,80 @@ +/* + * 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.watchers.common; + +import mage.constants.WatcherScope; +import mage.constants.Zone; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.game.events.GameEvent.EventType; +import mage.game.events.ZoneChangeEvent; +import mage.watchers.Watcher; + +/** + * + * @author emerald000 + * + */ +public class GravestormWatcher extends Watcher { + + private int gravestormCount = 0; + + public GravestormWatcher() { + super("GravestormWatcher", WatcherScope.GAME); + } + + public GravestormWatcher(final GravestormWatcher watcher) { + super(watcher); + this.gravestormCount = watcher.gravestormCount; + } + + @Override + public void watch(GameEvent event, Game game) { + if (event.getType() == EventType.ZONE_CHANGE) { + ZoneChangeEvent zEvent = (ZoneChangeEvent) event; + if (zEvent.getFromZone() == Zone.BATTLEFIELD && zEvent.getToZone() == Zone.GRAVEYARD) { + gravestormCount++; + } + } + } + + @Override + public void reset() { + super.reset(); + this.gravestormCount = 0; + } + + public int getGravestormCount() { + return this.gravestormCount; + } + + @Override + public GravestormWatcher copy() { + return new GravestormWatcher(this); + } +}