[EOC] Implement Solar Array

Mage.Sets/src/mage/cards/l/LuxArtillery.java

@@ -1,20 +1,18 @@
 package mage.cards.l;
 
 import mage.abilities.Ability;
-import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility;
 import mage.abilities.common.SpellCastControllerTriggeredAbility;
 import mage.abilities.condition.Condition;
 import mage.abilities.effects.ContinuousEffectImpl;
 import mage.abilities.effects.common.DamagePlayersEffect;
 import mage.abilities.keyword.SunburstAbility;
-import mage.cards.Card;
+import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
-import mage.counters.Counter;
+import mage.counters.Counters;
-import mage.filter.FilterPermanent;
 import mage.filter.FilterSpell;
-import mage.filter.predicate.Predicates;
+import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.game.stack.Spell;
@@ -37,11 +35,14 @@ public final class LuxArtillery extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}");
 
         // Whenever you cast an artifact creature spell, it gains sunburst.
-        this.addAbility(new SpellCastControllerTriggeredAbility(new LuxArtilleryEffect(this), filter, false, SetTargetPointer.SPELL));
+        this.addAbility(new SpellCastControllerTriggeredAbility(
+                new LuxArtilleryEffect(), filter, false, SetTargetPointer.SPELL
+        ));
 
         // At the beginning of your end step, if there are thirty or more counters among artifacts and creatures you control, Lux Artillery deals 10 damage to each opponent.
-        this.addAbility(new BeginningOfEndStepTriggeredAbility(new DamagePlayersEffect(10, TargetController.OPPONENT))
+        this.addAbility(new BeginningOfEndStepTriggeredAbility(
-                .withInterveningIf(LuxArtilleryCondition.instance));
+                new DamagePlayersEffect(10, TargetController.OPPONENT)
+        ).withInterveningIf(LuxArtilleryCondition.instance));
     }
 
     private LuxArtillery(final LuxArtillery card) {
@@ -56,21 +57,18 @@ public final class LuxArtillery extends CardImpl {
 
 class LuxArtilleryEffect extends ContinuousEffectImpl {
 
-    private final Ability ability;
-    private int zoneChangeCounter;
     private UUID permanentId;
+    private int zoneChangeCounter;
 
-    LuxArtilleryEffect(Card card) {
+    LuxArtilleryEffect() {
         super(Duration.OneUse, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility);
         staticText = "it gains sunburst. <i>(It enters the battlefield with a +1/+1 counter on it for each color of mana spent to cast it.)</i>";
-        ability = new SunburstAbility(card);
     }
 
     private LuxArtilleryEffect(final LuxArtilleryEffect effect) {
         super(effect);
-        this.ability = effect.ability.copy();
-        this.zoneChangeCounter = effect.zoneChangeCounter;
         this.permanentId = effect.permanentId;
+        this.zoneChangeCounter = effect.zoneChangeCounter;
     }
 
     @Override
@@ -81,26 +79,27 @@ class LuxArtilleryEffect extends ContinuousEffectImpl {
     @Override
     public void init(Ability source, Game game) {
         super.init(source, game);
-        Spell object = game.getStack().getSpell(getTargetPointer().getFirst(game, source));
+        Spell object = game.getSpell(getTargetPointer().getFirst(game, source));
         if (object != null) {
-            zoneChangeCounter = game.getState().getZoneChangeCounter(object.getSourceId()) + 1;
             permanentId = object.getSourceId();
+            zoneChangeCounter = game.getState().getZoneChangeCounter(object.getSourceId()) + 1;
         }
     }
 
     @Override
     public boolean apply(Game game, Ability source) {
+        if (game.getState().getZoneChangeCounter(permanentId) >= zoneChangeCounter) {
+            discard();
+            return false;
+        }
         Permanent permanent = game.getPermanent(permanentId);
         if (permanent != null && permanent.getZoneChangeCounter(game) <= zoneChangeCounter) {
             permanent.addAbility(new SunburstAbility(permanent), source.getSourceId(), game);
-        } else {
+            return true;
-            if (game.getState().getZoneChangeCounter(permanentId) >= zoneChangeCounter) {
-                discard();
         }
         Spell spell = game.getStack().getSpell(getTargetPointer().getFirst(game, source));
         if (spell != null) {
-                game.getState().addOtherAbility(spell.getCard(), ability, true);
+            game.getState().addOtherAbility(spell.getCard(), new SunburstAbility(spell), true);
-            }
         }
         return true;
     }
@@ -109,25 +108,18 @@ class LuxArtilleryEffect extends ContinuousEffectImpl {
 enum LuxArtilleryCondition implements Condition {
     instance;
 
-    private static final FilterPermanent filter = new FilterPermanent("artifacts and creatures you control");
-
-    static {
-        filter.add(Predicates.or(CardType.ARTIFACT.getPredicate(), CardType.CREATURE.getPredicate()));
-        filter.add(TargetController.YOU.getControllerPredicate());
-    }
-
     @Override
     public boolean apply(Game game, Ability source) {
-        int totalCounters = 0;
+        return game
-        for (Permanent permanent : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source, game)) {
+                .getBattlefield()
-            if (permanent == null) {
+                .getActivePermanents(
-                continue;
+                        StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT_OR_CREATURE,
-            }
+                        source.getControllerId(), source, game
-            for (Counter counter : permanent.getCounters(game).values()) {
+                )
-                totalCounters += counter.getCount();
+                .stream()
-            }
+                .map(permanent -> permanent.getCounters(game))
-        }
+                .mapToInt(Counters::getTotalCount)
-        return totalCounters >= 30;
+                .sum() >= 30;
     }
 
     @Override

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

@@ -0,0 +1,95 @@
+package mage.cards.s;
+
+import mage.abilities.Ability;
+import mage.abilities.common.delayed.CopyNextSpellDelayedTriggeredAbility;
+import mage.abilities.effects.ContinuousEffectImpl;
+import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect;
+import mage.abilities.keyword.SunburstAbility;
+import mage.abilities.mana.AnyColorManaAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.*;
+import mage.filter.StaticFilters;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.game.stack.Spell;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801, PurpleCrowbar
+ */
+public final class SolarArray extends CardImpl {
+
+    public SolarArray(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}");
+
+        // {T}: Add one mana of any color. When you next cast an artifact spell this turn, that spell gains sunburst.
+        AnyColorManaAbility ability = new AnyColorManaAbility();
+        ability.addEffect(new CreateDelayedTriggeredAbilityEffect(new CopyNextSpellDelayedTriggeredAbility(
+                StaticFilters.FILTER_SPELL_AN_ARTIFACT, new SolarArrayEffect(),
+                "When you next cast an artifact spell this turn, that spell gains sunburst."
+        )));
+        ability.setUndoPossible(false);
+        this.addAbility(ability);
+    }
+
+    private SolarArray(final SolarArray card) {
+        super(card);
+    }
+
+    @Override
+    public SolarArray copy() {
+        return new SolarArray(this);
+    }
+}
+
+class SolarArrayEffect extends ContinuousEffectImpl {
+
+    private UUID permanentId;
+    private int zoneChangeCounter;
+
+    SolarArrayEffect() {
+        super(Duration.OneUse, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility);
+        staticText = "that spell gains sunburst";
+    }
+
+    private SolarArrayEffect(final SolarArrayEffect effect) {
+        super(effect);
+        this.permanentId = effect.permanentId;
+        this.zoneChangeCounter = effect.zoneChangeCounter;
+    }
+
+    @Override
+    public SolarArrayEffect copy() {
+        return new SolarArrayEffect(this);
+    }
+
+    @Override
+    public void init(Ability source, Game game) {
+        super.init(source, game);
+        Spell object = game.getSpell(getTargetPointer().getFirst(game, source));
+        if (object != null) {
+            permanentId = object.getSourceId();
+            zoneChangeCounter = game.getState().getZoneChangeCounter(object.getSourceId()) + 1;
+        }
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        if (game.getState().getZoneChangeCounter(permanentId) >= zoneChangeCounter) {
+            discard();
+            return false;
+        }
+        Permanent permanent = game.getPermanent(permanentId);
+        if (permanent != null && permanent.getZoneChangeCounter(game) <= zoneChangeCounter) {
+            permanent.addAbility(new SunburstAbility(permanent), source.getSourceId(), game);
+            return true;
+        }
+        Spell spell = game.getStack().getSpell(getTargetPointer().getFirst(game, source));
+        if (spell != null) {
+            game.getState().addOtherAbility(spell.getCard(), new SunburstAbility(spell), true);
+        }
+        return true;
+    }
+}

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

@@ -165,6 +165,8 @@ public final class EdgeOfEternitiesCommander extends ExpansionSet {
         cards.add(new SetCardInfo("Skyshroud Claim", 107, Rarity.COMMON, mage.cards.s.SkyshroudClaim.class));
         cards.add(new SetCardInfo("Smoldering Marsh", 182, Rarity.RARE, mage.cards.s.SmolderingMarsh.class));
         cards.add(new SetCardInfo("Sol Ring", 57, Rarity.UNCOMMON, mage.cards.s.SolRing.class));
+        cards.add(new SetCardInfo("Solar Array", 18, Rarity.RARE, mage.cards.s.SolarArray.class, NON_FULL_USE_VARIOUS));
+        cards.add(new SetCardInfo("Solar Array", 38, Rarity.RARE, mage.cards.s.SolarArray.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Soul of Windgrace", 126, Rarity.MYTHIC, mage.cards.s.SoulOfWindgrace.class));
         cards.add(new SetCardInfo("Soul-Guide Lantern", 143, Rarity.UNCOMMON, mage.cards.s.SoulGuideLantern.class));
         cards.add(new SetCardInfo("Spire of Industry", 183, Rarity.RARE, mage.cards.s.SpireOfIndustry.class));