diff --git a/Mage.Sets/src/mage/cards/a/AboshanCephalidEmperor.java b/Mage.Sets/src/mage/cards/a/AboshanCephalidEmperor.java index cd8d329932a..77db4bb68d8 100644 --- a/Mage.Sets/src/mage/cards/a/AboshanCephalidEmperor.java +++ b/Mage.Sets/src/mage/cards/a/AboshanCephalidEmperor.java @@ -28,23 +28,23 @@ import java.util.UUID; */ public final class AboshanCephalidEmperor extends CardImpl { - static final FilterControlledPermanent filter1 = new FilterControlledPermanent("untapped Cephalid you control"); + static final FilterControlledPermanent filter1 = new FilterControlledPermanent("untapped Octopus you control"); static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("creatures without flying"); static { - filter1.add(SubType.CEPHALID.getPredicate()); + filter1.add(SubType.OCTOPUS.getPredicate()); filter2.add(Predicates.not(new AbilityPredicate(FlyingAbility.class))); } public AboshanCephalidEmperor(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{U}{U}"); this.supertype.add(SuperType.LEGENDARY); - this.subtype.add(SubType.CEPHALID, SubType.NOBLE); + this.subtype.add(SubType.OCTOPUS, SubType.NOBLE); this.power = new MageInt(3); this.toughness = new MageInt(3); - // Tap an untapped Cephalid you control: Tap target permanent. + // Tap an untapped Octopus you control: Tap target permanent. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapTargetCost(new TargetControlledPermanent(1, filter1))); ability.addTarget(new TargetPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BackstreetBruiser.java b/Mage.Sets/src/mage/cards/b/BackstreetBruiser.java index 80419d64518..afc87b0a984 100644 --- a/Mage.Sets/src/mage/cards/b/BackstreetBruiser.java +++ b/Mage.Sets/src/mage/cards/b/BackstreetBruiser.java @@ -27,7 +27,7 @@ public final class BackstreetBruiser extends CardImpl { public BackstreetBruiser(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}"); - this.subtype.add(SubType.CEPHALID); + this.subtype.add(SubType.OCTOPUS); this.subtype.add(SubType.ROGUE); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/b/BorGullet.java b/Mage.Sets/src/mage/cards/b/BorGullet.java index f3c38ec704f..42921443b25 100644 --- a/Mage.Sets/src/mage/cards/b/BorGullet.java +++ b/Mage.Sets/src/mage/cards/b/BorGullet.java @@ -21,7 +21,7 @@ public final class BorGullet extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}{B}"); this.subtype.add(SubType.HORROR); - this.subtype.add(SubType.CEPHALID); + this.subtype.add(SubType.OCTOPUS); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/c/CallousOppressor.java b/Mage.Sets/src/mage/cards/c/CallousOppressor.java index 19cb217790d..d15b79ac90f 100644 --- a/Mage.Sets/src/mage/cards/c/CallousOppressor.java +++ b/Mage.Sets/src/mage/cards/c/CallousOppressor.java @@ -34,7 +34,7 @@ public final class CallousOppressor extends CardImpl { public CallousOppressor(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}{U}"); - this.subtype.add(SubType.CEPHALID); + this.subtype.add(SubType.OCTOPUS); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/c/CephalidAristocrat.java b/Mage.Sets/src/mage/cards/c/CephalidAristocrat.java index e3ada73de32..7fd28e866cb 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidAristocrat.java +++ b/Mage.Sets/src/mage/cards/c/CephalidAristocrat.java @@ -17,7 +17,7 @@ public final class CephalidAristocrat extends CardImpl { public CephalidAristocrat(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{U}"); - this.subtype.add(SubType.CEPHALID, SubType.NOBLE); + this.subtype.add(SubType.OCTOPUS, SubType.NOBLE); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/c/CephalidBroker.java b/Mage.Sets/src/mage/cards/c/CephalidBroker.java index 87f993d1ae5..45579c298b7 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidBroker.java +++ b/Mage.Sets/src/mage/cards/c/CephalidBroker.java @@ -23,7 +23,7 @@ public final class CephalidBroker extends CardImpl { public CephalidBroker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}"); - this.subtype.add(SubType.CEPHALID); + this.subtype.add(SubType.OCTOPUS); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/c/CephalidConstable.java b/Mage.Sets/src/mage/cards/c/CephalidConstable.java index 8177dbc350a..9db209551d5 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidConstable.java +++ b/Mage.Sets/src/mage/cards/c/CephalidConstable.java @@ -27,7 +27,7 @@ public final class CephalidConstable extends CardImpl { public CephalidConstable(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{U}"); - this.subtype.add(SubType.CEPHALID); + this.subtype.add(SubType.OCTOPUS); this.subtype.add(SubType.WIZARD); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/c/CephalidFacetaker.java b/Mage.Sets/src/mage/cards/c/CephalidFacetaker.java index d04e0026606..c31eb1c4d3d 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidFacetaker.java +++ b/Mage.Sets/src/mage/cards/c/CephalidFacetaker.java @@ -27,7 +27,7 @@ public final class CephalidFacetaker extends CardImpl { public CephalidFacetaker(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}"); - this.subtype.add(SubType.CEPHALID); + this.subtype.add(SubType.OCTOPUS); this.subtype.add(SubType.ROGUE); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/c/CephalidIllusionist.java b/Mage.Sets/src/mage/cards/c/CephalidIllusionist.java index 966d3f3fa40..3bbeca35460 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidIllusionist.java +++ b/Mage.Sets/src/mage/cards/c/CephalidIllusionist.java @@ -28,7 +28,7 @@ public final class CephalidIllusionist extends CardImpl { public CephalidIllusionist(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); - this.subtype.add(SubType.CEPHALID); + this.subtype.add(SubType.OCTOPUS); this.subtype.add(SubType.WIZARD); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/c/CephalidInkshrouder.java b/Mage.Sets/src/mage/cards/c/CephalidInkshrouder.java index e01b5375fd8..61c22ccf431 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidInkshrouder.java +++ b/Mage.Sets/src/mage/cards/c/CephalidInkshrouder.java @@ -24,7 +24,7 @@ public final class CephalidInkshrouder extends CardImpl { public CephalidInkshrouder(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}"); - this.subtype.add(SubType.CEPHALID); + this.subtype.add(SubType.OCTOPUS); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/c/CephalidLooter.java b/Mage.Sets/src/mage/cards/c/CephalidLooter.java index 1b0166f39a6..433f47b813b 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidLooter.java +++ b/Mage.Sets/src/mage/cards/c/CephalidLooter.java @@ -20,7 +20,7 @@ public final class CephalidLooter extends CardImpl { public CephalidLooter(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}"); - this.subtype.add(SubType.CEPHALID); + this.subtype.add(SubType.OCTOPUS); this.subtype.add(SubType.ROGUE); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/c/CephalidPathmage.java b/Mage.Sets/src/mage/cards/c/CephalidPathmage.java index 5243f268897..5147283c11b 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidPathmage.java +++ b/Mage.Sets/src/mage/cards/c/CephalidPathmage.java @@ -23,7 +23,7 @@ public final class CephalidPathmage extends CardImpl { public CephalidPathmage(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}"); - this.subtype.add(SubType.CEPHALID); + this.subtype.add(SubType.OCTOPUS); this.subtype.add(SubType.WIZARD); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/c/CephalidRetainer.java b/Mage.Sets/src/mage/cards/c/CephalidRetainer.java index 11331f7b845..ff87b6306c3 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidRetainer.java +++ b/Mage.Sets/src/mage/cards/c/CephalidRetainer.java @@ -32,7 +32,7 @@ public final class CephalidRetainer extends CardImpl { public CephalidRetainer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}"); - this.subtype.add(SubType.CEPHALID); + this.subtype.add(SubType.OCTOPUS); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/c/CephalidSage.java b/Mage.Sets/src/mage/cards/c/CephalidSage.java index a2cb64737b6..9a76c7c2c48 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidSage.java +++ b/Mage.Sets/src/mage/cards/c/CephalidSage.java @@ -25,7 +25,7 @@ public final class CephalidSage extends CardImpl { public CephalidSage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}"); - this.subtype.add(SubType.CEPHALID); + this.subtype.add(SubType.OCTOPUS); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/c/CephalidScout.java b/Mage.Sets/src/mage/cards/c/CephalidScout.java index 167116741d1..2cb46ac9243 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidScout.java +++ b/Mage.Sets/src/mage/cards/c/CephalidScout.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.StaticFilters; -import mage.target.common.TargetControlledPermanent; /** * @@ -25,7 +24,7 @@ public final class CephalidScout extends CardImpl { public CephalidScout(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); - this.subtype.add(SubType.CEPHALID); + this.subtype.add(SubType.OCTOPUS); this.subtype.add(SubType.WIZARD); this.subtype.add(SubType.SCOUT); diff --git a/Mage.Sets/src/mage/cards/c/CephalidSnitch.java b/Mage.Sets/src/mage/cards/c/CephalidSnitch.java index 334b8a8c050..29750705037 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidSnitch.java +++ b/Mage.Sets/src/mage/cards/c/CephalidSnitch.java @@ -28,7 +28,7 @@ public final class CephalidSnitch extends CardImpl { public CephalidSnitch(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); - this.subtype.add(SubType.CEPHALID); + this.subtype.add(SubType.OCTOPUS); this.subtype.add(SubType.WIZARD); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/c/CephalidVandal.java b/Mage.Sets/src/mage/cards/c/CephalidVandal.java index eb90bea7afa..dffa2719ab8 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidVandal.java +++ b/Mage.Sets/src/mage/cards/c/CephalidVandal.java @@ -27,7 +27,7 @@ public final class CephalidVandal extends CardImpl { public CephalidVandal(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); - this.subtype.add(SubType.CEPHALID); + this.subtype.add(SubType.OCTOPUS); this.subtype.add(SubType.ROGUE); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/f/FreejamRegent.java b/Mage.Sets/src/mage/cards/f/FreejamRegent.java index 3f2fb0e2036..ddac7e7b00f 100644 --- a/Mage.Sets/src/mage/cards/f/FreejamRegent.java +++ b/Mage.Sets/src/mage/cards/f/FreejamRegent.java @@ -1,7 +1,5 @@ - package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -11,9 +9,10 @@ import mage.abilities.keyword.ImproviseAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Duration; -import mage.constants.Zone; +import mage.constants.SubType; + +import java.util.UUID; /** * @author JRHerlehy @@ -23,7 +22,7 @@ public final class FreejamRegent extends CardImpl { public FreejamRegent(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{R}{R}"); - this.subtype.add(SubType.DRAGON); + this.subtype.add(SubType.CAT, SubType.DRAGON); this.power = new MageInt(4); this.toughness = new MageInt(4); @@ -34,8 +33,9 @@ public final class FreejamRegent extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {1}{R}: Freejam Regent gets +2/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, - new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility( + new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}") + )); } private FreejamRegent(final FreejamRegent card) { diff --git a/Mage.Sets/src/mage/cards/k/KamizObscuraOculus.java b/Mage.Sets/src/mage/cards/k/KamizObscuraOculus.java index 1d4b6f9d551..4e8ae17b404 100644 --- a/Mage.Sets/src/mage/cards/k/KamizObscuraOculus.java +++ b/Mage.Sets/src/mage/cards/k/KamizObscuraOculus.java @@ -33,7 +33,7 @@ public final class KamizObscuraOculus extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}{U}{B}"); this.supertype.add(SuperType.LEGENDARY); - this.subtype.add(SubType.CEPHALID, SubType.ROGUE); + this.subtype.add(SubType.OCTOPUS, SubType.ROGUE); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/l/LlawanCephalidEmpress.java b/Mage.Sets/src/mage/cards/l/LlawanCephalidEmpress.java index 523e9185695..28135200652 100644 --- a/Mage.Sets/src/mage/cards/l/LlawanCephalidEmpress.java +++ b/Mage.Sets/src/mage/cards/l/LlawanCephalidEmpress.java @@ -38,7 +38,7 @@ public final class LlawanCephalidEmpress extends CardImpl { public LlawanCephalidEmpress(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}"); this.supertype.add(SuperType.LEGENDARY); - this.subtype.add(SubType.CEPHALID, SubType.NOBLE); + this.subtype.add(SubType.OCTOPUS, SubType.NOBLE); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/o/ObscuraInterceptor.java b/Mage.Sets/src/mage/cards/o/ObscuraInterceptor.java index 196dbed2823..773c1c6f240 100644 --- a/Mage.Sets/src/mage/cards/o/ObscuraInterceptor.java +++ b/Mage.Sets/src/mage/cards/o/ObscuraInterceptor.java @@ -24,7 +24,7 @@ public final class ObscuraInterceptor extends CardImpl { public ObscuraInterceptor(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}{U}{B}"); - this.subtype.add(SubType.CEPHALID); + this.subtype.add(SubType.OCTOPUS); this.subtype.add(SubType.WIZARD); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/o/OmenHawker.java b/Mage.Sets/src/mage/cards/o/OmenHawker.java index c8b2e51f138..41f0a7f71e2 100644 --- a/Mage.Sets/src/mage/cards/o/OmenHawker.java +++ b/Mage.Sets/src/mage/cards/o/OmenHawker.java @@ -25,7 +25,7 @@ public final class OmenHawker extends CardImpl { public OmenHawker(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{U}"); - this.subtype.add(SubType.CEPHALID); + this.subtype.add(SubType.OCTOPUS); this.subtype.add(SubType.ADVISOR); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/p/PsychicPickpocket.java b/Mage.Sets/src/mage/cards/p/PsychicPickpocket.java index 7f04184474c..cb95afe1f27 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicPickpocket.java +++ b/Mage.Sets/src/mage/cards/p/PsychicPickpocket.java @@ -21,7 +21,7 @@ public final class PsychicPickpocket extends CardImpl { public PsychicPickpocket(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{U}"); - this.subtype.add(SubType.CEPHALID); + this.subtype.add(SubType.OCTOPUS); this.subtype.add(SubType.ROGUE); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/q/QuezaAugurOfAgonies.java b/Mage.Sets/src/mage/cards/q/QuezaAugurOfAgonies.java index eba630b521c..be280d9a797 100644 --- a/Mage.Sets/src/mage/cards/q/QuezaAugurOfAgonies.java +++ b/Mage.Sets/src/mage/cards/q/QuezaAugurOfAgonies.java @@ -23,7 +23,7 @@ public final class QuezaAugurOfAgonies extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}{U}{B}"); this.supertype.add(SuperType.LEGENDARY); - this.subtype.add(SubType.CEPHALID); + this.subtype.add(SubType.OCTOPUS); this.subtype.add(SubType.ADVISOR); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/r/RevelRuiner.java b/Mage.Sets/src/mage/cards/r/RevelRuiner.java index 8e1e2109b80..e90847af564 100644 --- a/Mage.Sets/src/mage/cards/r/RevelRuiner.java +++ b/Mage.Sets/src/mage/cards/r/RevelRuiner.java @@ -19,7 +19,7 @@ public final class RevelRuiner extends CardImpl { public RevelRuiner(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}"); - this.subtype.add(SubType.CEPHALID); + this.subtype.add(SubType.OCTOPUS); this.subtype.add(SubType.ROGUE); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/s/ShieldBroker.java b/Mage.Sets/src/mage/cards/s/ShieldBroker.java index 5d2b4e380ed..57327cfb91b 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldBroker.java +++ b/Mage.Sets/src/mage/cards/s/ShieldBroker.java @@ -17,7 +17,6 @@ import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CommanderPredicate; -import mage.game.Game; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -36,7 +35,7 @@ public class ShieldBroker extends CardImpl { public ShieldBroker(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}{U}"); - this.addSubType(SubType.CEPHALID, SubType.ADVISOR); + this.addSubType(SubType.OCTOPUS, SubType.ADVISOR); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/s/SkyshipStalker.java b/Mage.Sets/src/mage/cards/s/SkyshipStalker.java index 3c8b29d3169..6a28d194d86 100644 --- a/Mage.Sets/src/mage/cards/s/SkyshipStalker.java +++ b/Mage.Sets/src/mage/cards/s/SkyshipStalker.java @@ -1,7 +1,5 @@ - package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -13,19 +11,19 @@ import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Duration; -import mage.constants.Zone; +import mage.constants.SubType; + +import java.util.UUID; /** - * * @author fireshoes */ public final class SkyshipStalker extends CardImpl { public SkyshipStalker(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}"); - this.subtype.add(SubType.DRAGON); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}{R}"); + this.subtype.add(SubType.CAT, SubType.DRAGON); this.power = new MageInt(3); this.toughness = new MageInt(3); @@ -33,13 +31,19 @@ public final class SkyshipStalker extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {R}: Skyship Stalker gains +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect( + 1, 0, Duration.EndOfTurn + ), new ManaCostsImpl<>("{R}"))); // {R}: Skyship Stalker gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect( + FirstStrikeAbility.getInstance(), Duration.EndOfTurn + ), new ManaCostsImpl<>("{R}"))); // {R}: Skyship Stalker gains haste until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect( + HasteAbility.getInstance(), Duration.EndOfTurn + ), new ManaCostsImpl<>("{R}"))); } private SkyshipStalker(final SkyshipStalker card) { diff --git a/Mage/src/main/java/mage/constants/SubType.java b/Mage/src/main/java/mage/constants/SubType.java index 83ac3877a4f..1f4a6d5181c 100644 --- a/Mage/src/main/java/mage/constants/SubType.java +++ b/Mage/src/main/java/mage/constants/SubType.java @@ -118,7 +118,6 @@ public enum SubType { CARRIER("Carrier", SubTypeSet.CreatureType), CAT("Cat", SubTypeSet.CreatureType), CENTAUR("Centaur", SubTypeSet.CreatureType), - CEPHALID("Cephalid", SubTypeSet.CreatureType), CEREAN("Cerean", SubTypeSet.CreatureType, true), // Star Wars CHIMERA("Chimera", SubTypeSet.CreatureType), CHISS("Chiss", SubTypeSet.CreatureType, true),