Merge pull request #7243 from IllianiBird/factionStandingContractPay

Improvement: Implements Faction Standing-based Contract Pay; Added Pay Modifier for Clan Campaigns Pre-Tukayyid

Author: HammerGS

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

@@ -39,6 +39,7 @@
 import static megamek.common.enums.SkillLevel.GREEN;
 import static megamek.common.enums.SkillLevel.REGULAR;
 import static megamek.common.enums.SkillLevel.VETERAN;
+import static mekhq.MHQConstants.BATTLE_OF_TUKAYYID;
 import static mekhq.campaign.Campaign.AdministratorSpecialization.COMMAND;
 import static mekhq.campaign.Campaign.AdministratorSpecialization.LOGISTICS;
 import static mekhq.campaign.Campaign.AdministratorSpecialization.TRANSPORT;
@@ -637,8 +638,18 @@ public double calculatePaymentMultiplier(Campaign campaign, AtBContract contract
             }
         }
 
+        if (campaignOptions.isUseFactionStandingContractPaySafe()) {
+            FactionStandings factionStandings = campaign.getFactionStandings();
+            double regard = factionStandings.getRegardForFaction(employer.getShortName(), true);
+            multiplier *= FactionStandingUtilities.getContractPayMultiplier(regard);
+        }
+
         // FG3 Difficulty Multiplier
-        if (campaignOptions.isUseGenericBattleValue()) {
+        if (campaign.getLocalDate().isBefore(BATTLE_OF_TUKAYYID)
+                  && !employer.isClan()
+                  && enemy.isClan()) {
+            multiplier *= 0.5;
+        } else if (campaignOptions.isUseGenericBattleValue()) {
             int contractDifficulty = contract.getDifficulty();
             if (contractDifficulty != Integer.MIN_VALUE && contractDifficulty <= 2) {
                 multiplier /= 0.5;