feat: Updated Guerilla Warfare XML and Dynamic scenario BV calculations

- Adjusted formatting in `GuerillaWarfare.xml` for clarity - Corrected `forceBVBudget` calculation in `AtBDynamicScenarioFactory.java` for accurate scenario BV adjustment
MegaMek · Jun 22, 2024 · 21bed1c · 21bed1c
1 parent b96c09a
commit 21bed1c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/MekHQ/data/stratconcontractdefinitions/GuerillaWarfare.xml b/MekHQ/data/stratconcontractdefinitions/GuerillaWarfare.xml
@@ -21,7 +21,8 @@
         <objectiveParameter>
 		<objectiveCount>-1</objectiveCount>
 		<objectiveType>AnyScenarioVictory</objectiveType>
-		<objectiveScenarioModifiers>										<objectiveScenarioModifier>OverwhelmingEnemyGroundReinforcements.xml</objectiveScenarioModifier>
+		<objectiveScenarioModifiers>
+            <objectiveScenarioModifier>OverwhelmingEnemyGroundReinforcements.xml</objectiveScenarioModifier>
 			<objectiveScenarioModifier>OverwhelmingEnemyAirReinforcements.xml</objectiveScenarioModifier>
 		</objectiveScenarioModifiers>
         </objectiveParameter>

diff --git a/MekHQ/src/mekhq/campaign/mission/AtBDynamicScenarioFactory.java b/MekHQ/src/mekhq/campaign/mission/AtBDynamicScenarioFactory.java
@@ -380,7 +380,7 @@ public static int generateForce(AtBDynamicScenario scenario, AtBContract contrac
         int forceBVBudget = (int) (effectiveBV * forceTemplate.getForceMultiplier());
 
         if (isScenarioModifier) {
-            forceBVBudget *= campaign.getCampaignOptions().getScenarioModBV();
+            forceBVBudget = (int) (forceBVBudget * ((double) campaign.getCampaignOptions().getScenarioModBV() / 100) * forceTemplate.getForceMultiplier());
         }
 
         int forceUnitBudget = 0;