diff --git a/Mage.Sets/src/mage/cards/b/BatteringKrasis.java b/Mage.Sets/src/mage/cards/b/BatteringKrasis.java index fc6586c7df..a60e7d8531 100644 --- a/Mage.Sets/src/mage/cards/b/BatteringKrasis.java +++ b/Mage.Sets/src/mage/cards/b/BatteringKrasis.java @@ -1,5 +1,3 @@ - - package mage.cards.b; import mage.MageInt; @@ -13,28 +11,25 @@ import mage.constants.SubType; import java.util.UUID; /** - * * @author LevelX2 */ - - public final class BatteringKrasis extends CardImpl { - public BatteringKrasis (UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); - this.subtype.add(SubType.FISH, SubType.BEAST); + public BatteringKrasis(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}"); + this.subtype.add(SubType.SHARK, SubType.BEAST); this.power = new MageInt(2); this.toughness = new MageInt(1); // Trample this.addAbility(TrampleAbility.getInstance()); + // Evolve (Whenever a creature enters the battlefield under your control, if that creature has greater power or toughness than this creature, put a +1/+1 counter on this creature.) this.addAbility(new EvolveAbility()); - } - public BatteringKrasis (final BatteringKrasis card) { + private BatteringKrasis(final BatteringKrasis card) { super(card); } diff --git a/Mage.Sets/src/mage/cards/c/ChickenALaKing.java b/Mage.Sets/src/mage/cards/c/ChickenALaKing.java index c9d9a0e0d9..e7e258a048 100644 --- a/Mage.Sets/src/mage/cards/c/ChickenALaKing.java +++ b/Mage.Sets/src/mage/cards/c/ChickenALaKing.java @@ -39,6 +39,7 @@ public final class ChickenALaKing extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}{U}"); this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.NOBLE); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/d/DryadOfTheIlysianGrove.java b/Mage.Sets/src/mage/cards/d/DryadOfTheIlysianGrove.java index 21b0902844..7e81a8956d 100644 --- a/Mage.Sets/src/mage/cards/d/DryadOfTheIlysianGrove.java +++ b/Mage.Sets/src/mage/cards/d/DryadOfTheIlysianGrove.java @@ -21,6 +21,7 @@ public final class DryadOfTheIlysianGrove extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT, CardType.CREATURE}, "{2}{G}"); this.subtype.add(SubType.NYMPH); + this.subtype.add(SubType.DRYAD); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/g/GiantShark.java b/Mage.Sets/src/mage/cards/g/GiantShark.java index 20feb429e6..3adccfc3a9 100644 --- a/Mage.Sets/src/mage/cards/g/GiantShark.java +++ b/Mage.Sets/src/mage/cards/g/GiantShark.java @@ -1,7 +1,5 @@ - package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility; @@ -14,19 +12,15 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ComparisonType; -import mage.constants.SubType; -import mage.constants.Duration; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.permanent.WasDealtDamageThisTurnPredicate; +import java.util.UUID; + /** - * * @author KholdFuzion & L_J - * */ public final class GiantShark extends CardImpl { @@ -39,8 +33,8 @@ public final class GiantShark extends CardImpl { } public GiantShark(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{U}"); - this.subtype.add(SubType.FISH); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{U}"); + this.subtype.add(SubType.SHARK); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/h/HammerheadShark.java b/Mage.Sets/src/mage/cards/h/HammerheadShark.java index c415b95bdc..217c645ed8 100644 --- a/Mage.Sets/src/mage/cards/h/HammerheadShark.java +++ b/Mage.Sets/src/mage/cards/h/HammerheadShark.java @@ -1,7 +1,5 @@ - package mage.cards.h; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.combat.CantAttackUnlessDefenderControllsPermanent; @@ -12,23 +10,25 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; +import java.util.UUID; + /** - * * @author fireshoes */ public final class HammerheadShark extends CardImpl { public HammerheadShark(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); - this.subtype.add(SubType.FISH); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}"); + this.subtype.add(SubType.SHARK); + this.power = new MageInt(2); this.toughness = new MageInt(3); // Hammerhead Shark can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); } - public HammerheadShark(final HammerheadShark card) { + private HammerheadShark(final HammerheadShark card) { super(card); } diff --git a/Mage.Sets/src/mage/cards/s/Shambleshark.java b/Mage.Sets/src/mage/cards/s/Shambleshark.java index 5faf34c397..c9d8c07414 100644 --- a/Mage.Sets/src/mage/cards/s/Shambleshark.java +++ b/Mage.Sets/src/mage/cards/s/Shambleshark.java @@ -1,7 +1,5 @@ - package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.EvolveAbility; import mage.abilities.keyword.FlashAbility; @@ -10,15 +8,16 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class Shambleshark extends CardImpl { public Shambleshark(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}{U}"); - this.subtype.add(SubType.FISH); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{G}{U}"); + this.subtype.add(SubType.SHARK); this.subtype.add(SubType.CRAB); this.power = new MageInt(2); @@ -30,7 +29,7 @@ public final class Shambleshark extends CardImpl { this.addAbility(new EvolveAbility()); } - public Shambleshark(final Shambleshark card) { + private Shambleshark(final Shambleshark card) { super(card); } diff --git a/Mage.Sets/src/mage/cards/s/Sharktocrab.java b/Mage.Sets/src/mage/cards/s/Sharktocrab.java index 64c91d73a1..d094f4f2dc 100644 --- a/Mage.Sets/src/mage/cards/s/Sharktocrab.java +++ b/Mage.Sets/src/mage/cards/s/Sharktocrab.java @@ -22,7 +22,7 @@ public final class Sharktocrab extends CardImpl { public Sharktocrab(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{U}"); - this.subtype.add(SubType.FISH); + this.subtype.add(SubType.SHARK); this.subtype.add(SubType.OCTOPUS); this.subtype.add(SubType.CRAB); this.power = new MageInt(4); diff --git a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java index 5a3c16a2c3..913eb29ac9 100644 --- a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java +++ b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java @@ -121,6 +121,11 @@ public class VerifyCardDataTest { // subtype skipListCreate(SKIP_LIST_SUBTYPE); skipListAddName(SKIP_LIST_SUBTYPE, "UGL", "Miss Demeanor"); + // the following are temporary + skipListAddName(SKIP_LIST_SUBTYPE, "THB", "Dryad of the Ilysian Grove"); + skipListAddName(SKIP_LIST_SUBTYPE, "UGL", "Chicken a la King"); + subtypesToIgnore.add("Shark"); + subtypesToIgnore.add("Fish"); // number skipListCreate(SKIP_LIST_NUMBER);