Skip to content

Commit 8256d1c

Browse files
committed
Merge pull request #95 from pheonixstorm/AtB-IORatingFactor
AtB Uses Int Ops Reputation Factor when IO rating is used
2 parents c4cd12f + d5c0c93 commit 8256d1c

File tree

1 file changed

+20
-14
lines changed

1 file changed

+20
-14
lines changed

MekHQ/src/mekhq/campaign/mission/AtBContract.java

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -354,19 +354,25 @@ public static boolean isMinorPower(String fName) {
354354
public void calculatePaymentMultiplier(Campaign campaign) {
355355
int unitRatingMod = campaign.getUnitRatingMod();
356356
double multiplier = 1.0;
357-
if (unitRatingMod >= IUnitRating.DRAGOON_A){
358-
multiplier *= 2.0;
359-
}
360-
if (unitRatingMod == IUnitRating.DRAGOON_B){
361-
multiplier *= 1.5;
362-
}
363-
if (unitRatingMod == IUnitRating.DRAGOON_D){
364-
multiplier *= 0.8;
365-
}
366-
if (unitRatingMod == IUnitRating.DRAGOON_F){
367-
multiplier *= 0.5;
368-
}
369-
357+
// IntOps reputation factor then Dragoons rating
358+
if (campaign.getCampaignOptions().useDragoonRating()
359+
&& campaign.getCampaignOptions().getUnitRatingMethod().equals(mekhq.campaign.rating.UnitRatingMethod.INTERSTELLAR_OPS)) {
360+
multiplier *= (unitRatingMod * .2) + .5;
361+
} else {
362+
if (unitRatingMod >= IUnitRating.DRAGOON_A){
363+
multiplier *= 2.0;
364+
}
365+
if (unitRatingMod == IUnitRating.DRAGOON_B){
366+
multiplier *= 1.5;
367+
}
368+
if (unitRatingMod == IUnitRating.DRAGOON_D){
369+
multiplier *= 0.8;
370+
}
371+
if (unitRatingMod == IUnitRating.DRAGOON_F){
372+
multiplier *= 0.5;
373+
}
374+
}
375+
370376
switch (missionType) {
371377
case MT_CADREDUTY:
372378
multiplier *= 0.8;
@@ -410,7 +416,7 @@ public void calculatePaymentMultiplier(Campaign campaign) {
410416
enemyCode.equals("PIR")) {
411417
multiplier *= 1.1;
412418
}
413-
419+
414420
int cmdrStrategy = 0;
415421
if (campaign.getFlaggedCommander() != null &&
416422
campaign.getFlaggedCommander().getSkill(SkillType.S_STRATEGY) != null) {

0 commit comments

Comments
 (0)