From 2944fdd23de1d569878648f770f0332d9302b04a Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 26 Jan 2022 18:23:43 -0500 Subject: [PATCH] Fixing build failures due to missing campaign parameters --- MekHQ/src/mekhq/campaign/mission/AtBScenario.java | 2 +- .../campaign/mission/atb/AtBScenarioModifierApplicator.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/MekHQ/src/mekhq/campaign/mission/AtBScenario.java b/MekHQ/src/mekhq/campaign/mission/AtBScenario.java index 64f38d80b3..e531bfb13c 100644 --- a/MekHQ/src/mekhq/campaign/mission/AtBScenario.java +++ b/MekHQ/src/mekhq/campaign/mission/AtBScenario.java @@ -788,7 +788,7 @@ private void setStandardMissionForces(Campaign campaign) { // aaand for fun, run everyone through the crew upgrader if (campaign.getCampaignOptions().useAbilities()) { - AtBDynamicScenarioFactory.upgradeBotCrews(this); + AtBDynamicScenarioFactory.upgradeBotCrews(this, campaign); } } diff --git a/MekHQ/src/mekhq/campaign/mission/atb/AtBScenarioModifierApplicator.java b/MekHQ/src/mekhq/campaign/mission/atb/AtBScenarioModifierApplicator.java index 16eb179247..b9eb4277a7 100644 --- a/MekHQ/src/mekhq/campaign/mission/atb/AtBScenarioModifierApplicator.java +++ b/MekHQ/src/mekhq/campaign/mission/atb/AtBScenarioModifierApplicator.java @@ -67,7 +67,7 @@ private static void postAddForce(Campaign campaign, AtBDynamicScenario scenario, // the most recently added bot force is the one we just generated BotForce generatedBotForce = scenario.getBotForce(scenario.getNumBots() - 1); generatedBotForce.setStart(deploymentZone); - AtBDynamicScenarioFactory.setDeploymentTurns(generatedBotForce, templateToApply, scenario); + AtBDynamicScenarioFactory.setDeploymentTurns(generatedBotForce, templateToApply, scenario, campaign); AtBDynamicScenarioFactory.setDestinationZone(generatedBotForce, templateToApply); // at this point, we have to re-translate the scenario objectives @@ -340,8 +340,7 @@ public static void applyObjective(AtBDynamicScenario scenario, Campaign campaign * Applies an additional event, selected from only modifiers that benefit the player or do not benefit the player */ public static void applyExtraEvent(AtBDynamicScenario scenario, boolean goodEvent) { - scenario.addScenarioModifier(AtBScenarioModifier.getRandomBattleModifier(scenario.getTemplate().mapParameters.getMapLocation(), - (Boolean) goodEvent)); + scenario.addScenarioModifier(AtBScenarioModifier.getRandomBattleModifier(scenario.getTemplate().mapParameters.getMapLocation(), goodEvent)); } /**