Merge branch 'main' into checktyle-adjustments

rjhancock · web-flow · commit d537df7d01f5 · 2026-02-08T18:41:30.000-06:00
diff --git a/MekHQ/resources/mekhq/resources/AdvancedReplacementLimbDialog.properties b/MekHQ/resources/mekhq/resources/AdvancedReplacementLimbDialog.properties
@@ -42,7 +42,7 @@ AdvancedReplacementLimbDialog.status.selected=<b>Selected:</b> {0} surgery(s)
 AdvancedReplacementLimbDialog.status.difficulty=<b>Surgery Skill Level Required:</b> {0}
 AdvancedReplacementLimbDialog.status.localSurgeon=<b>Using Local Surgeon</b> Cost increased tenfold
 AdvancedReplacementLimbDialog.status.localSurgeon.transit=<b>Unable to find a local surgeon in space</b>
-AdvancedReplacementLimbDialog.status.surgeon=<b>Surgeon:</b> {0} ({1}+)
+AdvancedReplacementLimbDialog.status.surgeon=<b>Surgeon:</b> {0} (Skill Level {1}, TN {2}+)
 AdvancedReplacementLimbDialog.status.total=<b>Total Cost:</b> {0} C-Bills
 AdvancedReplacementLimbDialog.exclusions.refused=<br>- {0}Patient has refused due to hatred of bionics.{1}
 AdvancedReplacementLimbDialog.exclusions.planet=<br>- {0}Advanced prosthetics require planetary facilities.{1}
diff --git a/MekHQ/resources/mekhq/resources/CreateCharacterDialog.properties b/MekHQ/resources/mekhq/resources/CreateCharacterDialog.properties
@@ -69,6 +69,7 @@ age=years old
 textBloodname.error=Generation Failed
 optionGroup.lvl3Advantages=Advantages
 optionGroup.edgeAdvantages=Edge
+optionGroup.eiAdvantages=Enhanced Imaging
 optionGroup.MDAdvantages=Warrior Augmentations
 txtDesc.title=Instructions
 panXpLeft.title=XP remaining
diff --git a/MekHQ/resources/mekhq/resources/CustomizePersonDialog.properties b/MekHQ/resources/mekhq/resources/CustomizePersonDialog.properties
@@ -70,4 +70,5 @@ age=years old
 textBloodname.error=Generation Failed
 optionGroup.lvl3Advantages=Advantages
 optionGroup.edgeAdvantages=Edge
+optionGroup.eiAdvantages=Enhanced Imaging
 optionGroup.MDAdvantages=Warrior Augmentations
diff --git a/MekHQ/src/mekhq/campaign/mission/AtBDynamicScenarioFactory.java b/MekHQ/src/mekhq/campaign/mission/AtBDynamicScenarioFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2025 The MegaMek Team. All Rights Reserved.
+ * Copyright (C) 2018-2026 The MegaMek Team. All Rights Reserved.
  *
  * This file is part of MekHQ.
  *
@@ -88,7 +88,6 @@
 import megamek.common.containers.MunitionTree;
 import megamek.common.enums.Gender;
 import megamek.common.enums.SkillLevel;
-import megamek.common.equipment.GunEmplacement;
 import megamek.common.equipment.MiscType;
 import megamek.common.equipment.Transporter;
 import megamek.common.equipment.WeaponMounted;
@@ -1828,9 +1827,12 @@ public static void setTerrain(AtBDynamicScenario scenario) {
             scenario.setBoardType(T_GROUND);
             StratConBiomeManifest biomeManifest = StratConBiomeManifest.getInstance();
             int kelvinTemp = scenario.getTemperature() + StratConContractInitializer.ZERO_CELSIUS_IN_KELVIN;
-            List<String> allowedTerrain = biomeManifest.getTempMap(StratConBiomeManifest.TERRAN_BIOME)
-                                                .floorEntry(kelvinTemp)
-                                                .getValue().allowedTerrainTypes;
+            var tempMap = biomeManifest.getTempMap(StratConBiomeManifest.TERRAN_BIOME);
+            var biomeEntry = tempMap.floorEntry(kelvinTemp);
+            if (biomeEntry == null) {
+                biomeEntry = tempMap.firstEntry();
+            }
+            List<String> allowedTerrain = biomeEntry.getValue().allowedTerrainTypes;
 
             int terrainIndex = randomInt(allowedTerrain.size());
             scenario.setTerrainType(allowedTerrain.get(terrainIndex));
@@ -1847,12 +1849,18 @@ public static void setTerrain(AtBDynamicScenario scenario) {
         } else {
             StratConBiomeManifest biomeManifest = StratConBiomeManifest.getInstance();
             int kelvinTemp = scenario.getTemperature() + StratConContractInitializer.ZERO_CELSIUS_IN_KELVIN;
-            List<String> allowedFacility = biomeManifest.getTempMap(StratConBiomeManifest.TERRAN_FACILITY_BIOME)
-                                                 .floorEntry(kelvinTemp)
-                                                 .getValue().allowedTerrainTypes;
-            List<String> allowedTerrain = biomeManifest.getTempMap(StratConBiomeManifest.TERRAN_BIOME)
-                                                .floorEntry(kelvinTemp)
-                                                .getValue().allowedTerrainTypes;
+            var facilityTempMap = biomeManifest.getTempMap(StratConBiomeManifest.TERRAN_FACILITY_BIOME);
+            var facilityBiomeEntry = facilityTempMap.floorEntry(kelvinTemp);
+            if (facilityBiomeEntry == null) {
+                facilityBiomeEntry = facilityTempMap.firstEntry();
+            }
+            List<String> allowedFacility = facilityBiomeEntry.getValue().allowedTerrainTypes;
+            var terrainTempMap = biomeManifest.getTempMap(StratConBiomeManifest.TERRAN_BIOME);
+            var terrainBiomeEntry = terrainTempMap.floorEntry(kelvinTemp);
+            if (terrainBiomeEntry == null) {
+                terrainBiomeEntry = terrainTempMap.firstEntry();
+            }
+            List<String> allowedTerrain = terrainBiomeEntry.getValue().allowedTerrainTypes;
             List<String> allowedTemplate = scenario.getTemplate().mapParameters.allowedTerrainTypes;
             // try to filter on temp
             allowedTerrain.addAll(allowedFacility);
diff --git a/MekHQ/src/mekhq/campaign/mission/ContractScore.java b/MekHQ/src/mekhq/campaign/mission/ContractScore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2025 The MegaMek Team. All Rights Reserved.
+ * Copyright (C) 2025-2026 The MegaMek Team. All Rights Reserved.
  *
  * This file is part of MekHQ.
  *
@@ -53,8 +53,8 @@ public class ContractScore {
     private static final int MARGINAL_DEFEAT = -1;
     private static final int DEFEAT = -2;
     private static final int DECISIVE_DEFEAT = -3;
-    private static final int FLEET_IN_BEING = 2;
-    private static final int REFUSED_ENGAGEMENT = 2;
+    private static final int FLEET_IN_BEING = -2;
+    private static final int REFUSED_ENGAGEMENT = -3;
 
     /**
      * Calculates the overall contract score based on the outcomes of all completed scenarios.
diff --git a/MekHQ/src/mekhq/campaign/personnel/education/Academy.java b/MekHQ/src/mekhq/campaign/personnel/education/Academy.java
@@ -549,6 +549,26 @@ public List<Integer> getQualificationStartYears() {
         return qualificationStartYears;
     }
 
+    /**
+     * Validates that the parallel lists (qualifications, curriculums, qualificationStartYears) have matching sizes.
+     * Logs a warning if they don't match.
+     *
+     * @return true if lists are valid (same size or all null/empty), false if mismatched
+     */
+    public boolean validateListSizes() {
+        int qualCount = (qualifications == null) ? 0 : qualifications.size();
+        int currCount = (curriculums == null) ? 0 : curriculums.size();
+        int yearCount = (qualificationStartYears == null) ? 0 : qualificationStartYears.size();
+
+        if (qualCount != currCount || qualCount != yearCount) {
+            LOGGER.warn("Academy '{}' has mismatched list sizes: qualifications={}, curriculums={}, startYears={}. "
+                              + "This may cause errors when viewing course tooltips.",
+                  name, qualCount, currCount, yearCount);
+            return false;
+        }
+        return true;
+    }
+
     /**
      * Retrieves the base skill level granted by this academy.
      *
@@ -812,6 +832,13 @@ public String getTooltip(Campaign campaign, List<Person> personnel, int courseIn
               MekHQ.getMHQOptions().getLocale());
 
         try {
+            // Bounds check: ensure courseIndex is valid for curriculums list
+            if (curriculums == null || courseIndex < 0 || courseIndex >= curriculums.size()) {
+                LOGGER.error("Invalid courseIndex {} for academy '{}' with {} curriculums",
+                      courseIndex, name, curriculums == null ? 0 : curriculums.size());
+                return "<html><body style='width: 200px'><i>Error: Invalid course data</i></body></html>";
+            }
+
             StringBuilder tooltip = new StringBuilder().append("<html><body style='width: 200px'>");
             tooltip.append("<i>").append(description).append("</i><br><br>");
             tooltip.append("<b>").append(resources.getString("curriculum.text")).append("</b><br>");
diff --git a/MekHQ/src/mekhq/campaign/personnel/education/AcademyFactory.java b/MekHQ/src/mekhq/campaign/personnel/education/AcademyFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2025 The MegaMek Team. All Rights Reserved.
+ * Copyright (C) 2018-2026 The MegaMek Team. All Rights Reserved.
  *
  * This file is part of MekHQ.
  *
@@ -140,9 +140,40 @@ public void loadAcademyFromStream(InputStream inputStream, String fileName) {
                 academy.setId(id);
                 id++;
                 academy.setSet(currentSetName);
+                // Validate that parallel lists have matching sizes, skip invalid academies
+                if (!academy.validateListSizes()) {
+                    LOGGER.warn("Skipping academy '{}' in set '{}' from file '{}' due to invalid list sizes.",
+                          academy.getName(), currentSetName, fileName);
+                    continue;
+                }
                 tempAcademyMap.put(academy.getName(), academy);
             }
-            academyMap.put(currentSetName, tempAcademyMap);
+
+            // Merge with existing academies instead of replacing the entire set.
+            // This allows user academy files to override specific academies while
+            // preserving base academies that aren't in the user's file.
+            Map<String, Academy> existingMap = academyMap.get(currentSetName);
+            if (existingMap != null) {
+                // Find the max ID from existing academies to avoid ID conflicts
+                int maxId = existingMap.values().stream()
+                                  .mapToInt(Academy::getId)
+                                  .max().orElse(-1);
+                // Reassign IDs: preserve IDs for overrides, assign new IDs for new academies
+                int newId = maxId + 1;
+                for (Academy academy : tempAcademyMap.values()) {
+                    Academy existing = existingMap.get(academy.getName());
+                    if (existing != null) {
+                        // Preserve the original ID when overriding an existing academy
+                        academy.setId(existing.getId());
+                    } else {
+                        // Assign a new, non-conflicting ID for new academies
+                        academy.setId(newId++);
+                    }
+                }
+                existingMap.putAll(tempAcademyMap);
+            } else {
+                academyMap.put(currentSetName, tempAcademyMap);
+            }
         } catch (JAXBException e) {
             LOGGER.error("Error loading XML for academies", e);
         }
diff --git a/MekHQ/src/mekhq/campaign/stratCon/StratConBiomeManifest.java b/MekHQ/src/mekhq/campaign/stratCon/StratConBiomeManifest.java
@@ -147,16 +147,47 @@ public String getFacilityImage(String facilityType) {
     private static StratConBiomeManifest instance;
 
     /**
-     * Gets the singleton biome manifest instance
+     * Gets the singleton biome manifest instance.
+     * If the manifest file cannot be loaded, returns a default instance with minimal biome data.
      */
     public static StratConBiomeManifest getInstance() {
         if (instance == null) {
             instance = load();
+            if (instance == null) {
+                logger.warn("Failed to load biome manifest, using default instance");
+                instance = createDefaultInstance();
+            }
         }
 
         return instance;
     }
 
+    /**
+     * Creates a default biome manifest with minimal data for fallback/testing scenarios. This ensures the system can
+     * function even when the XML configuration is unavailable.
+     */
+    private static StratConBiomeManifest createDefaultInstance() {
+        StratConBiomeManifest manifest = new StratConBiomeManifest();
+
+        // Create a default biome that covers all temperature ranges
+        StratConBiome defaultBiome = new StratConBiome();
+        defaultBiome.biomeCategory = TERRAN_BIOME;
+        defaultBiome.allowedTemperatureLowerBound = Integer.MIN_VALUE;
+        defaultBiome.allowedTemperatureUpperBound = Integer.MAX_VALUE;
+        defaultBiome.allowedTerrainTypes = new ArrayList<>();
+        defaultBiome.allowedTerrainTypes.add("Grasslands");
+
+        TreeMap<Integer, StratConBiome> defaultTempMap = new TreeMap<>();
+        defaultTempMap.put(Integer.MIN_VALUE, defaultBiome);
+
+        manifest.biomeTempMap.put(TERRAN_BIOME, defaultTempMap);
+        manifest.biomeTempMap.put(TERRAN_FACILITY_BIOME, defaultTempMap);
+
+        manifest.biomes.add(defaultBiome);
+
+        return manifest;
+    }
+
     private static StratConBiomeManifest load() {
         StratConBiomeManifest resultingManifest;
         File inputFile = new File(MHQConstants.STRAT_CON_BIOME_MANIFEST_PATH);
diff --git a/MekHQ/src/mekhq/campaign/stratCon/StratConContractInitializer.java b/MekHQ/src/mekhq/campaign/stratCon/StratConContractInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2025 The MegaMek Team. All Rights Reserved.
+ * Copyright (C) 2019-2026 The MegaMek Team. All Rights Reserved.
  *
  * This file is part of MekHQ.
  *
@@ -59,6 +59,8 @@
 import mekhq.campaign.mission.enums.AtBMoraleLevel;
 import mekhq.campaign.stratCon.StratConContractDefinition.ObjectiveParameters;
 import mekhq.campaign.stratCon.StratConContractDefinition.StrategicObjectiveType;
+import mekhq.campaign.universe.Planet;
+import mekhq.campaign.universe.PlanetarySystem;
 
 /**
  * This class handles StratCon state initialization when a contract is signed.
@@ -96,7 +98,8 @@ public static void initializeCampaignState(AtBContract contract, Campaign campai
         // when objective is allied/hostile facility, place those facilities
 
         int maximumTrackIndex = max(0, contract.getRequiredCombatTeams() / NUM_LANCES_PER_TRACK);
-        int planetaryTemperature = campaign.getLocation().getPlanet().getTemperature(campaign.getLocalDate());
+        // Use the contract's destination planet, not the campaign's current location
+        int planetaryTemperature = getContractPlanetTemperature(contract, campaign);
 
         CampaignOptions campaignOptions = campaign.getCampaignOptions();
         boolean isUseMaplessMode = campaignOptions.isUseStratConMaplessMode();
@@ -310,6 +313,45 @@ public static int getScenarioOdds(StratConContractDefinition contractDefinition)
         return contractDefinition.getScenarioOdds().get(Compute.randomInt(contractDefinition.getScenarioOdds().size()));
     }
 
+    /**
+     * Gets the temperature of the contract's destination planet.
+     *
+     * <p>Uses the contract's system (where the contract takes place), not the campaign's
+     * current location. Falls back to 25C (standard room temperature) if the planet or temperature data is
+     * unavailable.</p>
+     *
+     * @param contract the contract being initialized
+     * @param campaign the campaign (used to get the current date)
+     *
+     * @return the planetary temperature in Celsius
+     */
+    private static int getContractPlanetTemperature(AtBContract contract, Campaign campaign) {
+        final int DEFAULT_TEMPERATURE = 25; // Standard room temperature as fallback
+
+        PlanetarySystem system = contract.getSystem();
+        if (system == null) {
+            LOGGER.warn("Contract {} has no system, using default temperature",
+                  contract.getName());
+            return DEFAULT_TEMPERATURE;
+        }
+
+        Planet planet = system.getPrimaryPlanet();
+        if (planet == null) {
+            LOGGER.warn("System {} has no primary planet, using default temperature",
+                  system.getName(campaign.getLocalDate()));
+            return DEFAULT_TEMPERATURE;
+        }
+
+        Integer temperature = planet.getTemperature(campaign.getLocalDate());
+        if (temperature == null) {
+            LOGGER.warn("Planet {} has no temperature data, using default temperature",
+                  planet.getName(campaign.getLocalDate()));
+            return DEFAULT_TEMPERATURE;
+        }
+
+        return temperature;
+    }
+
     /**
      * Set up initial state of a track, dimensions are based on number of assigned lances.
      */
diff --git a/MekHQ/src/mekhq/campaign/stratCon/StratConRulesManager.java b/MekHQ/src/mekhq/campaign/stratCon/StratConRulesManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2025 The MegaMek Team. All Rights Reserved.
+ * Copyright (C) 2019-2026 The MegaMek Team. All Rights Reserved.
  *
  * This file is part of MekHQ.
  *
@@ -832,9 +832,12 @@ public static void setScenarioParametersFromBiome(StratConTrackState track, Stra
             // if facility doesn't have a biome temp map or no entry for the current
             // temperature, use the default one
             if (facility.getBiomes().isEmpty() || (facility.getBiomeTempMap().floorEntry(kelvinTemp) == null)) {
-                facilityBiome = biomeManifest.getTempMap(StratConBiomeManifest.TERRAN_FACILITY_BIOME)
-                                      .floorEntry(kelvinTemp)
-                                      .getValue();
+                var defaultTempMap = biomeManifest.getTempMap(StratConBiomeManifest.TERRAN_FACILITY_BIOME);
+                var biomeEntry = defaultTempMap.floorEntry(kelvinTemp);
+                if (biomeEntry == null) {
+                    biomeEntry = defaultTempMap.firstEntry();
+                }
+                facilityBiome = biomeEntry.getValue();
             } else {
                 facilityBiome = facility.getBiomeTempMap().floorEntry(kelvinTemp).getValue();
             }
diff --git a/MekHQ/src/mekhq/campaign/stratCon/StratConTerrainPlacer.java b/MekHQ/src/mekhq/campaign/stratCon/StratConTerrainPlacer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2025 The MegaMek Team. All Rights Reserved.
+ * Copyright (C) 2019-2026 The MegaMek Team. All Rights Reserved.
  *
  * This file is part of MekHQ.
  *
@@ -53,8 +53,14 @@ public static void InitializeTrackTerrain(StratConTrackState track) {
         // TODO: Maybe more than one of each biome?
         // TODO: Map category being displayed for some reason
         int kelvinTemp = track.getTemperature() + StratConContractInitializer.ZERO_CELSIUS_IN_KELVIN;
-        StratConBiome biome = StratConBiomeManifest.getInstance().getTempMap(StratConBiomeManifest.TERRAN_BIOME)
-                                    .floorEntry(kelvinTemp).getValue();
+        var tempMap = StratConBiomeManifest.getInstance().getTempMap(StratConBiomeManifest.TERRAN_BIOME);
+        var biomeEntry = tempMap.floorEntry(kelvinTemp);
+        // If temperature is below minimum (e.g., planet colder than absolute zero in data),
+        // fall back to the coldest available biome
+        if (biomeEntry == null) {
+            biomeEntry = tempMap.firstEntry();
+        }
+        StratConBiome biome = biomeEntry.getValue();
 
         int baseTerrainIndex = Compute.randomInt(biome.allowedTerrainTypes.size());
 
diff --git a/MekHQ/src/mekhq/campaign/universe/RandomFactionGenerator.java b/MekHQ/src/mekhq/campaign/universe/RandomFactionGenerator.java
diff --git a/MekHQ/src/mekhq/gui/DailyReportLogPanel.java b/MekHQ/src/mekhq/gui/DailyReportLogPanel.java
diff --git a/MekHQ/src/mekhq/gui/dialog/AdvancedReplacementLimbDialog.java b/MekHQ/src/mekhq/gui/dialog/AdvancedReplacementLimbDialog.java
diff --git a/MekHQ/unittests/mekhq/campaign/personnel/education/AcademyFactoryTest.java b/MekHQ/unittests/mekhq/campaign/personnel/education/AcademyFactoryTest.java
diff --git a/MekHQ/unittests/mekhq/campaign/stratCon/StratConTerrainPlacerTest.java b/MekHQ/unittests/mekhq/campaign/stratCon/StratConTerrainPlacerTest.java
