diff --git a/Mage.Sets/src/mage/cards/e/ElspethKnightErrant.java b/Mage.Sets/src/mage/cards/e/ElspethKnightErrant.java index d1a7b7671c4..52cd4541b28 100644 --- a/Mage.Sets/src/mage/cards/e/ElspethKnightErrant.java +++ b/Mage.Sets/src/mage/cards/e/ElspethKnightErrant.java @@ -36,7 +36,6 @@ public final class ElspethKnightErrant extends CardImpl { // +1: Create a 1/1 white Soldier creature token. Token token = new SoldierToken(); - token.setOriginalExpansionSetCode("ALA"); // to get the right image this.addAbility(new LoyaltyAbility(new CreateTokenEffect(token), 1)); // +1: Target creature gets +3/+3 and gains flying until end of turn. diff --git a/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java b/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java index 7fbe80baf97..3632e3227c9 100644 --- a/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java +++ b/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java @@ -51,13 +51,11 @@ class EnsouledScimitarToken extends TokenImpl { public EnsouledScimitarToken() { super("Pincher", "1/5 Spirit artifact creature with flying"); - setOriginalExpansionSetCode("5ND"); cardType.add(CardType.CREATURE); subtype.add(SubType.SPIRIT); power = new MageInt(1); toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); - } public EnsouledScimitarToken(final EnsouledScimitarToken token) { diff --git a/Mage/src/main/java/mage/designations/CitysBlessing.java b/Mage/src/main/java/mage/designations/CitysBlessing.java index 9e803a6b676..5e9ec95882c 100644 --- a/Mage/src/main/java/mage/designations/CitysBlessing.java +++ b/Mage/src/main/java/mage/designations/CitysBlessing.java @@ -6,7 +6,7 @@ package mage.designations; public class CitysBlessing extends Designation { public CitysBlessing() { - super(DesignationType.CITYS_BLESSING, "RIX"); + super(DesignationType.CITYS_BLESSING); } private CitysBlessing(final CitysBlessing card) { diff --git a/Mage/src/main/java/mage/designations/Designation.java b/Mage/src/main/java/mage/designations/Designation.java index 9d0b91a6465..520dc9a46d4 100644 --- a/Mage/src/main/java/mage/designations/Designation.java +++ b/Mage/src/main/java/mage/designations/Designation.java @@ -2,6 +2,7 @@ package mage.designations; import mage.MageInt; import mage.MageObject; +import mage.MageObjectImpl; import mage.ObjectColor; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; @@ -23,59 +24,44 @@ import java.util.*; /** * @author LevelX2 */ -public abstract class Designation implements MageObject { +public abstract class Designation extends MageObjectImpl { private static final List emptyList = Collections.unmodifiableList(new ArrayList<>()); private static final ObjectColor emptyColor = new ObjectColor(); private static final ManaCostsImpl emptyCost = new ManaCostsImpl<>(); - private String name; private final DesignationType designationType; - private UUID id; - private final FrameStyle frameStyle; + private final boolean unique; // can a designation be added multiple times (false) or only once to an object (true) + private boolean copy; private MageObject copyFrom; // copied card INFO (used to call original adjusters) private Abilities abilites = new AbilitiesImpl<>(); - private String expansionSetCodeForImage; - private final boolean unique; // can a designation be added multiple times (false) or only once to an object (true) - public Designation(DesignationType designationType, String expansionSetCode) { - this(designationType, expansionSetCode, true); + public Designation(DesignationType designationType) { + this(designationType, true); } - public Designation(DesignationType designationType, String expansionSetCode, boolean unique) { - this.name = designationType.toString(); + public Designation(DesignationType designationType, boolean unique) { + super(UUID.randomUUID()); this.designationType = designationType; - this.id = UUID.randomUUID(); - this.frameStyle = FrameStyle.M15_NORMAL; - this.expansionSetCodeForImage = expansionSetCode; this.unique = unique; + this.name = designationType.toString(); + this.frameStyle = FrameStyle.M15_NORMAL; } public Designation(final Designation designation) { - this.name = designation.name; + super(designation); this.designationType = designation.designationType; - this.id = designation.id; + this.unique = designation.unique; this.frameStyle = designation.frameStyle; this.copy = designation.copy; this.copyFrom = (designation.copyFrom != null ? designation.copyFrom.copy() : null); this.abilites = designation.abilites.copy(); - this.expansionSetCodeForImage = designation.expansionSetCodeForImage; - this.unique = designation.unique; } @Override public abstract Designation copy(); - @Override - public FrameStyle getFrameStyle() { - return frameStyle; - } - - public void assignNewId() { - this.id = UUID.randomUUID(); - } - @Override public void setCopy(boolean isCopy, MageObject copyFrom) { this.copy = isCopy; @@ -92,64 +78,21 @@ public abstract class Designation implements MageObject { return this.copyFrom; } - @Override - public String getName() { - return name; - } - - @Override - public String getIdName() { - return getName() + " [" + getId().toString().substring(0, 3) + ']'; - } - - @Override - public String getImageName() { - return this.name; - } - - @Override - public void setName(String name) { - this.name = name; - } - public void addAbility(Ability ability) { - ability.setSourceId(id); + ability.setSourceId(this.objectId); abilites.add(ability); abilites.addAll(ability.getSubAbilities()); } - @Override - public Abilities getAbilities() { - return abilites; - } - @Override public ObjectColor getFrameColor(Game game) { return emptyColor; } - @Override - public UUID getId() { - return this.id; - } - public DesignationType getDesignationType() { return designationType; } - public void setExpansionSetCodeForImage(String expansionSetCodeForImage) { - this.expansionSetCodeForImage = expansionSetCodeForImage; - } - - public String getExpansionSetCodeForImage() { - return expansionSetCodeForImage; - } - - @Override - public String getLogName() { - return GameLog.getColoredObjectIdName(this); - } - @Override public List getCardType(Game game) { return emptyList; @@ -210,24 +153,6 @@ public abstract class Designation implements MageObject { return MageInt.EmptyMageInt; } - @Override - public int getStartingLoyalty() { - return 0; - } - - @Override - public void setStartingLoyalty(int startingLoyalty) { - } - - @Override - public int getStartingDefense() { - return 0; - } - - @Override - public void setStartingDefense(int startingDefense) { - } - @Override public int getZoneChangeCounter(Game game) { return 1; // Emblems can't move zones until now so return always 1 @@ -247,14 +172,6 @@ public abstract class Designation implements MageObject { public void removePTCDA() { } - /** - * @param game - * @param controllerId - */ - public void start(Game game, UUID controllerId) { - - } - @Override public boolean isAllCreatureTypes(Game game) { return false; diff --git a/Mage/src/main/java/mage/designations/Initiative.java b/Mage/src/main/java/mage/designations/Initiative.java index 2d149124b28..14fb8a26015 100644 --- a/Mage/src/main/java/mage/designations/Initiative.java +++ b/Mage/src/main/java/mage/designations/Initiative.java @@ -21,7 +21,7 @@ import java.util.UUID; public class Initiative extends Designation { public Initiative() { - super(DesignationType.THE_INITIATIVE, "CLB"); + super(DesignationType.THE_INITIATIVE); // Whenever one or more creatures a player controls deals combat damage to you, that player takes the initiative. this.addAbility(new InitiativeDamageTriggeredAbility()); diff --git a/Mage/src/main/java/mage/designations/Monarch.java b/Mage/src/main/java/mage/designations/Monarch.java index 0bc8e9b61dc..09a6a160c47 100644 --- a/Mage/src/main/java/mage/designations/Monarch.java +++ b/Mage/src/main/java/mage/designations/Monarch.java @@ -19,7 +19,7 @@ import mage.target.targetpointer.FixedTarget; public class Monarch extends Designation { public Monarch() { - super(DesignationType.THE_MONARCH, "CN2"); + super(DesignationType.THE_MONARCH); addAbility(new MonarchDrawTriggeredAbility()); addAbility(new MonarchDealsCombatDamageToAPlayerTriggeredAbility()); } diff --git a/Mage/src/main/java/mage/game/command/dungeons/DungeonOfTheMadMageDungeon.java b/Mage/src/main/java/mage/game/command/dungeons/DungeonOfTheMadMageDungeon.java index b270b2b9448..86270c750d6 100644 --- a/Mage/src/main/java/mage/game/command/dungeons/DungeonOfTheMadMageDungeon.java +++ b/Mage/src/main/java/mage/game/command/dungeons/DungeonOfTheMadMageDungeon.java @@ -29,7 +29,7 @@ import mage.target.common.TargetCreaturePermanent; public class DungeonOfTheMadMageDungeon extends Dungeon { public DungeonOfTheMadMageDungeon() { - super("Dungeon of the Mad Mage", "AFR"); + super("Dungeon of the Mad Mage"); // (1) Yawning Portal — You gain 1 life. (→ 2) DungeonRoom yawningPortal = new DungeonRoom("Yawning Portal", new GainLifeEffect(1)); diff --git a/Mage/src/main/java/mage/game/command/dungeons/LostMineOfPhandelverDungeon.java b/Mage/src/main/java/mage/game/command/dungeons/LostMineOfPhandelverDungeon.java index c7e4b18c599..86c7c5dda0d 100644 --- a/Mage/src/main/java/mage/game/command/dungeons/LostMineOfPhandelverDungeon.java +++ b/Mage/src/main/java/mage/game/command/dungeons/LostMineOfPhandelverDungeon.java @@ -21,7 +21,7 @@ import mage.target.common.TargetCreaturePermanent; public class LostMineOfPhandelverDungeon extends Dungeon { public LostMineOfPhandelverDungeon() { - super("Lost Mine of Phandelver", "AFR"); + super("Lost Mine of Phandelver"); // (1) Cave Entrance — Scry 1. (→ 2a or 2b) DungeonRoom caveEntrance = new DungeonRoom( "Cave Entrance", new ScryEffect(1, false) diff --git a/Mage/src/main/java/mage/game/command/dungeons/TombOfAnnihilationDungeon.java b/Mage/src/main/java/mage/game/command/dungeons/TombOfAnnihilationDungeon.java index 5f56eaffdac..4ee8e01e808 100644 --- a/Mage/src/main/java/mage/game/command/dungeons/TombOfAnnihilationDungeon.java +++ b/Mage/src/main/java/mage/game/command/dungeons/TombOfAnnihilationDungeon.java @@ -42,7 +42,7 @@ public final class TombOfAnnihilationDungeon extends Dungeon { } public TombOfAnnihilationDungeon() { - super("Tomb of Annihilation", "AFR"); + super("Tomb of Annihilation"); // (1) Trapped Entry — Each player loses 1 life. (→ 2a or 2b) DungeonRoom trappedEntry = new DungeonRoom("Trapped Entry", new LoseLifeAllPlayersEffect(1)); diff --git a/Mage/src/main/java/mage/game/command/dungeons/UndercityDungeon.java b/Mage/src/main/java/mage/game/command/dungeons/UndercityDungeon.java index 41f58d22988..f69bf70fdd5 100644 --- a/Mage/src/main/java/mage/game/command/dungeons/UndercityDungeon.java +++ b/Mage/src/main/java/mage/game/command/dungeons/UndercityDungeon.java @@ -38,7 +38,7 @@ import mage.util.RandomUtil; public class UndercityDungeon extends Dungeon { public UndercityDungeon() { - super("Undercity", "CLB"); + super("Undercity"); // Secret Entrance — Search your library for a basic land card, // reveal it, diff --git a/Mage/src/main/java/mage/game/command/emblems/AjaniAdversaryOfTyrantsEmblem.java b/Mage/src/main/java/mage/game/command/emblems/AjaniAdversaryOfTyrantsEmblem.java index cdb80518c7c..7aeea7d6df0 100644 --- a/Mage/src/main/java/mage/game/command/emblems/AjaniAdversaryOfTyrantsEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/AjaniAdversaryOfTyrantsEmblem.java @@ -8,18 +8,25 @@ import mage.game.command.Emblem; import mage.game.permanent.token.CatToken2; /** - * * @author TheElk801 */ public final class AjaniAdversaryOfTyrantsEmblem extends Emblem { // −7: You get an emblem with "At the beginning of your end step, create three 1/1 white Cat creature tokens with lifelink." public AjaniAdversaryOfTyrantsEmblem() { - this.setName("Emblem Ajani"); - this.setExpansionSetCodeForImage("M19"); + super("Emblem Ajani"); this.getAbilities().add(new BeginningOfEndStepTriggeredAbility( Zone.COMMAND, new CreateTokenEffect(new CatToken2(), 3), TargetController.YOU, null, false )); } + + private AjaniAdversaryOfTyrantsEmblem(final AjaniAdversaryOfTyrantsEmblem card) { + super(card); + } + + @Override + public AjaniAdversaryOfTyrantsEmblem copy() { + return new AjaniAdversaryOfTyrantsEmblem(this); + } } diff --git a/Mage/src/main/java/mage/game/command/emblems/AjaniSleeperAgentEmblem.java b/Mage/src/main/java/mage/game/command/emblems/AjaniSleeperAgentEmblem.java index f282cc3717b..f286ab2f881 100644 --- a/Mage/src/main/java/mage/game/command/emblems/AjaniSleeperAgentEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/AjaniSleeperAgentEmblem.java @@ -20,10 +20,18 @@ public final class AjaniSleeperAgentEmblem extends Emblem { // You get an emblem with "Whenever you cast a creature or planeswalker spell, target opponent gets two poison counters." public AjaniSleeperAgentEmblem() { - this.setName("Emblem Ajani"); - this.setExpansionSetCodeForImage("DMU"); + super("Emblem Ajani"); Ability ability = new SpellCastControllerTriggeredAbility(Zone.COMMAND, new AddPoisonCounterTargetEffect(2), filter, false, false); ability.addTarget(new TargetOpponent()); this.getAbilities().add(ability); } + + private AjaniSleeperAgentEmblem(final AjaniSleeperAgentEmblem card) { + super(card); + } + + @Override + public AjaniSleeperAgentEmblem copy() { + return new AjaniSleeperAgentEmblem(this); + } } diff --git a/Mage/src/main/java/mage/game/command/emblems/AjaniSteadfastEmblem.java b/Mage/src/main/java/mage/game/command/emblems/AjaniSteadfastEmblem.java index 68923d697f1..cb02f3a7d8e 100644 --- a/Mage/src/main/java/mage/game/command/emblems/AjaniSteadfastEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/AjaniSteadfastEmblem.java @@ -1,4 +1,3 @@ - package mage.game.command.emblems; import mage.abilities.Ability; @@ -12,15 +11,22 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; /** - * * @author spjspj */ public final class AjaniSteadfastEmblem extends Emblem { public AjaniSteadfastEmblem() { - setName("Emblem Ajani"); + super("Emblem Ajani"); this.getAbilities().add(new SimpleStaticAbility(Zone.COMMAND, new AjaniSteadfastPreventEffect())); - this.setExpansionSetCodeForImage("M15"); + } + + private AjaniSteadfastEmblem(final AjaniSteadfastEmblem card) { + super(card); + } + + @Override + public AjaniSteadfastEmblem copy() { + return new AjaniSteadfastEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/ArlinnEmbracedByTheMoonEmblem.java b/Mage/src/main/java/mage/game/command/emblems/ArlinnEmbracedByTheMoonEmblem.java index 49974d845e1..e2d840aed84 100644 --- a/Mage/src/main/java/mage/game/command/emblems/ArlinnEmbracedByTheMoonEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/ArlinnEmbracedByTheMoonEmblem.java @@ -1,4 +1,3 @@ - package mage.game.command.emblems; import mage.abilities.Ability; @@ -18,14 +17,13 @@ import mage.game.command.Emblem; import mage.target.common.TargetAnyTarget; /** - * * @author spjspj */ public final class ArlinnEmbracedByTheMoonEmblem extends Emblem { // "Creatures you control have haste and '{T}: This creature deals damage equal to its power to any target.'" public ArlinnEmbracedByTheMoonEmblem() { - this.setName("Emblem Arlinn"); + super("Emblem Arlinn"); FilterPermanent filter = new FilterControlledCreaturePermanent("Creatures"); GainAbilityControlledEffect effect = new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.EndOfGame, filter); effect.setText("Creatures you control have haste"); @@ -38,7 +36,14 @@ public final class ArlinnEmbracedByTheMoonEmblem extends Emblem { effect.setText("and '{T}: This creature deals damage equal to its power to any target"); ability.addEffect(effect); this.getAbilities().add(ability); + } - this.setExpansionSetCodeForImage("SOI"); + private ArlinnEmbracedByTheMoonEmblem(final ArlinnEmbracedByTheMoonEmblem card) { + super(card); + } + + @Override + public ArlinnEmbracedByTheMoonEmblem copy() { + return new ArlinnEmbracedByTheMoonEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/AurraSingBaneOfJediEmblem.java b/Mage/src/main/java/mage/game/command/emblems/AurraSingBaneOfJediEmblem.java index 77262b5137c..746ea66785b 100644 --- a/Mage/src/main/java/mage/game/command/emblems/AurraSingBaneOfJediEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/AurraSingBaneOfJediEmblem.java @@ -1,23 +1,28 @@ - package mage.game.command.emblems; import mage.abilities.common.LeavesBattlefieldAllTriggeredAbility; import mage.abilities.effects.common.discard.DiscardControllerEffect; import mage.constants.Zone; import mage.filter.StaticFilters; -import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.TokenPredicate; import mage.game.command.Emblem; /** - * * @author spjspj */ public final class AurraSingBaneOfJediEmblem extends Emblem { // Whenever a nontoken creature you control leaves the battlefied, discard a card. public AurraSingBaneOfJediEmblem() { - this.setName("Emblem Aurra Sing, Bane of Jedi"); + super("Emblem Aurra Sing, Bane of Jedi"); getAbilities().add(new LeavesBattlefieldAllTriggeredAbility(Zone.COMMAND, new DiscardControllerEffect(1), StaticFilters.FILTER_CONTROLLED_CREATURE_NON_TOKEN, false)); } + + private AurraSingBaneOfJediEmblem(final AurraSingBaneOfJediEmblem card) { + super(card); + } + + @Override + public AurraSingBaneOfJediEmblem copy() { + return new AurraSingBaneOfJediEmblem(this); + } } diff --git a/Mage/src/main/java/mage/game/command/emblems/BasriKetEmblem.java b/Mage/src/main/java/mage/game/command/emblems/BasriKetEmblem.java index c42051ee94a..3b853bd72a1 100644 --- a/Mage/src/main/java/mage/game/command/emblems/BasriKetEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/BasriKetEmblem.java @@ -17,17 +17,24 @@ public final class BasriKetEmblem extends Emblem { */ public BasriKetEmblem() { - setName("Emblem Basri"); + super("Emblem Basri"); Ability ability = new BeginningOfCombatTriggeredAbility( Zone.COMMAND, new CreateTokenEffect(new SoldierToken()), TargetController.YOU, false, false); ability.addEffect( new AddCountersAllEffect(CounterType.P1P1.createInstance(), StaticFilters.FILTER_PERMANENT_CREATURE_CONTROLLED) - .setText(", then put a +1/+1 counter on each creature you control") + .setText(", then put a +1/+1 counter on each creature you control") ); this.getAbilities().add(ability); + } - this.setExpansionSetCodeForImage("M21"); + private BasriKetEmblem(final BasriKetEmblem card) { + super(card); + } + + @Override + public BasriKetEmblem copy() { + return new BasriKetEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/ChandraAwakenedInfernoEmblem.java b/Mage/src/main/java/mage/game/command/emblems/ChandraAwakenedInfernoEmblem.java index bc0e5526f40..2ff7a902f3b 100644 --- a/Mage/src/main/java/mage/game/command/emblems/ChandraAwakenedInfernoEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/ChandraAwakenedInfernoEmblem.java @@ -17,11 +17,19 @@ public final class ChandraAwakenedInfernoEmblem extends Emblem { */ public ChandraAwakenedInfernoEmblem() { - setName("Emblem Chandra"); - setExpansionSetCodeForImage("M20"); + super("Emblem Chandra"); this.getAbilities().add(new BeginningOfUpkeepTriggeredAbility( Zone.COMMAND, new DamageControllerEffect(1, "this emblem"), TargetController.YOU, false, true )); } + + private ChandraAwakenedInfernoEmblem(final ChandraAwakenedInfernoEmblem card) { + super(card); + } + + @Override + public ChandraAwakenedInfernoEmblem copy() { + return new ChandraAwakenedInfernoEmblem(this); + } } diff --git a/Mage/src/main/java/mage/game/command/emblems/ChandraDressedToKillEmblem.java b/Mage/src/main/java/mage/game/command/emblems/ChandraDressedToKillEmblem.java index 31c7d955f16..9d1adf5b3fe 100644 --- a/Mage/src/main/java/mage/game/command/emblems/ChandraDressedToKillEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/ChandraDressedToKillEmblem.java @@ -17,7 +17,6 @@ import mage.target.common.TargetAnyTarget; import mage.watchers.common.ManaPaidSourceWatcher; /** - * * @author weirddan455 */ public class ChandraDressedToKillEmblem extends Emblem { @@ -30,12 +29,19 @@ public class ChandraDressedToKillEmblem extends Emblem { // Whenever you cast a red spell, this emblem deals X damage to any target, where X is the amount of mana spent to cast that spell. public ChandraDressedToKillEmblem() { - this.setName("Emblem Chandra"); + super("Emblem Chandra"); Ability ability = new SpellCastControllerTriggeredAbility(Zone.COMMAND, new ChandraDressedToKillEmblemEffect(), filter, false, true); ability.addTarget(new TargetAnyTarget()); this.getAbilities().add(ability); + } - this.setExpansionSetCodeForImage("VOW"); + private ChandraDressedToKillEmblem(final ChandraDressedToKillEmblem card) { + super(card); + } + + @Override + public ChandraDressedToKillEmblem copy() { + return new ChandraDressedToKillEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/ChandraRoaringFlameEmblem.java b/Mage/src/main/java/mage/game/command/emblems/ChandraRoaringFlameEmblem.java index 3d263f9fbcb..7ef6beed953 100644 --- a/Mage/src/main/java/mage/game/command/emblems/ChandraRoaringFlameEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/ChandraRoaringFlameEmblem.java @@ -1,4 +1,3 @@ - package mage.game.command.emblems; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -9,7 +8,6 @@ import mage.constants.Zone; import mage.game.command.Emblem; /** - * * @author spjspj */ public final class ChandraRoaringFlameEmblem extends Emblem { @@ -20,10 +18,18 @@ public final class ChandraRoaringFlameEmblem extends Emblem { */ public ChandraRoaringFlameEmblem() { - setName("Emblem Chandra"); - setExpansionSetCodeForImage("ORI"); + super("Emblem Chandra"); Effect effect = new DamageTargetEffect(3); effect.setText("this emblem deals 3 damage to you"); this.getAbilities().add(new BeginningOfUpkeepTriggeredAbility(Zone.COMMAND, effect, TargetController.YOU, false, true)); } + + private ChandraRoaringFlameEmblem(final ChandraRoaringFlameEmblem card) { + super(card); + } + + @Override + public ChandraRoaringFlameEmblem copy() { + return new ChandraRoaringFlameEmblem(this); + } } diff --git a/Mage/src/main/java/mage/game/command/emblems/ChandraTorchOfDefianceEmblem.java b/Mage/src/main/java/mage/game/command/emblems/ChandraTorchOfDefianceEmblem.java index 599e4829742..8983e75f988 100644 --- a/Mage/src/main/java/mage/game/command/emblems/ChandraTorchOfDefianceEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/ChandraTorchOfDefianceEmblem.java @@ -1,4 +1,3 @@ - package mage.game.command.emblems; import mage.abilities.Ability; @@ -6,26 +5,31 @@ import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; import mage.constants.Zone; -import mage.filter.FilterSpell; import mage.filter.StaticFilters; import mage.game.command.Emblem; import mage.target.common.TargetAnyTarget; /** - * * @author spjspj */ public final class ChandraTorchOfDefianceEmblem extends Emblem { - + // You get an emblem with "Whenever you cast a spell, this emblem deals 5 damage to any target." public ChandraTorchOfDefianceEmblem() { - this.setName("Emblem Chandra"); + super("Emblem Chandra"); Effect effect = new DamageTargetEffect(5); effect.setText("this emblem deals 5 damage to any target"); Ability ability = new SpellCastControllerTriggeredAbility(Zone.COMMAND, effect, StaticFilters.FILTER_SPELL_A, false, false); ability.addTarget(new TargetAnyTarget()); getAbilities().add(ability); + } - this.setExpansionSetCodeForImage("KLD"); + private ChandraTorchOfDefianceEmblem(final ChandraTorchOfDefianceEmblem card) { + super(card); + } + + @Override + public ChandraTorchOfDefianceEmblem copy() { + return new ChandraTorchOfDefianceEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/DackFaydenEmblem.java b/Mage/src/main/java/mage/game/command/emblems/DackFaydenEmblem.java index d4683f735ec..03b8936e70b 100644 --- a/Mage/src/main/java/mage/game/command/emblems/DackFaydenEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/DackFaydenEmblem.java @@ -1,42 +1,42 @@ - package mage.game.command.emblems; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.SpellAbility; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.Effect; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.command.Emblem; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.game.stack.Spell; import mage.players.Player; import mage.target.Target; import mage.target.targetpointer.FixedTargets; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** - * * @author spjspj */ public final class DackFaydenEmblem extends Emblem { public DackFaydenEmblem() { - this.setName("Emblem Dack"); + super("Emblem Dack"); this.getAbilities().add(new DackFaydenEmblemTriggeredAbility()); + } - availableImageSetCodes = Arrays.asList("CNS", "EMA", "MED"); + private DackFaydenEmblem(final DackFaydenEmblem card) { + super(card); + } + + @Override + public DackFaydenEmblem copy() { + return new DackFaydenEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/DarettiScrapSavantEmblem.java b/Mage/src/main/java/mage/game/command/emblems/DarettiScrapSavantEmblem.java index 31987866d51..672fa9531e5 100644 --- a/Mage/src/main/java/mage/game/command/emblems/DarettiScrapSavantEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/DarettiScrapSavantEmblem.java @@ -1,4 +1,3 @@ - package mage.game.command.emblems; import mage.abilities.Ability; @@ -17,21 +16,25 @@ import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; import mage.target.targetpointer.FixedTarget; -import java.util.Arrays; - /** - * * @author spjspj */ public final class DarettiScrapSavantEmblem extends Emblem { // You get an emblem with "Whenever an artifact is put into your graveyard from the battlefield, return that card to the battlefield at the beginning of the next end step." public DarettiScrapSavantEmblem() { - setName("Emblem Daretti"); - availableImageSetCodes = Arrays.asList("C14", "C16", "CM2"); - + super("Emblem Daretti"); this.getAbilities().add(new DarettiScrapSavantTriggeredAbility()); } + + private DarettiScrapSavantEmblem(final DarettiScrapSavantEmblem card) { + super(card); + } + + @Override + public DarettiScrapSavantEmblem copy() { + return new DarettiScrapSavantEmblem(this); + } } class DarettiScrapSavantTriggeredAbility extends TriggeredAbilityImpl { diff --git a/Mage/src/main/java/mage/game/command/emblems/DomriChaosBringerEmblem.java b/Mage/src/main/java/mage/game/command/emblems/DomriChaosBringerEmblem.java index 68f7b29b4a7..2f2cbd641f2 100644 --- a/Mage/src/main/java/mage/game/command/emblems/DomriChaosBringerEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/DomriChaosBringerEmblem.java @@ -7,8 +7,6 @@ import mage.constants.Zone; import mage.game.command.Emblem; import mage.game.permanent.token.RedGreenBeastToken; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -16,11 +14,19 @@ public final class DomriChaosBringerEmblem extends Emblem { // -8: You get an emblem with "At the beginning of each end step, create a 4/4 red and green Beast creature token with trample." public DomriChaosBringerEmblem() { - this.setName("Emblem Domri"); - availableImageSetCodes = Arrays.asList("MED", "RNA"); + super("Emblem Domri"); this.getAbilities().add(new BeginningOfEndStepTriggeredAbility( Zone.COMMAND, new CreateTokenEffect(new RedGreenBeastToken()), TargetController.ANY, null, false )); } + + private DomriChaosBringerEmblem(final DomriChaosBringerEmblem card) { + super(card); + } + + @Override + public DomriChaosBringerEmblem copy() { + return new DomriChaosBringerEmblem(this); + } } diff --git a/Mage/src/main/java/mage/game/command/emblems/DomriRadeEmblem.java b/Mage/src/main/java/mage/game/command/emblems/DomriRadeEmblem.java index 1ce8d3cbf25..c5fa4266ac3 100644 --- a/Mage/src/main/java/mage/game/command/emblems/DomriRadeEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/DomriRadeEmblem.java @@ -1,4 +1,3 @@ - package mage.game.command.emblems; import mage.abilities.CompoundAbility; @@ -14,17 +13,14 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.command.Emblem; -import java.util.Arrays; - /** - * * @author spjspj */ public final class DomriRadeEmblem extends Emblem { // "Creatures you control have double strike, trample, hexproof and haste." public DomriRadeEmblem() { - this.setName("Emblem Domri"); + super("Emblem Domri"); FilterPermanent filter = new FilterControlledCreaturePermanent("Creatures"); CompoundAbility compoundAbilities = new CompoundAbility( @@ -34,7 +30,14 @@ public final class DomriRadeEmblem extends Emblem { HasteAbility.getInstance() ); this.getAbilities().add(new SimpleStaticAbility(Zone.COMMAND, new GainAbilityControlledEffect(compoundAbilities, Duration.EndOfGame, filter))); + } - availableImageSetCodes = Arrays.asList("GTC", "MM3"); + private DomriRadeEmblem(final DomriRadeEmblem card) { + super(card); + } + + @Override + public DomriRadeEmblem copy() { + return new DomriRadeEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/DovinBaanEmblem.java b/Mage/src/main/java/mage/game/command/emblems/DovinBaanEmblem.java index f9c5e56cd88..f73b93c521e 100644 --- a/Mage/src/main/java/mage/game/command/emblems/DovinBaanEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/DovinBaanEmblem.java @@ -1,4 +1,3 @@ - package mage.game.command.emblems; import mage.abilities.Ability; @@ -12,17 +11,23 @@ import mage.game.command.Emblem; import mage.players.Player; /** - * * @author spjspj */ public final class DovinBaanEmblem extends Emblem { public DovinBaanEmblem() { - this.setName("Emblem Dovin"); + super("Emblem Dovin"); Ability ability = new SimpleStaticAbility(Zone.COMMAND, new DovinBaanCantUntapEffect()); this.getAbilities().add(ability); + } - this.setExpansionSetCodeForImage("KLD"); + private DovinBaanEmblem(final DovinBaanEmblem card) { + super(card); + } + + @Override + public DovinBaanEmblem copy() { + return new DovinBaanEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/EllywickTumblestrumEmblem.java b/Mage/src/main/java/mage/game/command/emblems/EllywickTumblestrumEmblem.java index f2a2e191124..c83ef1c3c2c 100644 --- a/Mage/src/main/java/mage/game/command/emblems/EllywickTumblestrumEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/EllywickTumblestrumEmblem.java @@ -24,8 +24,7 @@ public final class EllywickTumblestrumEmblem extends Emblem { // −7: You get an emblem with "Creatures you control have trample and haste and get +2/+2 for each differently named dungeon you've completed." public EllywickTumblestrumEmblem() { - this.setName("Emblem Ellywick"); - this.setExpansionSetCodeForImage("AFR"); + super("Emblem Ellywick"); Ability ability = new SimpleStaticAbility(new GainAbilityControlledEffect( TrampleAbility.getInstance(), Duration.EndOfGame, StaticFilters.FILTER_PERMANENT_CREATURES @@ -41,6 +40,15 @@ public final class EllywickTumblestrumEmblem extends Emblem { ).setText("and get +2/+2 for each differently named dungeon you've completed")); this.getAbilities().add(ability.addHint(EllywickTumblestrumEmblemHint.instance)); } + + private EllywickTumblestrumEmblem(final EllywickTumblestrumEmblem card) { + super(card); + } + + @Override + public EllywickTumblestrumEmblem copy() { + return new EllywickTumblestrumEmblem(this); + } } enum EllywickTumblestrumEmblemValue implements DynamicValue { diff --git a/Mage/src/main/java/mage/game/command/emblems/ElspethKnightErrantEmblem.java b/Mage/src/main/java/mage/game/command/emblems/ElspethKnightErrantEmblem.java index 06a3d592208..e52dcc32805 100644 --- a/Mage/src/main/java/mage/game/command/emblems/ElspethKnightErrantEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/ElspethKnightErrantEmblem.java @@ -1,4 +1,3 @@ - package mage.game.command.emblems; import mage.abilities.common.SimpleStaticAbility; @@ -12,15 +11,13 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.game.command.Emblem; -import java.util.Arrays; - /** * @author spjspj */ public final class ElspethKnightErrantEmblem extends Emblem { public ElspethKnightErrantEmblem() { - this.setName("Emblem Elspeth"); + super("Emblem Elspeth"); FilterControlledPermanent filter = new FilterControlledPermanent("Artifacts, creatures, enchantments, and lands you control"); filter.add(Predicates.or( CardType.ARTIFACT.getPredicate(), @@ -30,6 +27,14 @@ public final class ElspethKnightErrantEmblem extends Emblem { Effect effect = new GainAbilityAllEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield, filter, false); effect.setText("Artifacts, creatures, enchantments, and lands you control have indestructible"); this.getAbilities().add(new SimpleStaticAbility(Zone.COMMAND, effect)); - availableImageSetCodes = Arrays.asList("MMA", "MD1", "MED"); + } + + private ElspethKnightErrantEmblem(final ElspethKnightErrantEmblem card) { + super(card); + } + + @Override + public ElspethKnightErrantEmblem copy() { + return new ElspethKnightErrantEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/ElspethSunsChampionEmblem.java b/Mage/src/main/java/mage/game/command/emblems/ElspethSunsChampionEmblem.java index e1b3a937fed..8d8e569d2f0 100644 --- a/Mage/src/main/java/mage/game/command/emblems/ElspethSunsChampionEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/ElspethSunsChampionEmblem.java @@ -10,19 +10,14 @@ import mage.constants.Zone; import mage.filter.StaticFilters; import mage.game.command.Emblem; -import java.util.Arrays; - /** - * * @author spjspj */ public final class ElspethSunsChampionEmblem extends Emblem { // -7: You get an emblem with "Creatures you control get +2/+2 and have flying." public ElspethSunsChampionEmblem() { - this.setName("Emblem Elspeth"); - availableImageSetCodes = Arrays.asList("THS", "MOC"); - + super("Emblem Elspeth"); Ability ability = new SimpleStaticAbility( Zone.COMMAND, new BoostControlledEffect( @@ -38,4 +33,13 @@ public final class ElspethSunsChampionEmblem extends Emblem { ).setText("and have flying")); this.getAbilities().add(ability); } + + private ElspethSunsChampionEmblem(final ElspethSunsChampionEmblem card) { + super(card); + } + + @Override + public ElspethSunsChampionEmblem copy() { + return new ElspethSunsChampionEmblem(this); + } } diff --git a/Mage/src/main/java/mage/game/command/emblems/GarrukApexPredatorEmblem.java b/Mage/src/main/java/mage/game/command/emblems/GarrukApexPredatorEmblem.java index b4b0b947357..87328b9c5f9 100644 --- a/Mage/src/main/java/mage/game/command/emblems/GarrukApexPredatorEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/GarrukApexPredatorEmblem.java @@ -11,8 +11,6 @@ import mage.constants.SetTargetPointer; import mage.constants.Zone; import mage.game.command.Emblem; -import java.util.Arrays; - /** * @author spjspj */ @@ -24,7 +22,7 @@ public final class GarrukApexPredatorEmblem extends Emblem { */ public GarrukApexPredatorEmblem() { - setName("Emblem Garruk"); + super("Emblem Garruk"); Effect effect = new BoostTargetEffect(5, 5, Duration.EndOfTurn); effect.setText("it gets +5/+5"); @@ -32,7 +30,14 @@ public final class GarrukApexPredatorEmblem extends Emblem { effect = new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn); ability.addEffect(effect.concatBy("and")); this.getAbilities().add(ability); + } - availableImageSetCodes = Arrays.asList("M15", "MED"); + private GarrukApexPredatorEmblem(final GarrukApexPredatorEmblem card) { + super(card); + } + + @Override + public GarrukApexPredatorEmblem copy() { + return new GarrukApexPredatorEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/GarrukCallerOfBeastsEmblem.java b/Mage/src/main/java/mage/game/command/emblems/GarrukCallerOfBeastsEmblem.java index a30a0a48849..59f7b8f0980 100644 --- a/Mage/src/main/java/mage/game/command/emblems/GarrukCallerOfBeastsEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/GarrukCallerOfBeastsEmblem.java @@ -1,4 +1,3 @@ - package mage.game.command.emblems; import mage.abilities.Ability; @@ -13,7 +12,6 @@ import mage.game.command.Emblem; import mage.target.common.TargetCardInLibrary; /** - * * @author spjspj */ public final class GarrukCallerOfBeastsEmblem extends Emblem { @@ -24,11 +22,18 @@ public final class GarrukCallerOfBeastsEmblem extends Emblem { * library." */ public GarrukCallerOfBeastsEmblem() { - this.setName("Emblem Garruk"); + super("Emblem Garruk"); Effect effect = new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterCreatureCard("creature card")), false, true, Outcome.PutCreatureInPlay); Ability ability = new SpellCastControllerTriggeredAbility(Zone.COMMAND, effect, StaticFilters.FILTER_SPELL_A_CREATURE, true, false); this.getAbilities().add(ability); + } - this.setExpansionSetCodeForImage("M14"); + private GarrukCallerOfBeastsEmblem(final GarrukCallerOfBeastsEmblem card) { + super(card); + } + + @Override + public GarrukCallerOfBeastsEmblem copy() { + return new GarrukCallerOfBeastsEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/GarrukCursedHuntsmanEmblem.java b/Mage/src/main/java/mage/game/command/emblems/GarrukCursedHuntsmanEmblem.java index 7c0aa6d3901..27c2a6c5dd1 100644 --- a/Mage/src/main/java/mage/game/command/emblems/GarrukCursedHuntsmanEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/GarrukCursedHuntsmanEmblem.java @@ -17,8 +17,7 @@ public final class GarrukCursedHuntsmanEmblem extends Emblem { // -6: You get an emblem with "Creatures you control get +3/+3 and have trample." public GarrukCursedHuntsmanEmblem() { - this.setName("Emblem Garruk"); - this.setExpansionSetCodeForImage("ELD"); + super("Emblem Garruk"); Ability ability = new SimpleStaticAbility( Zone.COMMAND, new BoostControlledEffect( @@ -34,4 +33,13 @@ public final class GarrukCursedHuntsmanEmblem extends Emblem { ).setText("and have trample")); this.getAbilities().add(ability); } + + private GarrukCursedHuntsmanEmblem(final GarrukCursedHuntsmanEmblem card) { + super(card); + } + + @Override + public GarrukCursedHuntsmanEmblem copy() { + return new GarrukCursedHuntsmanEmblem(this); + } } diff --git a/Mage/src/main/java/mage/game/command/emblems/GarrukUnleashedEmblem.java b/Mage/src/main/java/mage/game/command/emblems/GarrukUnleashedEmblem.java index d8e42f4dcaa..9bedbedc650 100644 --- a/Mage/src/main/java/mage/game/command/emblems/GarrukUnleashedEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/GarrukUnleashedEmblem.java @@ -13,11 +13,18 @@ public class GarrukUnleashedEmblem extends Emblem { // At the beginning of your end step, you may search your library for a creature card, put it onto the battlefield, then shuffle your library. public GarrukUnleashedEmblem() { - this.setName("Emblem Garruk"); + super("Emblem Garruk"); Effect effect = new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_CREATURE), false, true, Outcome.PutCreatureInPlay) - .setText("search your library for a creature card, put it onto the battlefield, then shuffle"); + .setText("search your library for a creature card, put it onto the battlefield, then shuffle"); this.getAbilities().add(new BeginningOfYourEndStepTriggeredAbility(Zone.COMMAND, effect, true)); + } - this.setExpansionSetCodeForImage("M21"); + private GarrukUnleashedEmblem(final GarrukUnleashedEmblem card) { + super(card); + } + + @Override + public GarrukUnleashedEmblem copy() { + return new GarrukUnleashedEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/GideonAllyOfZendikarEmblem.java b/Mage/src/main/java/mage/game/command/emblems/GideonAllyOfZendikarEmblem.java index cb0390ca082..fbb77db3b37 100644 --- a/Mage/src/main/java/mage/game/command/emblems/GideonAllyOfZendikarEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/GideonAllyOfZendikarEmblem.java @@ -1,4 +1,3 @@ - package mage.game.command.emblems; import mage.abilities.Ability; @@ -9,16 +8,23 @@ import mage.constants.Zone; import mage.game.command.Emblem; /** - * * @author spjspj */ public final class GideonAllyOfZendikarEmblem extends Emblem { public GideonAllyOfZendikarEmblem() { - this.setName("Emblem Gideon"); + super("Emblem Gideon"); BoostControlledEffect effect = new BoostControlledEffect(1, 1, Duration.EndOfGame); Ability ability = new SimpleStaticAbility(Zone.COMMAND, effect); this.getAbilities().add(ability); - this.setExpansionSetCodeForImage("BFZ"); + } + + private GideonAllyOfZendikarEmblem(final GideonAllyOfZendikarEmblem card) { + super(card); + } + + @Override + public GideonAllyOfZendikarEmblem copy() { + return new GideonAllyOfZendikarEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/GideonOfTheTrialsEmblem.java b/Mage/src/main/java/mage/game/command/emblems/GideonOfTheTrialsEmblem.java index 75269d1e377..eb769a34d74 100644 --- a/Mage/src/main/java/mage/game/command/emblems/GideonOfTheTrialsEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/GideonOfTheTrialsEmblem.java @@ -18,11 +18,18 @@ import mage.game.events.GameEvent; public final class GideonOfTheTrialsEmblem extends Emblem { public GideonOfTheTrialsEmblem() { - this.setName("Emblem Gideon"); + super("Emblem Gideon"); Ability ability = new SimpleStaticAbility(Zone.COMMAND, new GideonOfTheTrialsCantLoseEffect()); this.getAbilities().add(ability); + } - this.setExpansionSetCodeForImage("AKH"); + private GideonOfTheTrialsEmblem(final GideonOfTheTrialsEmblem card) { + super(card); + } + + @Override + public GideonOfTheTrialsEmblem copy() { + return new GideonOfTheTrialsEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/HuatliRadiantChampionEmblem.java b/Mage/src/main/java/mage/game/command/emblems/HuatliRadiantChampionEmblem.java index cc9dc6967c7..818ca32af37 100644 --- a/Mage/src/main/java/mage/game/command/emblems/HuatliRadiantChampionEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/HuatliRadiantChampionEmblem.java @@ -1,4 +1,3 @@ - package mage.game.command.emblems; import mage.abilities.Ability; @@ -9,18 +8,25 @@ import mage.filter.StaticFilters; import mage.game.command.Emblem; /** - * * @author LevelX2 */ public final class HuatliRadiantChampionEmblem extends Emblem { public HuatliRadiantChampionEmblem() { - this.setName("Emblem Huatli"); + super("Emblem Huatli"); // Whenever a creature enters the battlefield under your control, you may draw a card. Ability ability = new EntersBattlefieldControlledTriggeredAbility(Zone.COMMAND, new DrawCardSourceControllerEffect(1), StaticFilters.FILTER_CONTROLLED_A_CREATURE, true); this.getAbilities().add(ability); - this.setExpansionSetCodeForImage("RIX"); + } + + private HuatliRadiantChampionEmblem(final HuatliRadiantChampionEmblem card) { + super(card); + } + + @Override + public HuatliRadiantChampionEmblem copy() { + return new HuatliRadiantChampionEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/JaceTelepathUnboundEmblem.java b/Mage/src/main/java/mage/game/command/emblems/JaceTelepathUnboundEmblem.java index add45b12a4a..e7a3d462b69 100644 --- a/Mage/src/main/java/mage/game/command/emblems/JaceTelepathUnboundEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/JaceTelepathUnboundEmblem.java @@ -5,7 +5,6 @@ import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.MillCardsTargetEffect; import mage.constants.Zone; -import mage.filter.FilterSpell; import mage.filter.StaticFilters; import mage.game.command.Emblem; import mage.target.common.TargetOpponent; @@ -17,13 +16,20 @@ public final class JaceTelepathUnboundEmblem extends Emblem { // You get an emblem with "Whenever you cast a spell, target opponent puts the top five cards of their library into their graveyard". public JaceTelepathUnboundEmblem() { - this.setName("Emblem Jace"); + super("Emblem Jace"); Effect effect = new MillCardsTargetEffect(5); effect.setText("target opponent mills five cards"); Ability ability = new SpellCastControllerTriggeredAbility(Zone.COMMAND, effect, StaticFilters.FILTER_SPELL_A, false, false); ability.addTarget(new TargetOpponent()); getAbilities().add(ability); + } - this.setExpansionSetCodeForImage("ORI"); + private JaceTelepathUnboundEmblem(final JaceTelepathUnboundEmblem card) { + super(card); + } + + @Override + public JaceTelepathUnboundEmblem copy() { + return new JaceTelepathUnboundEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/JaceUnravelerOfSecretsEmblem.java b/Mage/src/main/java/mage/game/command/emblems/JaceUnravelerOfSecretsEmblem.java index fbb1cee20d8..f768760d5ec 100644 --- a/Mage/src/main/java/mage/game/command/emblems/JaceUnravelerOfSecretsEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/JaceUnravelerOfSecretsEmblem.java @@ -25,14 +25,22 @@ public final class JaceUnravelerOfSecretsEmblem extends Emblem { * counter that spell." */ public JaceUnravelerOfSecretsEmblem() { - this.setName("Emblem Jace"); - setExpansionSetCodeForImage("SOI"); + super("Emblem Jace"); Effect effect = new CounterTargetEffect(); effect.setText("counter that spell"); Ability ability = new JaceUnravelerOfSecretsTriggeredAbility(effect, false); ability.addWatcher(new SpellsCastWatcher()); this.getAbilities().add(ability); } + + private JaceUnravelerOfSecretsEmblem(final JaceUnravelerOfSecretsEmblem card) { + super(card); + } + + @Override + public JaceUnravelerOfSecretsEmblem copy() { + return new JaceUnravelerOfSecretsEmblem(this); + } } class JaceUnravelerOfSecretsTriggeredAbility extends SpellCastOpponentTriggeredAbility { diff --git a/Mage/src/main/java/mage/game/command/emblems/JayaBallardEmblem.java b/Mage/src/main/java/mage/game/command/emblems/JayaBallardEmblem.java index 9c5dfab9f06..ba92b9d2502 100644 --- a/Mage/src/main/java/mage/game/command/emblems/JayaBallardEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/JayaBallardEmblem.java @@ -1,7 +1,5 @@ package mage.game.command.emblems; -import java.util.Arrays; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.AsThoughEffectImpl; @@ -19,21 +17,30 @@ import mage.game.events.ZoneChangeEvent; import mage.players.Player; import mage.watchers.common.CastFromGraveyardWatcher; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class JayaBallardEmblem extends Emblem { // You get an emblem with "You may cast instant and sorcery cards from your graveyard. If a card cast this way would be put into your graveyard, exile it instead." public JayaBallardEmblem() { - setName("Emblem Jaya Ballard"); - availableImageSetCodes = Arrays.asList("DOM", "MED"); + super("Emblem Jaya Ballard"); Ability ability = new SimpleStaticAbility(Zone.COMMAND, new JayaBallardCastFromGraveyardEffect()); ability.addEffect(new JayaBallardReplacementEffect()); ability.addWatcher(new CastFromGraveyardWatcher()); this.getAbilities().add(ability); } + + private JayaBallardEmblem(final JayaBallardEmblem card) { + super(card); + } + + @Override + public JayaBallardEmblem copy() { + return new JayaBallardEmblem(this); + } } class JayaBallardCastFromGraveyardEffect extends AsThoughEffectImpl { @@ -120,7 +127,7 @@ class JayaBallardReplacementEffect extends ReplacementEffectImpl { CastFromGraveyardWatcher watcher = game.getState().getWatcher(CastFromGraveyardWatcher.class); return watcher != null && watcher.spellWasCastFromGraveyard(event.getTargetId(), - game.getState().getZoneChangeCounter(event.getTargetId())); + game.getState().getZoneChangeCounter(event.getTargetId())); } } return false; diff --git a/Mage/src/main/java/mage/game/command/emblems/JayaFieryNegotiatorEmblem.java b/Mage/src/main/java/mage/game/command/emblems/JayaFieryNegotiatorEmblem.java index 8c0851713e6..06b7a64b7a7 100644 --- a/Mage/src/main/java/mage/game/command/emblems/JayaFieryNegotiatorEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/JayaFieryNegotiatorEmblem.java @@ -25,12 +25,20 @@ public final class JayaFieryNegotiatorEmblem extends Emblem { // −8: You get an emblem with "Whenever you cast a red instant or sorcery spell, copy it twice. You may choose new targets for the copies." public JayaFieryNegotiatorEmblem() { - this.setName("Emblem Jaya"); - this.setExpansionSetCodeForImage("DMU"); + super("Emblem Jaya"); this.getAbilities().add(new SpellCastControllerTriggeredAbility( new JayaFieryNegotiatorEmblemEffect(), filter, false )); } + + private JayaFieryNegotiatorEmblem(final JayaFieryNegotiatorEmblem card) { + super(card); + } + + @Override + public JayaFieryNegotiatorEmblem copy() { + return new JayaFieryNegotiatorEmblem(this); + } } class JayaFieryNegotiatorEmblemEffect extends OneShotEffect { diff --git a/Mage/src/main/java/mage/game/command/emblems/KaitoShizukiEmblem.java b/Mage/src/main/java/mage/game/command/emblems/KaitoShizukiEmblem.java index 9cf7bb16078..6777be6903e 100644 --- a/Mage/src/main/java/mage/game/command/emblems/KaitoShizukiEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/KaitoShizukiEmblem.java @@ -4,6 +4,7 @@ import mage.ObjectColor; import mage.abilities.common.DealsDamageToAPlayerAllTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.constants.SetTargetPointer; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.StaticFilters; import mage.filter.common.FilterCreatureCard; @@ -11,7 +12,6 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.command.Emblem; import mage.target.common.TargetCardInLibrary; -import mage.constants.Zone; /** * @author TheElk801 @@ -29,12 +29,20 @@ public final class KaitoShizukiEmblem extends Emblem { // −7: You get an emblem with "Whenever a creature you control deals combat damage to a player, search your library for a blue or black creature card, put it onto the battlefield, then shuffle." public KaitoShizukiEmblem() { - this.setName("Emblem Kaito"); - this.setExpansionSetCodeForImage("NEO"); + super("Emblem Kaito"); this.getAbilities().add(new DealsDamageToAPlayerAllTriggeredAbility( Zone.COMMAND, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), StaticFilters.FILTER_CONTROLLED_A_CREATURE, false, SetTargetPointer.NONE, true, false )); } + + private KaitoShizukiEmblem(final KaitoShizukiEmblem card) { + super(card); + } + + @Override + public KaitoShizukiEmblem copy() { + return new KaitoShizukiEmblem(this); + } } diff --git a/Mage/src/main/java/mage/game/command/emblems/KarnLivingLegacyEmblem.java b/Mage/src/main/java/mage/game/command/emblems/KarnLivingLegacyEmblem.java index 2d374f3adf5..16af8bb685c 100644 --- a/Mage/src/main/java/mage/game/command/emblems/KarnLivingLegacyEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/KarnLivingLegacyEmblem.java @@ -25,8 +25,7 @@ public final class KarnLivingLegacyEmblem extends Emblem { // -7: You get an emblem with "Tap an untapped artifact you control: This emblem deals 1 damage to any target." public KarnLivingLegacyEmblem() { - this.setName("Emblem Karn"); - this.setExpansionSetCodeForImage("DMU"); + super("Emblem Karn"); Ability ability = new SimpleActivatedAbility( Zone.COMMAND, new DamageTargetEffect(1, "this emblem"), new TapTargetCost(new TargetControlledPermanent(filter)) @@ -34,4 +33,13 @@ public final class KarnLivingLegacyEmblem extends Emblem { ability.addTarget(new TargetAnyTarget()); this.getAbilities().add(ability); } + + private KarnLivingLegacyEmblem(final KarnLivingLegacyEmblem card) { + super(card); + } + + @Override + public KarnLivingLegacyEmblem copy() { + return new KarnLivingLegacyEmblem(this); + } } diff --git a/Mage/src/main/java/mage/game/command/emblems/KayaTheInexorableEmblem.java b/Mage/src/main/java/mage/game/command/emblems/KayaTheInexorableEmblem.java index 598351cb342..51929b8f0c0 100644 --- a/Mage/src/main/java/mage/game/command/emblems/KayaTheInexorableEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/KayaTheInexorableEmblem.java @@ -29,13 +29,21 @@ public class KayaTheInexorableEmblem extends Emblem { // −7: You get an emblem with "At the beginning of your upkeep, you may cast a legendary spell from your hand, from your graveyard, or from among cards you own in exile without paying its mana cost." public KayaTheInexorableEmblem() { - this.setName("Emblem Kaya"); - this.setExpansionSetCodeForImage("KHM"); + super("Emblem Kaya"); this.getAbilities().add(new BeginningOfUpkeepTriggeredAbility( Zone.COMMAND, new KayaTheInexorableEmblemEffect(), TargetController.YOU, true, false )); } + + private KayaTheInexorableEmblem(final KayaTheInexorableEmblem card) { + super(card); + } + + @Override + public KayaTheInexorableEmblem copy() { + return new KayaTheInexorableEmblem(this); + } } class KayaTheInexorableEmblemEffect extends OneShotEffect { diff --git a/Mage/src/main/java/mage/game/command/emblems/KioraEmblem.java b/Mage/src/main/java/mage/game/command/emblems/KioraEmblem.java index 5114c484225..4c46a27bf1c 100644 --- a/Mage/src/main/java/mage/game/command/emblems/KioraEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/KioraEmblem.java @@ -19,9 +19,17 @@ public final class KioraEmblem extends Emblem { */ public KioraEmblem() { - this.setName("Emblem Kiora"); - this.setExpansionSetCodeForImage("BNG"); + super("Emblem Kiora"); Ability ability = new BeginningOfEndStepTriggeredAbility(Zone.COMMAND, new CreateTokenEffect(new Kraken99Token()), TargetController.YOU, null, false); this.getAbilities().add(ability); } + + private KioraEmblem(final KioraEmblem card) { + super(card); + } + + @Override + public KioraEmblem copy() { + return new KioraEmblem(this); + } } diff --git a/Mage/src/main/java/mage/game/command/emblems/KioraMasterOfTheDepthsEmblem.java b/Mage/src/main/java/mage/game/command/emblems/KioraMasterOfTheDepthsEmblem.java index f841a2437f9..d87bbabaae9 100644 --- a/Mage/src/main/java/mage/game/command/emblems/KioraMasterOfTheDepthsEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/KioraMasterOfTheDepthsEmblem.java @@ -1,4 +1,3 @@ - package mage.game.command.emblems; import mage.abilities.Ability; @@ -14,7 +13,6 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; /** - * * @author spjspj */ public final class KioraMasterOfTheDepthsEmblem extends Emblem { @@ -22,14 +20,22 @@ public final class KioraMasterOfTheDepthsEmblem extends Emblem { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures"); public KioraMasterOfTheDepthsEmblem() { - this.setName("Emblem Kiora"); + super("Emblem Kiora"); Ability ability = new EntersBattlefieldControlledTriggeredAbility(Zone.COMMAND, new KioraFightEffect(), filter, true, SetTargetPointer.PERMANENT, "Whenever a creature enters the battlefield under your control, you may have it fight target creature."); ability.addTarget(new TargetCreaturePermanent()); this.getAbilities().add(ability); - this.setExpansionSetCodeForImage("BFZ"); + } + + private KioraMasterOfTheDepthsEmblem(final KioraMasterOfTheDepthsEmblem card) { + super(card); + } + + @Override + public KioraMasterOfTheDepthsEmblem copy() { + return new KioraMasterOfTheDepthsEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/KothFireOfResistanceEmblem.java b/Mage/src/main/java/mage/game/command/emblems/KothFireOfResistanceEmblem.java index 9429938e5aa..0a5e8762863 100644 --- a/Mage/src/main/java/mage/game/command/emblems/KothFireOfResistanceEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/KothFireOfResistanceEmblem.java @@ -22,8 +22,7 @@ public final class KothFireOfResistanceEmblem extends Emblem { // −7: You get an emblem with "Whenever a Mountain enters the battlefield under your control, this emblem deals 4 damage to any target." public KothFireOfResistanceEmblem() { - this.setName("Emblem Koth"); - this.setExpansionSetCodeForImage("ONE"); + super("Emblem Koth"); Ability ability = new EntersBattlefieldControlledTriggeredAbility( Zone.COMMAND, new DamageTargetEffect(4).setText("this emblem deals 4 damage to any target"), @@ -31,4 +30,13 @@ public final class KothFireOfResistanceEmblem extends Emblem { ability.addTarget(new TargetAnyTarget()); getAbilities().add(ability); } + + private KothFireOfResistanceEmblem(final KothFireOfResistanceEmblem card) { + super(card); + } + + @Override + public KothFireOfResistanceEmblem copy() { + return new KothFireOfResistanceEmblem(this); + } } diff --git a/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java b/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java index 87ed2b9c277..c2f24def3c8 100644 --- a/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java @@ -1,4 +1,3 @@ - package mage.game.command.emblems; import mage.abilities.Ability; @@ -8,7 +7,6 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.constants.*; - import mage.filter.common.FilterLandPermanent; import mage.game.Game; import mage.game.command.Emblem; @@ -16,17 +14,23 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetAnyTarget; /** - * * @author spjspj */ public final class KothOfTheHammerEmblem extends Emblem { // "Mountains you control have '{T}: This land deals 1 damage to any target.'" public KothOfTheHammerEmblem() { - this.setName("Emblem Koth"); + super("Emblem Koth"); this.getAbilities().add(new SimpleStaticAbility(Zone.COMMAND, new KothOfTheHammerThirdEffect())); + } - this.setExpansionSetCodeForImage("DDI"); + private KothOfTheHammerEmblem(final KothOfTheHammerEmblem card) { + super(card); + } + + @Override + public KothOfTheHammerEmblem copy() { + return new KothOfTheHammerEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/LilianaDefiantNecromancerEmblem.java b/Mage/src/main/java/mage/game/command/emblems/LilianaDefiantNecromancerEmblem.java index 79caf16885a..d28b8603ef5 100644 --- a/Mage/src/main/java/mage/game/command/emblems/LilianaDefiantNecromancerEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/LilianaDefiantNecromancerEmblem.java @@ -1,4 +1,3 @@ - package mage.game.command.emblems; import mage.abilities.Ability; @@ -17,18 +16,24 @@ import mage.game.command.Emblem; import mage.target.targetpointer.FixedTarget; /** - * * @author spjspj */ public final class LilianaDefiantNecromancerEmblem extends Emblem { // You get an emblem with "Whenever a creature you control dies, return it to the battlefield under your control at the beginning of the next end step." public LilianaDefiantNecromancerEmblem() { - this.setName("Emblem Liliana"); + super("Emblem Liliana"); Ability ability = new DiesCreatureTriggeredAbility(Zone.COMMAND, new LilianaDefiantNecromancerEmblemEffect(), false, StaticFilters.FILTER_PERMANENT_A_CREATURE, true); this.getAbilities().add(ability); + } - this.setExpansionSetCodeForImage("ORI"); + private LilianaDefiantNecromancerEmblem(final LilianaDefiantNecromancerEmblem card) { + super(card); + } + + @Override + public LilianaDefiantNecromancerEmblem copy() { + return new LilianaDefiantNecromancerEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/LilianaOfTheDarkRealmsEmblem.java b/Mage/src/main/java/mage/game/command/emblems/LilianaOfTheDarkRealmsEmblem.java index 6245294e8ff..5546e021636 100644 --- a/Mage/src/main/java/mage/game/command/emblems/LilianaOfTheDarkRealmsEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/LilianaOfTheDarkRealmsEmblem.java @@ -1,4 +1,3 @@ - package mage.game.command.emblems; import mage.Mana; @@ -13,10 +12,7 @@ import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.game.command.Emblem; -import java.util.Arrays; - /** - * * @author spjspj */ public final class LilianaOfTheDarkRealmsEmblem extends Emblem { @@ -28,11 +24,18 @@ public final class LilianaOfTheDarkRealmsEmblem extends Emblem { } public LilianaOfTheDarkRealmsEmblem() { - this.setName("Emblem Liliana"); + super("Emblem Liliana"); SimpleManaAbility manaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(4), new TapSourceCost()); Ability ability = new SimpleStaticAbility(Zone.COMMAND, new GainAbilityControlledEffect(manaAbility, Duration.WhileOnBattlefield, filter)); this.getAbilities().add(ability); + } - availableImageSetCodes = Arrays.asList("M13", "M14"); + private LilianaOfTheDarkRealmsEmblem(final LilianaOfTheDarkRealmsEmblem card) { + super(card); + } + + @Override + public LilianaOfTheDarkRealmsEmblem copy() { + return new LilianaOfTheDarkRealmsEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/LilianaTheLastHopeEmblem.java b/Mage/src/main/java/mage/game/command/emblems/LilianaTheLastHopeEmblem.java index cde0889b392..d181d83719d 100644 --- a/Mage/src/main/java/mage/game/command/emblems/LilianaTheLastHopeEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/LilianaTheLastHopeEmblem.java @@ -13,8 +13,6 @@ import mage.game.Game; import mage.game.command.Emblem; import mage.game.permanent.token.ZombieToken; -import java.util.Arrays; - /** * @author spjspj */ @@ -22,12 +20,19 @@ public final class LilianaTheLastHopeEmblem extends Emblem { // "At the beginning of your end step, create X 2/2 black Zombie creature tokens, where X is two plus the number of Zombies you control." public LilianaTheLastHopeEmblem() { - this.setName("Emblem Liliana"); + super("Emblem Liliana"); Ability ability = new BeginningOfEndStepTriggeredAbility(Zone.COMMAND, new CreateTokenEffect(new ZombieToken(), new LilianaZombiesCount()), TargetController.YOU, null, false); this.getAbilities().add(ability); + } - availableImageSetCodes = Arrays.asList("EMN", "MED", "2X2"); + private LilianaTheLastHopeEmblem(final LilianaTheLastHopeEmblem card) { + super(card); + } + + @Override + public LilianaTheLastHopeEmblem copy() { + return new LilianaTheLastHopeEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/LilianaWakerOfTheDeadEmblem.java b/Mage/src/main/java/mage/game/command/emblems/LilianaWakerOfTheDeadEmblem.java index 1e85a8f3779..bc91daa75db 100644 --- a/Mage/src/main/java/mage/game/command/emblems/LilianaWakerOfTheDeadEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/LilianaWakerOfTheDeadEmblem.java @@ -15,14 +15,21 @@ public final class LilianaWakerOfTheDeadEmblem extends Emblem { */ public LilianaWakerOfTheDeadEmblem() { - setName("Emblem Liliana"); + super("Emblem Liliana"); Ability ability = new BeginningOfCombatTriggeredAbility( Zone.COMMAND, new ReturnCreatureFromGraveyardToBattlefieldAndGainHasteEffect(), TargetController.YOU, false, false); ability.addTarget(new TargetCardInGraveyard(StaticFilters.FILTER_CARD_CREATURE)); this.getAbilities().add(ability); + } - this.setExpansionSetCodeForImage("M21"); + private LilianaWakerOfTheDeadEmblem(final LilianaWakerOfTheDeadEmblem card) { + super(card); + } + + @Override + public LilianaWakerOfTheDeadEmblem copy() { + return new LilianaWakerOfTheDeadEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/LolthSpiderQueenEmblem.java b/Mage/src/main/java/mage/game/command/emblems/LolthSpiderQueenEmblem.java index a756c179563..91f0704df40 100644 --- a/Mage/src/main/java/mage/game/command/emblems/LolthSpiderQueenEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/LolthSpiderQueenEmblem.java @@ -22,8 +22,7 @@ public final class LolthSpiderQueenEmblem extends Emblem { // −8: You get an emblem with "Whenever an opponent is dealt combat damage by one or more creatures you control, if that player lost less than 8 life this turn, they lose life equal to the difference." public LolthSpiderQueenEmblem() { - this.setName("Emblem Lolth"); - this.setExpansionSetCodeForImage("AFR"); + super("Emblem Lolth"); this.getAbilities().add(new ConditionalInterveningIfTriggeredAbility( new DealCombatDamageControlledTriggeredAbility( Zone.COMMAND, new LolthSpiderQueenEmblemEffect(), true, true @@ -32,6 +31,15 @@ public final class LolthSpiderQueenEmblem extends Emblem { "if that player lost less than 8 life this turn, they lose life equal to the difference." )); } + + private LolthSpiderQueenEmblem(final LolthSpiderQueenEmblem card) { + super(card); + } + + @Override + public LolthSpiderQueenEmblem copy() { + return new LolthSpiderQueenEmblem(this); + } } enum LolthSpiderQueenEmblemCondition implements Condition { diff --git a/Mage/src/main/java/mage/game/command/emblems/LukeSkywalkerEmblem.java b/Mage/src/main/java/mage/game/command/emblems/LukeSkywalkerEmblem.java index a3411988499..873828c1d24 100644 --- a/Mage/src/main/java/mage/game/command/emblems/LukeSkywalkerEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/LukeSkywalkerEmblem.java @@ -3,24 +3,33 @@ package mage.game.command.emblems; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.PreventionEffectImpl; -import mage.constants.*; +import mage.constants.Duration; +import mage.constants.TurnPhase; +import mage.constants.Zone; import mage.game.Game; import mage.game.command.Emblem; import mage.game.events.GameEvent; import mage.players.Player; /** - * * @author NinthWorld */ public final class LukeSkywalkerEmblem extends Emblem { // -6: You get an emblem with "Prevent all damage that would be dealt to you during combat." Exile Luke Skywalker, the Last Jedi. public LukeSkywalkerEmblem() { - this.setName("Emblem Luke Skywalker"); - this.setExpansionSetCodeForImage("SWS"); + super("Emblem Luke Skywalker"); this.getAbilities().add(new SimpleStaticAbility(Zone.BATTLEFIELD, new LukeSkywalkerEmblemEffect())); } + + private LukeSkywalkerEmblem(final LukeSkywalkerEmblem card) { + super(card); + } + + @Override + public LukeSkywalkerEmblem copy() { + return new LukeSkywalkerEmblem(this); + } } class LukeSkywalkerEmblemEffect extends PreventionEffectImpl { diff --git a/Mage/src/main/java/mage/game/command/emblems/LukkaWaywardBonderEmblem.java b/Mage/src/main/java/mage/game/command/emblems/LukkaWaywardBonderEmblem.java index ca2f2127f92..0bd37b2d9db 100644 --- a/Mage/src/main/java/mage/game/command/emblems/LukkaWaywardBonderEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/LukkaWaywardBonderEmblem.java @@ -19,8 +19,7 @@ public final class LukkaWaywardBonderEmblem extends Emblem { // −7: You get an emblem with "Whenever a creature enters the battlefield under your control, it deals damage equal to its power to any target." public LukkaWaywardBonderEmblem() { - this.setName("Emblem Lukka"); - this.setExpansionSetCodeForImage("STX"); + super("Emblem Lukka"); Ability ability = new EntersBattlefieldControlledTriggeredAbility( Zone.COMMAND, new LukkaWaywardBonderEmblemEffect(), StaticFilters.FILTER_PERMANENT_A_CREATURE, false @@ -28,6 +27,15 @@ public final class LukkaWaywardBonderEmblem extends Emblem { ability.addTarget(new TargetAnyTarget()); this.getAbilities().add(ability); } + + private LukkaWaywardBonderEmblem(final LukkaWaywardBonderEmblem card) { + super(card); + } + + @Override + public LukkaWaywardBonderEmblem copy() { + return new LukkaWaywardBonderEmblem(this); + } } class LukkaWaywardBonderEmblemEffect extends OneShotEffect { diff --git a/Mage/src/main/java/mage/game/command/emblems/MomirEmblem.java b/Mage/src/main/java/mage/game/command/emblems/MomirEmblem.java index a0344a261e3..9ed4c3295f0 100644 --- a/Mage/src/main/java/mage/game/command/emblems/MomirEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/MomirEmblem.java @@ -32,8 +32,7 @@ public final class MomirEmblem extends Emblem { // Faking Vanguard as an Emblem; need to come back to this and add a new type of CommandObject public MomirEmblem() { - setName("Emblem Momir Vig, Simic Visionary"); - setExpansionSetCodeForImage("DIS"); + super("Emblem Momir Vig, Simic Visionary"); // {X}, Discard a card: Create a token that's a copy of a creature card with converted mana cost X chosen at random. // Activate this ability only any time you could cast a sorcery and only once each turn. @@ -42,6 +41,15 @@ public final class MomirEmblem extends Emblem { ability.setTiming(TimingRule.SORCERY); this.getAbilities().add(ability); } + + private MomirEmblem(final MomirEmblem card) { + super(card); + } + + @Override + public MomirEmblem copy() { + return new MomirEmblem(this); + } } class MomirEffect extends OneShotEffect { diff --git a/Mage/src/main/java/mage/game/command/emblems/MordenkainenEmblem.java b/Mage/src/main/java/mage/game/command/emblems/MordenkainenEmblem.java index 2381add07d4..a10a047e650 100644 --- a/Mage/src/main/java/mage/game/command/emblems/MordenkainenEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/MordenkainenEmblem.java @@ -7,18 +7,24 @@ import mage.constants.Zone; import mage.game.command.Emblem; /** - * * @author weirddan455 */ public final class MordenkainenEmblem extends Emblem { // You get an emblem with "You have no maximum hand size." public MordenkainenEmblem() { - this.setName("Emblem Mordenkainen"); + super("Emblem Mordenkainen"); this.getAbilities().add(new SimpleStaticAbility(Zone.COMMAND, new MaximumHandSizeControllerEffect( Integer.MAX_VALUE, Duration.WhileOnBattlefield, MaximumHandSizeControllerEffect.HandSizeModification.SET ))); + } - this.setExpansionSetCodeForImage("AFR"); + private MordenkainenEmblem(final MordenkainenEmblem card) { + super(card); + } + + @Override + public MordenkainenEmblem copy() { + return new MordenkainenEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/MuYanlingSkyDancerEmblem.java b/Mage/src/main/java/mage/game/command/emblems/MuYanlingSkyDancerEmblem.java index 4b0f0ec4d9e..a1d0c7887ba 100644 --- a/Mage/src/main/java/mage/game/command/emblems/MuYanlingSkyDancerEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/MuYanlingSkyDancerEmblem.java @@ -22,8 +22,7 @@ public final class MuYanlingSkyDancerEmblem extends Emblem { // "Islands you control have '{T}: Draw a card'." public MuYanlingSkyDancerEmblem() { - this.setName("Emblem Yanling"); - this.setExpansionSetCodeForImage("M20"); + super("Emblem Yanling"); this.getAbilities().add(new SimpleStaticAbility( Zone.COMMAND, new GainAbilityControlledEffect(new SimpleActivatedAbility( @@ -31,4 +30,13 @@ public final class MuYanlingSkyDancerEmblem extends Emblem { ), Duration.EndOfGame, filter) )); } + + private MuYanlingSkyDancerEmblem(final MuYanlingSkyDancerEmblem card) { + super(card); + } + + @Override + public MuYanlingSkyDancerEmblem copy() { + return new MuYanlingSkyDancerEmblem(this); + } } diff --git a/Mage/src/main/java/mage/game/command/emblems/NarsetOfTheAncientWayEmblem.java b/Mage/src/main/java/mage/game/command/emblems/NarsetOfTheAncientWayEmblem.java index 03c86292f3a..66e77111319 100644 --- a/Mage/src/main/java/mage/game/command/emblems/NarsetOfTheAncientWayEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/NarsetOfTheAncientWayEmblem.java @@ -15,14 +15,21 @@ public final class NarsetOfTheAncientWayEmblem extends Emblem { // −6: You get an emblem with "Whenever you cast a noncreature spell, this emblem deals 2 damage to any target." public NarsetOfTheAncientWayEmblem() { - this.setName("Emblem Narset"); + super("Emblem Narset"); Ability ability = new SpellCastControllerTriggeredAbility( Zone.COMMAND, new DamageTargetEffect(2, "this emblem"), StaticFilters.FILTER_SPELL_A_NON_CREATURE, false, false ); ability.addTarget(new TargetAnyTarget()); this.getAbilities().add(ability); + } - this.setExpansionSetCodeForImage("IKO"); + private NarsetOfTheAncientWayEmblem(final NarsetOfTheAncientWayEmblem card) { + super(card); + } + + @Override + public NarsetOfTheAncientWayEmblem copy() { + return new NarsetOfTheAncientWayEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/NarsetTranscendentEmblem.java b/Mage/src/main/java/mage/game/command/emblems/NarsetTranscendentEmblem.java index 6702ed52da7..8ec5c87c60c 100644 --- a/Mage/src/main/java/mage/game/command/emblems/NarsetTranscendentEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/NarsetTranscendentEmblem.java @@ -1,4 +1,3 @@ - package mage.game.command.emblems; import mage.MageObject; @@ -15,18 +14,26 @@ import mage.game.events.GameEvent; import mage.players.Player; /** - * * @author spjspj */ public final class NarsetTranscendentEmblem extends Emblem { - + // "Your opponents can't cast noncreature spells. public NarsetTranscendentEmblem() { - this.setName("Emblem Narset"); + super("Emblem Narset"); this.getAbilities().add(new SimpleStaticAbility(Zone.COMMAND, new NarsetTranscendentCantCastEffect())); } + + private NarsetTranscendentEmblem(final NarsetTranscendentEmblem card) { + super(card); + } + + @Override + public NarsetTranscendentEmblem copy() { + return new NarsetTranscendentEmblem(this); + } } class NarsetTranscendentCantCastEffect extends ContinuousRuleModifyingEffectImpl { diff --git a/Mage/src/main/java/mage/game/command/emblems/NissaVitalForceEmblem.java b/Mage/src/main/java/mage/game/command/emblems/NissaVitalForceEmblem.java index d744ecd22db..a7ede67219e 100644 --- a/Mage/src/main/java/mage/game/command/emblems/NissaVitalForceEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/NissaVitalForceEmblem.java @@ -1,4 +1,3 @@ - package mage.game.command.emblems; import mage.abilities.Ability; @@ -9,18 +8,24 @@ import mage.filter.common.FilterControlledLandPermanent; import mage.game.command.Emblem; /** - * * @author spjspj */ public final class NissaVitalForceEmblem extends Emblem { // You get an emblem with "Whenever a land enters the battlefield under your control, you may draw a card." public NissaVitalForceEmblem() { - this.setName("Emblem Nissa"); + super("Emblem Nissa"); Ability ability = new EntersBattlefieldAllTriggeredAbility(Zone.COMMAND, new DrawCardSourceControllerEffect(1), new FilterControlledLandPermanent("a land"), true, null, true); getAbilities().add(ability); + } - this.setExpansionSetCodeForImage("KLD"); + private NissaVitalForceEmblem(final NissaVitalForceEmblem card) { + super(card); + } + + @Override + public NissaVitalForceEmblem copy() { + return new NissaVitalForceEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/NissaWhoShakesTheWorldEmblem.java b/Mage/src/main/java/mage/game/command/emblems/NissaWhoShakesTheWorldEmblem.java index 163298dd416..70bf2d97115 100644 --- a/Mage/src/main/java/mage/game/command/emblems/NissaWhoShakesTheWorldEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/NissaWhoShakesTheWorldEmblem.java @@ -1,4 +1,3 @@ - package mage.game.command.emblems; import mage.abilities.common.SimpleStaticAbility; @@ -15,7 +14,7 @@ import mage.game.command.Emblem; public final class NissaWhoShakesTheWorldEmblem extends Emblem { public NissaWhoShakesTheWorldEmblem() { - this.setName("Emblem Nissa"); + super("Emblem Nissa"); this.getAbilities().add(new SimpleStaticAbility( Zone.COMMAND, new GainAbilityAllEffect( @@ -23,6 +22,14 @@ public final class NissaWhoShakesTheWorldEmblem extends Emblem { StaticFilters.FILTER_CONTROLLED_PERMANENT_LANDS, false ) )); - this.setExpansionSetCodeForImage("WAR"); + } + + private NissaWhoShakesTheWorldEmblem(final NissaWhoShakesTheWorldEmblem card) { + super(card); + } + + @Override + public NissaWhoShakesTheWorldEmblem copy() { + return new NissaWhoShakesTheWorldEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/ObNixilisOfTheBlackOathEmblem.java b/Mage/src/main/java/mage/game/command/emblems/ObNixilisOfTheBlackOathEmblem.java index 7482ec7580b..3eabd0637ff 100644 --- a/Mage/src/main/java/mage/game/command/emblems/ObNixilisOfTheBlackOathEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/ObNixilisOfTheBlackOathEmblem.java @@ -1,4 +1,3 @@ - package mage.game.command.emblems; import mage.abilities.Ability; @@ -17,14 +16,13 @@ import mage.target.common.TargetControlledCreaturePermanent; import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; /** - * * @author spjspj */ public final class ObNixilisOfTheBlackOathEmblem extends Emblem { // You get an emblem with "{1}{B}, Sacrifice a creature: You gain X life and draw X cards, where X is the sacrificed creature's power." public ObNixilisOfTheBlackOathEmblem() { - this.setName("Emblem Nixilis"); + super("Emblem Nixilis"); DynamicValue xValue = SacrificeCostCreaturesPower.instance; Effect effect = new GainLifeEffect(xValue); effect.setText("You gain X life"); @@ -34,7 +32,14 @@ public final class ObNixilisOfTheBlackOathEmblem extends Emblem { effect.setText("and draw X cards, where X is the sacrificed creature's power"); ability.addEffect(effect); this.getAbilities().add(ability); + } - this.setExpansionSetCodeForImage("C14"); + private ObNixilisOfTheBlackOathEmblem(final ObNixilisOfTheBlackOathEmblem card) { + super(card); + } + + @Override + public ObNixilisOfTheBlackOathEmblem copy() { + return new ObNixilisOfTheBlackOathEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/ObNixilisReignitedEmblem.java b/Mage/src/main/java/mage/game/command/emblems/ObNixilisReignitedEmblem.java index 72287d85559..af456c67963 100644 --- a/Mage/src/main/java/mage/game/command/emblems/ObNixilisReignitedEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/ObNixilisReignitedEmblem.java @@ -1,4 +1,3 @@ - package mage.game.command.emblems; import mage.abilities.TriggeredAbilityImpl; @@ -8,21 +7,24 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.command.Emblem; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; - -import java.util.Arrays; /** - * * @author spjspj */ public final class ObNixilisReignitedEmblem extends Emblem { public ObNixilisReignitedEmblem() { - setName("Emblem Nixilis"); - + super("Emblem Nixilis"); this.getAbilities().add(new ObNixilisEmblemTriggeredAbility(new LoseLifeSourceControllerEffect(2), false)); - availableImageSetCodes = Arrays.asList("BFZ", "DDR", "C19"); + } + + private ObNixilisReignitedEmblem(final ObNixilisReignitedEmblem card) { + super(card); + } + + @Override + public ObNixilisReignitedEmblem copy() { + return new ObNixilisReignitedEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/ObiWanKenobiEmblem.java b/Mage/src/main/java/mage/game/command/emblems/ObiWanKenobiEmblem.java index 19cb1182025..4f0a4fc50a4 100644 --- a/Mage/src/main/java/mage/game/command/emblems/ObiWanKenobiEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/ObiWanKenobiEmblem.java @@ -1,4 +1,3 @@ - package mage.game.command.emblems; import mage.abilities.Ability; @@ -14,15 +13,13 @@ import mage.constants.Zone; import mage.game.command.Emblem; /** - * * @author spjspj */ public final class ObiWanKenobiEmblem extends Emblem { // Creatures you control get +1/+1 and have vigilance, first strike, and lifelink public ObiWanKenobiEmblem() { - this.setName("Emblem Obi-Wan Kenobi"); - this.setExpansionSetCodeForImage("SWS"); + super("Emblem Obi-Wan Kenobi"); Ability ability = new SimpleStaticAbility(Zone.COMMAND, new BoostControlledEffect(1, 1, Duration.EndOfGame)); Effect effect = new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.EndOfGame); effect.setText("and have vigilance"); @@ -35,4 +32,13 @@ public final class ObiWanKenobiEmblem extends Emblem { ability.addEffect(effect); getAbilities().add(ability); } + + private ObiWanKenobiEmblem(final ObiWanKenobiEmblem card) { + super(card); + } + + @Override + public ObiWanKenobiEmblem copy() { + return new ObiWanKenobiEmblem(this); + } } diff --git a/Mage/src/main/java/mage/game/command/emblems/RalIzzetViceroyEmblem.java b/Mage/src/main/java/mage/game/command/emblems/RalIzzetViceroyEmblem.java index f42a9ee71db..6f2274f478d 100644 --- a/Mage/src/main/java/mage/game/command/emblems/RalIzzetViceroyEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/RalIzzetViceroyEmblem.java @@ -9,19 +9,16 @@ import mage.filter.StaticFilters; import mage.game.command.Emblem; import mage.target.common.TargetAnyTarget; -import java.util.Arrays; - /** - * * @author TheElk801 */ public final class RalIzzetViceroyEmblem extends Emblem { // You get an emblem with "Whenever you cast an instant or sorcery spell, this emblem deals 4 damage to any target and you draw two cards." public RalIzzetViceroyEmblem() { - this.setName("Emblem Ral"); + super("Emblem Ral"); Ability ability = new SpellCastControllerTriggeredAbility( - Zone.COMMAND, new DamageTargetEffect(4, "this emblem"), + Zone.COMMAND, new DamageTargetEffect(4, "this emblem"), StaticFilters.FILTER_SPELL_AN_INSTANT_OR_SORCERY, false, false ); ability.addEffect( @@ -30,7 +27,14 @@ public final class RalIzzetViceroyEmblem extends Emblem { ); ability.addTarget(new TargetAnyTarget()); getAbilities().add(ability); + } - availableImageSetCodes = Arrays.asList("MED", "GRN"); + private RalIzzetViceroyEmblem(final RalIzzetViceroyEmblem card) { + super(card); + } + + @Override + public RalIzzetViceroyEmblem copy() { + return new RalIzzetViceroyEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/RowanKenrithEmblem.java b/Mage/src/main/java/mage/game/command/emblems/RowanKenrithEmblem.java index 6c840d043d4..cd00935b760 100644 --- a/Mage/src/main/java/mage/game/command/emblems/RowanKenrithEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/RowanKenrithEmblem.java @@ -9,8 +9,6 @@ import mage.game.command.Emblem; import mage.game.events.GameEvent; import mage.game.stack.StackAbility; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -18,10 +16,17 @@ public final class RowanKenrithEmblem extends Emblem { // Target player gets an emblem with "Whenever you activate an ability that isn't a mana ability, copy it. You may choose new targets for the copy." public RowanKenrithEmblem() { - this.setName("Emblem Rowan Kenrith"); + super("Emblem Rowan Kenrith"); this.getAbilities().add(new RowanKenrithEmblemTriggeredAbility()); + } - availableImageSetCodes = Arrays.asList("BBD", "CLB"); + private RowanKenrithEmblem(final RowanKenrithEmblem card) { + super(card); + } + + @Override + public RowanKenrithEmblem copy() { + return new RowanKenrithEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/RowanScholarOfSparksEmblem.java b/Mage/src/main/java/mage/game/command/emblems/RowanScholarOfSparksEmblem.java index 707e0edb368..d6abc744c0a 100644 --- a/Mage/src/main/java/mage/game/command/emblems/RowanScholarOfSparksEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/RowanScholarOfSparksEmblem.java @@ -15,11 +15,19 @@ public final class RowanScholarOfSparksEmblem extends Emblem { // −4: You get an emblem with "Whenever you cast an instant or sorcery spell, you may pay {2}. If you do, copy that spell. You may choose new targets for the copy." public RowanScholarOfSparksEmblem() { - this.setName("Emblem Rowan"); - this.setExpansionSetCodeForImage("STX"); + super("Emblem Rowan"); this.getAbilities().add(new SpellCastControllerTriggeredAbility( Zone.COMMAND, new DoIfCostPaid(new CopyTargetSpellEffect(true), new GenericManaCost(2)), StaticFilters.FILTER_SPELL_AN_INSTANT_OR_SORCERY, false, true )); } + + private RowanScholarOfSparksEmblem(final RowanScholarOfSparksEmblem card) { + super(card); + } + + @Override + public RowanScholarOfSparksEmblem copy() { + return new RowanScholarOfSparksEmblem(this); + } } diff --git a/Mage/src/main/java/mage/game/command/emblems/SaheeliFiligreeMasterEmblem.java b/Mage/src/main/java/mage/game/command/emblems/SaheeliFiligreeMasterEmblem.java index 5d7aca19c75..df29decb915 100644 --- a/Mage/src/main/java/mage/game/command/emblems/SaheeliFiligreeMasterEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/SaheeliFiligreeMasterEmblem.java @@ -15,8 +15,7 @@ public final class SaheeliFiligreeMasterEmblem extends Emblem { // −4: You get an emblem with "Artifact creatures you control get +1/+1" and "Artifact spells you cast cost {1} less to cast." public SaheeliFiligreeMasterEmblem() { - this.setName("Emblem Saheeli"); - this.setExpansionSetCodeForImage("BRO"); + super("Emblem Saheeli"); this.getAbilities().add(new SimpleStaticAbility( Zone.COMMAND, new BoostControlledEffect( @@ -31,4 +30,13 @@ public final class SaheeliFiligreeMasterEmblem extends Emblem { ).setText("Artifact spells you cast cost {1} less to cast") )); } + + private SaheeliFiligreeMasterEmblem(final SaheeliFiligreeMasterEmblem card) { + super(card); + } + + @Override + public SaheeliFiligreeMasterEmblem copy() { + return new SaheeliFiligreeMasterEmblem(this); + } } diff --git a/Mage/src/main/java/mage/game/command/emblems/SarkhanTheDragonspeakerEmblem.java b/Mage/src/main/java/mage/game/command/emblems/SarkhanTheDragonspeakerEmblem.java index 814514d2c27..fe21a168f5a 100644 --- a/Mage/src/main/java/mage/game/command/emblems/SarkhanTheDragonspeakerEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/SarkhanTheDragonspeakerEmblem.java @@ -1,4 +1,3 @@ - package mage.game.command.emblems; import mage.abilities.common.BeginningOfDrawTriggeredAbility; @@ -10,16 +9,23 @@ import mage.constants.Zone; import mage.game.command.Emblem; /** - * * @author spjspj */ public final class SarkhanTheDragonspeakerEmblem extends Emblem { public SarkhanTheDragonspeakerEmblem() { - setName("Emblem Sarkhan"); - this.setExpansionSetCodeForImage("KTK"); + super("Emblem Sarkhan"); this.getAbilities().add(new BeginningOfDrawTriggeredAbility(Zone.COMMAND, new DrawCardSourceControllerEffect(2), TargetController.YOU, false)); this.getAbilities().add(new BeginningOfEndStepTriggeredAbility(Zone.COMMAND, new DiscardHandControllerEffect(), TargetController.YOU, null, false)); } + + private SarkhanTheDragonspeakerEmblem(final SarkhanTheDragonspeakerEmblem card) { + super(card); + } + + @Override + public SarkhanTheDragonspeakerEmblem copy() { + return new SarkhanTheDragonspeakerEmblem(this); + } } diff --git a/Mage/src/main/java/mage/game/command/emblems/SerraTheBenevolentEmblem.java b/Mage/src/main/java/mage/game/command/emblems/SerraTheBenevolentEmblem.java index 2a7424fff69..c9eab14968d 100644 --- a/Mage/src/main/java/mage/game/command/emblems/SerraTheBenevolentEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/SerraTheBenevolentEmblem.java @@ -19,10 +19,17 @@ public final class SerraTheBenevolentEmblem extends Emblem { // -6: You get an emblem with "If you control a creature, damage that would reduce your life total to less than 1 reduces it to 1 instead." public SerraTheBenevolentEmblem() { - this.setName("Emblem Serra"); + super("Emblem Serra"); this.getAbilities().add(new SimpleStaticAbility(Zone.COMMAND, new SerraTheBenevolentEmblemEffect())); + } - this.setExpansionSetCodeForImage("MH1"); + private SerraTheBenevolentEmblem(final SerraTheBenevolentEmblem card) { + super(card); + } + + @Override + public SerraTheBenevolentEmblem copy() { + return new SerraTheBenevolentEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/SorinLordOfInnistradEmblem.java b/Mage/src/main/java/mage/game/command/emblems/SorinLordOfInnistradEmblem.java index 9aaf51a0191..afa46e5e00c 100644 --- a/Mage/src/main/java/mage/game/command/emblems/SorinLordOfInnistradEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/SorinLordOfInnistradEmblem.java @@ -1,4 +1,3 @@ - package mage.game.command.emblems; import mage.abilities.Ability; @@ -9,17 +8,23 @@ import mage.constants.Zone; import mage.game.command.Emblem; /** - * * @author spjspj */ public final class SorinLordOfInnistradEmblem extends Emblem { public SorinLordOfInnistradEmblem() { - this.setName("Emblem Sorin"); + super("Emblem Sorin"); BoostControlledEffect effect = new BoostControlledEffect(1, 0, Duration.EndOfGame); Ability ability = new SimpleStaticAbility(Zone.COMMAND, effect); this.getAbilities().add(ability); + } - this.setExpansionSetCodeForImage("DKA"); + private SorinLordOfInnistradEmblem(final SorinLordOfInnistradEmblem card) { + super(card); + } + + @Override + public SorinLordOfInnistradEmblem copy() { + return new SorinLordOfInnistradEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/SorinSolemnVisitorEmblem.java b/Mage/src/main/java/mage/game/command/emblems/SorinSolemnVisitorEmblem.java index eedc5bf4a75..7a8ee216e58 100644 --- a/Mage/src/main/java/mage/game/command/emblems/SorinSolemnVisitorEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/SorinSolemnVisitorEmblem.java @@ -1,4 +1,3 @@ - package mage.game.command.emblems; import mage.abilities.Ability; @@ -10,7 +9,6 @@ import mage.filter.StaticFilters; import mage.game.command.Emblem; /** - * * @author spjspj */ public final class SorinSolemnVisitorEmblem extends Emblem { @@ -20,8 +18,17 @@ public final class SorinSolemnVisitorEmblem extends Emblem { * sacrifices a creature." */ public SorinSolemnVisitorEmblem() { - this.setName("Emblem Sorin"); + super("Emblem Sorin"); Ability ability = new BeginningOfUpkeepTriggeredAbility(Zone.COMMAND, new SacrificeEffect(StaticFilters.FILTER_PERMANENT_CREATURE, 1, "that player"), TargetController.OPPONENT, false, true); this.getAbilities().add(ability); } + + private SorinSolemnVisitorEmblem(final SorinSolemnVisitorEmblem card) { + super(card); + } + + @Override + public SorinSolemnVisitorEmblem copy() { + return new SorinSolemnVisitorEmblem(this); + } } diff --git a/Mage/src/main/java/mage/game/command/emblems/TamiyoFieldResearcherEmblem.java b/Mage/src/main/java/mage/game/command/emblems/TamiyoFieldResearcherEmblem.java index adb9510e90a..08eb920638b 100644 --- a/Mage/src/main/java/mage/game/command/emblems/TamiyoFieldResearcherEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/TamiyoFieldResearcherEmblem.java @@ -1,4 +1,3 @@ - package mage.game.command.emblems; import mage.abilities.common.SimpleStaticAbility; @@ -6,8 +5,7 @@ import mage.abilities.effects.common.continuous.CastFromHandWithoutPayingManaCos import mage.constants.Zone; import mage.game.command.Emblem; -/* - * +/** * Author: spjspj */ public final class TamiyoFieldResearcherEmblem extends Emblem { @@ -15,10 +13,17 @@ public final class TamiyoFieldResearcherEmblem extends Emblem { public TamiyoFieldResearcherEmblem() { - this.setName("Emblem Tamiyo"); + super("Emblem Tamiyo"); this.getAbilities().add(new SimpleStaticAbility(Zone.COMMAND, new CastFromHandWithoutPayingManaCostEffect())); + } - this.setExpansionSetCodeForImage("EMN"); + private TamiyoFieldResearcherEmblem(final TamiyoFieldResearcherEmblem card) { + super(card); + } + + @Override + public TamiyoFieldResearcherEmblem copy() { + return new TamiyoFieldResearcherEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/TamiyoTheMoonSageEmblem.java b/Mage/src/main/java/mage/game/command/emblems/TamiyoTheMoonSageEmblem.java index 87604c16410..e7c7a0df292 100644 --- a/Mage/src/main/java/mage/game/command/emblems/TamiyoTheMoonSageEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/TamiyoTheMoonSageEmblem.java @@ -12,8 +12,6 @@ import mage.constants.Zone; import mage.filter.StaticFilters; import mage.game.command.Emblem; -import java.util.Arrays; - /** * @author spjspj */ @@ -25,7 +23,7 @@ public final class TamiyoTheMoonSageEmblem extends Emblem { */ public TamiyoTheMoonSageEmblem() { - this.setName("Emblem Tamiyo"); + super("Emblem Tamiyo"); this.getAbilities().add(new SimpleStaticAbility(Zone.COMMAND, new MaximumHandSizeControllerEffect( Integer.MAX_VALUE, Duration.Custom, HandSizeModification.SET ))); @@ -33,7 +31,14 @@ public final class TamiyoTheMoonSageEmblem extends Emblem { Zone.COMMAND, new ReturnToHandTargetEffect().setText("return it to your hand"), true, StaticFilters.FILTER_CARD_A, TargetController.YOU, SetTargetPointer.CARD )); + } - availableImageSetCodes = Arrays.asList("AVR", "MED"); + private TamiyoTheMoonSageEmblem(final TamiyoTheMoonSageEmblem card) { + super(card); + } + + @Override + public TamiyoTheMoonSageEmblem copy() { + return new TamiyoTheMoonSageEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/TeferiAkosaOfZhalfirEmblem.java b/Mage/src/main/java/mage/game/command/emblems/TeferiAkosaOfZhalfirEmblem.java index 9eb05517b55..f9716baaab5 100644 --- a/Mage/src/main/java/mage/game/command/emblems/TeferiAkosaOfZhalfirEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/TeferiAkosaOfZhalfirEmblem.java @@ -23,8 +23,7 @@ public final class TeferiAkosaOfZhalfirEmblem extends Emblem { // -2: You get an emblem with "Knights you control get +1/+0 and have ward {1}." public TeferiAkosaOfZhalfirEmblem() { - this.setName("Emblem Teferi"); - this.setExpansionSetCodeForImage("MOM"); + super("Emblem Teferi"); Ability ability = new SimpleStaticAbility( Zone.COMMAND, new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, filter) ); @@ -34,4 +33,13 @@ public final class TeferiAkosaOfZhalfirEmblem extends Emblem { ).setText("and have ward {1}")); this.getAbilities().add(ability); } + + private TeferiAkosaOfZhalfirEmblem(final TeferiAkosaOfZhalfirEmblem card) { + super(card); + } + + @Override + public TeferiAkosaOfZhalfirEmblem copy() { + return new TeferiAkosaOfZhalfirEmblem(this); + } } diff --git a/Mage/src/main/java/mage/game/command/emblems/TeferiHeroOfDominariaEmblem.java b/Mage/src/main/java/mage/game/command/emblems/TeferiHeroOfDominariaEmblem.java index c7625098222..fcaf8c6dc4b 100644 --- a/Mage/src/main/java/mage/game/command/emblems/TeferiHeroOfDominariaEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/TeferiHeroOfDominariaEmblem.java @@ -9,24 +9,28 @@ import mage.filter.FilterPermanent; import mage.game.command.Emblem; import mage.target.TargetPermanent; -import java.util.Arrays; - /** - * * @author LevelX2 */ public final class TeferiHeroOfDominariaEmblem extends Emblem { // Whenever you draw a card, exile target permanent an opponent controls. public TeferiHeroOfDominariaEmblem() { - this.setName("Emblem Teferi"); + super("Emblem Teferi"); Ability ability = new DrawCardControllerTriggeredAbility(Zone.COMMAND, new ExileTargetEffect(), false); FilterPermanent filter = new FilterPermanent("permanent an opponent controls"); filter.add(TargetController.OPPONENT.getControllerPredicate()); ability.addTarget(new TargetPermanent(filter)); this.getAbilities().add(ability); + } - availableImageSetCodes = Arrays.asList("DOM", "MED"); + private TeferiHeroOfDominariaEmblem(final TeferiHeroOfDominariaEmblem card) { + super(card); + } + + @Override + public TeferiHeroOfDominariaEmblem copy() { + return new TeferiHeroOfDominariaEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/TeferiTemporalArchmageEmblem.java b/Mage/src/main/java/mage/game/command/emblems/TeferiTemporalArchmageEmblem.java index 57f9d29cbb6..a9146c38b06 100644 --- a/Mage/src/main/java/mage/game/command/emblems/TeferiTemporalArchmageEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/TeferiTemporalArchmageEmblem.java @@ -1,4 +1,3 @@ - package mage.game.command.emblems; import mage.abilities.LoyaltyAbility; @@ -8,16 +7,22 @@ import mage.constants.Zone; import mage.game.command.Emblem; /** - * * @author spjspj */ public final class TeferiTemporalArchmageEmblem extends Emblem { // "You may activate loyalty abilities of planeswalkers you control on any player's turn any time you could cast an instant." public TeferiTemporalArchmageEmblem() { - this.setName("Emblem Teferi"); + super("Emblem Teferi"); this.getAbilities().add(new SimpleStaticAbility(Zone.COMMAND, new ActivateAbilitiesAnyTimeYouCouldCastInstantEffect(LoyaltyAbility.class, "loyalty abilities of planeswalkers you control on any player's turn"))); + } - this.setExpansionSetCodeForImage("C14"); + private TeferiTemporalArchmageEmblem(final TeferiTemporalArchmageEmblem card) { + super(card); + } + + @Override + public TeferiTemporalArchmageEmblem copy() { + return new TeferiTemporalArchmageEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/TeferiWhoSlowsTheSunsetEmblem.java b/Mage/src/main/java/mage/game/command/emblems/TeferiWhoSlowsTheSunsetEmblem.java index 6ff1acc6f78..372330b5bc2 100644 --- a/Mage/src/main/java/mage/game/command/emblems/TeferiWhoSlowsTheSunsetEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/TeferiWhoSlowsTheSunsetEmblem.java @@ -13,13 +13,20 @@ import mage.players.Player; public class TeferiWhoSlowsTheSunsetEmblem extends Emblem { // You get an emblem with "Untap all permanents you control during each opponent's untap step" and "You draw a card during each opponent's draw step." public TeferiWhoSlowsTheSunsetEmblem() { - this.setName("Emblem Teferi"); + super("Emblem Teferi"); this.getAbilities().add(new SimpleStaticAbility( Zone.COMMAND, new UntapAllDuringEachOtherPlayersUntapStepEffect(StaticFilters.FILTER_CONTROLLED_PERMANENTS) )); this.getAbilities().add(new SimpleStaticAbility(new TeferiWhoSlowsTheSunsetEmblemEffect())); + } - this.setExpansionSetCodeForImage("MID"); + private TeferiWhoSlowsTheSunsetEmblem(final TeferiWhoSlowsTheSunsetEmblem card) { + super(card); + } + + @Override + public TeferiWhoSlowsTheSunsetEmblem copy() { + return new TeferiWhoSlowsTheSunsetEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/TeferisTalentEmblem.java b/Mage/src/main/java/mage/game/command/emblems/TeferisTalentEmblem.java index 61245d920d3..818782e70e2 100644 --- a/Mage/src/main/java/mage/game/command/emblems/TeferisTalentEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/TeferisTalentEmblem.java @@ -13,7 +13,7 @@ public final class TeferisTalentEmblem extends Emblem { // -12: "You may activate loyalty abilities of planeswalkers you control on any player's turn any time you could cast an instant." public TeferisTalentEmblem() { - this.setName("Emblem Teferi"); + super("Emblem Teferi"); this.getAbilities().add(new SimpleStaticAbility( Zone.COMMAND, new ActivateAbilitiesAnyTimeYouCouldCastInstantEffect( @@ -21,7 +21,14 @@ public final class TeferisTalentEmblem extends Emblem { "loyalty abilities of planeswalkers you control on any player's turn" ) )); + } - this.setExpansionSetCodeForImage("MOC"); + private TeferisTalentEmblem(final TeferisTalentEmblem card) { + super(card); + } + + @Override + public TeferisTalentEmblem copy() { + return new TeferisTalentEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/TezzeretArtificeMasterEmblem.java b/Mage/src/main/java/mage/game/command/emblems/TezzeretArtificeMasterEmblem.java index 7b4dd91633a..8853e8e2688 100644 --- a/Mage/src/main/java/mage/game/command/emblems/TezzeretArtificeMasterEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/TezzeretArtificeMasterEmblem.java @@ -9,15 +9,13 @@ import mage.game.command.Emblem; import mage.target.common.TargetCardInLibrary; /** - * * @author TheElk801 */ public final class TezzeretArtificeMasterEmblem extends Emblem { // −9: You get an emblem with "At the beginning of your end step, search your library for a permanent card, put it into the battlefield, then shuffle your library." public TezzeretArtificeMasterEmblem() { - this.setName("Emblem Tezzeret"); - this.setExpansionSetCodeForImage("M19"); + super("Emblem Tezzeret"); this.getAbilities().add(new BeginningOfEndStepTriggeredAbility( Zone.COMMAND, new SearchLibraryPutInPlayEffect( @@ -25,4 +23,13 @@ public final class TezzeretArtificeMasterEmblem extends Emblem { ), TargetController.YOU, null, false )); } + + private TezzeretArtificeMasterEmblem(final TezzeretArtificeMasterEmblem card) { + super(card); + } + + @Override + public TezzeretArtificeMasterEmblem copy() { + return new TezzeretArtificeMasterEmblem(this); + } } diff --git a/Mage/src/main/java/mage/game/command/emblems/TezzeretBetrayerOfFleshEmblem.java b/Mage/src/main/java/mage/game/command/emblems/TezzeretBetrayerOfFleshEmblem.java index 48a63cb23c9..75c790f73a5 100644 --- a/Mage/src/main/java/mage/game/command/emblems/TezzeretBetrayerOfFleshEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/TezzeretBetrayerOfFleshEmblem.java @@ -13,11 +13,19 @@ public final class TezzeretBetrayerOfFleshEmblem extends Emblem { // −6: You get an emblem with "Whenever an artifact you control becomes tapped, draw a card." public TezzeretBetrayerOfFleshEmblem() { - this.setName("Emblem Tezzeret"); - this.setExpansionSetCodeForImage("NEO"); + super("Emblem Tezzeret"); this.getAbilities().add(new BecomesTappedTriggeredAbility( Zone.COMMAND, new DrawCardSourceControllerEffect(1), false, StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT, false )); } + + private TezzeretBetrayerOfFleshEmblem(final TezzeretBetrayerOfFleshEmblem card) { + super(card); + } + + @Override + public TezzeretBetrayerOfFleshEmblem copy() { + return new TezzeretBetrayerOfFleshEmblem(this); + } } diff --git a/Mage/src/main/java/mage/game/command/emblems/TezzeretTheSchemerEmblem.java b/Mage/src/main/java/mage/game/command/emblems/TezzeretTheSchemerEmblem.java index 281f41ee61f..333c9253a94 100644 --- a/Mage/src/main/java/mage/game/command/emblems/TezzeretTheSchemerEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/TezzeretTheSchemerEmblem.java @@ -1,4 +1,3 @@ - package mage.game.command.emblems; import mage.abilities.Ability; @@ -10,18 +9,18 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; -import static mage.filter.StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT; import mage.game.command.Emblem; import mage.target.TargetPermanent; +import static mage.filter.StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT; + /** - * * @author spjspj */ public final class TezzeretTheSchemerEmblem extends Emblem { public TezzeretTheSchemerEmblem() { - this.setName("Emblem Tezzeret"); + super("Emblem Tezzeret"); Effect effect = new AddCardTypeTargetEffect(Duration.EndOfGame, CardType.ARTIFACT, CardType.CREATURE); effect.setText("target artifact you control becomes an artifact creature"); @@ -31,7 +30,14 @@ public final class TezzeretTheSchemerEmblem extends Emblem { ability.addEffect(effect); ability.addTarget(new TargetPermanent(FILTER_CONTROLLED_PERMANENT_ARTIFACT)); this.getAbilities().add(ability); + } - this.setExpansionSetCodeForImage("AER"); + private TezzeretTheSchemerEmblem(final TezzeretTheSchemerEmblem card) { + super(card); + } + + @Override + public TezzeretTheSchemerEmblem copy() { + return new TezzeretTheSchemerEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/TheRingEmblem.java b/Mage/src/main/java/mage/game/command/emblems/TheRingEmblem.java index 002ca156761..e5a0f8b50c1 100644 --- a/Mage/src/main/java/mage/game/command/emblems/TheRingEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/TheRingEmblem.java @@ -31,6 +31,7 @@ import java.util.UUID; * @author TheElk801 */ public final class TheRingEmblem extends Emblem { + private static final FilterPermanent filter = new FilterControlledPermanent("your Ring-bearer"); static { @@ -38,12 +39,19 @@ public final class TheRingEmblem extends Emblem { } public TheRingEmblem(UUID controllerId) { - super(); - this.setName("The Ring"); - this.setExpansionSetCodeForImage("LTR"); + super("The Ring"); this.setControllerId(controllerId); } + private TheRingEmblem(final TheRingEmblem card) { + super(card); + } + + @Override + public TheRingEmblem copy() { + return new TheRingEmblem(this); + } + public void addNextAbility(Game game) { Ability ability; switch (TemptedByTheRingWatcher.getCount(this.getControllerId(), game)) { diff --git a/Mage/src/main/java/mage/game/command/emblems/TibaltCosmicImpostorEmblem.java b/Mage/src/main/java/mage/game/command/emblems/TibaltCosmicImpostorEmblem.java index e9baa8f92be..97b9ddfa2c7 100644 --- a/Mage/src/main/java/mage/game/command/emblems/TibaltCosmicImpostorEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/TibaltCosmicImpostorEmblem.java @@ -22,10 +22,17 @@ public final class TibaltCosmicImpostorEmblem extends Emblem { // You may play cards exiled with Tibalt, Cosmic Impostor, and you may spend mana as though it were mana of any color to cast those spells." public TibaltCosmicImpostorEmblem() { - setName("Emblem Tibalt"); + super("Emblem Tibalt"); this.getAbilities().add(new SimpleStaticAbility(Zone.COMMAND, new TibaltCosmicImpostorPlayFromExileEffect())); + } - this.setExpansionSetCodeForImage("KHM"); + private TibaltCosmicImpostorEmblem(final TibaltCosmicImpostorEmblem card) { + super(card); + } + + @Override + public TibaltCosmicImpostorEmblem copy() { + return new TibaltCosmicImpostorEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/TyvarKellEmblem.java b/Mage/src/main/java/mage/game/command/emblems/TyvarKellEmblem.java index 6500ee4fd33..8889f88aed4 100644 --- a/Mage/src/main/java/mage/game/command/emblems/TyvarKellEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/TyvarKellEmblem.java @@ -24,8 +24,7 @@ public final class TyvarKellEmblem extends Emblem { // −6: You get an emblem with "Whenever you cast an Elf spell, it gains haste until end of turn and you draw two cards." public TyvarKellEmblem() { - this.setName("Emblem Tyvar"); - this.setExpansionSetCodeForImage("KHM"); + super("Emblem Tyvar"); Ability ability = new SpellCastControllerTriggeredAbility( Zone.COMMAND, @@ -36,4 +35,13 @@ public final class TyvarKellEmblem extends Emblem { ability.addEffect(new DrawCardSourceControllerEffect(2, "you").concatBy("and")); this.getAbilities().add(ability); } + + private TyvarKellEmblem(final TyvarKellEmblem card) { + super(card); + } + + @Override + public TyvarKellEmblem copy() { + return new TyvarKellEmblem(this); + } } diff --git a/Mage/src/main/java/mage/game/command/emblems/VenserTheSojournerEmblem.java b/Mage/src/main/java/mage/game/command/emblems/VenserTheSojournerEmblem.java index 59334c5ba4f..65c2e9318ca 100644 --- a/Mage/src/main/java/mage/game/command/emblems/VenserTheSojournerEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/VenserTheSojournerEmblem.java @@ -1,4 +1,3 @@ - package mage.game.command.emblems; import mage.abilities.Ability; @@ -6,18 +5,15 @@ import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.ExileTargetEffect; import mage.constants.Zone; -import mage.filter.FilterSpell; import mage.filter.StaticFilters; import mage.game.Game; import mage.game.command.Emblem; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.stack.Spell; import mage.target.Target; import mage.target.TargetPermanent; /** - * * @author spjspj */ public final class VenserTheSojournerEmblem extends Emblem { @@ -27,13 +23,20 @@ public final class VenserTheSojournerEmblem extends Emblem { */ public VenserTheSojournerEmblem() { - this.setName("Emblem Venser"); + super("Emblem Venser"); Ability ability = new VenserTheSojournerSpellCastTriggeredAbility(new ExileTargetEffect(), false); Target target = new TargetPermanent(); ability.addTarget(target); this.getAbilities().add(ability); + } - this.setExpansionSetCodeForImage("DDI"); + private VenserTheSojournerEmblem(final VenserTheSojournerEmblem card) { + super(card); + } + + @Override + public VenserTheSojournerEmblem copy() { + return new VenserTheSojournerEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/VivienReidEmblem.java b/Mage/src/main/java/mage/game/command/emblems/VivienReidEmblem.java index bf9dcf08874..d8a2a6c405b 100644 --- a/Mage/src/main/java/mage/game/command/emblems/VivienReidEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/VivienReidEmblem.java @@ -13,15 +13,13 @@ import mage.filter.StaticFilters; import mage.game.command.Emblem; /** - * * @author TheElk801 */ public final class VivienReidEmblem extends Emblem { // -8: You get an emblem with "Creatures you control get +2/+2 and have vigilance, trample, and indestructible. public VivienReidEmblem() { - this.setName("Emblem Vivien"); - this.setExpansionSetCodeForImage("M19"); + super("Emblem Vivien"); Ability ability = new SimpleStaticAbility( Zone.COMMAND, new BoostControlledEffect( @@ -47,4 +45,13 @@ public final class VivienReidEmblem extends Emblem { ).setText(", and indestructible")); this.getAbilities().add(ability); } + + private VivienReidEmblem(final VivienReidEmblem card) { + super(card); + } + + @Override + public VivienReidEmblem copy() { + return new VivienReidEmblem(this); + } } diff --git a/Mage/src/main/java/mage/game/command/emblems/VraskaGolgariQueenEmblem.java b/Mage/src/main/java/mage/game/command/emblems/VraskaGolgariQueenEmblem.java index 12ed9af2558..7b1b86423ef 100644 --- a/Mage/src/main/java/mage/game/command/emblems/VraskaGolgariQueenEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/VraskaGolgariQueenEmblem.java @@ -7,8 +7,6 @@ import mage.constants.Zone; import mage.filter.StaticFilters; import mage.game.command.Emblem; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -16,12 +14,20 @@ public final class VraskaGolgariQueenEmblem extends Emblem { // -9: You get an emblem with "Whenever a creature you control deals combat damage to a player, that player loses the game." public VraskaGolgariQueenEmblem() { - this.setName("Emblem Vraska"); - availableImageSetCodes = Arrays.asList("MED", "GRN"); + super("Emblem Vraska"); this.getAbilities().add(new DealsDamageToAPlayerAllTriggeredAbility( Zone.COMMAND, new LoseGameTargetPlayerEffect(), StaticFilters.FILTER_CONTROLLED_A_CREATURE, false, SetTargetPointer.NONE, true, true )); } + + private VraskaGolgariQueenEmblem(final VraskaGolgariQueenEmblem card) { + super(card); + } + + @Override + public VraskaGolgariQueenEmblem copy() { + return new VraskaGolgariQueenEmblem(this); + } } diff --git a/Mage/src/main/java/mage/game/command/emblems/WillKenrithEmblem.java b/Mage/src/main/java/mage/game/command/emblems/WillKenrithEmblem.java index b7485445c8c..085bc8f6f8d 100644 --- a/Mage/src/main/java/mage/game/command/emblems/WillKenrithEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/WillKenrithEmblem.java @@ -6,8 +6,6 @@ import mage.constants.Zone; import mage.filter.StaticFilters; import mage.game.command.Emblem; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -15,7 +13,7 @@ public final class WillKenrithEmblem extends Emblem { // Target player gets an emblem with "Whenever you cast an instant or sorcery spell, copy it. You may choose new targets for the copy." public WillKenrithEmblem() { - this.setName("Emblem Will Kenrith"); + super("Emblem Will Kenrith"); this.getAbilities().add(new SpellCastControllerTriggeredAbility( Zone.COMMAND, new CopyTargetSpellEffect(true).withSpellName("it"), @@ -23,7 +21,14 @@ public final class WillKenrithEmblem extends Emblem { false, true )); + } - availableImageSetCodes = Arrays.asList("BBD", "CLB"); + private WillKenrithEmblem(final WillKenrithEmblem card) { + super(card); + } + + @Override + public WillKenrithEmblem copy() { + return new WillKenrithEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/WrennAndRealmbreakerEmblem.java b/Mage/src/main/java/mage/game/command/emblems/WrennAndRealmbreakerEmblem.java index d2a2a8a92bc..b909fe3da21 100644 --- a/Mage/src/main/java/mage/game/command/emblems/WrennAndRealmbreakerEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/WrennAndRealmbreakerEmblem.java @@ -20,10 +20,18 @@ public final class WrennAndRealmbreakerEmblem extends Emblem { // -7: You get an emblem with "You may play lands and cast permanent spells from your graveyard." public WrennAndRealmbreakerEmblem() { - this.setName("Emblem Wrenn"); - this.setExpansionSetCodeForImage("MOM"); + super("Emblem Wrenn"); this.getAbilities().add(new SimpleStaticAbility(Zone.COMMAND, new WrennAndRealmbreakerEmblemEffect())); } + + private WrennAndRealmbreakerEmblem(final WrennAndRealmbreakerEmblem card) { + super(card); + } + + @Override + public WrennAndRealmbreakerEmblem copy() { + return new WrennAndRealmbreakerEmblem(this); + } } class WrennAndRealmbreakerEmblemEffect extends AsThoughEffectImpl { diff --git a/Mage/src/main/java/mage/game/command/emblems/WrennAndSevenEmblem.java b/Mage/src/main/java/mage/game/command/emblems/WrennAndSevenEmblem.java index 4b01ee11d9d..8508337abff 100644 --- a/Mage/src/main/java/mage/game/command/emblems/WrennAndSevenEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/WrennAndSevenEmblem.java @@ -13,11 +13,18 @@ public final class WrennAndSevenEmblem extends Emblem { // You get an emblem with "You have no maximum hand size." public WrennAndSevenEmblem() { - this.setName("Emblem Wrenn"); + super("Emblem Wrenn"); this.getAbilities().add(new SimpleStaticAbility(Zone.COMMAND, new MaximumHandSizeControllerEffect( Integer.MAX_VALUE, Duration.WhileOnBattlefield, MaximumHandSizeControllerEffect.HandSizeModification.SET ))); + } - this.setExpansionSetCodeForImage("MID"); + private WrennAndSevenEmblem(final WrennAndSevenEmblem card) { + super(card); + } + + @Override + public WrennAndSevenEmblem copy() { + return new WrennAndSevenEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/WrennAndSixEmblem.java b/Mage/src/main/java/mage/game/command/emblems/WrennAndSixEmblem.java index a4931d38c0f..14f371cce8d 100644 --- a/Mage/src/main/java/mage/game/command/emblems/WrennAndSixEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/WrennAndSixEmblem.java @@ -4,19 +4,13 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.keyword.RetraceAbility; -import mage.cards.AdventureCard; -import mage.cards.Card; +import mage.cards.*; import mage.constants.*; import mage.game.Game; import mage.game.command.Emblem; import mage.players.Player; -import java.util.Arrays; import java.util.UUID; -import mage.cards.ModalDoubleFacesCard; -import mage.cards.ModalDoubleFacesCardHalf; -import mage.cards.SplitCard; -import mage.cards.SplitCardHalf; /** * @author TheElk801 @@ -24,10 +18,17 @@ import mage.cards.SplitCardHalf; public final class WrennAndSixEmblem extends Emblem { public WrennAndSixEmblem() { - this.setName("Emblem Wrenn"); + super("Emblem Wrenn"); this.getAbilities().add(new SimpleStaticAbility(Zone.COMMAND, new WrennAndSixEmblemEffect())); + } - availableImageSetCodes = Arrays.asList("MH1", "2X2"); + private WrennAndSixEmblem(final WrennAndSixEmblem card) { + super(card); + } + + @Override + public WrennAndSixEmblem copy() { + return new WrennAndSixEmblem(this); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/YodaEmblem.java b/Mage/src/main/java/mage/game/command/emblems/YodaEmblem.java index 9c7d02276b0..c816a1051eb 100644 --- a/Mage/src/main/java/mage/game/command/emblems/YodaEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/YodaEmblem.java @@ -1,4 +1,3 @@ - package mage.game.command.emblems; import mage.abilities.Ability; @@ -13,14 +12,13 @@ import mage.filter.common.FilterCreaturePermanent; import mage.game.command.Emblem; /** - * * @author spjspj */ public final class YodaEmblem extends Emblem { // You get an emblem with "Hexproof, you and your creatures have." public YodaEmblem() { - this.setName("Emblem Yoda, Jedi Master"); + super("Emblem Yoda, Jedi Master"); Effect effect = new GainAbilityControllerEffect(HexproofAbility.getInstance(), Duration.EndOfGame); effect.setText("Hexproof, you"); Ability ability = new SimpleStaticAbility(Zone.COMMAND, effect); @@ -29,4 +27,13 @@ public final class YodaEmblem extends Emblem { ability.addEffect(effect); getAbilities().add(ability); } + + private YodaEmblem(final YodaEmblem card) { + super(card); + } + + @Override + public YodaEmblem copy() { + return new YodaEmblem(this); + } } diff --git a/Mage/src/main/java/mage/game/command/emblems/ZarielArchdukeOfAvernusEmblem.java b/Mage/src/main/java/mage/game/command/emblems/ZarielArchdukeOfAvernusEmblem.java index efceb70f38f..9249355b260 100644 --- a/Mage/src/main/java/mage/game/command/emblems/ZarielArchdukeOfAvernusEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/ZarielArchdukeOfAvernusEmblem.java @@ -17,10 +17,18 @@ public final class ZarielArchdukeOfAvernusEmblem extends Emblem { // −6: You get an emblem with "At the end of the first combat phase on your turn, untap target creature you control. After this phase, there is an additional combat phase." public ZarielArchdukeOfAvernusEmblem() { - this.setName("Emblem Zariel"); - this.setExpansionSetCodeForImage("AFR"); + super("Emblem Zariel"); this.getAbilities().add(new ZarielArchdukeOfAvernusEmblemAbility()); } + + private ZarielArchdukeOfAvernusEmblem(final ZarielArchdukeOfAvernusEmblem card) { + super(card); + } + + @Override + public ZarielArchdukeOfAvernusEmblem copy() { + return new ZarielArchdukeOfAvernusEmblem(this); + } } class ZarielArchdukeOfAvernusEmblemAbility extends TriggeredAbilityImpl { diff --git a/Mage/src/main/java/mage/game/command/planes/AcademyAtTolariaWestPlane.java b/Mage/src/main/java/mage/game/command/planes/AcademyAtTolariaWestPlane.java index f948bab2a5d..dc47d6bc31d 100644 --- a/Mage/src/main/java/mage/game/command/planes/AcademyAtTolariaWestPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/AcademyAtTolariaWestPlane.java @@ -35,7 +35,6 @@ public class AcademyAtTolariaWestPlane extends Plane { public AcademyAtTolariaWestPlane() { this.setPlaneType(Planes.PLANE_ACADEMY_AT_TOLARIA_WEST); - this.setExpansionSetCodeForImage("PCA"); // At the beginning of your end step, if you have 0 cards in hand, draw seven cards Ability ability = new BeginningOfEndStepTriggeredAbility(Zone.COMMAND, new DrawCardsActivePlayerEffect(7), TargetController.ANY, HellbentAPCondition.instance, false); @@ -57,6 +56,15 @@ public class AcademyAtTolariaWestPlane extends Plane { chaosAbility.setMayActivate(TargetController.ANY); this.getAbilities().add(new SimpleStaticAbility(Zone.ALL, new PlanarDieRollCostIncreasingEffect(chaosAbility.getOriginalId()))); } + + private AcademyAtTolariaWestPlane(final AcademyAtTolariaWestPlane plane) { + super(plane); + } + + @Override + public AcademyAtTolariaWestPlane copy() { + return new AcademyAtTolariaWestPlane(this); + } } class DrawCardsActivePlayerEffect extends OneShotEffect { diff --git a/Mage/src/main/java/mage/game/command/planes/AgyremPlane.java b/Mage/src/main/java/mage/game/command/planes/AgyremPlane.java index b8618ecf7af..cb0c19caefa 100644 --- a/Mage/src/main/java/mage/game/command/planes/AgyremPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/AgyremPlane.java @@ -46,7 +46,6 @@ public class AgyremPlane extends Plane { public AgyremPlane() { this.setPlaneType(Planes.PLANE_AGYREM); - this.setExpansionSetCodeForImage("PCA"); // Whenever a white creature dies, return it to the battlefield under its owner's control at the beginning of the next end step DiesCreatureTriggeredAbility ability = new DiesCreatureTriggeredAbility(Zone.COMMAND, new AgyremEffect(), false, filterWhite, true); @@ -70,6 +69,15 @@ public class AgyremPlane extends Plane { chaosAbility.setMayActivate(TargetController.ANY); this.getAbilities().add(new SimpleStaticAbility(Zone.ALL, new PlanarDieRollCostIncreasingEffect(chaosAbility.getOriginalId()))); } + + private AgyremPlane(final AgyremPlane plane) { + super(plane); + } + + @Override + public AgyremPlane copy() { + return new AgyremPlane(this); + } } class AgyremEffect extends OneShotEffect { diff --git a/Mage/src/main/java/mage/game/command/planes/AkoumPlane.java b/Mage/src/main/java/mage/game/command/planes/AkoumPlane.java index 57607eb484b..bcf839a0580 100644 --- a/Mage/src/main/java/mage/game/command/planes/AkoumPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/AkoumPlane.java @@ -37,7 +37,6 @@ public class AkoumPlane extends Plane { public AkoumPlane() { this.setPlaneType(Planes.PLANE_AKOUM); - this.setExpansionSetCodeForImage("PCA"); // Players may cast enchantment spells as if they had flash SimpleStaticAbility ability = new SimpleStaticAbility(Zone.COMMAND, new CastAsThoughItHadFlashAllEffect(Duration.Custom, filterCard, true)); @@ -58,4 +57,13 @@ public class AkoumPlane extends Plane { chaosAbility.setMayActivate(TargetController.ANY); this.getAbilities().add(new SimpleStaticAbility(Zone.ALL, new PlanarDieRollCostIncreasingEffect(chaosAbility.getOriginalId()))); } + + private AkoumPlane(final AkoumPlane plane) { + super(plane); + } + + @Override + public AkoumPlane copy() { + return new AkoumPlane(this); + } } diff --git a/Mage/src/main/java/mage/game/command/planes/AstralArenaPlane.java b/Mage/src/main/java/mage/game/command/planes/AstralArenaPlane.java index 2a600581950..c672997542c 100644 --- a/Mage/src/main/java/mage/game/command/planes/AstralArenaPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/AstralArenaPlane.java @@ -33,7 +33,6 @@ public class AstralArenaPlane extends Plane { public AstralArenaPlane() { this.setPlaneType(Planes.PLANE_ASTRAL_ARENA); - this.setExpansionSetCodeForImage("PCA"); // No more than one creature can attack each turn. No more than one creature can block each turn. SimpleStaticAbility ability = new SimpleStaticAbility(Zone.COMMAND, new AstralArenaAttackRestrictionEffect()); @@ -58,6 +57,15 @@ public class AstralArenaPlane extends Plane { chaosAbility.setMayActivate(TargetController.ANY); this.getAbilities().add(new SimpleStaticAbility(Zone.ALL, new PlanarDieRollCostIncreasingEffect(chaosAbility.getOriginalId()))); } + + private AstralArenaPlane(final AstralArenaPlane plane) { + super(plane); + } + + @Override + public AstralArenaPlane copy() { + return new AstralArenaPlane(this); + } } class AstralArenaAttackRestrictionEffect extends RestrictionEffect { diff --git a/Mage/src/main/java/mage/game/command/planes/BantPlane.java b/Mage/src/main/java/mage/game/command/planes/BantPlane.java index a7173050337..0a8f555508e 100644 --- a/Mage/src/main/java/mage/game/command/planes/BantPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/BantPlane.java @@ -50,7 +50,6 @@ public class BantPlane extends Plane { public BantPlane() { this.setPlaneType(Planes.PLANE_BANT); - this.setExpansionSetCodeForImage("PCA"); // All creatures have exalted SimpleStaticAbility ability @@ -80,4 +79,13 @@ public class BantPlane extends Plane { chaosAbility.setMayActivate(TargetController.ANY); this.getAbilities().add(new SimpleStaticAbility(Zone.ALL, new PlanarDieRollCostIncreasingEffect(chaosAbility.getOriginalId()))); } + + private BantPlane(final BantPlane plane) { + super(plane); + } + + @Override + public BantPlane copy() { + return new BantPlane(this); + } } diff --git a/Mage/src/main/java/mage/game/command/planes/EdgeOfMalacolPlane.java b/Mage/src/main/java/mage/game/command/planes/EdgeOfMalacolPlane.java index 5f5841f6c08..c21f054292d 100644 --- a/Mage/src/main/java/mage/game/command/planes/EdgeOfMalacolPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/EdgeOfMalacolPlane.java @@ -18,7 +18,6 @@ import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.command.Plane; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.target.Target; import mage.target.targetpointer.FixedTarget; @@ -36,7 +35,6 @@ public class EdgeOfMalacolPlane extends Plane { public EdgeOfMalacolPlane() { this.setPlaneType(Planes.PLANE_EDGE_OF_MALACOL); - this.setExpansionSetCodeForImage("PCA"); // If a creature you control would untap during your untap step, put two +1/+1 counters on it instead. SimpleStaticAbility ability = new SimpleStaticAbility(Zone.COMMAND, new EdgeOfMalacolEffect()); @@ -57,6 +55,15 @@ public class EdgeOfMalacolPlane extends Plane { chaosAbility.setMayActivate(TargetController.ANY); this.getAbilities().add(new SimpleStaticAbility(Zone.ALL, new PlanarDieRollCostIncreasingEffect(chaosAbility.getOriginalId()))); } + + private EdgeOfMalacolPlane(final EdgeOfMalacolPlane plane) { + super(plane); + } + + @Override + public EdgeOfMalacolPlane copy() { + return new EdgeOfMalacolPlane(this); + } } class EdgeOfMalacolEffect extends ContinuousRuleModifyingEffectImpl { diff --git a/Mage/src/main/java/mage/game/command/planes/FeedingGroundsPlane.java b/Mage/src/main/java/mage/game/command/planes/FeedingGroundsPlane.java index 33a3f6dcc28..2cf165b8343 100644 --- a/Mage/src/main/java/mage/game/command/planes/FeedingGroundsPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/FeedingGroundsPlane.java @@ -1,7 +1,5 @@ package mage.game.command.planes; -import java.util.ArrayList; -import java.util.List; import mage.MageObject; import mage.ObjectColor; import mage.abilities.Ability; @@ -31,6 +29,9 @@ import mage.target.common.TargetCreaturePermanent; import mage.util.CardUtil; import mage.watchers.common.PlanarRollWatcher; +import java.util.ArrayList; +import java.util.List; + /** * @author spjspj */ @@ -40,7 +41,6 @@ public class FeedingGroundsPlane extends Plane { public FeedingGroundsPlane() { this.setPlaneType(Planes.PLANE_FEEDING_GROUNDS); - this.setExpansionSetCodeForImage("PCA"); // Red spells cost {1} less to cast. Green spells cost {1} less to cast Ability ability = new SimpleStaticAbility(Zone.COMMAND, new FeedingGroundsEffect()); @@ -61,6 +61,15 @@ public class FeedingGroundsPlane extends Plane { chaosAbility.setMayActivate(TargetController.ANY); this.getAbilities().add(new SimpleStaticAbility(Zone.ALL, new PlanarDieRollCostIncreasingEffect(chaosAbility.getOriginalId()))); } + + private FeedingGroundsPlane(final FeedingGroundsPlane plane) { + super(plane); + } + + @Override + public FeedingGroundsPlane copy() { + return new FeedingGroundsPlane(this); + } } class FeedingGroundsEffect extends CostModificationEffectImpl { diff --git a/Mage/src/main/java/mage/game/command/planes/FieldsOfSummerPlane.java b/Mage/src/main/java/mage/game/command/planes/FieldsOfSummerPlane.java index e4e07bf4426..b1d08cf2706 100644 --- a/Mage/src/main/java/mage/game/command/planes/FieldsOfSummerPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/FieldsOfSummerPlane.java @@ -13,7 +13,6 @@ import mage.abilities.effects.common.GainLifeTargetEffect; import mage.abilities.effects.common.RollPlanarDieEffect; import mage.abilities.effects.common.cost.PlanarDieRollCostIncreasingEffect; import mage.constants.*; -import mage.filter.FilterSpell; import mage.filter.StaticFilters; import mage.game.Game; import mage.game.command.Plane; @@ -33,7 +32,6 @@ public class FieldsOfSummerPlane extends Plane { public FieldsOfSummerPlane() { this.setPlaneType(Planes.PLANE_FIELDS_OF_SUMMER); - this.setExpansionSetCodeForImage("PCA"); // Whenever a player casts a spell, that player may gain 2 life SpellCastAllTriggeredAbility ability = new SpellCastAllTriggeredAbility(Zone.COMMAND, new FieldsOfSummerEffect(), StaticFilters.FILTER_SPELL_A, false, SetTargetPointer.PLAYER); @@ -54,6 +52,15 @@ public class FieldsOfSummerPlane extends Plane { chaosAbility.setMayActivate(TargetController.ANY); this.getAbilities().add(new SimpleStaticAbility(Zone.ALL, new PlanarDieRollCostIncreasingEffect(chaosAbility.getOriginalId()))); } + + private FieldsOfSummerPlane(final FieldsOfSummerPlane plane) { + super(plane); + } + + @Override + public FieldsOfSummerPlane copy() { + return new FieldsOfSummerPlane(this); + } } class FieldsOfSummerEffect extends OneShotEffect { diff --git a/Mage/src/main/java/mage/game/command/planes/HedronFieldsOfAgadeemPlane.java b/Mage/src/main/java/mage/game/command/planes/HedronFieldsOfAgadeemPlane.java index 87af270d4b7..b5a902392a9 100644 --- a/Mage/src/main/java/mage/game/command/planes/HedronFieldsOfAgadeemPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/HedronFieldsOfAgadeemPlane.java @@ -30,7 +30,6 @@ public class HedronFieldsOfAgadeemPlane extends Plane { public HedronFieldsOfAgadeemPlane() { this.setPlaneType(Planes.PLANE_HEDRON_FIELDS_OF_AGADEEM); - this.setExpansionSetCodeForImage("PCA"); // Creatures with power 7 or greater can't attack or block Ability ability = new SimpleStaticAbility(Zone.COMMAND, new HedronFieldsOfAgadeemRestrictionEffect()); @@ -52,6 +51,15 @@ public class HedronFieldsOfAgadeemPlane extends Plane { chaosAbility.setMayActivate(TargetController.ANY); this.getAbilities().add(new SimpleStaticAbility(Zone.ALL, new PlanarDieRollCostIncreasingEffect(chaosAbility.getOriginalId()))); } + + private HedronFieldsOfAgadeemPlane(final HedronFieldsOfAgadeemPlane plane) { + super(plane); + } + + @Override + public HedronFieldsOfAgadeemPlane copy() { + return new HedronFieldsOfAgadeemPlane(this); + } } class HedronFieldsOfAgadeemRestrictionEffect extends RestrictionEffect { diff --git a/Mage/src/main/java/mage/game/command/planes/LetheLakePlane.java b/Mage/src/main/java/mage/game/command/planes/LetheLakePlane.java index 291194f5cd1..0be2718aced 100644 --- a/Mage/src/main/java/mage/game/command/planes/LetheLakePlane.java +++ b/Mage/src/main/java/mage/game/command/planes/LetheLakePlane.java @@ -7,8 +7,8 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MainPhaseStackEmptyCondition; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.Effect; -import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.abilities.effects.common.MillCardsTargetEffect; +import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.abilities.effects.common.RollPlanarDieEffect; import mage.abilities.effects.common.cost.PlanarDieRollCostIncreasingEffect; import mage.constants.Planes; @@ -29,7 +29,6 @@ public class LetheLakePlane extends Plane { public LetheLakePlane() { this.setPlaneType(Planes.PLANE_LETHE_LAKE); - this.setExpansionSetCodeForImage("PCA"); // At the beginning of your upkeep, put the top ten cards of your libary into your graveyard Ability ability = new BeginningOfUpkeepTriggeredAbility(Zone.COMMAND, new PutLibraryIntoGraveTargetEffect(10).setText("that player mills 10 cards"), TargetController.ANY, false, true); @@ -51,4 +50,13 @@ public class LetheLakePlane extends Plane { chaosAbility.setMayActivate(TargetController.ANY); this.getAbilities().add(new SimpleStaticAbility(Zone.ALL, new PlanarDieRollCostIncreasingEffect(chaosAbility.getOriginalId()))); } + + private LetheLakePlane(final LetheLakePlane plane) { + super(plane); + } + + @Override + public LetheLakePlane copy() { + return new LetheLakePlane(this); + } } diff --git a/Mage/src/main/java/mage/game/command/planes/NayaPlane.java b/Mage/src/main/java/mage/game/command/planes/NayaPlane.java index 764a479d4c2..c622443917b 100644 --- a/Mage/src/main/java/mage/game/command/planes/NayaPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/NayaPlane.java @@ -42,7 +42,6 @@ public class NayaPlane extends Plane { public NayaPlane() { this.setPlaneType(Planes.PLANE_NAYA); - this.setExpansionSetCodeForImage("PCA"); // You may play any number of lands on each of your turns Ability ability = new SimpleStaticAbility(Zone.COMMAND, new PlayAdditionalLandsAllEffect(Integer.MAX_VALUE)); @@ -64,4 +63,13 @@ public class NayaPlane extends Plane { chaosAbility.setMayActivate(TargetController.ANY); this.getAbilities().add(new SimpleStaticAbility(Zone.ALL, new PlanarDieRollCostIncreasingEffect(chaosAbility.getOriginalId()))); } + + private NayaPlane(final NayaPlane plane) { + super(plane); + } + + @Override + public NayaPlane copy() { + return new NayaPlane(this); + } } diff --git a/Mage/src/main/java/mage/game/command/planes/PanopticonPlane.java b/Mage/src/main/java/mage/game/command/planes/PanopticonPlane.java index af7024ca634..0cb10a18cf5 100644 --- a/Mage/src/main/java/mage/game/command/planes/PanopticonPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/PanopticonPlane.java @@ -18,7 +18,6 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.command.Plane; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.players.Player; import mage.target.Target; import mage.target.targetpointer.FixedTarget; @@ -36,7 +35,6 @@ public class PanopticonPlane extends Plane { public PanopticonPlane() { this.setPlaneType(Planes.PLANE_PANOPTICON); - this.setExpansionSetCodeForImage("PCA"); // When you planeswalk to Panopticon, draw a card Ability pwability = new PanopticonTriggeredAbility(new DrawCardTargetEffect(1)); @@ -62,6 +60,15 @@ public class PanopticonPlane extends Plane { chaosAbility.setMayActivate(TargetController.ANY); this.getAbilities().add(new SimpleStaticAbility(Zone.ALL, new PlanarDieRollCostIncreasingEffect(chaosAbility.getOriginalId()))); } + + private PanopticonPlane(final PanopticonPlane plane) { + super(plane); + } + + @Override + public PanopticonPlane copy() { + return new PanopticonPlane(this); + } } class PanopticonTriggeredAbility extends TriggeredAbilityImpl { diff --git a/Mage/src/main/java/mage/game/command/planes/TazeemPlane.java b/Mage/src/main/java/mage/game/command/planes/TazeemPlane.java index 6f9ba42e1ba..db10b46e869 100644 --- a/Mage/src/main/java/mage/game/command/planes/TazeemPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/TazeemPlane.java @@ -36,7 +36,6 @@ public class TazeemPlane extends Plane { public TazeemPlane() { this.setPlaneType(Planes.PLANE_TAZEEM); - this.setExpansionSetCodeForImage("PCA"); // Creatures can't block Ability ability = new SimpleStaticAbility(Zone.COMMAND, new TazeemCantBlockAllEffect()); @@ -58,6 +57,15 @@ public class TazeemPlane extends Plane { chaosAbility.setMayActivate(TargetController.ANY); this.getAbilities().add(new SimpleStaticAbility(Zone.ALL, new PlanarDieRollCostIncreasingEffect(chaosAbility.getOriginalId()))); } + + private TazeemPlane(final TazeemPlane plane) { + super(plane); + } + + @Override + public TazeemPlane copy() { + return new TazeemPlane(this); + } } class TazeemCantBlockAllEffect extends RestrictionEffect { diff --git a/Mage/src/main/java/mage/game/command/planes/TheDarkBaronyPlane.java b/Mage/src/main/java/mage/game/command/planes/TheDarkBaronyPlane.java index ab5682e9aa4..29a2d2245dc 100644 --- a/Mage/src/main/java/mage/game/command/planes/TheDarkBaronyPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/TheDarkBaronyPlane.java @@ -39,7 +39,6 @@ public class TheDarkBaronyPlane extends Plane { public TheDarkBaronyPlane() { this.setPlaneType(Planes.PLANE_THE_DARK_BARONY); - this.setExpansionSetCodeForImage("PCA"); // Whenever a nonblack card is put into a player's graveyard from anywhere, that player loses 1 life Ability ability = new PutCardIntoGraveFromAnywhereAllTriggeredAbility(Zone.COMMAND, @@ -61,4 +60,13 @@ public class TheDarkBaronyPlane extends Plane { chaosAbility.setMayActivate(TargetController.ANY); this.getAbilities().add(new SimpleStaticAbility(Zone.ALL, new PlanarDieRollCostIncreasingEffect(chaosAbility.getOriginalId()))); } + + private TheDarkBaronyPlane(final TheDarkBaronyPlane plane) { + super(plane); + } + + @Override + public TheDarkBaronyPlane copy() { + return new TheDarkBaronyPlane(this); + } } diff --git a/Mage/src/main/java/mage/game/command/planes/TheEonFogPlane.java b/Mage/src/main/java/mage/game/command/planes/TheEonFogPlane.java index d153355cbf1..2ead0a80bbb 100644 --- a/Mage/src/main/java/mage/game/command/planes/TheEonFogPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/TheEonFogPlane.java @@ -28,7 +28,6 @@ public class TheEonFogPlane extends Plane { public TheEonFogPlane() { this.setPlaneType(Planes.PLANE_THE_EON_FOG); - this.setExpansionSetCodeForImage("PCA"); // All players miss their untap step Ability ability = new SimpleStaticAbility(Zone.COMMAND, new TheEonFogSkipUntapStepEffect(Duration.Custom, true)); @@ -50,6 +49,15 @@ public class TheEonFogPlane extends Plane { chaosAbility.setMayActivate(TargetController.ANY); this.getAbilities().add(new SimpleStaticAbility(Zone.ALL, new PlanarDieRollCostIncreasingEffect(chaosAbility.getOriginalId()))); } + + private TheEonFogPlane(final TheEonFogPlane plane) { + super(plane); + } + + @Override + public TheEonFogPlane copy() { + return new TheEonFogPlane(this); + } } class TheEonFogSkipUntapStepEffect extends ContinuousRuleModifyingEffectImpl { diff --git a/Mage/src/main/java/mage/game/command/planes/TheGreatForestPlane.java b/Mage/src/main/java/mage/game/command/planes/TheGreatForestPlane.java index 3d363d87079..5d4e1d555d7 100644 --- a/Mage/src/main/java/mage/game/command/planes/TheGreatForestPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/TheGreatForestPlane.java @@ -31,7 +31,6 @@ public class TheGreatForestPlane extends Plane { public TheGreatForestPlane() { this.setPlaneType(Planes.PLANE_THE_GREAT_FOREST); - this.setExpansionSetCodeForImage("PCA"); // Each creature assigns combat damage equal to its toughness rather than its power Ability ability = new SimpleStaticAbility(Zone.COMMAND, new TheGreatForestCombatDamageRuleEffect()); @@ -56,6 +55,15 @@ public class TheGreatForestPlane extends Plane { chaosAbility.setMayActivate(TargetController.ANY); this.getAbilities().add(new SimpleStaticAbility(Zone.ALL, new PlanarDieRollCostIncreasingEffect(chaosAbility.getOriginalId()))); } + + private TheGreatForestPlane(final TheGreatForestPlane plane) { + super(plane); + } + + @Override + public TheGreatForestPlane copy() { + return new TheGreatForestPlane(this); + } } class TheGreatForestCombatDamageRuleEffect extends ContinuousEffectImpl { diff --git a/Mage/src/main/java/mage/game/command/planes/TheZephyrMazePlane.java b/Mage/src/main/java/mage/game/command/planes/TheZephyrMazePlane.java index b46cc06d129..09cb80a6451 100644 --- a/Mage/src/main/java/mage/game/command/planes/TheZephyrMazePlane.java +++ b/Mage/src/main/java/mage/game/command/planes/TheZephyrMazePlane.java @@ -46,7 +46,6 @@ public class TheZephyrMazePlane extends Plane { public TheZephyrMazePlane() { this.setPlaneType(Planes.PLANE_THE_ZEPHYR_MAZE_FOG); - this.setExpansionSetCodeForImage("PCA"); // Creatures with flying get +2/+0 // Creatures without flying get -2/+0 @@ -76,4 +75,13 @@ public class TheZephyrMazePlane extends Plane { chaosAbility.setMayActivate(TargetController.ANY); this.getAbilities().add(new SimpleStaticAbility(Zone.ALL, new PlanarDieRollCostIncreasingEffect(chaosAbility.getOriginalId()))); } + + private TheZephyrMazePlane(final TheZephyrMazePlane plane) { + super(plane); + } + + @Override + public TheZephyrMazePlane copy() { + return new TheZephyrMazePlane(this); + } } diff --git a/Mage/src/main/java/mage/game/command/planes/TrailOfTheMageRingsPlane.java b/Mage/src/main/java/mage/game/command/planes/TrailOfTheMageRingsPlane.java index be02a597c81..8294154413c 100644 --- a/Mage/src/main/java/mage/game/command/planes/TrailOfTheMageRingsPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/TrailOfTheMageRingsPlane.java @@ -43,7 +43,6 @@ public class TrailOfTheMageRingsPlane extends Plane { public TrailOfTheMageRingsPlane() { this.setPlaneType(Planes.PLANE_TRAIL_OF_THE_MAGE_RINGS); - this.setExpansionSetCodeForImage("PCA"); // Instant and sorcery spells have rebound Ability ability = new SimpleStaticAbility(Zone.COMMAND, new TrailOfTheMageRingsReboundEffect()); @@ -64,6 +63,15 @@ public class TrailOfTheMageRingsPlane extends Plane { chaosAbility.setMayActivate(TargetController.ANY); this.getAbilities().add(new SimpleStaticAbility(Zone.ALL, new PlanarDieRollCostIncreasingEffect(chaosAbility.getOriginalId()))); } + + private TrailOfTheMageRingsPlane(final TrailOfTheMageRingsPlane plane) { + super(plane); + } + + @Override + public TrailOfTheMageRingsPlane copy() { + return new TrailOfTheMageRingsPlane(this); + } } class TrailOfTheMageRingsReboundEffect extends ContinuousEffectImpl { diff --git a/Mage/src/main/java/mage/game/command/planes/TrugaJunglePlane.java b/Mage/src/main/java/mage/game/command/planes/TrugaJunglePlane.java index f04613c19c5..50e1343be2b 100644 --- a/Mage/src/main/java/mage/game/command/planes/TrugaJunglePlane.java +++ b/Mage/src/main/java/mage/game/command/planes/TrugaJunglePlane.java @@ -34,7 +34,6 @@ public class TrugaJunglePlane extends Plane { public TrugaJunglePlane() { this.setPlaneType(Planes.PLANE_TRUGA_JUNGLE); - this.setExpansionSetCodeForImage("PCA"); SimpleStaticAbility ability = new SimpleStaticAbility(Zone.COMMAND, new ConditionalContinuousEffect( @@ -58,4 +57,13 @@ public class TrugaJunglePlane extends Plane { chaosAbility.setMayActivate(TargetController.ANY); this.getAbilities().add(new SimpleStaticAbility(Zone.ALL, new PlanarDieRollCostIncreasingEffect(chaosAbility.getOriginalId()))); } + + private TrugaJunglePlane(final TrugaJunglePlane plane) { + super(plane); + } + + @Override + public TrugaJunglePlane copy() { + return new TrugaJunglePlane(this); + } } diff --git a/Mage/src/main/java/mage/game/command/planes/TurriIslandPlane.java b/Mage/src/main/java/mage/game/command/planes/TurriIslandPlane.java index 99b658cde3e..d96e01d5c92 100644 --- a/Mage/src/main/java/mage/game/command/planes/TurriIslandPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/TurriIslandPlane.java @@ -31,7 +31,6 @@ public class TurriIslandPlane extends Plane { public TurriIslandPlane() { this.setPlaneType(Planes.PLANE_TURRI_ISLAND); - this.setExpansionSetCodeForImage("PCA"); // Creature spells cost {2} less to cast. Ability ability = new SimpleStaticAbility(Zone.COMMAND, new TurriIslandEffect(2)); @@ -52,6 +51,15 @@ public class TurriIslandPlane extends Plane { chaosAbility.setMayActivate(TargetController.ANY); this.getAbilities().add(new SimpleStaticAbility(Zone.ALL, new PlanarDieRollCostIncreasingEffect(chaosAbility.getOriginalId()))); } + + private TurriIslandPlane(final TurriIslandPlane plane) { + super(plane); + } + + @Override + public TurriIslandPlane copy() { + return new TurriIslandPlane(this); + } } class TurriIslandEffect extends CostModificationEffectImpl { diff --git a/Mage/src/main/java/mage/game/command/planes/UndercityReachesPlane.java b/Mage/src/main/java/mage/game/command/planes/UndercityReachesPlane.java index 76e463e3071..5dad69ffef4 100644 --- a/Mage/src/main/java/mage/game/command/planes/UndercityReachesPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/UndercityReachesPlane.java @@ -19,7 +19,6 @@ import mage.game.Game; import mage.game.command.Plane; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.target.Target; import mage.target.targetpointer.FixedTarget; @@ -41,7 +40,6 @@ public class UndercityReachesPlane extends Plane { public UndercityReachesPlane() { this.setPlaneType(Planes.PLANE_UNDERCITY_REACHES); - this.setExpansionSetCodeForImage("PCA"); // Whenever a creature deals combat damage to a player, its controller may draw a card. Ability ability = new UndercityReachesTriggeredAbility(); @@ -63,6 +61,15 @@ public class UndercityReachesPlane extends Plane { chaosAbility.setMayActivate(TargetController.ANY); this.getAbilities().add(new SimpleStaticAbility(Zone.ALL, new PlanarDieRollCostIncreasingEffect(chaosAbility.getOriginalId()))); } + + private UndercityReachesPlane(final UndercityReachesPlane plane) { + super(plane); + } + + @Override + public UndercityReachesPlane copy() { + return new UndercityReachesPlane(this); + } } class UndercityReachesTriggeredAbility extends TriggeredAbilityImpl { diff --git a/Mage/src/main/java/mage/game/permanent/token/ATATToken.java b/Mage/src/main/java/mage/game/permanent/token/ATATToken.java index 2be49e52ce3..eb917ab7d9d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ATATToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ATATToken.java @@ -1,22 +1,18 @@ - - package mage.game.permanent.token; import mage.MageInt; -import mage.constants.CardType; -import mage.constants.SubType; import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class ATATToken extends TokenImpl { public ATATToken() { super("AT-AT Token", "5/5 white artifact AT-AT creature tokens with \"When this creature dies, create two 1/1 white Trooper creature tokens.\""); - this.setOriginalExpansionSetCode("SWS"); this.power = new MageInt(5); this.toughness = new MageInt(5); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/AjanisPridemateToken.java b/Mage/src/main/java/mage/game/permanent/token/AjanisPridemateToken.java index 6e890792a4b..4a4df6a1502 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AjanisPridemateToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AjanisPridemateToken.java @@ -20,7 +20,6 @@ public final class AjanisPridemateToken extends TokenImpl { subtype.add(SubType.SOLDIER); power = new MageInt(2); toughness = new MageInt(2); - setOriginalExpansionSetCode("M20"); this.addAbility(new GainLifeControllerTriggeredAbility( new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false diff --git a/Mage/src/main/java/mage/game/permanent/token/AkroanSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/AkroanSoldierToken.java index 3fa3066af7b..6a7f1a154b6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AkroanSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AkroanSoldierToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -20,8 +18,6 @@ public final class AkroanSoldierToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); this.addAbility(HasteAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("THS", "UMA"); } public AkroanSoldierToken(final AkroanSoldierToken token) { @@ -31,13 +27,4 @@ public final class AkroanSoldierToken extends TokenImpl { public AkroanSoldierToken copy() { return new AkroanSoldierToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("THS")) { - this.setTokenType(3); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/Angel33Token.java b/Mage/src/main/java/mage/game/permanent/token/Angel33Token.java index 392a76dc36e..bf4026f5662 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Angel33Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Angel33Token.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -22,16 +20,6 @@ public final class Angel33Token extends TokenImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("AFR", "SNC", "OGW", "MOC"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MOC")) { - this.setTokenType(1); - } } public Angel33Token(final Angel33Token token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/AngelToken.java b/Mage/src/main/java/mage/game/permanent/token/AngelToken.java index ea36d07b9e9..3f68fa606ae 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AngelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AngelToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - public final class AngelToken extends TokenImpl { public AngelToken() { @@ -18,20 +16,6 @@ public final class AngelToken extends TokenImpl { toughness = new MageInt(4); addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("APC", "AVR", "C14", "C15", "C18", "CON", "DDQ", "GTC", - "ISD", "M14", "MM3", "NEM", "OGW", "ORI", "PC2", "SCG", "SOI", "ZEN", "C20", "M21", "CMR", "AFC", "VOC", "2XM", "IMA", "PCA", "A25", "GN3", "ONC", "MOC"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("ONC")) { - this.setTokenType(1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MOC")) { - this.setTokenType(2); - } } public AngelToken(final AngelToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/AngelVigilanceToken.java b/Mage/src/main/java/mage/game/permanent/token/AngelVigilanceToken.java index 9e8e460fb6c..6d9a899eaa8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AngelVigilanceToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AngelVigilanceToken.java @@ -6,8 +6,6 @@ import mage.abilities.keyword.VigilanceAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - public final class AngelVigilanceToken extends TokenImpl { public AngelVigilanceToken() { @@ -19,16 +17,6 @@ public final class AngelVigilanceToken extends TokenImpl { toughness = new MageInt(4); addAbility(FlyingAbility.getInstance()); addAbility(VigilanceAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("NEC", "MH1", "WAR", "GRN", "M19", "2X2", "DMC", "ONC"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("ONC")) { - this.setTokenType(2); - } } public AngelVigilanceToken(final AngelVigilanceToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/AngelWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/AngelWarriorToken.java index fbd00510921..01ce091e74e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AngelWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AngelWarriorToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - public final class AngelWarriorToken extends TokenImpl { public AngelWarriorToken() { @@ -19,8 +17,6 @@ public final class AngelWarriorToken extends TokenImpl { toughness = new MageInt(4); addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("ZNR"); } public AngelWarriorToken(final AngelWarriorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/AngelWarriorVigilanceToken.java b/Mage/src/main/java/mage/game/permanent/token/AngelWarriorVigilanceToken.java index 955d3962e3f..afbae80fce4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AngelWarriorVigilanceToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AngelWarriorVigilanceToken.java @@ -6,8 +6,6 @@ import mage.abilities.keyword.VigilanceAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - public final class AngelWarriorVigilanceToken extends TokenImpl { public AngelWarriorVigilanceToken() { @@ -21,8 +19,6 @@ public final class AngelWarriorVigilanceToken extends TokenImpl { addAbility(FlyingAbility.getInstance()); addAbility(VigilanceAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("KHM", "CLB"); } private AngelWarriorVigilanceToken(final AngelWarriorVigilanceToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/AnotherSpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/AnotherSpiritToken.java index 0d9af4c271d..d42bfaf9410 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AnotherSpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AnotherSpiritToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -21,17 +19,6 @@ public final class AnotherSpiritToken extends TokenImpl { toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("VOC"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("VOC")) { - setTokenType(2); - } } public AnotherSpiritToken(final AnotherSpiritToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ApeToken.java b/Mage/src/main/java/mage/game/permanent/token/ApeToken.java index 3bcac7031db..19c38bba45d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ApeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ApeToken.java @@ -1,14 +1,10 @@ - package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; - -import java.util.Arrays; /** - * * @author spjspj */ public final class ApeToken extends TokenImpl { @@ -20,8 +16,6 @@ public final class ApeToken extends TokenImpl { subtype.add(SubType.APE); power = new MageInt(3); toughness = new MageInt(3); - - availableImageSetCodes = Arrays.asList("C14", "2XM", "TSR"); } public ApeToken(final ApeToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ArchitectOfTheUntamedBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/ArchitectOfTheUntamedBeastToken.java index ac5a3463db2..2f877e7f147 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ArchitectOfTheUntamedBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ArchitectOfTheUntamedBeastToken.java @@ -1,13 +1,10 @@ - - package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** - * * @author spjspj */ public final class ArchitectOfTheUntamedBeastToken extends TokenImpl { @@ -19,8 +16,6 @@ public final class ArchitectOfTheUntamedBeastToken extends TokenImpl { subtype.add(SubType.BEAST); power = new MageInt(6); toughness = new MageInt(6); - - setOriginalExpansionSetCode("KLD"); } public ArchitectOfTheUntamedBeastToken(final ArchitectOfTheUntamedBeastToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ArtifactWallToken.java b/Mage/src/main/java/mage/game/permanent/token/ArtifactWallToken.java index 90b7c374752..7987966e4d7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ArtifactWallToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ArtifactWallToken.java @@ -14,7 +14,6 @@ public final class ArtifactWallToken extends TokenImpl { subtype.add(SubType.WALL); power = new MageInt(0); toughness = new MageInt(4); - setOriginalExpansionSetCode("THB"); addAbility(DefenderAbility.getInstance()); } diff --git a/Mage/src/main/java/mage/game/permanent/token/AshiokNightmareMuseToken.java b/Mage/src/main/java/mage/game/permanent/token/AshiokNightmareMuseToken.java index fde35984bd2..1be43c33bcc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AshiokNightmareMuseToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AshiokNightmareMuseToken.java @@ -31,7 +31,6 @@ public final class AshiokNightmareMuseToken extends TokenImpl { subtype.add(SubType.NIGHTMARE); power = new MageInt(2); toughness = new MageInt(3); - setOriginalExpansionSetCode("THB"); this.addAbility(new AttacksOrBlocksTriggeredAbility(new AshiokNightmareMuseTokenEffect(), false)); } diff --git a/Mage/src/main/java/mage/game/permanent/token/AshnodZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/AshnodZombieToken.java index 577ba020d3f..b90dd9c46b5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AshnodZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AshnodZombieToken.java @@ -16,8 +16,6 @@ public final class AshnodZombieToken extends TokenImpl { subtype.add(SubType.ZOMBIE); power = new MageInt(3); toughness = new MageInt(3); - - setOriginalExpansionSetCode("BRO"); } public AshnodZombieToken(final AshnodZombieToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/AssassinToken.java b/Mage/src/main/java/mage/game/permanent/token/AssassinToken.java index b77e432a346..681e5773cb0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AssassinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AssassinToken.java @@ -1,17 +1,12 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.LoseGameTargetPlayerEffect; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class AssassinToken extends TokenImpl { @@ -24,8 +19,6 @@ public final class AssassinToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new LoseGameTargetPlayerEffect(), false, true)); - - availableImageSetCodes = Arrays.asList("RTR", "DDM", "C19"); } public AssassinToken(final AssassinToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/AssassinToken2.java b/Mage/src/main/java/mage/game/permanent/token/AssassinToken2.java index ac7ddf60053..35fe6790e62 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AssassinToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/AssassinToken2.java @@ -20,8 +20,6 @@ public final class AssassinToken2 extends TokenImpl { toughness = new MageInt(1); addAbility(DeathtouchAbility.getInstance()); addAbility(new DestroyPlaneswalkerWhenDamagedTriggeredAbility()); - - setOriginalExpansionSetCode("WAR"); } private AssassinToken2(final AssassinToken2 token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/AssemblyWorkerToken.java b/Mage/src/main/java/mage/game/permanent/token/AssemblyWorkerToken.java index e80569871da..5e21229eea2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AssemblyWorkerToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AssemblyWorkerToken.java @@ -1,14 +1,10 @@ - package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; - -import java.util.Arrays; /** - * * @author spjspj */ public final class AssemblyWorkerToken extends TokenImpl { @@ -21,8 +17,6 @@ public final class AssemblyWorkerToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); - - availableImageSetCodes = Arrays.asList("ATQ", "TSR"); } public AssemblyWorkerToken(final AssemblyWorkerToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/AtlaPalaniToken.java b/Mage/src/main/java/mage/game/permanent/token/AtlaPalaniToken.java index dc5c5c393bf..47f2a42e839 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AtlaPalaniToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AtlaPalaniToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.DefenderAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -20,8 +18,6 @@ public final class AtlaPalaniToken extends TokenImpl { power = new MageInt(0); toughness = new MageInt(1); addAbility(DefenderAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("C19", "2X2", "DMC"); } private AtlaPalaniToken(final AtlaPalaniToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/AvatarToken.java b/Mage/src/main/java/mage/game/permanent/token/AvatarToken.java index 6a91016fb53..a9b79417dc6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AvatarToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AvatarToken.java @@ -6,8 +6,6 @@ import mage.abilities.effects.common.continuous.SetBasePowerToughnessSourceEffec import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -21,8 +19,6 @@ public final class AvatarToken extends TokenImpl { this.addAbility(new SimpleStaticAbility(new SetBasePowerToughnessSourceEffect( ControllerLifeCount.instance ).setText("this creature's power and toughness are each equal to your life total"))); - - availableImageSetCodes = Arrays.asList("LRW", "M10", "M11"); } public AvatarToken(final AvatarToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/AvatarToken2.java b/Mage/src/main/java/mage/game/permanent/token/AvatarToken2.java index 0991b40f9bc..0f7993a1d8b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AvatarToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/AvatarToken2.java @@ -14,7 +14,6 @@ public final class AvatarToken2 extends TokenImpl { subtype.add(SubType.AVATAR); power = new MageInt(4); toughness = new MageInt(4); - setOriginalExpansionSetCode("M19"); addAbility(FlyingAbility.getInstance()); } diff --git a/Mage/src/main/java/mage/game/permanent/token/BadgerToken.java b/Mage/src/main/java/mage/game/permanent/token/BadgerToken.java index dd4b27d094f..eb0a18029c4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BadgerToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BadgerToken.java @@ -14,7 +14,6 @@ public final class BadgerToken extends TokenImpl { subtype.add(SubType.BADGER); power = new MageInt(3); toughness = new MageInt(3); - setOriginalExpansionSetCode("DMC"); } public BadgerToken(final BadgerToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/BananaToken.java b/Mage/src/main/java/mage/game/permanent/token/BananaToken.java index ae106a32d8c..19aa44e44fa 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BananaToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BananaToken.java @@ -7,8 +7,6 @@ import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.RedManaAbility; import mage.constants.CardType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -27,8 +25,6 @@ public final class BananaToken extends TokenImpl { ability.addCost(new SacrificeSourceCost().setText("sacrifice this artifact")); ability.addEffect(new GainLifeEffect(2)); this.addAbility(ability); - - availableImageSetCodes = Arrays.asList("J22"); } public BananaToken(final BananaToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/BatToken.java b/Mage/src/main/java/mage/game/permanent/token/BatToken.java index cf877f8c863..053b34dafbe 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BatToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - public final class BatToken extends TokenImpl { public BatToken() { @@ -17,8 +15,6 @@ public final class BatToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("C17", "GVL", "MMA", "M19", "MID", "VOC", "GK2"); } public BatToken(final BatToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/BearToken.java b/Mage/src/main/java/mage/game/permanent/token/BearToken.java index 19e2c0bb3b3..34994cc4d81 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BearToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BearToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author BetaSteward_at_googlemail.com */ @@ -18,8 +16,6 @@ public final class BearToken extends TokenImpl { subtype.add(SubType.BEAR); power = new MageInt(2); toughness = new MageInt(2); - - availableImageSetCodes = Arrays.asList("C15", "JUD", "ODY", "VMA", "MH1", "ELD", "KHM", "DMC", "BRO"); } public BearToken(final BearToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/BearsCompanionBearToken.java b/Mage/src/main/java/mage/game/permanent/token/BearsCompanionBearToken.java index b9cb00e49d1..4402caac488 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BearsCompanionBearToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BearsCompanionBearToken.java @@ -1,14 +1,10 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; - -import java.util.Arrays; /** - * * @author spjspj */ public final class BearsCompanionBearToken extends TokenImpl { @@ -20,9 +16,8 @@ public final class BearsCompanionBearToken extends TokenImpl { subtype.add(SubType.BEAR); power = new MageInt(4); toughness = new MageInt(4); - - availableImageSetCodes = Arrays.asList("KTK", "2X2"); } + public BearsCompanionBearToken(final BearsCompanionBearToken token) { super(token); } diff --git a/Mage/src/main/java/mage/game/permanent/token/BeastToken.java b/Mage/src/main/java/mage/game/permanent/token/BeastToken.java index a67d13f7620..b14fafd1152 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken.java @@ -3,9 +3,6 @@ package mage.game.permanent.token; import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.util.RandomUtil; - -import java.util.Arrays; /** * @author BetaSteward_at_googlemail.com @@ -19,41 +16,6 @@ public final class BeastToken extends TokenImpl { subtype.add(SubType.BEAST); power = new MageInt(3); toughness = new MageInt(3); - - availableImageSetCodes = Arrays.asList("C14", "C16", "C19", "CMA", "CN2", "GVL", - "DD3GVL", "DDD", "DDL", "DST", "E01", "EVE", "LRW", "M10", "M11", "M12", - "M13", "M14", "M15", "MM3", "NPH", "PC2", "USG", "M19", "IKO", "M21", "CMR", "C21", - "AFC", "MIC", "NEC", "2XM", "NCC", "BBD", "PCA", "CLB", "DMU", "ONC", "30A"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("M15")) { - this.setTokenType(2); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("GVL")) { - this.setTokenType(1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C19")) { - this.setTokenType(1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MM3")) { - setTokenType(1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("CMA")) { - setTokenType(1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("DDD")) { - setTokenType(1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("E01")) { - setTokenType(1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C21")) { - setTokenType(1); - } } public BeastToken(final BeastToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java b/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java index 47ab0889dca..44280617c03 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author LoneFox */ @@ -18,9 +16,6 @@ public final class BeastToken2 extends TokenImpl { subtype.add(SubType.BEAST); power = new MageInt(4); toughness = new MageInt(4); - - availableImageSetCodes = Arrays.asList("C14", "C15", "C18", "C19", "CMA", "GVL", "DDD", - "E01", "ODY", "SCG", "ZEN", "C20", "ZNC", "CMR", "C21", "MH2", "MID", "IMA", "MM3", "DDS", "MOC"); } public BeastToken2(final BeastToken2 token) { @@ -31,49 +26,4 @@ public final class BeastToken2 extends TokenImpl { public BeastToken2 copy() { return new BeastToken2(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C14")) { - this.setTokenType(2); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C18")) { - this.setTokenType(1); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C19")) { - this.setTokenType(2); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("CMA")) { - this.setTokenType(2); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("DDD")) { - this.setTokenType(2); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("E01")) { - this.setTokenType(2); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("CMR")) { - this.setTokenType(2); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C21")) { - this.setTokenType(2); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("GVL")) { - this.setTokenType(2); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MM3")) { - this.setTokenType(2); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/BeastToken3.java b/Mage/src/main/java/mage/game/permanent/token/BeastToken3.java index 2f30bfcb59a..aa0428a3703 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeastToken3.java +++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken3.java @@ -1,4 +1,3 @@ - package mage.game.permanent.token; import mage.MageInt; @@ -6,22 +5,12 @@ import mage.constants.CardType; import mage.constants.SubType; /** - * * @author fireshoes */ public final class BeastToken3 extends TokenImpl { public BeastToken3() { - this(null, 0); - } - - public BeastToken3(String setCode) { - this(setCode, 0); - } - - public BeastToken3(String setCode, int tokenType) { super("Beast Token", "4/2 green Beast creature token"); - setOriginalExpansionSetCode("AKH"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.BEAST); diff --git a/Mage/src/main/java/mage/game/permanent/token/BeastToken4.java b/Mage/src/main/java/mage/game/permanent/token/BeastToken4.java index e43290ac9a9..a64a7a0745c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeastToken4.java +++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken4.java @@ -1,4 +1,3 @@ - package mage.game.permanent.token; import mage.MageInt; @@ -7,22 +6,12 @@ import mage.constants.SubType; /** - * * @author BetaSteward_at_googlemail.com */ public final class BeastToken4 extends TokenImpl { public BeastToken4() { - this(null, 0); - } - - public BeastToken4(String setCode) { - this(setCode, 0); - } - - public BeastToken4(String setCode, int tokenType) { super("Beast Token", "2/2 green Beast creature token"); - setOriginalExpansionSetCode(setCode != null ? setCode : "EXO"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.BEAST); diff --git a/Mage/src/main/java/mage/game/permanent/token/BelzenlokClericToken.java b/Mage/src/main/java/mage/game/permanent/token/BelzenlokClericToken.java index 810d61bbbd2..07dcff2654e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BelzenlokClericToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BelzenlokClericToken.java @@ -1,27 +1,16 @@ - package mage.game.permanent.token; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; /** - * * @author spjspj */ public final class BelzenlokClericToken extends TokenImpl { - static final private List tokenImageSets = new ArrayList<>(); - static { - tokenImageSets.addAll(Arrays.asList("DOM")); - } - public BelzenlokClericToken() { super("Cleric Token", "0/1 black Cleric creature token"); - availableImageSetCodes = tokenImageSets; cardType.add(CardType.CREATURE); subtype.add(SubType.CLERIC); color.setBlack(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java b/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java index e88e03913c8..9151a2b4f11 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java @@ -17,8 +17,6 @@ import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.players.Player; -import java.util.Arrays; - /** * @author LoneFox */ @@ -35,8 +33,6 @@ public final class BelzenlokDemonToken extends TokenImpl { addAbility(FlyingAbility.getInstance()); addAbility(TrampleAbility.getInstance()); addAbility(new BeginningOfUpkeepTriggeredAbility(new BelzenlokDemonTokenEffect(), TargetController.YOU, false)); - - availableImageSetCodes = Arrays.asList("DOM", "MOC"); } public BelzenlokDemonToken(final BelzenlokDemonToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/BiogenicOozeToken.java b/Mage/src/main/java/mage/game/permanent/token/BiogenicOozeToken.java index 7e85f4f6b54..b1f5c211458 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BiogenicOozeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BiogenicOozeToken.java @@ -13,7 +13,6 @@ public final class BiogenicOozeToken extends TokenImpl { color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - setOriginalExpansionSetCode("RNA"); } public BiogenicOozeToken(final BiogenicOozeToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/BirdIllusionToken.java b/Mage/src/main/java/mage/game/permanent/token/BirdIllusionToken.java index 721886caa6f..88f27a6cdeb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BirdIllusionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BirdIllusionToken.java @@ -1,15 +1,11 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author TheElk801 */ public final class BirdIllusionToken extends TokenImpl { @@ -23,8 +19,6 @@ public final class BirdIllusionToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("GRN", "C20", "GN3"); } public BirdIllusionToken(final BirdIllusionToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/BirdSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/BirdSoldierToken.java index 2c9f71c8e3b..a9c6c73ccc0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BirdSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BirdSoldierToken.java @@ -1,26 +1,23 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class BirdSoldierToken extends TokenImpl { public BirdSoldierToken() { - super("Bird Soldier Token","1/1 white Bird Soldier creature token with flying"); + super("Bird Soldier Token", "1/1 white Bird Soldier creature token with flying"); cardType.add(CardType.CREATURE); subtype.add(SubType.BIRD); color.setWhite(true); power = new MageInt(1); toughness = new MageInt(1); - setOriginalExpansionSetCode("ARB"); addAbility(FlyingAbility.getInstance()); } diff --git a/Mage/src/main/java/mage/game/permanent/token/BirdToken.java b/Mage/src/main/java/mage/game/permanent/token/BirdToken.java index 22794f103be..4f6319b6295 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BirdToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author LoneFox */ @@ -21,9 +19,6 @@ public final class BirdToken extends TokenImpl { toughness = new MageInt(1); addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("BNG", "CSP", "JUD", "MM3", "RTR", "VMA", "ZEN", - "MH1", "C16", "C20", "M21", "ZNC", "KHC", "MH2", "IMA", "CM2", "DMU", "DMR", "ONC", "MOC"); } public BirdToken(final BirdToken token) { @@ -34,19 +29,4 @@ public final class BirdToken extends TokenImpl { public BirdToken copy() { return new BirdToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C16")) { - setTokenType(2); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("BNG")) { - setTokenType(2); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("DMU")) { - setTokenType(2); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/BlackAstartesWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/BlackAstartesWarriorToken.java index 8ca916a8c0c..c3eece6c038 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BlackAstartesWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BlackAstartesWarriorToken.java @@ -1,12 +1,10 @@ package mage.game.permanent.token; import mage.MageInt; +import mage.abilities.keyword.MenaceAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; -import mage.abilities.keyword.MenaceAbility; - /** * @author TheElk801 */ @@ -21,9 +19,6 @@ public final class BlackAstartesWarriorToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); addAbility(new MenaceAbility()); - - availableImageSetCodes.addAll(Arrays.asList("40K")); - this.setTokenType(1); } public BlackAstartesWarriorToken(final BlackAstartesWarriorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/BlackBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/BlackBirdToken.java index 72e9811862b..8b10d514c37 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BlackBirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BlackBirdToken.java @@ -7,7 +7,6 @@ import mage.constants.CardType; import mage.constants.SubType; /** - * * @author weirddan455 */ public final class BlackBirdToken extends TokenImpl { @@ -19,7 +18,6 @@ public final class BlackBirdToken extends TokenImpl { subtype.add(SubType.BIRD); power = new MageInt(1); toughness = new MageInt(1); - setOriginalExpansionSetCode("DMU"); addAbility(FlyingAbility.getInstance()); addAbility(new CantBlockAbility()); @@ -33,13 +31,4 @@ public final class BlackBirdToken extends TokenImpl { public BlackBirdToken copy() { return new BlackBirdToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("DMU")) { - setTokenType(1); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/BlackGreenWormToken.java b/Mage/src/main/java/mage/game/permanent/token/BlackGreenWormToken.java index 35175c0cdc8..f39e03eab89 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BlackGreenWormToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BlackGreenWormToken.java @@ -1,14 +1,10 @@ - package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; - -import java.util.Arrays; /** - * * @author spjspj */ public final class BlackGreenWormToken extends TokenImpl { @@ -21,8 +17,6 @@ public final class BlackGreenWormToken extends TokenImpl { subtype.add(SubType.WORM); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("EVE", "MMA", "MM2", "C16", "C18", "2X2"); } public BlackGreenWormToken(final BlackGreenWormToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/BloodAvatarToken.java b/Mage/src/main/java/mage/game/permanent/token/BloodAvatarToken.java index c0df76bf865..c6e915f4e31 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BloodAvatarToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BloodAvatarToken.java @@ -8,8 +8,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -29,8 +27,6 @@ public final class BloodAvatarToken extends TokenImpl { new DamagePlayersEffect(3, TargetController.OPPONENT), false, "Whenever this creature attacks, it deals 3 damage to each opponent." )); - - availableImageSetCodes = Arrays.asList("STX"); } private BloodAvatarToken(final BloodAvatarToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/BloodToken.java b/Mage/src/main/java/mage/game/permanent/token/BloodToken.java index a3c884f8e81..0ce152d4f2f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BloodToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BloodToken.java @@ -10,8 +10,6 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -30,8 +28,6 @@ public final class BloodToken extends TokenImpl { ability.addCost(new DiscardCardCost()); ability.addCost(new SacrificeSourceCost().setText("Sacrifice this artifact")); this.addAbility(ability); - - availableImageSetCodes = Arrays.asList("VOW", "MOC"); } public BloodToken(final BloodToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/BlueBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/BlueBirdToken.java index 80944459b8d..73a2a5d8c02 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BlueBirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BlueBirdToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -21,8 +19,6 @@ public final class BlueBirdToken extends TokenImpl { toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("EVE", "INV", "KHM", "30A"); } public BlueBirdToken(final BlueBirdToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/BlueHorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/BlueHorrorToken.java index 59a7169470f..e8ec0466d30 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BlueHorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BlueHorrorToken.java @@ -29,8 +29,6 @@ public final class BlueHorrorToken extends TokenImpl { ); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); - - this.setExpansionSetCodeForImage("40K"); } public BlueHorrorToken(final BlueHorrorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/Boar2Token.java b/Mage/src/main/java/mage/game/permanent/token/Boar2Token.java index 6447191600d..7f0b6197ac4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Boar2Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Boar2Token.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -18,8 +16,6 @@ public final class Boar2Token extends TokenImpl { subtype.add(SubType.BOAR); power = new MageInt(2); toughness = new MageInt(2); - - availableImageSetCodes = Arrays.asList("THS", "KHC", "C21", "CLB"); } public Boar2Token(final Boar2Token token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/Boar3Token.java b/Mage/src/main/java/mage/game/permanent/token/Boar3Token.java index b2b1f8987b3..4ffd686010a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Boar3Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Boar3Token.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -18,8 +16,6 @@ public final class Boar3Token extends TokenImpl { subtype.add(SubType.BOAR); power = new MageInt(3); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("VOW"); } public Boar3Token(final Boar3Token token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/BoarToken.java b/Mage/src/main/java/mage/game/permanent/token/BoarToken.java index 20e475b2a53..bc3a8f3e00a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BoarToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BoarToken.java @@ -1,14 +1,10 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; - -import java.util.Arrays; /** - * * @author spjspj */ public final class BoarToken extends TokenImpl { @@ -20,8 +16,6 @@ public final class BoarToken extends TokenImpl { subtype.add(SubType.BOAR); power = new MageInt(3); toughness = new MageInt(3); - - availableImageSetCodes = Arrays.asList("PCA", "2X2"); } public BoarToken(final BoarToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/BooToken.java b/Mage/src/main/java/mage/game/permanent/token/BooToken.java index ed595342ce6..d54ed52c410 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BooToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BooToken.java @@ -7,8 +7,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -25,8 +23,6 @@ public final class BooToken extends TokenImpl { addAbility(TrampleAbility.getInstance()); addAbility(HasteAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("AFR", "CLB"); } private BooToken(final BooToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/BreedingPitThrullToken.java b/Mage/src/main/java/mage/game/permanent/token/BreedingPitThrullToken.java index fd207d7041a..479963c4a40 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BreedingPitThrullToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BreedingPitThrullToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -18,8 +16,6 @@ public final class BreedingPitThrullToken extends TokenImpl { color.setBlack(true); power = new MageInt(0); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("CMR", "DDC", "DVD"); } public BreedingPitThrullToken(final BreedingPitThrullToken token) { @@ -29,9 +25,4 @@ public final class BreedingPitThrullToken extends TokenImpl { public BreedingPitThrullToken copy() { return new BreedingPitThrullToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/BrudicladTelchorMyrToken.java b/Mage/src/main/java/mage/game/permanent/token/BrudicladTelchorMyrToken.java index 80e98944c3a..7241861f4c2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BrudicladTelchorMyrToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BrudicladTelchorMyrToken.java @@ -4,18 +4,8 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - public final class BrudicladTelchorMyrToken extends TokenImpl { - static final private List tokenImageSets = new ArrayList<>(); - - static { - tokenImageSets.addAll(Arrays.asList("C18", "2XM", "BRC")); - } - public BrudicladTelchorMyrToken() { super("Phyrexian Myr Token", "2/1 blue Phyrexian Myr artifact creature token"); cardType.add(CardType.CREATURE); @@ -25,8 +15,6 @@ public final class BrudicladTelchorMyrToken extends TokenImpl { color.setBlue(true); power = new MageInt(2); toughness = new MageInt(1); - - availableImageSetCodes = tokenImageSets; } public BrudicladTelchorMyrToken(final BrudicladTelchorMyrToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ButterflyToken.java b/Mage/src/main/java/mage/game/permanent/token/ButterflyToken.java index 0d1d5af3f8e..ddf328655ed 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ButterflyToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ButterflyToken.java @@ -1,13 +1,11 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class ButterflyToken extends TokenImpl { @@ -20,8 +18,6 @@ public final class ButterflyToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); addAbility(FlyingAbility.getInstance()); - - this.setExpansionSetCodeForImage("MOC"); } public ButterflyToken(final ButterflyToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/CallTheSkyBreakerElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/CallTheSkyBreakerElementalToken.java index f18d24e7768..01232e7c424 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CallTheSkyBreakerElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CallTheSkyBreakerElementalToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -22,21 +20,6 @@ public final class CallTheSkyBreakerElementalToken extends TokenImpl { toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("C15", "EMA", "EVE", "C21", "NCC"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("EMA")) { - setTokenType(2); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("NCC")) { - setTokenType(2); - } } public CallTheSkyBreakerElementalToken(final CallTheSkyBreakerElementalToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/CamaridToken.java b/Mage/src/main/java/mage/game/permanent/token/CamaridToken.java index 2d553940761..72dcf6a8775 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CamaridToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CamaridToken.java @@ -1,4 +1,3 @@ - package mage.game.permanent.token; import mage.MageInt; @@ -6,14 +5,12 @@ import mage.constants.CardType; import mage.constants.SubType; /** - * * @author spjspj */ public final class CamaridToken extends TokenImpl { public CamaridToken() { super("Camarid Token", "1/1 blue Camarid creature tokens"); - this.setOriginalExpansionSetCode("FEM"); this.power = new MageInt(1); this.toughness = new MageInt(1); this.color.setBlue(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/CarnivoreToken.java b/Mage/src/main/java/mage/game/permanent/token/CarnivoreToken.java index 2cc3b02c53b..1b380c96727 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CarnivoreToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CarnivoreToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -18,8 +16,6 @@ public final class CarnivoreToken extends TokenImpl { subtype.add(SubType.BEAST); power = new MageInt(3); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("EMA"); } public CarnivoreToken(final CarnivoreToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/CatBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/CatBeastToken.java index cb4e48d488e..9b2ef6ad067 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatBeastToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -19,8 +17,6 @@ public final class CatBeastToken extends TokenImpl { subtype.add(SubType.BEAST); power = new MageInt(2); toughness = new MageInt(2); - - availableImageSetCodes = Arrays.asList("ZNR", "NCC"); } public CatBeastToken(final CatBeastToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/CatBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/CatBirdToken.java index b212d15e0e0..53f893bbbed 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatBirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatBirdToken.java @@ -19,7 +19,6 @@ public final class CatBirdToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); addAbility(FlyingAbility.getInstance()); - setOriginalExpansionSetCode("IKO"); } private CatBirdToken(final CatBirdToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/CatHasteToken.java b/Mage/src/main/java/mage/game/permanent/token/CatHasteToken.java index af6b90b825f..b2f67dd8070 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatHasteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatHasteToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -21,8 +19,6 @@ public final class CatHasteToken extends TokenImpl { toughness = new MageInt(2); this.addAbility(HasteAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("SNC"); } private CatHasteToken(final CatHasteToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/CatSoldierCreatureToken.java b/Mage/src/main/java/mage/game/permanent/token/CatSoldierCreatureToken.java index 3eb45d336b1..d64d8f459e4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatSoldierCreatureToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatSoldierCreatureToken.java @@ -1,4 +1,3 @@ - package mage.game.permanent.token; import mage.MageInt; @@ -7,7 +6,6 @@ import mage.constants.CardType; import mage.constants.SubType; /** - * * @author LevelX2 */ public final class CatSoldierCreatureToken extends TokenImpl { @@ -16,14 +14,13 @@ public final class CatSoldierCreatureToken extends TokenImpl { super("Cat Soldier Token", "1/1 white Cat Soldier creature token with vigilance"); cardType.add(CardType.CREATURE); color.setWhite(true); - + subtype.add(SubType.CAT); subtype.add(SubType.SOLDIER); power = new MageInt(1); toughness = new MageInt(1); - + this.addAbility(VigilanceAbility.getInstance()); - this.setOriginalExpansionSetCode("BNG"); } public CatSoldierCreatureToken(final CatSoldierCreatureToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/CatToken.java b/Mage/src/main/java/mage/game/permanent/token/CatToken.java index 1d8ba8cf9bd..1996ace044f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author LoneFox */ @@ -18,8 +16,6 @@ public final class CatToken extends TokenImpl { subtype.add(SubType.CAT); power = new MageInt(2); toughness = new MageInt(2); - - availableImageSetCodes = Arrays.asList("PMEI", "C14", "C15", "C17", "C18", "M13", "M14", "SOM", "CMR", "2XM", "ONE"); } public CatToken(final CatToken token) { @@ -29,9 +25,4 @@ public final class CatToken extends TokenImpl { public CatToken copy() { return new CatToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/CatToken2.java b/Mage/src/main/java/mage/game/permanent/token/CatToken2.java index 253164b9a8d..73f3f2b903e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatToken2.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.LifelinkAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author fireshoes */ @@ -20,8 +18,6 @@ public final class CatToken2 extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); addAbility(LifelinkAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("AKH", "M19", "IKO"); } public CatToken2(final CatToken2 token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/CatToken3.java b/Mage/src/main/java/mage/game/permanent/token/CatToken3.java index 07f26b40588..d7eabbd8353 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatToken3.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatToken3.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -18,8 +16,6 @@ public final class CatToken3 extends TokenImpl { subtype.add(SubType.CAT); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("ZNR"); } private CatToken3(final CatToken3 token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java index 2de0e79e6f9..54d92934b5f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java @@ -1,17 +1,15 @@ - - package mage.game.permanent.token; + +import mage.MageInt; +import mage.abilities.keyword.ForestwalkAbility; +import mage.constants.CardType; +import mage.constants.SubType; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import mage.MageInt; -import mage.constants.CardType; -import mage.abilities.keyword.ForestwalkAbility; -import mage.constants.SubType; - /** - * * @author spjspj */ public final class CatWarriorToken extends TokenImpl { @@ -24,7 +22,6 @@ public final class CatWarriorToken extends TokenImpl { public CatWarriorToken() { super("Cat Warrior Token", "2/2 green Cat Warrior creature token with forestwalk"); - availableImageSetCodes = tokenImageSets; this.power = new MageInt(2); this.toughness = new MageInt(2); this.color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/CentaurEnchantmentCreatureToken.java b/Mage/src/main/java/mage/game/permanent/token/CentaurEnchantmentCreatureToken.java index 036f1cb52b1..461d1f9175c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CentaurEnchantmentCreatureToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CentaurEnchantmentCreatureToken.java @@ -1,4 +1,3 @@ - package mage.game.permanent.token; import mage.MageInt; @@ -6,7 +5,6 @@ import mage.constants.CardType; import mage.constants.SubType; /** - * * @author LevelX2 */ public final class CentaurEnchantmentCreatureToken extends TokenImpl { @@ -19,7 +17,6 @@ public final class CentaurEnchantmentCreatureToken extends TokenImpl { subtype.add(SubType.CENTAUR); power = new MageInt(3); toughness = new MageInt(3); - this.setOriginalExpansionSetCode("BNG"); } public CentaurEnchantmentCreatureToken(final CentaurEnchantmentCreatureToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java b/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java index 6737e615009..7119c783566 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java @@ -3,9 +3,6 @@ package mage.game.permanent.token; import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.util.RandomUtil; - -import java.util.Arrays; /** * @author LevelX2 @@ -19,8 +16,6 @@ public final class CentaurToken extends TokenImpl { subtype.add(SubType.CENTAUR); power = new MageInt(3); toughness = new MageInt(3); - - availableImageSetCodes = Arrays.asList("C19", "RTR", "RNA", "MIC", "MM3", "GK1"); } public CentaurToken(final CentaurToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ChainersTormentNightmareToken.java b/Mage/src/main/java/mage/game/permanent/token/ChainersTormentNightmareToken.java index 0c30eee4f59..3613bfaf39f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ChainersTormentNightmareToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ChainersTormentNightmareToken.java @@ -1,32 +1,33 @@ - package mage.game.permanent.token; +import mage.MageInt; +import mage.constants.CardType; +import mage.constants.SubType; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.MageInt; /** - * * @author spjspj */ public final class ChainersTormentNightmareToken extends TokenImpl { static final private List tokenImageSets = new ArrayList<>(); + static { tokenImageSets.addAll(Arrays.asList("DOM")); } - public ChainersTormentNightmareToken() { this(0); }; + public ChainersTormentNightmareToken() { + this(0); + } + + ; public ChainersTormentNightmareToken(int xValue) { super("Nightmare Horror Token", "X/X black Nightmare Horror creature token"); - - availableImageSetCodes = tokenImageSets; - setOriginalExpansionSetCode("DOM"); - + cardType.add(CardType.CREATURE); subtype.add(SubType.NIGHTMARE); subtype.add(SubType.HORROR); diff --git a/Mage/src/main/java/mage/game/permanent/token/CherubaelToken.java b/Mage/src/main/java/mage/game/permanent/token/CherubaelToken.java index 30d23e35d4e..268baf3d0f5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CherubaelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CherubaelToken.java @@ -20,8 +20,6 @@ public final class CherubaelToken extends TokenImpl { power = new MageInt(4); toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); - - this.setExpansionSetCodeForImage("40K"); } public CherubaelToken(final CherubaelToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/CitizenGreenWhiteToken.java b/Mage/src/main/java/mage/game/permanent/token/CitizenGreenWhiteToken.java index dc6b66e29ba..ada27037d0b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CitizenGreenWhiteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CitizenGreenWhiteToken.java @@ -3,7 +3,6 @@ package mage.game.permanent.token; import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; /** * @author TheElk801 @@ -19,8 +18,6 @@ public final class CitizenGreenWhiteToken extends TokenImpl { subtype.add(SubType.CITIZEN); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("SNC"); } private CitizenGreenWhiteToken(final CitizenGreenWhiteToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/CitizenToken.java b/Mage/src/main/java/mage/game/permanent/token/CitizenToken.java index be7ee81d835..b315f00e3c2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CitizenToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CitizenToken.java @@ -1,29 +1,22 @@ - - package mage.game.permanent.token; import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** - * * @author Quercitron */ public final class CitizenToken extends TokenImpl { - + public CitizenToken() { super("Citizen Token", "1/1 white Citizen creature token"); cardType.add(CardType.CREATURE); color.setWhite(true); - + subtype.add(SubType.CITIZEN); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("UMA"); } public CitizenToken(final CitizenToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/CloudSpriteToken.java b/Mage/src/main/java/mage/game/permanent/token/CloudSpriteToken.java index 4794f24207d..11a063dfe02 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CloudSpriteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CloudSpriteToken.java @@ -1,16 +1,12 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.common.CanBlockOnlyFlyingAbility; import mage.abilities.keyword.FlyingAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class CloudSpriteToken extends TokenImpl { @@ -28,8 +24,6 @@ public final class CloudSpriteToken extends TokenImpl { // Cloud Sprite can block only creatures with flying. this.addAbility(new CanBlockOnlyFlyingAbility()); - - availableImageSetCodes = Arrays.asList("TSR"); } public CloudSpriteToken(final CloudSpriteToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ClueArtifactToken.java b/Mage/src/main/java/mage/game/permanent/token/ClueArtifactToken.java index 9cf37967299..f0d31bef99b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ClueArtifactToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ClueArtifactToken.java @@ -8,9 +8,6 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.util.RandomUtil; - -import java.util.Arrays; /** * @@ -28,25 +25,6 @@ public final class ClueArtifactToken extends TokenImpl { cost.setText("Sacrifice this artifact"); ability.addCost(cost); this.addAbility(ability); - - availableImageSetCodes = Arrays.asList("C18", "SOI", "MH2", "AFC", "MID", "VOC", "SLD", "2XM", "NCC", "CLB", "40K", "30A", "MOC"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode().equals("SOI")) { - this.setTokenType(RandomUtil.nextInt(6) + 1); // 6 different images - } - - if (getOriginalExpansionSetCode().equals("MH2")) { - this.setTokenType(RandomUtil.nextInt(2) + 1); // 2 different images - } - - if (getOriginalExpansionSetCode().equals("30A")) { - this.setTokenType(RandomUtil.nextInt(2) + 1); // 2 different images - } } public ClueArtifactToken(final ClueArtifactToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/CommodoreGuffToken.java b/Mage/src/main/java/mage/game/permanent/token/CommodoreGuffToken.java index d5a37cd90b7..00ab29fb2fb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CommodoreGuffToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CommodoreGuffToken.java @@ -23,8 +23,6 @@ public final class CommodoreGuffToken extends TokenImpl { toughness = new MageInt(1); this.addAbility(new ConditionalColoredManaAbility(Mana.RedMana(1), new CommodoreGuffTokenManaBuilder())); - - setOriginalExpansionSetCode("CMM"); } private CommodoreGuffToken(final CommodoreGuffToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/Construct2Token.java b/Mage/src/main/java/mage/game/permanent/token/Construct2Token.java index 7feedee8bff..b42294a1c23 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Construct2Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Construct2Token.java @@ -5,7 +5,6 @@ import mage.constants.CardType; import mage.constants.SubType; /** - * * @author weirddan455 */ public class Construct2Token extends TokenImpl { @@ -17,9 +16,6 @@ public class Construct2Token extends TokenImpl { subtype.add(SubType.CONSTRUCT); power = new MageInt(2); toughness = new MageInt(2); - - this.setExpansionSetCodeForImage("BRO"); - this.setTokenType(2); } private Construct2Token(final Construct2Token token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/Construct4Token.java b/Mage/src/main/java/mage/game/permanent/token/Construct4Token.java index 0a669a4a569..f8514eef4fa 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Construct4Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Construct4Token.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -18,8 +16,6 @@ public final class Construct4Token extends TokenImpl { subtype.add(SubType.CONSTRUCT); power = new MageInt(4); toughness = new MageInt(4); - - availableImageSetCodes.addAll(Arrays.asList("C18", "M21")); } public Construct4Token(final Construct4Token token) { @@ -29,13 +25,4 @@ public final class Construct4Token extends TokenImpl { public Construct4Token copy() { return new Construct4Token(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C18")) { - this.setTokenType(1); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/ConstructRedToken.java b/Mage/src/main/java/mage/game/permanent/token/ConstructRedToken.java index b0853ba5007..f9466f0ea6f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ConstructRedToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ConstructRedToken.java @@ -19,16 +19,6 @@ public final class ConstructRedToken extends TokenImpl { power = new MageInt(3); toughness = new MageInt(1); addAbility(HasteAbility.getInstance()); - setOriginalExpansionSetCode("NEO"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("NEO")) { - setTokenType(2); - } } public ConstructRedToken(final ConstructRedToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ConstructToken.java b/Mage/src/main/java/mage/game/permanent/token/ConstructToken.java index 66d9c676e75..58abc379555 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ConstructToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ConstructToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -18,17 +16,6 @@ public final class ConstructToken extends TokenImpl { subtype.add(SubType.CONSTRUCT); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("ZNR", "NEO", "CLB", "BRC"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("NEO")) { - setTokenType(1); - } } public ConstructToken(final ConstructToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ConsumingBlobOozeToken.java b/Mage/src/main/java/mage/game/permanent/token/ConsumingBlobOozeToken.java index 38b9fb7deab..6f39c1ed03f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ConsumingBlobOozeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ConsumingBlobOozeToken.java @@ -9,8 +9,6 @@ import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.continuous.SetBasePowerToughnessSourceEffect; import mage.constants.*; -import java.util.Arrays; - /** * @author ciaccona007 */ @@ -34,8 +32,6 @@ public final class ConsumingBlobOozeToken extends TokenImpl { new SetBasePowerToughnessSourceEffect(powerValue, toughnessValue, Duration.EndOfGame, SubLayer.CharacteristicDefining_7a) .setText("{this}'s power is equal to the number of creature cards in all graveyards and its toughness is equal to that number plus 1") )); - - availableImageSetCodes.addAll(Arrays.asList("MID")); } private ConsumingBlobOozeToken(final ConsumingBlobOozeToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/CorpseweftZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/CorpseweftZombieToken.java index b98ea1e8d63..8cdbf438f00 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CorpseweftZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CorpseweftZombieToken.java @@ -1,18 +1,16 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** - * * @author spjspj */ public final class CorpseweftZombieToken extends TokenImpl { public CorpseweftZombieToken() { - this(2,2); + this(2, 2); } public CorpseweftZombieToken(int power, int toughness) { @@ -23,7 +21,6 @@ public final class CorpseweftZombieToken extends TokenImpl { color.setBlack(true); this.power = new MageInt(power); this.toughness = new MageInt(toughness); - setOriginalExpansionSetCode("DTK"); } public CorpseweftZombieToken(final CorpseweftZombieToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/CrabToken.java b/Mage/src/main/java/mage/game/permanent/token/CrabToken.java index a420a68a50b..cfa35eb13ef 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CrabToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CrabToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -18,8 +16,6 @@ public final class CrabToken extends TokenImpl { subtype.add(SubType.CRAB); power = new MageInt(0); toughness = new MageInt(3); - - availableImageSetCodes = Arrays.asList("MH2"); } public CrabToken(final CrabToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/CrestedSunmareToken.java b/Mage/src/main/java/mage/game/permanent/token/CrestedSunmareToken.java index 821ec5eb8c1..44760b2dc9a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CrestedSunmareToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CrestedSunmareToken.java @@ -1,12 +1,10 @@ - package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** - * * @author spjspj */ public final class CrestedSunmareToken extends TokenImpl { @@ -18,7 +16,6 @@ public final class CrestedSunmareToken extends TokenImpl { color.setWhite(true); subtype.add(SubType.HORSE); cardType.add(CardType.CREATURE); - setOriginalExpansionSetCode("HOU"); } public CrestedSunmareToken(final CrestedSunmareToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/CribSwapShapeshifterWhiteToken.java b/Mage/src/main/java/mage/game/permanent/token/CribSwapShapeshifterWhiteToken.java index 0dcad4637a0..737dcb4a776 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CribSwapShapeshifterWhiteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CribSwapShapeshifterWhiteToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.ChangelingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -14,23 +12,11 @@ public final class CribSwapShapeshifterWhiteToken extends TokenImpl { public CribSwapShapeshifterWhiteToken() { super("Shapeshifter Token", "1/1 colorless Shapeshifter creature token with changeling"); - this.setOriginalExpansionSetCode("LRW"); cardType.add(CardType.CREATURE); subtype.add(SubType.SHAPESHIFTER); power = new MageInt(1); toughness = new MageInt(1); addAbility(new ChangelingAbility()); - - availableImageSetCodes = Arrays.asList("LRW", "C15", "CM2", "C18", "2XM", "CLB"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("CLB")) { - this.setTokenType(1); - } } public CribSwapShapeshifterWhiteToken(final CribSwapShapeshifterWhiteToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/CrushOfTentaclesToken.java b/Mage/src/main/java/mage/game/permanent/token/CrushOfTentaclesToken.java index 77dea51a8b4..9ed207c1d7b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CrushOfTentaclesToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CrushOfTentaclesToken.java @@ -1,25 +1,23 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** - * * @author spjspj */ public final class CrushOfTentaclesToken extends TokenImpl { public CrushOfTentaclesToken() { super("Octopus Token", "8/8 blue Octopus creature"); - this.setExpansionSetCodeForImage("BFZ"); this.cardType.add(CardType.CREATURE); this.color.setBlue(true); this.subtype.add(SubType.OCTOPUS); this.power = new MageInt(8); this.toughness = new MageInt(8); } + public CrushOfTentaclesToken(final CrushOfTentaclesToken token) { super(token); } @@ -27,5 +25,5 @@ public final class CrushOfTentaclesToken extends TokenImpl { public CrushOfTentaclesToken copy() { return new CrushOfTentaclesToken(this); } - + } diff --git a/Mage/src/main/java/mage/game/permanent/token/CustomIllusionToken.java b/Mage/src/main/java/mage/game/permanent/token/CustomIllusionToken.java index e3353d0a382..5018cb6e5ca 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CustomIllusionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CustomIllusionToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -22,8 +20,6 @@ public final class CustomIllusionToken extends TokenImpl { subtype.add(SubType.ILLUSION); power = new MageInt(xValue); toughness = new MageInt(xValue); - - availableImageSetCodes = Arrays.asList("ZNR"); } public CustomIllusionToken(final CustomIllusionToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DarettiConstructToken.java b/Mage/src/main/java/mage/game/permanent/token/DarettiConstructToken.java index 2ff74207646..2d0617a8f39 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DarettiConstructToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DarettiConstructToken.java @@ -1,16 +1,11 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.DefenderAbility; -import mage.util.RandomUtil; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class DarettiConstructToken extends TokenImpl { @@ -24,17 +19,6 @@ public final class DarettiConstructToken extends TokenImpl { toughness = new MageInt(1); addAbility(DefenderAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("CNS", "CN2", "MED"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MED")) { - setTokenType(2); - } } public DarettiConstructToken(final DarettiConstructToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DaxosSpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/DaxosSpiritToken.java index e97fb3fe658..2e6e92e3934 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DaxosSpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DaxosSpiritToken.java @@ -1,33 +1,23 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; /** - * * @author spjspj */ public final class DaxosSpiritToken extends TokenImpl { public DaxosSpiritToken() { super("Spirit Token", "white and black Spirit enchantment creature token with \"This creature's power and toughness are each equal to the number of experience counters you have.\""); - this.setOriginalExpansionSetCode("C15"); - setTokenType(2); cardType.add(CardType.ENCHANTMENT); cardType.add(CardType.CREATURE); color.setWhite(true); @@ -45,15 +35,6 @@ public final class DaxosSpiritToken extends TokenImpl { public DaxosSpiritToken copy() { return new DaxosSpiritToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode().equals("C15")) { - this.setTokenType(1); - } - } } class DaxosSpiritSetPTEffect extends ContinuousEffectImpl { diff --git a/Mage/src/main/java/mage/game/permanent/token/DeadlyGrubInsectToken.java b/Mage/src/main/java/mage/game/permanent/token/DeadlyGrubInsectToken.java index 697530d2bef..68240da443d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DeadlyGrubInsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DeadlyGrubInsectToken.java @@ -1,15 +1,11 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.ShroudAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class DeadlyGrubInsectToken extends TokenImpl { @@ -24,8 +20,6 @@ public final class DeadlyGrubInsectToken extends TokenImpl { // Shroud this.addAbility(ShroudAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("PLC", "TSR"); } public DeadlyGrubInsectToken(final DeadlyGrubInsectToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java b/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java index ebce3bfc5d6..9e87da183cb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java @@ -1,5 +1,3 @@ - - package mage.game.permanent.token; import mage.MageInt; @@ -16,10 +14,7 @@ import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.NamePredicate; import mage.target.common.TargetCardInYourGraveyard; -import java.util.Arrays; - /** - * * @author spjspj */ public final class DeathpactAngelToken extends TokenImpl { @@ -47,8 +42,6 @@ public final class DeathpactAngelToken extends TokenImpl { ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); - - availableImageSetCodes = Arrays.asList("GTC", "GK2"); } public DeathpactAngelToken(final DeathpactAngelToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java b/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java index 7a57ebab779..0c19b0ffd0a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java @@ -1,29 +1,27 @@ - - package mage.game.permanent.token; + +import mage.MageInt; +import mage.abilities.keyword.DeathtouchAbility; +import mage.constants.CardType; +import mage.constants.SubType; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import mage.constants.CardType; -import mage.MageInt; -import mage.abilities.keyword.DeathtouchAbility; -import mage.constants.SubType; /** - * * @author Saga */ public final class DeathtouchRatToken extends TokenImpl { - + static final private List tokenImageSets = new ArrayList<>(); + static { tokenImageSets.addAll(Arrays.asList("C17")); } public DeathtouchRatToken() { super("Rat Token", "1/1 black Rat creature token with deathtouch"); - this.setExpansionSetCodeForImage("C17"); - availableImageSetCodes = tokenImageSets; this.cardType.add(CardType.CREATURE); this.color.setBlack(true); this.subtype.add(SubType.RAT); diff --git a/Mage/src/main/java/mage/game/permanent/token/DeathtouchSnakeToken.java b/Mage/src/main/java/mage/game/permanent/token/DeathtouchSnakeToken.java index 5f5a57c436d..2c6afec45d1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DeathtouchSnakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DeathtouchSnakeToken.java @@ -1,13 +1,11 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class DeathtouchSnakeToken extends TokenImpl { @@ -20,8 +18,6 @@ public final class DeathtouchSnakeToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); addAbility(DeathtouchAbility.getInstance()); - - setOriginalExpansionSetCode("AKH"); } public DeathtouchSnakeToken(final DeathtouchSnakeToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DefenderPlantToken.java b/Mage/src/main/java/mage/game/permanent/token/DefenderPlantToken.java index 66501de4e52..da5f65e1222 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DefenderPlantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DefenderPlantToken.java @@ -1,4 +1,3 @@ - package mage.game.permanent.token; import mage.MageInt; @@ -7,7 +6,6 @@ import mage.constants.CardType; import mage.constants.SubType; /** - * * @author TheElk801 */ public final class DefenderPlantToken extends TokenImpl { @@ -19,7 +17,6 @@ public final class DefenderPlantToken extends TokenImpl { subtype.add(SubType.PLANT); power = new MageInt(0); toughness = new MageInt(2); - setOriginalExpansionSetCode("XLN"); this.addAbility(DefenderAbility.getInstance()); } diff --git a/Mage/src/main/java/mage/game/permanent/token/Demon33Token.java b/Mage/src/main/java/mage/game/permanent/token/Demon33Token.java index 251fb5c677c..b8a693fe6c0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Demon33Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Demon33Token.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -18,8 +16,6 @@ public final class Demon33Token extends TokenImpl { subtype.add(SubType.DEMON); power = new MageInt(3); toughness = new MageInt(3); - - availableImageSetCodes.addAll(Arrays.asList("CLB")); } public Demon33Token(final Demon33Token token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DemonBerserkerToken.java b/Mage/src/main/java/mage/game/permanent/token/DemonBerserkerToken.java index b1d4716880d..6e9f0cba5d8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DemonBerserkerToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DemonBerserkerToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.MenaceAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -22,8 +20,6 @@ public final class DemonBerserkerToken extends TokenImpl { toughness = new MageInt(3); addAbility(new MenaceAbility()); - - availableImageSetCodes.addAll(Arrays.asList("KHM")); } private DemonBerserkerToken(final DemonBerserkerToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DemonFlyingToken.java b/Mage/src/main/java/mage/game/permanent/token/DemonFlyingToken.java index 4a4f52dbb22..e26947e63c3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DemonFlyingToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DemonFlyingToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -25,8 +23,6 @@ public final class DemonFlyingToken extends TokenImpl { toughness = new MageInt(xValue); addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("C14", "C21", "NCC", "DDC", "CNS", "DVD"); } public DemonFlyingToken(final DemonFlyingToken token) { @@ -36,13 +32,4 @@ public final class DemonFlyingToken extends TokenImpl { public DemonFlyingToken copy() { return new DemonFlyingToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C14")) { - setTokenType(2); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/DemonToken.java b/Mage/src/main/java/mage/game/permanent/token/DemonToken.java index b63f72cff31..8221319ecb6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DemonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DemonToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author LoneFox */ @@ -20,8 +18,6 @@ public final class DemonToken extends TokenImpl { power = new MageInt(5); toughness = new MageInt(5); addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes.addAll(Arrays.asList("AVR", "C14", "ISD", "ORI", "M20", "M21", "2XM", "DDR", "GN3", "30A")); } public DemonToken(final DemonToken token) { @@ -32,13 +28,4 @@ public final class DemonToken extends TokenImpl { public DemonToken copy() { return new DemonToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C14")) { - setTokenType(1); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/DevastatingSummonsElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/DevastatingSummonsElementalToken.java index fb00899c288..1e70c7b6b24 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DevastatingSummonsElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DevastatingSummonsElementalToken.java @@ -1,11 +1,9 @@ - package mage.game.permanent.token; import mage.constants.CardType; import mage.constants.SubType; /** - * * @author spjspj */ public final class DevastatingSummonsElementalToken extends TokenImpl { @@ -15,7 +13,6 @@ public final class DevastatingSummonsElementalToken extends TokenImpl { cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.ELEMENTAL); - setOriginalExpansionSetCode("ROE"); } public DevastatingSummonsElementalToken(final DevastatingSummonsElementalToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DevilToken.java b/Mage/src/main/java/mage/game/permanent/token/DevilToken.java index dcfb10d472f..2f81606680e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DevilToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DevilToken.java @@ -1,9 +1,5 @@ - package mage.game.permanent.token; -import java.util.Arrays; -import java.util.Collections; - import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesSourceTriggeredAbility; @@ -14,7 +10,6 @@ import mage.constants.SubType; import mage.target.common.TargetAnyTarget; /** - * * @author fireshoes */ public final class DevilToken extends TokenImpl { @@ -33,8 +28,6 @@ public final class DevilToken extends TokenImpl { Ability ability = new DiesSourceTriggeredAbility(effect); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); - - availableImageSetCodes = Arrays.asList("SOI", "WAR", "AFR", "MID", "SNC", "NCC", "CLB"); } public DevilToken(final DevilToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DinOfTheFireherdToken.java b/Mage/src/main/java/mage/game/permanent/token/DinOfTheFireherdToken.java index deb74b52628..67f548c23f4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DinOfTheFireherdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DinOfTheFireherdToken.java @@ -1,12 +1,10 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** - * * @author spjspj */ public final class DinOfTheFireherdToken extends TokenImpl { @@ -21,15 +19,6 @@ public final class DinOfTheFireherdToken extends TokenImpl { toughness = new MageInt(5); } - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode().equals("SHM")) { - this.setTokenType(1); - } - } - public DinOfTheFireherdToken(final DinOfTheFireherdToken token) { super(token); } diff --git a/Mage/src/main/java/mage/game/permanent/token/DinosaurBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/DinosaurBeastToken.java index b69a54ed871..76f9d4ed2e3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DinosaurBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DinosaurBeastToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; - import mage.MageInt; - import mage.abilities.keyword.TrampleAbility; - import mage.constants.CardType; - import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.TrampleAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * @author TheElk801 @@ -13,6 +13,7 @@ public final class DinosaurBeastToken extends TokenImpl { public DinosaurBeastToken() { this(0); } + public DinosaurBeastToken(int xValue) { super("Dinosaur Beast Token", "X/X green Dinosaur Beast creature token with trample"); cardType.add(CardType.CREATURE); @@ -22,7 +23,6 @@ public final class DinosaurBeastToken extends TokenImpl { power = new MageInt(xValue); toughness = new MageInt(xValue); addAbility(TrampleAbility.getInstance()); - setOriginalExpansionSetCode("IKO"); } private DinosaurBeastToken(final DinosaurBeastToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DinosaurCatToken.java b/Mage/src/main/java/mage/game/permanent/token/DinosaurCatToken.java index 79faba774a2..5d511b392f0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DinosaurCatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DinosaurCatToken.java @@ -14,7 +14,6 @@ public final class DinosaurCatToken extends TokenImpl { subtype.add(SubType.CAT); power = new MageInt(2); toughness = new MageInt(2); - setOriginalExpansionSetCode("C20"); } public DinosaurCatToken(final DinosaurCatToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DinosaurHasteToken.java b/Mage/src/main/java/mage/game/permanent/token/DinosaurHasteToken.java index fd363622cb7..5929502e4b5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DinosaurHasteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DinosaurHasteToken.java @@ -18,7 +18,6 @@ public final class DinosaurHasteToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); addAbility(HasteAbility.getInstance()); - setOriginalExpansionSetCode("IKO"); } private DinosaurHasteToken(final DinosaurHasteToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DinosaurToken.java b/Mage/src/main/java/mage/game/permanent/token/DinosaurToken.java index 1fda65c4fa3..f04b0a0ddb4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DinosaurToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DinosaurToken.java @@ -1,15 +1,11 @@ - package mage.game.permanent.token; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; +import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** - * * @author TheElk801 */ public final class DinosaurToken extends TokenImpl { @@ -22,8 +18,6 @@ public final class DinosaurToken extends TokenImpl { power = new MageInt(3); toughness = new MageInt(3); addAbility(TrampleAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("XLN", "GN2"); } public DinosaurToken(final DinosaurToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DinosaurXXToken.java b/Mage/src/main/java/mage/game/permanent/token/DinosaurXXToken.java index b82c33a4398..836c198aafc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DinosaurXXToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DinosaurXXToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.TrampleAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -24,8 +22,6 @@ public final class DinosaurXXToken extends TokenImpl { power = new MageInt(xValue); toughness = new MageInt(xValue); addAbility(TrampleAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("MOM"); } private DinosaurXXToken(final DinosaurXXToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DjinnMonkToken.java b/Mage/src/main/java/mage/game/permanent/token/DjinnMonkToken.java index 0edf0cc7865..50ffd367004 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DjinnMonkToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DjinnMonkToken.java @@ -1,15 +1,11 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class DjinnMonkToken extends TokenImpl { @@ -23,8 +19,6 @@ public final class DjinnMonkToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("DTK", "IMA"); } public DjinnMonkToken(final DjinnMonkToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DogIllusionToken.java b/Mage/src/main/java/mage/game/permanent/token/DogIllusionToken.java index 3b072210491..5a324e8a7b6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DogIllusionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DogIllusionToken.java @@ -12,10 +12,7 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; -import java.util.Arrays; - /** - * * @author weirddan455 */ public final class DogIllusionToken extends TokenImpl { @@ -34,8 +31,6 @@ public final class DogIllusionToken extends TokenImpl { DogIllusionValue.instance) .setText("this creature's power and toughness are each equal to twice the number of cards in your hand") )); - - availableImageSetCodes = Arrays.asList("AFR"); } private DogIllusionToken(final DogIllusionToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DogVigilanceToken.java b/Mage/src/main/java/mage/game/permanent/token/DogVigilanceToken.java index f99df565d37..17b3a0806c3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DogVigilanceToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DogVigilanceToken.java @@ -4,7 +4,6 @@ import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; /** * @author TheElk801 @@ -21,8 +20,6 @@ public final class DogVigilanceToken extends TokenImpl { toughness = new MageInt(1); this.addAbility(VigilanceAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("SNC"); } private DogVigilanceToken(final DogVigilanceToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java b/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java index bee359bece7..50c596cd6cc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java @@ -1,20 +1,18 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.continuous.BoostSourceEffect; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; /** - * * @author spjspj */ public final class DokaiWeaverofLifeToken extends TokenImpl { @@ -30,7 +28,6 @@ public final class DokaiWeaverofLifeToken extends TokenImpl { toughness = new MageInt(0); DynamicValue controlledLands = new PermanentsOnBattlefieldCount(filterLands); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(controlledLands, controlledLands, Duration.WhileOnBattlefield))); - setOriginalExpansionSetCode("C18"); } public DokaiWeaverofLifeToken(final DokaiWeaverofLifeToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DoomedArtisanToken.java b/Mage/src/main/java/mage/game/permanent/token/DoomedArtisanToken.java index 159297fec84..f1b6856eeca 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DoomedArtisanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DoomedArtisanToken.java @@ -26,7 +26,6 @@ public final class DoomedArtisanToken extends TokenImpl { public DoomedArtisanToken() { super("Sculpture Token", "colorless Sculpture artifact creature token with \"This creature's power and toughness are each equal to the number of Sculptures you control.\""); - setOriginalExpansionSetCode("C19"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.SCULPTURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/DorotheasRetributionSpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/DorotheasRetributionSpiritToken.java index fe7cf5add86..4139c05c9c1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DorotheasRetributionSpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DorotheasRetributionSpiritToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author JayDi85 */ @@ -21,17 +19,6 @@ public final class DorotheasRetributionSpiritToken extends TokenImpl { toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("VOW"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("VOW")) { - setTokenType(2); - } } public DorotheasRetributionSpiritToken(final DorotheasRetributionSpiritToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DoublestrikeSamuraiToken.java b/Mage/src/main/java/mage/game/permanent/token/DoublestrikeSamuraiToken.java index 422ebe5a687..f2363671d56 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DoublestrikeSamuraiToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DoublestrikeSamuraiToken.java @@ -18,8 +18,6 @@ public class DoublestrikeSamuraiToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); addAbility(DoubleStrikeAbility.getInstance()); - - setOriginalExpansionSetCode("ONE"); } private DoublestrikeSamuraiToken(final DoublestrikeSamuraiToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonBroodmotherDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/DragonBroodmotherDragonToken.java index 7b64e602726..8749a6855a2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonBroodmotherDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonBroodmotherDragonToken.java @@ -1,4 +1,3 @@ - package mage.game.permanent.token; import mage.MageInt; @@ -9,7 +8,6 @@ import mage.constants.CardType; import mage.constants.SubType; /** - * * @author spjspj */ public final class DragonBroodmotherDragonToken extends TokenImpl { @@ -24,7 +22,6 @@ public final class DragonBroodmotherDragonToken extends TokenImpl { toughness = new MageInt(1); addAbility(FlyingAbility.getInstance()); addAbility(new DevourAbility(DevourEffect.DevourFactor.Devour2)); - setOriginalExpansionSetCode("ARB"); } public DragonBroodmotherDragonToken(final DragonBroodmotherDragonToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java index ead623252af..e2787600215 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java @@ -10,8 +10,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; -import java.util.Arrays; - /** * @author spjspj */ @@ -27,8 +25,6 @@ public final class DragonEggDragonToken extends TokenImpl { this.addAbility(FlyingAbility.getInstance()); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); - - availableImageSetCodes = Arrays.asList("C18", "EMA", "M14", "M15", "M19", "CMR", "IMA", "GN2", "GN3"); } public DragonEggDragonToken(final DragonEggDragonToken token) { @@ -38,19 +34,4 @@ public final class DragonEggDragonToken extends TokenImpl { public DragonEggDragonToken copy() { return new DragonEggDragonToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("IMA")) { - this.setTokenType(1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("M19")) { - this.setTokenType(1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("GN2")) { - this.setTokenType(1); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonIllusionToken.java b/Mage/src/main/java/mage/game/permanent/token/DragonIllusionToken.java index 68cec03e74c..c838c2817b4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonIllusionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonIllusionToken.java @@ -6,10 +6,7 @@ import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** - * * @author weirddan455 */ public class DragonIllusionToken extends TokenImpl { @@ -29,8 +26,6 @@ public class DragonIllusionToken extends TokenImpl { this.addAbility(FlyingAbility.getInstance()); this.addAbility(HasteAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("VOW"); } private DragonIllusionToken(final DragonIllusionToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonSpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/DragonSpiritToken.java index 6deb6410e7d..b183ca19a2b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonSpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonSpiritToken.java @@ -19,7 +19,6 @@ public final class DragonSpiritToken extends TokenImpl { power = new MageInt(5); toughness = new MageInt(5); addAbility(FlyingAbility.getInstance()); - setOriginalExpansionSetCode("NEO"); } public DragonSpiritToken(final DragonSpiritToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonToken.java b/Mage/src/main/java/mage/game/permanent/token/DragonToken.java index 12c8b4ef389..03eeaebb5ca 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonToken.java @@ -5,33 +5,13 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * @author BetaSteward_at_googlemail.com */ public final class DragonToken extends TokenImpl { - static final private List tokenImageSets = new ArrayList<>(); - - static { - tokenImageSets.addAll(Arrays.asList("DTK", "MMA", "ALA", "MM3", "C17", "WAR", "MED", "CLB", "DMU")); - } - public DragonToken() { - this(null, 0); - } - - public DragonToken(String setCode) { - this(setCode, 0); - } - - public DragonToken(String setCode, int tokenType) { super("Dragon Token", "4/4 red Dragon creature token with flying"); - availableImageSetCodes = tokenImageSets; - setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.DRAGON); @@ -47,17 +27,4 @@ public final class DragonToken extends TokenImpl { public DragonToken copy() { return new DragonToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C17")) { - setTokenType(1); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("CLB")) { - setTokenType(1); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java b/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java index 0a9cf808b95..a205acbe9e8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author LoneFox */ @@ -21,8 +19,6 @@ public final class DragonToken2 extends TokenImpl { toughness = new MageInt(5); addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("10E", "BFZ", "C15", "C19", "CMA", "SCG", "WWK", "M19", "KHM", "AFC", "IMA", "PCA", "CN2", "GN2", "CLB", "ONC"); } public DragonToken2(final DragonToken2 token) { @@ -32,22 +28,4 @@ public final class DragonToken2 extends TokenImpl { public DragonToken2 copy() { return new DragonToken2(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("M19")) { - this.setTokenType(2); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("IMA")) { - this.setTokenType(2); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("GN2")) { - this.setTokenType(2); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("CLB")) { - this.setTokenType(2); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonTokenGold.java b/Mage/src/main/java/mage/game/permanent/token/DragonTokenGold.java index 09c35e83010..37a1f919b38 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonTokenGold.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonTokenGold.java @@ -1,39 +1,17 @@ - - package mage.game.permanent.token; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; /** - * * @author Saga */ public final class DragonTokenGold extends TokenImpl { - static final private List tokenImageSets = new ArrayList<>(); - - static { - tokenImageSets.addAll(Arrays.asList("UST","H17")); - } - public DragonTokenGold() { - this(null, 0); - } - - public DragonTokenGold(String setCode) { - this(setCode, 0); - } - - public DragonTokenGold(String setCode, int tokenType) { super("Dragon Token", "4/4 gold Dragon creature token with flying"); - availableImageSetCodes = tokenImageSets; - setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); color.setGold(true); subtype.add(SubType.DRAGON); diff --git a/Mage/src/main/java/mage/game/permanent/token/DrakeToken.java b/Mage/src/main/java/mage/game/permanent/token/DrakeToken.java index 4e1be9dbf9a..85f085f0567 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DrakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DrakeToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author North */ @@ -22,8 +20,6 @@ public final class DrakeToken extends TokenImpl { this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("AKH", "C15", "C19", "M13", "C20", "ZNR", "C21", "UMA", "NCC", "DDS", "2X2", "GN3"); } public DrakeToken(final DrakeToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DroidToken.java b/Mage/src/main/java/mage/game/permanent/token/DroidToken.java index 6fb64eaae1f..88bc94a0853 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DroidToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DroidToken.java @@ -1,21 +1,16 @@ - package mage.game.permanent.token; -import java.util.Collections; - import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; /** - * * @author Styxo */ public final class DroidToken extends TokenImpl { public DroidToken() { super("Droid Token", "1/1 colorless Droid creature token"); - availableImageSetCodes.addAll(Collections.singletonList("SWS")); cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); diff --git a/Mage/src/main/java/mage/game/permanent/token/DroneToken.java b/Mage/src/main/java/mage/game/permanent/token/DroneToken.java index 9dd24769e93..bf6a5fb6407 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DroneToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DroneToken.java @@ -26,9 +26,6 @@ public class DroneToken extends TokenImpl { Ability ability = new LeavesBattlefieldTriggeredAbility(new LoseLifeOpponentsEffect(2), false).setTriggerPhrase("When this creature leaves the battlefield, "); ability.addEffect(new GainLifeEffect(2).concatBy("and")); addAbility(ability); - - setOriginalExpansionSetCode("ONE"); - } private DroneToken(final DroneToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DwarfBerserkerToken.java b/Mage/src/main/java/mage/game/permanent/token/DwarfBerserkerToken.java index a0bc31c7669..d1f5b95b7bd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DwarfBerserkerToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DwarfBerserkerToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - public final class DwarfBerserkerToken extends TokenImpl { public DwarfBerserkerToken() { @@ -16,8 +14,6 @@ public final class DwarfBerserkerToken extends TokenImpl { subtype.add(SubType.BERSERKER); power = new MageInt(2); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("KHM"); } public DwarfBerserkerToken(final DwarfBerserkerToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DwarfToken.java b/Mage/src/main/java/mage/game/permanent/token/DwarfToken.java index 1f29375acde..dd6c349178f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DwarfToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DwarfToken.java @@ -16,7 +16,6 @@ public final class DwarfToken extends TokenImpl { subtype.add(SubType.DWARF); power = new MageInt(1); toughness = new MageInt(1); - setOriginalExpansionSetCode("ELD"); } private DwarfToken(final DwarfToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java b/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java index e250a9099bb..edf04ccf2a8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java @@ -1,28 +1,26 @@ - package mage.game.permanent.token; +import mage.MageInt; +import mage.constants.CardType; +import mage.constants.SubType; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.MageInt; /** - * * @author spjspj */ public final class EdgarMarkovToken extends TokenImpl { static final private List tokenImageSets = new ArrayList<>(); + static { tokenImageSets.addAll(Arrays.asList("C17")); } public EdgarMarkovToken() { super("Vampire Token", "1/1 black Vampire creature token"); - availableImageSetCodes = tokenImageSets; - setExpansionSetCodeForImage("C17"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.VAMPIRE); diff --git a/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovsCoffinVampireToken.java b/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovsCoffinVampireToken.java index 180dbba1e6a..9cccb95b31e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovsCoffinVampireToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovsCoffinVampireToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.LifelinkAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -23,8 +21,6 @@ public final class EdgarMarkovsCoffinVampireToken extends TokenImpl { // Lifelink this.addAbility(LifelinkAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("VOW"); } public EdgarMarkovsCoffinVampireToken(final EdgarMarkovsCoffinVampireToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziAnnihilatorToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziAnnihilatorToken.java index a4c7ccc2dc5..c9bd8df1961 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EldraziAnnihilatorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EldraziAnnihilatorToken.java @@ -1,15 +1,11 @@ - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.AnnihilatorAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class EldraziAnnihilatorToken extends TokenImpl { @@ -18,12 +14,9 @@ public final class EldraziAnnihilatorToken extends TokenImpl { super("Eldrazi Token", "7/7 colorless Eldrazi creature token with annihilator 1"); cardType.add(CardType.CREATURE); subtype.add(SubType.ELDRAZI); - setExpansionSetCodeForImage("PCA"); power = new MageInt(7); toughness = new MageInt(7); addAbility(new AnnihilatorAbility(1)); - - availableImageSetCodes = Arrays.asList("PCA", "MOC"); } public EldraziAnnihilatorToken(final EldraziAnnihilatorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziHorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziHorrorToken.java index 61b738d4800..71e3fd2baab 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EldraziHorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EldraziHorrorToken.java @@ -1,16 +1,10 @@ - package mage.game.permanent.token; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; /** - * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) */ public final class EldraziHorrorToken extends TokenImpl { @@ -22,8 +16,6 @@ public final class EldraziHorrorToken extends TokenImpl { subtype.add(SubType.HORROR); power = new MageInt(3); toughness = new MageInt(2); - - availableImageSetCodes = Arrays.asList("EMN", "CLB"); } public EldraziHorrorToken(final EldraziHorrorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java index b018ea77575..d044da23766 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java @@ -1,10 +1,5 @@ - package mage.game.permanent.token; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import mage.MageInt; import mage.Mana; import mage.abilities.costs.common.SacrificeSourceCost; @@ -12,20 +7,12 @@ import mage.abilities.mana.SimpleManaAbility; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.util.RandomUtil; /** - * * @author fireshoes */ public final class EldraziScionToken extends TokenImpl { - static final private List tokenImageSets = new ArrayList<>(); - - static { - tokenImageSets.addAll(Arrays.asList("BFZ", "OGW", "DDR", "2X2")); - } - public EldraziScionToken() { super("Eldrazi Scion Token", "1/1 colorless Eldrazi Scion creature token with \"Sacrifice this creature: Add {C}.\""); cardType.add(CardType.CREATURE); @@ -34,18 +21,6 @@ public final class EldraziScionToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(1), new SacrificeSourceCost())); - availableImageSetCodes = tokenImageSets; - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - if (getOriginalExpansionSetCode().equals("BFZ")) { - this.setTokenType(RandomUtil.nextInt(3) + 1); // 3 different images - } - if (getOriginalExpansionSetCode().equals("OGW")) { - this.setTokenType(RandomUtil.nextInt(6) + 1); // 6 different images - } } public EldraziScionToken(final EldraziScionToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java index 106b6ddda61..bfc0c74ab93 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java @@ -1,4 +1,3 @@ - package mage.game.permanent.token; import mage.MageInt; @@ -8,9 +7,6 @@ import mage.abilities.mana.SimpleManaAbility; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.util.RandomUtil; - -import java.util.Arrays; /** * @author BetaSteward_at_googlemail.com @@ -25,29 +21,6 @@ public final class EldraziSpawnToken extends TokenImpl { power = new MageInt(0); toughness = new MageInt(1); addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(1), new SacrificeSourceCost())); - - availableImageSetCodes = Arrays.asList("C17", "DDP", "MM2", "PC2", "ROE", "MIC", "2XM", "NCC", "PCA"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("DDP")) { - this.setTokenType(RandomUtil.nextInt(3) + 1); // randomly take image 1, 2 or 3 - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MM2")) { - this.setTokenType(RandomUtil.nextInt(3) + 1); // randomly take image 1, 2 or 3 - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("ROE")) { - this.setTokenType(RandomUtil.nextInt(3) + 1); // randomly take image 1, 2 or 3 - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("PCA")) { - this.setTokenType(RandomUtil.nextInt(3) + 1); // randomly take image 1, 2 or 3 - } } public EldraziSpawnToken(final EldraziSpawnToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziToken.java index 93df2ce07c6..19cdeaecd46 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EldraziToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EldraziToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -17,8 +15,6 @@ public final class EldraziToken extends TokenImpl { subtype.add(SubType.ELDRAZI); power = new MageInt(10); toughness = new MageInt(10); - - availableImageSetCodes = Arrays.asList("BFZ", "C19", "C21", "NCC", "BRC", "ONC"); } public EldraziToken(final EldraziToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/Elemental11BlueRedToken.java b/Mage/src/main/java/mage/game/permanent/token/Elemental11BlueRedToken.java index 305069ce141..4fdef95534e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Elemental11BlueRedToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/Elemental11BlueRedToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -19,8 +17,6 @@ public final class Elemental11BlueRedToken extends TokenImpl { color.setRed(true); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("MOM"); } public Elemental11BlueRedToken(final Elemental11BlueRedToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/Elemental11HasteToken.java b/Mage/src/main/java/mage/game/permanent/token/Elemental11HasteToken.java index a4417a7162d..d1fbe115923 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Elemental11HasteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/Elemental11HasteToken.java @@ -1,4 +1,3 @@ - package mage.game.permanent.token; import mage.MageInt; @@ -6,10 +5,7 @@ import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** - * * @author spjspj */ public final class Elemental11HasteToken extends TokenImpl { @@ -22,17 +18,6 @@ public final class Elemental11HasteToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); addAbility(HasteAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("SHM"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode().equals("SHM")) { - this.setTokenType(2); - } } public Elemental11HasteToken(final Elemental11HasteToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/Elemental21TrampleHasteToken.java b/Mage/src/main/java/mage/game/permanent/token/Elemental21TrampleHasteToken.java index 7d8799392ea..033d66db363 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Elemental21TrampleHasteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/Elemental21TrampleHasteToken.java @@ -7,7 +7,6 @@ import mage.constants.CardType; import mage.constants.SubType; /** - * * @author weirddan455 */ public final class Elemental21TrampleHasteToken extends TokenImpl { @@ -19,7 +18,6 @@ public final class Elemental21TrampleHasteToken extends TokenImpl { subtype.add(SubType.ELEMENTAL); power = new MageInt(2); toughness = new MageInt(1); - setOriginalExpansionSetCode("DMU"); this.addAbility(TrampleAbility.getInstance()); this.addAbility(HasteAbility.getInstance()); } diff --git a/Mage/src/main/java/mage/game/permanent/token/Elemental31TrampleHasteToken.java b/Mage/src/main/java/mage/game/permanent/token/Elemental31TrampleHasteToken.java index e649b416783..41f6404d96c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Elemental31TrampleHasteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/Elemental31TrampleHasteToken.java @@ -6,8 +6,6 @@ import mage.abilities.keyword.TrampleAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -22,20 +20,6 @@ public final class Elemental31TrampleHasteToken extends TokenImpl { toughness = new MageInt(1); this.addAbility(TrampleAbility.getInstance()); this.addAbility(HasteAbility.getInstance()); - availableImageSetCodes.addAll(Arrays.asList("BFZ", "MH1", "DOM", "DMR")); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("BFZ")) { - setTokenType(2); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MH1")) { - setTokenType(2); - } } public Elemental31TrampleHasteToken(final Elemental31TrampleHasteToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/Elemental44Token.java b/Mage/src/main/java/mage/game/permanent/token/Elemental44Token.java index 9ec0d1c6ace..136434b2040 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Elemental44Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Elemental44Token.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -19,8 +17,6 @@ public final class Elemental44Token extends TokenImpl { subtype.add(SubType.ELEMENTAL); power = new MageInt(4); toughness = new MageInt(4); - - availableImageSetCodes = Arrays.asList("STX"); } private Elemental44Token(final Elemental44Token token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java b/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java index 2887a5923ba..3e5acc6abbb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java @@ -1,16 +1,11 @@ - package mage.game.permanent.token; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; import mage.constants.SubType; /** - * * @author Styxo */ public final class ElementalShamanToken extends TokenImpl { @@ -32,8 +27,6 @@ public final class ElementalShamanToken extends TokenImpl { subtype.add(SubType.SHAMAN); power = new MageInt(3); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("C15", "JVC", "DD2", "LRW", "CM2"); } public ElementalShamanToken(final ElementalShamanToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ElementalTokenWithHaste.java b/Mage/src/main/java/mage/game/permanent/token/ElementalTokenWithHaste.java index be28990827a..0530a866c71 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElementalTokenWithHaste.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElementalTokenWithHaste.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author magenoxx */ @@ -20,8 +18,6 @@ public final class ElementalTokenWithHaste extends TokenImpl { power = new MageInt(3); toughness = new MageInt(1); this.addAbility(HasteAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("C20", "PMEI", "OGW", "SOK", "MRD", "CON"); } public ElementalTokenWithHaste(final ElementalTokenWithHaste token) { @@ -31,19 +27,4 @@ public final class ElementalTokenWithHaste extends TokenImpl { public ElementalTokenWithHaste copy() { return new ElementalTokenWithHaste(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("OGW")) { - setTokenType(2); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C20")) { - setTokenType(1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("SOK")) { - setTokenType(1); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java b/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java index 4e160308321..72263f3c526 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author BetaSteward_at_googlemail.com */ @@ -18,9 +16,6 @@ public final class ElephantToken extends TokenImpl { subtype.add(SubType.ELEPHANT); power = new MageInt(3); toughness = new MageInt(3); - - availableImageSetCodes = Arrays.asList("C14", "C15", "CMA", "CNS", "GVL", "DDD", - "EMA", "INV", "JUD", "MM2", "ODY", "VMA", "WWK", "MH1", "CMR", "C21", "MIC", "NEC", "2XM", "NCC", "MM3", "DDS", "DMC", "DMR", "ONC", "MOC"); } public ElephantToken(final ElephantToken token) { @@ -30,9 +25,4 @@ public final class ElephantToken extends TokenImpl { public ElephantToken copy() { return new ElephantToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - } } \ No newline at end of file diff --git a/Mage/src/main/java/mage/game/permanent/token/ElfDruidToken.java b/Mage/src/main/java/mage/game/permanent/token/ElfDruidToken.java index d18cc1a6530..be4719eb78c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElfDruidToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElfDruidToken.java @@ -1,29 +1,16 @@ - package mage.game.permanent.token; -import java.util.Arrays; - +import mage.MageInt; +import mage.abilities.mana.GreenManaAbility; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; -import mage.ObjectColor; -import mage.abilities.mana.GreenManaAbility; /** - * * @author spjspj */ public final class ElfDruidToken extends TokenImpl { public ElfDruidToken() { - this(null, 0); - } - - public ElfDruidToken(String setCode) { - this(setCode, 0); - } - - public ElfDruidToken(String setCode, int tokenType) { super("Elf Druid Token", "1/1 green Elf Druid creature token with \"{T}: Add {G}.\""); this.cardType.add(CardType.CREATURE); this.color.setGreen(true); @@ -35,8 +22,6 @@ public final class ElfDruidToken extends TokenImpl { // {T}: Add {G}. this.addAbility(new GreenManaAbility()); - - availableImageSetCodes = Arrays.asList("C14", "CMA"); } public ElfDruidToken(final ElfDruidToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ElfKnightToken.java b/Mage/src/main/java/mage/game/permanent/token/ElfKnightToken.java index eb2da5939c9..c0b28c887a1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElfKnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElfKnightToken.java @@ -12,7 +12,6 @@ public final class ElfKnightToken extends TokenImpl { public ElfKnightToken() { super("Elf Knight Token", "2/2 green and white Elf Knight creature token with vigilance"); - this.setExpansionSetCodeForImage("GRN"); cardType.add(CardType.CREATURE); color.setGreen(true); color.setWhite(true); @@ -30,5 +29,4 @@ public final class ElfKnightToken extends TokenImpl { public ElfKnightToken copy() { return new ElfKnightToken(this); } - } diff --git a/Mage/src/main/java/mage/game/permanent/token/ElfWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/ElfWarriorToken.java index 1dcb4334f3d..8ede1e4ce60 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElfWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElfWarriorToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author Loki */ @@ -19,8 +17,6 @@ public final class ElfWarriorToken extends TokenImpl { subtype.add(SubType.WARRIOR); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("C14", "C16", "EVG", "EMA", "LRW", "ORI", "SHM", "M19", "CMR", "KHM", "NCC", "DDU", "CMA", "DD1", "DDS", "A25", "GN3"); } public ElfWarriorToken(final ElfWarriorToken token) { @@ -31,13 +27,4 @@ public final class ElfWarriorToken extends TokenImpl { public ElfWarriorToken copy() { return new ElfWarriorToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode().equals("SHM")) { - this.setTokenType(1); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/EnchantmentBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/EnchantmentBirdToken.java index 7b8f6acb470..dc316933363 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EnchantmentBirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EnchantmentBirdToken.java @@ -1,17 +1,11 @@ - - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class EnchantmentBirdToken extends TokenImpl { @@ -25,17 +19,6 @@ public final class EnchantmentBirdToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("BNG"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("BNG")) { - setTokenType(1); - } } public EnchantmentBirdToken(final EnchantmentBirdToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/EtheriumCellToken.java b/Mage/src/main/java/mage/game/permanent/token/EtheriumCellToken.java index a1bc68568af..aee2481e93a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EtheriumCellToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EtheriumCellToken.java @@ -1,23 +1,20 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; + import mage.abilities.Ability; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.mana.AddManaOfAnyColorEffect; import mage.abilities.mana.SimpleManaAbility; +import mage.constants.CardType; import mage.constants.Zone; /** - * * @author spjspj */ public final class EtheriumCellToken extends TokenImpl { public EtheriumCellToken() { super("Etherium Cell", "colorless artifact token named Etherium Cell with \"{T}, Sacrifice this artifact: Add one mana of any color.\""); - this.setOriginalExpansionSetCode("AER"); cardType.add(CardType.ARTIFACT); Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(), new TapSourceCost()); diff --git a/Mage/src/main/java/mage/game/permanent/token/EwokToken.java b/Mage/src/main/java/mage/game/permanent/token/EwokToken.java index 77c55565fd0..4626798c58a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EwokToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EwokToken.java @@ -1,21 +1,16 @@ - - package mage.game.permanent.token; -import java.util.Collections; import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; /** - * * @author Styxo */ public final class EwokToken extends TokenImpl { public EwokToken() { super("Ewok Token", "1/1 green Ewok creature tokens"); - availableImageSetCodes.addAll(Collections.singletonList("SWS")); this.power = new MageInt(1); this.toughness = new MageInt(1); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/EyesOfTheWisentElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/EyesOfTheWisentElementalToken.java index 3e9edc30606..a5f7e9b50e6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EyesOfTheWisentElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EyesOfTheWisentElementalToken.java @@ -1,25 +1,21 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** - * * @author spjspj */ public final class EyesOfTheWisentElementalToken extends TokenImpl { public EyesOfTheWisentElementalToken() { super("Elemental Token", "4/4 green Elemental creature token"); - this.setOriginalExpansionSetCode("MMA"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.ELEMENTAL); power = new MageInt(4); toughness = new MageInt(4); - setTokenType(1); } public EyesOfTheWisentElementalToken(final EyesOfTheWisentElementalToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/FableOfTheMirrorBreakerToken.java b/Mage/src/main/java/mage/game/permanent/token/FableOfTheMirrorBreakerToken.java index fd17dd47ce4..bb211bcd3b6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FableOfTheMirrorBreakerToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FableOfTheMirrorBreakerToken.java @@ -20,7 +20,6 @@ public class FableOfTheMirrorBreakerToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); addAbility(new AttacksTriggeredAbility(new CreateTokenEffect(new TreasureToken())).setTriggerPhrase("Whenever this creature attacks, ")); - setOriginalExpansionSetCode("NEO"); } private FableOfTheMirrorBreakerToken(final FableOfTheMirrorBreakerToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/FaerieDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/FaerieDragonToken.java index 3150f3af8c3..7c25902a7c7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FaerieDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FaerieDragonToken.java @@ -5,10 +5,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** - * * @author weirddan455 */ public class FaerieDragonToken extends TokenImpl { @@ -22,8 +19,6 @@ public class FaerieDragonToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("AFR", "CLB"); } private FaerieDragonToken(final FaerieDragonToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/FaerieRogueToken.java b/Mage/src/main/java/mage/game/permanent/token/FaerieRogueToken.java index 9769fda79e0..72492c77c49 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FaerieRogueToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FaerieRogueToken.java @@ -4,9 +4,6 @@ import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import mage.util.RandomUtil; - -import java.util.Arrays; /** * @author LoneFox @@ -22,17 +19,6 @@ public final class FaerieRogueToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("MOR", "MM2", "ZNC", "UMA", "SLD", "2X2"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("SLD")) { - setTokenType(RandomUtil.nextInt(4) + 1); - } } public FaerieRogueToken(final FaerieRogueToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/FaerieToken.java b/Mage/src/main/java/mage/game/permanent/token/FaerieToken.java index cd39129998b..53f59c44120 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FaerieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FaerieToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -20,8 +18,6 @@ public final class FaerieToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("ELD", "NCC", "BRC", "MOC"); } public FaerieToken(final FaerieToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/FeatherToken.java b/Mage/src/main/java/mage/game/permanent/token/FeatherToken.java index e5672c4cdc3..ca69fe3707e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FeatherToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FeatherToken.java @@ -9,8 +9,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import java.util.Arrays; - public final class FeatherToken extends TokenImpl { private static final FilterCard filter = new FilterCard("Phoenix card"); @@ -28,8 +26,6 @@ public final class FeatherToken extends TokenImpl { ); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); - - availableImageSetCodes = Arrays.asList("IKO", "MOC"); } private FeatherToken(final FeatherToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/FirstMateRagavanToken.java b/Mage/src/main/java/mage/game/permanent/token/FirstMateRagavanToken.java index 920043b5138..dcae83d6524 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FirstMateRagavanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FirstMateRagavanToken.java @@ -5,8 +5,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -21,8 +19,6 @@ public final class FirstMateRagavanToken extends TokenImpl { this.subtype.add(SubType.MONKEY); this.subtype.add(SubType.PIRATE); this.cardType.add(CardType.CREATURE); - - availableImageSetCodes = Arrays.asList("MOM"); } public FirstMateRagavanToken(final FirstMateRagavanToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/FishToken.java b/Mage/src/main/java/mage/game/permanent/token/FishToken.java index f8a6628e5f5..7688aec0972 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FishToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FishToken.java @@ -4,7 +4,6 @@ import mage.MageInt; import mage.abilities.keyword.CantBeBlockedSourceAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; /** * @author TheElk801 @@ -20,8 +19,6 @@ public final class FishToken extends TokenImpl { toughness = new MageInt(1); addAbility(new CantBeBlockedSourceAbility("this creature can't be blocked")); - - availableImageSetCodes = Arrays.asList("SNC"); } public FishToken(final FishToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/FleshCarverHorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/FleshCarverHorrorToken.java index 4b1c7ab4935..ba9b85e9459 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FleshCarverHorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FleshCarverHorrorToken.java @@ -1,12 +1,10 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** - * * @author spjspj */ public final class FleshCarverHorrorToken extends TokenImpl { @@ -17,7 +15,6 @@ public final class FleshCarverHorrorToken extends TokenImpl { public FleshCarverHorrorToken(int xValue) { super("Horror Token", "X/X black Horror creature token"); - setOriginalExpansionSetCode("C14"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.HORROR); diff --git a/Mage/src/main/java/mage/game/permanent/token/FoodToken.java b/Mage/src/main/java/mage/game/permanent/token/FoodToken.java index 4256e345a13..edcbac46f1c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FoodToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FoodToken.java @@ -9,9 +9,6 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.util.RandomUtil; - -import java.util.Arrays; /** * @author jmharmon @@ -31,21 +28,6 @@ public final class FoodToken extends TokenImpl { cost.setText("Sacrifice this artifact"); ability.addCost(cost); this.addAbility(ability); - - availableImageSetCodes = Arrays.asList("ELD", "C21", "MH2", "NCC", "MOC"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("ELD")) { - setTokenType(RandomUtil.nextInt(4) + 1); // 1..4 - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MH2")) { - setTokenType(RandomUtil.nextInt(2) + 1); // 1..2 - } } public FoodToken(final FoodToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ForestDryadToken.java b/Mage/src/main/java/mage/game/permanent/token/ForestDryadToken.java index c0f1ad5ccc1..4a8e3f7bc78 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ForestDryadToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ForestDryadToken.java @@ -5,8 +5,6 @@ import mage.abilities.mana.GreenManaAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -23,8 +21,6 @@ public final class ForestDryadToken extends TokenImpl { // (This creature is affected by summoning sickness, and it has “{T}: Add {G}.”) this.addAbility(new GreenManaAbility()); - - availableImageSetCodes = Arrays.asList("BRO"); } public ForestDryadToken(final ForestDryadToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ForlornPseudammaZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/ForlornPseudammaZombieToken.java index 732df162524..9e3b22f8f62 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ForlornPseudammaZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ForlornPseudammaZombieToken.java @@ -1,13 +1,10 @@ - - package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** - * * @author spjspj */ public final class ForlornPseudammaZombieToken extends TokenImpl { @@ -20,7 +17,6 @@ public final class ForlornPseudammaZombieToken extends TokenImpl { subtype.add(SubType.ZOMBIE); power = new MageInt(2); toughness = new MageInt(2); - this.setOriginalExpansionSetCode("BNG"); } public ForlornPseudammaZombieToken(final ForlornPseudammaZombieToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/FractalToken.java b/Mage/src/main/java/mage/game/permanent/token/FractalToken.java index 91b3737adb9..0facabb0820 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FractalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FractalToken.java @@ -11,7 +11,6 @@ import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.Arrays; import java.util.UUID; /** @@ -27,8 +26,6 @@ public final class FractalToken extends TokenImpl { color.setBlue(true); power = new MageInt(0); toughness = new MageInt(0); - - availableImageSetCodes = Arrays.asList("STX"); } private FractalToken(final FractalToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/FrogLizardToken.java b/Mage/src/main/java/mage/game/permanent/token/FrogLizardToken.java index a271cdecd4a..1bd8e12f3ee 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FrogLizardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FrogLizardToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -19,8 +17,6 @@ public final class FrogLizardToken extends TokenImpl { subtype.add(SubType.LIZARD); power = new MageInt(3); toughness = new MageInt(3); - - availableImageSetCodes = Arrays.asList("GTC", "RNA", "C15", "C21"); } public FrogLizardToken(final FrogLizardToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/FungusBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/FungusBeastToken.java index 8c24296c618..636c287b91f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FungusBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FungusBeastToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.TrampleAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -22,8 +20,6 @@ public final class FungusBeastToken extends TokenImpl { toughness = new MageInt(4); addAbility(TrampleAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("C21"); } private FungusBeastToken(final FungusBeastToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GargoyleToken.java b/Mage/src/main/java/mage/game/permanent/token/GargoyleToken.java index 76969cfd399..062946dd7ea 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GargoyleToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GargoyleToken.java @@ -1,15 +1,11 @@ - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class GargoyleToken extends TokenImpl { @@ -22,8 +18,6 @@ public final class GargoyleToken extends TokenImpl { power = new MageInt(3); toughness = new MageInt(4); addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes.addAll(Arrays.asList("M10", "C14", "CMA", "C19")); } public GargoyleToken(final GargoyleToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GarrukApexPredatorBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/GarrukApexPredatorBeastToken.java index ba4e0c18333..6bb80db838a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GarrukApexPredatorBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GarrukApexPredatorBeastToken.java @@ -1,24 +1,17 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; -import mage.util.RandomUtil; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class GarrukApexPredatorBeastToken extends TokenImpl { public GarrukApexPredatorBeastToken() { super("Beast Token", "3/3 black Beast creature token with deathtouch"); - setOriginalExpansionSetCode("M15"); - setTokenType(1); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.BEAST); @@ -26,17 +19,6 @@ public final class GarrukApexPredatorBeastToken extends TokenImpl { toughness = new MageInt(3); abilities.add(DeathtouchAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("M15", "MED"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode().equals("M15")) { - this.setTokenType(1); - } } public GarrukApexPredatorBeastToken(final GarrukApexPredatorBeastToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GiantBaitingGiantWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/GiantBaitingGiantWarriorToken.java index d0eef221d7d..92a4f98407d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GiantBaitingGiantWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GiantBaitingGiantWarriorToken.java @@ -1,15 +1,11 @@ - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.HasteAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class GiantBaitingGiantWarriorToken extends TokenImpl { @@ -24,8 +20,6 @@ public final class GiantBaitingGiantWarriorToken extends TokenImpl { power = new MageInt(4); toughness = new MageInt(4); this.addAbility(HasteAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("SHM", "MM3"); } public GiantBaitingGiantWarriorToken(final GiantBaitingGiantWarriorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GiantToken.java b/Mage/src/main/java/mage/game/permanent/token/GiantToken.java index e74e3c72772..c07e846db1e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GiantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GiantToken.java @@ -1,14 +1,10 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; - -import java.util.Arrays; /** - * * @author spjspj */ public final class GiantToken extends TokenImpl { @@ -20,8 +16,6 @@ public final class GiantToken extends TokenImpl { color.setRed(true); power = new MageInt(4); toughness = new MageInt(4); - - availableImageSetCodes = Arrays.asList("TSR"); } public GiantToken(final GiantToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GiantWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/GiantWarriorToken.java index 909b973470a..93489cd32dc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GiantWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GiantWarriorToken.java @@ -1,14 +1,10 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; - -import java.util.Arrays; /** - * * @author spjspj */ public final class GiantWarriorToken extends TokenImpl { @@ -21,8 +17,6 @@ public final class GiantWarriorToken extends TokenImpl { subtype.add(SubType.WARRIOR); power = new MageInt(5); toughness = new MageInt(5); - - availableImageSetCodes = Arrays.asList("MOR", "MMA"); } public GiantWarriorToken(final GiantWarriorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GiantWizardToken.java b/Mage/src/main/java/mage/game/permanent/token/GiantWizardToken.java index 262a40c37a5..0823db04c02 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GiantWizardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GiantWizardToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - public final class GiantWizardToken extends TokenImpl { public GiantWizardToken() { @@ -16,8 +14,6 @@ public final class GiantWizardToken extends TokenImpl { subtype.add(SubType.WIZARD); power = new MageInt(4); toughness = new MageInt(4); - - availableImageSetCodes = Arrays.asList("KHM"); } public GiantWizardToken(final GiantWizardToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GoatToken.java b/Mage/src/main/java/mage/game/permanent/token/GoatToken.java index ced84c7aac9..831d29e53c0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoatToken.java @@ -4,33 +4,13 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * @author LoneFox */ public final class GoatToken extends TokenImpl { - static final private List tokenImageSets = new ArrayList<>(); - - static { - tokenImageSets.addAll(Arrays.asList("EVE", "M13", "M14", "C14", "C16", "ELD", "THB", "NCC", "CM2", "PCA", "CLB", "BRC")); - } - public GoatToken() { - this(null, 0); - } - - public GoatToken(String setCode) { - this(setCode, 0); - } - - public GoatToken(String setCode, int tokenType) { super("Goat Token", "0/1 white Goat creature token"); - availableImageSetCodes = tokenImageSets; - setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.GOAT); diff --git a/Mage/src/main/java/mage/game/permanent/token/GoblinRogueToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinRogueToken.java index cff570f388e..1b1f67d7fe5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoblinRogueToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoblinRogueToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author LoneFox */ @@ -19,8 +17,6 @@ public final class GoblinRogueToken extends TokenImpl { subtype.add(SubType.ROGUE); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes.addAll(Arrays.asList("LRW", "MMA", "ZNC")); } public GoblinRogueToken(final GoblinRogueToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GoblinSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinSoldierToken.java index fd134cf469e..87b5df36b44 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoblinSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoblinSoldierToken.java @@ -1,12 +1,10 @@ package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; - -import java.util.Arrays; /** - * * @author spjspj */ public final class GoblinSoldierToken extends TokenImpl { @@ -20,8 +18,6 @@ public final class GoblinSoldierToken extends TokenImpl { subtype.add(SubType.SOLDIER); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("EVE", "EMA"); } public GoblinSoldierToken(final GoblinSoldierToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java index 558ffede0ce..3b70f40be15 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author North */ @@ -29,12 +27,6 @@ public final class GoblinToken extends TokenImpl { color.setRed(true); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("10E", "ALA", "SOM", "M10", "M13", "RTR", - "MMA", "M15", "C14", "KTK", "EVG", "DTK", "ORI", "DDG", "DDN", - "MM3", "EMA", "DOM", "RNA", "WAR", "MH1", "TSR", "MH2", "AFR", - "NEC", "M19", "CM2", "PCA", "DD1", "DDS", "DDT", "A25", "GRN", - "GK1", "DMU", "DMR", "ONC", "MOC"); } public GoblinToken(final GoblinToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GoblinWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinWarriorToken.java index f8141fe31a8..7cc117459a9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoblinWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoblinWarriorToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -20,8 +18,6 @@ public final class GoblinWarriorToken extends TokenImpl { subtype.add(SubType.WARRIOR); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("SHM", "MM3", "C20"); } public GoblinWarriorToken(final GoblinWarriorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GoblinWizardToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinWizardToken.java index ef8e87db515..f2a3f0f32ca 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoblinWizardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoblinWizardToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.ProwessAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -21,8 +19,6 @@ public final class GoblinWizardToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); this.addAbility(new ProwessAbility()); - - availableImageSetCodes.addAll(Arrays.asList("M21")); } private GoblinWizardToken(final GoblinWizardToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GodEternalOketraToken.java b/Mage/src/main/java/mage/game/permanent/token/GodEternalOketraToken.java index 87607b85da3..81c9eae7899 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GodEternalOketraToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GodEternalOketraToken.java @@ -12,7 +12,6 @@ public final class GodEternalOketraToken extends TokenImpl { public GodEternalOketraToken() { super("Zombie Warrior Token", "4/4 black Zombie Warrior creature token with vigilance"); - setOriginalExpansionSetCode("WAR"); // default cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.ZOMBIE); diff --git a/Mage/src/main/java/mage/game/permanent/token/GodFavoredGeneralSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/GodFavoredGeneralSoldierToken.java index d01d4b66000..e67a332e894 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GodFavoredGeneralSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GodFavoredGeneralSoldierToken.java @@ -1,12 +1,10 @@ - package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** - * * @author spjspj */ public final class GodFavoredGeneralSoldierToken extends TokenImpl { @@ -20,7 +18,6 @@ public final class GodFavoredGeneralSoldierToken extends TokenImpl { subtype.add(SubType.SOLDIER); power = new MageInt(1); toughness = new MageInt(1); - this.setOriginalExpansionSetCode("BNG"); } public GodFavoredGeneralSoldierToken(final GodFavoredGeneralSoldierToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GoldToken.java b/Mage/src/main/java/mage/game/permanent/token/GoldToken.java index 0c084788c30..cc4ec4e5f30 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoldToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoldToken.java @@ -6,24 +6,13 @@ import mage.abilities.mana.AnyColorManaAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * @author LevelX2 */ public final class GoldToken extends TokenImpl { - static final private List tokenImageSets = new ArrayList<>(); - - static { - tokenImageSets.addAll(Arrays.asList("BNG", "C15", "C17", "THB", "CLB", "MOC")); - } - public GoldToken() { super("Gold Token", "Gold token"); - availableImageSetCodes = tokenImageSets; cardType.add(CardType.ARTIFACT); subtype.add(SubType.GOLD); diff --git a/Mage/src/main/java/mage/game/permanent/token/GolemFlyingToken.java b/Mage/src/main/java/mage/game/permanent/token/GolemFlyingToken.java index 25a057caafa..bfc2e4b920c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GolemFlyingToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GolemFlyingToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -21,8 +19,6 @@ public final class GolemFlyingToken extends TokenImpl { toughness = new MageInt(3); addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("C21"); } private GolemFlyingToken(final GolemFlyingToken token) { @@ -32,13 +28,4 @@ public final class GolemFlyingToken extends TokenImpl { public GolemFlyingToken copy() { return new GolemFlyingToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C21")) { - setTokenType(1); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/GolemToken.java b/Mage/src/main/java/mage/game/permanent/token/GolemToken.java index f7f386eb114..0511f9fbc65 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GolemToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GolemToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author North */ @@ -18,8 +16,6 @@ public final class GolemToken extends TokenImpl { subtype.add(SubType.GOLEM); power = new MageInt(3); toughness = new MageInt(3); - - availableImageSetCodes = Arrays.asList("MM2", "SOM", "MH1", "M20", "CMR", "2XM", "MOC"); } public GolemToken(final GolemToken token) { @@ -29,9 +25,4 @@ public final class GolemToken extends TokenImpl { public GolemToken copy() { return new GolemToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/GolemTrampleToken.java b/Mage/src/main/java/mage/game/permanent/token/GolemTrampleToken.java index 949e3136cd6..13e7d170207 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GolemTrampleToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GolemTrampleToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.TrampleAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -21,8 +19,6 @@ public final class GolemTrampleToken extends TokenImpl { toughness = new MageInt(3); addAbility(TrampleAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("C21"); } private GolemTrampleToken(final GolemTrampleToken token) { @@ -32,13 +28,4 @@ public final class GolemTrampleToken extends TokenImpl { public GolemTrampleToken copy() { return new GolemTrampleToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C21")) { - setTokenType(3); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/GolemVigilanceToken.java b/Mage/src/main/java/mage/game/permanent/token/GolemVigilanceToken.java index 15847391c96..7f3b3b308e0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GolemVigilanceToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GolemVigilanceToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.VigilanceAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -21,8 +19,6 @@ public final class GolemVigilanceToken extends TokenImpl { toughness = new MageInt(3); addAbility(VigilanceAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("C21"); } private GolemVigilanceToken(final GolemVigilanceToken token) { @@ -32,13 +28,4 @@ public final class GolemVigilanceToken extends TokenImpl { public GolemVigilanceToken copy() { return new GolemVigilanceToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C21")) { - setTokenType(2); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/GolemXXToken.java b/Mage/src/main/java/mage/game/permanent/token/GolemXXToken.java index d9c1da3a647..84c0f92fc1f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GolemXXToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GolemXXToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -22,8 +20,6 @@ public final class GolemXXToken extends TokenImpl { subtype.add(SubType.GOLEM); power = new MageInt(xValue); toughness = new MageInt(xValue); - - availableImageSetCodes = Arrays.asList("BRO"); } public GolemXXToken(final GolemXXToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GrakmawSkyclaveRavagerHydraToken.java b/Mage/src/main/java/mage/game/permanent/token/GrakmawSkyclaveRavagerHydraToken.java index a34b2d01832..1caacb839f3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GrakmawSkyclaveRavagerHydraToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GrakmawSkyclaveRavagerHydraToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -23,8 +21,6 @@ public final class GrakmawSkyclaveRavagerHydraToken extends TokenImpl { subtype.add(SubType.HYDRA); power = new MageInt(xValue); toughness = new MageInt(xValue); - - availableImageSetCodes = Arrays.asList("ZNR"); } private GrakmawSkyclaveRavagerHydraToken(final GrakmawSkyclaveRavagerHydraToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GreenAndWhiteElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/GreenAndWhiteElementalToken.java index 1c475f092de..e36a1743a22 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GreenAndWhiteElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GreenAndWhiteElementalToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.VigilanceAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author JayDi85 */ @@ -21,8 +19,6 @@ public final class GreenAndWhiteElementalToken extends TokenImpl { power = new MageInt(8); toughness = new MageInt(8); this.addAbility(VigilanceAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("GK1", "PTC", "RTR"); } public GreenAndWhiteElementalToken(final GreenAndWhiteElementalToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GreenCat2Token.java b/Mage/src/main/java/mage/game/permanent/token/GreenCat2Token.java index eaaed763fd5..36e9091e4d4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GreenCat2Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/GreenCat2Token.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -18,8 +16,6 @@ public final class GreenCat2Token extends TokenImpl { subtype.add(SubType.CAT); power = new MageInt(2); toughness = new MageInt(2); - - availableImageSetCodes = Arrays.asList("M21", "KHM", "DMR"); } private GreenCat2Token(final GreenCat2Token token) { @@ -29,16 +25,4 @@ public final class GreenCat2Token extends TokenImpl { public GreenCat2Token copy() { return new GreenCat2Token(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("M21")) { - this.setTokenType(2); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("DMR")) { - this.setTokenType(2); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/GreenCatToken.java b/Mage/src/main/java/mage/game/permanent/token/GreenCatToken.java index 930dd620d84..9e02ad60f0b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GreenCatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GreenCatToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -18,8 +16,6 @@ public final class GreenCatToken extends TokenImpl { subtype.add(SubType.CAT); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes.addAll(Arrays.asList("6ED", "M21")); } public GreenCatToken(final GreenCatToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GreenWhiteElfWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/GreenWhiteElfWarriorToken.java index 28cd41d8921..9d341548b11 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GreenWhiteElfWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GreenWhiteElfWarriorToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -20,8 +18,6 @@ public final class GreenWhiteElfWarriorToken extends TokenImpl { subtype.add(SubType.WARRIOR); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("SHM", "2XM"); } public GreenWhiteElfWarriorToken(final GreenWhiteElfWarriorToken token) { @@ -31,13 +27,4 @@ public final class GreenWhiteElfWarriorToken extends TokenImpl { public GreenWhiteElfWarriorToken copy() { return new GreenWhiteElfWarriorToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("SHM")) { - this.setTokenType(2); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/GremlinArtifactToken.java b/Mage/src/main/java/mage/game/permanent/token/GremlinArtifactToken.java index 90d73dcfa09..ee2137043fb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GremlinArtifactToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GremlinArtifactToken.java @@ -13,7 +13,6 @@ public final class GremlinArtifactToken extends TokenImpl { super("Gremlin Token", "0/0 red Gremlin artifact creature token"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); - this.setOriginalExpansionSetCode("MOC"); subtype.add(SubType.GREMLIN); color.setRed(true); power = new MageInt(0); diff --git a/Mage/src/main/java/mage/game/permanent/token/GremlinToken.java b/Mage/src/main/java/mage/game/permanent/token/GremlinToken.java index cf86dff6698..55966dd4f86 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GremlinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GremlinToken.java @@ -1,4 +1,3 @@ - package mage.game.permanent.token; import mage.MageInt; @@ -6,7 +5,6 @@ import mage.constants.CardType; import mage.constants.SubType; /** - * * @author Styxo */ public final class GremlinToken extends TokenImpl { @@ -14,7 +12,6 @@ public final class GremlinToken extends TokenImpl { public GremlinToken() { super("Gremlin Token", "2/2 red Gremlin creature token"); cardType.add(CardType.CREATURE); - this.setOriginalExpansionSetCode("AER"); subtype.add(SubType.GREMLIN); color.setRed(true); power = new MageInt(2); diff --git a/Mage/src/main/java/mage/game/permanent/token/GriffinToken.java b/Mage/src/main/java/mage/game/permanent/token/GriffinToken.java index f991f973f96..0d38ffd3d5c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GriffinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GriffinToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -22,8 +20,6 @@ public final class GriffinToken extends TokenImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("DDH", "DDL", "M21", "TSR", "DMC", "DMR"); } public GriffinToken(final GriffinToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GrismoldPlantToken.java b/Mage/src/main/java/mage/game/permanent/token/GrismoldPlantToken.java index d11db3b9c2d..f3d62f8ca9e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GrismoldPlantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GrismoldPlantToken.java @@ -4,18 +4,8 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - public final class GrismoldPlantToken extends TokenImpl { - static final private List tokenImageSets = new ArrayList<>(); - - static { - tokenImageSets.addAll(Arrays.asList("C19")); - } - public GrismoldPlantToken() { super("Plant Token", "1/1 green Plant creature token"); cardType.add(CardType.CREATURE); @@ -23,8 +13,6 @@ public final class GrismoldPlantToken extends TokenImpl { subtype.add(SubType.PLANT); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = tokenImageSets; } public GrismoldPlantToken(final GrismoldPlantToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GrovetenderDruidsPlantToken.java b/Mage/src/main/java/mage/game/permanent/token/GrovetenderDruidsPlantToken.java index 6c11b69fe5b..b5969cd67b0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GrovetenderDruidsPlantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GrovetenderDruidsPlantToken.java @@ -1,12 +1,10 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** - * * @author spjspj */ public final class GrovetenderDruidsPlantToken extends TokenImpl { @@ -18,7 +16,6 @@ public final class GrovetenderDruidsPlantToken extends TokenImpl { subtype.add(SubType.PLANT); power = new MageInt(1); toughness = new MageInt(1); - this.setOriginalExpansionSetCode("BFZ"); } public GrovetenderDruidsPlantToken(final GrovetenderDruidsPlantToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GuenhwyvarToken.java b/Mage/src/main/java/mage/game/permanent/token/GuenhwyvarToken.java index 3b32e1ad841..9c40b6552dc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GuenhwyvarToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GuenhwyvarToken.java @@ -6,8 +6,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -24,8 +22,6 @@ public final class GuenhwyvarToken extends TokenImpl { // Trample this.addAbility(TrampleAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("AFR"); } private GuenhwyvarToken(final GuenhwyvarToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/HammerOfPurphorosGolemToken.java b/Mage/src/main/java/mage/game/permanent/token/HammerOfPurphorosGolemToken.java index f910e371949..287cb439030 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HammerOfPurphorosGolemToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HammerOfPurphorosGolemToken.java @@ -1,19 +1,16 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** - * * @author spjspj */ public final class HammerOfPurphorosGolemToken extends TokenImpl { public HammerOfPurphorosGolemToken() { super("Golem Token", "3/3 colorless Golem enchantment artifact creature token"); - setOriginalExpansionSetCode("THS"); cardType.add(CardType.ENCHANTMENT); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/HasteGolemToken.java b/Mage/src/main/java/mage/game/permanent/token/HasteGolemToken.java index bcfcf1ee3b5..411af640a4c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HasteGolemToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HasteGolemToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author PurpleCrowbar */ @@ -24,8 +22,6 @@ public final class HasteGolemToken extends TokenImpl { power = new MageInt(xValue); toughness = new MageInt(xValue); this.addAbility(HasteAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("ONC"); } public HasteGolemToken(final HasteGolemToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/HazezonTamarSandWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/HazezonTamarSandWarriorToken.java index 943a016fbc5..47146996621 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HazezonTamarSandWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HazezonTamarSandWarriorToken.java @@ -1,4 +1,3 @@ - package mage.game.permanent.token; import mage.MageInt; @@ -6,7 +5,6 @@ import mage.constants.CardType; import mage.constants.SubType; /** - * * @author spjspj */ public final class HazezonTamarSandWarriorToken extends TokenImpl { @@ -21,7 +19,6 @@ public final class HazezonTamarSandWarriorToken extends TokenImpl { subtype.add(SubType.WARRIOR); power = new MageInt(1); toughness = new MageInt(1); - setOriginalExpansionSetCode("DMC"); } public HazezonTamarSandWarriorToken(final HazezonTamarSandWarriorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/HellionToken.java b/Mage/src/main/java/mage/game/permanent/token/HellionToken.java index bee514f974a..5cc23ebdedc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HellionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HellionToken.java @@ -1,4 +1,3 @@ - package mage.game.permanent.token; import mage.MageInt; @@ -6,10 +5,7 @@ import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** - * * @author spjspj */ public final class HellionToken extends TokenImpl { @@ -30,8 +26,6 @@ public final class HellionToken extends TokenImpl { subtype.add(SubType.HELLION); power = new MageInt(4); toughness = new MageInt(4); - - availableImageSetCodes = Arrays.asList("ROE", "DDP", "M13", "PCA"); } public HellionToken(final HellionToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/HornetToken.java b/Mage/src/main/java/mage/game/permanent/token/HornetToken.java index e25a0052726..62842b4d189 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HornetToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HornetToken.java @@ -1,5 +1,3 @@ - - package mage.game.permanent.token; import mage.MageInt; @@ -9,18 +7,16 @@ import mage.constants.CardType; import mage.constants.SubType; /** - * * @author FenrisulfrX */ public final class HornetToken extends TokenImpl { - + public HornetToken() { this("DDE"); } - + public HornetToken(String setCode) { super("Hornet Token", "1/1 colorless Insect artifact creature token with flying and haste"); - this.setOriginalExpansionSetCode(setCode); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.INSECT); diff --git a/Mage/src/main/java/mage/game/permanent/token/Horror2Token.java b/Mage/src/main/java/mage/game/permanent/token/Horror2Token.java index 0c0eee08392..eb02ba13d27 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Horror2Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Horror2Token.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -18,8 +16,6 @@ public final class Horror2Token extends TokenImpl { subtype.add(SubType.HORROR); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("CLB"); } public Horror2Token(final Horror2Token token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/HorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/HorrorToken.java index 301bfa92ed9..f8133a39e03 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HorrorToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -18,8 +16,6 @@ public final class HorrorToken extends TokenImpl { subtype.add(SubType.HORROR); power = new MageInt(4); toughness = new MageInt(4); - - availableImageSetCodes = Arrays.asList("RAV", "C21"); } public HorrorToken(final HorrorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/HourOfNeedSphinxToken.java b/Mage/src/main/java/mage/game/permanent/token/HourOfNeedSphinxToken.java index 69839e16969..0b76f7b2ac7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HourOfNeedSphinxToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HourOfNeedSphinxToken.java @@ -1,20 +1,17 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class HourOfNeedSphinxToken extends TokenImpl { public HourOfNeedSphinxToken() { super("Sphinx Token", "4/4 blue Sphinx creature token with flying"); - this.setOriginalExpansionSetCode("JOU"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.SPHINX); diff --git a/Mage/src/main/java/mage/game/permanent/token/HumanClericToken.java b/Mage/src/main/java/mage/game/permanent/token/HumanClericToken.java index 0c286833eb7..df2a1fd1999 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HumanClericToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HumanClericToken.java @@ -1,14 +1,10 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; - -import java.util.Arrays; /** - * * @author spjspj */ public final class HumanClericToken extends TokenImpl { @@ -22,9 +18,8 @@ public final class HumanClericToken extends TokenImpl { color.setBlack(true); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes.addAll(Arrays.asList("SOI", "30A")); } + public HumanClericToken(final HumanClericToken token) { super(token); } diff --git a/Mage/src/main/java/mage/game/permanent/token/HumanMonkToken.java b/Mage/src/main/java/mage/game/permanent/token/HumanMonkToken.java index c8dc6597c58..7d95ca184a2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HumanMonkToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HumanMonkToken.java @@ -5,8 +5,6 @@ import mage.abilities.mana.GreenManaAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -21,8 +19,6 @@ public final class HumanMonkToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); addAbility(new GreenManaAbility()); - - availableImageSetCodes = Arrays.asList("NEO"); } public HumanMonkToken(final HumanMonkToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/HumanSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/HumanSoldierToken.java index 7502877b4a4..6c69bb86b94 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HumanSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HumanSoldierToken.java @@ -3,9 +3,6 @@ package mage.game.permanent.token; import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.util.RandomUtil; - -import java.util.Arrays; public final class HumanSoldierToken extends TokenImpl { @@ -17,17 +14,6 @@ public final class HumanSoldierToken extends TokenImpl { color.setWhite(true); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("SOI", "THB", "IKO", "MIC", "2XM", "NCC", "GN3", "ONC"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("IKO")) { - setTokenType(RandomUtil.nextInt(3) + 1); // 1...3 - } } public HumanSoldierToken(final HumanSoldierToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/HumanSoldierTrainingToken.java b/Mage/src/main/java/mage/game/permanent/token/HumanSoldierTrainingToken.java index e1f345f844b..2817535f1e5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HumanSoldierTrainingToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HumanSoldierTrainingToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.TrainingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -24,8 +22,6 @@ public class HumanSoldierTrainingToken extends TokenImpl { // Training (Whenever this creature attacks with another creature with greater power, put a +1/+1 counter on this creature.) this.addAbility(new TrainingAbility()); - - availableImageSetCodes = Arrays.asList("VOW"); } private HumanSoldierTrainingToken(final HumanSoldierTrainingToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/HumanToken.java b/Mage/src/main/java/mage/game/permanent/token/HumanToken.java index 6081f1965f3..5f556234d2f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HumanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HumanToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author LoneFox */ @@ -18,8 +16,6 @@ public final class HumanToken extends TokenImpl { subtype.add(SubType.HUMAN); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes.addAll(Arrays.asList("DKA", "AVR", "FNMP", "RNA", "ELD", "C19", "C20", "MID", "VOW", "NCC", "DDQ", "CLB", "DMC", "ONC", "30A", "MOC")); } public HumanToken(final HumanToken token) { @@ -30,19 +26,4 @@ public final class HumanToken extends TokenImpl { public HumanToken copy() { return new HumanToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode().equals("VOW")) { - this.setTokenType(2); - } - if (getOriginalExpansionSetCode().equals("AVR")) { - this.setTokenType(2); - } - if (getOriginalExpansionSetCode().equals("MOC")) { - this.setTokenType(2); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/HumanWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/HumanWarriorToken.java index b9afdf97cb8..8212fc280a7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HumanWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HumanWarriorToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -19,8 +17,6 @@ public final class HumanWarriorToken extends TokenImpl { subtype.add(SubType.WARRIOR); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("KHM", "30A"); } private HumanWarriorToken(final HumanWarriorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/HumanWizardToken.java b/Mage/src/main/java/mage/game/permanent/token/HumanWizardToken.java index 44a6380e63e..419666e1965 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HumanWizardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HumanWizardToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - public final class HumanWizardToken extends TokenImpl { public HumanWizardToken() { @@ -16,8 +14,6 @@ public final class HumanWizardToken extends TokenImpl { color.setBlue(true); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("EMN", "30A"); } public HumanWizardToken(final HumanWizardToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/HungryForMoreVampireToken.java b/Mage/src/main/java/mage/game/permanent/token/HungryForMoreVampireToken.java index 139f6c6a58e..2401e767122 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HungryForMoreVampireToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HungryForMoreVampireToken.java @@ -7,8 +7,6 @@ import mage.abilities.keyword.TrampleAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -25,8 +23,6 @@ public final class HungryForMoreVampireToken extends TokenImpl { addAbility(TrampleAbility.getInstance()); addAbility(LifelinkAbility.getInstance()); addAbility(HasteAbility.getInstance()); - - availableImageSetCodes.addAll(Arrays.asList("MID")); } public HungryForMoreVampireToken(final HungryForMoreVampireToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/HuntedCentaurToken.java b/Mage/src/main/java/mage/game/permanent/token/HuntedCentaurToken.java index 56d50e2fb70..e549e2da480 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HuntedCentaurToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HuntedCentaurToken.java @@ -1,17 +1,12 @@ - package mage.game.permanent.token; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.ProtectionAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author LevelX2 */ public final class HuntedCentaurToken extends TokenImpl { @@ -24,8 +19,6 @@ public final class HuntedCentaurToken extends TokenImpl { power = new MageInt(3); toughness = new MageInt(3); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK)); - - availableImageSetCodes = Arrays.asList("RTR", "MM3", "CLB"); } public HuntedCentaurToken(final HuntedCentaurToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/HuntedDragonKnightToken.java b/Mage/src/main/java/mage/game/permanent/token/HuntedDragonKnightToken.java index f0c19eceb5a..ebc60994eab 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HuntedDragonKnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HuntedDragonKnightToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -20,8 +18,6 @@ public final class HuntedDragonKnightToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); this.addAbility(FirstStrikeAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("ORI", "RTR", "C15", "CM2"); } public HuntedDragonKnightToken(final HuntedDragonKnightToken token) { @@ -31,13 +27,4 @@ public final class HuntedDragonKnightToken extends TokenImpl { public HuntedDragonKnightToken copy() { return new HuntedDragonKnightToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C15")) { - setTokenType(1); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/HunterToken.java b/Mage/src/main/java/mage/game/permanent/token/HunterToken.java index d85f56f5089..3492863d569 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HunterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HunterToken.java @@ -1,5 +1,3 @@ - - package mage.game.permanent.token; import mage.MageInt; @@ -7,14 +5,12 @@ import mage.constants.CardType; import mage.constants.SubType; /** - * * @author spjspj */ public final class HunterToken extends TokenImpl { public HunterToken() { super("Hunter Token", "4/4 red Hunter creature token"); - this.setOriginalExpansionSetCode("SWS"); this.power = new MageInt(4); this.toughness = new MageInt(4); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/HydraBroodmasterToken.java b/Mage/src/main/java/mage/game/permanent/token/HydraBroodmasterToken.java index 5604b846770..89be8881090 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HydraBroodmasterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HydraBroodmasterToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -22,8 +20,6 @@ public final class HydraBroodmasterToken extends TokenImpl { subtype.add(SubType.HYDRA); this.power = new MageInt(power); this.toughness = new MageInt(toughness); - - availableImageSetCodes = Arrays.asList("JOU", "C21"); } public HydraBroodmasterToken(final HydraBroodmasterToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/IcingdeathFrostTongueToken.java b/Mage/src/main/java/mage/game/permanent/token/IcingdeathFrostTongueToken.java index 39d6c118f3a..b8e0f099c96 100644 --- a/Mage/src/main/java/mage/game/permanent/token/IcingdeathFrostTongueToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/IcingdeathFrostTongueToken.java @@ -17,7 +17,6 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; -import java.util.Arrays; import java.util.Optional; /** @@ -52,8 +51,6 @@ public class IcingdeathFrostTongueToken extends TokenImpl { // Equip {2} this.addAbility(new EquipAbility(2)); - - availableImageSetCodes = Arrays.asList("AFR"); } private IcingdeathFrostTongueToken(final IcingdeathFrostTongueToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/IcyManalithToken.java b/Mage/src/main/java/mage/game/permanent/token/IcyManalithToken.java index c079c1c552f..3d33ec440d7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/IcyManalithToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/IcyManalithToken.java @@ -4,8 +4,6 @@ import mage.abilities.mana.AnyColorManaAbility; import mage.constants.CardType; import mage.constants.SuperType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -17,8 +15,6 @@ public final class IcyManalithToken extends TokenImpl { this.cardType.add(CardType.ARTIFACT); this.addAbility(new AnyColorManaAbility()); - - availableImageSetCodes = Arrays.asList("KHM"); } private IcyManalithToken(final IcyManalithToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/IllusionToken.java b/Mage/src/main/java/mage/game/permanent/token/IllusionToken.java index 430dca6853c..3bc89651fe2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/IllusionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/IllusionToken.java @@ -1,13 +1,10 @@ - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; - -import java.util.Arrays; /** - * * @author spjspj */ public final class IllusionToken extends TokenImpl { @@ -20,8 +17,6 @@ public final class IllusionToken extends TokenImpl { subtype.add(SubType.ILLUSION); power = new MageInt(2); toughness = new MageInt(2); - - availableImageSetCodes = Arrays.asList("ZEN"); } public IllusionToken(final IllusionToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/IncubatorToken.java b/Mage/src/main/java/mage/game/permanent/token/IncubatorToken.java index e025147d308..65b08817c0d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/IncubatorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/IncubatorToken.java @@ -7,8 +7,6 @@ import mage.abilities.keyword.TransformAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -24,7 +22,6 @@ public final class IncubatorToken extends TokenImpl { this.addAbility(new SimpleActivatedAbility( new TransformSourceEffect().setText("transform this artifact"), new GenericManaCost(2) )); - availableImageSetCodes = Arrays.asList("MOM"); } public IncubatorToken(final IncubatorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/InklingToken.java b/Mage/src/main/java/mage/game/permanent/token/InklingToken.java index faa7804e732..11a93c8b4d5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/InklingToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/InklingToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -22,8 +20,6 @@ public final class InklingToken extends TokenImpl { toughness = new MageInt(1); addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("STX", "CLB", "BRC"); } private InklingToken(final InklingToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/InsectColorlessToken.java b/Mage/src/main/java/mage/game/permanent/token/InsectColorlessToken.java index 1caf1ec038f..4ef77166d05 100644 --- a/Mage/src/main/java/mage/game/permanent/token/InsectColorlessToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/InsectColorlessToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -20,8 +18,6 @@ public final class InsectColorlessToken extends TokenImpl { toughness = new MageInt(1); addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("40K"); } public InsectColorlessToken(final InsectColorlessToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/InsectDeathToken.java b/Mage/src/main/java/mage/game/permanent/token/InsectDeathToken.java index 2c7985c8998..57a5cf426b5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/InsectDeathToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/InsectDeathToken.java @@ -6,8 +6,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -22,8 +20,6 @@ public final class InsectDeathToken extends TokenImpl { toughness = new MageInt(1); addAbility(FlyingAbility.getInstance()); addAbility(DeathtouchAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("M15", "C20", "C21", "CLB"); } public InsectDeathToken(final InsectDeathToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/InsectInfectToken.java b/Mage/src/main/java/mage/game/permanent/token/InsectInfectToken.java index f67299674d2..91a9ab3bb55 100644 --- a/Mage/src/main/java/mage/game/permanent/token/InsectInfectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/InsectInfectToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.InfectAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author nantuko */ @@ -21,7 +19,6 @@ public final class InsectInfectToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); addAbility(InfectAbility.getInstance()); - availableImageSetCodes = Arrays.asList("SOM", "ONC"); } public InsectInfectToken(final InsectInfectToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/InsectToken.java b/Mage/src/main/java/mage/game/permanent/token/InsectToken.java index 12433a9340b..5116f77bf32 100644 --- a/Mage/src/main/java/mage/game/permanent/token/InsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/InsectToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author BetaSteward_at_googlemail.com */ @@ -17,14 +15,11 @@ public final class InsectToken extends TokenImpl { public InsectToken(String setCode) { super("Insect Token", "1/1 green Insect creature token"); - setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.INSECT); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("M10", "MM2", "SOI", "ZNR", "VOW", "NCC", "PCA", "CN2", "A25", "DMR"); } public InsectToken(final InsectToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/IxalanVampireToken.java b/Mage/src/main/java/mage/game/permanent/token/IxalanVampireToken.java index d19dfd27f9a..1f29aea247c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/IxalanVampireToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/IxalanVampireToken.java @@ -1,15 +1,11 @@ - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.LifelinkAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author TheElk801 */ public final class IxalanVampireToken extends TokenImpl { @@ -22,8 +18,6 @@ public final class IxalanVampireToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); addAbility(LifelinkAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("XLN", "2X2", "MOM"); } public IxalanVampireToken(final IxalanVampireToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/IzoniInsectToken.java b/Mage/src/main/java/mage/game/permanent/token/IzoniInsectToken.java index e62b2f97416..21b136645ac 100644 --- a/Mage/src/main/java/mage/game/permanent/token/IzoniInsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/IzoniInsectToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -19,8 +17,6 @@ public final class IzoniInsectToken extends TokenImpl { subtype.add(SubType.INSECT); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("GRN", "MH2"); } public IzoniInsectToken(final IzoniInsectToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/JoinTheRanksSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/JoinTheRanksSoldierToken.java index b7d6be41b55..2502703c4be 100644 --- a/Mage/src/main/java/mage/game/permanent/token/JoinTheRanksSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/JoinTheRanksSoldierToken.java @@ -1,19 +1,16 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** - * * @author spjspj */ public final class JoinTheRanksSoldierToken extends TokenImpl { public JoinTheRanksSoldierToken() { super("Soldier Ally Token", "1/1 white Soldier Ally creature token"); - this.setOriginalExpansionSetCode("WWK"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.SOLDIER); diff --git a/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java index c1a7f5155f2..03f5a4f3c89 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java @@ -1,21 +1,19 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; + import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.continuous.SetBasePowerToughnessSourceEffect; +import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; /** - * * @author spjspj */ public final class KalonianTwingroveTreefolkWarriorToken extends TokenImpl { - + static final FilterControlledPermanent filterLands = new FilterControlledPermanent("Forests you control"); static { @@ -24,7 +22,6 @@ public final class KalonianTwingroveTreefolkWarriorToken extends TokenImpl { public KalonianTwingroveTreefolkWarriorToken() { super("Treefolk Warrior Token", "green Treefolk Warrior creature token with \"This creature's power and toughness are each equal to the number of Forests you control.\""); - this.setOriginalExpansionSetCode("M15"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.TREEFOLK); diff --git a/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java b/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java index 3111cfeafbc..bb32edfd4de 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java @@ -9,8 +9,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; -import java.util.Arrays; - /** * @author spjspj */ @@ -28,8 +26,6 @@ public final class KarnConstructToken extends TokenImpl { new BoostSourceEffect(ArtifactYouControlCount.instance, ArtifactYouControlCount.instance, Duration.WhileOnBattlefield) .setText("This creature gets +1/+1 for each artifact you control") )); - - availableImageSetCodes = Arrays.asList("DOM", "MH1", "C21", "MH2", "MED", "BRO", "DMR"); } public KarnConstructToken(final KarnConstructToken token) { @@ -39,19 +35,4 @@ public final class KarnConstructToken extends TokenImpl { public KarnConstructToken copy() { return new KarnConstructToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C21")) { - setTokenType(2); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MED")) { - setTokenType(1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("BRO")) { - setTokenType(1); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/KaroxBladewingDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/KaroxBladewingDragonToken.java index cc7fb975b77..3417cf1fffc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KaroxBladewingDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KaroxBladewingDragonToken.java @@ -1,10 +1,5 @@ - package mage.game.permanent.token; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; @@ -13,21 +8,12 @@ import mage.constants.SuperType; /** * @author JRHerlehy - * Created on 4/5/18. + * Created on 4/5/18. */ public final class KaroxBladewingDragonToken extends TokenImpl { - static final private List tokenImageSets = new ArrayList<>(); - static { - tokenImageSets.addAll(Arrays.asList("DOM")); - } - public KaroxBladewingDragonToken() { super("Karox Bladewing Token", "legendary 4/4 red Dragon creature token with flying"); - - availableImageSetCodes = tokenImageSets; - this.setOriginalExpansionSetCode("DOM"); - this.power = new MageInt(4); this.toughness = new MageInt(4); this.addSuperType(SuperType.LEGENDARY); diff --git a/Mage/src/main/java/mage/game/permanent/token/KavuAllColorToken.java b/Mage/src/main/java/mage/game/permanent/token/KavuAllColorToken.java index 50b3bd2a744..28b6eed3e27 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KavuAllColorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KavuAllColorToken.java @@ -26,7 +26,6 @@ public final class KavuAllColorToken extends TokenImpl { toughness = new MageInt(3); this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("This creature is all colors"))); this.addAbility(TrampleAbility.getInstance()); - setOriginalExpansionSetCode("DMC"); } public KavuAllColorToken(final KavuAllColorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/KeimiToken.java b/Mage/src/main/java/mage/game/permanent/token/KeimiToken.java index fb154e2d992..3880f955384 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KeimiToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KeimiToken.java @@ -10,8 +10,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.StaticFilters; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -33,8 +31,6 @@ public final class KeimiToken extends TokenImpl { ); ability.addEffect(new GainLifeEffect(1).concatBy("and")); this.addAbility(ability); - - availableImageSetCodes = Arrays.asList("NEO"); } private KeimiToken(final KeimiToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/KelpToken.java b/Mage/src/main/java/mage/game/permanent/token/KelpToken.java index 7dfa0862a80..b08b0a559a5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KelpToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KelpToken.java @@ -1,20 +1,17 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.DefenderAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class KelpToken extends TokenImpl { public KelpToken() { super("Kelp", "0/1 blue Plant Wall creature token with defender named Kelp"); - this.setOriginalExpansionSetCode("MIR"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.PLANT); diff --git a/Mage/src/main/java/mage/game/permanent/token/KherKeepKoboldToken.java b/Mage/src/main/java/mage/game/permanent/token/KherKeepKoboldToken.java index cc598ece0b9..1247758d27c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KherKeepKoboldToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KherKeepKoboldToken.java @@ -1,14 +1,10 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; - -import java.util.Arrays; /** - * * @author spjspj */ public final class KherKeepKoboldToken extends TokenImpl { @@ -20,9 +16,8 @@ public final class KherKeepKoboldToken extends TokenImpl { subtype.add(SubType.KOBOLD); power = new MageInt(0); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("A25", "TSR", "CLB", "DMC", "ONC", "MOC"); } + public KherKeepKoboldToken(final KherKeepKoboldToken token) { super(token); } diff --git a/Mage/src/main/java/mage/game/permanent/token/KithkinSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/KithkinSoldierToken.java index d6f0f1e9bfa..927e556ce6d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KithkinSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KithkinSoldierToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author Loki */ @@ -19,8 +17,6 @@ public final class KithkinSoldierToken extends TokenImpl { subtype.add(SubType.SOLDIER); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("LRW", "SHM", "MMA", "KHC", "CMA"); } public KithkinSoldierToken(final KithkinSoldierToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/KnightAllyToken.java b/Mage/src/main/java/mage/game/permanent/token/KnightAllyToken.java index 1a457412dca..908e965af3a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KnightAllyToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KnightAllyToken.java @@ -1,19 +1,16 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** - * * @author spjspj */ public final class KnightAllyToken extends TokenImpl { public KnightAllyToken() { super("Knight Ally Token", "2/2 white Knight Ally creature token"); - this.setExpansionSetCodeForImage("BFZ"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.KNIGHT); diff --git a/Mage/src/main/java/mage/game/permanent/token/KnightToken.java b/Mage/src/main/java/mage/game/permanent/token/KnightToken.java index fd43186d22a..dfeded8d6a0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KnightToken.java @@ -4,9 +4,6 @@ import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; import mage.constants.CardType; import mage.constants.SubType; -import mage.util.RandomUtil; - -import java.util.Arrays; /** * @author LevelX2 @@ -22,8 +19,6 @@ public final class KnightToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); this.addAbility(VigilanceAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("C15", "CMA", "ORI", "RTR", "M19", "ELD", "M21", "AFC", "MIC", "DOM", "2X2", "DMC", "MOC"); } public KnightToken(final KnightToken token) { @@ -33,21 +28,4 @@ public final class KnightToken extends TokenImpl { public KnightToken copy() { return new KnightToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C15")) { - setTokenType(2); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("DOM")) { - setTokenType(RandomUtil.nextInt(2) + 1); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("DMC")) { - setTokenType(1); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/KnightWhiteBlueToken.java b/Mage/src/main/java/mage/game/permanent/token/KnightWhiteBlueToken.java index 30ed39c2a1e..27b430ba929 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KnightWhiteBlueToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KnightWhiteBlueToken.java @@ -20,8 +20,6 @@ public final class KnightWhiteBlueToken extends TokenImpl { toughness = new MageInt(2); addAbility(VigilanceAbility.getInstance()); - - this.setExpansionSetCodeForImage("MOM"); } public KnightWhiteBlueToken(final KnightWhiteBlueToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/KomasCoilToken.java b/Mage/src/main/java/mage/game/permanent/token/KomasCoilToken.java index a58dc5be589..231d5abed7d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KomasCoilToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KomasCoilToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - public final class KomasCoilToken extends TokenImpl { public KomasCoilToken() { @@ -15,8 +13,6 @@ public final class KomasCoilToken extends TokenImpl { color.setBlue(true); power = new MageInt(3); toughness = new MageInt(3); - - availableImageSetCodes = Arrays.asList("KHM"); } private KomasCoilToken(final KomasCoilToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/KorAllyToken.java b/Mage/src/main/java/mage/game/permanent/token/KorAllyToken.java index a31888bad98..33be15e512a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KorAllyToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KorAllyToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - public final class KorAllyToken extends TokenImpl { public KorAllyToken() { @@ -16,8 +14,6 @@ public final class KorAllyToken extends TokenImpl { color.setWhite(true); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("BFZ", "ZNC"); } public KorAllyToken(final KorAllyToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/KorSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/KorSoldierToken.java index 82a5a31c281..f631f8a67fc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KorSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KorSoldierToken.java @@ -1,14 +1,10 @@ - - package mage.game.permanent.token; -import java.util.Arrays; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** - * * @author LoneFox */ public final class KorSoldierToken extends TokenImpl { @@ -21,8 +17,8 @@ public final class KorSoldierToken extends TokenImpl { subtype.add(SubType.SOLDIER); power = new MageInt(1); toughness = new MageInt(1); - availableImageSetCodes.addAll(Arrays.asList("C14", "ZEN")); } + public KorSoldierToken(final KorSoldierToken token) { super(token); } diff --git a/Mage/src/main/java/mage/game/permanent/token/KorWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/KorWarriorToken.java index 85afc7a1ee4..13deccaad1c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KorWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KorWarriorToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -19,8 +17,6 @@ public final class KorWarriorToken extends TokenImpl { color.setWhite(true); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("ZNR", "CLB"); } public KorWarriorToken(final KorWarriorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/Kraken11Token.java b/Mage/src/main/java/mage/game/permanent/token/Kraken11Token.java index d639c907fd5..0bae7ac720d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Kraken11Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Kraken11Token.java @@ -18,8 +18,6 @@ public final class Kraken11Token extends TokenImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(TrampleAbility.getInstance()); - - this.setExpansionSetCodeForImage("MOM"); } private Kraken11Token(final Kraken11Token token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/Kraken99Token.java b/Mage/src/main/java/mage/game/permanent/token/Kraken99Token.java index b24889d849b..0e2fdde96f5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Kraken99Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Kraken99Token.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -18,8 +16,6 @@ public final class Kraken99Token extends TokenImpl { subtype.add(SubType.KRAKEN); power = new MageInt(9); toughness = new MageInt(9); - - availableImageSetCodes = Arrays.asList("BNG", "C14", "DDO", "C21", "A25"); } public Kraken99Token(final Kraken99Token token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/LandMineToken.java b/Mage/src/main/java/mage/game/permanent/token/LandMineToken.java index 1da46a84bc2..64897b80dab 100644 --- a/Mage/src/main/java/mage/game/permanent/token/LandMineToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/LandMineToken.java @@ -1,5 +1,3 @@ - - package mage.game.permanent.token; import mage.abilities.Ability; @@ -16,7 +14,6 @@ import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetCreaturePermanent; /** - * * @author spjspj */ public final class LandMineToken extends TokenImpl { @@ -29,9 +26,7 @@ public final class LandMineToken extends TokenImpl { public LandMineToken() { super("Land Mine", "colorless artifact token named Land Mine with \"{R}, Sacrifice this artifact: This artifact deals 2 damage to target attacking creature without flying.\""); - this.setOriginalExpansionSetCode("M15"); cardType.add(CardType.ARTIFACT); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage/src/main/java/mage/game/permanent/token/LeafdrakeRoostDrakeToken.java b/Mage/src/main/java/mage/game/permanent/token/LeafdrakeRoostDrakeToken.java index 219ffc9ffa1..be8a7f16fe0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/LeafdrakeRoostDrakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/LeafdrakeRoostDrakeToken.java @@ -1,38 +1,17 @@ - - package mage.game.permanent.token; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class LeafdrakeRoostDrakeToken extends TokenImpl { - static final private List tokenImageSets = new ArrayList<>(); - - static { - tokenImageSets.addAll(Arrays.asList("CMA")); - } - public LeafdrakeRoostDrakeToken() { - this(null, 0); - } - - public LeafdrakeRoostDrakeToken(String setCode) { - this(setCode, 0); - } - - public LeafdrakeRoostDrakeToken(String setCode, int tokenType) { super("Drake Token", "2/2 green and blue Drake creature token with flying"); - availableImageSetCodes = tokenImageSets; - setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); color.setGreen(true); color.setBlue(true); @@ -41,7 +20,7 @@ public final class LeafdrakeRoostDrakeToken extends TokenImpl { toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); } - + public LeafdrakeRoostDrakeToken(final LeafdrakeRoostDrakeToken token) { super(token); } diff --git a/Mage/src/main/java/mage/game/permanent/token/LightningRagerToken.java b/Mage/src/main/java/mage/game/permanent/token/LightningRagerToken.java index be7110e072d..c707b5f9cd7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/LightningRagerToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/LightningRagerToken.java @@ -9,8 +9,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; -import java.util.Arrays; - /** * @author spjspj */ @@ -28,8 +26,6 @@ public final class LightningRagerToken extends TokenImpl { this.addAbility(TrampleAbility.getInstance()); this.addAbility(HasteAbility.getInstance()); this.addAbility(new BeginningOfEndStepTriggeredAbility(new SacrificeSourceEffect(), TargetController.NEXT, false)); - - availableImageSetCodes = Arrays.asList("C15", "CM2", "NCC"); } public LightningRagerToken(final LightningRagerToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/LlanowarElvesToken.java b/Mage/src/main/java/mage/game/permanent/token/LlanowarElvesToken.java index 4dc4bd75fb9..f0fb0b300ec 100644 --- a/Mage/src/main/java/mage/game/permanent/token/LlanowarElvesToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/LlanowarElvesToken.java @@ -1,14 +1,11 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.mana.GreenManaAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class LlanowarElvesToken extends TokenImpl { @@ -24,8 +21,6 @@ public final class LlanowarElvesToken extends TokenImpl { // {T}: Add {G}. this.addAbility(new GreenManaAbility()); - - availableImageSetCodes = Arrays.asList("TSR"); } public LlanowarElvesToken(final LlanowarElvesToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/LolthSpiderToken.java b/Mage/src/main/java/mage/game/permanent/token/LolthSpiderToken.java index 3a7819a67cc..92e5b7ce18e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/LolthSpiderToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/LolthSpiderToken.java @@ -6,8 +6,6 @@ import mage.abilities.keyword.ReachAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -26,8 +24,6 @@ public final class LolthSpiderToken extends TokenImpl { // Reach this.addAbility(ReachAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("AFR"); } public LolthSpiderToken(final LolthSpiderToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/MagesAttendantToken.java b/Mage/src/main/java/mage/game/permanent/token/MagesAttendantToken.java index 0df5ed602e6..1e1640a8751 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MagesAttendantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MagesAttendantToken.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.StaticFilters; import mage.target.TargetSpell; -import java.util.Arrays; /** * @author TheElk801 @@ -31,8 +30,6 @@ public final class MagesAttendantToken extends TokenImpl { ability.addCost(new SacrificeSourceCost().setText("sacrifice this creature")); ability.addTarget(new TargetSpell(StaticFilters.FILTER_SPELL_NON_CREATURE)); this.addAbility(ability); - - availableImageSetCodes = Arrays.asList("SNC", "CLB"); } private MagesAttendantToken(final MagesAttendantToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/MarduStrikeLeaderWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/MarduStrikeLeaderWarriorToken.java index ee180f1e781..98232cdbf9d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MarduStrikeLeaderWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MarduStrikeLeaderWarriorToken.java @@ -1,14 +1,10 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; - -import java.util.Arrays; /** - * * @author spjspj */ public final class MarduStrikeLeaderWarriorToken extends TokenImpl { @@ -20,8 +16,6 @@ public final class MarduStrikeLeaderWarriorToken extends TokenImpl { subtype.add(SubType.WARRIOR); power = new MageInt(2); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("FRF", "CLB"); } public MarduStrikeLeaderWarriorToken(final MarduStrikeLeaderWarriorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/MaritLageToken.java b/Mage/src/main/java/mage/game/permanent/token/MaritLageToken.java index 271cd2c56be..80e60d6fca5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MaritLageToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MaritLageToken.java @@ -7,8 +7,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import java.util.Arrays; - /** * @author spjspj */ @@ -26,8 +24,6 @@ public final class MaritLageToken extends TokenImpl { this.addAbility(FlyingAbility.getInstance()); this.addAbility(IndestructibleAbility.getInstance()); - - availableImageSetCodes.addAll(Arrays.asList("CSP", "MH1", "UMA", "2XM", "V16", "DMR")); } public MaritLageToken(final MaritLageToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/MasterOfWavesElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/MasterOfWavesElementalToken.java index 09e6098d19f..e226e9eb881 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MasterOfWavesElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MasterOfWavesElementalToken.java @@ -1,14 +1,10 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; - -import java.util.Arrays; /** - * * @author spjspj */ public final class MasterOfWavesElementalToken extends TokenImpl { @@ -22,8 +18,6 @@ public final class MasterOfWavesElementalToken extends TokenImpl { this.power = new MageInt(1); this.toughness = new MageInt(0); - - availableImageSetCodes = Arrays.asList("THS", "DDT"); } public MasterOfWavesElementalToken(final MasterOfWavesElementalToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/MelokuTheCloudedMirrorToken.java b/Mage/src/main/java/mage/game/permanent/token/MelokuTheCloudedMirrorToken.java index fa7d177ede9..f7d2f7aa7df 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MelokuTheCloudedMirrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MelokuTheCloudedMirrorToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -21,8 +19,6 @@ public final class MelokuTheCloudedMirrorToken extends TokenImpl { toughness = new MageInt(1); addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("CHK", "MMA", "MH1", "CMR"); } public MelokuTheCloudedMirrorToken(final MelokuTheCloudedMirrorToken token) { @@ -32,9 +28,4 @@ public final class MelokuTheCloudedMirrorToken extends TokenImpl { public MelokuTheCloudedMirrorToken copy() { return new MelokuTheCloudedMirrorToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/MerfolkToken.java b/Mage/src/main/java/mage/game/permanent/token/MerfolkToken.java index 543e40d58c1..fd09be8309a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MerfolkToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MerfolkToken.java @@ -1,14 +1,10 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; - -import java.util.Arrays; /** - * * @author spjspj */ public final class MerfolkToken extends TokenImpl { @@ -20,8 +16,6 @@ public final class MerfolkToken extends TokenImpl { subtype.add(SubType.MERFOLK); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("ZEN", "DMC"); } public MerfolkToken(final MerfolkToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/MerfolkWizardToken.java b/Mage/src/main/java/mage/game/permanent/token/MerfolkWizardToken.java index 62b0112d7e0..a732a3e9887 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MerfolkWizardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MerfolkWizardToken.java @@ -4,10 +4,7 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** - * * @author Loki */ public final class MerfolkWizardToken extends TokenImpl { @@ -20,8 +17,6 @@ public final class MerfolkWizardToken extends TokenImpl { subtype.add(SubType.WIZARD); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("LRW"); } public MerfolkWizardToken(final MerfolkWizardToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/MesmerizingBenthidToken.java b/Mage/src/main/java/mage/game/permanent/token/MesmerizingBenthidToken.java index 685f5dc84d5..f624bf9050d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MesmerizingBenthidToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MesmerizingBenthidToken.java @@ -15,8 +15,6 @@ public final class MesmerizingBenthidToken extends TokenImpl { super("Illusion Token", "0/2 blue Illusion creature token with \"Whenever this creature blocks a creature, that creature doesn't untap during its controller's next untap step.\""); cardType.add(CardType.CREATURE); color.setBlue(true); - setOriginalExpansionSetCode("RNA"); - subtype.add(SubType.ILLUSION); power = new MageInt(0); toughness = new MageInt(2); diff --git a/Mage/src/main/java/mage/game/permanent/token/MetallicSliverToken.java b/Mage/src/main/java/mage/game/permanent/token/MetallicSliverToken.java index 7ee8dfc3652..443ac9152d4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MetallicSliverToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MetallicSliverToken.java @@ -1,14 +1,10 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; - -import java.util.Arrays; /** - * * @author spjspj */ public final class MetallicSliverToken extends TokenImpl { @@ -20,8 +16,6 @@ public final class MetallicSliverToken extends TokenImpl { subtype.add(SubType.SLIVER); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("TSR"); } public MetallicSliverToken(final MetallicSliverToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/MetallurgicSummoningsConstructToken.java b/Mage/src/main/java/mage/game/permanent/token/MetallurgicSummoningsConstructToken.java index 7e4e7a23bb7..e57702c7d2b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MetallurgicSummoningsConstructToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MetallurgicSummoningsConstructToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -22,8 +20,6 @@ public final class MetallurgicSummoningsConstructToken extends TokenImpl { subtype.add(SubType.CONSTRUCT); power = new MageInt(xValue); toughness = new MageInt(xValue); - - availableImageSetCodes = Arrays.asList("KLD", "C21"); } public MetallurgicSummoningsConstructToken(final MetallurgicSummoningsConstructToken token) { @@ -33,16 +29,4 @@ public final class MetallurgicSummoningsConstructToken extends TokenImpl { public MetallurgicSummoningsConstructToken copy() { return new MetallurgicSummoningsConstructToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("KLD")) { - setTokenType(2); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C21")) { - setTokenType(1); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/MinionToken.java b/Mage/src/main/java/mage/game/permanent/token/MinionToken.java index da91cbc7fd0..e4f173b26cd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MinionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MinionToken.java @@ -1,5 +1,3 @@ - - package mage.game.permanent.token; import mage.MageInt; @@ -7,18 +5,16 @@ import mage.constants.CardType; import mage.constants.SubType; /** - * * @author FenrisulfrX */ public final class MinionToken extends TokenImpl { - + public MinionToken() { this("DDE"); } - + public MinionToken(String setCode) { super("Phyrexian Minion Token", "X/X black Phyrexian Minion creature token"); - this.setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); subtype.add(SubType.PHYREXIAN); subtype.add(SubType.MINION); diff --git a/Mage/src/main/java/mage/game/permanent/token/MinionToken2.java b/Mage/src/main/java/mage/game/permanent/token/MinionToken2.java index 91ec948d84f..b678ccfff38 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MinionToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/MinionToken2.java @@ -1,5 +1,3 @@ - - package mage.game.permanent.token; import mage.MageInt; @@ -7,18 +5,12 @@ import mage.constants.CardType; import mage.constants.SubType; /** - * * @author Quercitron */ public final class MinionToken2 extends TokenImpl { public MinionToken2() { - this("PCY"); - } - - public MinionToken2(String setCode) { super("Minion Token", "1/1 black Minion creature token"); - this.setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); subtype.add(SubType.MINION); color.setBlack(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/MinnWilyIllusionistToken.java b/Mage/src/main/java/mage/game/permanent/token/MinnWilyIllusionistToken.java index 26af3f0fecf..b2ae7328ff0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MinnWilyIllusionistToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MinnWilyIllusionistToken.java @@ -13,8 +13,6 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.AnotherPredicate; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -38,8 +36,6 @@ public final class MinnWilyIllusionistToken extends TokenImpl { addAbility(new SimpleStaticAbility(new BoostSourceEffect( xValue, StaticValue.get(0), Duration.WhileOnBattlefield ).setText("this creature gets +1/+0 for each other Illusion you control"))); - - availableImageSetCodes = Arrays.asList("AFC"); } public MinnWilyIllusionistToken(final MinnWilyIllusionistToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/MinotaurToken.java b/Mage/src/main/java/mage/game/permanent/token/MinotaurToken.java index 653142a5a2e..9424b68e8cf 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MinotaurToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MinotaurToken.java @@ -6,8 +6,6 @@ import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -29,8 +27,6 @@ public final class MinotaurToken extends TokenImpl { subtype.add(SubType.MINOTAUR); power = new MageInt(2); toughness = new MageInt(3); - - availableImageSetCodes = Arrays.asList("JOU"); } private MinotaurToken(final MinotaurToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/MonasteryMentorToken.java b/Mage/src/main/java/mage/game/permanent/token/MonasteryMentorToken.java index 138ddbcdb39..0761217758e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MonasteryMentorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MonasteryMentorToken.java @@ -1,15 +1,11 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.ProwessAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class MonasteryMentorToken extends TokenImpl { @@ -22,8 +18,6 @@ public final class MonasteryMentorToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); this.addAbility(new ProwessAbility()); - - availableImageSetCodes = Arrays.asList("FRF", "2X2", "MOM"); } public MonasteryMentorToken(final MonasteryMentorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/MonkRedToken.java b/Mage/src/main/java/mage/game/permanent/token/MonkRedToken.java index 9027b715b4a..d086a605a80 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MonkRedToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MonkRedToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.ProwessAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -20,8 +18,6 @@ public final class MonkRedToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); addAbility(new ProwessAbility()); - - availableImageSetCodes = Arrays.asList("DMU"); } public MonkRedToken(final MonkRedToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/MowuToken.java b/Mage/src/main/java/mage/game/permanent/token/MowuToken.java index f07920112ff..df3f5082ea7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MowuToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MowuToken.java @@ -5,10 +5,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import java.util.Arrays; - /** - * * @author TheElk801 */ public final class MowuToken extends TokenImpl { @@ -21,8 +18,6 @@ public final class MowuToken extends TokenImpl { subtype.add(SubType.DOG); power = new MageInt(3); toughness = new MageInt(3); - - availableImageSetCodes = Arrays.asList("GS1"); } public MowuToken(final MowuToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/MyrToken.java b/Mage/src/main/java/mage/game/permanent/token/MyrToken.java index 15af06d0add..a18363535f9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MyrToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MyrToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - public final class MyrToken extends TokenImpl { public MyrToken() { @@ -15,8 +13,6 @@ public final class MyrToken extends TokenImpl { subtype.add(SubType.MYR); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("C14", "C16", "C18", "DST", "MM2", "MRD", "SOM", "MH1", "C21", "NEC", "2XM", "BBD", "DDU", "CM2", "BRC", "ONC", "MOC"); } public MyrToken(final MyrToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/NecronWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/NecronWarriorToken.java index e7ace281be2..c6aabacb254 100644 --- a/Mage/src/main/java/mage/game/permanent/token/NecronWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/NecronWarriorToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -20,8 +18,6 @@ public final class NecronWarriorToken extends TokenImpl { subtype.add(SubType.WARRIOR); power = new MageInt(2); toughness = new MageInt(2); - - availableImageSetCodes.addAll(Arrays.asList("40K")); } public NecronWarriorToken(final NecronWarriorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/NestOfScarabsBlackInsectToken.java b/Mage/src/main/java/mage/game/permanent/token/NestOfScarabsBlackInsectToken.java index c69d849aae1..b974742ba1b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/NestOfScarabsBlackInsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/NestOfScarabsBlackInsectToken.java @@ -1,12 +1,10 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** - * * @author spjspj */ public final class NestOfScarabsBlackInsectToken extends TokenImpl { @@ -18,8 +16,6 @@ public final class NestOfScarabsBlackInsectToken extends TokenImpl { subtype.add(SubType.INSECT); power = new MageInt(1); toughness = new MageInt(1); - - setOriginalExpansionSetCode("AKH"); } public NestOfScarabsBlackInsectToken(final NestOfScarabsBlackInsectToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/NightwingHorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/NightwingHorrorToken.java index 11e3dc0735b..a5612821f3b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/NightwingHorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/NightwingHorrorToken.java @@ -1,15 +1,11 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class NightwingHorrorToken extends TokenImpl { @@ -25,8 +21,6 @@ public final class NightwingHorrorToken extends TokenImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("GTC", "GK1"); } public NightwingHorrorToken(final NightwingHorrorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/NinjaToken.java b/Mage/src/main/java/mage/game/permanent/token/NinjaToken.java index c877036d55e..0191bd47c32 100644 --- a/Mage/src/main/java/mage/game/permanent/token/NinjaToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/NinjaToken.java @@ -6,8 +6,6 @@ import mage.abilities.effects.common.combat.CantBeBlockedSourceEffect; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -22,7 +20,6 @@ public final class NinjaToken extends TokenImpl { toughness = new MageInt(1); this.addAbility(new SimpleStaticAbility(new CantBeBlockedSourceEffect().setText("this creature can't be blocked"))); - availableImageSetCodes = Arrays.asList("NEO"); } private NinjaToken(final NinjaToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/NissaSageAnimistToken.java b/Mage/src/main/java/mage/game/permanent/token/NissaSageAnimistToken.java index 40510a889a2..a4bc90e8834 100644 --- a/Mage/src/main/java/mage/game/permanent/token/NissaSageAnimistToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/NissaSageAnimistToken.java @@ -1,4 +1,3 @@ - package mage.game.permanent.token; import mage.MageInt; @@ -7,14 +6,12 @@ import mage.constants.SubType; import mage.constants.SuperType; /** - * * @author spjspj */ public final class NissaSageAnimistToken extends TokenImpl { public NissaSageAnimistToken() { super("Ashaya, the Awoken World", "Ashaya, the Awoken World, a legendary 4/4 green Elemental creature token"); - this.setOriginalExpansionSetCode("ORI"); this.supertype.add(SuperType.LEGENDARY); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage/src/main/java/mage/game/permanent/token/OctopusToken.java b/Mage/src/main/java/mage/game/permanent/token/OctopusToken.java index 16f3bfeaae5..1f545dcb96b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OctopusToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OctopusToken.java @@ -1,12 +1,10 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** - * * @author spjspj */ public final class OctopusToken extends TokenImpl { @@ -18,7 +16,6 @@ public final class OctopusToken extends TokenImpl { subtype.add(SubType.OCTOPUS); power = new MageInt(8); toughness = new MageInt(8); - this.setOriginalExpansionSetCode("BFZ"); } public OctopusToken(final OctopusToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/OgreToken.java b/Mage/src/main/java/mage/game/permanent/token/OgreToken.java index f3bbce9a02d..f8a8d94a2eb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OgreToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OgreToken.java @@ -1,14 +1,10 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; - -import java.util.Arrays; /** - * * @author spjspj */ public final class OgreToken extends TokenImpl { @@ -20,8 +16,6 @@ public final class OgreToken extends TokenImpl { subtype.add(SubType.OGRE); power = new MageInt(3); toughness = new MageInt(3); - - availableImageSetCodes = Arrays.asList("WWK", "C16", "NCC", "CLB"); } public OgreToken(final OgreToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/OgreWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/OgreWarriorToken.java index 4f7d8b31af2..b8f45c9c7ba 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OgreWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OgreWarriorToken.java @@ -3,7 +3,6 @@ package mage.game.permanent.token; import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; /** * @author TheElk801 @@ -18,8 +17,6 @@ public final class OgreWarriorToken extends TokenImpl { subtype.add(SubType.WARRIOR); power = new MageInt(4); toughness = new MageInt(3); - - availableImageSetCodes = Arrays.asList("SNC"); } public OgreWarriorToken(final OgreWarriorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/OminousRoostBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/OminousRoostBirdToken.java index 23b169db6c7..542b475bd12 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OminousRoostBirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OminousRoostBirdToken.java @@ -6,8 +6,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - public class OminousRoostBirdToken extends TokenImpl { public OminousRoostBirdToken() { @@ -20,8 +18,6 @@ public class OminousRoostBirdToken extends TokenImpl { this.addAbility(FlyingAbility.getInstance()); this.addAbility(new CanBlockOnlyFlyingAbility()); - - availableImageSetCodes = Arrays.asList("MID"); } public OminousRoostBirdToken(final OminousRoostBirdToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/OmnathElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/OmnathElementalToken.java index 16e03105858..6756e7a1f29 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OmnathElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OmnathElementalToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -13,8 +11,6 @@ public final class OmnathElementalToken extends TokenImpl { public OmnathElementalToken() { super("Elemental Token", "5/5 red and green Elemental creature token"); - setTokenType(1); - setOriginalExpansionSetCode("BFZ"); cardType.add(CardType.CREATURE); subtype.add(SubType.ELEMENTAL); @@ -22,8 +18,6 @@ public final class OmnathElementalToken extends TokenImpl { color.setGreen(true); power = new MageInt(5); toughness = new MageInt(5); - - availableImageSetCodes.addAll(Arrays.asList("BFZ", "ZNC")); } public OmnathElementalToken(final OmnathElementalToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/OneDozenEyesBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/OneDozenEyesBeastToken.java index 602d2ad1e6e..c540bba3a90 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OneDozenEyesBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OneDozenEyesBeastToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -18,8 +16,6 @@ public final class OneDozenEyesBeastToken extends TokenImpl { subtype.add(SubType.BEAST); power = new MageInt(5); toughness = new MageInt(5); - - availableImageSetCodes = Arrays.asList("MRD"); } public OneDozenEyesBeastToken(final OneDozenEyesBeastToken token) { @@ -29,13 +25,4 @@ public final class OneDozenEyesBeastToken extends TokenImpl { public OneDozenEyesBeastToken copy() { return new OneDozenEyesBeastToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C13")) { - this.setTokenType(3); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/OonaQueenFaerieRogueToken.java b/Mage/src/main/java/mage/game/permanent/token/OonaQueenFaerieRogueToken.java index 48a2eef4acd..e3be36d7403 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OonaQueenFaerieRogueToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OonaQueenFaerieRogueToken.java @@ -1,15 +1,11 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class OonaQueenFaerieRogueToken extends TokenImpl { @@ -24,9 +20,8 @@ public final class OonaQueenFaerieRogueToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("MMA", "SHM"); } + public OonaQueenFaerieRogueToken(final OonaQueenFaerieRogueToken token) { super(token); } diff --git a/Mage/src/main/java/mage/game/permanent/token/Ooze2Token.java b/Mage/src/main/java/mage/game/permanent/token/Ooze2Token.java index fd354045bbe..aa32703e2af 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Ooze2Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Ooze2Token.java @@ -1,16 +1,12 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class Ooze2Token extends TokenImpl { @@ -23,25 +19,6 @@ public final class Ooze2Token extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new OozeToken(1, 1), 2), false)); - - availableImageSetCodes = Arrays.asList("M11", "PCA", "NCC"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("M11")) { - setTokenType(2); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("PCA")) { - setTokenType(2); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("NCC")) { - setTokenType(2); - } } public Ooze2Token(final Ooze2Token token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/OozeToken.java b/Mage/src/main/java/mage/game/permanent/token/OozeToken.java index 218d46de011..49344acf1d0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OozeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OozeToken.java @@ -3,9 +3,6 @@ package mage.game.permanent.token; import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.util.RandomUtil; - -import java.util.Arrays; public final class OozeToken extends TokenImpl { @@ -25,25 +22,6 @@ public final class OozeToken extends TokenImpl { subtype.add(SubType.OOZE); power = new MageInt(0); toughness = new MageInt(0); - - availableImageSetCodes = Arrays.asList("ALA", "ROE", "RTR", "MM3", "UMA", "GK2", "2XM", "M11", "PCA", "NCC"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("M11")) { - setTokenType(1); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("PCA")) { - setTokenType(1); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("NCC")) { - setTokenType(1); - } } public OozeToken(final OozeToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/OphiomancerSnakeToken.java b/Mage/src/main/java/mage/game/permanent/token/OphiomancerSnakeToken.java index edaad29b191..8e3cdcf3f6e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OphiomancerSnakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OphiomancerSnakeToken.java @@ -1,13 +1,11 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class OphiomancerSnakeToken extends TokenImpl { @@ -20,7 +18,6 @@ public final class OphiomancerSnakeToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); this.addAbility(DeathtouchAbility.getInstance()); - setOriginalExpansionSetCode("CC2"); } public OphiomancerSnakeToken(final OphiomancerSnakeToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/OrnithopterToken.java b/Mage/src/main/java/mage/game/permanent/token/OrnithopterToken.java index 39d0efc7d86..18a6060fd72 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OrnithopterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OrnithopterToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -21,8 +19,6 @@ public final class OrnithopterToken extends TokenImpl { toughness = new MageInt(2); addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("DMU"); } public OrnithopterToken(final OrnithopterToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/OviyaPashiriSageLifecrafterToken.java b/Mage/src/main/java/mage/game/permanent/token/OviyaPashiriSageLifecrafterToken.java index 3bf522a2371..0df125979f9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OviyaPashiriSageLifecrafterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OviyaPashiriSageLifecrafterToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -22,8 +20,6 @@ public final class OviyaPashiriSageLifecrafterToken extends TokenImpl { subtype.add(SubType.CONSTRUCT); power = new MageInt(number); toughness = new MageInt(number); - - availableImageSetCodes = Arrays.asList("KLD"); } public OviyaPashiriSageLifecrafterToken(final OviyaPashiriSageLifecrafterToken token) { @@ -33,13 +29,4 @@ public final class OviyaPashiriSageLifecrafterToken extends TokenImpl { public OviyaPashiriSageLifecrafterToken copy() { return new OviyaPashiriSageLifecrafterToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("KLD")) { - setTokenType(1); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/OxGreenToken.java b/Mage/src/main/java/mage/game/permanent/token/OxGreenToken.java index 3c1777497da..fa12465aac2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OxGreenToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OxGreenToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -19,8 +17,6 @@ public final class OxGreenToken extends TokenImpl { subtype.add(SubType.OX); power = new MageInt(4); toughness = new MageInt(4); - - availableImageSetCodes = Arrays.asList("CLB"); } public OxGreenToken(final OxGreenToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PegasusToken.java b/Mage/src/main/java/mage/game/permanent/token/PegasusToken.java index 85115d75048..1b03a718598 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PegasusToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PegasusToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author LoneFox */ @@ -21,8 +19,6 @@ public final class PegasusToken extends TokenImpl { toughness = new MageInt(1); addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("C14", "C19", "KHC", "CLB"); } public PegasusToken(final PegasusToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PentaviteToken.java b/Mage/src/main/java/mage/game/permanent/token/PentaviteToken.java index b749f2a7e4a..1e2c892d47c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PentaviteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PentaviteToken.java @@ -1,15 +1,11 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class PentaviteToken extends TokenImpl { @@ -22,8 +18,6 @@ public final class PentaviteToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes.addAll(Arrays.asList("M12", "C14", "CM2")); } public PentaviteToken(final PentaviteToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PenumbraBobcatToken.java b/Mage/src/main/java/mage/game/permanent/token/PenumbraBobcatToken.java index fb7f0f9f5a9..619a026e9c9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PenumbraBobcatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PenumbraBobcatToken.java @@ -1,12 +1,10 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** - * * @author spjspj */ public final class PenumbraBobcatToken extends TokenImpl { @@ -18,9 +16,6 @@ public final class PenumbraBobcatToken extends TokenImpl { subtype.add(SubType.CAT); power = new MageInt(2); toughness = new MageInt(1); - - setOriginalExpansionSetCode("DMR"); - setTokenType(1); } public PenumbraBobcatToken(final PenumbraBobcatToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PenumbraSpiderToken.java b/Mage/src/main/java/mage/game/permanent/token/PenumbraSpiderToken.java index a3e08fd7582..f0c8c5440fc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PenumbraSpiderToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PenumbraSpiderToken.java @@ -1,14 +1,11 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.ReachAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class PenumbraSpiderToken extends TokenImpl { @@ -23,8 +20,6 @@ public final class PenumbraSpiderToken extends TokenImpl { toughness = new MageInt(4); addAbility(ReachAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("MMA", "PC2", "TSR", "PCA", "MM3"); } public PenumbraSpiderToken(final PenumbraSpiderToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PenumbraWurmToken.java b/Mage/src/main/java/mage/game/permanent/token/PenumbraWurmToken.java index 6501f23b799..3b157abb63b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PenumbraWurmToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PenumbraWurmToken.java @@ -1,15 +1,11 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.TrampleAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class PenumbraWurmToken extends TokenImpl { @@ -23,8 +19,6 @@ public final class PenumbraWurmToken extends TokenImpl { toughness = new MageInt(6); this.addAbility(TrampleAbility.getInstance()); - - availableImageSetCodes.addAll(Arrays.asList("UMA")); } public PenumbraWurmToken(final PenumbraWurmToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/Pest11GainLifeToken.java b/Mage/src/main/java/mage/game/permanent/token/Pest11GainLifeToken.java index 6f6be5f4478..f2fa415d6fd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Pest11GainLifeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/Pest11GainLifeToken.java @@ -6,8 +6,6 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -23,8 +21,6 @@ public final class Pest11GainLifeToken extends TokenImpl { toughness = new MageInt(1); this.addAbility(new DiesSourceTriggeredAbility(new GainLifeEffect(1))); - - availableImageSetCodes = Arrays.asList("STX"); } private Pest11GainLifeToken(final Pest11GainLifeToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PestToken.java b/Mage/src/main/java/mage/game/permanent/token/PestToken.java index ecc96a850e0..d93d69b5f2d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PestToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PestToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -18,8 +16,6 @@ public final class PestToken extends TokenImpl { subtype.add(SubType.PEST); power = new MageInt(0); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("HOP", "MRD"); } public PestToken(final PestToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PharikaSnakeToken.java b/Mage/src/main/java/mage/game/permanent/token/PharikaSnakeToken.java index ce613e05a90..40dc98ae891 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PharikaSnakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PharikaSnakeToken.java @@ -1,20 +1,17 @@ - - package mage.game.permanent.token; + import mage.MageInt; +import mage.abilities.keyword.DeathtouchAbility; import mage.constants.CardType; import mage.constants.SubType; -import mage.abilities.keyword.DeathtouchAbility; /** - * * @author spjspj */ public final class PharikaSnakeToken extends TokenImpl { public PharikaSnakeToken() { super("Snake Token", "1/1 black and green Snake enchantment creature token with deathtouch"); - this.setOriginalExpansionSetCode("JOU"); this.power = new MageInt(1); this.toughness = new MageInt(1); cardType.add(CardType.ENCHANTMENT); @@ -24,6 +21,7 @@ public final class PharikaSnakeToken extends TokenImpl { color.setGreen(true); this.addAbility(DeathtouchAbility.getInstance()); } + public PharikaSnakeToken(final PharikaSnakeToken token) { super(token); } diff --git a/Mage/src/main/java/mage/game/permanent/token/Phyrexian00Token.java b/Mage/src/main/java/mage/game/permanent/token/Phyrexian00Token.java index cdfaa271c96..e48ff4ab910 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Phyrexian00Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Phyrexian00Token.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -18,8 +16,6 @@ public class Phyrexian00Token extends TokenImpl { subtype.add(SubType.PHYREXIAN); power = new MageInt(0); toughness = new MageInt(0); - - availableImageSetCodes = Arrays.asList("MOM"); } public Phyrexian00Token(final Phyrexian00Token token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianBeastToken.java index 506ed3685ba..f15b317e1a2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianBeastToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -19,8 +17,6 @@ public final class PhyrexianBeastToken extends TokenImpl { subtype.add(SubType.BEAST); power = new MageInt(4); toughness = new MageInt(4); - - availableImageSetCodes = Arrays.asList("C21", "CLB"); } public PhyrexianBeastToken(final PhyrexianBeastToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianBeastToxicToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianBeastToxicToken.java index 151b85320ce..bc2f8026ddf 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianBeastToxicToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianBeastToxicToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.ToxicAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -22,8 +20,6 @@ public final class PhyrexianBeastToxicToken extends TokenImpl { toughness = new MageInt(3); addAbility(new ToxicAbility(1)); - - availableImageSetCodes = Arrays.asList("ONE"); } public PhyrexianBeastToxicToken(final PhyrexianBeastToxicToken token) { @@ -33,9 +29,4 @@ public final class PhyrexianBeastToxicToken extends TokenImpl { public PhyrexianBeastToxicToken copy() { return new PhyrexianBeastToxicToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianGermToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianGermToken.java index d44ec053430..d8e76d000ff 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianGermToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianGermToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -19,13 +17,6 @@ public final class PhyrexianGermToken extends TokenImpl { subtype.add(SubType.GERM); power = new MageInt(0); toughness = new MageInt(0); - - availableImageSetCodes = Arrays.asList("C14", "C15", "C16", "MBS", "MM2", "PC2", "MH2", "NEC", "2XM", "CM2", "CMA", "PCA", "ONC", "MOC"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); } public PhyrexianGermToken(final PhyrexianGermToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianGoblinHasteToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianGoblinHasteToken.java index fc2c7e6ee58..5fa8b867a14 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianGoblinHasteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianGoblinHasteToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -22,8 +20,6 @@ public final class PhyrexianGoblinHasteToken extends TokenImpl { toughness = new MageInt(1); addAbility(HasteAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("NPH"); } public PhyrexianGoblinHasteToken(final PhyrexianGoblinHasteToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianGoblinToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianGoblinToken.java index 33478670f9a..90b3fbed454 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianGoblinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianGoblinToken.java @@ -1,12 +1,9 @@ package mage.game.permanent.token; import mage.MageInt; -import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -20,8 +17,6 @@ public final class PhyrexianGoblinToken extends TokenImpl { color.setRed(true); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("ONE"); } public PhyrexianGoblinToken(final PhyrexianGoblinToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianGolemToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianGolemToken.java index ad3b8a654e5..5650b6ad29c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianGolemToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianGolemToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -19,8 +17,6 @@ public final class PhyrexianGolemToken extends TokenImpl { subtype.add(SubType.GOLEM); power = new MageInt(3); toughness = new MageInt(3); - - availableImageSetCodes = Arrays.asList("MM2", "NPH", "SOM", "MH1", "M20", "CMR", "MM3", "2X2", "ONE", "MOC"); } public PhyrexianGolemToken(final PhyrexianGolemToken token) { @@ -30,9 +26,4 @@ public final class PhyrexianGolemToken extends TokenImpl { public PhyrexianGolemToken copy() { return new PhyrexianGolemToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianHorrorGreenToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianHorrorGreenToken.java index d710542df75..90721069a7d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianHorrorGreenToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianHorrorGreenToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -23,17 +21,6 @@ public final class PhyrexianHorrorGreenToken extends TokenImpl { subtype.add(SubType.HORROR); power = new MageInt(xValue); toughness = new MageInt(xValue); - - availableImageSetCodes = Arrays.asList("ONE"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("ONE")) { - setTokenType(1); - } } public PhyrexianHorrorGreenToken(final PhyrexianHorrorGreenToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianHorrorRedToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianHorrorRedToken.java index 9c87be1b6cc..0303e6db502 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianHorrorRedToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianHorrorRedToken.java @@ -6,8 +6,6 @@ import mage.abilities.keyword.TrampleAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -28,17 +26,6 @@ public final class PhyrexianHorrorRedToken extends TokenImpl { addAbility(TrampleAbility.getInstance()); addAbility(HasteAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("ONE"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("ONE")) { - setTokenType(2); - } } public PhyrexianHorrorRedToken(final PhyrexianHorrorRedToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianHydraWithLifelinkToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianHydraWithLifelinkToken.java index 1d125c1b42f..7856a15fa04 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianHydraWithLifelinkToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianHydraWithLifelinkToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.LifelinkAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -23,16 +21,6 @@ public final class PhyrexianHydraWithLifelinkToken extends TokenImpl { toughness = new MageInt(3); this.addAbility(LifelinkAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("MOM"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MOM")) { - this.setTokenType(1); - } } public PhyrexianHydraWithLifelinkToken(final PhyrexianHydraWithLifelinkToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianHydraWithReachToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianHydraWithReachToken.java index 9989be035fa..7b0b24f76d1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianHydraWithReachToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianHydraWithReachToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.ReachAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -23,16 +21,6 @@ public final class PhyrexianHydraWithReachToken extends TokenImpl { toughness = new MageInt(3); this.addAbility(ReachAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("MOM"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MOM")) { - this.setTokenType(2); - } } public PhyrexianHydraWithReachToken(final PhyrexianHydraWithReachToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianMiteToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianMiteToken.java index 86f789ea222..56198ef4ebe 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianMiteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianMiteToken.java @@ -7,9 +7,6 @@ import mage.abilities.keyword.ToxicAbility; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.util.RandomUtil; - -import java.util.Arrays; /** * @author TheElk801 @@ -27,17 +24,6 @@ public final class PhyrexianMiteToken extends TokenImpl { this.addAbility(new ToxicAbility(1)); this.addAbility(new SimpleStaticAbility(new CantBlockSourceEffect(Duration.WhileOnBattlefield).setText("this creature can't block"))); - - availableImageSetCodes = Arrays.asList("ONE"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("ONE")) { - this.setTokenType(RandomUtil.nextInt(2) + 1); - } } public PhyrexianMiteToken(final PhyrexianMiteToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianMyrToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianMyrToken.java index 2abe2c0d50f..f79360365ed 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianMyrToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianMyrToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - public final class PhyrexianMyrToken extends TokenImpl { public PhyrexianMyrToken() { @@ -16,8 +14,6 @@ public final class PhyrexianMyrToken extends TokenImpl { subtype.add(SubType.MYR); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("NPH", "MD1"); } public PhyrexianMyrToken(final PhyrexianMyrToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianRebirthHorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianRebirthHorrorToken.java index bc4023e0ffc..106427b3770 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianRebirthHorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianRebirthHorrorToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -23,8 +21,6 @@ public final class PhyrexianRebirthHorrorToken extends TokenImpl { this.subtype.add(SubType.HORROR); this.power = new MageInt(power); this.toughness = new MageInt(toughness); - - availableImageSetCodes = Arrays.asList("C16", "C18", "C19", "MBS", "CMR", "BRC", "ONC", "MOC"); } public PhyrexianRebirthHorrorToken(final PhyrexianRebirthHorrorToken token) { @@ -34,9 +30,4 @@ public final class PhyrexianRebirthHorrorToken extends TokenImpl { public PhyrexianRebirthHorrorToken copy() { return new PhyrexianRebirthHorrorToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianSaprolingToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianSaprolingToken.java index 250732b2045..2a2f7a0c191 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianSaprolingToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianSaprolingToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -19,8 +17,6 @@ public final class PhyrexianSaprolingToken extends TokenImpl { subtype.add(SubType.SAPROLING); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("MOM"); } public PhyrexianSaprolingToken(final PhyrexianSaprolingToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianToken.java index ae5b243c076..50ce4c7a764 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -18,8 +16,6 @@ public final class PhyrexianToken extends TokenImpl { subtype.add(SubType.PHYREXIAN); power = new MageInt(2); toughness = new MageInt(2); - - availableImageSetCodes = Arrays.asList("DMU"); } public PhyrexianToken(final PhyrexianToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianWurmToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianWurmToken.java index eade7eecbf1..0e955e66958 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianWurmToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianWurmToken.java @@ -6,8 +6,6 @@ import mage.abilities.keyword.TrampleAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - public final class PhyrexianWurmToken extends TokenImpl { public PhyrexianWurmToken() { @@ -24,8 +22,6 @@ public final class PhyrexianWurmToken extends TokenImpl { toughness = new MageInt(amount); addAbility(TrampleAbility.getInstance()); addAbility(new ToxicAbility(1)); - - availableImageSetCodes = Arrays.asList("ONC"); } public PhyrexianWurmToken(final PhyrexianWurmToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianZombieToken.java index 067367321b6..fca319da168 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianZombieToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -19,8 +17,6 @@ public final class PhyrexianZombieToken extends TokenImpl { subtype.add(SubType.ZOMBIE); power = new MageInt(2); toughness = new MageInt(2); - - availableImageSetCodes = Arrays.asList("MBS"); } public PhyrexianZombieToken(final PhyrexianZombieToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PilotToken.java b/Mage/src/main/java/mage/game/permanent/token/PilotToken.java index 020cd39b577..304153c48ac 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PilotToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PilotToken.java @@ -5,8 +5,6 @@ import mage.abilities.common.CrewIncreasedPowerAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -19,8 +17,6 @@ public final class PilotToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); addAbility(new CrewIncreasedPowerAbility("this creature")); - - availableImageSetCodes = Arrays.asList("NEO"); } public PilotToken(final PilotToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PincherToken.java b/Mage/src/main/java/mage/game/permanent/token/PincherToken.java index e996e55ea0e..2bf56d9f016 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PincherToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PincherToken.java @@ -1,25 +1,23 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** - * * @author spjspj */ public final class PincherToken extends TokenImpl { public PincherToken() { super("Pincher Token", "2/2 colorless Pincher creature token"); - setOriginalExpansionSetCode("5ND"); cardType.add(CardType.CREATURE); subtype.add(SubType.PINCHER); power = new MageInt(2); toughness = new MageInt(2); } + public PincherToken(final PincherToken token) { super(token); } diff --git a/Mage/src/main/java/mage/game/permanent/token/PlaguebearerOfNurgleToken.java b/Mage/src/main/java/mage/game/permanent/token/PlaguebearerOfNurgleToken.java index ad241d899c4..3f062570051 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PlaguebearerOfNurgleToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PlaguebearerOfNurgleToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -18,8 +16,6 @@ public final class PlaguebearerOfNurgleToken extends TokenImpl { subtype.add(SubType.DEMON); power = new MageInt(1); toughness = new MageInt(3); - - availableImageSetCodes = Arrays.asList("40K"); } public PlaguebearerOfNurgleToken(final PlaguebearerOfNurgleToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PlantToken.java b/Mage/src/main/java/mage/game/permanent/token/PlantToken.java index bef6b114217..2170c635db9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PlantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PlantToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - public final class PlantToken extends TokenImpl { public PlantToken() { @@ -15,8 +13,6 @@ public final class PlantToken extends TokenImpl { subtype.add(SubType.PLANT); power = new MageInt(0); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("C18", "DDP", "OGW", "PC2", "WWK", "XLN", "ZNR", "CMR", "NEC", "2XM", "NCC", "PCA", "DDR"); } public PlantToken(final PlantToken token) { @@ -26,9 +22,4 @@ public final class PlantToken extends TokenImpl { public PlantToken copy() { return new PlantToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/PorgToken.java b/Mage/src/main/java/mage/game/permanent/token/PorgToken.java index fc09a8c7a53..41601195613 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PorgToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PorgToken.java @@ -1,5 +1,3 @@ - - package mage.game.permanent.token; import mage.MageInt; @@ -7,17 +5,13 @@ import mage.abilities.keyword.MonstrosityAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Collections; - /** - * * @author NinthWorld */ public final class PorgToken extends TokenImpl { public PorgToken() { super("Porg", "0/1 green Bird creature token named Porg with \"{G}: Monstrosity 1.\""); - availableImageSetCodes.addAll(Collections.singletonList("SWS")); cardType.add(CardType.CREATURE); subtype.add(SubType.BIRD); diff --git a/Mage/src/main/java/mage/game/permanent/token/PowerstoneToken.java b/Mage/src/main/java/mage/game/permanent/token/PowerstoneToken.java index 366d0b2db7a..1947b95c3a8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PowerstoneToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PowerstoneToken.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.game.Game; -import java.util.Arrays; import java.util.UUID; /** @@ -29,8 +28,6 @@ public final class PowerstoneToken extends TokenImpl { // {T}: Add {C}. This mana can't be spent to cast a nonartifact spell. this.addAbility(new ConditionalColorlessManaAbility(1, makeBuilder())); - - availableImageSetCodes = Arrays.asList("DMU", "BRO"); } public PowerstoneToken(final PowerstoneToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PrismToken.java b/Mage/src/main/java/mage/game/permanent/token/PrismToken.java index 8fe9417a576..10d1a0293ed 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PrismToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PrismToken.java @@ -1,28 +1,16 @@ - package mage.game.permanent.token; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; /** - * * @author fireshoes */ public final class PrismToken extends TokenImpl { - static final private List tokenImageSets = new ArrayList<>(); - - static { - tokenImageSets.addAll(Collections.singletonList("VIS")); - } - public PrismToken() { super("Prism Token", "0/1 colorless Prism artifact creature token"); - availableImageSetCodes = tokenImageSets; cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.PRISM); @@ -30,18 +18,12 @@ public final class PrismToken extends TokenImpl { toughness = new MageInt(1); } - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - } - public PrismToken(final PrismToken token) { super(token); } @Override public PrismToken copy() { - return new PrismToken(this); //To change body of generated methods, choose Tools | Templates. + return new PrismToken(this); } - } diff --git a/Mage/src/main/java/mage/game/permanent/token/PursuedWhaleToken.java b/Mage/src/main/java/mage/game/permanent/token/PursuedWhaleToken.java index 738d85fc51a..4ec7bf7da57 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PursuedWhaleToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PursuedWhaleToken.java @@ -9,8 +9,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.StaticFilters; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -27,8 +25,6 @@ public final class PursuedWhaleToken extends TokenImpl { this.addAbility(new SimpleStaticAbility(new CantBlockSourceEffect(Duration.WhileOnBattlefield) .setText("this creature can't block"))); this.addAbility(new SimpleStaticAbility(new AttacksIfAbleAllEffect(StaticFilters.FILTER_CONTROLLED_CREATURES))); - - availableImageSetCodes = Arrays.asList("M21", "CLB"); } private PursuedWhaleToken(final PursuedWhaleToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/QueenMarchesaAssassinToken.java b/Mage/src/main/java/mage/game/permanent/token/QueenMarchesaAssassinToken.java index e45f1b58728..84e01864add 100644 --- a/Mage/src/main/java/mage/game/permanent/token/QueenMarchesaAssassinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/QueenMarchesaAssassinToken.java @@ -1,16 +1,12 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.HasteAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class QueenMarchesaAssassinToken extends TokenImpl { @@ -24,8 +20,6 @@ public final class QueenMarchesaAssassinToken extends TokenImpl { toughness = new MageInt(1); addAbility(DeathtouchAbility.getInstance()); addAbility(HasteAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("CN2", "MOC"); } public QueenMarchesaAssassinToken(final QueenMarchesaAssassinToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/QuestForTheGravelordZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/QuestForTheGravelordZombieToken.java index a122cd246f4..ef39036cc6b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/QuestForTheGravelordZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/QuestForTheGravelordZombieToken.java @@ -1,15 +1,10 @@ - package mage.game.permanent.token; - import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** - * * spjspj */ public final class QuestForTheGravelordZombieToken extends TokenImpl { @@ -23,8 +18,6 @@ public final class QuestForTheGravelordZombieToken extends TokenImpl { color.setBlack(true); power = new MageInt(5); toughness = new MageInt(5); - - availableImageSetCodes.addAll(Arrays.asList("ZEN", "DDR", "BBD")); } public QuestForTheGravelordZombieToken(final QuestForTheGravelordZombieToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/RabbitToken.java b/Mage/src/main/java/mage/game/permanent/token/RabbitToken.java index d352e1c6af0..5a4d5a3f78a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RabbitToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RabbitToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -18,8 +16,6 @@ public final class RabbitToken extends TokenImpl { subtype.add(SubType.RABBIT); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("CLB"); } private RabbitToken(final RabbitToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/RagavanToken.java b/Mage/src/main/java/mage/game/permanent/token/RagavanToken.java index 0f5ed3c8601..eff45e34ff7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RagavanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RagavanToken.java @@ -1,15 +1,11 @@ - - package mage.game.permanent.token; + import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import java.util.Arrays; - /** - * * @author spjspj */ public final class RagavanToken extends TokenImpl { @@ -22,8 +18,6 @@ public final class RagavanToken extends TokenImpl { this.color.setRed(true); this.subtype.add(SubType.MONKEY); this.cardType.add(CardType.CREATURE); - - availableImageSetCodes = Arrays.asList("AER", "DMC"); } public RagavanToken(final RagavanToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/RakdosGuildmageGoblinToken.java b/Mage/src/main/java/mage/game/permanent/token/RakdosGuildmageGoblinToken.java index 7d2e25f8373..482721ca2b6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RakdosGuildmageGoblinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RakdosGuildmageGoblinToken.java @@ -1,15 +1,11 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.HasteAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class RakdosGuildmageGoblinToken extends TokenImpl { @@ -22,8 +18,6 @@ public final class RakdosGuildmageGoblinToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(1); this.addAbility(HasteAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("GK2"); } public RakdosGuildmageGoblinToken(final RakdosGuildmageGoblinToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/RasputinKnightToken.java b/Mage/src/main/java/mage/game/permanent/token/RasputinKnightToken.java index 9044893a20c..8f6eb57a300 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RasputinKnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RasputinKnightToken.java @@ -19,7 +19,6 @@ public final class RasputinKnightToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); this.addAbility(ProtectionAbility.from(ObjectColor.RED)); - setOriginalExpansionSetCode("DMC"); } public RasputinKnightToken(final RasputinKnightToken token) { @@ -29,13 +28,4 @@ public final class RasputinKnightToken extends TokenImpl { public RasputinKnightToken copy() { return new RasputinKnightToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("DMC")) { - setTokenType(2); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/RatToken.java b/Mage/src/main/java/mage/game/permanent/token/RatToken.java index 4b55bd5a1e8..dfbcf82aa35 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RatToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author LevelX2 */ @@ -18,8 +16,6 @@ public final class RatToken extends TokenImpl { subtype.add(SubType.RAT); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("GTC", "SHM", "ELD", "ZNC", "AFC"); } public RatToken(final RatToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/RebelRedToken.java b/Mage/src/main/java/mage/game/permanent/token/RebelRedToken.java index 46b38ae42cf..a269bc1831e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RebelRedToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RebelRedToken.java @@ -16,8 +16,6 @@ public final class RebelRedToken extends TokenImpl { cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.REBEL); - - setOriginalExpansionSetCode("ONE"); } public RebelRedToken(final RebelRedToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/RebelStarshipToken.java b/Mage/src/main/java/mage/game/permanent/token/RebelStarshipToken.java index 43a82b1e82f..3457815ad93 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RebelStarshipToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RebelStarshipToken.java @@ -1,20 +1,17 @@ - - package mage.game.permanent.token; + import mage.MageInt; +import mage.abilities.keyword.SpaceflightAbility; import mage.constants.CardType; import mage.constants.SubType; -import mage.abilities.keyword.SpaceflightAbility; /** - * * @author spjspj */ public final class RebelStarshipToken extends TokenImpl { public RebelStarshipToken() { super("B-Wing Token", "2/3 blue Rebel Starship artifact creature tokens with spaceflight name B-Wing"); - this.setOriginalExpansionSetCode("SWS"); this.power = new MageInt(2); this.toughness = new MageInt(3); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/RebelToken.java b/Mage/src/main/java/mage/game/permanent/token/RebelToken.java index aac08ee372b..df7769f6219 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RebelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RebelToken.java @@ -1,19 +1,16 @@ - - package mage.game.permanent.token; + import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; /** - * * @author spjspj */ public final class RebelToken extends TokenImpl { public RebelToken() { super("Rebel Token", "1/1 white Rebel creature token"); - this.setOriginalExpansionSetCode("SWS"); this.power = new MageInt(1); this.toughness = new MageInt(1); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/RedElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/RedElementalToken.java index 107dc0b3c79..d9429a06b1c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RedElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RedElementalToken.java @@ -3,9 +3,6 @@ package mage.game.permanent.token; import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.util.RandomUtil; - -import java.util.Arrays; /** * @author spjspj @@ -19,37 +16,6 @@ public final class RedElementalToken extends TokenImpl { subtype.add(SubType.ELEMENTAL); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("EMA", "M14", "SHM", "MH1", "M20", "RIX", "UMA", "NEC", "DDS", "2X2"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C13")) { - setTokenType(2); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("M14")) { - setTokenType(RandomUtil.nextInt(2) + 1); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("RIX")) { - setTokenType(2); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("SHM")) { - setTokenType(2); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("UMA")) { - setTokenType(RandomUtil.nextInt(2) + 2); // 2..3 - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("EMA")) { - setTokenType(1); - } } public RedElementalToken(final RedElementalToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/RedHumanToken.java b/Mage/src/main/java/mage/game/permanent/token/RedHumanToken.java index 489094285d6..bd76b969ea2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RedHumanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RedHumanToken.java @@ -1,14 +1,10 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; - -import java.util.Arrays; /** - * * @author spjspj */ public final class RedHumanToken extends TokenImpl { @@ -21,20 +17,6 @@ public final class RedHumanToken extends TokenImpl { this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("AVR", "EMN", "VOW", "MOC"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode().equals("AVR")) { - this.setTokenType(1); - } - if (getOriginalExpansionSetCode().equals("MOC")) { - this.setTokenType(1); - } } public RedHumanToken(final RedHumanToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/RedWhiteGolemToken.java b/Mage/src/main/java/mage/game/permanent/token/RedWhiteGolemToken.java index e344af37b7d..1096951c7c7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RedWhiteGolemToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RedWhiteGolemToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author weirddan455 */ @@ -20,8 +18,6 @@ public class RedWhiteGolemToken extends TokenImpl { color.setWhite(true); power = new MageInt(4); toughness = new MageInt(4); - - availableImageSetCodes = Arrays.asList("MH2"); } private RedWhiteGolemToken(final RedWhiteGolemToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/RedWolfToken.java b/Mage/src/main/java/mage/game/permanent/token/RedWolfToken.java index 46aeb2c56f3..9da5db27988 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RedWolfToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RedWolfToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -19,17 +17,6 @@ public final class RedWolfToken extends TokenImpl { subtype.add(SubType.WOLF); power = new MageInt(3); toughness = new MageInt(2); - - availableImageSetCodes = Arrays.asList("VOW"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("VOW")) { - setTokenType(2); - } } private RedWolfToken(final RedWolfToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ReefWormFishToken.java b/Mage/src/main/java/mage/game/permanent/token/ReefWormFishToken.java index e303069632c..9a96fb2a3c1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ReefWormFishToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ReefWormFishToken.java @@ -6,8 +6,6 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -22,8 +20,6 @@ public final class ReefWormFishToken extends TokenImpl { toughness = new MageInt(3); addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new ReefWormWhaleToken()))); - - availableImageSetCodes = Arrays.asList("C14", "A25", "C21"); } public ReefWormFishToken(final ReefWormFishToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ReefWormWhaleToken.java b/Mage/src/main/java/mage/game/permanent/token/ReefWormWhaleToken.java index 6c10c18d322..10ac933df5e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ReefWormWhaleToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ReefWormWhaleToken.java @@ -6,8 +6,6 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -22,8 +20,6 @@ public final class ReefWormWhaleToken extends TokenImpl { toughness = new MageInt(6); addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new Kraken99Token()))); - - availableImageSetCodes.addAll(Arrays.asList("C14", "A25", "C21")); } public ReefWormWhaleToken(final ReefWormWhaleToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ReflectionPureToken.java b/Mage/src/main/java/mage/game/permanent/token/ReflectionPureToken.java index 6ab0041e74b..ffc68e14f61 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ReflectionPureToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ReflectionPureToken.java @@ -1,23 +1,20 @@ - package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** - * * @author SpikesCafe-google */ public final class ReflectionPureToken extends TokenImpl { - + public ReflectionPureToken() { - this(1); + this(1); } public ReflectionPureToken(int xValue) { super("Reflection Token", "X/X white Reflection creature token, where X is the mana value of that spell"); - this.setOriginalExpansionSetCode("INV"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.REFLECTION); diff --git a/Mage/src/main/java/mage/game/permanent/token/ReflectionToken.java b/Mage/src/main/java/mage/game/permanent/token/ReflectionToken.java index 2e53f13b01f..7033a9a9de5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ReflectionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ReflectionToken.java @@ -1,19 +1,16 @@ - package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** - * * @author spjspj */ public final class ReflectionToken extends TokenImpl { public ReflectionToken() { super("Reflection Token", "2/2 white Reflection creature token"); - this.setOriginalExpansionSetCode("TMP"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.REFLECTION); diff --git a/Mage/src/main/java/mage/game/permanent/token/RekindlingPhoenixToken.java b/Mage/src/main/java/mage/game/permanent/token/RekindlingPhoenixToken.java index 8fec7cdd898..e753bb6fc37 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RekindlingPhoenixToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RekindlingPhoenixToken.java @@ -1,4 +1,3 @@ - package mage.game.permanent.token; import mage.MageInt; @@ -8,27 +7,18 @@ import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffec import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.HasteAbility; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SubType; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.NamePredicate; import mage.target.common.TargetCardInYourGraveyard; -import mage.util.RandomUtil; - -import java.util.Arrays; /** - * * @author LevelX2 */ public final class RekindlingPhoenixToken extends TokenImpl { public RekindlingPhoenixToken() { super("Elemental Token", "0/1 red Elemental creature token with \"At the beginning of your upkeep, sacrifice this creature and return target card named Rekindling Phoenix from your graveyard to the battlefield. It gains haste until end of turn.\""); - setTokenType(1); cardType.add(CardType.CREATURE); subtype.add(SubType.ELEMENTAL); color.setRed(true); @@ -42,22 +32,8 @@ public final class RekindlingPhoenixToken extends TokenImpl { filter.add(new NamePredicate("Rekindling Phoenix")); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); - - availableImageSetCodes = Arrays.asList("RIX", "NCC"); } - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("RIX")) { - this.setTokenType(1); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("NCC")) { - this.setTokenType(1); - } - } public RekindlingPhoenixToken(final RekindlingPhoenixToken token) { super(token); diff --git a/Mage/src/main/java/mage/game/permanent/token/RelicRobberToken.java b/Mage/src/main/java/mage/game/permanent/token/RelicRobberToken.java index abebd803438..ee9275b8f99 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RelicRobberToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RelicRobberToken.java @@ -10,8 +10,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; -import java.util.Arrays; - public final class RelicRobberToken extends TokenImpl { public RelicRobberToken() { @@ -29,8 +27,6 @@ public final class RelicRobberToken extends TokenImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DamageControllerEffect( 1, "this creature" ), TargetController.YOU, false)); - - availableImageSetCodes = Arrays.asList("ZNR"); } public RelicRobberToken(final RelicRobberToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/RenownedWeaverSpiderToken.java b/Mage/src/main/java/mage/game/permanent/token/RenownedWeaverSpiderToken.java index 14d9e7a01c0..5d028a4b8fd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RenownedWeaverSpiderToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RenownedWeaverSpiderToken.java @@ -1,16 +1,12 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.ReachAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class RenownedWeaverSpiderToken extends TokenImpl { @@ -25,8 +21,6 @@ public final class RenownedWeaverSpiderToken extends TokenImpl { toughness = new MageInt(3); this.addAbility(ReachAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("JOU"); } public RenownedWeaverSpiderToken(final RenownedWeaverSpiderToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ReplicatedRingToken.java b/Mage/src/main/java/mage/game/permanent/token/ReplicatedRingToken.java index 1f7be429a93..0bafa25521d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ReplicatedRingToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ReplicatedRingToken.java @@ -4,8 +4,6 @@ import mage.abilities.mana.AnyColorManaAbility; import mage.constants.CardType; import mage.constants.SuperType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -17,11 +15,8 @@ public final class ReplicatedRingToken extends TokenImpl { cardType.add(CardType.ARTIFACT); this.addAbility(new AnyColorManaAbility()); - - availableImageSetCodes = Arrays.asList("KHM", "MOC"); } - private ReplicatedRingToken(final ReplicatedRingToken token) { super(token); } diff --git a/Mage/src/main/java/mage/game/permanent/token/ResearchDevelopmentToken.java b/Mage/src/main/java/mage/game/permanent/token/ResearchDevelopmentToken.java index 2932743c4cd..1c59f3c1849 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ResearchDevelopmentToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ResearchDevelopmentToken.java @@ -4,24 +4,13 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * @author JayDi85 */ public final class ResearchDevelopmentToken extends TokenImpl { - static final private List tokenImageSets = new ArrayList<>(); - - static { - tokenImageSets.addAll(Arrays.asList("DIS")); - } - public ResearchDevelopmentToken() { super("Elemental Token", "3/1 red Elemental creature token"); - availableImageSetCodes = tokenImageSets; cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.ELEMENTAL); diff --git a/Mage/src/main/java/mage/game/permanent/token/RhinoToken.java b/Mage/src/main/java/mage/game/permanent/token/RhinoToken.java index e2c4c1948b3..e6ca77f9771 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RhinoToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RhinoToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.TrampleAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -20,8 +18,6 @@ public final class RhinoToken extends TokenImpl { power = new MageInt(4); toughness = new MageInt(4); addAbility(TrampleAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("RTR", "MH1", "C19", "MIC"); } public RhinoToken(final RhinoToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/RhinoWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/RhinoWarriorToken.java index a051e1dcfe1..5ee1018da7d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RhinoWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RhinoWarriorToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -19,8 +17,6 @@ public final class RhinoWarriorToken extends TokenImpl { subtype.add(SubType.WARRIOR); power = new MageInt(4); toughness = new MageInt(4); - - availableImageSetCodes = Arrays.asList("SNC"); } public RhinoWarriorToken(final RhinoWarriorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/RiftmarkedKnightToken.java b/Mage/src/main/java/mage/game/permanent/token/RiftmarkedKnightToken.java index 1d013958b03..cb6c8fcf59a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RiftmarkedKnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RiftmarkedKnightToken.java @@ -1,18 +1,14 @@ - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.FlankingAbility; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.ProtectionAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class RiftmarkedKnightToken extends TokenImpl { @@ -28,8 +24,6 @@ public final class RiftmarkedKnightToken extends TokenImpl { this.addAbility(new FlankingAbility()); this.addAbility(ProtectionAbility.from(ObjectColor.WHITE)); this.addAbility(HasteAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("PLC", "TSR"); } public RiftmarkedKnightToken(final RiftmarkedKnightToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/RiseOfTheAntsInsectToken.java b/Mage/src/main/java/mage/game/permanent/token/RiseOfTheAntsInsectToken.java index 0447d65cec5..306cb6ed12f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RiseOfTheAntsInsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RiseOfTheAntsInsectToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -18,8 +16,6 @@ public final class RiseOfTheAntsInsectToken extends TokenImpl { subtype.add(SubType.INSECT); power = new MageInt(3); toughness = new MageInt(3); - - availableImageSetCodes.addAll(Arrays.asList("MID")); } public RiseOfTheAntsInsectToken(final RiseOfTheAntsInsectToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/RitualOfTheReturnedZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/RitualOfTheReturnedZombieToken.java index 8cbf6e4ad74..5c24bbc6a89 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RitualOfTheReturnedZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RitualOfTheReturnedZombieToken.java @@ -1,22 +1,20 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** - * * @author spjspj */ public final class RitualOfTheReturnedZombieToken extends TokenImpl { public RitualOfTheReturnedZombieToken() { - this(1,1); + this(1, 1); } + public RitualOfTheReturnedZombieToken(int power, int toughness) { super("Zombie Token", "black Zombie creature token with power equal to the exiled card's power and toughness equal to the exiled card's toughness"); - this.setOriginalExpansionSetCode("JOU"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.ZOMBIE); diff --git a/Mage/src/main/java/mage/game/permanent/token/RobotToken.java b/Mage/src/main/java/mage/game/permanent/token/RobotToken.java index 7592f60764c..ed8cdae5973 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RobotToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RobotToken.java @@ -23,8 +23,6 @@ public final class RobotToken extends TokenImpl { new CantBlockSourceEffect(Duration.WhileOnBattlefield) .setText("this creature can't block") )); - - this.setExpansionSetCodeForImage("40K"); } public RobotToken(final RobotToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/RocEggToken.java b/Mage/src/main/java/mage/game/permanent/token/RocEggToken.java index 5206127d369..2da2c8198b2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RocEggToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RocEggToken.java @@ -1,16 +1,11 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; -import mage.util.RandomUtil; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class RocEggToken extends TokenImpl { @@ -23,8 +18,6 @@ public final class RocEggToken extends TokenImpl { power = new MageInt(3); toughness = new MageInt(3); addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("M11", "M12", "C19"); } public RocEggToken(final RocEggToken token) { @@ -34,13 +27,4 @@ public final class RocEggToken extends TokenImpl { public RocEggToken copy() { return new RocEggToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C19")) { - this.setTokenType(1); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/RockToken.java b/Mage/src/main/java/mage/game/permanent/token/RockToken.java index 915d097614a..db464197223 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RockToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RockToken.java @@ -11,8 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.target.common.TargetAnyTarget; -import java.util.Arrays; - public final class RockToken extends TokenImpl { public RockToken() { @@ -25,8 +23,6 @@ public final class RockToken extends TokenImpl { new DamageTargetEffect(2), new TargetAnyTarget(), new SacrificeAttachmentCost(), new GenericManaCost(1), new TapSourceCost() ))); this.addAbility(new EquipAbility(1)); - - availableImageSetCodes = Arrays.asList("CMR"); } public RockToken(final RockToken token) { @@ -36,9 +32,4 @@ public final class RockToken extends TokenImpl { public RockToken copy() { return new RockToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/RogueToken.java b/Mage/src/main/java/mage/game/permanent/token/RogueToken.java index 8c570719998..bf80cd1d32e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RogueToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RogueToken.java @@ -3,7 +3,6 @@ package mage.game.permanent.token; import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; /** * @author TheElk801 @@ -17,8 +16,6 @@ public final class RogueToken extends TokenImpl { color.setBlack(true); power = new MageInt(2); toughness = new MageInt(2); - - availableImageSetCodes = Arrays.asList("SNC"); } public RogueToken(final RogueToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/RoyalGuardToken.java b/Mage/src/main/java/mage/game/permanent/token/RoyalGuardToken.java index 139d3d705f2..f6237aadf30 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RoyalGuardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RoyalGuardToken.java @@ -1,20 +1,17 @@ - - package mage.game.permanent.token; + import mage.MageInt; +import mage.abilities.keyword.FirstStrikeAbility; import mage.constants.CardType; import mage.constants.SubType; -import mage.abilities.keyword.FirstStrikeAbility; /** - * * @author spjspj */ public final class RoyalGuardToken extends TokenImpl { public RoyalGuardToken() { super("Royal Guard", "2/2 red Soldier creature token with first strike named Royal Guard"); - this.setOriginalExpansionSetCode("SWS"); this.power = new MageInt(2); this.toughness = new MageInt(2); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/RukhEggBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/RukhEggBirdToken.java index 055955de724..f523d57f084 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RukhEggBirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RukhEggBirdToken.java @@ -1,4 +1,3 @@ - package mage.game.permanent.token; import mage.MageInt; @@ -7,18 +6,12 @@ import mage.constants.CardType; import mage.constants.SubType; /** - * * @author spjspj */ public final class RukhEggBirdToken extends TokenImpl { public RukhEggBirdToken() { - this("ARN"); //there is no such token in either ARN, 8ED or 9ED - } - - public RukhEggBirdToken(String setCode) { super("Bird Token", "4/4 red Bird creature token with flying"); - this.setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); color.setRed(true); @@ -27,6 +20,7 @@ public final class RukhEggBirdToken extends TokenImpl { toughness = new MageInt(4); addAbility(FlyingAbility.getInstance()); } + public RukhEggBirdToken(final RukhEggBirdToken token) { super(token); } diff --git a/Mage/src/main/java/mage/game/permanent/token/SalamnderWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/SalamnderWarriorToken.java index 1d9cba5e3d8..21d476e0fa5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SalamnderWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SalamnderWarriorToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -19,8 +17,6 @@ public final class SalamnderWarriorToken extends TokenImpl { subtype.add(SubType.WARRIOR); power = new MageInt(4); toughness = new MageInt(3); - - availableImageSetCodes = Arrays.asList("CMR"); } public SalamnderWarriorToken(final SalamnderWarriorToken token) { @@ -30,9 +26,4 @@ public final class SalamnderWarriorToken extends TokenImpl { public SalamnderWarriorToken copy() { return new SalamnderWarriorToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java b/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java index c8da6be6bd9..4ff172f3ece 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java @@ -3,67 +3,14 @@ package mage.game.permanent.token; import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.util.RandomUtil; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; /** * @author BetaSteward_at_googlemail.com */ public final class SaprolingToken extends TokenImpl { - static final private List tokenImageSets = new ArrayList<>(); - - static { - tokenImageSets.addAll(Arrays.asList( - "10E", - "ALA", - "DDE", - "DDH", - "DDJ", - "M12", - "M13", - "M14", - "MM2", - "MM3", - "MMA", - "NEM", - "RTR", - "C15", - "INV", - "C16", // 2 different token images... - "CMA", - "VMA", // 2 different token, one with DIFFERENT stats, "Saproling Burst" create different token, see https://scryfall.com/card/tvma/12 - "E02", - "RIX", - "DOM", // 3 different token images - "C19", - "C20", - "M21", - "ZNC", - "CMR", - "TSR", - "C21", - "AFC", - "NEC", - "2XM", - "NCC", - "CM2", - "PCA", - "GK1", - "GK2", - "CLB", - "2X2", - "DMU", - "DMR" - )); - } - public SaprolingToken() { super("Saproling Token", "1/1 green Saproling creature token"); - availableImageSetCodes = tokenImageSets; cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.SAPROLING); @@ -78,26 +25,4 @@ public final class SaprolingToken extends TokenImpl { public SaprolingToken copy() { return new SaprolingToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("NEM")) { - this.setTokenType(2); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("VMA")) { - this.setTokenType(2); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C16")) { - this.setTokenType(RandomUtil.nextInt(2) + 1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("DOM")) { - this.setTokenType(RandomUtil.nextInt(3) + 1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("GK1")) { - this.setTokenType(RandomUtil.nextInt(2) + 1); - } - } } \ No newline at end of file diff --git a/Mage/src/main/java/mage/game/permanent/token/SatyrNyxSmithElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/SatyrNyxSmithElementalToken.java index 643c400a6ed..877762769a4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SatyrNyxSmithElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SatyrNyxSmithElementalToken.java @@ -1,13 +1,11 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.HasteAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class SatyrNyxSmithElementalToken extends TokenImpl { @@ -21,7 +19,6 @@ public final class SatyrNyxSmithElementalToken extends TokenImpl { power = new MageInt(3); toughness = new MageInt(1); this.addAbility(HasteAbility.getInstance()); - this.setOriginalExpansionSetCode("BNG"); } public SatyrNyxSmithElementalToken(final SatyrNyxSmithElementalToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ScrapToken.java b/Mage/src/main/java/mage/game/permanent/token/ScrapToken.java index d8aff5a21b9..5506c56641d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ScrapToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ScrapToken.java @@ -10,8 +10,6 @@ public final class ScrapToken extends TokenImpl { public ScrapToken() { super("Scrap", "colorless artifact token named Scrap"); cardType.add(CardType.ARTIFACT); - - availableImageSetCodes.add("BRC"); } public ScrapToken(final ScrapToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SeedGuardianToken.java b/Mage/src/main/java/mage/game/permanent/token/SeedGuardianToken.java index 37d04770774..d6a9d5be48d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SeedGuardianToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SeedGuardianToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -22,8 +20,6 @@ public final class SeedGuardianToken extends TokenImpl { subtype.add(SubType.ELEMENTAL); power = new MageInt(xValue); toughness = new MageInt(xValue); - - availableImageSetCodes = Arrays.asList("CHK", "OGW"); } public SeedGuardianToken(final SeedGuardianToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SeizeTheStormElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/SeizeTheStormElementalToken.java index 4a337ce60c1..908e4c7f8f2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SeizeTheStormElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SeizeTheStormElementalToken.java @@ -11,8 +11,6 @@ import mage.abilities.keyword.TrampleAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -37,8 +35,6 @@ public final class SeizeTheStormElementalToken extends TokenImpl { ).setText("this creature's power and toughness are each equal to the number of " + "instant and sorcery cards in your graveyard, plus the number of cards with flashback you own in exile") ).addHint(hint)); - - availableImageSetCodes = Arrays.asList("MID"); } private SeizeTheStormElementalToken(final SeizeTheStormElementalToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java b/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java index 1baa8e4baf6..a508db2fdaa 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java @@ -19,8 +19,6 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetCardInExile; -import java.util.Arrays; - /** * @author spjspj */ @@ -43,8 +41,6 @@ public final class SengirNosferatuBatToken extends TokenImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{B}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); - - availableImageSetCodes = Arrays.asList("TSR"); } public SengirNosferatuBatToken(final SengirNosferatuBatToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SerfToken.java b/Mage/src/main/java/mage/game/permanent/token/SerfToken.java index d7b7915b07e..d999bcf7ab6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SerfToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SerfToken.java @@ -1,14 +1,10 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; - -import java.util.Arrays; /** - * * @author spjspj */ public final class SerfToken extends TokenImpl { @@ -20,8 +16,6 @@ public final class SerfToken extends TokenImpl { subtype.add(SubType.SERF); power = new MageInt(0); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("EMA"); } public SerfToken(final SerfToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ServoToken.java b/Mage/src/main/java/mage/game/permanent/token/ServoToken.java index 22f771ecb72..33842752231 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ServoToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ServoToken.java @@ -3,9 +3,6 @@ package mage.game.permanent.token; import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.util.RandomUtil; - -import java.util.Arrays; /** * @author fireshoes @@ -19,17 +16,6 @@ public final class ServoToken extends TokenImpl { subtype.add(SubType.SERVO); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("C18", "KLD", "WAR", "KHC", "AFC", "2XM", "BRC", "MOC"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("KLD")) { - this.setTokenType(RandomUtil.nextInt(3) + 1); - } } public ServoToken(final ServoToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/Shapeshifter32Token.java b/Mage/src/main/java/mage/game/permanent/token/Shapeshifter32Token.java index e71bec84e06..13d15fec431 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Shapeshifter32Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Shapeshifter32Token.java @@ -5,24 +5,13 @@ import mage.abilities.keyword.ChangelingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * @author TheElk801 */ public final class Shapeshifter32Token extends TokenImpl { - static final private List tokenImageSets = new ArrayList<>(); - - static { - tokenImageSets.addAll(Arrays.asList("CLB")); - } - public Shapeshifter32Token() { super("Shapeshifter Token", "3/2 colorless Shapeshifter creature token with changeling"); - availableImageSetCodes = tokenImageSets; cardType.add(CardType.CREATURE); subtype.add(SubType.SHAPESHIFTER); power = new MageInt(3); @@ -30,15 +19,6 @@ public final class Shapeshifter32Token extends TokenImpl { addAbility(new ChangelingAbility()); } - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("CLB")) { - this.setTokenType(3); - } - } - public Shapeshifter32Token(final Shapeshifter32Token token) { super(token); } diff --git a/Mage/src/main/java/mage/game/permanent/token/ShapeshifterBlueToken.java b/Mage/src/main/java/mage/game/permanent/token/ShapeshifterBlueToken.java index b7ec77f9b2f..2fd915809c7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ShapeshifterBlueToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ShapeshifterBlueToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.ChangelingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -21,17 +19,6 @@ public final class ShapeshifterBlueToken extends TokenImpl { toughness = new MageInt(2); addAbility(new ChangelingAbility()); - - availableImageSetCodes = Arrays.asList("KHM", "CLB", "MOC"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("CLB")) { - this.setTokenType(4); - } } private ShapeshifterBlueToken(final ShapeshifterBlueToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ShapeshifterToken.java b/Mage/src/main/java/mage/game/permanent/token/ShapeshifterToken.java index 62b49c9a3b6..8c3c8cc3f54 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ShapeshifterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ShapeshifterToken.java @@ -4,7 +4,6 @@ import mage.MageInt; import mage.abilities.keyword.ChangelingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; /** * @author TheElk801 @@ -19,17 +18,6 @@ public final class ShapeshifterToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); addAbility(new ChangelingAbility()); - - availableImageSetCodes = Arrays.asList("MH1", "CLB"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("CLB")) { - this.setTokenType(2); - } } public ShapeshifterToken(final ShapeshifterToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ShardToken.java b/Mage/src/main/java/mage/game/permanent/token/ShardToken.java index 82d09efa19d..699090eb947 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ShardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ShardToken.java @@ -9,8 +9,6 @@ import mage.abilities.effects.keyword.ScryEffect; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -29,8 +27,6 @@ public final class ShardToken extends TokenImpl { cost.setText("Sacrifice this enchantment"); ability.addCost(cost); this.addAbility(ability); - - availableImageSetCodes = Arrays.asList("KHM"); } public ShardToken(final ShardToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SheepToken.java b/Mage/src/main/java/mage/game/permanent/token/SheepToken.java index ee6da4c098b..56581499e1f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SheepToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SheepToken.java @@ -1,4 +1,3 @@ - package mage.game.permanent.token; import mage.MageInt; @@ -6,7 +5,6 @@ import mage.constants.CardType; import mage.constants.SubType; /** - * * @author L_J */ public final class SheepToken extends TokenImpl { @@ -18,8 +16,6 @@ public final class SheepToken extends TokenImpl { subtype.add(SubType.SHEEP); power = new MageInt(0); toughness = new MageInt(1); - - setOriginalExpansionSetCode("DMR"); } public SheepToken(final SheepToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ShrineToken.java b/Mage/src/main/java/mage/game/permanent/token/ShrineToken.java index 3df8ba38ea0..5b08c63a6d2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ShrineToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ShrineToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -18,8 +16,6 @@ public final class ShrineToken extends TokenImpl { subtype.add(SubType.SHRINE); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("NEC"); } public ShrineToken(final ShrineToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SkeletonMenaceToken.java b/Mage/src/main/java/mage/game/permanent/token/SkeletonMenaceToken.java index 384076e063c..49e3ecb6c2f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SkeletonMenaceToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SkeletonMenaceToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.MenaceAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -21,8 +19,6 @@ public final class SkeletonMenaceToken extends TokenImpl { toughness = new MageInt(1); addAbility(new MenaceAbility()); - - availableImageSetCodes = Arrays.asList("CLB"); } public SkeletonMenaceToken(final SkeletonMenaceToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SkeletonRegenerateToken.java b/Mage/src/main/java/mage/game/permanent/token/SkeletonRegenerateToken.java index d849228ac84..7f63f3382cc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SkeletonRegenerateToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SkeletonRegenerateToken.java @@ -9,8 +9,6 @@ import mage.constants.ColoredManaSymbol; import mage.constants.SubType; import mage.constants.Zone; -import java.util.Arrays; - public final class SkeletonRegenerateToken extends TokenImpl { public SkeletonRegenerateToken() { @@ -21,8 +19,6 @@ public final class SkeletonRegenerateToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.B))); - - availableImageSetCodes = Arrays.asList("ALA", "A25"); } public SkeletonRegenerateToken(final SkeletonRegenerateToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SkeletonToken.java b/Mage/src/main/java/mage/game/permanent/token/SkeletonToken.java index 4dbe7343c8f..b18620fc4cd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SkeletonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SkeletonToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -18,8 +16,6 @@ public final class SkeletonToken extends TokenImpl { color.setBlack(true); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("AFR", "30A"); } public SkeletonToken(final SkeletonToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SliverToken.java b/Mage/src/main/java/mage/game/permanent/token/SliverToken.java index 240b6b9e87d..1213304b016 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SliverToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SliverToken.java @@ -1,14 +1,10 @@ - - package mage.game.permanent.token; -import java.util.Arrays; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** - * * @author LoneFox */ public final class SliverToken extends TokenImpl { @@ -19,7 +15,6 @@ public final class SliverToken extends TokenImpl { subtype.add(SubType.SLIVER); power = new MageInt(1); toughness = new MageInt(1); - availableImageSetCodes.addAll(Arrays.asList("M14", "M15", "MOC")); } public SliverToken(final SliverToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SlugToken.java b/Mage/src/main/java/mage/game/permanent/token/SlugToken.java index 8fc56ac9329..c3295191173 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SlugToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SlugToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -18,8 +16,6 @@ public final class SlugToken extends TokenImpl { subtype.add(SubType.SLUG); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("VOW"); } public SlugToken(final SlugToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SmokeBlessingToken.java b/Mage/src/main/java/mage/game/permanent/token/SmokeBlessingToken.java index c65012de674..031d6cbd402 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SmokeBlessingToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SmokeBlessingToken.java @@ -13,8 +13,6 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPermanent; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -37,8 +35,6 @@ public final class SmokeBlessingToken extends TokenImpl { this.addAbility(ability); this.addAbility(new DiesAttachedTriggeredAbility(new SmokeBlessingTokenEffect(), "enchanted creature")); - - availableImageSetCodes = Arrays.asList("NEC"); } public SmokeBlessingToken(final SmokeBlessingToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java b/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java index 797b4af07bb..7a07e17f0a2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author BetaSteward_at_googlemail.com */ @@ -18,9 +16,6 @@ public final class SnakeToken extends TokenImpl { subtype.add(SubType.SNAKE); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("6ED", "C15", "C19", "CHK", "KTK", "MM2", "MMQ", "SOK", - "VIS", "ZEN", "C20", "MIC", "DMC"); } public SnakeToken(final SnakeToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SoldierArtifactToken.java b/Mage/src/main/java/mage/game/permanent/token/SoldierArtifactToken.java index 505b78b9f70..7c6d7658f35 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoldierArtifactToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoldierArtifactToken.java @@ -3,9 +3,6 @@ package mage.game.permanent.token; import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.util.RandomUtil; - -import java.util.Arrays; /** * @author TheElk801 @@ -19,9 +16,6 @@ public final class SoldierArtifactToken extends TokenImpl { subtype.add(SubType.SOLDIER); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("BRO"); - this.setTokenType(RandomUtil.nextInt(2) + 1); } public SoldierArtifactToken(final SoldierArtifactToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SoldierLifelinkToken.java b/Mage/src/main/java/mage/game/permanent/token/SoldierLifelinkToken.java index 5ee8234702d..f012636bba3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoldierLifelinkToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoldierLifelinkToken.java @@ -5,10 +5,7 @@ import mage.abilities.keyword.LifelinkAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** - * * @author TheElk801 */ public final class SoldierLifelinkToken extends TokenImpl { @@ -21,17 +18,6 @@ public final class SoldierLifelinkToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); addAbility(LifelinkAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("GRN", "NCC", "MOM"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("NCC")) { - setTokenType(1); - } } public SoldierLifelinkToken(final SoldierLifelinkToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java index 2a51ad26fb3..9440dce269d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java @@ -3,9 +3,6 @@ package mage.game.permanent.token; import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.util.RandomUtil; - -import java.util.Arrays; /** * @author BetaSteward_at_googlemail.com @@ -19,10 +16,6 @@ public final class SoldierToken extends TokenImpl { subtype.add(SubType.SOLDIER); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("10E", "M15", "C14", "ORI", "ALA", "DDF", "THS", "M12", "M13", - "MM2", "MMA", "RTR", "SOM", "DDO", "M10", "ORI", "EMN", "EMA", "CN2", "C16", "C18", "MM3", "E01", - "DOM", "MH1", "M20", "C20", "M21", "CMR", "KHC", "TSR", "2XM", "MED", "M19", "MD1", "A25", "CLB", "2X2", "DMU", "GN3", "40K", "ONC", "30A", "MOC"); } public SoldierToken(final SoldierToken token) { @@ -33,25 +26,4 @@ public final class SoldierToken extends TokenImpl { public SoldierToken copy() { return new SoldierToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MM3")) { - this.setTokenType(1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("THS")) { - this.setTokenType(RandomUtil.nextInt(2) + 1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("CMR")) { - this.setTokenType(RandomUtil.nextInt(2) + 1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("40K")) { - this.setTokenType(RandomUtil.nextInt(3) + 1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("ONC")) { - this.setTokenType(1); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java b/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java index f798fb58f16..96e00b5cc18 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author LoneFox */ @@ -21,24 +19,6 @@ public final class SoldierTokenWithHaste extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); addAbility(HasteAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("GTC", "MM3", "NCC", "GK1", "ONC"); - } - - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MM3")) { - setTokenType(2); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("NCC")) { - setTokenType(2); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("ONC")) { - setTokenType(3); - } } public SoldierTokenWithHaste(final SoldierTokenWithHaste token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SoldierVigilanceToken.java b/Mage/src/main/java/mage/game/permanent/token/SoldierVigilanceToken.java index 973294d1b23..55a2f2d53d6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoldierVigilanceToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoldierVigilanceToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.VigilanceAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -21,16 +19,6 @@ public final class SoldierVigilanceToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); addAbility(VigilanceAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("WAR", "ONC"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("ONC")) { - this.setTokenType(2); - } } private SoldierVigilanceToken(final SoldierVigilanceToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SorinLordOfInnistradVampireToken.java b/Mage/src/main/java/mage/game/permanent/token/SorinLordOfInnistradVampireToken.java index 2f332061d94..4847c7d1c79 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SorinLordOfInnistradVampireToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SorinLordOfInnistradVampireToken.java @@ -1,15 +1,11 @@ - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.LifelinkAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class SorinLordOfInnistradVampireToken extends TokenImpl { @@ -22,8 +18,6 @@ public final class SorinLordOfInnistradVampireToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); addAbility(LifelinkAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("DKA"); } public SorinLordOfInnistradVampireToken(final SorinLordOfInnistradVampireToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SorinSolemnVisitorVampireToken.java b/Mage/src/main/java/mage/game/permanent/token/SorinSolemnVisitorVampireToken.java index 4b9a4a859f3..e79414f5b4a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SorinSolemnVisitorVampireToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SorinSolemnVisitorVampireToken.java @@ -1,20 +1,17 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class SorinSolemnVisitorVampireToken extends TokenImpl { public SorinSolemnVisitorVampireToken() { super("Vampire Token", "2/2 black Vampire creature token with flying"); - setOriginalExpansionSetCode("KTK"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.VAMPIRE); diff --git a/Mage/src/main/java/mage/game/permanent/token/SparkElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/SparkElementalToken.java index 50e2453f631..f8fdd0d5f97 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SparkElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SparkElementalToken.java @@ -1,17 +1,15 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.TrampleAbility; +import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.TargetController; -import java.util.Arrays; - /** - * * @author spjspj */ public final class SparkElementalToken extends TokenImpl { @@ -27,8 +25,6 @@ public final class SparkElementalToken extends TokenImpl { this.addAbility(TrampleAbility.getInstance()); this.addAbility(HasteAbility.getInstance()); this.addAbility(new BeginningOfEndStepTriggeredAbility(new SacrificeSourceEffect(), TargetController.ANY, false)); - - availableImageSetCodes = Arrays.asList("UMA"); } public SparkElementalToken(final SparkElementalToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SpawningGroundsBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/SpawningGroundsBeastToken.java index 5804debe419..220ee1a5aaa 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpawningGroundsBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpawningGroundsBeastToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.TrampleAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -21,8 +19,6 @@ public final class SpawningGroundsBeastToken extends TokenImpl { toughness = new MageInt(5); this.addAbility(TrampleAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("C18"); } public SpawningGroundsBeastToken(final SpawningGroundsBeastToken token) { @@ -32,13 +28,4 @@ public final class SpawningGroundsBeastToken extends TokenImpl { public SpawningGroundsBeastToken copy() { return new SpawningGroundsBeastToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C18")) { - this.setTokenType(2); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java index 439c6a346d3..f9ab8e4f8fa 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.ReachAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author fireshoes */ @@ -21,8 +19,6 @@ public final class SpiderToken extends TokenImpl { toughness = new MageInt(2); this.addAbility(ReachAbility.getInstance()); - - availableImageSetCodes.addAll(Arrays.asList("C15", "EMN", "ISD", "SHM", "MH1", "THB", "MID", "UMA", "NCC", "CMA", "CLB", "2X2")); } public SpiderToken(final SpiderToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/Spirit22Token.java b/Mage/src/main/java/mage/game/permanent/token/Spirit22Token.java index c4e9e04c7fe..e9413147777 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Spirit22Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Spirit22Token.java @@ -4,10 +4,8 @@ import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; /** - * * @author weirddan455 */ public class Spirit22Token extends TokenImpl { @@ -20,8 +18,6 @@ public class Spirit22Token extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("SNC"); } private Spirit22Token(final Spirit22Token token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/Spirit32Token.java b/Mage/src/main/java/mage/game/permanent/token/Spirit32Token.java index b31f8b03db4..034b082fbcd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Spirit32Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Spirit32Token.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -19,17 +17,6 @@ public final class Spirit32Token extends TokenImpl { subtype.add(SubType.SPIRIT); power = new MageInt(3); toughness = new MageInt(2); - - availableImageSetCodes = Arrays.asList("STX", "MOM"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode().equals("MOM")) { - this.setTokenType(2); - } } private Spirit32Token(final Spirit32Token token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritBlueToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritBlueToken.java index 3ce777bff0d..fc6cb210cd2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritBlueToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritBlueToken.java @@ -1,15 +1,11 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class SpiritBlueToken extends TokenImpl { @@ -22,19 +18,6 @@ public final class SpiritBlueToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("AVR", "MOC"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("AVR")) { - setTokenType(1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MOC")) { - setTokenType(1); - } } public SpiritBlueToken(final SpiritBlueToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritClericToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritClericToken.java index 09dc2ed285e..f30396a9569 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritClericToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritClericToken.java @@ -11,10 +11,7 @@ import mage.constants.SubType; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.Arrays; - /** - * * @author weirddan455 */ public class SpiritClericToken extends TokenImpl { @@ -31,8 +28,6 @@ public class SpiritClericToken extends TokenImpl { // This creature’s power and toughness are each equal to the number of Spirits you control. this.addAbility(new SimpleStaticAbility(new SetBasePowerToughnessSourceEffect(SpiritClericTokenValue.instance))); - - availableImageSetCodes = Arrays.asList("VOW"); } private SpiritClericToken(final SpiritClericToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritGreenToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritGreenToken.java index a9490ec0f9a..a99e045cd4d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritGreenToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritGreenToken.java @@ -18,15 +18,6 @@ public final class SpiritGreenToken extends TokenImpl { toughness = new MageInt(5); } - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("NEO")) { - setTokenType(3); - } - } - public SpiritGreenToken(final SpiritGreenToken token) { super(token); } diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritGreenXToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritGreenXToken.java index f25533a0fe8..bc8daa92574 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritGreenXToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritGreenXToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -22,17 +20,6 @@ public final class SpiritGreenXToken extends TokenImpl { color.setGreen(true); power = new MageInt(xValue); toughness = new MageInt(xValue); - - availableImageSetCodes = Arrays.asList("NEO"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("NEO")) { - setTokenType(2); - } } public SpiritGreenXToken(final SpiritGreenXToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritRedToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritRedToken.java index 9ad263f913c..11dfb6adc49 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritRedToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritRedToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.MenaceAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -20,17 +18,6 @@ public final class SpiritRedToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); addAbility(new MenaceAbility()); - - availableImageSetCodes = Arrays.asList("NEO"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("NEO")) { - setTokenType(4); - } } public SpiritRedToken(final SpiritRedToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritTeferiToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritTeferiToken.java index 02a7e8d75f1..9da2bc69c40 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritTeferiToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritTeferiToken.java @@ -9,7 +9,6 @@ import mage.constants.SubType; import mage.counters.CounterType; /** - * * @author weirddan455 */ public class SpiritTeferiToken extends TokenImpl { @@ -23,8 +22,6 @@ public class SpiritTeferiToken extends TokenImpl { toughness = new MageInt(2); addAbility(VigilanceAbility.getInstance()); addAbility(new DrawCardControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false)); - - this.setExpansionSetCodeForImage("BRO"); } private SpiritTeferiToken(final SpiritTeferiToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java index 535895518fe..a52b68d4a7f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author Loki */ @@ -17,37 +15,6 @@ public final class SpiritToken extends TokenImpl { subtype.add(SubType.SPIRIT); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("C16", "EMA", "NEO", "VOC", "A25", "2X2"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("EMA")) { - setTokenType(1); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("NEO")) { - setTokenType(1); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C16")) { - setTokenType(1); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("A25")) { - setTokenType(1); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("VOC")) { - setTokenType(1); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("2X2")) { - setTokenType(1); - } } public SpiritToken(final SpiritToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java index 7efae31f5e7..8f5a0134a75 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author nantuko */ @@ -21,36 +19,6 @@ public final class SpiritWhiteToken extends TokenImpl { toughness = new MageInt(1); addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("AVR", "C14", "CNS", "DDC", "DDK", "FRF", "ISD", "KTK", "M15", "MM2", "SHM", - "SOI", "EMA", "C16", "MM3", "CMA", "E01", "RAV", "EMN", "M20", "C19", "C20", "CMR", "KHM", - "MID", "VOW", "UMA", "BBD", "IMA", "CM2", "MD1", "DVD", "DDQ", "CN2", "A25", "GK2", "2X2", "ONC", "MOC"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("AVR")) { - setTokenType(2); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C16")) { - setTokenType(2); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("EMA")) { - setTokenType(2); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("UMA")) { - setTokenType(1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("A25")) { - setTokenType(2); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("2X2")) { - setTokenType(2); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MOC")) { - setTokenType(2); - } } public SpiritWhiteToken(final SpiritWhiteToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SpoilsOfBloodHorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/SpoilsOfBloodHorrorToken.java index 920b1b0421e..306fa3298e6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpoilsOfBloodHorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpoilsOfBloodHorrorToken.java @@ -1,12 +1,10 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** - * * @author spjspj */ public final class SpoilsOfBloodHorrorToken extends TokenImpl { @@ -14,9 +12,9 @@ public final class SpoilsOfBloodHorrorToken extends TokenImpl { public SpoilsOfBloodHorrorToken() { this(1); } + public SpoilsOfBloodHorrorToken(int xValue) { super("Horror Token", "X/X black Horror creature token"); - setOriginalExpansionSetCode("C14"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.HORROR); diff --git a/Mage/src/main/java/mage/game/permanent/token/SpyMasterGoblinToken.java b/Mage/src/main/java/mage/game/permanent/token/SpyMasterGoblinToken.java index 6007549de16..e2ceb8c002f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpyMasterGoblinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpyMasterGoblinToken.java @@ -2,17 +2,12 @@ package mage.game.permanent.token; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.Effect; import mage.abilities.effects.common.combat.AttacksIfAbleAllEffect; import mage.constants.CardType; -import mage.constants.Duration; import mage.constants.SubType; import mage.filter.StaticFilters; -import java.util.Arrays; - /** - * * @author spjspj */ public final class SpyMasterGoblinToken extends TokenImpl { @@ -26,8 +21,6 @@ public final class SpyMasterGoblinToken extends TokenImpl { toughness = new MageInt(1); this.addAbility(new SimpleStaticAbility(new AttacksIfAbleAllEffect(StaticFilters.FILTER_CONTROLLED_CREATURES))); - - availableImageSetCodes = Arrays.asList("C16", "CLB"); } public SpyMasterGoblinToken(final SpyMasterGoblinToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SquidToken.java b/Mage/src/main/java/mage/game/permanent/token/SquidToken.java index addad94839d..5bd708f989c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SquidToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SquidToken.java @@ -1,14 +1,11 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.IslandwalkAbility; -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class SquidToken extends TokenImpl { @@ -22,8 +19,6 @@ public final class SquidToken extends TokenImpl { toughness = new MageInt(1); this.addAbility(new IslandwalkAbility()); - - availableImageSetCodes = Arrays.asList("M15", "C16", "NCC", "CLB", "MOC"); } private SquidToken(final SquidToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java b/Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java index 6bb8b173a0e..8f512878169 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author North */ @@ -18,9 +16,6 @@ public final class SquirrelToken extends TokenImpl { color.setGreen(true); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("CNS", "ODY", "PCY", "TOR", "ULG", "UNH", "WMA", - "WTH", "MH1", "MH2", "2XM", "CLB", "DMR"); } public SquirrelToken(final SquirrelToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/StanggTwinToken.java b/Mage/src/main/java/mage/game/permanent/token/StanggTwinToken.java index 771cd0199b3..e988fab5aa7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/StanggTwinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/StanggTwinToken.java @@ -1,15 +1,11 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; import mage.constants.SuperType; -import java.util.Arrays; - /** - * * @author L_J */ public final class StanggTwinToken extends TokenImpl { @@ -25,8 +21,6 @@ public final class StanggTwinToken extends TokenImpl { this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(4); - - availableImageSetCodes = Arrays.asList("A25", "DMC"); } public StanggTwinToken(final StanggTwinToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/StarfishToken.java b/Mage/src/main/java/mage/game/permanent/token/StarfishToken.java index 77329e78276..b93ee217da6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/StarfishToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/StarfishToken.java @@ -5,16 +5,11 @@ import mage.constants.CardType; import mage.constants.SubType; /** - * * @author spike */ public final class StarfishToken extends TokenImpl { public StarfishToken() { - this(null, 0); - } - - public StarfishToken(String setCode, int tokenType) { super("Starfish Token", "0/1 blue Starfish creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.STARFISH); diff --git a/Mage/src/main/java/mage/game/permanent/token/StitcherGeralfZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/StitcherGeralfZombieToken.java index fc63461b683..d130c0970fd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/StitcherGeralfZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/StitcherGeralfZombieToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -22,25 +20,6 @@ public final class StitcherGeralfZombieToken extends TokenImpl { subtype.add(SubType.ZOMBIE); power = new MageInt(xValue); toughness = new MageInt(xValue); - - availableImageSetCodes = Arrays.asList("C14", "MIC", "VOW"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode().equals("C14")) { - this.setTokenType(2); - } - - if (getOriginalExpansionSetCode().equals("MIC")) { - this.setTokenType(2); - } - - if (getOriginalExpansionSetCode().equals("VOW")) { - this.setTokenType(2); - } } public StitcherGeralfZombieToken(final StitcherGeralfZombieToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/StitchersApprenticeHomunculusToken.java b/Mage/src/main/java/mage/game/permanent/token/StitchersApprenticeHomunculusToken.java index 4780b5e1a01..af21a3a0cfe 100644 --- a/Mage/src/main/java/mage/game/permanent/token/StitchersApprenticeHomunculusToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/StitchersApprenticeHomunculusToken.java @@ -1,14 +1,10 @@ - package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; - -import java.util.Arrays; /** - * * @author spjspj */ public final class StitchersApprenticeHomunculusToken extends TokenImpl { @@ -20,8 +16,6 @@ public final class StitchersApprenticeHomunculusToken extends TokenImpl { subtype.add(SubType.HOMUNCULUS); power = new MageInt(2); toughness = new MageInt(2); - - availableImageSetCodes = Arrays.asList("ISD", "UMA"); } public StitchersApprenticeHomunculusToken(final StitchersApprenticeHomunculusToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/StoneTrapIdolToken.java b/Mage/src/main/java/mage/game/permanent/token/StoneTrapIdolToken.java index e32961c302d..4869edbd7f8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/StoneTrapIdolToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/StoneTrapIdolToken.java @@ -1,15 +1,11 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.TrampleAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class StoneTrapIdolToken extends TokenImpl { @@ -22,8 +18,6 @@ public final class StoneTrapIdolToken extends TokenImpl { power = new MageInt(6); toughness = new MageInt(12); addAbility(TrampleAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("WWK", "C18", "MOC"); } public StoneTrapIdolToken(final StoneTrapIdolToken token) { @@ -33,13 +27,4 @@ public final class StoneTrapIdolToken extends TokenImpl { public StoneTrapIdolToken copy() { return new StoneTrapIdolToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C18")) { - this.setTokenType(2); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/SwanSongBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/SwanSongBirdToken.java index 7c2214cabc6..e18ba21794f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SwanSongBirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SwanSongBirdToken.java @@ -1,15 +1,11 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class SwanSongBirdToken extends TokenImpl { @@ -22,17 +18,6 @@ public final class SwanSongBirdToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("THS", "C16"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C16")) { - setTokenType(1); - } } public SwanSongBirdToken(final SwanSongBirdToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SylvanOfferingTreefolkToken.java b/Mage/src/main/java/mage/game/permanent/token/SylvanOfferingTreefolkToken.java index e14369751c4..7069343b51b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SylvanOfferingTreefolkToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SylvanOfferingTreefolkToken.java @@ -1,14 +1,10 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; - -import java.util.Arrays; /** - * * @author spjspj */ public final class SylvanOfferingTreefolkToken extends TokenImpl { @@ -16,16 +12,14 @@ public final class SylvanOfferingTreefolkToken extends TokenImpl { public SylvanOfferingTreefolkToken() { this(1); } + public SylvanOfferingTreefolkToken(int xValue) { super("Treefolk Token", "X/X green Treefolk creature token"); - setOriginalExpansionSetCode("C14"); cardType.add(CardType.CREATURE); subtype.add(SubType.TREEFOLK); color.setGreen(true); power = new MageInt(xValue); toughness = new MageInt(xValue); - - availableImageSetCodes = Arrays.asList("C14", "CMA", "NCC"); } public SylvanOfferingTreefolkToken(final SylvanOfferingTreefolkToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/TIEFighterToken.java b/Mage/src/main/java/mage/game/permanent/token/TIEFighterToken.java index 1302bd828a0..e35b6c045b8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TIEFighterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TIEFighterToken.java @@ -6,14 +6,12 @@ import mage.constants.CardType; import mage.constants.SubType; /** - * * @author Styxo */ public final class TIEFighterToken extends TokenImpl { public TIEFighterToken() { super("TIE Fighter", "1/1 black Starship artifact creature tokens with Spaceflight named TIE Fighter"); - this.setOriginalExpansionSetCode("SWS"); this.power = new MageInt(1); this.toughness = new MageInt(1); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/TentacleToken.java b/Mage/src/main/java/mage/game/permanent/token/TentacleToken.java index b48db5134a8..122f49bae25 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TentacleToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TentacleToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -18,8 +16,6 @@ public final class TentacleToken extends TokenImpl { subtype.add(SubType.TENTACLE); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = Arrays.asList("THB", "NCC", "MOC"); } private TentacleToken(final TentacleToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/TeyoToken.java b/Mage/src/main/java/mage/game/permanent/token/TeyoToken.java index 016bd9db07e..c97bb5942ef 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TeyoToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TeyoToken.java @@ -15,8 +15,6 @@ public final class TeyoToken extends TokenImpl { power = new MageInt(0); toughness = new MageInt(3); addAbility(DefenderAbility.getInstance()); - - setOriginalExpansionSetCode("WAR"); } public TeyoToken(final TeyoToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/TheAtropalToken.java b/Mage/src/main/java/mage/game/permanent/token/TheAtropalToken.java index 2fa1c3b1807..283b83b25da 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TheAtropalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TheAtropalToken.java @@ -6,8 +6,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -25,8 +23,6 @@ public final class TheAtropalToken extends TokenImpl { // Deathtouch addAbility(DeathtouchAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("AFR"); } public TheAtropalToken(final TheAtropalToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/TheHollowSentinelToken.java b/Mage/src/main/java/mage/game/permanent/token/TheHollowSentinelToken.java index 36d5dc0632f..a979e686a3f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TheHollowSentinelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TheHollowSentinelToken.java @@ -5,8 +5,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -21,8 +19,6 @@ public final class TheHollowSentinelToken extends TokenImpl { subtype.add(SubType.GOLEM); power = new MageInt(3); toughness = new MageInt(3); - - availableImageSetCodes = Arrays.asList("ONE"); } public TheHollowSentinelToken(final TheHollowSentinelToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/TheLocustGodInsectToken.java b/Mage/src/main/java/mage/game/permanent/token/TheLocustGodInsectToken.java index 8a0813d3e34..43f010e3866 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TheLocustGodInsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TheLocustGodInsectToken.java @@ -6,8 +6,6 @@ import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -23,17 +21,6 @@ public final class TheLocustGodInsectToken extends TokenImpl { toughness = new MageInt(1); addAbility(FlyingAbility.getInstance()); addAbility(HasteAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("HOU", "C20", "MOC"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C20")) { - this.setTokenType(2); - } } public TheLocustGodInsectToken(final TheLocustGodInsectToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java b/Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java index 4cc3792caed..4511afd1648 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java @@ -4,9 +4,6 @@ import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import mage.util.RandomUtil; - -import java.util.Arrays; /** * @author fireshoes @@ -22,31 +19,6 @@ public final class ThopterColorlessToken extends TokenImpl { toughness = new MageInt(1); addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("C18", "KLD", "MBS", "ORI", "VMA", "M19", "ZNC", - "KHC", "C21", "MH2", "AFC", "VOC", "NEC", "2XM", "RNA", "NCC", "DDU", "BRO", "ONC", "MOM"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C18")) { - this.setTokenType(RandomUtil.nextInt(2) + 1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("KLD")) { - this.setTokenType(RandomUtil.nextInt(3) + 1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("ORI")) { - this.setTokenType(RandomUtil.nextInt(2) + 1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("2XM")) { - this.setTokenType(1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("DDU")) { - this.setTokenType(RandomUtil.nextInt(2) + 1); - } - } public ThopterColorlessToken(final ThopterColorlessToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ThopterToken.java b/Mage/src/main/java/mage/game/permanent/token/ThopterToken.java index 126804fe8d1..f7ef7452b32 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ThopterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ThopterToken.java @@ -1,15 +1,11 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class ThopterToken extends TokenImpl { @@ -23,21 +19,6 @@ public final class ThopterToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("ALA", "C16", "C18", "2XM", "BRC", "MOC"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode().equals("2XM")) { - this.setTokenType(2); - } - - if (getOriginalExpansionSetCode().equals("C18")) { - this.setTokenType(3); - } } public ThopterToken(final ThopterToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ThrullToken.java b/Mage/src/main/java/mage/game/permanent/token/ThrullToken.java index 6f204e6e32a..74489b377dc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ThrullToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ThrullToken.java @@ -1,26 +1,14 @@ - - package mage.game.permanent.token; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; /** - * * @author Quercitron */ public final class ThrullToken extends TokenImpl { - static final private List tokenImageSets = new ArrayList<>(); - - static { - tokenImageSets.addAll(Collections.singletonList("MM2")); - } - public ThrullToken() { super("Thrull Token", "1/1 black Thrull creature token"); cardType.add(CardType.CREATURE); @@ -28,8 +16,6 @@ public final class ThrullToken extends TokenImpl { color.setBlack(true); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = tokenImageSets; } public ThrullToken(final ThrullToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/TidalWaveWallToken.java b/Mage/src/main/java/mage/game/permanent/token/TidalWaveWallToken.java index 4fd89ce29f8..df1d03fd682 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TidalWaveWallToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TidalWaveWallToken.java @@ -1,15 +1,11 @@ - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class TidalWaveWallToken extends TokenImpl { @@ -22,8 +18,6 @@ public final class TidalWaveWallToken extends TokenImpl { power = new MageInt(5); toughness = new MageInt(5); this.addAbility(DefenderAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("EMA", "DDT"); } public TidalWaveWallToken(final TidalWaveWallToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/TitaniaProtectorOfArgothElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/TitaniaProtectorOfArgothElementalToken.java index 62b06649d4e..bcc89b325c1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TitaniaProtectorOfArgothElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TitaniaProtectorOfArgothElementalToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -18,8 +16,6 @@ public final class TitaniaProtectorOfArgothElementalToken extends TokenImpl { this.subtype.add(SubType.ELEMENTAL); this.power = new MageInt(5); this.toughness = new MageInt(3); - - availableImageSetCodes = Arrays.asList("C14", "CMA", "MH2", "BRC"); } public TitaniaProtectorOfArgothElementalToken(final TitaniaProtectorOfArgothElementalToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/Token.java b/Mage/src/main/java/mage/game/permanent/token/Token.java index f2275067305..d9596762473 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Token.java @@ -37,28 +37,14 @@ public interface Token extends MageObject { boolean putOntoBattlefield(int amount, Game game, Ability source, UUID controllerId, boolean tapped, boolean attacking, UUID attackedPlayer, boolean created); - int getTokenType(); - void setPower(int power); void setToughness(int toughness); - void setTokenType(int tokenType); - - String getOriginalCardNumber(); - - void setOriginalCardNumber(String originalCardNumber); - - String getOriginalExpansionSetCode(); - - void setOriginalExpansionSetCode(String originalExpansionSetCode); - Card getCopySourceCard(); void setCopySourceCard(Card copySourceCard); - void setExpansionSetCodeForImage(String code); - Token getBackFace(); void setColor(ObjectColor color); diff --git a/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java b/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java index 434f051d0e4..2eb67a77816 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java +++ b/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java @@ -15,7 +15,6 @@ import mage.cards.repository.TokenRepository; import mage.cards.repository.TokenType; import mage.constants.*; import mage.game.Game; -import mage.game.command.CommandObject; import mage.game.events.CreateTokenEvent; import mage.game.events.CreatedTokenEvent; import mage.game.events.CreatedTokensEvent; @@ -24,10 +23,8 @@ import mage.game.permanent.Permanent; import mage.game.permanent.PermanentToken; import mage.players.Player; import mage.target.Target; -import mage.util.RandomUtil; import java.util.*; -import java.util.stream.Collectors; /** * Each token must have default constructor without params (GUI require for card viewer) @@ -36,15 +33,10 @@ public abstract class TokenImpl extends MageObjectImpl implements Token { protected String description; private final ArrayList lastAddedTokenIds = new ArrayList<>(); - private int tokenType; - private String originalCardNumber; - private String originalExpansionSetCode; + private Card copySourceCard; // the card the Token is a copy from private static final int MAX_TOKENS_PER_GAME = 500; - // list of set codes token images are available for - protected List availableImageSetCodes = new ArrayList<>(); // TODO: delete - protected Token backFace = null; private boolean entersTransformed = false; @@ -64,12 +56,8 @@ public abstract class TokenImpl extends MageObjectImpl implements Token { protected TokenImpl(final TokenImpl token) { super(token); this.description = token.description; - this.tokenType = token.tokenType; this.lastAddedTokenIds.addAll(token.lastAddedTokenIds); - this.originalCardNumber = token.originalCardNumber; - this.originalExpansionSetCode = token.originalExpansionSetCode; this.copySourceCard = token.copySourceCard; // will never be changed - this.availableImageSetCodes = token.availableImageSetCodes; this.backFace = token.backFace != null ? token.backFace.copy() : null; this.entersTransformed = token.entersTransformed; } @@ -157,17 +145,17 @@ public abstract class TokenImpl extends MageObjectImpl implements Token { // - use default set code // token from a card - must use card image instead (example: Embalm ability) - if (token.getOriginalCardNumber() != null) { - return new TokenInfo(TokenType.TOKEN, token.getName(), token.getOriginalExpansionSetCode(), 0); + if (!token.getCardNumber().isEmpty()) { + return new TokenInfo(TokenType.TOKEN, token.getName(), token.getExpansionSetCode(), 0); } // token from another token if (token instanceof EmptyToken) { - if (token.getOriginalExpansionSetCode() == null) { + if (token.getExpansionSetCode() == null) { // possible reason: miss call of CardUtil.copySetAndCardNumber in copying method throw new IllegalArgumentException("Wrong code usage: can't copy token without set code"); } - return new TokenInfo(TokenType.TOKEN, token.getName(), token.getOriginalExpansionSetCode(), token.getTokenType()); + return new TokenInfo(TokenType.TOKEN, token.getName(), token.getExpansionSetCode(), token.getImageNumber()); } // token as is @@ -179,26 +167,17 @@ public abstract class TokenImpl extends MageObjectImpl implements Token { setCode = sourceCard.getExpansionSetCode(); } else { MageObject sourceObject = game.getObject(sourceId); - if (sourceObject instanceof CommandObject) { - setCode = ((CommandObject) sourceObject).getExpansionSetCodeForImage(); + if (sourceObject != null) { + setCode = sourceObject.getExpansionSetCode(); } else { setCode = null; } } // search by set code - List possibleInfo = TokenRepository.instance.getByClassName(token.getClass().getName()) - .stream() - .filter(info -> info.getSetCode().equals(setCode)) - .collect(Collectors.toList()); - - // search by random set - if (possibleInfo.isEmpty()) { - possibleInfo = new ArrayList<>(TokenRepository.instance.getByClassName(token.getClass().getName())); - } - - if (possibleInfo.size() > 0) { - return RandomUtil.randomFromCollection(possibleInfo); + TokenInfo foundInfo = TokenRepository.instance.generateTokenInfoBySetCode(token.getClass().getName(), setCode); + if (foundInfo != null) { + return foundInfo; } // TODO: implement auto-generate images for CreatureToken (search public tokens for same characteristics) @@ -275,9 +254,9 @@ public abstract class TokenImpl extends MageObjectImpl implements Token { // choose token's set code due source TokenInfo tokenInfo = TokenImpl.generateTokenInfo((TokenImpl) token, game, source == null ? null : source.getSourceId()); - token.setOriginalExpansionSetCode(tokenInfo.getSetCode()); - token.setExpansionSetCodeForImage(tokenInfo.getSetCode()); - token.setTokenType(tokenInfo.getImageNumber()); + token.setExpansionSetCode(tokenInfo.getSetCode()); + //token.setCardNumber(""); // if token from a card then don't change a card number + token.setImageNumber(tokenInfo.getImageNumber()); List needTokens = new ArrayList<>(); List allowedTokens = new ArrayList<>(); @@ -424,35 +403,6 @@ public abstract class TokenImpl extends MageObjectImpl implements Token { this.toughness = new MageInt(toughness); } - @Override - public int getTokenType() { - return tokenType; - } - - /** - * Set token index to search in tokens-database.txt (if set have multiple - * tokens with same name) Default is 1 - */ - @Override - public void setTokenType(int tokenType) { - this.tokenType = tokenType; - } - - @Override - public String getOriginalCardNumber() { - return originalCardNumber; - } - - @Override - public void setOriginalCardNumber(String originalCardNumber) { - this.originalCardNumber = originalCardNumber; - } - - @Override - public String getOriginalExpansionSetCode() { - return originalExpansionSetCode; - } - @Override public void setStartingLoyalty(int startingLoyalty) { if (backFace != null) { @@ -469,14 +419,6 @@ public abstract class TokenImpl extends MageObjectImpl implements Token { super.setStartingDefense(intArg); } - @Override - public void setOriginalExpansionSetCode(String originalExpansionSetCode) { - // TODO: delete - // TODO: remove original set code at all... token image must be takes by card source or by latest set (on null source) - // TODO: if set have same tokens then selects it by random - this.originalExpansionSetCode = originalExpansionSetCode; - } - @Override public Card getCopySourceCard() { return copySourceCard; @@ -489,12 +431,6 @@ public abstract class TokenImpl extends MageObjectImpl implements Token { } } - @Override - public void setExpansionSetCodeForImage(String code) { - // TODO: delete - setOriginalExpansionSetCode(code); - } - @Override public Token getBackFace() { return backFace; diff --git a/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java b/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java index b0305afae4c..dcd73fe6ecc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java @@ -8,9 +8,6 @@ import mage.abilities.mana.SimpleManaAbility; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.util.RandomUtil; - -import java.util.Arrays; /** * @author TheElk801 @@ -26,11 +23,6 @@ public final class TreasureToken extends TokenImpl { Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost().setText("sacrifice this artifact")); this.addAbility(ability); - - availableImageSetCodes = Arrays.asList("XLN", "RNA", "M20", "C19", "C20", - "M21", "CMR", "KHM", "STX", "MH2", - "AFR", "VOW", "NEO", "SLD", "2XM", - "SNC", "CLB", "2X2", "DMC", "GN3", "30A", "MOM"); } public TreasureToken(final TreasureToken token) { @@ -40,25 +32,4 @@ public final class TreasureToken extends TokenImpl { public TreasureToken copy() { return new TreasureToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("XLN")) { - this.setTokenType(RandomUtil.nextInt(4) + 1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("SNC")) { - this.setTokenType(RandomUtil.nextInt(5) + 1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MH2")) { - this.setTokenType(RandomUtil.nextInt(2) + 1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("30A")) { - this.setTokenType(RandomUtil.nextInt(3) + 1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MOM")) { - this.setTokenType(RandomUtil.nextInt(2) + 1); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/TreefolkShamanToken.java b/Mage/src/main/java/mage/game/permanent/token/TreefolkShamanToken.java index ed90215fd4e..95a5437d9b3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TreefolkShamanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TreefolkShamanToken.java @@ -1,14 +1,10 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; - -import java.util.Arrays; /** - * * @author spjspj */ public final class TreefolkShamanToken extends TokenImpl { @@ -21,8 +17,6 @@ public final class TreefolkShamanToken extends TokenImpl { subtype.add(SubType.SHAMAN); power = new MageInt(2); toughness = new MageInt(5); - - availableImageSetCodes = Arrays.asList("MOR", "MMA"); } public TreefolkShamanToken(final TreefolkShamanToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/TriskelaviteToken.java b/Mage/src/main/java/mage/game/permanent/token/TriskelaviteToken.java index ef2f3c58841..319c40ed9fd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TriskelaviteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TriskelaviteToken.java @@ -1,28 +1,23 @@ - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetAnyTarget; -import java.util.Arrays; - /** - * * @author spjspj */ public final class TriskelaviteToken extends TokenImpl { public TriskelaviteToken() { super("Triskelavite Token", "1/1 colorless Triskelavite artifact creature token with flying. It has \"Sacrifice this creature: This creature deals 1 damage to any target.\""); - this.setOriginalExpansionSetCode("TSP"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.TRISKELAVITE); @@ -34,8 +29,6 @@ public final class TriskelaviteToken extends TokenImpl { this.addAbility(ability); addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("CM2"); } public TriskelaviteToken(final TriskelaviteToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/TrollWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/TrollWarriorToken.java index 40f63593ebe..affd3a93467 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TrollWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TrollWarriorToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.TrampleAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -22,8 +20,6 @@ public final class TrollWarriorToken extends TokenImpl { toughness = new MageInt(4); addAbility(TrampleAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("KHM"); } private TrollWarriorToken(final TrollWarriorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/TrooperToken.java b/Mage/src/main/java/mage/game/permanent/token/TrooperToken.java index 3cb8adbe6f0..dd3bfa06cb7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TrooperToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TrooperToken.java @@ -1,21 +1,16 @@ - package mage.game.permanent.token; -import java.util.Collections; - import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; /** - * * @author Styxo */ public final class TrooperToken extends TokenImpl { public TrooperToken() { super("Trooper Token", "1/1 white Trooper creature token"); - availableImageSetCodes.addAll(Collections.singletonList("SWS")); cardType.add(CardType.CREATURE); subtype.add(SubType.TROOPER); diff --git a/Mage/src/main/java/mage/game/permanent/token/TrooperToken2.java b/Mage/src/main/java/mage/game/permanent/token/TrooperToken2.java index 3e9b0c31d68..48045fc0945 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TrooperToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/TrooperToken2.java @@ -1,22 +1,16 @@ - package mage.game.permanent.token; -import java.util.Collections; - import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; /** - * * @author NinthWorld */ public final class TrooperToken2 extends TokenImpl { public TrooperToken2() { super("Trooper Token", "1/1 black Trooper creature token"); - availableImageSetCodes.addAll(Collections.singletonList("SWS")); - this.setTokenType(2); cardType.add(CardType.CREATURE); subtype.add(SubType.TROOPER); diff --git a/Mage/src/main/java/mage/game/permanent/token/TuktukTheReturnedToken.java b/Mage/src/main/java/mage/game/permanent/token/TuktukTheReturnedToken.java index e5684c22068..87af43dc7f2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TuktukTheReturnedToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TuktukTheReturnedToken.java @@ -5,8 +5,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import java.util.Arrays; - /** * @author spjspj */ @@ -21,8 +19,6 @@ public final class TuktukTheReturnedToken extends TokenImpl { subtype.add(SubType.GOLEM); power = new MageInt(5); toughness = new MageInt(5); - - availableImageSetCodes = Arrays.asList("ROE", "C14", "CM2", "2XM"); } public TuktukTheReturnedToken(final TuktukTheReturnedToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/TuskenRaiderToken.java b/Mage/src/main/java/mage/game/permanent/token/TuskenRaiderToken.java index 4d1516ec99b..6f8194126a0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TuskenRaiderToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TuskenRaiderToken.java @@ -1,19 +1,16 @@ - - package mage.game.permanent.token; + import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; /** - * * @author spjspj */ public final class TuskenRaiderToken extends TokenImpl { public TuskenRaiderToken() { super("Tusken Raider Token", "white Tusken Raider creature token"); - this.setOriginalExpansionSetCode("SWS"); this.power = new MageInt(1); this.toughness = new MageInt(1); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/Tyranid55Token.java b/Mage/src/main/java/mage/game/permanent/token/Tyranid55Token.java index ee815e0fc4f..3d5f0c911eb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Tyranid55Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Tyranid55Token.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -18,9 +16,6 @@ public final class Tyranid55Token extends TokenImpl { subtype.add(SubType.TYRANID); power = new MageInt(5); toughness = new MageInt(5); - - availableImageSetCodes.addAll(Arrays.asList("40K")); - this.setTokenType(2); } public Tyranid55Token(final Tyranid55Token token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/TyranidGargoyleToken.java b/Mage/src/main/java/mage/game/permanent/token/TyranidGargoyleToken.java index 06e8c0cac0d..7e9c222d2f6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TyranidGargoyleToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TyranidGargoyleToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -22,8 +20,6 @@ public final class TyranidGargoyleToken extends TokenImpl { toughness = new MageInt(1); addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes.addAll(Arrays.asList("40K")); } public TyranidGargoyleToken(final TyranidGargoyleToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/TyranidToken.java b/Mage/src/main/java/mage/game/permanent/token/TyranidToken.java index 42d7f56bf21..4f45ea65624 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TyranidToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TyranidToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -18,9 +16,6 @@ public final class TyranidToken extends TokenImpl { subtype.add(SubType.TYRANID); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes.addAll(Arrays.asList("40K")); - this.setTokenType(1); } public TyranidToken(final TyranidToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/TyranidWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/TyranidWarriorToken.java index 3452899a979..c2230765e53 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TyranidWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TyranidWarriorToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.TrampleAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -21,8 +19,6 @@ public final class TyranidWarriorToken extends TokenImpl { power = new MageInt(3); toughness = new MageInt(3); addAbility(TrampleAbility.getInstance()); - - availableImageSetCodes.addAll(Arrays.asList("40K")); } public TyranidWarriorToken(final TyranidWarriorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/UginTheIneffableToken.java b/Mage/src/main/java/mage/game/permanent/token/UginTheIneffableToken.java index a4fc8b57e00..2d7887ce31a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/UginTheIneffableToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/UginTheIneffableToken.java @@ -11,7 +11,6 @@ public final class UginTheIneffableToken extends TokenImpl { public UginTheIneffableToken() { super("Spirit Token", "2/2 colorless Spirit creature token"); - setExpansionSetCodeForImage("WAR"); // default cardType.add(CardType.CREATURE); subtype.add(SubType.SPIRIT); power = new MageInt(2); diff --git a/Mage/src/main/java/mage/game/permanent/token/UnicornToken.java b/Mage/src/main/java/mage/game/permanent/token/UnicornToken.java index 899a6fe2198..7edc1a3a8d9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/UnicornToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/UnicornToken.java @@ -8,7 +8,6 @@ public final class UnicornToken extends TokenImpl { public UnicornToken() { super("Unicorn Token", "2/2 white Unicorn creature token"); - setExpansionSetCodeForImage("JMP"); cardType.add(CardType.CREATURE); subtype.add(SubType.UNICORN); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java index 2ea05ffeeeb..cf193d1cfb2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java @@ -1,28 +1,17 @@ - package mage.game.permanent.token; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class UtvaraHellkiteDragonToken extends TokenImpl { - - static final private List tokenImageSets = new ArrayList<>(); - static { - tokenImageSets.addAll(Arrays.asList("RTR", "C17", "GK2")); - } public UtvaraHellkiteDragonToken() { super("Dragon Token", "6/6 red Dragon creature token with flying"); - availableImageSetCodes = tokenImageSets; cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.DRAGON); @@ -30,6 +19,7 @@ public final class UtvaraHellkiteDragonToken extends TokenImpl { toughness = new MageInt(6); addAbility(FlyingAbility.getInstance()); } + public UtvaraHellkiteDragonToken(final UtvaraHellkiteDragonToken token) { super(token); } @@ -37,14 +27,4 @@ public final class UtvaraHellkiteDragonToken extends TokenImpl { public UtvaraHellkiteDragonToken copy() { return new UtvaraHellkiteDragonToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C17")) { - setTokenType(2); - } - } - } diff --git a/Mage/src/main/java/mage/game/permanent/token/VampireKnightToken.java b/Mage/src/main/java/mage/game/permanent/token/VampireKnightToken.java index 33ca751ad80..3c1a99c1845 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VampireKnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VampireKnightToken.java @@ -16,8 +16,6 @@ public final class VampireKnightToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); addAbility(LifelinkAbility.getInstance()); - - this.setOriginalExpansionSetCode("MOC"); } public VampireKnightToken(final VampireKnightToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/VampireLifelinkToken.java b/Mage/src/main/java/mage/game/permanent/token/VampireLifelinkToken.java index fe5afdbb3a6..7e6da5124e9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VampireLifelinkToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VampireLifelinkToken.java @@ -6,10 +6,7 @@ import mage.abilities.keyword.LifelinkAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** - * * @author weirddan455 */ public class VampireLifelinkToken extends TokenImpl { @@ -24,17 +21,6 @@ public class VampireLifelinkToken extends TokenImpl { this.addAbility(FlyingAbility.getInstance()); this.addAbility(LifelinkAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("VOW"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("VOW")) { - setTokenType(2); - } } private VampireLifelinkToken(final VampireLifelinkToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/VampireToken.java b/Mage/src/main/java/mage/game/permanent/token/VampireToken.java index 78067d197b2..ee3a5837124 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VampireToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VampireToken.java @@ -1,15 +1,11 @@ - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class VampireToken extends TokenImpl { @@ -22,8 +18,6 @@ public final class VampireToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("ISD", "KTK"); } public VampireToken(final VampireToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/VecnaToken.java b/Mage/src/main/java/mage/game/permanent/token/VecnaToken.java index 2a9a336db28..57b83df8ae3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VecnaToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VecnaToken.java @@ -6,8 +6,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -25,8 +23,6 @@ public final class VecnaToken extends TokenImpl { // Indestructible this.addAbility(IndestructibleAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("AFR"); } private VecnaToken(final VecnaToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/VoiceOfResurgenceToken.java b/Mage/src/main/java/mage/game/permanent/token/VoiceOfResurgenceToken.java index addf64c0ad1..281c2b8fc07 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VoiceOfResurgenceToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VoiceOfResurgenceToken.java @@ -8,8 +8,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import java.util.Arrays; - /** * @author spjspj */ @@ -17,7 +15,6 @@ public final class VoiceOfResurgenceToken extends TokenImpl { public VoiceOfResurgenceToken() { super("Elemental Token", "green and white Elemental creature token with \"This creature's power and toughness are each equal to the number of creatures you control."); - setOriginalExpansionSetCode("DGM"); cardType.add(CardType.CREATURE); color.setGreen(true); color.setWhite(true); @@ -29,8 +26,6 @@ public final class VoiceOfResurgenceToken extends TokenImpl { // This creature's power and toughness are each equal to the number of creatures you control. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SetBasePowerToughnessSourceEffect( CreaturesYouControlCount.instance))); - - availableImageSetCodes = Arrays.asList("DGM", "MM3", "2XM"); } public VoiceOfResurgenceToken(final VoiceOfResurgenceToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/VoiceOfTheWoodsElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/VoiceOfTheWoodsElementalToken.java index 989a85ad746..66daa22daac 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VoiceOfTheWoodsElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VoiceOfTheWoodsElementalToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.TrampleAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -22,8 +20,6 @@ public final class VoiceOfTheWoodsElementalToken extends TokenImpl { toughness = new MageInt(7); addAbility(TrampleAbility.getInstance()); - - availableImageSetCodes.addAll(Arrays.asList("DD1", "EVG", "KHC")); } public VoiceOfTheWoodsElementalToken(final VoiceOfTheWoodsElementalToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/VojaFriendToElvesToken.java b/Mage/src/main/java/mage/game/permanent/token/VojaFriendToElvesToken.java index cb8c66b1330..fc3cd2d85b6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VojaFriendToElvesToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VojaFriendToElvesToken.java @@ -20,8 +20,6 @@ public final class VojaFriendToElvesToken extends TokenImpl { this.color.setWhite(true); this.power = new MageInt(3); this.toughness = new MageInt(3); - - setOriginalExpansionSetCode("WAR"); } private VojaFriendToElvesToken(final VojaFriendToElvesToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/VojaToken.java b/Mage/src/main/java/mage/game/permanent/token/VojaToken.java index c2035ffcfaf..eb72a5baf2d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VojaToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VojaToken.java @@ -1,15 +1,11 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; import mage.constants.SuperType; -import java.util.Arrays; - /** - * * @author spjspj */ public final class VojaToken extends TokenImpl { @@ -24,8 +20,6 @@ public final class VojaToken extends TokenImpl { this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - - availableImageSetCodes = Arrays.asList("GK1"); } public VojaToken(final VojaToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/VolosJournalToken.java b/Mage/src/main/java/mage/game/permanent/token/VolosJournalToken.java index 4312af4a875..b04f7e29de0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VolosJournalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VolosJournalToken.java @@ -7,18 +7,14 @@ import mage.abilities.hint.Hint; import mage.abilities.keyword.HexproofAbility; import mage.choices.ChoiceCreatureType; import mage.constants.*; -import mage.filter.FilterCard; import mage.filter.StaticFilters; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.stack.Spell; import mage.players.Player; -import mage.util.RandomUtil; -import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import java.util.UUID; import java.util.stream.Collectors; /** @@ -34,8 +30,6 @@ public final class VolosJournalToken extends TokenImpl { this.addAbility(new SpellCastControllerTriggeredAbility( new VolosJournalTokenEffect(), StaticFilters.FILTER_SPELL_A_CREATURE, false ).addHint(VolosJournalTokenHint.instance)); - - availableImageSetCodes = Arrays.asList("CLB"); } public VolosJournalToken(final VolosJournalToken token) { @@ -121,10 +115,10 @@ class VolosJournalTokenEffect extends OneShotEffect { if (!spell.isAllCreatureTypes(game)) { choice.setChoices( spell.getSubtype(game) - .stream() - .filter(subType -> subType.getSubTypeSet() == SubTypeSet.CreatureType) - .map(SubType::getDescription) - .collect(Collectors.toSet()) + .stream() + .filter(subType -> subType.getSubTypeSet() == SubTypeSet.CreatureType) + .map(SubType::getDescription) + .collect(Collectors.toSet()) ); } // Remove from the possible choices the subtypes which have already been chosen. diff --git a/Mage/src/main/java/mage/game/permanent/token/VrondissRageOfAncientsToken.java b/Mage/src/main/java/mage/game/permanent/token/VrondissRageOfAncientsToken.java index 3ba0900c4ce..aecdc1d59bb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VrondissRageOfAncientsToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VrondissRageOfAncientsToken.java @@ -9,8 +9,6 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; -import java.util.Arrays; - public final class VrondissRageOfAncientsToken extends TokenImpl { public VrondissRageOfAncientsToken() { @@ -24,8 +22,6 @@ public final class VrondissRageOfAncientsToken extends TokenImpl { toughness = new MageInt(4); this.addAbility(new VrondissRageOfAncientsTokenTriggeredAbility()); - - availableImageSetCodes = Arrays.asList("AFC"); } public VrondissRageOfAncientsToken(final VrondissRageOfAncientsToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/WalkerOfTheGroveToken.java b/Mage/src/main/java/mage/game/permanent/token/WalkerOfTheGroveToken.java index d2af36124f0..ed18700d002 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WalkerOfTheGroveToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WalkerOfTheGroveToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -19,20 +17,6 @@ public final class WalkerOfTheGroveToken extends TokenImpl { this.color.setGreen(true); power = new MageInt(4); toughness = new MageInt(4); - - availableImageSetCodes = Arrays.asList("LRW", "MMA", "DDR", "UMA"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode().equals("UMA")) { - this.setTokenType(1); - } - if (getOriginalExpansionSetCode().equals("LRW")) { - this.setTokenType(1); - } } public WalkerOfTheGroveToken(final WalkerOfTheGroveToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/WalkerToken.java b/Mage/src/main/java/mage/game/permanent/token/WalkerToken.java index e3c330b9ecc..bc5dc468618 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WalkerToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WalkerToken.java @@ -3,9 +3,6 @@ package mage.game.permanent.token; import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.util.RandomUtil; - -import java.util.Arrays; /** * @author TheElk801 @@ -19,17 +16,6 @@ public final class WalkerToken extends TokenImpl { subtype.add(SubType.ZOMBIE); power = new MageInt(2); toughness = new MageInt(2); - - availableImageSetCodes = Arrays.asList("SLD"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("SLD")) { - setTokenType(RandomUtil.nextInt(5) + 1); - } } public WalkerToken(final WalkerToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/WandOfTheElementsFirstToken.java b/Mage/src/main/java/mage/game/permanent/token/WandOfTheElementsFirstToken.java index 728879a69a8..cde0e919792 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WandOfTheElementsFirstToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WandOfTheElementsFirstToken.java @@ -18,8 +18,6 @@ public final class WandOfTheElementsFirstToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - - setTokenType(1); } public WandOfTheElementsFirstToken(final WandOfTheElementsFirstToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/WandOfTheElementsSecondToken.java b/Mage/src/main/java/mage/game/permanent/token/WandOfTheElementsSecondToken.java index 7f3bda800ef..b984c8eb879 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WandOfTheElementsSecondToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WandOfTheElementsSecondToken.java @@ -16,8 +16,6 @@ public final class WandOfTheElementsSecondToken extends TokenImpl { this.color.setRed(true); power = new MageInt(3); toughness = new MageInt(3); - - setTokenType(2); } public WandOfTheElementsSecondToken(final WandOfTheElementsSecondToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/WardenSphinxToken.java b/Mage/src/main/java/mage/game/permanent/token/WardenSphinxToken.java index d8b08db40f1..1fc60719bba 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WardenSphinxToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WardenSphinxToken.java @@ -13,7 +13,6 @@ public final class WardenSphinxToken extends TokenImpl { public WardenSphinxToken() { super("Sphinx Token", "4/4 white and blue Sphinx creature token with flying and vigilance"); - this.setOriginalExpansionSetCode("RNA"); color.setWhite(true); color.setBlue(true); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/WarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/WarriorToken.java index 9b71f7c63cf..25cacff6adb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WarriorToken.java @@ -1,16 +1,10 @@ - - package mage.game.permanent.token; -import java.util.Arrays; - import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.util.RandomUtil; /** - * * @author LoneFox */ public final class WarriorToken extends TokenImpl { @@ -22,7 +16,6 @@ public final class WarriorToken extends TokenImpl { subtype.add(SubType.WARRIOR); power = new MageInt(1); toughness = new MageInt(1); - availableImageSetCodes.addAll(Arrays.asList("KTK", "DTK", "BBD", "MOC")); } public WarriorToken(final WarriorToken token) { @@ -30,15 +23,7 @@ public final class WarriorToken extends TokenImpl { } @Override - public WarriorToken copy() { + public WarriorToken copy() { return new WarriorToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - if (getOriginalExpansionSetCode().equals("KTK")) { - this.setTokenType(RandomUtil.nextInt(2) + 1); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/WarriorVigilantToken.java b/Mage/src/main/java/mage/game/permanent/token/WarriorVigilantToken.java index 9dd1a4e76ab..83a09d5dd3d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WarriorVigilantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WarriorVigilantToken.java @@ -1,16 +1,11 @@ - - package mage.game.permanent.token; -import java.util.Arrays; - import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; import mage.constants.CardType; import mage.constants.SubType; /** - * * @author fireshoes */ public final class WarriorVigilantToken extends TokenImpl { @@ -23,7 +18,6 @@ public final class WarriorVigilantToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); addAbility(VigilanceAbility.getInstance()); - availableImageSetCodes.addAll(Arrays.asList("AKH", "DMC")); } public WarriorVigilantToken(final WarriorVigilantToken token) { @@ -31,7 +25,7 @@ public final class WarriorVigilantToken extends TokenImpl { } @Override - public WarriorVigilantToken copy() { + public WarriorVigilantToken copy() { return new WarriorVigilantToken(this); } } diff --git a/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java index 4985d895aec..5c12b910ab5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java @@ -1,31 +1,17 @@ - package mage.game.permanent.token; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class WasitoraCatDragonToken extends TokenImpl { - static final private List tokenImageSets = new ArrayList<>(); - - static { - tokenImageSets.addAll(Arrays.asList("C17", "2X2")); - } - public WasitoraCatDragonToken() { super("Cat Dragon Token", "3/3 black, red, and green Cat Dragon creature token with flying"); - - availableImageSetCodes = tokenImageSets; - cardType.add(CardType.CREATURE); this.subtype.add(SubType.CAT); this.subtype.add(SubType.DRAGON); diff --git a/Mage/src/main/java/mage/game/permanent/token/WaspToken.java b/Mage/src/main/java/mage/game/permanent/token/WaspToken.java index 2cce7154793..2d1e00c5ba8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WaspToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WaspToken.java @@ -1,15 +1,11 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class WaspToken extends TokenImpl { @@ -22,8 +18,6 @@ public final class WaspToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("10E", "30A"); } public WaspToken(final WaspToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/WaylayToken.java b/Mage/src/main/java/mage/game/permanent/token/WaylayToken.java index 423523f88c0..cb63ab39e8e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WaylayToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WaylayToken.java @@ -1,14 +1,10 @@ - package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; - -import java.util.Arrays; /** - * * @author spjspj */ public final class WaylayToken extends TokenImpl { @@ -20,8 +16,6 @@ public final class WaylayToken extends TokenImpl { subtype.add(SubType.KNIGHT); power = new MageInt(2); toughness = new MageInt(2); - - availableImageSetCodes = Arrays.asList("CLB"); } public WaylayToken(final WaylayToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/WeirdToken.java b/Mage/src/main/java/mage/game/permanent/token/WeirdToken.java index 6a688c49e7f..fab7f418f31 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WeirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WeirdToken.java @@ -1,16 +1,12 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.FlyingAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class WeirdToken extends TokenImpl { @@ -24,8 +20,6 @@ public final class WeirdToken extends TokenImpl { toughness = new MageInt(3); this.addAbility(DefenderAbility.getInstance()); this.addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("GK1"); } public WeirdToken(final WeirdToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/WeirdToken2.java b/Mage/src/main/java/mage/game/permanent/token/WeirdToken2.java index 22be2351a42..a02569a9ba0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WeirdToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/WeirdToken2.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -23,8 +21,6 @@ public final class WeirdToken2 extends TokenImpl { subtype.add(SubType.WEIRD); power = new MageInt(xValue); toughness = new MageInt(xValue); - - availableImageSetCodes = Arrays.asList("M21"); } private WeirdToken2(final WeirdToken2 token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/WhiteAstartesWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/WhiteAstartesWarriorToken.java index 94bc53bd851..9634500ddb9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WhiteAstartesWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WhiteAstartesWarriorToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.VigilanceAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -21,9 +19,6 @@ public final class WhiteAstartesWarriorToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); addAbility(VigilanceAbility.getInstance()); - - availableImageSetCodes.addAll(Arrays.asList("40K")); - this.setTokenType(2); } public WhiteAstartesWarriorToken(final WhiteAstartesWarriorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/WhiteBlackSpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/WhiteBlackSpiritToken.java index facf2b65335..cab897962ac 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WhiteBlackSpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WhiteBlackSpiritToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -21,23 +19,6 @@ public final class WhiteBlackSpiritToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes.addAll(Arrays.asList("GTC", "EVE", "MH1", "C15", "C21", "UMA", "RNA", "MOM")); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode().equals("UMA")) { - this.setTokenType(2); - } - if (getOriginalExpansionSetCode().equals("C15")) { - this.setTokenType(2); - } - if (getOriginalExpansionSetCode().equals("MOM")) { - this.setTokenType(1); - } } public WhiteBlackSpiritToken(final WhiteBlackSpiritToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/WhiteBlueBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/WhiteBlueBirdToken.java index b8737e47fda..e52b5fc398f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WhiteBlueBirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WhiteBlueBirdToken.java @@ -1,13 +1,11 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class WhiteBlueBirdToken extends TokenImpl { @@ -21,9 +19,8 @@ public final class WhiteBlueBirdToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("GK2"); } + public WhiteBlueBirdToken(final WhiteBlueBirdToken token) { super(token); } diff --git a/Mage/src/main/java/mage/game/permanent/token/WhiteDogToken.java b/Mage/src/main/java/mage/game/permanent/token/WhiteDogToken.java index 5caff0492c4..573fe94f5b1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WhiteDogToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WhiteDogToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author htrajan */ @@ -19,8 +17,6 @@ public final class WhiteDogToken extends TokenImpl { color.setWhite(true); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes.addAll(Arrays.asList("M21")); } private WhiteDogToken(final WhiteDogToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/WhiteElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/WhiteElementalToken.java index ff677075cca..a0603d94ce1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WhiteElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WhiteElementalToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -20,25 +18,6 @@ public final class WhiteElementalToken extends TokenImpl { power = new MageInt(4); toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("LRW", "C16", "C20", "RTR", "NCC"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C20")) { - setTokenType(2); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("LRW")) { - setTokenType(2); - } - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("NCC")) { - setTokenType(3); - } } public WhiteElementalToken(final WhiteElementalToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/WildfireAwakenerToken.java b/Mage/src/main/java/mage/game/permanent/token/WildfireAwakenerToken.java index 5e66137ff8d..decf15e535f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WildfireAwakenerToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WildfireAwakenerToken.java @@ -8,8 +8,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.target.TargetPlayer; -import java.util.Arrays; - /** * @author PurpleCrowbar */ @@ -28,8 +26,6 @@ public final class WildfireAwakenerToken extends TokenImpl { Ability ability = new BecomesTappedSourceTriggeredAbility(new DamageTargetEffect(1, "it")); ability.addTarget(new TargetPlayer()); this.addAbility(ability); - - availableImageSetCodes.addAll(Arrays.asList("MOC")); } public WildfireAwakenerToken(final WildfireAwakenerToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/WingmateRocToken.java b/Mage/src/main/java/mage/game/permanent/token/WingmateRocToken.java index 723790a0dcb..3b9b14a341d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WingmateRocToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WingmateRocToken.java @@ -1,15 +1,11 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class WingmateRocToken extends TokenImpl { @@ -22,8 +18,6 @@ public final class WingmateRocToken extends TokenImpl { power = new MageInt(3); toughness = new MageInt(4); addAbility(FlyingAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("KTK", "C19"); } public WingmateRocToken(final WingmateRocToken token) { @@ -33,13 +27,4 @@ public final class WingmateRocToken extends TokenImpl { public WingmateRocToken copy() { return new WingmateRocToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C19")) { - this.setTokenType(2); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/WireflyToken.java b/Mage/src/main/java/mage/game/permanent/token/WireflyToken.java index 6f39347e8a0..b9c0c0ad8c7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WireflyToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WireflyToken.java @@ -1,20 +1,17 @@ - package mage.game.permanent.token; import mage.MageInt; -import mage.constants.CardType; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; import mage.constants.SubType; /** - * * @author spjspj */ public final class WireflyToken extends TokenImpl { public WireflyToken() { super("Wirefly", "2/2 colorless Insect artifact creature token with flying named Wirefly"); - this.setOriginalExpansionSetCode("DST"); this.power = new MageInt(2); this.toughness = new MageInt(2); this.subtype.add(SubType.INSECT); diff --git a/Mage/src/main/java/mage/game/permanent/token/WizardToken.java b/Mage/src/main/java/mage/game/permanent/token/WizardToken.java index 67a04fb3a07..0d6a1eb8074 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WizardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WizardToken.java @@ -16,8 +16,6 @@ public final class WizardToken extends TokenImpl { color.setBlue(true); power = new MageInt(2); toughness = new MageInt(2); - - setOriginalExpansionSetCode("WAR"); } private WizardToken(final WizardToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/WolfToken.java b/Mage/src/main/java/mage/game/permanent/token/WolfToken.java index dae18612e21..3386fca5d63 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WolfToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WolfToken.java @@ -3,9 +3,6 @@ package mage.game.permanent.token; import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.util.RandomUtil; - -import java.util.Arrays; /** * @author BetaSteward_at_googlemail.com @@ -20,22 +17,6 @@ public final class WolfToken extends TokenImpl { subtype.add(SubType.WOLF); power = new MageInt(2); toughness = new MageInt(2); - - availableImageSetCodes = Arrays.asList("BNG", "C14", "C15", "CMA", "CNS", "ISD", - "LRW", "M10", "M14", "MM2", "SHM", "SOI", "SOM", "V10", "ZEN", "WAR", "M20", - "THB", "AFR", "MID", "VOW", "2XM", "A25", "CLB", "30A"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("ISD")) { - this.setTokenType(2); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("CMA")) { - this.setTokenType(RandomUtil.nextInt(2) + 1); // 2 images - } } public WolfToken(final WolfToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java b/Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java index 9457a47c04b..652b03d686a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java +++ b/Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java @@ -1,17 +1,11 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; -import mage.util.RandomUtil; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author nantuko */ public final class WolfTokenWithDeathtouch extends TokenImpl { @@ -25,17 +19,6 @@ public final class WolfTokenWithDeathtouch extends TokenImpl { toughness = new MageInt(1); addAbility(DeathtouchAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("ISD"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("ISD")) { - this.setTokenType(1); - } } public WolfTokenWithDeathtouch(final WolfTokenWithDeathtouch token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/WoodToken.java b/Mage/src/main/java/mage/game/permanent/token/WoodToken.java index 21f493d197b..feb008519d2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WoodToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WoodToken.java @@ -1,20 +1,17 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.DefenderAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class WoodToken extends TokenImpl { public WoodToken() { super("Wood", "0/1 green Wall creature token with defender named Wood"); - this.setOriginalExpansionSetCode("MIR"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.WALL); diff --git a/Mage/src/main/java/mage/game/permanent/token/WrennAndSevenTreefolkToken.java b/Mage/src/main/java/mage/game/permanent/token/WrennAndSevenTreefolkToken.java index 50885d83724..8535b2e0c9b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WrennAndSevenTreefolkToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WrennAndSevenTreefolkToken.java @@ -9,8 +9,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -27,8 +25,6 @@ public final class WrennAndSevenTreefolkToken extends TokenImpl { this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetBasePowerToughnessSourceEffect( LandsYouControlCount.instance ).setText("this creature's power and toughness are each equal to the number of lands you control"))); - - availableImageSetCodes.addAll(Arrays.asList("MID")); } public WrennAndSevenTreefolkToken(final WrennAndSevenTreefolkToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/Wurm44Token.java b/Mage/src/main/java/mage/game/permanent/token/Wurm44Token.java index c820cf507e4..3fe0756c435 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Wurm44Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Wurm44Token.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -18,7 +16,6 @@ public final class Wurm44Token extends TokenImpl { subtype.add(SubType.WURM); power = new MageInt(4); toughness = new MageInt(4); - setOriginalExpansionSetCode("DMC"); } public Wurm44Token(final Wurm44Token token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/Wurm55Token.java b/Mage/src/main/java/mage/game/permanent/token/Wurm55Token.java index bf6c45fccfb..6cc7ac99e77 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Wurm55Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Wurm55Token.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author fireshoes */ @@ -18,8 +16,6 @@ public final class Wurm55Token extends TokenImpl { subtype.add(SubType.WURM); power = new MageInt(5); toughness = new MageInt(5); - - availableImageSetCodes = Arrays.asList("AKH", "NCC", "CLB"); } public Wurm55Token(final Wurm55Token token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/WurmToken.java b/Mage/src/main/java/mage/game/permanent/token/WurmToken.java index b351ed205c7..f4832fa15a3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WurmToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WurmToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author magenoxx_at_gmail.com */ @@ -18,17 +16,6 @@ public final class WurmToken extends TokenImpl { subtype.add(SubType.WURM); power = new MageInt(6); toughness = new MageInt(6); - - availableImageSetCodes = Arrays.asList("C19", "EMA", "JUD", "M12", "M13", "MM3", "ODY", "VMA", "C21", "DDS", "GK2"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode().equals("VMA")) { - this.setTokenType(2); - } } public WurmToken(final WurmToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/WurmWithDeathtouchToken.java b/Mage/src/main/java/mage/game/permanent/token/WurmWithDeathtouchToken.java index edae64a1a6c..e372b356064 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WurmWithDeathtouchToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WurmWithDeathtouchToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.DeathtouchAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -21,29 +19,6 @@ public final class WurmWithDeathtouchToken extends TokenImpl { power = new MageInt(3); toughness = new MageInt(3); this.addAbility(DeathtouchAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("C14", "SOM", "2XM", "CM2"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode().equals("C14")) { - this.setTokenType(1); - } - if (getOriginalExpansionSetCode().equals("SOM")) { - this.setTokenType(1); - } - if (getOriginalExpansionSetCode().equals("CM2")) { - this.setTokenType(1); - } - if (getOriginalExpansionSetCode().equals("2XM")) { - this.setTokenType(1); - } - if (getOriginalExpansionSetCode().equals("CM2")) { - this.setTokenType(1); - } } public WurmWithDeathtouchToken(final WurmWithDeathtouchToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/WurmWithLifelinkToken.java b/Mage/src/main/java/mage/game/permanent/token/WurmWithLifelinkToken.java index 0bee9aa6aa5..7b107a33585 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WurmWithLifelinkToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WurmWithLifelinkToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.LifelinkAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -21,26 +19,6 @@ public final class WurmWithLifelinkToken extends TokenImpl { power = new MageInt(3); toughness = new MageInt(3); this.addAbility(LifelinkAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("C14", "SOM", "2XM", "CM2"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode().equals("C14")) { - this.setTokenType(2); - } - if (getOriginalExpansionSetCode().equals("SOM")) { - this.setTokenType(2); - } - if (getOriginalExpansionSetCode().equals("CM2")) { - this.setTokenType(2); - } - if (getOriginalExpansionSetCode().equals("2XM")) { - this.setTokenType(2); - } } public WurmWithLifelinkToken(final WurmWithLifelinkToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/WurmWithTrampleToken.java b/Mage/src/main/java/mage/game/permanent/token/WurmWithTrampleToken.java index 31162fc2cff..5afc9723560 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WurmWithTrampleToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WurmWithTrampleToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.TrampleAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author LoneFox */ @@ -20,8 +18,6 @@ public final class WurmWithTrampleToken extends TokenImpl { power = new MageInt(5); toughness = new MageInt(5); addAbility(TrampleAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("RTR", "MM3", "GK1"); } public WurmWithTrampleToken(final WurmWithTrampleToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/XenagosSatyrToken.java b/Mage/src/main/java/mage/game/permanent/token/XenagosSatyrToken.java index 4db3e4ad085..5b0619ec012 100644 --- a/Mage/src/main/java/mage/game/permanent/token/XenagosSatyrToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/XenagosSatyrToken.java @@ -1,15 +1,11 @@ - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.HasteAbility; - -import java.util.Arrays; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class XenagosSatyrToken extends TokenImpl { @@ -24,9 +20,8 @@ public final class XenagosSatyrToken extends TokenImpl { toughness = new MageInt(2); this.addAbility(HasteAbility.getInstance()); - - availableImageSetCodes = Arrays.asList("THS", "CLB"); } + public XenagosSatyrToken(final XenagosSatyrToken token) { super(token); } diff --git a/Mage/src/main/java/mage/game/permanent/token/XiraBlackInsectToken.java b/Mage/src/main/java/mage/game/permanent/token/XiraBlackInsectToken.java index d891d960c35..070c7bd8105 100644 --- a/Mage/src/main/java/mage/game/permanent/token/XiraBlackInsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/XiraBlackInsectToken.java @@ -18,7 +18,6 @@ public final class XiraBlackInsectToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - setOriginalExpansionSetCode("DMC"); } public XiraBlackInsectToken(final XiraBlackInsectToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ZaxaraTheExemplaryHydraToken.java b/Mage/src/main/java/mage/game/permanent/token/ZaxaraTheExemplaryHydraToken.java index 4d7b80b1308..338cbcd651d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZaxaraTheExemplaryHydraToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZaxaraTheExemplaryHydraToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author AsterAether */ @@ -18,8 +16,6 @@ public class ZaxaraTheExemplaryHydraToken extends TokenImpl { subtype.add(SubType.HYDRA); power = new MageInt(0); toughness = new MageInt(0); - - availableImageSetCodes = Arrays.asList("C20", "DMC"); } private ZaxaraTheExemplaryHydraToken(final ZaxaraTheExemplaryHydraToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ZendikarsRoilElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/ZendikarsRoilElementalToken.java index b8753dfd66a..fbe8a163a40 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZendikarsRoilElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZendikarsRoilElementalToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ @@ -18,8 +16,6 @@ public final class ZendikarsRoilElementalToken extends TokenImpl { color.setGreen(true); power = new MageInt(2); toughness = new MageInt(2); - - availableImageSetCodes.addAll(Arrays.asList("ORI", "ZNC")); } public ZendikarsRoilElementalToken(final ZendikarsRoilElementalToken token) { @@ -29,13 +25,4 @@ public final class ZendikarsRoilElementalToken extends TokenImpl { public ZendikarsRoilElementalToken copy() { return new ZendikarsRoilElementalToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("ZNC")) { - setTokenType(2); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/ZeppelinToken.java b/Mage/src/main/java/mage/game/permanent/token/ZeppelinToken.java index 8cd1fc26e8b..e5ed0c3012b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZeppelinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZeppelinToken.java @@ -6,8 +6,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -22,8 +20,6 @@ public final class ZeppelinToken extends TokenImpl { this.addAbility(FlyingAbility.getInstance()); this.addAbility(new CrewAbility(3)); - - availableImageSetCodes = Arrays.asList("J22"); } public ZeppelinToken(final ZeppelinToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieArmyToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieArmyToken.java index e32d893adaa..e06f9290b0d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieArmyToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieArmyToken.java @@ -3,9 +3,6 @@ package mage.game.permanent.token; import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.util.RandomUtil; - -import java.util.Arrays; /** * @author TheElk801 @@ -21,8 +18,6 @@ public final class ZombieArmyToken extends TokenImpl { subtype.add(SubType.ARMY); power = new MageInt(0); toughness = new MageInt(0); - - availableImageSetCodes = Arrays.asList("WAR", "MH2", "MIC"); } private ZombieArmyToken(final ZombieArmyToken token) { @@ -33,13 +28,4 @@ public final class ZombieArmyToken extends TokenImpl { public ZombieArmyToken copy() { return new ZombieArmyToken(this); } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("WAR")) { - this.setTokenType(RandomUtil.nextInt(3) + 1); // 1..3 - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieBerserkerToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieBerserkerToken.java index b43c276ee82..52295a0a827 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieBerserkerToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieBerserkerToken.java @@ -4,8 +4,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author TheElk801 */ @@ -19,8 +17,6 @@ public final class ZombieBerserkerToken extends TokenImpl { subtype.add(SubType.BERSERKER); power = new MageInt(2); toughness = new MageInt(2); - - availableImageSetCodes = Arrays.asList("KHM"); } private ZombieBerserkerToken(final ZombieBerserkerToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieDecayedToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieDecayedToken.java index 70ceab02d52..55ac36bab16 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieDecayedToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieDecayedToken.java @@ -18,17 +18,6 @@ public final class ZombieDecayedToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); this.addAbility(new DecayedAbility()); - - this.setExpansionSetCodeForImage("MID"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MID")) { - this.setTokenType(1); - } } public ZombieDecayedToken(final ZombieDecayedToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieKnightToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieKnightToken.java index d01b5812479..62069fafd3e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieKnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieKnightToken.java @@ -1,9 +1,5 @@ - package mage.game.permanent.token; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; import mage.MageInt; import mage.abilities.keyword.MenaceAbility; import mage.constants.CardType; @@ -11,14 +7,8 @@ import mage.constants.SubType; public final class ZombieKnightToken extends TokenImpl { - static final private List tokenImageSets = new ArrayList<>(); - static { - tokenImageSets.addAll(Arrays.asList("DOM", "DMC", "MOC")); - } - - public ZombieKnightToken(){ + public ZombieKnightToken() { super("Zombie Knight Token", "2/2 black Zombie Knight creature token with menace"); - availableImageSetCodes = tokenImageSets; color.setBlack(true); cardType.add(CardType.CREATURE); subtype.add(SubType.ZOMBIE, SubType.KNIGHT); @@ -27,7 +17,7 @@ public final class ZombieKnightToken extends TokenImpl { toughness = new MageInt(2); } - public ZombieKnightToken(final ZombieKnightToken zombieKnightToken){ + public ZombieKnightToken(final ZombieKnightToken zombieKnightToken) { super(zombieKnightToken); } diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieMenaceToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieMenaceToken.java index ae0e0201600..b8460ad18a6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieMenaceToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieMenaceToken.java @@ -5,8 +5,6 @@ import mage.abilities.keyword.MenaceAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - public class ZombieMenaceToken extends TokenImpl { public ZombieMenaceToken() { @@ -23,17 +21,6 @@ public class ZombieMenaceToken extends TokenImpl { toughness = new MageInt(xValue); this.addAbility(new MenaceAbility()); - - availableImageSetCodes.addAll(Arrays.asList("MID")); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MID")) { - this.setTokenType(2); - } } private ZombieMenaceToken(final ZombieMenaceToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java index 2fc1b78b0e6..d07c5abb4a0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java @@ -3,9 +3,6 @@ package mage.game.permanent.token; import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.util.RandomUtil; - -import java.util.Arrays; /** * @author BetaSteward_at_googlemail.com @@ -19,46 +16,6 @@ public final class ZombieToken extends TokenImpl { subtype.add(SubType.ZOMBIE); power = new MageInt(2); toughness = new MageInt(2); - - availableImageSetCodes = Arrays.asList("10E", "M10", "M11", "M12", - "M13", "M14", "M15", "C18", - "MBS", "ALA", "ISD", "C14", - "C15", "C16", "C17", "CNS", - "MMA", "BNG", "KTK", "DTK", - "ORI", "OGW", "SOI", "EMN", - "EMA", "MM3", "AKH", "CMA", - "RNA", "WAR", "MH1", "M20", - "C19", "C20", "THB", "M21", - "CMR", "C21", "MH2", "AFR", - "MIC", "VOW", "UMA", "NCC", - "MED", "BBD", "M19", "CM2", - "PCA", "AVR", "DDQ", "CN2", - "2X2", "CC2", "DMC", "GN3", - "DMR", "MOM", "ODY"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("ISD")) { - this.setTokenType(RandomUtil.nextInt(3) + 1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C14")) { - this.setTokenType(1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("EMN")) { - this.setTokenType(RandomUtil.nextInt(3) + 1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C19")) { - this.setTokenType(RandomUtil.nextInt(2) + 1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MIC")) { - this.setTokenType(1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("VOW")) { - this.setTokenType(1); - } } public ZombieToken(final ZombieToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieToken2.java b/Mage/src/main/java/mage/game/permanent/token/ZombieToken2.java index af191a32be0..e6e65ed3737 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieToken2.java @@ -1,4 +1,3 @@ - package mage.game.permanent.token; import mage.MageInt; @@ -6,7 +5,6 @@ import mage.constants.CardType; import mage.constants.SubType; /** - * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) */ public final class ZombieToken2 extends TokenImpl { @@ -22,16 +20,6 @@ public final class ZombieToken2 extends TokenImpl { subtype.add(SubType.ZOMBIE); power = new MageInt(zPower); toughness = new MageInt(zToughness); - setOriginalExpansionSetCode("EMN"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("EMN")) { - this.setTokenType(4); - } } public ZombieToken2(final ZombieToken2 token) {