diff --git a/MekHQ/src/mekhq/campaign/mission/AtBContract.java b/MekHQ/src/mekhq/campaign/mission/AtBContract.java index de1717d9c4..2cb4184f96 100644 --- a/MekHQ/src/mekhq/campaign/mission/AtBContract.java +++ b/MekHQ/src/mekhq/campaign/mission/AtBContract.java @@ -354,19 +354,25 @@ public static boolean isMinorPower(String fName) { public void calculatePaymentMultiplier(Campaign campaign) { int unitRatingMod = campaign.getUnitRatingMod(); double multiplier = 1.0; - if (unitRatingMod >= IUnitRating.DRAGOON_A){ - multiplier *= 2.0; - } - if (unitRatingMod == IUnitRating.DRAGOON_B){ - multiplier *= 1.5; - } - if (unitRatingMod == IUnitRating.DRAGOON_D){ - multiplier *= 0.8; - } - if (unitRatingMod == IUnitRating.DRAGOON_F){ - multiplier *= 0.5; - } - + // IntOps reputation factor then Dragoons rating + if (campaign.getCampaignOptions().useDragoonRating() + && campaign.getCampaignOptions().getUnitRatingMethod().equals(mekhq.campaign.rating.UnitRatingMethod.INTERSTELLAR_OPS)) { + multiplier *= (unitRatingMod * .2) + .5; + } else { + if (unitRatingMod >= IUnitRating.DRAGOON_A){ + multiplier *= 2.0; + } + if (unitRatingMod == IUnitRating.DRAGOON_B){ + multiplier *= 1.5; + } + if (unitRatingMod == IUnitRating.DRAGOON_D){ + multiplier *= 0.8; + } + if (unitRatingMod == IUnitRating.DRAGOON_F){ + multiplier *= 0.5; + } + } + switch (missionType) { case MT_CADREDUTY: multiplier *= 0.8; @@ -410,7 +416,7 @@ public void calculatePaymentMultiplier(Campaign campaign) { enemyCode.equals("PIR")) { multiplier *= 1.1; } - + int cmdrStrategy = 0; if (campaign.getFlaggedCommander() != null && campaign.getFlaggedCommander().getSkill(SkillType.S_STRATEGY) != null) {