github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 03:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Subtype Update for "Z" Cards.

Browse source 
Updated the subtypes for all implemented cards in the "Z" package.
Corrected typo in the SubType enum for type BOAR.
Added a varargs function to allow all creature types to be added in a single function call rather than 1-4.
This commit is contained in:
Justin Herlehy 2017-07-17 17:17:07 -07:00
parent e2ccc5c87f
commit 1daad30559
78 changed files with 288 additions and 246 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Mage.Sets/src/mage/cards/z/ZadaHedronGrinder.java
View file

@ -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);

10
Mage.Sets/src/mage/cards/z/ZadasCommando.java
View file

@ -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);

3
Mage.Sets/src/mage/cards/z/ZamWesell.java
View file

@ -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);

12
Mage.Sets/src/mage/cards/z/ZameckGuildmage.java
View file

@ -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);

8
Mage.Sets/src/mage/cards/z/ZanikevLocust.java
View file

@ -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);

9
Mage.Sets/src/mage/cards/z/ZarichiTiger.java
View file

@ -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);

7
Mage.Sets/src/mage/cards/z/ZealotIlVec.java
View file

@ -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);

7
Mage.Sets/src/mage/cards/z/ZealotOfTheGodPharaoh.java
View file

@ -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);

10
Mage.Sets/src/mage/cards/z/ZealousConscripts.java
View file

@ -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);

9
Mage.Sets/src/mage/cards/z/ZealousGuardian.java
View file

@ -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);

7
Mage.Sets/src/mage/cards/z/ZealousInquisitor.java
View file

@ -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);

10
Mage.Sets/src/mage/cards/z/ZealousPersecution.java
View file

@ -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));
}

7
Mage.Sets/src/mage/cards/z/ZealousStrike.java
View file

@ -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));

6
Mage.Sets/src/mage/cards/z/ZebraUnicorn.java
View file

@ -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);

6
Mage.Sets/src/mage/cards/z/ZedruuTheGreathearted.java
View file

@ -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);

8
Mage.Sets/src/mage/cards/z/ZendikarFarguide.java
View file

@ -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);

6
Mage.Sets/src/mage/cards/z/ZendikarIncarnate.java
View file

@ -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);

9
Mage.Sets/src/mage/cards/z/ZenithSeeker.java
View file

@ -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);

8
Mage.Sets/src/mage/cards/z/Zephid.java
View file

@ -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);

10
Mage.Sets/src/mage/cards/z/ZephidsEmbrace.java
View file

@ -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();

4
Mage.Sets/src/mage/cards/z/ZephyrCharge.java
View file

@ -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());

8
Mage.Sets/src/mage/cards/z/ZephyrFalcon.java
View file

@ -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);

4
Mage.Sets/src/mage/cards/z/ZephyrNet.java
View file

@ -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();

7
Mage.Sets/src/mage/cards/z/ZephyrScribe.java
View file

@ -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);

6
Mage.Sets/src/mage/cards/z/ZephyrSpirit.java
View file

@ -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);

8
Mage.Sets/src/mage/cards/z/ZephyrSprite.java
View file

@ -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);

10
Mage.Sets/src/mage/cards/z/ZerapaMinotaur.java
View file

@ -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);

9
Mage.Sets/src/mage/cards/z/ZhalfirinCommander.java
View file

@ -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);

7
Mage.Sets/src/mage/cards/z/ZhalfirinCrusader.java
View file

@ -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);

10
Mage.Sets/src/mage/cards/z/ZhalfirinKnight.java
View file

@ -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);

8
Mage.Sets/src/mage/cards/z/ZhangFeiFierceWarrior.java
View file

@ -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);

4
Mage.Sets/src/mage/cards/z/ZhangHeWeiGeneral.java
View file

@ -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);

4
Mage.Sets/src/mage/cards/z/ZhangLiaoHeroOfHefei.java
View file

@ -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);

5
Mage.Sets/src/mage/cards/z/ZhaoZilongTigerGeneral.java
View file

@ -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);

3
Mage.Sets/src/mage/cards/z/ZhouYuChiefCommander.java
View file

@ -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);

10
Mage.Sets/src/mage/cards/z/ZhugeJinWuStrategist.java
View file

@ -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);

6
Mage.Sets/src/mage/cards/z/ZhurTaaAncient.java
View file

@ -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);

7
Mage.Sets/src/mage/cards/z/ZhurTaaDruid.java
View file

@ -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);

10
Mage.Sets/src/mage/cards/z/ZhurTaaSwine.java
View file

@ -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);

3
Mage.Sets/src/mage/cards/z/ZirilanOfTheClaw.java
View file

@ -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);

4
Mage.Sets/src/mage/cards/z/ZoZuThePunisher.java
View file

@ -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);

6
Mage.Sets/src/mage/cards/z/ZodiacDog.java
View file

@ -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);

6
Mage.Sets/src/mage/cards/z/ZodiacDragon.java
View file

@ -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);

6
Mage.Sets/src/mage/cards/z/ZodiacGoat.java
View file

@ -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);

6
Mage.Sets/src/mage/cards/z/ZodiacHorse.java
View file

@ -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);

3
Mage.Sets/src/mage/cards/z/ZodiacMonkey.java
View file

@ -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);

6
Mage.Sets/src/mage/cards/z/ZodiacOx.java
View file

@ -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);

6
Mage.Sets/src/mage/cards/z/ZodiacPig.java
View file

@ -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);

6
Mage.Sets/src/mage/cards/z/ZodiacRabbit.java
View file

@ -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);

6
Mage.Sets/src/mage/cards/z/ZodiacRat.java
View file

@ -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);

6
Mage.Sets/src/mage/cards/z/ZodiacRooster.java
View file

@ -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);

6
Mage.Sets/src/mage/cards/z/ZodiacSnake.java
View file

@ -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);

6
Mage.Sets/src/mage/cards/z/ZodiacTiger.java
View file

@ -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);

12
Mage.Sets/src/mage/cards/z/ZofShade.java
View file

@ -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);

7
Mage.Sets/src/mage/cards/z/ZombieApocalypse.java
View file

@ -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());
}

7
Mage.Sets/src/mage/cards/z/ZombieAssassin.java
View file

@ -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);

6
Mage.Sets/src/mage/cards/z/ZombieBrute.java
View file

@ -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);

6
Mage.Sets/src/mage/cards/z/ZombieCannibal.java
View file

@ -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);

6
Mage.Sets/src/mage/cards/z/ZombieCutthroat.java
View file

@ -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);

10
Mage.Sets/src/mage/cards/z/ZombieGoliath.java
View file

@ -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);

5
Mage.Sets/src/mage/cards/z/ZombieMaster.java
View file

@ -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);

9
Mage.Sets/src/mage/cards/z/ZombieOutlander.java
View file

@ -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);

6
Mage.Sets/src/mage/cards/z/ZombieScavengers.java
View file

@ -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);

6
Mage.Sets/src/mage/cards/z/ZombieTrailblazer.java
View file

@ -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);

6
Mage.Sets/src/mage/cards/z/Zombify.java
View file

@ -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")));

7
Mage.Sets/src/mage/cards/z/Zoologist.java
View file

@ -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);

2
Mage.Sets/src/mage/cards/z/ZuberiGoldenFeather.java
View file

@ -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);

7
Mage.Sets/src/mage/cards/z/ZulaportChainmage.java
View file

@ -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);

8
Mage.Sets/src/mage/cards/z/ZulaportCutthroat.java
View file

@ -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);

7
Mage.Sets/src/mage/cards/z/ZulaportEnforcer.java
View file

@ -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);

4
Mage.Sets/src/mage/cards/z/ZuoCiTheMockingSage.java
View file

@ -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);

6
Mage.Sets/src/mage/cards/z/ZurTheEnchanter.java
View file

@ -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);

7
Mage.Sets/src/mage/cards/z/ZuranEnchanter.java
View file

@ -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);

11
Mage.Sets/src/mage/cards/z/ZuranSpellcaster.java
View file

@ -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);

8
Mage.Sets/src/mage/cards/z/ZurgoBellstriker.java
View file

@ -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);

8
Mage.Sets/src/mage/cards/z/ZurgoHelmsmasher.java
View file

@ -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);

2
Mage/src/main/java/mage/constants/SubType.java
View file

@ -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),

5
Mage/src/main/java/mage/util/SubTypeList.java
View file

@ -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<SubType> {
return super.add(s);
}
public boolean add(SubType... subTypes) {
return Collections.addAll(this, subTypes);
}
public boolean add(String s) {
return add(SubType.byDescription(s));
}