diff --git a/Mage.Common/src/main/java/mage/view/CardView.java b/Mage.Common/src/main/java/mage/view/CardView.java index 358a377a146..3d56ae7d26d 100644 --- a/Mage.Common/src/main/java/mage/view/CardView.java +++ b/Mage.Common/src/main/java/mage/view/CardView.java @@ -987,7 +987,7 @@ public class CardView extends SimpleCardView { } if (!getSubTypes().isEmpty()) { type.append(" - "); - type.append(String.join(" ", getSubTypes().stream().map(p->p.toString()).collect(Collectors.toSet()))); + type.append(String.join(" ", getSubTypes().stream().map(SubType::toString).collect(Collectors.toList()))); } return type.toString(); } diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/DuelCommander.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/DuelCommander.java index 6c9d65cfc85..7778a4fce24 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/DuelCommander.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/DuelCommander.java @@ -35,14 +35,13 @@ public class DuelCommander extends Commander { public DuelCommander() { banned.add("Ancestral Recall"); - banned.add("Ancient Tomb"); banned.add("Back to Basics"); banned.add("Black Lotus"); banned.add("Channel"); banned.add("Chrome Mox"); banned.add("Dig Through Time"); + banned.add("Emrakul, the Aeons Torn"); banned.add("Entomb"); - banned.add("Fastbond"); banned.add("Food Chain"); banned.add("Gaea's Cradle"); banned.add("Gifts Ungiven"); @@ -56,7 +55,6 @@ public class DuelCommander extends Commander { banned.add("Mana Crypt"); banned.add("Mana Drain"); banned.add("Mana Vault"); - banned.add("Mind Twist"); banned.add("Mishra's Workshop"); banned.add("Mox Diamond"); banned.add("Mox Emerald"); @@ -68,6 +66,7 @@ public class DuelCommander extends Commander { banned.add("Natural Order"); banned.add("Necrotic Ooze"); banned.add("Oath of Druids"); + banned.add("Polymorph"); banned.add("Protean Hulk"); banned.add("Sensei's Divining Top"); banned.add("Shahrazad"); @@ -82,9 +81,12 @@ public class DuelCommander extends Commander { banned.add("Vampiric Tutor"); bannedCommander.add("Breya, Etherium Shaper"); + bannedCommander.add("Bruse Tarl, Boorish Herder"); bannedCommander.add("Derevi, Empyrial Tactician"); bannedCommander.add("Edric, Spymaster of Trest"); bannedCommander.add("Erayo, Soratami Ascendant"); + bannedCommander.add("Geist of Saint Traft"); + bannedCommander.add("Jace, Vryn's Prodigy"); bannedCommander.add("Marath, Will of the Wild"); bannedCommander.add("Oloro, Ageless Ascetic"); bannedCommander.add("Rofellos, Llanowar Emissary"); diff --git a/Mage.Sets/src/mage/cards/z/ZadaHedronGrinder.java b/Mage.Sets/src/mage/cards/z/ZadaHedronGrinder.java index e944f90d035..f78d3deeaf0 100644 --- a/Mage.Sets/src/mage/cards/z/ZadaHedronGrinder.java +++ b/Mage.Sets/src/mage/cards/z/ZadaHedronGrinder.java @@ -34,10 +34,7 @@ import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.events.GameEvent; @@ -58,8 +55,7 @@ public class ZadaHedronGrinder extends CardImpl { public ZadaHedronGrinder(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Goblin"); - this.subtype.add("Ally"); + this.subtype.add(SubType.GOBLIN, SubType.ALLY); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/z/ZadasCommando.java b/Mage.Sets/src/mage/cards/z/ZadasCommando.java index 9105802eef4..16a95d64a8c 100644 --- a/Mage.Sets/src/mage/cards/z/ZadasCommando.java +++ b/Mage.Sets/src/mage/cards/z/ZadasCommando.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -48,6 +47,8 @@ import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author fireshoes @@ -63,9 +64,10 @@ public class ZadasCommando extends CardImpl { public ZadasCommando(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}"); - this.subtype.add("Goblin"); - this.subtype.add("Archer"); - this.subtype.add("Ally"); + this.subtype.add(SubType.GOBLIN, SubType.ARCHER, SubType.ALLY); + //this.subtype.add("Goblin"); + //this.subtype.add("Archer"); + //this.subtype.add("Ally"); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/z/ZamWesell.java b/Mage.Sets/src/mage/cards/z/ZamWesell.java index b20cd69bf5e..7e0f16ee56d 100644 --- a/Mage.Sets/src/mage/cards/z/ZamWesell.java +++ b/Mage.Sets/src/mage/cards/z/ZamWesell.java @@ -54,8 +54,7 @@ public class ZamWesell extends CardImpl { public ZamWesell(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}{U}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Shapeshifter"); - this.subtype.add("Hunter"); + this.subtype.add(SubType.SHAPESHIFTER, SubType.HUNTER); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/z/ZameckGuildmage.java b/Mage.Sets/src/mage/cards/z/ZameckGuildmage.java index b691159e4f0..d85ae999d47 100644 --- a/Mage.Sets/src/mage/cards/z/ZameckGuildmage.java +++ b/Mage.Sets/src/mage/cards/z/ZameckGuildmage.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,10 +36,7 @@ import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.EntersTheBattlefieldEvent; @@ -48,6 +44,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -56,9 +54,7 @@ public class ZameckGuildmage extends CardImpl { public ZameckGuildmage(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{G}{U}"); - this.subtype.add("Elf"); - this.subtype.add("Wizard"); - + this.subtype.add(SubType.ELF, SubType.WIZARD); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/z/ZanikevLocust.java b/Mage.Sets/src/mage/cards/z/ZanikevLocust.java index c371dc157ba..f8ec532929e 100644 --- a/Mage.Sets/src/mage/cards/z/ZanikevLocust.java +++ b/Mage.Sets/src/mage/cards/z/ZanikevLocust.java @@ -27,14 +27,16 @@ */ package mage.cards.z; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.ScavengeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SubType; + +import java.util.UUID; /** * @@ -44,7 +46,7 @@ public class ZanikevLocust extends CardImpl { public ZanikevLocust(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{B}"); - this.subtype.add("Insect"); + this.subtype.add(SubType.INSECT); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/z/Zap.java b/Mage.Sets/src/mage/cards/z/Zap.java index ef6853e1dde..a97ad771306 100644 --- a/Mage.Sets/src/mage/cards/z/Zap.java +++ b/Mage.Sets/src/mage/cards/z/Zap.java @@ -27,14 +27,15 @@ */ package mage.cards.z; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Loki @@ -44,7 +45,6 @@ public class Zap extends CardImpl { public Zap(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{R}"); - // Zap deals 1 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); diff --git a/Mage.Sets/src/mage/cards/z/ZarichiTiger.java b/Mage.Sets/src/mage/cards/z/ZarichiTiger.java index dd79a108aa2..71d45985cd2 100644 --- a/Mage.Sets/src/mage/cards/z/ZarichiTiger.java +++ b/Mage.Sets/src/mage/cards/z/ZarichiTiger.java @@ -27,9 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,8 +35,12 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 @@ -48,7 +49,7 @@ public class ZarichiTiger extends CardImpl { public ZarichiTiger(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.subtype.add("Cat"); + this.subtype.add(SubType.CAT); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/z/ZealotIlVec.java b/Mage.Sets/src/mage/cards/z/ZealotIlVec.java index b209f4a2ad5..500213b2750 100644 --- a/Mage.Sets/src/mage/cards/z/ZealotIlVec.java +++ b/Mage.Sets/src/mage/cards/z/ZealotIlVec.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksAndIsNotBlockedTriggeredAbility; @@ -39,8 +38,11 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox @@ -49,8 +51,7 @@ public class ZealotIlVec extends CardImpl { public ZealotIlVec(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); - this.subtype.add("Human"); - this.subtype.add("Rebel"); + this.subtype.add(SubType.HUMAN, SubType.REBEL); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/z/ZealotOfTheGodPharaoh.java b/Mage.Sets/src/mage/cards/z/ZealotOfTheGodPharaoh.java index e4d11fbd417..0b0234d6a6e 100644 --- a/Mage.Sets/src/mage/cards/z/ZealotOfTheGodPharaoh.java +++ b/Mage.Sets/src/mage/cards/z/ZealotOfTheGodPharaoh.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -36,9 +35,12 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author spjspj @@ -48,8 +50,7 @@ public class ZealotOfTheGodPharaoh extends CardImpl { public ZealotOfTheGodPharaoh(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}"); - this.subtype.add("Minotaur"); - this.subtype.add("Archer"); + this.subtype.add(SubType.MINOTAUR, SubType.ARCHER); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/z/ZealousConscripts.java b/Mage.Sets/src/mage/cards/z/ZealousConscripts.java index 50c97c2945f..c1a65489fec 100644 --- a/Mage.Sets/src/mage/cards/z/ZealousConscripts.java +++ b/Mage.Sets/src/mage/cards/z/ZealousConscripts.java @@ -27,9 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -39,9 +36,13 @@ import mage.abilities.effects.common.continuous.GainControlTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Loki @@ -50,8 +51,7 @@ public class ZealousConscripts extends CardImpl { public ZealousConscripts(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}"); - this.subtype.add("Human"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.HUMAN, SubType.WARRIOR); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/z/ZealousGuardian.java b/Mage.Sets/src/mage/cards/z/ZealousGuardian.java index cf8e409e3a5..abce7293c25 100644 --- a/Mage.Sets/src/mage/cards/z/ZealousGuardian.java +++ b/Mage.Sets/src/mage/cards/z/ZealousGuardian.java @@ -27,12 +27,14 @@ */ package mage.cards.z; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SubType; + +import java.util.UUID; /** * @@ -42,8 +44,7 @@ public class ZealousGuardian extends CardImpl { public ZealousGuardian(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W/U}"); - this.subtype.add("Kithkin"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.KITHKIN, SubType.SOLDIER); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/z/ZealousInquisitor.java b/Mage.Sets/src/mage/cards/z/ZealousInquisitor.java index a7c8c26eb9b..bc44a88827b 100644 --- a/Mage.Sets/src/mage/cards/z/ZealousInquisitor.java +++ b/Mage.Sets/src/mage/cards/z/ZealousInquisitor.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,9 +36,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -48,8 +50,7 @@ public class ZealousInquisitor extends CardImpl { public ZealousInquisitor(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); - this.subtype.add("Human"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.HUMAN, SubType.CLERIC); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/z/ZealousPersecution.java b/Mage.Sets/src/mage/cards/z/ZealousPersecution.java index 9b8b2f65382..792b789ad22 100644 --- a/Mage.Sets/src/mage/cards/z/ZealousPersecution.java +++ b/Mage.Sets/src/mage/cards/z/ZealousPersecution.java @@ -27,13 +27,14 @@ */ package mage.cards.z; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.effects.common.continuous.BoostOpponentsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; + +import java.util.UUID; /** * @@ -44,9 +45,6 @@ public class ZealousPersecution extends CardImpl { public ZealousPersecution(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{W}{B}"); - - - this.getSpellAbility().addEffect(new BoostControlledEffect(1, 1, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new BoostOpponentsEffect(-1, -1, Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/cards/z/ZealousStrike.java b/Mage.Sets/src/mage/cards/z/ZealousStrike.java index 2728e028c82..0db563d3487 100644 --- a/Mage.Sets/src/mage/cards/z/ZealousStrike.java +++ b/Mage.Sets/src/mage/cards/z/ZealousStrike.java @@ -27,17 +27,17 @@ */ package mage.cards.z; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki @@ -47,7 +47,6 @@ public class ZealousStrike extends CardImpl { public ZealousStrike(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{W}"); - // Target creature gets +2/+2 and gains first strike until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/cards/z/ZebraUnicorn.java b/Mage.Sets/src/mage/cards/z/ZebraUnicorn.java index f21f0318bda..427a6225046 100644 --- a/Mage.Sets/src/mage/cards/z/ZebraUnicorn.java +++ b/Mage.Sets/src/mage/cards/z/ZebraUnicorn.java @@ -27,12 +27,14 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsDamageGainLifeSourceTriggeredAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; + +import java.util.UUID; /** * @@ -42,7 +44,7 @@ public class ZebraUnicorn extends CardImpl { public ZebraUnicorn(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{W}"); - this.subtype.add("Unicorn"); + this.subtype.add(SubType.UNICORN); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/z/ZedruuTheGreathearted.java b/Mage.Sets/src/mage/cards/z/ZedruuTheGreathearted.java index 02cbf8ae876..1c78cda57b1 100644 --- a/Mage.Sets/src/mage/cards/z/ZedruuTheGreathearted.java +++ b/Mage.Sets/src/mage/cards/z/ZedruuTheGreathearted.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; @@ -47,6 +46,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author andyfries @@ -56,8 +57,7 @@ public class ZedruuTheGreathearted extends CardImpl { public ZedruuTheGreathearted(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{W}{U}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Minotaur"); - this.subtype.add("Monk"); + this.subtype.add(SubType.MINOTAUR, SubType.MONK); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/z/ZendikarFarguide.java b/Mage.Sets/src/mage/cards/z/ZendikarFarguide.java index afebb0cd6c3..1a1683ce07a 100644 --- a/Mage.Sets/src/mage/cards/z/ZendikarFarguide.java +++ b/Mage.Sets/src/mage/cards/z/ZendikarFarguide.java @@ -27,12 +27,14 @@ */ package mage.cards.z; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.ForestwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SubType; + +import java.util.UUID; /** * @@ -42,7 +44,7 @@ public class ZendikarFarguide extends CardImpl { public ZendikarFarguide(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}"); - this.subtype.add("Elemental"); + this.subtype.add(SubType.ELEMENTAL); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/z/ZendikarIncarnate.java b/Mage.Sets/src/mage/cards/z/ZendikarIncarnate.java index 9529dedd1ad..4dc60f3d6be 100644 --- a/Mage.Sets/src/mage/cards/z/ZendikarIncarnate.java +++ b/Mage.Sets/src/mage/cards/z/ZendikarIncarnate.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; @@ -37,10 +36,13 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; 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; +import java.util.UUID; + /** * * @author fireshoes @@ -51,7 +53,7 @@ public class ZendikarIncarnate extends CardImpl { public ZendikarIncarnate(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{G}"); - this.subtype.add("Elemental"); + this.subtype.add(SubType.ELEMENTAL); this.power = new MageInt(0); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/z/ZenithSeeker.java b/Mage.Sets/src/mage/cards/z/ZenithSeeker.java index fc42e21f046..5bdb90d3231 100644 --- a/Mage.Sets/src/mage/cards/z/ZenithSeeker.java +++ b/Mage.Sets/src/mage/cards/z/ZenithSeeker.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.CycleOrDiscardControllerTriggeredAbility; @@ -37,8 +36,11 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author anonymous @@ -47,9 +49,8 @@ public class ZenithSeeker extends CardImpl { public ZenithSeeker(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}"); - - this.subtype.add("Bird"); - this.subtype.add("Wizard"); + + this.subtype.add(SubType.BIRD, SubType.WIZARD); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/z/Zephid.java b/Mage.Sets/src/mage/cards/z/Zephid.java index e5bb571b685..10209409a1d 100644 --- a/Mage.Sets/src/mage/cards/z/Zephid.java +++ b/Mage.Sets/src/mage/cards/z/Zephid.java @@ -29,13 +29,15 @@ package mage.cards.z; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SubType; + +import java.util.UUID; /** * @@ -45,7 +47,7 @@ public class Zephid extends CardImpl { public Zephid(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}{U}"); - this.subtype.add("Illusion"); + this.subtype.add(SubType.ILLUSION); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/z/ZephidsEmbrace.java b/Mage.Sets/src/mage/cards/z/ZephidsEmbrace.java index cb9ef350dbb..82071769593 100644 --- a/Mage.Sets/src/mage/cards/z/ZephidsEmbrace.java +++ b/Mage.Sets/src/mage/cards/z/ZephidsEmbrace.java @@ -28,7 +28,6 @@ package mage.cards.z; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -40,13 +39,12 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Backfir3 @@ -55,7 +53,7 @@ public class ZephidsEmbrace extends CardImpl { public ZephidsEmbrace(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{U}{U}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/cards/z/ZephyrCharge.java b/Mage.Sets/src/mage/cards/z/ZephyrCharge.java index e5064691a45..c237d224dfb 100644 --- a/Mage.Sets/src/mage/cards/z/ZephyrCharge.java +++ b/Mage.Sets/src/mage/cards/z/ZephyrCharge.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -49,7 +50,6 @@ public class ZephyrCharge extends CardImpl { public ZephyrCharge(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{U}"); - // {1}{U}: Target creature gains flying until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{U}")); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/z/ZephyrFalcon.java b/Mage.Sets/src/mage/cards/z/ZephyrFalcon.java index 8803e98b676..7d4ef9a265f 100644 --- a/Mage.Sets/src/mage/cards/z/ZephyrFalcon.java +++ b/Mage.Sets/src/mage/cards/z/ZephyrFalcon.java @@ -27,13 +27,15 @@ */ package mage.cards.z; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SubType; + +import java.util.UUID; /** * @@ -43,7 +45,7 @@ public class ZephyrFalcon extends CardImpl { public ZephyrFalcon(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); - this.subtype.add("Bird"); + this.subtype.add(SubType.BIRD); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/z/ZephyrNet.java b/Mage.Sets/src/mage/cards/z/ZephyrNet.java index 292f7de10dd..9ac3040ff8f 100644 --- a/Mage.Sets/src/mage/cards/z/ZephyrNet.java +++ b/Mage.Sets/src/mage/cards/z/ZephyrNet.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -37,6 +36,7 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -50,7 +50,7 @@ public class ZephyrNet extends CardImpl { public ZephyrNet(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{U}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/cards/z/ZephyrScribe.java b/Mage.Sets/src/mage/cards/z/ZephyrScribe.java index 03b14cb8117..e7cbdf4ab8c 100644 --- a/Mage.Sets/src/mage/cards/z/ZephyrScribe.java +++ b/Mage.Sets/src/mage/cards/z/ZephyrScribe.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,11 +38,14 @@ import mage.abilities.effects.common.UntapSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author LevelX2 @@ -58,8 +60,7 @@ public class ZephyrScribe extends CardImpl { public ZephyrScribe(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}"); - this.subtype.add("Human"); - this.subtype.add("Monk"); + this.subtype.add(SubType.HUMAN, SubType.MONK); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/z/ZephyrSpirit.java b/Mage.Sets/src/mage/cards/z/ZephyrSpirit.java index e67e5058eda..f8056a904dd 100644 --- a/Mage.Sets/src/mage/cards/z/ZephyrSpirit.java +++ b/Mage.Sets/src/mage/cards/z/ZephyrSpirit.java @@ -27,13 +27,15 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; + +import java.util.UUID; /** * @@ -44,7 +46,7 @@ public class ZephyrSpirit extends CardImpl { public ZephyrSpirit(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{U}"); - this.subtype.add("Spirit"); + this.subtype.add(SubType.SPIRIT); this.power = new MageInt(0); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/z/ZephyrSprite.java b/Mage.Sets/src/mage/cards/z/ZephyrSprite.java index 1bb74d3d098..ebc0c32aeca 100644 --- a/Mage.Sets/src/mage/cards/z/ZephyrSprite.java +++ b/Mage.Sets/src/mage/cards/z/ZephyrSprite.java @@ -28,12 +28,14 @@ package mage.cards.z; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SubType; + +import java.util.UUID; /** * @@ -43,7 +45,7 @@ public class ZephyrSprite extends CardImpl { public ZephyrSprite(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{U}"); - this.subtype.add("Faerie"); + this.subtype.add(SubType.FAERIE); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/z/ZerapaMinotaur.java b/Mage.Sets/src/mage/cards/z/ZerapaMinotaur.java index ab6d6a590c4..93a0db53cba 100644 --- a/Mage.Sets/src/mage/cards/z/ZerapaMinotaur.java +++ b/Mage.Sets/src/mage/cards/z/ZerapaMinotaur.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -36,10 +35,9 @@ import mage.abilities.effects.common.continuous.LoseAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; + +import java.util.UUID; /** * @@ -49,7 +47,7 @@ public class ZerapaMinotaur extends CardImpl { public ZerapaMinotaur(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}"); - this.subtype.add("Minotaur"); + this.subtype.add(SubType.MINOTAUR); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/z/ZhalfirinCommander.java b/Mage.Sets/src/mage/cards/z/ZhalfirinCommander.java index 55c1da48ef0..bafdbc09419 100644 --- a/Mage.Sets/src/mage/cards/z/ZhalfirinCommander.java +++ b/Mage.Sets/src/mage/cards/z/ZhalfirinCommander.java @@ -27,9 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +35,7 @@ import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.keyword.FlankingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; @@ -45,6 +43,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman @@ -59,8 +59,7 @@ public class ZhalfirinCommander extends CardImpl { public ZhalfirinCommander(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); - this.subtype.add("Human"); - this.subtype.add("Knight"); + this.subtype.add(SubType.HUMAN, SubType.KNIGHT); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/z/ZhalfirinCrusader.java b/Mage.Sets/src/mage/cards/z/ZhalfirinCrusader.java index 28fde40534e..17e87a14283 100644 --- a/Mage.Sets/src/mage/cards/z/ZhalfirinCrusader.java +++ b/Mage.Sets/src/mage/cards/z/ZhalfirinCrusader.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,9 +37,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author fireshoes @@ -49,8 +51,7 @@ public class ZhalfirinCrusader extends CardImpl { public ZhalfirinCrusader(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}"); - this.subtype.add("Human"); - this.subtype.add("Knight"); + this.subtype.add(SubType.HUMAN, SubType.KNIGHT); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/z/ZhalfirinKnight.java b/Mage.Sets/src/mage/cards/z/ZhalfirinKnight.java index f139e913fa5..ca2b235b6ef 100644 --- a/Mage.Sets/src/mage/cards/z/ZhalfirinKnight.java +++ b/Mage.Sets/src/mage/cards/z/ZhalfirinKnight.java @@ -27,9 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,9 +35,13 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.FlankingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman @@ -49,8 +50,7 @@ public class ZhalfirinKnight extends CardImpl { public ZhalfirinKnight(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); - this.subtype.add("Human"); - this.subtype.add("Knight"); + this.subtype.add(SubType.HUMAN, SubType.KNIGHT); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/z/ZhangFeiFierceWarrior.java b/Mage.Sets/src/mage/cards/z/ZhangFeiFierceWarrior.java index a87324deea0..339ff609a21 100644 --- a/Mage.Sets/src/mage/cards/z/ZhangFeiFierceWarrior.java +++ b/Mage.Sets/src/mage/cards/z/ZhangFeiFierceWarrior.java @@ -27,15 +27,17 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.HorsemanshipAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.SuperType; +import java.util.UUID; + /** * * @author LoneFox @@ -45,9 +47,7 @@ public class ZhangFeiFierceWarrior extends CardImpl { public ZhangFeiFierceWarrior(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}{W}"); this.addSuperType(SuperType.LEGENDARY); - this.subtype.add("Human"); - this.subtype.add("Soldier"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.HUMAN, SubType.SOLDIER, SubType.WARRIOR); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/z/ZhangHeWeiGeneral.java b/Mage.Sets/src/mage/cards/z/ZhangHeWeiGeneral.java index 63c940a6b7b..d43e94f6a70 100644 --- a/Mage.Sets/src/mage/cards/z/ZhangHeWeiGeneral.java +++ b/Mage.Sets/src/mage/cards/z/ZhangHeWeiGeneral.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; @@ -49,8 +50,7 @@ public class ZhangHeWeiGeneral extends CardImpl { public ZhangHeWeiGeneral(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN, SubType.SOLDIER); this.power = new MageInt(4); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/z/ZhangLiaoHeroOfHefei.java b/Mage.Sets/src/mage/cards/z/ZhangLiaoHeroOfHefei.java index 78e98ec34ad..935bd3cdeda 100644 --- a/Mage.Sets/src/mage/cards/z/ZhangLiaoHeroOfHefei.java +++ b/Mage.Sets/src/mage/cards/z/ZhangLiaoHeroOfHefei.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.SuperType; import java.util.UUID; @@ -46,8 +47,7 @@ public class ZhangLiaoHeroOfHefei extends CardImpl { public ZhangLiaoHeroOfHefei(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}{B}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN, SubType.SOLDIER); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/z/ZhaoZilongTigerGeneral.java b/Mage.Sets/src/mage/cards/z/ZhaoZilongTigerGeneral.java index 22f0c56b70e..ac2f378cfe2 100644 --- a/Mage.Sets/src/mage/cards/z/ZhaoZilongTigerGeneral.java +++ b/Mage.Sets/src/mage/cards/z/ZhaoZilongTigerGeneral.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.SuperType; import java.util.UUID; @@ -48,9 +49,7 @@ public class ZhaoZilongTigerGeneral extends CardImpl { public ZhaoZilongTigerGeneral(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Human"); - this.subtype.add("Soldier"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.HUMAN, SubType.SOLDIER, SubType.WARRIOR); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/z/ZhouYuChiefCommander.java b/Mage.Sets/src/mage/cards/z/ZhouYuChiefCommander.java index f1829fedee0..162273ecfb0 100644 --- a/Mage.Sets/src/mage/cards/z/ZhouYuChiefCommander.java +++ b/Mage.Sets/src/mage/cards/z/ZhouYuChiefCommander.java @@ -49,8 +49,7 @@ public class ZhouYuChiefCommander extends CardImpl { public ZhouYuChiefCommander(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{U}{U}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN, SubType.SOLDIER); this.power = new MageInt(8); this.toughness = new MageInt(8); diff --git a/Mage.Sets/src/mage/cards/z/ZhugeJinWuStrategist.java b/Mage.Sets/src/mage/cards/z/ZhugeJinWuStrategist.java index 00f4e5f0a4c..068e9680b56 100644 --- a/Mage.Sets/src/mage/cards/z/ZhugeJinWuStrategist.java +++ b/Mage.Sets/src/mage/cards/z/ZhugeJinWuStrategist.java @@ -35,10 +35,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.combat.CantBeBlockedTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -52,9 +49,8 @@ public class ZhugeJinWuStrategist extends CardImpl { public ZhugeJinWuStrategist(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{U}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Human"); - this.subtype.add("Advisor"); - + this.subtype.add(SubType.HUMAN, SubType.ADVISOR); + this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/z/ZhurTaaAncient.java b/Mage.Sets/src/mage/cards/z/ZhurTaaAncient.java index 08025d6f5f2..353a79a0e7f 100644 --- a/Mage.Sets/src/mage/cards/z/ZhurTaaAncient.java +++ b/Mage.Sets/src/mage/cards/z/ZhurTaaAncient.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.TapForManaAllTriggeredManaAbility; import mage.abilities.effects.common.AddManaOfAnyTypeProducedEffect; @@ -35,8 +34,11 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SetTargetPointer; +import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -45,7 +47,7 @@ public class ZhurTaaAncient extends CardImpl { public ZhurTaaAncient(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{G}"); - this.subtype.add("Beast"); + this.subtype.add(SubType.BEAST); this.power = new MageInt(7); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/z/ZhurTaaDruid.java b/Mage.Sets/src/mage/cards/z/ZhurTaaDruid.java index dda83cd56c0..73d4ecc4ccf 100644 --- a/Mage.Sets/src/mage/cards/z/ZhurTaaDruid.java +++ b/Mage.Sets/src/mage/cards/z/ZhurTaaDruid.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DamagePlayersEffect; @@ -35,12 +34,15 @@ import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author LevelX2 @@ -49,8 +51,7 @@ public class ZhurTaaDruid extends CardImpl { public ZhurTaaDruid(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}{G}"); - this.subtype.add("Human"); - this.subtype.add("Druid"); + this.subtype.add(SubType.HUMAN, SubType.DRUID); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/z/ZhurTaaSwine.java b/Mage.Sets/src/mage/cards/z/ZhurTaaSwine.java index 3cd19e9f531..4c721ac396b 100644 --- a/Mage.Sets/src/mage/cards/z/ZhurTaaSwine.java +++ b/Mage.Sets/src/mage/cards/z/ZhurTaaSwine.java @@ -27,14 +27,16 @@ */ package mage.cards.z; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.keyword.BloodrushAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.SubType; + +import java.util.UUID; /** * @@ -44,7 +46,7 @@ public class ZhurTaaSwine extends CardImpl { public ZhurTaaSwine(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{G}"); - this.subtype.add("Boar"); + this.subtype.add(SubType.BOAR); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/z/ZirilanOfTheClaw.java b/Mage.Sets/src/mage/cards/z/ZirilanOfTheClaw.java index 9d69e9baf19..0aa1a490c33 100644 --- a/Mage.Sets/src/mage/cards/z/ZirilanOfTheClaw.java +++ b/Mage.Sets/src/mage/cards/z/ZirilanOfTheClaw.java @@ -62,8 +62,7 @@ public class ZirilanOfTheClaw extends CardImpl { public ZirilanOfTheClaw(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{R}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Viashino"); - this.subtype.add("Shaman"); + this.subtype.add(SubType.VIASHINO, SubType.SHAMAN); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/z/ZoZuThePunisher.java b/Mage.Sets/src/mage/cards/z/ZoZuThePunisher.java index 9fa034d4bc5..61262869336 100644 --- a/Mage.Sets/src/mage/cards/z/ZoZuThePunisher.java +++ b/Mage.Sets/src/mage/cards/z/ZoZuThePunisher.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; @@ -54,8 +55,7 @@ public class ZoZuThePunisher extends CardImpl { public ZoZuThePunisher(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{R}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Goblin"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.GOBLIN, SubType.WARRIOR); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/z/ZodiacDog.java b/Mage.Sets/src/mage/cards/z/ZodiacDog.java index 9e03244e94c..5302cbf12ef 100644 --- a/Mage.Sets/src/mage/cards/z/ZodiacDog.java +++ b/Mage.Sets/src/mage/cards/z/ZodiacDog.java @@ -27,12 +27,14 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.MountainwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; + +import java.util.UUID; /** * @@ -42,7 +44,7 @@ public class ZodiacDog extends CardImpl { public ZodiacDog(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); - this.subtype.add("Hound"); + this.subtype.add(SubType.HOUND); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/z/ZodiacDragon.java b/Mage.Sets/src/mage/cards/z/ZodiacDragon.java index 79772e68cda..7ae93341be1 100644 --- a/Mage.Sets/src/mage/cards/z/ZodiacDragon.java +++ b/Mage.Sets/src/mage/cards/z/ZodiacDragon.java @@ -27,13 +27,15 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; + +import java.util.UUID; /** * @@ -43,7 +45,7 @@ public class ZodiacDragon extends CardImpl { public ZodiacDragon(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{7}{R}{R}"); - this.subtype.add("Dragon"); + this.subtype.add(SubType.DRAGON); this.power = new MageInt(8); this.toughness = new MageInt(8); diff --git a/Mage.Sets/src/mage/cards/z/ZodiacGoat.java b/Mage.Sets/src/mage/cards/z/ZodiacGoat.java index 0fb75f6fde0..f63831031cd 100644 --- a/Mage.Sets/src/mage/cards/z/ZodiacGoat.java +++ b/Mage.Sets/src/mage/cards/z/ZodiacGoat.java @@ -27,12 +27,14 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.MountainwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; + +import java.util.UUID; /** * @@ -42,7 +44,7 @@ public class ZodiacGoat extends CardImpl { public ZodiacGoat(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}"); - this.subtype.add("Goat"); + this.subtype.add(SubType.GOAT); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/z/ZodiacHorse.java b/Mage.Sets/src/mage/cards/z/ZodiacHorse.java index e466d05ddba..50c43ef3d07 100644 --- a/Mage.Sets/src/mage/cards/z/ZodiacHorse.java +++ b/Mage.Sets/src/mage/cards/z/ZodiacHorse.java @@ -27,12 +27,14 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.IslandwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; + +import java.util.UUID; /** * @@ -42,7 +44,7 @@ public class ZodiacHorse extends CardImpl { public ZodiacHorse(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}"); - this.subtype.add("Horse"); + this.subtype.add(SubType.HORSE); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/z/ZodiacMonkey.java b/Mage.Sets/src/mage/cards/z/ZodiacMonkey.java index 4e65b22f062..0cdc2ae2745 100644 --- a/Mage.Sets/src/mage/cards/z/ZodiacMonkey.java +++ b/Mage.Sets/src/mage/cards/z/ZodiacMonkey.java @@ -32,6 +32,7 @@ import mage.abilities.keyword.ForestwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -43,7 +44,7 @@ public class ZodiacMonkey extends CardImpl { public ZodiacMonkey(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}"); - this.subtype.add("Monkey"); + this.subtype.add(SubType.MONKEY); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/z/ZodiacOx.java b/Mage.Sets/src/mage/cards/z/ZodiacOx.java index 197b709374a..e4ce9699325 100644 --- a/Mage.Sets/src/mage/cards/z/ZodiacOx.java +++ b/Mage.Sets/src/mage/cards/z/ZodiacOx.java @@ -27,12 +27,14 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; + +import java.util.UUID; /** * @@ -42,7 +44,7 @@ public class ZodiacOx extends CardImpl { public ZodiacOx(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}"); - this.subtype.add("Ox"); + this.subtype.add(SubType.OX); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/z/ZodiacPig.java b/Mage.Sets/src/mage/cards/z/ZodiacPig.java index 56aa9967694..eac6054ee49 100644 --- a/Mage.Sets/src/mage/cards/z/ZodiacPig.java +++ b/Mage.Sets/src/mage/cards/z/ZodiacPig.java @@ -27,12 +27,14 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; + +import java.util.UUID; /** * @@ -42,7 +44,7 @@ public class ZodiacPig extends CardImpl { public ZodiacPig(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}"); - this.subtype.add("Boar"); + this.subtype.add(SubType.BOAR); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/z/ZodiacRabbit.java b/Mage.Sets/src/mage/cards/z/ZodiacRabbit.java index ec64cac0389..1e2f6d0f370 100644 --- a/Mage.Sets/src/mage/cards/z/ZodiacRabbit.java +++ b/Mage.Sets/src/mage/cards/z/ZodiacRabbit.java @@ -27,12 +27,14 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.ForestwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; + +import java.util.UUID; /** * @@ -42,7 +44,7 @@ public class ZodiacRabbit extends CardImpl { public ZodiacRabbit(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}"); - this.subtype.add("Rabbit"); + this.subtype.add(SubType.RABBIT); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/z/ZodiacRat.java b/Mage.Sets/src/mage/cards/z/ZodiacRat.java index 6872a06cdbe..64d023c0c60 100644 --- a/Mage.Sets/src/mage/cards/z/ZodiacRat.java +++ b/Mage.Sets/src/mage/cards/z/ZodiacRat.java @@ -27,12 +27,14 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; + +import java.util.UUID; /** * @@ -42,7 +44,7 @@ public class ZodiacRat extends CardImpl { public ZodiacRat(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}"); - this.subtype.add("Rat"); + this.subtype.add(SubType.RAT); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/z/ZodiacRooster.java b/Mage.Sets/src/mage/cards/z/ZodiacRooster.java index 0d6f02a938f..84bea2ce828 100644 --- a/Mage.Sets/src/mage/cards/z/ZodiacRooster.java +++ b/Mage.Sets/src/mage/cards/z/ZodiacRooster.java @@ -27,12 +27,14 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.PlainswalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; + +import java.util.UUID; /** * @@ -42,7 +44,7 @@ public class ZodiacRooster extends CardImpl { public ZodiacRooster(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}"); - this.subtype.add("Bird"); + this.subtype.add(SubType.BIRD); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/z/ZodiacSnake.java b/Mage.Sets/src/mage/cards/z/ZodiacSnake.java index 76dc813248a..3e62c2c6b2d 100644 --- a/Mage.Sets/src/mage/cards/z/ZodiacSnake.java +++ b/Mage.Sets/src/mage/cards/z/ZodiacSnake.java @@ -27,12 +27,14 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; + +import java.util.UUID; /** * @@ -42,7 +44,7 @@ public class ZodiacSnake extends CardImpl { public ZodiacSnake(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}"); - this.subtype.add("Snake"); + this.subtype.add(SubType.SNAKE); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/z/ZodiacTiger.java b/Mage.Sets/src/mage/cards/z/ZodiacTiger.java index ab4d5790a3d..d9d69f18e19 100644 --- a/Mage.Sets/src/mage/cards/z/ZodiacTiger.java +++ b/Mage.Sets/src/mage/cards/z/ZodiacTiger.java @@ -27,12 +27,14 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.ForestwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; + +import java.util.UUID; /** * @@ -42,7 +44,7 @@ public class ZodiacTiger extends CardImpl { public ZodiacTiger(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}"); - this.subtype.add("Cat"); + this.subtype.add(SubType.CAT); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/z/ZofShade.java b/Mage.Sets/src/mage/cards/z/ZofShade.java index 0296537e38e..a46001cdfb8 100644 --- a/Mage.Sets/src/mage/cards/z/ZofShade.java +++ b/Mage.Sets/src/mage/cards/z/ZofShade.java @@ -27,16 +27,18 @@ */ package mage.cards.z; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.SubType; +import mage.constants.Zone; + +import java.util.UUID; /** * @@ -46,7 +48,7 @@ public class ZofShade extends CardImpl { public ZofShade(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}"); - this.subtype.add("Shade"); + this.subtype.add(SubType.SHADE); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/z/ZombieApocalypse.java b/Mage.Sets/src/mage/cards/z/ZombieApocalypse.java index b85b2e2f8d7..da540f6f527 100644 --- a/Mage.Sets/src/mage/cards/z/ZombieApocalypse.java +++ b/Mage.Sets/src/mage/cards/z/ZombieApocalypse.java @@ -27,14 +27,12 @@ */ package mage.cards.z; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; @@ -45,6 +43,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author BetaSteward @@ -54,7 +54,6 @@ public class ZombieApocalypse extends CardImpl { public ZombieApocalypse(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{B}{B}{B}"); - // Return all Zombie creature cards from your graveyard to the battlefield tapped, then destroy all Humans. this.getSpellAbility().addEffect(new ZombieApocalypseEffect()); } diff --git a/Mage.Sets/src/mage/cards/z/ZombieAssassin.java b/Mage.Sets/src/mage/cards/z/ZombieAssassin.java index 8638555b0ae..10dc5a5ec6e 100644 --- a/Mage.Sets/src/mage/cards/z/ZombieAssassin.java +++ b/Mage.Sets/src/mage/cards/z/ZombieAssassin.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -39,6 +38,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; @@ -48,6 +48,8 @@ import mage.target.Target; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author cbt33 @@ -63,8 +65,7 @@ public class ZombieAssassin extends CardImpl { public ZombieAssassin(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}"); - this.subtype.add("Zombie"); - this.subtype.add("Assassin"); + this.subtype.add(SubType.ZOMBIE, SubType.ASSASSIN); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/z/ZombieBrute.java b/Mage.Sets/src/mage/cards/z/ZombieBrute.java index f04b3cc43c5..577674d2ad5 100644 --- a/Mage.Sets/src/mage/cards/z/ZombieBrute.java +++ b/Mage.Sets/src/mage/cards/z/ZombieBrute.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.effects.common.AmplifyEffect; import mage.abilities.keyword.AmplifyAbility; @@ -35,6 +34,9 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; + +import java.util.UUID; /** * @@ -44,7 +46,7 @@ public class ZombieBrute extends CardImpl { public ZombieBrute(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{6}{B}"); - this.subtype.add("Zombie"); + this.subtype.add(SubType.ZOMBIE); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/z/ZombieCannibal.java b/Mage.Sets/src/mage/cards/z/ZombieCannibal.java index 5bdf28b06e7..1e6960dc179 100644 --- a/Mage.Sets/src/mage/cards/z/ZombieCannibal.java +++ b/Mage.Sets/src/mage/cards/z/ZombieCannibal.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -36,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.other.OwnerIdPredicate; import mage.game.Game; @@ -43,6 +43,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + /** * * @author cbt33 @@ -51,7 +53,7 @@ public class ZombieCannibal extends CardImpl { public ZombieCannibal(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}"); - this.subtype.add("Zombie"); + this.subtype.add(SubType.ZOMBIE); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/z/ZombieCutthroat.java b/Mage.Sets/src/mage/cards/z/ZombieCutthroat.java index 68730c47c96..b367b531fb5 100644 --- a/Mage.Sets/src/mage/cards/z/ZombieCutthroat.java +++ b/Mage.Sets/src/mage/cards/z/ZombieCutthroat.java @@ -27,13 +27,15 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.keyword.MorphAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; + +import java.util.UUID; /** * @@ -43,7 +45,7 @@ public class ZombieCutthroat extends CardImpl { public ZombieCutthroat(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}"); - this.subtype.add("Zombie"); + this.subtype.add(SubType.ZOMBIE); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/z/ZombieGoliath.java b/Mage.Sets/src/mage/cards/z/ZombieGoliath.java index 6c3b063c8ac..bb1d4341ba2 100644 --- a/Mage.Sets/src/mage/cards/z/ZombieGoliath.java +++ b/Mage.Sets/src/mage/cards/z/ZombieGoliath.java @@ -28,12 +28,13 @@ package mage.cards.z; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SubType; + +import java.util.UUID; /** * @author Loki @@ -42,8 +43,7 @@ public class ZombieGoliath extends CardImpl { public ZombieGoliath(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}"); - this.subtype.add("Zombie"); - this.subtype.add("Giant"); + this.subtype.add(SubType.ZOMBIE, SubType.GIANT); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/z/ZombieMaster.java b/Mage.Sets/src/mage/cards/z/ZombieMaster.java index a601b5d735f..c7774a1d582 100644 --- a/Mage.Sets/src/mage/cards/z/ZombieMaster.java +++ b/Mage.Sets/src/mage/cards/z/ZombieMaster.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -45,6 +44,8 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author KholdFuzion @@ -60,7 +61,7 @@ public class ZombieMaster extends CardImpl { public ZombieMaster(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}{B}"); - this.subtype.add("Zombie"); + this.subtype.add(SubType.ZOMBIE); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/z/ZombieOutlander.java b/Mage.Sets/src/mage/cards/z/ZombieOutlander.java index 050af33d351..7bcfe6faab1 100644 --- a/Mage.Sets/src/mage/cards/z/ZombieOutlander.java +++ b/Mage.Sets/src/mage/cards/z/ZombieOutlander.java @@ -28,13 +28,15 @@ package mage.cards.z; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SubType; + +import java.util.UUID; /** * @@ -44,8 +46,7 @@ public class ZombieOutlander extends CardImpl { public ZombieOutlander(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{U}{B}"); - this.subtype.add("Zombie"); - this.subtype.add("Scout"); + this.subtype.add(SubType.ZOMBIE, SubType.SCOUT); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/z/ZombieScavengers.java b/Mage.Sets/src/mage/cards/z/ZombieScavengers.java index 6f98a12fe7d..2d9279180b2 100644 --- a/Mage.Sets/src/mage/cards/z/ZombieScavengers.java +++ b/Mage.Sets/src/mage/cards/z/ZombieScavengers.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.ExileTopCreatureCardOfGraveyardCost; @@ -35,8 +34,11 @@ import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes @@ -45,7 +47,7 @@ public class ZombieScavengers extends CardImpl { public ZombieScavengers(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}"); - this.subtype.add("Zombie"); + this.subtype.add(SubType.ZOMBIE); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/z/ZombieTrailblazer.java b/Mage.Sets/src/mage/cards/z/ZombieTrailblazer.java index 703e72474fb..54c9ccbea78 100644 --- a/Mage.Sets/src/mage/cards/z/ZombieTrailblazer.java +++ b/Mage.Sets/src/mage/cards/z/ZombieTrailblazer.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -49,6 +48,8 @@ import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -64,8 +65,7 @@ public class ZombieTrailblazer extends CardImpl { public ZombieTrailblazer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{B}{B}"); - this.subtype.add("Zombie"); - this.subtype.add("Scout"); + this.subtype.add(SubType.ZOMBIE, SubType.SCOUT); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/z/Zombify.java b/Mage.Sets/src/mage/cards/z/Zombify.java index 9023787684b..0be316c61c4 100644 --- a/Mage.Sets/src/mage/cards/z/Zombify.java +++ b/Mage.Sets/src/mage/cards/z/Zombify.java @@ -27,14 +27,15 @@ */ package mage.cards.z; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author Plopman @@ -44,7 +45,6 @@ public class Zombify extends CardImpl { public Zombify(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{B}"); - // Return target creature card from your graveyard to the battlefield. this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect()); this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard"))); diff --git a/Mage.Sets/src/mage/cards/z/Zoologist.java b/Mage.Sets/src/mage/cards/z/Zoologist.java index c488d535432..401bbd2fcbf 100644 --- a/Mage.Sets/src/mage/cards/z/Zoologist.java +++ b/Mage.Sets/src/mage/cards/z/Zoologist.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -41,10 +40,13 @@ import mage.cards.CardSetInfo; import mage.cards.CardsImpl; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 @@ -53,8 +55,7 @@ public class Zoologist extends CardImpl { public Zoologist(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}"); - this.subtype.add("Human"); - this.subtype.add("Druid"); + this.subtype.add(SubType.HUMAN, SubType.DRUID); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/z/ZuberiGoldenFeather.java b/Mage.Sets/src/mage/cards/z/ZuberiGoldenFeather.java index 084aa258bca..9857493a945 100644 --- a/Mage.Sets/src/mage/cards/z/ZuberiGoldenFeather.java +++ b/Mage.Sets/src/mage/cards/z/ZuberiGoldenFeather.java @@ -49,7 +49,7 @@ public class ZuberiGoldenFeather extends CardImpl { public ZuberiGoldenFeather(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Griffin"); + this.subtype.add(SubType.GRIFFIN); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/z/ZulaportChainmage.java b/Mage.Sets/src/mage/cards/z/ZulaportChainmage.java index db946887f31..9d12b7e6d49 100644 --- a/Mage.Sets/src/mage/cards/z/ZulaportChainmage.java +++ b/Mage.Sets/src/mage/cards/z/ZulaportChainmage.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -46,6 +45,8 @@ import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LevelX2 @@ -61,9 +62,7 @@ public class ZulaportChainmage extends CardImpl { public ZulaportChainmage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}"); - this.subtype.add("Human"); - this.subtype.add("Shaman"); - this.subtype.add("Ally"); + this.subtype.add(SubType.HUMAN, SubType.SHAMAN, SubType.ALLY); this.power = new MageInt(4); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/z/ZulaportCutthroat.java b/Mage.Sets/src/mage/cards/z/ZulaportCutthroat.java index ad9a5df24bd..01b4a9a1765 100644 --- a/Mage.Sets/src/mage/cards/z/ZulaportCutthroat.java +++ b/Mage.Sets/src/mage/cards/z/ZulaportCutthroat.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesThisOrAnotherCreatureTriggeredAbility; @@ -37,10 +36,13 @@ import mage.abilities.effects.common.LoseLifeOpponentsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LevelX2 @@ -55,9 +57,7 @@ public class ZulaportCutthroat extends CardImpl { public ZulaportCutthroat(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}"); - this.subtype.add("Human"); - this.subtype.add("Rogue"); - this.subtype.add("Ally"); + this.subtype.add(SubType.HUMAN, SubType.ROGUE, SubType.ALLY); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/z/ZulaportEnforcer.java b/Mage.Sets/src/mage/cards/z/ZulaportEnforcer.java index 6128cd59acd..0fed3fbd2e8 100644 --- a/Mage.Sets/src/mage/cards/z/ZulaportEnforcer.java +++ b/Mage.Sets/src/mage/cards/z/ZulaportEnforcer.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Abilities; @@ -42,10 +41,13 @@ import mage.cards.CardSetInfo; import mage.cards.LevelerCard; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author North, noxx @@ -60,8 +62,7 @@ public class ZulaportEnforcer extends LevelerCard { public ZulaportEnforcer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}"); - this.subtype.add("Human"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.HUMAN, SubType.WARRIOR); this.color.setBlack(true); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/z/ZuoCiTheMockingSage.java b/Mage.Sets/src/mage/cards/z/ZuoCiTheMockingSage.java index 11237a83f57..512e5dacd4c 100644 --- a/Mage.Sets/src/mage/cards/z/ZuoCiTheMockingSage.java +++ b/Mage.Sets/src/mage/cards/z/ZuoCiTheMockingSage.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; @@ -57,8 +58,7 @@ public class ZuoCiTheMockingSage extends CardImpl { public ZuoCiTheMockingSage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}{G}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Human"); - this.subtype.add("Advisor"); + this.subtype.add(SubType.HUMAN, SubType.ADVISOR); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/z/ZurTheEnchanter.java b/Mage.Sets/src/mage/cards/z/ZurTheEnchanter.java index 85313ef6640..cbda9de8aec 100644 --- a/Mage.Sets/src/mage/cards/z/ZurTheEnchanter.java +++ b/Mage.Sets/src/mage/cards/z/ZurTheEnchanter.java @@ -28,13 +28,14 @@ package mage.cards.z; import mage.MageInt; -import mage.constants.ComparisonType; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.ComparisonType; +import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -59,8 +60,7 @@ public class ZurTheEnchanter extends CardImpl { public ZurTheEnchanter(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{U}{B}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN, SubType.WIZARD); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/z/ZuranEnchanter.java b/Mage.Sets/src/mage/cards/z/ZuranEnchanter.java index 40c3d7813cf..b596124c5bb 100644 --- a/Mage.Sets/src/mage/cards/z/ZuranEnchanter.java +++ b/Mage.Sets/src/mage/cards/z/ZuranEnchanter.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -38,9 +37,12 @@ import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author nigelzor @@ -49,8 +51,7 @@ public class ZuranEnchanter extends CardImpl { public ZuranEnchanter(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN, SubType.WIZARD); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/z/ZuranSpellcaster.java b/Mage.Sets/src/mage/cards/z/ZuranSpellcaster.java index 7e66b16ba1a..a61a063eb67 100644 --- a/Mage.Sets/src/mage/cards/z/ZuranSpellcaster.java +++ b/Mage.Sets/src/mage/cards/z/ZuranSpellcaster.java @@ -27,17 +27,19 @@ */ package mage.cards.z; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SubType; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LoneFox @@ -46,8 +48,7 @@ public class ZuranSpellcaster extends CardImpl { public ZuranSpellcaster(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}"); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN, SubType.WIZARD); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/z/ZurgoBellstriker.java b/Mage.Sets/src/mage/cards/z/ZurgoBellstriker.java index fbffff7cdd7..95cbb6157c5 100644 --- a/Mage.Sets/src/mage/cards/z/ZurgoBellstriker.java +++ b/Mage.Sets/src/mage/cards/z/ZurgoBellstriker.java @@ -28,15 +28,12 @@ package mage.cards.z; import mage.MageInt; -import mage.constants.ComparisonType; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.combat.CantBlockCreaturesSourceEffect; import mage.abilities.keyword.DashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; @@ -57,8 +54,7 @@ public class ZurgoBellstriker extends CardImpl { public ZurgoBellstriker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Orc"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.ORC, SubType.WARRIOR); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/z/ZurgoHelmsmasher.java b/Mage.Sets/src/mage/cards/z/ZurgoHelmsmasher.java index 0ab0340d05c..aa8c248fb51 100644 --- a/Mage.Sets/src/mage/cards/z/ZurgoHelmsmasher.java +++ b/Mage.Sets/src/mage/cards/z/ZurgoHelmsmasher.java @@ -39,10 +39,7 @@ import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import java.util.UUID; @@ -56,8 +53,7 @@ public class ZurgoHelmsmasher extends CardImpl { public ZurgoHelmsmasher(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{W}{B}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Orc"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.ORC, SubType.WARRIOR); this.power = new MageInt(7); this.toughness = new MageInt(2); diff --git a/Mage/src/main/java/mage/constants/SubType.java b/Mage/src/main/java/mage/constants/SubType.java index 9f8dc09547e..b53a9b9f9e5 100644 --- a/Mage/src/main/java/mage/constants/SubType.java +++ b/Mage/src/main/java/mage/constants/SubType.java @@ -73,7 +73,7 @@ public enum SubType { BIRD("Bird", SubTypeSet.CreatureType, false), BITH("Bith", SubTypeSet.CreatureType, true), // Star Wars BLINKMOTH("Blinkmoth", SubTypeSet.CreatureType, false), - BOARD("Boar", SubTypeSet.CreatureType, false), + BOAR("Boar", SubTypeSet.CreatureType, false), BRINGER("Bringer", SubTypeSet.CreatureType, false), BRUSHWAGG("Brushwagg", SubTypeSet.CreatureType, false), diff --git a/Mage/src/main/java/mage/util/SubTypeList.java b/Mage/src/main/java/mage/util/SubTypeList.java index 7009f1338b8..e434b957159 100644 --- a/Mage/src/main/java/mage/util/SubTypeList.java +++ b/Mage/src/main/java/mage/util/SubTypeList.java @@ -3,6 +3,7 @@ package mage.util; import mage.constants.SubType; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -29,6 +30,10 @@ public class SubTypeList extends ArrayList { return super.add(s); } + public boolean add(SubType... subTypes) { + return Collections.addAll(this, subTypes); + } + public boolean add(String s) { return add(SubType.byDescription(s)); }