- Updated the quest deck Riddler 4 and improved AI handling of Guilty Conscience.

res/quest/duels/Riddler 4.dck

@@ -10,18 +10,24 @@ Deck Type=constructed
 4 Arid Mesa
 4 Plateau
 4 Windswept Heath
-3 Scalding Tarn
+3 Flooded Strand
-6 Plains|M11
+1 Plains|M11
 1 Mountain|M11
+1 Mox Emerald
+1 Mox Sapphire
+1 Mox Jet
+1 Mox Ruby
+1 Mox Pearl
+4 Boros Reckoner
 4 Spitemare
-4 Swans of Bryn Argoll
+2 Swans of Bryn Argoll
 4 Stuffy Doll
-4 Wall of Hope
+2 Wall of Hope
 4 Guilty Conscience
 4 Pyroclasm
 4 Volcanic Fallout
 2 Tremor
 2 Chain Reaction
-4 Enlightened Tutor
 2 Idyllic Tutor
+4 Blasphemous Act
 [sideboard]

src/main/java/forge/card/ability/ai/AttachAi.java

@@ -395,10 +395,20 @@ public class AttachAi extends SpellAbilityAi {
     private static Card attachAISpecificCardPreference(final SpellAbility sa, final List<Card> list, final boolean mandatory,
             final Card attachSource) {
         // I know this isn't much better than Hardcoding, but some cards need it for now
-        Player ai = sa.getActivatingPlayer();
+        final Player ai = sa.getActivatingPlayer();
         Card chosen = null;
         if ("Guilty Conscience".equals(sa.getSourceCard().getName())) {
-            List<Card> aiStuffies = CardLists.filter(list, Predicates.and(CardPredicates.isController(ai), CardPredicates.nameEquals("Stuffy Doll")));
+            List<Card> aiStuffies = CardLists.filter(list, new Predicate<Card>() {
+                @Override
+                public boolean apply(final Card c) {
+                    // Don't enchant creatures that can survive
+                    if (!c.getController().equals(ai)) {
+                        return false;
+                    }
+                    final String name = c.getName();
+                    return name.equals("Stuffy Doll") || name.equals("Boros Reckoner") || name.equals("Spitemare");
+                }
+            });
             if (!aiStuffies.isEmpty()) {
                 chosen = aiStuffies.get(0);
             } else {
@@ -407,7 +417,7 @@ public class AttachAi extends SpellAbilityAi {
                     @Override
                     public boolean apply(final Card c) {
                         // Don't enchant creatures that can survive
-                        if (!c.canBeDestroyed() || c.getNetCombatDamage() < c.getNetDefense()) {
+                        if (!c.canBeDestroyed() || c.getNetCombatDamage() < c.getNetDefense() || c.isEnchantedBy("Guilty Conscience")) {
                             return false;
                         }
                         return true;