[MSH] Implement Super-Skrull

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

@@ -19,7 +19,7 @@ import mage.constants.SubType;
 import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
-import mage.game.permanent.token.WallToken;
+import mage.game.permanent.token.BasaltGolemToken;
 import mage.players.Player;
 
 /**
@@ -30,7 +30,7 @@ public final class BasaltGolem extends CardImpl {
 
     public BasaltGolem(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{5}");
-        
+
         this.subtype.add(SubType.GOLEM);
         this.power = new MageInt(2);
         this.toughness = new MageInt(4);
@@ -83,6 +83,6 @@ class BasaltGolemEffect extends OneShotEffect {
         if (!creature.sacrifice(source, game))
             return false;
 
-        return new WallToken().putOntoBattlefield(1, game, source, player.getId());
+        return new BasaltGolemToken().putOntoBattlefield(1, game, source, player.getId());
     }
 }

Mage.Sets/src/mage/cards/s/SuperSkrull.java

@@ -0,0 +1,71 @@
+package mage.cards.s;
+
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.DamageTargetEffect;
+import mage.abilities.effects.common.DrawCardTargetEffect;
+import mage.abilities.effects.common.continuous.BoostSourceEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.SubType;
+import mage.constants.SuperType;
+import mage.game.permanent.token.WallColorlessToken;
+import mage.target.TargetPlayer;
+import mage.target.common.TargetCreaturePermanent;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class SuperSkrull extends CardImpl {
+
+    public SuperSkrull(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}{B}{B}");
+
+        this.supertype.add(SuperType.LEGENDARY);
+        this.subtype.add(SubType.SKRULL);
+        this.subtype.add(SubType.SHAPESHIFTER);
+        this.subtype.add(SubType.VILLAIN);
+        this.power = new MageInt(4);
+        this.toughness = new MageInt(5);
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+
+        // {2}{W}: Create a 0/4 colorless Wall creature token with defender.
+        this.addAbility(new SimpleActivatedAbility(
+                new CreateTokenEffect(new WallColorlessToken()), new ManaCostsImpl<>("{2}{W}")
+        ));
+
+        // {3}{G}: Super-Skrull gets +4/+4 until end of turn.
+        this.addAbility(new SimpleActivatedAbility(
+                new BoostSourceEffect(4, 4, Duration.EndOfTurn), new ManaCostsImpl<>("{3}{G}")
+        ));
+
+        // {4}{R}: Super-Skrull deals 4 damage to target creature.
+        Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(4), new ManaCostsImpl<>("{4}{R}"));
+        ability.addTarget(new TargetCreaturePermanent());
+        this.addAbility(ability);
+
+        // {5}{U}: Target player draws four cards.
+        ability = new SimpleActivatedAbility(new DrawCardTargetEffect(4), new ManaCostsImpl<>("{5}{U}"));
+        ability.addTarget(new TargetPlayer());
+        this.addAbility(ability);
+    }
+
+    private SuperSkrull(final SuperSkrull card) {
+        super(card);
+    }
+
+    @Override
+    public SuperSkrull copy() {
+        return new SuperSkrull(this);
+    }
+}

Mage.Sets/src/mage/sets/MarvelSuperHeroes.java

@@ -21,5 +21,6 @@ public final class MarvelSuperHeroes extends ExpansionSet {
         this.hasBasicLands = false; // temporary
 
         cards.add(new SetCardInfo("Quicksilver, Brash Blur", 148, Rarity.RARE, mage.cards.q.QuicksilverBrashBlur.class));
+        cards.add(new SetCardInfo("Super-Skrull", 115, Rarity.RARE, mage.cards.s.SuperSkrull.class));
     }
 }

Mage/src/main/java/mage/constants/SubType.java

@@ -382,6 +382,7 @@ public enum SubType {
     SIREN("Siren", SubTypeSet.CreatureType),
     SITH("Sith", SubTypeSet.CreatureType),
     SKELETON("Skeleton", SubTypeSet.CreatureType),
+    SKRULL("Skrull", SubTypeSet.CreatureType),
     SKUNK("Skunk", SubTypeSet.CreatureType),
     SLITH("Slith", SubTypeSet.CreatureType),
     SLIVER("Sliver", SubTypeSet.CreatureType),

Mage/src/main/java/mage/game/permanent/token/BasaltGolemToken.java

@@ -8,9 +8,9 @@ import mage.constants.SubType;
 /**
  * @author lagdotcom
  */
-public final class WallToken extends TokenImpl {
+public final class BasaltGolemToken extends TokenImpl {
 
-    public WallToken() {
+    public BasaltGolemToken() {
         super("Wall Token", "0/2 colorless Wall artifact creature token with defender");
         cardType.add(CardType.ARTIFACT);
         cardType.add(CardType.CREATURE);
@@ -20,11 +20,11 @@ public final class WallToken extends TokenImpl {
         addAbility(DefenderAbility.getInstance());
     }
 
-    private WallToken(final WallToken token) {
+    private BasaltGolemToken(final BasaltGolemToken token) {
         super(token);
     }
 
-    public WallToken copy() {
+    public BasaltGolemToken copy() {
-        return new WallToken(this);
+        return new BasaltGolemToken(this);
     }
 }

Mage/src/main/java/mage/game/permanent/token/WallColorlessToken.java

@@ -0,0 +1,29 @@
+package mage.game.permanent.token;
+
+import mage.MageInt;
+import mage.abilities.keyword.DefenderAbility;
+import mage.constants.CardType;
+import mage.constants.SubType;
+
+/**
+ * @author TheElk801
+ */
+public final class WallColorlessToken extends TokenImpl {
+
+    public WallColorlessToken() {
+        super("Wall Token", "0/4 colorless Wall creature token with defender");
+        cardType.add(CardType.CREATURE);
+        subtype.add(SubType.WALL);
+        power = new MageInt(0);
+        toughness = new MageInt(4);
+        addAbility(DefenderAbility.getInstance());
+    }
+
+    private WallColorlessToken(final WallColorlessToken token) {
+        super(token);
+    }
+
+    public WallColorlessToken copy() {
+        return new WallColorlessToken(this);
+    }
+}