Merge remote-tracking branch 'upstream/master' into hover_comments

Author: agylesox

docs/Card-scripting-API/AbilityFactory.md

@@ -318,7 +318,7 @@ This follows our general approach where we try to find a reasonable middle groun
 
 ## Fight
 
-## FlipACoin
+## FlipCoin
 
 ## Fog
 This AF is based on the original *Fog* spell: "Prevent all combat damage that would be dealt this turn." While this could be done with an Effect, the specialized nature of the AI gives it its own AF.

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

@@ -103,7 +103,7 @@ public enum SpellApiToAi {
             .put(ApiType.ExchangeZone, ZoneExchangeAi.class)
             .put(ApiType.Explore, ExploreAi.class)
             .put(ApiType.Fight, FightAi.class)
-            .put(ApiType.FlipACoin, FlipACoinAi.class)
+            .put(ApiType.FlipCoin, FlipCoinAi.class)
             .put(ApiType.FlipOntoBattlefield, FlipOntoBattlefieldAi.class)
             .put(ApiType.Fog, FogAi.class)
             .put(ApiType.GainControl, ControlGainAi.class)

forge-ai/src/main/java/forge/ai/ability/CharmAi.java

@@ -60,7 +60,7 @@ protected AiAbilityDecision checkApiLogic(Player ai, SpellAbility sa) {
              * bonus choice(s) for the AI otherwise it might be too hard to ever fulfil
              * minimum choice requirements with canPlayAi() alone.
              */
-            chosenList = min > 1 ? chooseMultipleOptionsAi(choices, ai, min)
+            chosenList = min > 1 ? chooseMultipleOptionsAi(sa, choices, ai, min)
                     : chooseOptionsAi(sa, choices, ai, timingRight, num, min);
         }
 
@@ -92,12 +92,11 @@ protected AiAbilityDecision checkApiLogic(Player ai, SpellAbility sa) {
     }
 
     private List<AbilitySub> chooseOptionsAi(SpellAbility sa, List<AbilitySub> choices, final Player ai, boolean isTrigger, int num, int min) {
-        List<AbilitySub> chosenList = Lists.newArrayList();
+        List<AbilitySub> chosen = Lists.newArrayList();
         AiController aic = ((PlayerControllerAi) ai.getController()).getAi();
         // TODO unused for now, the AI doesn't know how to effectively handle repeated choices
         boolean allowRepeat = sa.hasParam("CanRepeatModes");
 
-        // Pawprint
         final int pawprintLimit = sa.hasParam("Pawprint") ? AbilityUtils.calculateAmount(sa.getHostCard(), sa.getParam("Pawprint"), sa) : 0;
         if (pawprintLimit > 0) {
             // try to pay for the more expensive subs first
@@ -107,6 +106,7 @@ private List<AbilitySub> chooseOptionsAi(SpellAbility sa, List<AbilitySub> choic
 
         // First pass using standard canPlayAi() for good choices
         for (AbilitySub sub : choices) {
+            handleDependentModes(sa, chosen, sub);
             sub.setActivatingPlayer(ai);
             // TODO refactor to obtain the AiAbilityDecision instead, then we can check all to sort by value
             if (AiPlayDecision.WillPlay == aic.canPlaySa(sub)) {
@@ -117,42 +117,45 @@ private List<AbilitySub> chooseOptionsAi(SpellAbility sa, List<AbilitySub> choic
                     }
                     pawprintAmount += curPawprintAmount;
                 }
-                chosenList.add(sub);
-                if (chosenList.size() == num) {
+                chosen.add(sub);
+                if (chosen.size() == num) {
                     // maximum choices reached
-                    return chosenList;
+                    break;
                 }
             }
         }
-        if (isTrigger && chosenList.size() < min) {
+        if (isTrigger && chosen.size() < min) {
             // Second pass using doTrigger(false) to fulfill minimum choice
-            choices.removeAll(chosenList);
+            choices.removeAll(chosen);
             for (AbilitySub sub : choices) {
+                handleDependentModes(sa, chosen, sub);
                 if (aic.doTrigger(sub, false)) {
-                    chosenList.add(sub);
-                    if (chosenList.size() == min) {
-                        return chosenList;
+                    chosen.add(sub);
+                    if (chosen.size() == min) {
+                        break;
                     }
                 }
             }
             // Third pass using doTrigger(true) to force fill minimum choices
-            if (chosenList.size() < min) {
-                choices.removeAll(chosenList);
+            if (chosen.size() < min) {
+                choices.removeAll(chosen);
                 for (AbilitySub sub : choices) {
+                    handleDependentModes(sa, chosen, sub);
                     if (aic.doTrigger(sub, true)) {
-                        chosenList.add(sub);
-                        if (chosenList.size() == min) {
+                        chosen.add(sub);
+                        if (chosen.size() == min) {
                             break;
                         }
                     }
                 }
             }
         }
-        if (chosenList.size() < min) {
+        if (chosen.size() < min) {
             // not enough choices
-            chosenList.clear();
+            chosen.clear();
         }
-        return chosenList;
+        sa.setSubAbility(null);
+        return chosen;
     }
 
     private List<AbilitySub> chooseTriskaidekaphobia(List<AbilitySub> choices, final Player ai) {
@@ -242,32 +245,43 @@ else if (aiLife < 13 || ((aiLife - 13) % 2) == 1) {
         return chosenList;
     }
 
-    // Choice selection for charms that require multiple choices (eg. Cryptic Command, DTK commands)
-    private List<AbilitySub> chooseMultipleOptionsAi(List<AbilitySub> choices, final Player ai, int min) {
+    // Choice selection for charms that require multiple choices (e.g. Cryptic Command)
+    private List<AbilitySub> chooseMultipleOptionsAi(SpellAbility sa, List<AbilitySub> choices, final Player ai, int min) {
         AbilitySub goodChoice = null;
-        List<AbilitySub> chosenList = Lists.newArrayList();
+        List<AbilitySub> chosen = Lists.newArrayList();
         AiController aic = ((PlayerControllerAi) ai.getController()).getAi();
         for (AbilitySub sub : choices) {
+            handleDependentModes(sa, chosen, sub);
             sub.setActivatingPlayer(ai);
             // Assign generic good choice to fill up choices if necessary 
             if ("Good".equals(sub.getParam("AILogic")) && aic.doTrigger(sub, false)) {
                 goodChoice = sub;
             } else if (AiPlayDecision.WillPlay == aic.canPlaySa(sub)) {
-                chosenList.add(sub);
-                if (chosenList.size() == min) {
+                chosen.add(sub);
+                if (chosen.size() == min) {
                     break; // enough choices
                 }
             }
         }
         // Add generic good choice if one more choice is needed
-        if (chosenList.size() == min - 1 && goodChoice != null) {
-            chosenList.add(0, goodChoice);  // hack to make Dromoka's Command fight targets work
+        if (chosen.size() == min - 1 && goodChoice != null) {
+            chosen.add(0, goodChoice);  // hack to make Dromoka's Command fight targets work
         }
-        if (chosenList.size() != min) {
-            chosenList.clear();
+        if (chosen.size() != min) {
+            chosen.clear();
         }
-        return chosenList;
-    } 
+        sa.setSubAbility(null);
+        return chosen;
+    }
+
+    private void handleDependentModes(SpellAbility sa, List<AbilitySub> chosen, AbilitySub sub) {
+        if (sub.hasParam("TargetUnique") && !chosen.isEmpty()) {
+            // support "Each mode must target a different..."
+            sa.setSubAbility(null);
+            CharmEffect.chainAbilities(sa, chosen);
+            sa.appendSubAbility(sub);
+        }
+    }
 
     @Override
     public Player chooseSinglePlayer(Player ai, SpellAbility sa, Iterable<Player> opponents, Map<String, Object> params) {

forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java

@@ -335,17 +335,14 @@ protected AiAbilityDecision checkApiLogic(Player ai, final SpellAbility sa) {
             amount = 1; // TODO: improve this to possibly account for some variability depending on the roll outcome (e.g. 4 for 1d8, perhaps)
         }
 
-        if (ph.is(PhaseType.COMBAT_DECLARE_BLOCKERS)) {
-            Combat combat = game.getCombat();
-            if (sourceName.equals("Psychic Frog")) {
-                return doCombatAdaptLogic(source, amount, combat);
-            }
-            if (sa.hasParam("Adapt")) {
-                if (!source.canReceiveCounters(CounterEnumType.P1P1) || source.getCounters(CounterEnumType.P1P1) > 0) {
-                    return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
-                }
-                return doCombatAdaptLogic(source, amount, combat);
-            }
+        if (sa.hasParam("Adapt") &&
+                (!source.canReceiveCounters(CounterEnumType.P1P1) || source.getCounters(CounterEnumType.P1P1) > 0)) {
+            return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
+        }
+
+        if (ph.is(PhaseType.COMBAT_DECLARE_BLOCKERS) &&
+                (sa.hasParam("Adapt") || sourceName.equals("Psychic Frog"))) {
+            return doCombatAdaptLogic(source, amount, game.getCombat());
         }
 
         if ("Fight".equals(logic) || "PowerDmg".equals(logic)) {

forge-ai/src/main/java/forge/ai/ability/CountersPutAllAi.java

@@ -139,8 +139,7 @@ protected AiAbilityDecision doTriggerNoCost(final Player aiPlayer, final SpellAb
 
             for (final Player p : players) {
                 if (sa.canTarget(p)) {
-                    boolean preferred = false;
-                    preferred = (sa.isCurse() && p.isOpponentOf(aiPlayer)) || (!sa.isCurse() && p == aiPlayer);
+                    boolean preferred = (sa.isCurse() && p.isOpponentOf(aiPlayer)) || (!sa.isCurse() && p == aiPlayer);
                     sa.resetTargets();
                     sa.getTargets().add(p);
                     if (preferred) {
@@ -149,9 +148,8 @@ protected AiAbilityDecision doTriggerNoCost(final Player aiPlayer, final SpellAb
 
                     if (mandatory) {
                         return new AiAbilityDecision(100, AiPlayDecision.WillPlay);
-                    } else {
-                        return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
                     }
+                    return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
                 }
             }
         }

forge-ai/src/main/java/forge/ai/ability/DrawAi.java

@@ -289,23 +289,19 @@ private boolean targetAI(final Player ai, final SpellAbility sa, final boolean m
         // TODO: if xPaid and one of the below reasons would fail, instead of
         // bailing reduce toPay amount to acceptable level
         if (sa.usesTargeting()) {
-            // ability is targeted
             sa.resetTargets();
 
             // if it wouldn't draw anything and its not mandatory, skip it
             if (numCards == 0 && !mandatory && !drawback) {
                 return false;
             }
 
-            // filter player that can be targeted
             PlayerCollection players = game.getPlayers().filter(PlayerPredicates.isTargetableBy(sa));
 
-            // no targets skip it
             if (players.isEmpty()) {
                 return false;
             }
 
-            // filter opponents
             PlayerCollection opps = players.filter(PlayerPredicates.isOpponentOf(ai));
 
             for (Player oppA : opps) {
@@ -530,7 +526,7 @@ private boolean targetAI(final Player ai, final SpellAbility sa, final boolean m
             }
         }
         return true;
-    } // drawTargetAI()
+    }
 
     @Override
     protected AiAbilityDecision doTriggerNoCost(Player ai, SpellAbility sa, boolean mandatory) {

…n/java/forge/ai/ability/FlipACoinAi.java …in/java/forge/ai/ability/FlipCoinAi.javaforge-ai/src/main/java/forge/ai/ability/FlipACoinAi.java renamed to forge-ai/src/main/java/forge/ai/ability/FlipCoinAi.java forge-ai/src/main/java/forge/ai/ability/FlipACoinAi.java renamed to forge-ai/src/main/java/forge/ai/ability/FlipCoinAi.java

@@ -9,7 +9,7 @@
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 
-public class FlipACoinAi extends SpellAbilityAi {
+public class FlipCoinAi extends SpellAbilityAi {
 
     /* (non-Javadoc)
      * @see forge.card.abilityfactory.SpellAiLogic#checkApiLogic(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)

forge-ai/src/main/java/forge/ai/ability/TokenAi.java

@@ -256,20 +256,21 @@ protected AiAbilityDecision doTriggerNoCost(Player ai, SpellAbility sa, boolean
                 if (tgtRoleAura(ai, sa, actualToken, mandatory)) {
                     // Targeting handled in tgtRoleAura
                     return new AiAbilityDecision(100, AiPlayDecision.WillPlay);
-                } else {
-                    return new AiAbilityDecision(0, AiPlayDecision.TargetingFailed);
                 }
+                return new AiAbilityDecision(0, AiPlayDecision.TargetingFailed);
             }
 
-            if (tgt.canOnlyTgtOpponent()) {
+            if (sa.canTarget(ai)) {
+                sa.getTargets().add(ai);
+            } else if (mandatory || tgt.canOnlyTgtOpponent()) {
                 PlayerCollection targetableOpps = ai.getOpponents().filter(PlayerPredicates.isTargetableBy(sa));
-                if (mandatory && targetableOpps.isEmpty()) {
-                    return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
+                if (targetableOpps.isEmpty()) {
+                    return new AiAbilityDecision(0, AiPlayDecision.TargetingFailed);
                 }
                 Player opp = targetableOpps.min(PlayerPredicates.compareByLife());
                 sa.getTargets().add(opp);
             } else {
-                sa.getTargets().add(ai);
+                return new AiAbilityDecision(0, AiPlayDecision.TargetingFailed);
             }
         }
 

forge-game/src/main/java/forge/game/GameLogFormatter.java

@@ -290,10 +290,16 @@ public GameLogEntry visit(GameEventCardChangeZone ev) {
         if (ev.from() == null || ev.to() == null) {
             return null;
         }
-        // Only log Battlefield → Graveyard/Exile to avoid duplicating entries
-        // already covered by other events (land played, spell cast, discard, etc.)
         final ZoneType from = ev.from().zoneType();
         final ZoneType to = ev.to().zoneType();
+        // Log mid-game ante additions (e.g. Contract from Below, Demonic Attorney)
+        if (to == ZoneType.Ante && from != ZoneType.Ante) {
+            final CardView c = ev.card();
+            return new GameLogEntry(GameLogEntryType.ANTE,
+                    (c != null ? c.getOwner() + " anted " + c : "a card was anted"));
+        }
+        // Only log Battlefield -> Graveyard/Exile to avoid duplicating entries
+        // already covered by other events (land played, spell cast, discard, etc.)
         if (from != ZoneType.Battlefield || (to != ZoneType.Graveyard && to != ZoneType.Exile)) {
             return null;
         }

forge-game/src/main/java/forge/game/ability/AbilityUtils.java

@@ -43,6 +43,7 @@
 
 import java.util.*;
 import java.util.Map.Entry;
+import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -1829,18 +1830,13 @@ public static int xCount(Card c, final String s, final CardTraitBase ctb) {
                 }
 
                 if (sq[0].startsWith("TotalManaSpent ")) {
-                    final String[] k = sq[0].split(" ");
-                    int v = 0;
-                    if (sa.getRootAbility().getPayingMana() != null) {
-                        for (Mana m : sa.getRootAbility().getPayingMana()) {
-                            Card source = m.getSourceCard();
-                            if (source != null) {
-                                if (source.isValid(k[1].split(","), player, c, sa)) {
-                                    v += 1;
-                                }
-                            }
-                        }
+                    if (sa.getRootAbility().getPayingMana() == null) {
+                        return doXMath(0, expr, c, ctb);
                     }
+                    final String[] k = sq[0].split(" ");
+                    int v = (int) sa.getRootAbility().getPayingMana().stream().map(Mana::getSourceCard)
+                            .filter(Predicate.<Card>not(Objects::isNull).and(CardPredicates.restriction(k[1].split(","), player, c, ctb)))
+                            .count();
                     return doXMath(v, expr, c, ctb);
                 }
 
@@ -1878,17 +1874,12 @@ public static int xCount(Card c, final String s, final CardTraitBase ctb) {
             }
             if (sq[0].startsWith("CastTotalManaSpent ")) {
                 final String[] k = sq[0].split(" ");
-                int v = 0;
-                if (c.getCastSA() != null) {
-                    for (Mana m : c.getCastSA().getPayingMana()) {
-                        Card source = m.getSourceCard();
-                        if (source != null) {
-                            if (source.isValid(k[1].split(","), player, c, ctb)) {
-                                v += 1;
-                            }
-                        }
-                    }
+                if (c.getCastSA() == null) {
+                    return doXMath(0, expr, c, ctb);
                 }
+                int v = (int) c.getCastSA().getPayingMana().stream().map(Mana::getSourceCard)
+                        .filter(Predicate.<Card>not(Objects::isNull).and(CardPredicates.restriction(k[1].split(","), player, c, ctb)))
+                        .count();
                 return doXMath(v, expr, c, ctb);
             }