Merge pull request #3714 from ingmargoudt/master

subtypes for 'B' cards

Mage.Sets/src/mage/cards/b/Backfire.java

@@ -27,20 +27,22 @@
  */
 package mage.cards.b;
 
-import java.util.UUID;
-import mage.target.common.TargetCreaturePermanent;
 import mage.abilities.Ability;
 import mage.abilities.common.DealsDamageToAPlayerAttachedTriggeredAbility;
 import mage.abilities.dynamicvalue.common.NumericSetToEffectValues;
 import mage.abilities.effects.common.AttachEffect;
 import mage.abilities.effects.common.DamageAttachedControllerEffect;
-import mage.constants.Outcome;
-import mage.target.TargetPermanent;
 import mage.abilities.keyword.EnchantAbility;
 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.target.TargetPermanent;
+import mage.target.common.TargetCreaturePermanent;
+
+import java.util.UUID;
 
 /**
  *
@@ -51,7 +53,7 @@ public class Backfire extends CardImpl {
     public Backfire(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();

Mage.Sets/src/mage/cards/b/BackwoodsSurvivalists.java

@@ -39,6 +39,7 @@ 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;
@@ -51,8 +52,7 @@ public class BackwoodsSurvivalists extends CardImpl {
 
     public BackwoodsSurvivalists(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}");
-        this.subtype.add("Human");
+        this.subtype.add(SubType.HUMAN, SubType.WARRIOR);
-        this.subtype.add("Warrior");
         this.power = new MageInt(4);
         this.toughness = new MageInt(3);
 

Mage.Sets/src/mage/cards/b/Badlands.java

@@ -32,6 +32,7 @@ import mage.abilities.mana.RedManaAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 
 import java.util.UUID;
 
@@ -43,8 +44,8 @@ public class Badlands extends CardImpl {
 
     public Badlands(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.LAND},"");
-        this.subtype.add("Swamp");
+        this.subtype.add(SubType.SWAMP, SubType.MOUNTAIN);
-        this.subtype.add("Mountain");
+
         
         this.addAbility(new BlackManaAbility());
         this.addAbility(new RedManaAbility());

Mage.Sets/src/mage/cards/b/BalaGedScorpion.java

@@ -34,6 +34,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.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.mageobject.PowerPredicate;
 import mage.target.common.TargetCreaturePermanent;
@@ -54,7 +55,7 @@ public class BalaGedScorpion extends CardImpl {
 
     public BalaGedScorpion(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}");
-        this.subtype.add("Scorpion");
+        this.subtype.add(SubType.SCORPION);
 
         this.power = new MageInt(2);
         this.toughness = new MageInt(3);

Mage.Sets/src/mage/cards/b/BalaGedThief.java

@@ -55,9 +55,7 @@ public class BalaGedThief extends CardImpl {
 
     public BalaGedThief(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}");
-        this.subtype.add("Human");
+        this.subtype.add(SubType.HUMAN, SubType.ROGUE, SubType.ALLY);
-        this.subtype.add("Rogue");
-        this.subtype.add("Ally");
 
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);

Mage.Sets/src/mage/cards/b/BalduvianBarbarians.java

@@ -31,6 +31,7 @@ import mage.MageInt;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 
 import java.util.UUID;
 
@@ -42,8 +43,7 @@ public class BalduvianBarbarians extends CardImpl {
 
     public BalduvianBarbarians(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{R}");
-        this.subtype.add("Human");
+        this.subtype.add(SubType.HUMAN, SubType.BARBARIAN);
-        this.subtype.add("Barbarian");
 
         this.power = new MageInt(3);
         this.toughness = new MageInt(2);

Mage.Sets/src/mage/cards/b/BalduvianBears.java

@@ -31,6 +31,7 @@ import mage.MageInt;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 
 import java.util.UUID;
 
@@ -42,7 +43,7 @@ public class BalduvianBears extends CardImpl {
 
     public BalduvianBears(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}");
-        this.subtype.add("Bear");
+        this.subtype.add(SubType.BEAR);
 
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);

Mage.Sets/src/mage/cards/b/BalduvianDead.java

@@ -27,7 +27,6 @@
  */
 package mage.cards.b;
 
-import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.DelayedTriggeredAbility;
@@ -42,6 +41,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
+import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterCreatureCard;
 import mage.game.Game;
@@ -50,6 +50,8 @@ import mage.game.permanent.token.BalduvianToken;
 import mage.target.common.TargetCardInYourGraveyard;
 import mage.target.targetpointer.FixedTarget;
 
+import java.util.UUID;
+
 /**
  *
  * @author jeffwadsworth
@@ -58,7 +60,7 @@ public class BalduvianDead extends CardImpl {
 
     public BalduvianDead(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}");
-        this.subtype.add("Zombie");
+        this.subtype.add(SubType.ZOMBIE);
         this.power = new MageInt(2);
         this.toughness = new MageInt(3);
 

Mage.Sets/src/mage/cards/b/BalduvianHorde.java

@@ -34,6 +34,7 @@ import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 
 import java.util.UUID;
 
@@ -45,8 +46,7 @@ public class BalduvianHorde extends CardImpl {
 
     public BalduvianHorde(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}");
-        this.subtype.add("Human");
+        this.subtype.add(SubType.HUMAN, SubType.BARBARIAN);
-        this.subtype.add("Barbarian");
 
         this.power = new MageInt(5);
         this.toughness = new MageInt(5);

Mage.Sets/src/mage/cards/b/BalduvianWarMakers.java

@@ -33,6 +33,7 @@ import mage.abilities.keyword.RampageAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 
 import java.util.UUID;
 
@@ -44,8 +45,7 @@ public class BalduvianWarMakers extends CardImpl {
 
     public BalduvianWarMakers(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}");
-        this.subtype.add("Human");
+        this.subtype.add(SubType.HUMAN, SubType.BARBARIAN);
-        this.subtype.add("Barbarian");
         this.power = new MageInt(3);
         this.toughness = new MageInt(3);
 

Mage.Sets/src/mage/cards/b/BalefireDragon.java

@@ -36,6 +36,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
+import mage.constants.SubType;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
@@ -51,7 +52,7 @@ public class BalefireDragon extends CardImpl {
 
     public BalefireDragon(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{R}{R}");
-        this.subtype.add("Dragon");
+        this.subtype.add(SubType.DRAGON);
 
         this.power = new MageInt(6);
         this.toughness = new MageInt(6);

Mage.Sets/src/mage/cards/b/BalefireLiege.java

@@ -39,6 +39,7 @@ 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.FilterSpell;
 import mage.filter.common.FilterCreaturePermanent;
@@ -66,8 +67,7 @@ public class BalefireLiege extends CardImpl {
 
     public BalefireLiege(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R/W}{R/W}{R/W}");
-        this.subtype.add("Spirit");
+        this.subtype.add(SubType.SPIRIT, SubType.HORROR);
-        this.subtype.add("Horror");
 
 
         this.power = new MageInt(2);

Mage.Sets/src/mage/cards/b/BalefulAmmit.java

@@ -27,7 +27,6 @@
  */
 package mage.cards.b;
 
-import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
@@ -36,9 +35,12 @@ import mage.abilities.keyword.LifelinkAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 import mage.counters.CounterType;
 import mage.target.common.TargetControlledCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author fireshoes
@@ -48,8 +50,7 @@ public class BalefulAmmit extends CardImpl {
     public BalefulAmmit(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}");
 
-        this.subtype.add("Crocodile");
+        this.subtype.add(SubType.CROCODILE, SubType.DEMON);
-        this.subtype.add("Demon");
         this.power = new MageInt(4);
         this.toughness = new MageInt(3);
 

Mage.Sets/src/mage/cards/b/BalefulEidolon.java

@@ -36,10 +36,7 @@ import mage.abilities.keyword.BestowAbility;
 import mage.abilities.keyword.DeathtouchAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
-import mage.constants.AttachmentType;
+import mage.constants.*;
-import mage.constants.CardType;
-import mage.constants.Duration;
-import mage.constants.Zone;
 
 import java.util.UUID;
 
@@ -51,7 +48,7 @@ public class BalefulEidolon extends CardImpl {
 
     public BalefulEidolon(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.CREATURE},"{1}{B}");
-        this.subtype.add("Spirit");
+        this.subtype.add(SubType.SPIRIT);
 
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);

Mage.Sets/src/mage/cards/b/BalefulForce.java

@@ -36,6 +36,7 @@ import mage.abilities.effects.common.LoseLifeSourceControllerEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 import mage.constants.TargetController;
 
 import java.util.UUID;
@@ -48,7 +49,7 @@ public class BalefulForce extends CardImpl {
 
     public BalefulForce(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{B}{B}{B}");
-        this.subtype.add("Elemental");
+        this.subtype.add(SubType.ELEMENTAL);
 
         this.power = new MageInt(7);
         this.toughness = new MageInt(7);

Mage.Sets/src/mage/cards/b/BalefulStrix.java

@@ -35,6 +35,7 @@ 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;
 
@@ -46,7 +47,7 @@ public class BalefulStrix extends CardImpl {
 
     public BalefulStrix(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{U}{B}");
-        this.subtype.add("Bird");
+        this.subtype.add(SubType.BIRD);
 
 
         this.power = new MageInt(1);

Mage.Sets/src/mage/cards/b/BallLightning.java

@@ -36,6 +36,7 @@ import mage.abilities.keyword.TrampleAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 import mage.game.events.GameEvent.EventType;
 
 import java.util.UUID;
@@ -48,7 +49,7 @@ public class BallLightning extends CardImpl {
 
     public BallLightning(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}{R}{R}");
-        this.subtype.add("Elemental");
+        this.subtype.add(SubType.ELEMENTAL);
 
         this.power = new MageInt(6);
         this.toughness = new MageInt(1);

Mage.Sets/src/mage/cards/b/BallistaCharger.java

@@ -36,6 +36,7 @@ import mage.abilities.keyword.CrewAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 import mage.target.common.TargetCreatureOrPlayer;
 
 import java.util.UUID;
@@ -48,7 +49,7 @@ public class BallistaCharger extends CardImpl {
 
     public BallistaCharger(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}");
-        this.subtype.add("Vehicle");
+        this.subtype.add(SubType.VEHICLE);
         this.power = new MageInt(6);
         this.toughness = new MageInt(6);
 

Mage.Sets/src/mage/cards/b/BallistaSquad.java

@@ -37,6 +37,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.Zone;
 import mage.target.common.TargetAttackingOrBlockingCreature;
 
@@ -50,8 +51,7 @@ public class BallistaSquad extends CardImpl {
 
     public BallistaSquad(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}");
-        this.subtype.add("Human");
+        this.subtype.add(SubType.HUMAN, SubType.REBEL);
-        this.subtype.add("Rebel");
 
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);

Mage.Sets/src/mage/cards/b/BalloonPeddler.java

@@ -39,6 +39,7 @@ 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;
 
@@ -52,8 +53,7 @@ public class BalloonPeddler extends CardImpl {
 
     public BalloonPeddler(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}");
-        this.subtype.add("Human");
+        this.subtype.add(SubType.HUMAN, SubType.SPELLSHAPER);
-        this.subtype.add("Spellshaper");
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 

Mage.Sets/src/mage/cards/b/BallynockCohort.java

@@ -29,7 +29,7 @@ package mage.cards.b;
 
 import mage.MageInt;
 import mage.ObjectColor;
-import mage.constants.ComparisonType;
+import mage.constants.*;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
@@ -39,9 +39,6 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect;
 import mage.abilities.keyword.FirstStrikeAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
-import mage.constants.CardType;
-import mage.constants.Duration;
-import mage.constants.Zone;
 import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.predicate.mageobject.ColorPredicate;
 import mage.filter.predicate.permanent.AnotherPredicate;
@@ -65,8 +62,7 @@ public class BallynockCohort extends CardImpl {
 
     public BallynockCohort(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}");
-        this.subtype.add("Kithkin");
+        this.subtype.add(SubType.KITHKIN, SubType.SOLDIER);
-        this.subtype.add("Soldier");
 
         this.color.setWhite(true);
         this.power = new MageInt(2);

Mage.Sets/src/mage/cards/b/BallynockTrapper.java

@@ -38,6 +38,7 @@ 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.mageobject.ColorPredicate;
@@ -58,8 +59,7 @@ public class BallynockTrapper extends CardImpl {
 
     public BallynockTrapper(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}");
-        this.subtype.add("Kithkin");
+        this.subtype.add(SubType.KITHKIN, SubType.SOLDIER);
-        this.subtype.add("Soldier");
 
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);

Mage.Sets/src/mage/cards/b/BallyrushBanneret.java

@@ -57,8 +57,7 @@ public class BallyrushBanneret extends CardImpl {
 
     public BallyrushBanneret(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}");
-        this.subtype.add("Kithkin");
+        this.subtype.add(SubType.KITHKIN, SubType.SOLDIER);
-        this.subtype.add("Soldier");
 
         this.power = new MageInt(2);
         this.toughness = new MageInt(1);

Mage.Sets/src/mage/cards/b/BalothNull.java

@@ -34,6 +34,7 @@ import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 import mage.filter.common.FilterCreatureCard;
 import mage.target.common.TargetCardInYourGraveyard;
 
@@ -47,8 +48,7 @@ public class BalothNull extends CardImpl {
 
     public BalothNull(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}{G}");
-        this.subtype.add("Zombie");
+        this.subtype.add(SubType.ZOMBIE, SubType.BEAST);
-        this.subtype.add("Beast");
         this.power = new MageInt(4);
         this.toughness = new MageInt(5);
 

Mage.Sets/src/mage/cards/b/BalothPup.java

@@ -37,6 +37,7 @@ import mage.abilities.keyword.TrampleAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.counters.CounterType;
 
@@ -52,7 +53,7 @@ public class BalothPup extends CardImpl {
 
     public BalothPup(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}");
-        this.subtype.add("Beast");
+        this.subtype.add(SubType.BEAST);
         this.power = new MageInt(3);
         this.toughness = new MageInt(1);
 

Mage.Sets/src/mage/cards/b/BalothWoodcrasher.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 java.util.UUID;
 
@@ -47,7 +48,7 @@ public class BalothWoodcrasher extends CardImpl {
 
     public BalothWoodcrasher(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}{G}");
-        this.subtype.add("Beast");
+        this.subtype.add(SubType.BEAST);
 
         this.power = new MageInt(4);
         this.toughness = new MageInt(4);

Mage.Sets/src/mage/cards/b/BalshanBeguiler.java

@@ -37,6 +37,7 @@ 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.filter.FilterCard;
 import mage.game.Game;
@@ -53,8 +54,7 @@ public class BalshanBeguiler extends CardImpl {
 
     public BalshanBeguiler(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}");
-        this.subtype.add("Human");
+        this.subtype.add(SubType.HUMAN, SubType.WIZARD);
-        this.subtype.add("Wizard");
 
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);

Mage.Sets/src/mage/cards/b/BalshanCollaborator.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.Zone;
 
 import java.util.UUID;
@@ -48,8 +49,7 @@ public class BalshanCollaborator extends CardImpl {
 
     public BalshanCollaborator(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}");
-        this.subtype.add("Bird");
+        this.subtype.add(SubType.BIRD, SubType.SOLDIER);
-        this.subtype.add("Soldier");
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 

Mage.Sets/src/mage/cards/b/BalshanGriffin.java

@@ -37,6 +37,7 @@ import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.target.common.TargetCardInHand;
 
@@ -50,7 +51,7 @@ public class BalshanGriffin extends CardImpl {
 
     public BalshanGriffin(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{U}");
-        this.subtype.add("Griffin");
+        this.subtype.add(SubType.GRIFFIN);
 
         this.power = new MageInt(3);
         this.toughness = new MageInt(2);

Mage.Sets/src/mage/cards/b/BalthorTheDefiled.java

@@ -59,8 +59,7 @@ public class BalthorTheDefiled extends CardImpl {
     public BalthorTheDefiled(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}");
         addSuperType(SuperType.LEGENDARY);
-        this.subtype.add("Zombie");
+        this.subtype.add(SubType.ZOMBIE, SubType.DWARF);
-        this.subtype.add("Dwarf");
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 

Mage.Sets/src/mage/cards/b/BalthorTheStout.java

@@ -62,8 +62,7 @@ public class BalthorTheStout extends CardImpl {
     public BalthorTheStout(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{R}");
         addSuperType(SuperType.LEGENDARY);
-        this.subtype.add("Dwarf");
+        this.subtype.add(SubType.DWARF, SubType.BARBARIAN);
-        this.subtype.add("Barbarian");
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 

Mage.Sets/src/mage/cards/b/BalustradeSpy.java

@@ -39,6 +39,7 @@ 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;
@@ -54,8 +55,7 @@ public class BalustradeSpy extends CardImpl {
 
     public BalustradeSpy(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}");
-        this.subtype.add("Vampire");
+        this.subtype.add(SubType.VAMPIRE, SubType.ROGUE);
-        this.subtype.add("Rogue");
 
         this.power = new MageInt(2);
         this.toughness = new MageInt(3);

Mage.Sets/src/mage/cards/b/BaneAlleyBlackguard.java

@@ -32,6 +32,7 @@ import mage.MageInt;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 
 import java.util.UUID;
 
@@ -45,8 +46,7 @@ public class BaneAlleyBlackguard extends CardImpl {
 
     public BaneAlleyBlackguard (UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}");
-        this.subtype.add("Human");
+        this.subtype.add(SubType.HUMAN, SubType.ROGUE);
-        this.subtype.add("Rogue");
 
         this.power = new MageInt(1);
         this.toughness = new MageInt(3);

Mage.Sets/src/mage/cards/b/BaneAlleyBroker.java

@@ -89,8 +89,7 @@ public class BaneAlleyBroker extends CardImpl {
 
     public BaneAlleyBroker(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{B}");
-        this.subtype.add("Human");
+        this.subtype.add(SubType.HUMAN, SubType.ROGUE);
-        this.subtype.add("Rogue");
 
         this.power = new MageInt(0);
         this.toughness = new MageInt(3);

Mage.Sets/src/mage/cards/b/BaneOfBalaGed.java

@@ -34,10 +34,7 @@ import mage.abilities.effects.OneShotEffect;
 import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
-import mage.constants.CardType;
+import mage.constants.*;
-import mage.constants.Outcome;
-import mage.constants.SetTargetPointer;
-import mage.constants.Zone;
 import mage.game.Game;
 import mage.players.Player;
 import mage.target.Target;
@@ -55,7 +52,7 @@ public class BaneOfBalaGed extends CardImpl {
 
     public BaneOfBalaGed(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{7}");
-        this.subtype.add("Eldrazi");
+        this.subtype.add(SubType.ELDRAZI);
         this.power = new MageInt(7);
         this.toughness = new MageInt(5);
 

Mage.Sets/src/mage/cards/b/BaneOfHanweir.java

@@ -38,6 +38,7 @@ import mage.abilities.keyword.TransformAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 import mage.constants.TargetController;
 
 import java.util.UUID;
@@ -49,7 +50,7 @@ public class BaneOfHanweir extends CardImpl {
 
     public BaneOfHanweir(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"");
-        this.subtype.add("Werewolf");
+        this.subtype.add(SubType.WEREWOLF);
         this.color.setRed(true);
 
         // this card is the second face of double-faced card

Mage.Sets/src/mage/cards/b/BaneOfProgress.java

@@ -36,6 +36,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
+import mage.constants.SubType;
 import mage.counters.CounterType;
 import mage.filter.FilterPermanent;
 import mage.filter.predicate.Predicates;
@@ -53,7 +54,7 @@ public class BaneOfProgress extends CardImpl {
 
     public BaneOfProgress(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}{G}");
-        this.subtype.add("Elemental");
+        this.subtype.add(SubType.ELEMENTAL);
 
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);

Mage.Sets/src/mage/cards/b/BaneOfTheLiving.java

@@ -39,6 +39,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Duration;
+import mage.constants.SubType;
 import mage.filter.common.FilterCreaturePermanent;
 
 import java.util.UUID;
@@ -51,7 +52,7 @@ public class BaneOfTheLiving extends CardImpl {
 
     public BaneOfTheLiving(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}");
-        this.subtype.add("Insect");
+        this.subtype.add(SubType.INSECT);
         this.power = new MageInt(4);
         this.toughness = new MageInt(3);
 

Mage.Sets/src/mage/cards/b/BaneslayerAngel.java

@@ -58,7 +58,7 @@ public class BaneslayerAngel extends CardImpl {
 
     public BaneslayerAngel(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}");
-        this.subtype.add("Angel");
+        this.subtype.add(SubType.ANGEL);
 
         this.power = new MageInt(5);
         this.toughness = new MageInt(5);

Mage.Sets/src/mage/cards/b/BanewaspAffliction.java

@@ -37,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.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
@@ -53,7 +54,7 @@ public class BanewaspAffliction extends CardImpl {
 
     public BanewaspAffliction(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{B}");
-        this.subtype.add("Aura");
+        this.subtype.add(SubType.AURA);
 
 
         // Enchant creature

Mage.Sets/src/mage/cards/b/BanewhipPunisher.java

@@ -1,6 +1,5 @@
 package mage.cards.b;
 
-import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
@@ -12,6 +11,7 @@ import mage.abilities.effects.common.counter.AddCountersTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.counters.CounterType;
 import mage.filter.common.FilterCreaturePermanent;
@@ -19,6 +19,8 @@ import mage.filter.predicate.permanent.CounterPredicate;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 public class BanewhipPunisher extends CardImpl {
     
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with a -1/-1 counter on it");    
@@ -29,8 +31,7 @@ public class BanewhipPunisher extends CardImpl {
 
     public BanewhipPunisher(UUID ownerId, CardSetInfo cardSetInfo) {
         super(ownerId, cardSetInfo, new CardType[]{CardType.CREATURE}, "{2}{B}");
-        subtype.add("Human");
+        subtype.add(SubType.HUMAN, SubType.WARRIOR);
-        subtype.add("Warrior");
         power = new MageInt(2);
         toughness = new MageInt(2);
         

Mage.Sets/src/mage/cards/b/BanisherPriest.java

@@ -38,6 +38,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.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.permanent.ControllerPredicate;
@@ -62,8 +63,7 @@ public class BanisherPriest extends CardImpl {
 
     public BanisherPriest(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}");
-        this.subtype.add("Human");
+        this.subtype.add(SubType.HUMAN, SubType.CLERIC);
-        this.subtype.add("Cleric");
 
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);

Mage.Sets/src/mage/cards/b/BansheeOfTheDreadChoir.java

@@ -34,6 +34,7 @@ import mage.abilities.keyword.MyriadAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 
 import java.util.UUID;
 
@@ -45,7 +46,7 @@ public class BansheeOfTheDreadChoir extends CardImpl {
 
     public BansheeOfTheDreadChoir(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}");
-        this.subtype.add("Spirit");
+        this.subtype.add(SubType.SPIRIT);
         this.power = new MageInt(4);
         this.toughness = new MageInt(4);
 

Mage.Sets/src/mage/cards/b/BansheesBlade.java

@@ -38,6 +38,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
+import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.counters.CounterType;
 import mage.game.Game;
@@ -56,7 +57,7 @@ public class BansheesBlade extends CardImpl {
 
     public BansheesBlade(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}");
-        this.subtype.add("Equipment");
+        this.subtype.add(SubType.EQUIPMENT);
 
         // Equipped creature gets +1/+1 for each charge counter on Banshee's Blade.
         CountersSourceCount chargeCountersCount = new CountersSourceCount(CounterType.CHARGE);

Mage.Sets/src/mage/cards/b/BantBattlemage.java

@@ -40,6 +40,7 @@ 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;
 
@@ -53,8 +54,7 @@ public class BantBattlemage extends CardImpl {
 
     public BantBattlemage (UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}");
-        this.subtype.add("Human");
+        this.subtype.add(SubType.HUMAN, SubType.WIZARD);
-        this.subtype.add("Wizard");
 
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);

Mage.Sets/src/mage/cards/b/BantSojourners.java

@@ -37,6 +37,7 @@ import mage.abilities.keyword.CyclingAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 import mage.game.permanent.token.SoldierToken;
 
 import java.util.UUID;
@@ -49,11 +50,7 @@ public class BantSojourners extends CardImpl {
 
     public BantSojourners(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}{W}{U}");
-        this.subtype.add("Human");
+        this.subtype.add(SubType.HUMAN, SubType.SOLDIER);
-        this.subtype.add("Soldier");
-
-
-
 
         this.power = new MageInt(2);
         this.toughness = new MageInt(4);

Mage.Sets/src/mage/cards/b/BantSureblade.java

@@ -39,6 +39,7 @@ 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.FilterControlledPermanent;
 import mage.filter.predicate.mageobject.MulticoloredPredicate;
@@ -61,11 +62,7 @@ public class BantSureblade extends CardImpl {
 
     public BantSureblade(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G/U}{W}");
-        this.subtype.add("Human");
+        this.subtype.add(SubType.HUMAN, SubType.SOLDIER);
-        this.subtype.add("Soldier");
-
-
-
 
         this.power = new MageInt(2);
         this.toughness = new MageInt(1);

Mage.Sets/src/mage/cards/b/BanthaHerd.java

@@ -27,7 +27,6 @@
  */
 package mage.cards.b;
 
-import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.BecomesMonstrousSourceTriggeredAbility;
@@ -38,10 +37,13 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
+import mage.constants.SubType;
 import mage.game.Game;
 import mage.game.permanent.token.TuskenRaiderToken;
 import mage.players.Player;
 
+import java.util.UUID;
+
 /**
  *
  * @author Styxo
@@ -50,7 +52,7 @@ public class BanthaHerd extends CardImpl {
 
     public BanthaHerd(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}{W}");
-        this.subtype.add("Beast");
+        this.subtype.add(SubType.BEAST);
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 

Mage.Sets/src/mage/cards/b/BaralChiefOfCompliance.java

@@ -35,6 +35,7 @@ import mage.abilities.effects.common.cost.SpellsCostReductionControllerEffect;
 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.filter.FilterCard;
@@ -62,7 +63,7 @@ public class BaralChiefOfCompliance extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}");
 
        addSuperType(SuperType.LEGENDARY);
-        this.subtype.add("Human");
+        this.subtype.add(SubType.HUMAN, SubType.WIZARD);
         this.subtype.add("Wizard");
         this.power = new MageInt(1);
         this.toughness = new MageInt(3);

Mage.Sets/src/mage/cards/b/BarbarianGeneral.java

@@ -32,6 +32,7 @@ import mage.abilities.keyword.HorsemanshipAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 
 import java.util.UUID;
 
@@ -43,9 +44,7 @@ public class BarbarianGeneral extends CardImpl {
 
     public BarbarianGeneral(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}");
-        this.subtype.add("Human");
+        this.subtype.add(SubType.HUMAN, SubType.BARBARIAN, SubType.SOLDIER);
-        this.subtype.add("Barbarian");
-        this.subtype.add("Soldier");
         this.power = new MageInt(3);
         this.toughness = new MageInt(2);
 

Mage.Sets/src/mage/cards/b/BarbarianHorde.java

@@ -31,6 +31,7 @@ import mage.MageInt;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 
 import java.util.UUID;
 
@@ -42,9 +43,7 @@ public class BarbarianHorde extends CardImpl {
 
     public BarbarianHorde(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}");
-        this.subtype.add("Human");
+        this.subtype.add(SubType.HUMAN, SubType.BARBARIAN, SubType.SOLDIER);
-        this.subtype.add("Barbarian");
-        this.subtype.add("Soldier");
 
         this.power = new MageInt(3);
         this.toughness = new MageInt(3);

Mage.Sets/src/mage/cards/b/BarbarianLunatic.java

@@ -36,6 +36,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.Zone;
 import mage.target.common.TargetCreaturePermanent;
 
@@ -49,8 +50,7 @@ public class BarbarianLunatic extends CardImpl {
 
     public BarbarianLunatic(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}");
-        this.subtype.add("Human");
+        this.subtype.add(SubType.HUMAN, SubType.BARBARIAN);
-        this.subtype.add("Barbarian");
 
         this.power = new MageInt(2);
         this.toughness = new MageInt(1);

Mage.Sets/src/mage/cards/b/BarbarianOutcast.java

@@ -55,9 +55,7 @@ public class BarbarianOutcast extends CardImpl {
 
     public BarbarianOutcast(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}");
-        this.subtype.add("Human");
+        this.subtype.add(SubType.HUMAN, SubType.BARBARIAN, SubType.BEAST);
-        this.subtype.add("Barbarian");
-        this.subtype.add("Beast");
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 

Mage.Sets/src/mage/cards/b/BarbarianRiftcutter.java

@@ -37,6 +37,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.ColoredManaSymbol;
+import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.target.common.TargetLandPermanent;
 
@@ -50,8 +51,7 @@ public class BarbarianRiftcutter extends CardImpl {
 
     public BarbarianRiftcutter(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}");
-        this.subtype.add("Human");
+        this.subtype.add(SubType.HUMAN, SubType.BARBARIAN);
-        this.subtype.add("Barbarian");
 
         this.power = new MageInt(3);
         this.toughness = new MageInt(3);

Mage.Sets/src/mage/cards/b/BarbaryApes.java

@@ -31,6 +31,7 @@ import mage.MageInt;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 
 import java.util.UUID;
 
@@ -42,7 +43,7 @@ public class BarbaryApes extends CardImpl {
 
     public BarbaryApes(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}");
-        this.subtype.add("Ape");
+        this.subtype.add(SubType.APE);
 
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);

Mage.Sets/src/mage/cards/b/BarbedBackWurm.java

@@ -37,6 +37,7 @@ 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.FilterCreaturePermanent;
 import mage.filter.predicate.mageobject.ColorPredicate;
@@ -53,7 +54,7 @@ public class BarbedBackWurm extends CardImpl {
 
     public BarbedBackWurm(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}");
-        this.subtype.add("Wurm");
+        this.subtype.add(SubType.WURM);
         this.power = new MageInt(4);
         this.toughness = new MageInt(3);
 

Mage.Sets/src/mage/cards/b/BarbedBattlegear.java

@@ -36,6 +36,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
+import mage.constants.SubType;
 import mage.constants.Zone;
 
 import java.util.UUID;
@@ -48,7 +49,7 @@ public class BarbedBattlegear extends CardImpl {
 
     public BarbedBattlegear (UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}");
-        this.subtype.add("Equipment");
+        this.subtype.add(SubType.EQUIPMENT);
         this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2)));
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(4, -1)));
     }

Mage.Sets/src/mage/cards/b/BarbedField.java

@@ -38,10 +38,7 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
 import mage.abilities.keyword.EnchantAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
-import mage.constants.AttachmentType;
+import mage.constants.*;
-import mage.constants.CardType;
-import mage.constants.Outcome;
-import mage.constants.Zone;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetCreatureOrPlayer;
 import mage.target.common.TargetLandPermanent;
@@ -56,7 +53,7 @@ public class BarbedField extends CardImpl {
 
     public BarbedField(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}{R}");
-        this.subtype.add("Aura");
+        this.subtype.add(SubType.AURA);
 
         // Enchant land
         TargetPermanent auraTarget = new TargetLandPermanent();

Mage.Sets/src/mage/cards/b/BarbedShocker.java

@@ -38,6 +38,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
+import mage.constants.SubType;
 import mage.game.Game;
 import mage.players.Player;
 
@@ -51,7 +52,7 @@ public class BarbedShocker extends CardImpl {
 
     public BarbedShocker(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}");
-        this.subtype.add("Insect");
+        this.subtype.add(SubType.INSECT);
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 

Mage.Sets/src/mage/cards/b/BarbedSliver.java

@@ -37,6 +37,7 @@ 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.StaticFilters;
 
@@ -50,7 +51,7 @@ public class BarbedSliver extends CardImpl {
 
     public BarbedSliver(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}");
-        this.subtype.add("Sliver");
+        this.subtype.add(SubType.SLIVER);
 
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);

Mage.Sets/src/mage/cards/b/BarbtoothWurm.java

@@ -31,6 +31,7 @@ import mage.MageInt;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 
 import java.util.UUID;
 
@@ -42,7 +43,7 @@ public class BarbtoothWurm extends CardImpl {
 
     public BarbtoothWurm(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{G}");
-        this.subtype.add("Wurm");
+        this.subtype.add(SubType.WURM);
 
         this.power = new MageInt(6);
         this.toughness = new MageInt(4);

Mage.Sets/src/mage/cards/b/BarkhideMauler.java

@@ -33,6 +33,7 @@ import mage.abilities.keyword.CyclingAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 
 import java.util.UUID;
 
@@ -44,7 +45,7 @@ public class BarkhideMauler extends CardImpl {
 
     public BarkhideMauler(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}");
-        this.subtype.add("Beast");
+        this.subtype.add(SubType.BEAST);
 
         this.power = new MageInt(4);
         this.toughness = new MageInt(4);

Mage.Sets/src/mage/cards/b/BarktoothWarbeard.java

@@ -31,6 +31,7 @@ import mage.MageInt;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 import mage.constants.SuperType;
 
 import java.util.UUID;
@@ -44,8 +45,7 @@ public class BarktoothWarbeard extends CardImpl {
     public BarktoothWarbeard(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}{R}{R}");
         addSuperType(SuperType.LEGENDARY);
-        this.subtype.add("Human");
+        this.subtype.add(SubType.HUMAN, SubType.WARRIOR);
-        this.subtype.add("Warrior");
 
         this.power = new MageInt(6);
         this.toughness = new MageInt(5);

Mage.Sets/src/mage/cards/b/BaronSengir.java

@@ -65,7 +65,7 @@ public class BaronSengir extends CardImpl {
     public BaronSengir(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{B}{B}{B}");
         addSuperType(SuperType.LEGENDARY);
-        this.subtype.add("Vampire");
+        this.subtype.add(SubType.VAMPIRE);
         this.power = new MageInt(5);
         this.toughness = new MageInt(5);
 

Mage.Sets/src/mage/cards/b/BaronyVampire.java

@@ -32,6 +32,7 @@ import mage.MageInt;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 
 import java.util.UUID;
 
@@ -44,7 +45,7 @@ public class BaronyVampire extends CardImpl {
     public BaronyVampire(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}");
 
-        this.subtype.add("Vampire");
+        this.subtype.add(SubType.VAMPIRE);
         this.power = new MageInt(3);
         this.toughness = new MageInt(2);
     }

Mage.Sets/src/mage/cards/b/BarrageOgre.java

@@ -37,6 +37,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.Zone;
 import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.mageobject.CardTypePredicate;
@@ -58,7 +59,7 @@ public class BarrageOgre extends CardImpl {
 
     public BarrageOgre (UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{R}");
-        this.subtype.add("Ogre");
+        this.subtype.add(SubType.OGRE, SubType.WARRIOR);
         this.subtype.add("Warrior");
         this.color.setRed(true);        
         this.power = new MageInt(3);

Mage.Sets/src/mage/cards/b/BarrageTyrant.java

@@ -39,6 +39,7 @@ import mage.abilities.keyword.DevoidAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.predicate.mageobject.ColorlessPredicate;
@@ -63,7 +64,7 @@ public class BarrageTyrant extends CardImpl {
 
     public BarrageTyrant(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}");
-        this.subtype.add("Eldrazi");
+        this.subtype.add(SubType.ELDRAZI);
         this.power = new MageInt(5);
         this.toughness = new MageInt(3);
 

Mage.Sets/src/mage/cards/b/BarrelDownSokenzan.java

@@ -48,7 +48,7 @@ public class BarrelDownSokenzan extends CardImpl {
 
     public BarrelDownSokenzan(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{R}");
-        this.subtype.add("Arcane");
+        this.subtype.add(SubType.ARCANE);
 
 
         // Sweep - Return any number of Mountains you control to their owner's hand. Barrel Down Sokenzan deals damage to target creature equal to twice the number of Mountains returned this way.

Mage.Sets/src/mage/cards/b/BarrentonCragtreads.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.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.mageobject.ColorPredicate;
 
@@ -54,8 +55,7 @@ public class BarrentonCragtreads extends CardImpl {
 
     public BarrentonCragtreads(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W/U}{W/U}");
-        this.subtype.add("Kithkin");
+        this.subtype.add(SubType.KITHKIN, SubType.SCOUT);
-        this.subtype.add("Scout");
 
         this.power = new MageInt(3);
         this.toughness = new MageInt(3);

Mage.Sets/src/mage/cards/b/BarrentonMedic.java

@@ -38,6 +38,7 @@ 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.counters.CounterType;
 import mage.target.common.TargetCreatureOrPlayer;
@@ -53,8 +54,7 @@ public class BarrentonMedic extends CardImpl {
 
     public BarrentonMedic(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}");
-        this.subtype.add("Kithkin");
+        this.subtype.add(SubType.KITHKIN, SubType.CLERIC);
-        this.subtype.add("Cleric");
 
         this.power = new MageInt(0);
         this.toughness = new MageInt(4);

Mage.Sets/src/mage/cards/b/BarricadeBreaker.java

@@ -33,6 +33,7 @@ import mage.abilities.keyword.ImproviseAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 
 import java.util.UUID;
 
@@ -45,7 +46,7 @@ public class BarricadeBreaker extends CardImpl {
     public BarricadeBreaker(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{7}");
         
-        this.subtype.add("Juggernaut");
+        this.subtype.add(SubType.JUGGERNAUT);
         this.power = new MageInt(7);
         this.toughness = new MageInt(5);
 

Mage.Sets/src/mage/cards/b/BarrinMasterWizard.java

@@ -35,6 +35,7 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect;
 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.target.common.TargetControlledPermanent;
@@ -51,7 +52,7 @@ public class BarrinMasterWizard extends CardImpl {
     public BarrinMasterWizard(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{U}");
         addSuperType(SuperType.LEGENDARY);
-        this.subtype.add("Human");
+        this.subtype.add(SubType.HUMAN, SubType.WIZARD);
         this.subtype.add("Wizard");
 
         this.power = new MageInt(1);

Mage.Sets/src/mage/cards/b/BarrowGhoul.java

@@ -34,6 +34,7 @@ import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 import mage.constants.TargetController;
 
 import java.util.UUID;
@@ -46,7 +47,7 @@ public class BarrowGhoul extends CardImpl {
 
     public BarrowGhoul(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}");
-        this.subtype.add("Zombie");
+        this.subtype.add(SubType.ZOMBIE);
         this.power = new MageInt(4);
         this.toughness = new MageInt(4);
 

Mage.Sets/src/mage/cards/b/BartelRuneaxe.java

@@ -51,8 +51,7 @@ public class BartelRuneaxe extends CardImpl {
     public BartelRuneaxe(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{R}{G}");
         addSuperType(SuperType.LEGENDARY);
-        this.subtype.add("Giant");
+        this.subtype.add(SubType.GIANT, SubType.WARRIOR);
-        this.subtype.add("Warrior");
         this.power = new MageInt(6);
         this.toughness = new MageInt(5);
 

Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java

@@ -27,7 +27,6 @@
  */
 package mage.cards.b;
 
-import java.util.UUID;
 import mage.MageInt;
 import mage.ObjectColor;
 import mage.abilities.Ability;
@@ -51,6 +50,8 @@ import mage.game.Game;
 import mage.game.permanent.token.BaruFistOfKrosaToken;
 import mage.game.permanent.token.Token;
 
+import java.util.UUID;
+
 /**
  *
  * @author emerald000
@@ -69,8 +70,7 @@ public class BaruFistOfKrosa extends CardImpl {
     public BaruFistOfKrosa(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{G}{G}");
         addSuperType(SuperType.LEGENDARY);
-        this.subtype.add("Human");
+        this.subtype.add(SubType.HUMAN, SubType.DRUID);
-        this.subtype.add("Druid");
 
         this.power = new MageInt(4);
         this.toughness = new MageInt(4);

Mage.Sets/src/mage/cards/b/BasalSliver.java

@@ -59,7 +59,7 @@ public class BasalSliver extends CardImpl {
 
     public BasalSliver(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}");
-        this.subtype.add("Sliver");
+        this.subtype.add(SubType.SLIVER);
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 

Mage.Sets/src/mage/cards/b/BasalThrull.java

@@ -36,6 +36,7 @@ import mage.abilities.mana.SimpleManaAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 import mage.constants.Zone;
 
 import java.util.UUID;
@@ -48,7 +49,7 @@ public class BasalThrull extends CardImpl {
 
     public BasalThrull(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{B}");
-        this.subtype.add("Thrull");
+        this.subtype.add(SubType.THRULL);
         this.power = new MageInt(1);
         this.toughness = new MageInt(2);
 

Mage.Sets/src/mage/cards/b/BasaltGargoyle.java

@@ -37,6 +37,7 @@ 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;
@@ -49,7 +50,7 @@ public class BasaltGargoyle extends CardImpl {
 
     public BasaltGargoyle(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}");
-        this.subtype.add("Gargoyle");
+        this.subtype.add(SubType.GARGOYLE);
         this.power = new MageInt(3);
         this.toughness = new MageInt(2);
 

Mage.Sets/src/mage/cards/b/BasandraBattleSeraph.java

@@ -55,7 +55,7 @@ public class BasandraBattleSeraph extends CardImpl {
     public BasandraBattleSeraph(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{W}");
         addSuperType(SuperType.LEGENDARY);
-        this.subtype.add("Angel");
+        this.subtype.add(SubType.ANGEL);
 
         this.power = new MageInt(4);
         this.toughness = new MageInt(4);

Mage.Sets/src/mage/cards/b/BasilicaGuards.java

@@ -33,6 +33,7 @@ import mage.abilities.keyword.ExtortAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 
 import java.util.UUID;
 
@@ -44,8 +45,7 @@ public class BasilicaGuards extends CardImpl {
 
     public BasilicaGuards(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}");
-        this.subtype.add("Human");
+        this.subtype.add(SubType.HUMAN, SubType.SOLDIER);
-        this.subtype.add("Soldier");
 
         this.power = new MageInt(1);
         this.toughness = new MageInt(4);

Mage.Sets/src/mage/cards/b/BasilicaScreecher.java

@@ -33,6 +33,7 @@ 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;
 
@@ -44,7 +45,7 @@ public class BasilicaScreecher extends CardImpl {
 
     public BasilicaScreecher(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}");
-        this.subtype.add("Bat");
+        this.subtype.add(SubType.BAT);
 
         this.power = new MageInt(1);
         this.toughness = new MageInt(2);

Mage.Sets/src/mage/cards/b/BasiliskCollar.java

@@ -36,10 +36,7 @@ import mage.abilities.keyword.EquipAbility;
 import mage.abilities.keyword.LifelinkAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
-import mage.constants.AttachmentType;
+import mage.constants.*;
-import mage.constants.CardType;
-import mage.constants.Outcome;
-import mage.constants.Zone;
 
 import java.util.UUID;
 
@@ -51,7 +48,7 @@ public class BasiliskCollar extends CardImpl {
 
     public BasiliskCollar(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}");
-        this.subtype.add("Equipment");
+        this.subtype.add(SubType.EQUIPMENT);
         this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2)));
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.EQUIPMENT)));
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DeathtouchAbility.getInstance(), AttachmentType.EQUIPMENT)));

Mage.Sets/src/mage/cards/b/BaskingRootwalla.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.Zone;
 
 import java.util.UUID;
@@ -48,7 +49,7 @@ public class BaskingRootwalla extends CardImpl {
 
     public BaskingRootwalla(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}");
-        this.subtype.add("Lizard");
+        this.subtype.add(SubType.LIZARD);
 
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);

Mage.Sets/src/mage/cards/b/BassaraTowerArcher.java

@@ -33,6 +33,7 @@ import mage.abilities.keyword.ReachAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 
 import java.util.UUID;
 
@@ -44,8 +45,7 @@ public class BassaraTowerArcher extends CardImpl {
 
     public BassaraTowerArcher(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}{G}");
-        this.subtype.add("Human");
+        this.subtype.add(SubType.HUMAN, SubType.ARCHER);
-        this.subtype.add("Archer");
 
         this.power = new MageInt(2);
         this.toughness = new MageInt(1);

Mage.Sets/src/mage/cards/b/BastionEnforcer.java

@@ -31,6 +31,7 @@ import mage.MageInt;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 
 import java.util.UUID;
 
@@ -43,8 +44,7 @@ public class BastionEnforcer extends CardImpl {
     public BastionEnforcer(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}");
         
-        this.subtype.add("Dwarf");
+        this.subtype.add(SubType.DWARF, SubType.SOLDIER);
-        this.subtype.add("Soldier");
         this.power = new MageInt(3);
         this.toughness = new MageInt(2);
     }

Mage.Sets/src/mage/cards/b/BastionInventor.java

@@ -33,6 +33,7 @@ import mage.abilities.keyword.ImproviseAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 
 import java.util.UUID;
 
@@ -45,8 +46,7 @@ public class BastionInventor extends CardImpl {
     public BastionInventor(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{U}");
         
-        this.subtype.add("Vedalken");
+        this.subtype.add(SubType.VEDALKEN, SubType.ARTIFICER);
-        this.subtype.add("Artificer");
         this.power = new MageInt(4);
         this.toughness = new MageInt(4);
 

Mage.Sets/src/mage/cards/b/BastionMastodon.java

@@ -37,6 +37,7 @@ 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;
@@ -49,7 +50,7 @@ public class BastionMastodon extends CardImpl {
 
     public BastionMastodon(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{5}");
-        this.subtype.add("Elephant");
+        this.subtype.add(SubType.ELEPHANT);
         this.power = new MageInt(4);
         this.toughness = new MageInt(5);
 

Mage.Sets/src/mage/cards/b/BastionProtector.java

@@ -38,6 +38,7 @@ 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.FilterCreaturePermanent;
 import mage.filter.predicate.permanent.CommanderPredicate;
@@ -58,8 +59,7 @@ public class BastionProtector extends CardImpl {
 
     public BastionProtector(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}");
-        this.subtype.add("Human");
+        this.subtype.add(SubType.HUMAN, SubType.SOLDIER);
-        this.subtype.add("Soldier");
         this.power = new MageInt(3);
         this.toughness = new MageInt(3);
 

Mage.Sets/src/mage/cards/b/BatteredGolem.java

@@ -35,6 +35,7 @@ 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.common.FilterArtifactPermanent;
 
@@ -48,7 +49,7 @@ public class BatteredGolem extends CardImpl {
 
     public BatteredGolem(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{3}");
-        this.subtype.add("Golem");
+        this.subtype.add(SubType.GOLEM);
 
         this.power = new MageInt(3);
         this.toughness = new MageInt(2);

Mage.Sets/src/mage/cards/b/Batterhorn.java

@@ -35,6 +35,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.target.common.TargetArtifactPermanent;
 
 import java.util.UUID;
@@ -47,7 +48,7 @@ public class Batterhorn extends CardImpl {
 
     public Batterhorn (UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}");
-        this.subtype.add("Beast");
+        this.subtype.add(SubType.BEAST);
 
         this.power = new MageInt(4);
         this.toughness = new MageInt(3);

Mage.Sets/src/mage/cards/b/BatteringCraghorn.java

@@ -34,6 +34,7 @@ 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;
 
@@ -45,7 +46,7 @@ public class BatteringCraghorn extends CardImpl {
 
     public BatteringCraghorn(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}");
-        this.subtype.add("Goat");
+        this.subtype.add(SubType.GOAT, SubType.BEAST);
         this.subtype.add("Beast");
         this.power = new MageInt(3);
         this.toughness = new MageInt(1);

Mage.Sets/src/mage/cards/b/BatteringKrasis.java

@@ -34,6 +34,7 @@ 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;
 
@@ -47,7 +48,7 @@ public class BatteringKrasis extends CardImpl {
 
     public BatteringKrasis (UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}");
-        this.subtype.add("Fish");
+        this.subtype.add(SubType.FISH, SubType.BEAST);
         this.subtype.add("Beast");
 
         this.power = new MageInt(2);

Mage.Sets/src/mage/cards/b/BatteringSliver.java

@@ -56,7 +56,7 @@ public class BatteringSliver extends CardImpl {
 
     public BatteringSliver(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{R}");
-        this.subtype.add("Sliver");
+        this.subtype.add(SubType.SLIVER);
 
         this.power = new MageInt(4);
         this.toughness = new MageInt(4);

Mage.Sets/src/mage/cards/b/BatteringWurm.java

@@ -34,6 +34,7 @@ import mage.abilities.keyword.BloodthirstAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 import mage.constants.Zone;
 
 import java.util.UUID;
@@ -46,7 +47,7 @@ public class BatteringWurm extends CardImpl {
 
     public BatteringWurm(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{6}{G}");
-        this.subtype.add("Wurm");
+        this.subtype.add(SubType.WURM);
 
         this.power = new MageInt(4);
         this.toughness = new MageInt(3);

Mage.Sets/src/mage/cards/b/Batterskull.java

@@ -40,10 +40,7 @@ import mage.abilities.keyword.LivingWeaponAbility;
 import mage.abilities.keyword.VigilanceAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
-import mage.constants.AttachmentType;
+import mage.constants.*;
-import mage.constants.CardType;
-import mage.constants.Outcome;
-import mage.constants.Zone;
 
 import java.util.UUID;
 
@@ -55,7 +52,7 @@ public class Batterskull extends CardImpl {
 
     public Batterskull (UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}");
-        this.subtype.add("Equipment");
+        this.subtype.add(SubType.EQUIPMENT);
 
         // Living weapon (When this Equipment enters the battlefield, create a 0/0 black Germ creature token, then attach this to it.)
         this.addAbility(new LivingWeaponAbility());

Mage.Sets/src/mage/cards/b/BattleBrawler.java

@@ -40,6 +40,7 @@ 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.FilterControlledPermanent;
 import mage.filter.predicate.Predicates;
@@ -61,8 +62,8 @@ public class BattleBrawler extends CardImpl {
 
     public BattleBrawler(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}");
-        this.subtype.add("Orc");
+        this.subtype.add(SubType.ORC);
-        this.subtype.add("Warrior");
+        this.subtype.add(SubType.WARRIOR);
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 

Mage.Sets/src/mage/cards/b/BattleHurda.java

@@ -33,6 +33,7 @@ import mage.abilities.keyword.FirstStrikeAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 
 import java.util.UUID;
 
@@ -44,7 +45,7 @@ public class BattleHurda extends CardImpl {
 
     public BattleHurda (UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}");
-        this.subtype.add("Giant");
+        this.subtype.add(SubType.GIANT);
 
         this.power = new MageInt(3);
         this.toughness = new MageInt(3);

Mage.Sets/src/mage/cards/b/BattleMadRonin.java

@@ -33,6 +33,7 @@ import mage.abilities.keyword.BushidoAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 
 import java.util.UUID;
 
@@ -44,7 +45,7 @@ public class BattleMadRonin extends CardImpl {
 
     public BattleMadRonin(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}");
-        this.subtype.add("Human");
+        this.subtype.add(SubType.HUMAN, SubType.SAMURAI);
         this.subtype.add("Samurai");
 
         this.power = new MageInt(1);

Mage.Sets/src/mage/cards/b/BattleMastery.java

@@ -35,10 +35,7 @@ import mage.abilities.keyword.DoubleStrikeAbility;
 import mage.abilities.keyword.EnchantAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
-import mage.constants.AttachmentType;
+import mage.constants.*;
-import mage.constants.CardType;
-import mage.constants.Outcome;
-import mage.constants.Zone;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetCreaturePermanent;
 
@@ -52,7 +49,7 @@ public class BattleMastery extends CardImpl {
 
     public BattleMastery(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}");
-        this.subtype.add("Aura");
+        this.subtype.add(SubType.AURA);
 
         TargetPermanent auraTarget = new TargetCreaturePermanent();
         this.getSpellAbility().addTarget(auraTarget);

Mage.Sets/src/mage/cards/b/BattleRampart.java

@@ -37,6 +37,7 @@ 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;
 
@@ -50,7 +51,7 @@ public class BattleRampart extends CardImpl {
 
     public BattleRampart(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}");
-        this.subtype.add("Wall");
+        this.subtype.add(SubType.WALL);
 
         this.power = new MageInt(1);
         this.toughness = new MageInt(3);