Merge branch 'master' into mapTabDisplayDelay

# Conflicts:
#	MekHQ/src/mekhq/gui/InterstellarMapPanel.java

Author: IllianiBird

MekHQ/docs/history.txt

@@ -185,6 +185,8 @@ MEKHQ VERSION HISTORY:
 + PR #6286: Increased Minimum Skill Requirement For Replacement Limb Procedures to Match RAW
 + PR #6291: Added Handling for When Unit Quality is Manually Set to Empty or null Quality
 + PR #6292: Added Specific Handling for Legacy Prisoner Capture Styles
++ Fix #5977: Updated Label Texts for Clarity in Campaign Options IIC
++ PR #6298: Added Employer Modifiers to Contract Negotiations
 
 0.50.03 (2025-02-02 2030 UTC)
 + PR #5568: Spare parts rules reference adjustment

MekHQ/resources/mekhq/resources/CampaignOptionsDialog.properties

@@ -488,10 +488,10 @@ lblUseTimeInRank.tooltip=Track the amount of time an active person has had their
 lblTimeInRankDisplayFormat.text=Display Time in Rank
 lblTimeInRankDisplayFormat.tooltip=This is the format used to display the length the person has\
   \ spent in their current rank.
-lblTrackTotalEarnings.text=Track Total Earnings
+lblTrackTotalEarnings.text=Track Total C-Bill Earnings
 lblTrackTotalEarnings.tooltip=This tracks the total amount earned by personnel. The tracking is\
   \ only done when this option is enabled, and it is not backfilled.
-lblTrackTotalXPEarnings.text=Display Total Earnings
+lblTrackTotalXPEarnings.text=Track Total XP Earnings
 lblTrackTotalXPEarnings.tooltip=This tracks the total amount of experience earned by personnel. The\
   \ tracking is only done when this option is enabled, and it is not backfilled.
 lblShowOriginFaction.text=Display Origin Faction

MekHQ/src/mekhq/campaign/market/contractMarket/AtbMonthlyContractMarket.java

@@ -30,7 +30,6 @@
 
 import megamek.common.Compute;
 import megamek.common.annotations.Nullable;
-import megamek.common.enums.SkillLevel;
 import megamek.logging.MMLogger;
 import mekhq.MekHQ;
 import mekhq.campaign.Campaign;
@@ -53,6 +52,10 @@
 import static java.lang.Math.floor;
 import static megamek.codeUtilities.MathUtility.clamp;
 import static megamek.common.Compute.d6;
+import static megamek.common.enums.SkillLevel.ELITE;
+import static megamek.common.enums.SkillLevel.GREEN;
+import static megamek.common.enums.SkillLevel.REGULAR;
+import static megamek.common.enums.SkillLevel.VETERAN;
 import static mekhq.campaign.mission.AtBContract.getEffectiveNumUnits;
 import static mekhq.campaign.randomEvents.GrayMonday.isGrayMonday;
 
@@ -331,7 +334,7 @@ private void checkForSubcontracts(Campaign campaign, AtBContract contract, int u
         setEnemyRating(contract, campaign.getGameYear());
 
         if (contract.getContractType().isCadreDuty()) {
-            contract.setAllySkill(SkillLevel.GREEN);
+            contract.setAllySkill(GREEN);
             contract.setAllyQuality(IUnitRating.DRAGOON_F);
         }
 
@@ -415,7 +418,7 @@ protected AtBContract generateAtBSubcontract(Campaign campaign,
         setEnemyRating(contract, campaign.getGameYear());
 
         if (contract.getContractType().isCadreDuty()) {
-            contract.setAllySkill(SkillLevel.GREEN);
+            contract.setAllySkill(GREEN);
             contract.setAllyQuality(IUnitRating.DRAGOON_F);
         }
         contract.calculateLength(campaign.getCampaignOptions().isVariableContractLength());
@@ -700,26 +703,29 @@ private void setContractClauses(AtBContract contract, int unitRatingMod, Campaig
             mods.mods[i] += missionMods[contract.getContractType().ordinal()][i];
         }
 
-        if (Factions.getInstance().getFaction(contract.getEmployerCode()).isISMajorOrSuperPower()) {
-            mods.mods[CLAUSE_SALVAGE] += -1;
+        Faction employerFaction = contract.getEmployerFaction();
+
+        if (employerFaction.isISMajorOrSuperPower()) {
+            mods.mods[CLAUSE_SALVAGE] -= 1;
             mods.mods[CLAUSE_TRANSPORT] += 1;
-        }
-        if (AtBContract.isMinorPower(contract.getEmployerCode())) {
-            mods.mods[CLAUSE_SALVAGE] += -2;
-        }
-        if (contract.getEmployerFaction().isMercenary()) {
-            mods.mods[CLAUSE_COMMAND] += -1;
+        } else if (employerFaction.isMinorPower()) {
+            mods.mods[CLAUSE_SALVAGE] -= 2;
+        } else if (employerFaction.isMercenary()) {
+            mods.mods[CLAUSE_COMMAND] -= 1;
             mods.mods[CLAUSE_SALVAGE] += 2;
             mods.mods[CLAUSE_SUPPORT] += 1;
             mods.mods[CLAUSE_TRANSPORT] += 1;
-        }
-        if (contract.getEmployerCode().equals("IND")) {
-            mods.mods[CLAUSE_COMMAND] += 0;
-            mods.mods[CLAUSE_SALVAGE] += -1;
-            mods.mods[CLAUSE_SUPPORT] += -1;
-            mods.mods[CLAUSE_TRANSPORT] += 0;
+        } else if (employerFaction.getShortName().equals("IND")) {
+            mods.mods[CLAUSE_SALVAGE] -= 1;
+            mods.mods[CLAUSE_SUPPORT] -= 1;
         }
 
+        int modifier = getEmployerNegotiatorModifier(employerFaction);
+        mods.mods[CLAUSE_COMMAND] -= modifier;
+        mods.mods[CLAUSE_SALVAGE] -= modifier;
+        mods.mods[CLAUSE_SUPPORT] -= modifier;
+        mods.mods[CLAUSE_TRANSPORT] -= modifier;
+
         if (campaign.getFaction().isMercenary()) {
             rollCommandClause(contract, mods.mods[CLAUSE_COMMAND]);
         } else {
@@ -730,4 +736,32 @@ private void setContractClauses(AtBContract contract, int unitRatingMod, Campaig
         rollSupportClause(contract, mods.mods[CLAUSE_SUPPORT]);
         rollTransportClause(contract, mods.mods[CLAUSE_TRANSPORT]);
     }
+
+    /**
+     * Calculates the negotiation modifier for a contract based on the employer's faction type.
+     * The modifier reflects the negotiation capabilities of the employer, making it harder to
+     * achieve favorable results with more influential or powerful employers.
+     *
+     * <p>The negotiation modifier is determined as follows:
+     * <ul>
+     *   <li>Default: A "Green" modifier is used for most employers.</li>
+     *   <li>Major or superpower faction: A "Regular" modifier is applied.</li>
+     *   <li>Clan faction: A "Veteran" modifier is applied.</li>
+     *   <li>ComStar or Word of Blake (WoB): An "Elite" modifier is applied.</li>
+     * </ul>
+     *
+     * @param employerFaction The {@link Faction} that is performing the negotiation.
+     * @return An integer representing the negotiation modifier corresponding to the employer's capabilities.
+     */
+    private static int getEmployerNegotiatorModifier(Faction employerFaction) {
+        if (employerFaction.isMajorOrSuperPower()) {
+            return REGULAR.getExperienceLevel();
+        } else if (employerFaction.isClan()) {
+            return VETERAN.getExperienceLevel();
+        } else if (employerFaction.isComStarOrWoB()) {
+            return ELITE.getExperienceLevel();
+        }
+
+        return GREEN.getExperienceLevel();
+    }
 }

MekHQ/src/mekhq/gui/InterstellarMapPanel.java

@@ -122,7 +122,7 @@ public InterstellarMapPanel(Campaign c, CampaignGUI view) {
         systems = campaign.getSystems();
         hqview = view;
         jumpPath = new JumpPath();
-        optionPanelHidden = true;
+        optionPanelHidden = false;
         optionPanelTimer = new Timer(0, new ActionListener() {
             Point viewPoint = new Point();
 

MekHQ/src/mekhq/gui/stratcon/CampaignManagementDialog.java

@@ -71,8 +71,8 @@ public void display(Campaign campaign, StratconCampaignState campaignState,
                         StratconTrackState currentTrack, boolean gmMode) {
         currentCampaignState = campaignState;
 
-        btnRemoveCVP.setEnabled(currentCampaignState.getVictoryPoints() > 0);
-        btnGMRemoveSP.setEnabled(currentCampaignState.getSupportPoints() > 0);
+        btnRemoveCVP.setEnabled(gmMode);
+        btnGMRemoveSP.setEnabled(gmMode);
         btnGMAddVP.setEnabled(gmMode);
         btnGMAddSP.setEnabled(gmMode);