Merge pull request #5223 from IllianiCBT/fg3_commandRightModifiers

Adjusted Command Rights Scenario Modifiers
MegaMek · Nov 23, 2024 · 4d65dda · 4d65dda
2 parents 1fad612 + 63db181
commit 4d65dda
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/MekHQ/data/scenariomodifiers/HouseOfficerAir.xml b/MekHQ/data/scenariomodifiers/HouseOfficerAir.xml
@@ -4,7 +4,7 @@
     <eventTiming>PreForceGeneration</eventTiming>
     <forceDefinition>
         <actualDeploymentZone>-1</actualDeploymentZone>
-        <allowAeroBombs>true</allowAeroBombs>
+        <allowAeroBombs>false</allowAeroBombs>
         <allowedUnitType>9</allowedUnitType>
         <arrivalTurn>0</arrivalTurn>
         <canReinforceLinked>false</canReinforceLinked>
@@ -16,7 +16,7 @@
         <destinationZone>5</destinationZone>
         <fixedUnitCount>0</fixedUnitCount>
         <forceAlignment>1</forceAlignment>
-        <forceMultiplier>1.0</forceMultiplier>
+        <forceMultiplier>0.25</forceMultiplier>
         <forceName>Joint Force</forceName>
         <generationMethod>2</generationMethod>
         <generationOrder>1</generationOrder>

diff --git a/MekHQ/data/scenariomodifiers/HouseOfficerGround.xml b/MekHQ/data/scenariomodifiers/HouseOfficerGround.xml
@@ -8,7 +8,7 @@
     <eventTiming>PreForceGeneration</eventTiming>
     <forceDefinition>
         <actualDeploymentZone>-1</actualDeploymentZone>
-        <allowAeroBombs>true</allowAeroBombs>
+        <allowAeroBombs>false</allowAeroBombs>
         <allowedUnitType>0</allowedUnitType>
         <arrivalTurn>0</arrivalTurn>
         <canReinforceLinked>false</canReinforceLinked>
@@ -20,7 +20,7 @@
         <destinationZone>5</destinationZone>
         <fixedUnitCount>0</fixedUnitCount>
         <forceAlignment>1</forceAlignment>
-        <forceMultiplier>1.0</forceMultiplier>
+        <forceMultiplier>0.25</forceMultiplier>
         <forceName>Joint Force</forceName>
         <generationMethod>2</generationMethod>
         <generationOrder>1</generationOrder>

diff --git a/MekHQ/data/scenariomodifiers/IntegratedAlliesAir.xml b/MekHQ/data/scenariomodifiers/IntegratedAlliesAir.xml
@@ -4,7 +4,7 @@
     <eventTiming>PreForceGeneration</eventTiming>
     <forceDefinition>
         <actualDeploymentZone>-1</actualDeploymentZone>
-        <allowAeroBombs>true</allowAeroBombs>
+        <allowAeroBombs>false</allowAeroBombs>
         <allowedUnitType>9</allowedUnitType>
         <arrivalTurn>0</arrivalTurn>
         <canReinforceLinked>false</canReinforceLinked>
@@ -16,7 +16,7 @@
         <destinationZone>5</destinationZone>
         <fixedUnitCount>0</fixedUnitCount>
         <forceAlignment>1</forceAlignment>
-        <forceMultiplier>2.0</forceMultiplier>
+        <forceMultiplier>0.5</forceMultiplier>
         <forceName>Integrated Allies</forceName>
         <generationMethod>2</generationMethod>
         <generationOrder>1</generationOrder>

diff --git a/MekHQ/data/scenariomodifiers/IntegratedAlliesGround.xml b/MekHQ/data/scenariomodifiers/IntegratedAlliesGround.xml
@@ -8,7 +8,7 @@
     <eventTiming>PreForceGeneration</eventTiming>
     <forceDefinition>
         <actualDeploymentZone>-1</actualDeploymentZone>
-        <allowAeroBombs>true</allowAeroBombs>
+        <allowAeroBombs>false</allowAeroBombs>
         <allowedUnitType>0</allowedUnitType>
         <arrivalTurn>0</arrivalTurn>
         <canReinforceLinked>false</canReinforceLinked>
@@ -20,7 +20,7 @@
         <destinationZone>5</destinationZone>
         <fixedUnitCount>0</fixedUnitCount>
         <forceAlignment>1</forceAlignment>
-        <forceMultiplier>2.0</forceMultiplier>
+        <forceMultiplier>0.5</forceMultiplier>
         <forceName>Integrated Allies</forceName>
         <generationMethod>2</generationMethod>
         <generationOrder>1</generationOrder>

diff --git a/MekHQ/src/mekhq/campaign/mission/AtBContract.java b/MekHQ/src/mekhq/campaign/mission/AtBContract.java
@@ -1793,8 +1793,8 @@ public int calculateContractDifficulty(Campaign campaign) {
         double allyRatio = switch (getCommandRights()) {
             case INDEPENDENT    -> 0; // no allies
             case LIAISON        -> 0.4; // single allied heavy/assault mek, pure guess for now
-            case HOUSE          -> 1; // allies with same (G)BV budget
-            case INTEGRATED     -> 2; // allies with twice the player's (G)BV budget
+            case HOUSE          -> 0.25; // allies with 25% the player's (G)BV budget
+            case INTEGRATED     -> 0.5; // allies with 50% the player's (G)BV budget
         };
 
         if (allyRatio > 0) {