AI can now use signets!

Author: tehdiplomat

forge-ai/src/main/java/forge/ai/ManaPaymentService.java

@@ -578,7 +578,7 @@ public boolean payManaCost() {
                             paymentList.add(ability);
                             // Remove this multi-mana source from all other shard lists for this payment
                             if (sourcesForShards != null) {
-                                for (ManaCostShard shard : sourcesForShards.keySet()) {
+                                for (ManaCostShard shard : new ArrayList<>(sourcesForShards.keySet())) {
                                     sourcesForShards.get(shard).removeIf(sa2 -> sa2.getHostCard() == manaSource);
                                 }
                             }
@@ -1214,9 +1214,11 @@ public List<SpellAbility> getAIPlayableMana(Card c) {
             // if a mana ability has a mana cost the AI will miscalculate
             // if there is a parent ability the AI can't use it
             final Cost cost = a.getPayCosts();
-            if (cost.hasManaCost() || (a.getApi() != ApiType.Mana && a.getApi() != ApiType.ManaReflected)) {
-                continue;
-            }
+            // Previously AI didn't know how to handle mana abilities with mana costs
+            // We're trying to fix that, so commenting this out for now
+//            if (cost.hasManaCost() || (a.getApi() != ApiType.Mana && a.getApi() != ApiType.ManaReflected)) {
+//                continue;
+//            }
 
             if (a.getRestrictions() != null && a.getRestrictions().isInstantSpeed()) {
                 continue;

forge-gui-desktop/src/test/java/forge/ai/controller/AutoPaymentTest.java

@@ -124,15 +124,17 @@ public void payWithSignets() {
         // AI doesn't know how to use Signets. So the score here is going to be bad
 
         int score = sim.simulateSpellAbility(strix.getFirstSpellAbility()).value;
-        AssertJUnit.assertFalse(score > 0);
-
-        // Once the AI learns how to use Signets, this test will pass
-        // Uncomment below when the AI is fixed
+        AssertJUnit.assertTrue(score > 0);
 
-//        Game simGame = sim.getSimulatedGameState();
-//        Card strixBF = findCardWithName(simGame, strix.getName());
-//        AssertJUnit.assertNotNull(strixBF);
-//        AssertJUnit.assertEquals(ZoneType.Battlefield, strixBF.getZone().getZoneType());
+        Game simGame = sim.getSimulatedGameState();
+        Card strixBF = findCardWithName(simGame, strix.getName());
+        AssertJUnit.assertNotNull(strixBF);
+        AssertJUnit.assertEquals(ZoneType.Battlefield, strixBF.getZone().getZoneType());
+
+        Card signetBF = findCardWithName(simGame, signet.getName());
+        Card islandBF = findCardWithName(simGame, island.getName());
+        AssertJUnit.assertTrue(signetBF.isTapped());
+        AssertJUnit.assertTrue(islandBF.isTapped());
     }
 
     @Test

forge-gui/res/cardsfolder/a/azorius_signet.txt

@@ -2,5 +2,4 @@ Name:Azorius Signet
 ManaCost:2
 Types:Artifact
 A:AB$ Mana | Cost$ 1 T | Produced$ W U | SpellDescription$ Add {W}{U}.
-AI:RemoveDeck:All
 Oracle:{1}, {T}: Add {W}{U}.

forge-gui/res/cardsfolder/b/boros_signet.txt

@@ -2,5 +2,4 @@ Name:Boros Signet
 ManaCost:2
 Types:Artifact
 A:AB$ Mana | Cost$ 1 T | Produced$ R W | SpellDescription$ Add {R}{W}.
-AI:RemoveDeck:All
 Oracle:{1}, {T}: Add {R}{W}.

forge-gui/res/cardsfolder/d/dimir_signet.txt

@@ -2,5 +2,4 @@ Name:Dimir Signet
 ManaCost:2
 Types:Artifact
 A:AB$ Mana | Cost$ 1 T | Produced$ U B | SpellDescription$ Add {U}{B}.
-AI:RemoveDeck:All
 Oracle:{1}, {T}: Add {U}{B}.

forge-gui/res/cardsfolder/g/golgari_signet.txt

@@ -2,5 +2,4 @@ Name:Golgari Signet
 ManaCost:2
 Types:Artifact
 A:AB$ Mana | Cost$ 1 T | Produced$ B G | SpellDescription$ Add {B}{G}.
-AI:RemoveDeck:All
 Oracle:{1}, {T}: Add {B}{G}.

forge-gui/res/cardsfolder/g/gruul_signet.txt

@@ -2,5 +2,4 @@ Name:Gruul Signet
 ManaCost:2
 Types:Artifact
 A:AB$ Mana | Cost$ 1 T | Produced$ R G | SpellDescription$ Add {R}{G}.
-AI:RemoveDeck:All
 Oracle:{1}, {T}: Add {R}{G}.

forge-gui/res/cardsfolder/i/izzet_signet.txt

@@ -2,5 +2,4 @@ Name:Izzet Signet
 ManaCost:2
 Types:Artifact
 A:AB$ Mana | Cost$ 1 T | Produced$ U R | SpellDescription$ Add {U}{R}.
-AI:RemoveDeck:All
 Oracle:{1}, {T}: Add {U}{R}.

forge-gui/res/cardsfolder/o/orzhov_signet.txt

@@ -2,5 +2,4 @@ Name:Orzhov Signet
 ManaCost:2
 Types:Artifact
 A:AB$ Mana | Cost$ 1 T | Produced$ W B | SpellDescription$ Add {W}{B}.
-AI:RemoveDeck:All
 Oracle:{1}, {T}: Add {W}{B}.

forge-gui/res/cardsfolder/r/rakdos_signet.txt

@@ -2,5 +2,4 @@ Name:Rakdos Signet
 ManaCost:2
 Types:Artifact
 A:AB$ Mana | Cost$ 1 T | Produced$ B R | SpellDescription$ Add {B}{R}.
-AI:RemoveDeck:All
 Oracle:{1}, {T}: Add {B}{R}.