From baffa65bb593078fdc32a5ee6e223f4e9f9a559e Mon Sep 17 00:00:00 2001
From: Ada Joule <ada.fulmina@gmail.com>
Date: Sat, 14 Apr 2018 10:48:20 +0700
Subject: [PATCH] Correct target filter in Scrap Trawler (#1556)

* Correct target filter in Scrap Trawler

* Revert "Correct target filter in Scrap Trawler"

This reverts commit e6f2575c3a1903ba1db701bba906d393d98bf237.

* Add cmcLT to MagicCardFilterImpl and Scrap Trawler
---
 release/Magarena/scripts/Scrap_Trawler.groovy   | 2 +-
 src/magic/model/target/MagicCardFilterImpl.java | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/release/Magarena/scripts/Scrap_Trawler.groovy b/release/Magarena/scripts/Scrap_Trawler.groovy
index 07d46b94e2..6755a8836c 100644
--- a/release/Magarena/scripts/Scrap_Trawler.groovy
+++ b/release/Magarena/scripts/Scrap_Trawler.groovy
@@ -10,7 +10,7 @@
             return new MagicEvent(
                 permanent,
                 new MagicTargetChoice(
-                    card(MagicType.Artifact).cmcLEQ(cmc).from(MagicTargetType.Graveyard),
+                    card(MagicType.Artifact).cmcLT(cmc).from(MagicTargetType.Graveyard),
                     "target artifact card in your graveyard with converted mana cost less than ${cmc}"
                 ),
                 this,
diff --git a/src/magic/model/target/MagicCardFilterImpl.java b/src/magic/model/target/MagicCardFilterImpl.java
index 0aed7e77c8..34adee49e6 100644
--- a/src/magic/model/target/MagicCardFilterImpl.java
+++ b/src/magic/model/target/MagicCardFilterImpl.java
@@ -193,6 +193,15 @@ public abstract class MagicCardFilterImpl implements MagicTargetFilter<MagicCard
             }
         };
     }
+    public MagicCardFilterImpl cmcLT(final int n) {
+        final MagicCardFilterImpl curr = this;
+        return new MagicCardFilterImpl() {
+            @Override
+            public boolean accept(final MagicSource source,final MagicPlayer player,final MagicCard target) {
+                return curr.accept(source, player, target) && target.getConvertedCost() < n;
+            }
+        };
+    }
 
     /**
      * @param n power limit