From 262d048893f4ae72df6f93e509d8cf1afc7a9e45 Mon Sep 17 00:00:00 2001
From: Noah Gleason <noah.gleason1@gmail.com>
Date: Mon, 18 Jun 2018 14:23:43 -0400
Subject: [PATCH 1/2] Implement Searing Rays

---
 Mage.Sets/src/mage/cards/s/SearingRays.java | 79 +++++++++++++++++++++
 Mage.Sets/src/mage/sets/Invasion.java       |  1 +
 2 files changed, 80 insertions(+)
 create mode 100644 Mage.Sets/src/mage/cards/s/SearingRays.java

diff --git a/Mage.Sets/src/mage/cards/s/SearingRays.java b/Mage.Sets/src/mage/cards/s/SearingRays.java
new file mode 100644
index 00000000000..fdfae131579
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/s/SearingRays.java
@@ -0,0 +1,79 @@
+package mage.cards.s;
+
+import java.util.UUID;
+
+import mage.abilities.Ability;
+import mage.abilities.effects.OneShotEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.choices.ChoiceColor;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.filter.FilterPermanent;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.mageobject.ColorPredicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+
+/**
+ *
+ * @author noahg
+ */
+public final class SearingRays extends CardImpl {
+
+    public SearingRays(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{R}");
+
+
+        // Choose a color. Searing Rays deals damage to each player equal to the number of creatures of that color that player controls.
+        this.getSpellAbility().addEffect(new SearingRaysEffect());
+    }
+
+    public SearingRays(final SearingRays card) {
+        super(card);
+    }
+
+    @Override
+    public SearingRays copy() {
+        return new SearingRays(this);
+    }
+}
+
+class SearingRaysEffect extends OneShotEffect {
+
+    public SearingRaysEffect() {
+        super(Outcome.Damage);
+        this.staticText = "Choose a color. {this} deals damage to each player equal to the number of creatures of that color that player controls";
+    }
+
+    public SearingRaysEffect(final SearingRaysEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public SearingRaysEffect copy() {
+        return new SearingRaysEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player controller = game.getPlayer(source.getControllerId());
+        ChoiceColor choice = new ChoiceColor();
+        if (controller != null && controller.choose(outcome, choice, game)) {
+            FilterCreaturePermanent filter = new FilterCreaturePermanent(choice.getColor().getDescription()+" creatures");
+            filter.add(new ColorPredicate(choice.getColor()));
+            for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) {
+                int amount = game.getBattlefield().countAll(filter , playerId, game);
+                if (amount > 0) {
+                    Player player = game.getPlayer(playerId);
+                    if (player != null) {
+                        player.damage(amount, source.getSourceId(), game, false, true);
+                    }
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/Invasion.java b/Mage.Sets/src/mage/sets/Invasion.java
index b69da56388a..1287c0530c9 100644
--- a/Mage.Sets/src/mage/sets/Invasion.java
+++ b/Mage.Sets/src/mage/sets/Invasion.java
@@ -253,6 +253,7 @@ public final class Invasion extends ExpansionSet {
         cards.add(new SetCardInfo("Scavenged Weaponry", 123, Rarity.COMMON, mage.cards.s.ScavengedWeaponry.class));
         cards.add(new SetCardInfo("Scorching Lava", 164, Rarity.COMMON, mage.cards.s.ScorchingLava.class));
         cards.add(new SetCardInfo("Scouting Trek", 210, Rarity.UNCOMMON, mage.cards.s.ScoutingTrek.class));
+        cards.add(new SetCardInfo("Searing Rays", 165, Rarity.UNCOMMON, mage.cards.s.SearingRays.class));
         cards.add(new SetCardInfo("Seashell Cameo", 311, Rarity.UNCOMMON, mage.cards.s.SeashellCameo.class));
         cards.add(new SetCardInfo("Seer's Vision", 270, Rarity.UNCOMMON, mage.cards.s.SeersVision.class));
         cards.add(new SetCardInfo("Serpentine Kavu", 211, Rarity.COMMON, mage.cards.s.SerpentineKavu.class));

From 4c73c9386603419de8180f8c0fe221024c68988d Mon Sep 17 00:00:00 2001
From: Noah Gleason <noah.gleason1@gmail.com>
Date: Tue, 19 Jun 2018 18:59:16 -0400
Subject: [PATCH 2/2] Check if choice.getColor() is null

---
 Mage.Sets/src/mage/cards/s/SearingRays.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mage.Sets/src/mage/cards/s/SearingRays.java b/Mage.Sets/src/mage/cards/s/SearingRays.java
index fdfae131579..bbd65ef0e15 100644
--- a/Mage.Sets/src/mage/cards/s/SearingRays.java
+++ b/Mage.Sets/src/mage/cards/s/SearingRays.java
@@ -60,7 +60,7 @@ class SearingRaysEffect extends OneShotEffect {
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         ChoiceColor choice = new ChoiceColor();
-        if (controller != null && controller.choose(outcome, choice, game)) {
+        if (controller != null && controller.choose(outcome, choice, game) && choice.getColor() != null) {
             FilterCreaturePermanent filter = new FilterCreaturePermanent(choice.getColor().getDescription()+" creatures");
             filter.add(new ColorPredicate(choice.getColor()));
             for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) {