Minor cleanup

Author: tool4EvEr

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

@@ -151,6 +151,7 @@ public Combat getPredictedCombat() {
             AiAttackController aiAtk = new AiAttackController(player);
             predictedCombat = new Combat(player);
             aiAtk.declareAttackers(predictedCombat);
+            // ignoring attack costs for performance
         }
         return predictedCombat;
     }
@@ -1321,7 +1322,6 @@ public void declareAttackers(Player attacker, Combat combat) {
         AiAttackController aiAtk = new AiAttackController(attacker);
         lastAttackAggression = aiAtk.declareAttackers(combat);
 
-        // Check if we can reinforce with Banding creatures
         aiAtk.reinforceWithBanding(combat);
 
         // Per CR 508.1d, the decision to pay attack costs (e.g. Propaganda)
@@ -1348,7 +1348,7 @@ public void declareAttackers(Player attacker, Combat combat) {
     }
 
     private void removeUnpayableAttackers(Combat combat) {
-        for (Card attacker : new ArrayList<>(combat.getAttackers())) {
+        for (Card attacker : combat.getAttackers().threadSafeIterable()) {
             Cost attackCost = CombatUtil.getAttackCost(game, attacker, combat.getDefenderByAttacker(attacker));
             if (attackCost == null) {
                 continue;

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

@@ -47,6 +47,7 @@ public int evaluateCreature(final Card c, final boolean considerPT, final boolea
 
         if (considerPT) {
             value += addValue(power * 15, "power");
+            // TODO factor in marked damage - but probably not always?
             value += addValue(toughness * 10, "toughness: " + toughness);
 
             // because backside is always stronger the potential makes it better than a single faced card

forge-game/src/main/java/forge/game/card/CardFactoryUtil.java

@@ -3228,6 +3228,7 @@ public void resolve() {
             sa.setCardState(host.getAlternateState());
             sa.setAlternativeCost(AlternativeCost.MTMtE);
 
+            sa.putParam("Secondary", "True");
             sa.putParam("PrecostDesc", n[0] + " ");
             sa.putParam("CostDesc", convertCost.toString());
             sa.putParam("AfterDescription", "(Converted)");

forge-game/src/main/java/forge/game/phase/PhaseHandler.java

@@ -597,7 +597,6 @@ private void declareAttackersTurnBasedAction() {
                         }
                     }
                 }
-
             } while (!success);
 
             CardCollection tapped = new CardCollection();

forge-gui/src/main/java/forge/gamemodes/net/NetConnectUtil.java

@@ -131,14 +131,13 @@ public static ChatMessage join(final String url, final IOnlineLobby onlineLobby,
         int port;
 
         URLValidator.HostPort hostPort = parseURL(url);
-        if(hostPort == null) {
+        if (hostPort == null) {
             return new ChatMessage(null, ForgeConstants.INVALID_HOST_COMMAND);
         }
 
         hostname = hostPort.host();
         port = hostPort.port();
-        if(port == -1) port = ForgeConstants.DEFAULT_SERVER_CONNECTION_PORT;
-
+        if (port == -1) port = Integer.valueOf(ForgeNetPreferences.FNetPref.NET_PORT.getDefault());
 
         final FGameClient client = new FGameClient(FModel.getPreferences().getPref(FPref.PLAYER_NAME), "0", gui, hostname, port);
         onlineLobby.setClient(client);

forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java

@@ -36,7 +36,6 @@ public final class ForgeConstants {
     public static final String ASSETS_DIR                       = GuiBase.getInterface().getAssetsDir();
     public static final String PROFILE_FILE                     = ASSETS_DIR + "forge.profile.properties";
     public static final String PROFILE_TEMPLATE_FILE            = PROFILE_FILE + ".example";
-    public static final Integer DEFAULT_SERVER_CONNECTION_PORT  = 36743;
 
     public static final String RES_DIR                      = ASSETS_DIR + "res" + PATH_SEPARATOR;
     public static final String ADVENTURE_DIR                = RES_DIR + "adventure" + PATH_SEPARATOR;

forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java

@@ -371,37 +371,6 @@ private static String defaultCustomLogTypes() {
     /** Instantiates a ForgePreferences object. */
     public ForgePreferences() {
         super(ForgeConstants.MAIN_PREFS_FILE, FPref.class);
-        migrateLogVerbosity();
-    }
-
-    /** Migrate old GameLogEntryType values to GameLogVerbosity presets. */
-    private void migrateLogVerbosity() {
-        final String stored = getPref(FPref.DEV_LOG_ENTRY_TYPE);
-        try {
-            GameLogVerbosity.valueOf(stored); // strict check for enum name
-            return; // already a valid verbosity preset
-        } catch (IllegalArgumentException ignored) {}
-        // Also accept caption format ("High" etc.) from combobox storage
-        for (GameLogVerbosity v : GameLogVerbosity.values()) {
-            if (v.toString().equals(stored)) {
-                setPref(FPref.DEV_LOG_ENTRY_TYPE, v.name());
-                save();
-                return;
-            }
-        }
-        // Old value is a GameLogEntryType name — map to a preset
-        try {
-            int ordinal = GameLogEntryType.valueOf(stored).ordinal();
-            String mapped = ordinal <= 8 ? GameLogVerbosity.LOW.name()
-                          : ordinal <= 14 ? GameLogVerbosity.MEDIUM.name()
-                          : GameLogVerbosity.HIGH.name();
-            setPref(FPref.DEV_LOG_ENTRY_TYPE, mapped);
-            save();
-        } catch (IllegalArgumentException ignored) {
-            // Unrecognized value — reset to default
-            setPref(FPref.DEV_LOG_ENTRY_TYPE, FPref.DEV_LOG_ENTRY_TYPE.getDefault());
-            save();
-        }
     }
 
     /** Parse the custom log types preference into a Set. */