Merge branch 'master' into network-draft-sealed

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: MostCromulent

docs/Development/ownership.md

@@ -5,9 +5,9 @@ Please also try to check back a bit after your PR gets merged in case it causes
 ## DevOps
 | Concept | Owners | Ancestors | Example tasks |
 | - | - | - | - |
-| PC Releases | friarsol | Agetian | - update Maven dependencies |
+| PC Releases | friarsol | Agetian | - update Maven dependencies<br>- maintain CI files |
 | Android Releases | | kevlahnota | |
-| Sentry | JaminCollins | | - watch for rare/unusual crashes |
+| Sentry | JaminCollins | | - watch trends for rare/unusual crashes |
 
 ## Ingame Engine
 | Concept | Owners | Ancestors | Example tasks |
@@ -26,7 +26,7 @@ Please also try to check back a bit after your PR gets merged in case it causes
 ## User Interface
 | Concept | Owners | Ancestors | Example tasks |
 | - | - | - | - |
-| Desktop | | | |
+| Desktop | | | - performance profiling |
 | Android | | DrDev, kevlahnota | - test new libGDX versions |
 | Localization | | Alumi | - update card translation files<br>- update engine text (native speaker not required) |
 | Sound effects | | | |
@@ -41,7 +41,7 @@ Please also try to check back a bit after your PR gets merged in case it causes
 | Concept | Owners | Ancestors | Example tasks |
 | - | - | - | - |
 | Quest | friarsol | | |
-| [Network Play](../network-play.md) | | JaminCollins | |
+| [Network Play](../network-play.md) | MostCromulent | JaminCollins | |
 | Gauntlet | | | |
 | Draft | | | |
 | Planar Conquest | | DrDev | |
@@ -61,4 +61,4 @@ Please also try to check back a bit after your PR gets merged in case it causes
 ## Miscellaneous
 | Concept | Owners | Ancestors | Example tasks |
 | - | - | - | - |
-| Documentation | | | - update Wiki |
+| Documentation | TRT | | - update Wiki |

docs/Network-Play.md

@@ -45,22 +45,22 @@
 
 1. **Configure network** — Host must configure network settings to enable external connections (see [Network Configuration](#network-configuration) below).
 2. **Verify versions** — Confirm all devices are running the same Forge version (see [Version Compatibility](#version-compatibility) below).
-3. **Launch Forge** on all devices.
+3. **Launch Forge** on all devices and navigate to the online play screen.
      - Mobile: Choose "Classic Mode", then "Play Online"
-     - Desktop: "Online Multiplayer" > "Lobby" > "Connect to Server"
-4. **Host** leaves the server address field **empty** and clicks OK.
+     - Desktop: "Online Multiplayer" > "Lobby"
+4. **Host** clicks **"Host a Game"** to start the server.
      - On first host, Forge will ask whether to **automatically open the port via UPnP** (see [UPnP](#upnp-automatic-port-forwarding) below). If your router supports UPnP, choosing "Just Once" or "Always" can skip manual port forwarding entirely.
 5. **Host** determines address to share with clients:
      - **Local play:** Use the **Copy Local URL** button in the lobby — this copies the address in the correct format. Forge displays the host's IP (typically `192.168.x.x`). Verify against the device's network settings. Ignore any suggestion to use `localhost`.
      - **Remote play:** Use the **Copy External URL** button in the lobby — if necessary verify the external IP at [canyouseeme.org](http://canyouseeme.org).
- 7. **Client** enters the host's IP address in the connection dialog and clicks OK.
+6. **Client** clicks **"Join a Game"** and enters the host's address.
      - The address format is **`IP:port`** — for example: `192.168.1.50:36743` (local) or `203.0.113.45:36743` (remote).
      - If the port is omitted, Forge defaults to 36743 (=FORGE on older phone keypads).
-8. **Configure the match:**
+7. **Configure the match:**
      - Host selects match type, teams, and game settings.
      - All players select decks, sleeves, and avatars.
      - Each player toggles their **Ready** switch.
-9. **Host starts the match** once all players are ready.
+8. **Host starts the match** once all players are ready.
 
 ---
 

docs/User-Guide.md

@@ -20,7 +20,7 @@
   - [Shift Key helper](#shift-key-helper)
   - [Full Control](#full-control)
   - [Repeatable Sequences (Macros)](#repeatable-sequences-macros)
-- [User Interface](#user-interface)
+- [Desktop User Interface](#desktop-user-interface)
   - [Layout](#layout)
   - [Viewing Cards in Different Zones](#viewing-cards-in-different-zones)
   - [Auto-Sort Multiplayer Fields](#auto-sort-multiplayer-fields)
@@ -34,8 +34,8 @@
 
 [***CLICK HERE FOR DOWNLOAD LINKS - Forge SNAPSHOT Version (DESKTOP/ANDROID)***](https://github.com/Card-Forge/forge/releases/tag/daily-snapshots)
 
-* For desktop, grab the installer file that ends in .jar
-* For android, grab the android file that ends in .apk
+* For Desktop, grab the installer file that ends in .jar
+* For Android, grab the app file that ends in .apk
   ‐ Watch the screen recording if one of following steps isn't clear for you
 
 <https://github.com/user-attachments/assets/7a0c7bb8-7cf9-4800-8091-bcc30ff2f4d8>

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

@@ -435,6 +435,8 @@ private CardCollection filterLandsToPlay(CardCollection landList) {
             }
         }
 
+        landList = ComputerUtilCard.dedupeCards(landList);
+
         landList = CardLists.filter(landList, c -> {
             String name = c.getName();
             CardCollectionView battlefield = player.getCardsIn(ZoneType.Battlefield);
@@ -473,8 +475,6 @@ private Card chooseBestLandToPlay(CardCollection landList) {
             return null;
         }
 
-        landList = ComputerUtilCard.dedupeCards(landList);
-
         CardCollection nonLandsInHand = CardLists.filter(player.getCardsIn(ZoneType.Hand), CardPredicates.NON_LANDS);
 
         // Some considerations for Momir/MoJhoSto
@@ -2167,9 +2167,9 @@ public boolean chooseEvenOdd(SpellAbility sa) {
         String aiLogic = sa.getParamOrDefault("AILogic", "");
 
         if (aiLogic.equals("AlwaysEven")) {
-            return false; // false is Even
+            return false;
         } else if (aiLogic.equals("AlwaysOdd")) {
-            return true; // true is Odd
+            return true;
         } else if (aiLogic.equals("Random")) {
             return MyRandom.getRandom().nextBoolean();
         } else if (aiLogic.equals("CMCInHand")) {

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

@@ -18,6 +18,7 @@
 package forge.ai;
 
 import com.google.common.collect.*;
+
 import forge.ai.AiCardMemory.MemorySet;
 import forge.ai.ability.ProtectAi;
 import forge.ai.ability.TokenAi;
@@ -412,7 +413,7 @@ else if (pref.contains("DiscardCost")) { // search for permanents with DiscardMe
                 int mana = ComputerUtilMana.getAvailableManaEstimate(ai, false);
 
                 boolean cantAffordSoon = activate.getCMC() > mana + 1;
-                boolean wrongColor = !activate.getColor().hasNoColorsExcept(ColorSet.fromNames(ComputerUtilCost.getAvailableManaColors(ai, ImmutableList.of())).getColor());
+                boolean wrongColor = !activate.getColor().hasNoColorsExcept(ColorSet.fromNames(ComputerUtilCost.getAvailableManaColors(ai, List.of())).getColor());
 
                 // Only do this for spells, not activated abilities
                 // We can't pay for this spell even if we play another land, or have wrong colors
@@ -2340,7 +2341,7 @@ public static String chooseSomeType(Player ai, String kindOfType, SpellAbility s
         final String logic = sa.getParam("AILogic");
 
         if (validTypes == null) {
-            validTypes = ImmutableList.of();
+            validTypes = List.of();
         }
 
         final Game game = ai.getGame();

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

@@ -2107,9 +2107,8 @@ public static CardCollection prioritizeCreaturesWorthRemovingNow(final Player ai
 
     public static AiPlayDecision checkNeedsToPlayReqs(final Card card, final SpellAbility sa) {
         Game game = card.getGame();
-        boolean isRightSplit = sa != null && sa.getCardState().getStateName() == CardStateName.RightSplit;
-        String needsToPlayName = isRightSplit ? "SplitNeedsToPlay" : "NeedsToPlay";
-        String needsToPlayVarName = isRightSplit ? "SplitNeedsToPlayVar" : "NeedsToPlayVar";
+        String needsToPlayName = "NeedsToPlay";
+        String needsToPlayVarName = "NeedsToPlayVar";
 
         // TODO: if there are ever split cards with Evoke or Kicker, factor in the right split option above
         if (sa != null) {

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

@@ -931,10 +931,9 @@ public boolean chooseFlipResult(SpellAbility sa, Player flipper, boolean call) {
         if (call) {
             // Win if possible
             return true;
-        } else {
-            // heads or tails, AI doesn't know which is better now
-            return MyRandom.getRandom().nextBoolean();
         }
+        // heads or tails, AI doesn't know which is better now
+        return MyRandom.getRandom().nextBoolean();
     }
 
     @Override
@@ -993,7 +992,10 @@ public boolean chooseBinary(SpellAbility sa, String question, BinaryChoiceType k
                 }
                 return defaultVal != null && defaultVal;
             case LeftOrRight: return brains.chooseDirection(sa);
-            case OddsOrEvens: return brains.chooseEvenOdd(sa); // false is Odd, true is Even
+            case OddsOrEvens: return brains.chooseEvenOdd(sa);
+            case HeadsOrTails:
+                // this is the result if AI gets to choose after
+                return true;
             default:
                 return MyRandom.getRandom().nextBoolean();
         }

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

@@ -286,22 +286,22 @@ public boolean chooseBinary(BinaryChoiceType kindOfChoice, SpellAbility sa, Map<
                 }
 
                 return ComputerUtil.isNegativeCounter(type, tgt);
-            } else {
-                if (type.is(CounterEnumType.ICE) && "Dark Depths".equals(tgt.getName())) {
-                    CardCollectionView marit = ai.getCardsIn(ZoneType.Battlefield, "Marit Lage");
-                    boolean maritEmpty = marit.isEmpty() || Iterables.contains(marit, (Predicate<Card>) Card::ignoreLegendRule);
+            }
 
-                    if (maritEmpty) {
-                        return false;
-                    }
-                } else if (type.is(CounterEnumType.M1M1) && tgt.hasKeyword(Keyword.PERSIST)) {
-                    return false;
-                } else if (type.is(CounterEnumType.P1P1) && tgt.hasKeyword(Keyword.UNDYING)) {
+            if (type.is(CounterEnumType.ICE) && "Dark Depths".equals(tgt.getName())) {
+                CardCollectionView marit = ai.getCardsIn(ZoneType.Battlefield, "Marit Lage");
+                boolean maritEmpty = marit.isEmpty() || Iterables.contains(marit, (Predicate<Card>) Card::ignoreLegendRule);
+
+                if (maritEmpty) {
                     return false;
                 }
-
-                return !ComputerUtil.isNegativeCounter(type, tgt);
+            } else if (type.is(CounterEnumType.M1M1) && tgt.hasKeyword(Keyword.PERSIST)) {
+                return false;
+            } else if (type.is(CounterEnumType.P1P1) && tgt.hasKeyword(Keyword.UNDYING)) {
+                return false;
             }
+
+            return !ComputerUtil.isNegativeCounter(type, tgt);
         }
         return super.chooseBinary(kindOfChoice, sa, params);
     }

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

@@ -167,7 +167,7 @@ private static boolean untapPrefTargeting(final Player ai, final SpellAbility sa
                 if (combat == null) {
                     return false;
                 }
-                list = CardLists.filter(list, c -> isAttackingAi(c, ai, combat));
+                list = CardLists.filter(list, c -> combat.isAttacking(c, ai));
                 if (list.isEmpty()) {
                     return false;
                 }
@@ -379,7 +379,7 @@ private boolean doPreventCombatDamageLogic(final Player ai, final SpellAbility s
         }
 
         CardCollection list = CardLists.getTargetableCards(activeCombat.getAttackers(), sa);
-        list = CardLists.filter(list, c -> isAttackingAi(c, ai, activeCombat));
+        list = CardLists.filter(list, c -> activeCombat.isAttacking(c, ai));
 
         if (list.isEmpty()) {
             return false;
@@ -398,10 +398,6 @@ private boolean doPreventCombatDamageLogic(final Player ai, final SpellAbility s
         return false;
     }
 
-    private static boolean isAttackingAi(final Card card, final Player ai, final Combat combat) {
-        return ai.equals(combat.getDefenderPlayerByAttacker(card));
-    }
-
     private static boolean alreadyAssignedTarget(final SpellAbility sa) {
         if (sa.hasParam("AILogic")) {
             String aiLogic = sa.getParam("AILogic");

forge-ai/src/main/java/forge/ai/simulation/GameStateEvaluator.java

@@ -50,14 +50,8 @@ private CombatSimResult simulateUpcomingCombatThisTurn(final Game evalGame, fina
             return null;
         }
 
-        Game gameCopy;
         GameCopier copier = new GameCopier(evalGame);
-
-        if (evalGame.EXPERIMENTAL_RESTORE_SNAPSHOT) {
-            gameCopy = copier.makeCopy();
-        } else {
-            gameCopy = copier.makeCopy(null, aiPlayer);
-        }
+        Game gameCopy = copier.makeCopy(null, aiPlayer);
 
         gameCopy.getPhaseHandler().devAdvanceToPhase(PhaseType.COMBAT_DAMAGE, () -> GameSimulator.resolveStack(gameCopy, aiPlayer.getWeakestOpponent()));
         CombatSimResult result = new CombatSimResult();