From 5d85874284d3a0ff1c547b142597585f7cd3e7f2 Mon Sep 17 00:00:00 2001 From: igoudt Date: Mon, 28 Aug 2017 12:30:27 +0200 Subject: [PATCH] subtypes for a --- Mage.Sets/src/mage/cards/a/AirBladder.java | 14 ++++++-------- .../src/mage/cards/a/AphettoExterminator.java | 7 ++++--- .../src/mage/cards/a/ArahboRoarOfTheWorld.java | 16 ++++------------ Mage.Sets/src/mage/cards/a/ArcboundFiend.java | 6 ++++-- 4 files changed, 18 insertions(+), 25 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AirBladder.java b/Mage.Sets/src/mage/cards/a/AirBladder.java index f4b7453905..99fc7e6e81 100644 --- a/Mage.Sets/src/mage/cards/a/AirBladder.java +++ b/Mage.Sets/src/mage/cards/a/AirBladder.java @@ -27,22 +27,20 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.target.common.TargetCreaturePermanent; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.combat.CanBlockOnlyFlyingAttachedEffect; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; -import mage.constants.Outcome; -import mage.target.TargetPermanent; import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Zone; +import mage.constants.*; +import mage.target.TargetPermanent; +import mage.target.common.TargetCreaturePermanent; + +import java.util.UUID; /** * @@ -53,7 +51,7 @@ public class AirBladder extends CardImpl { public AirBladder(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{U}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/cards/a/AphettoExterminator.java b/Mage.Sets/src/mage/cards/a/AphettoExterminator.java index d2aa49be39..85e5ebff75 100644 --- a/Mage.Sets/src/mage/cards/a/AphettoExterminator.java +++ b/Mage.Sets/src/mage/cards/a/AphettoExterminator.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.TurnedFaceUpSourceTriggeredAbility; @@ -38,8 +37,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 TheElk801 @@ -49,8 +51,7 @@ public class AphettoExterminator extends CardImpl { public AphettoExterminator(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}"); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN, SubType.WIZARD); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/ArahboRoarOfTheWorld.java b/Mage.Sets/src/mage/cards/a/ArahboRoarOfTheWorld.java index a79507d3cf..d8feae173b 100644 --- a/Mage.Sets/src/mage/cards/a/ArahboRoarOfTheWorld.java +++ b/Mage.Sets/src/mage/cards/a/ArahboRoarOfTheWorld.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksCreatureYouControlTriggeredAbility; @@ -36,7 +35,6 @@ import mage.abilities.condition.common.SourceOnBattlefieldOrCommandZoneCondition import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.ContinuousEffect; -import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -44,14 +42,7 @@ import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AbilityWord; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.SubType; -import mage.constants.SuperType; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -62,6 +53,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author TheElk801 @@ -84,8 +77,7 @@ public class ArahboRoarOfTheWorld extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{G}{W}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Cat"); - this.subtype.add("Avatar"); + this.subtype.add(SubType.CAT, SubType.AVATAR); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/ArcboundFiend.java b/Mage.Sets/src/mage/cards/a/ArcboundFiend.java index 9afa80df66..83713be492 100644 --- a/Mage.Sets/src/mage/cards/a/ArcboundFiend.java +++ b/Mage.Sets/src/mage/cards/a/ArcboundFiend.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -38,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.game.Game; @@ -45,6 +45,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author TheElk801 @@ -54,7 +56,7 @@ public class ArcboundFiend extends CardImpl { public ArcboundFiend(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{6}"); - this.subtype.add("Horror"); + this.subtype.add(SubType.HORROR); this.power = new MageInt(0); this.toughness = new MageInt(0);