From cce2ebd4e701ef1df726ad69293a27715da8f886 Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Tue, 19 Nov 2024 11:29:20 -0600 Subject: [PATCH 1/4] Rolled Back Command Rights Scenario Modifiers Rolled back the command right modifiers for House and Integrated contracts. They will now create forces similar to their pre-50.01 versions. --- MekHQ/data/scenariomodifiers/HouseOfficerAir.xml | 14 +++++++------- .../data/scenariomodifiers/HouseOfficerGround.xml | 14 +++++++------- .../data/scenariomodifiers/IntegratedAlliesAir.xml | 10 +++++----- .../scenariomodifiers/IntegratedAlliesGround.xml | 10 +++++----- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/MekHQ/data/scenariomodifiers/HouseOfficerAir.xml b/MekHQ/data/scenariomodifiers/HouseOfficerAir.xml index 89d4f40c36..f940f5a4e4 100644 --- a/MekHQ/data/scenariomodifiers/HouseOfficerAir.xml +++ b/MekHQ/data/scenariomodifiers/HouseOfficerAir.xml @@ -1,10 +1,10 @@ - Your employer is dispatching a force to assist with this objective. + Your force will be deployed under the command of an allied commander. true PreForceGeneration -1 - true + false 9 0 false @@ -14,14 +14,14 @@ false 5 - 0 - 1 + 1 + 0 1.0 - Joint Force - 2 + Commander + 3 1 4 - 2 + 3 0 5 diff --git a/MekHQ/data/scenariomodifiers/HouseOfficerGround.xml b/MekHQ/data/scenariomodifiers/HouseOfficerGround.xml index 9b4adf84cc..d8bcf1b865 100644 --- a/MekHQ/data/scenariomodifiers/HouseOfficerGround.xml +++ b/MekHQ/data/scenariomodifiers/HouseOfficerGround.xml @@ -1,5 +1,5 @@ - Your employer is dispatching a force to assist with this objective. + Your force will be deployed under the command of an allied commander. AllGroundTerrain SpecificGroundTerrain @@ -8,7 +8,7 @@ PreForceGeneration -1 - true + false 0 0 false @@ -18,14 +18,14 @@ false 5 - 0 - 1 + 1 + 0 1.0 - Joint Force - 2 + Allied Commander + 3 1 4 - 2 + 3 0 0 diff --git a/MekHQ/data/scenariomodifiers/IntegratedAlliesAir.xml b/MekHQ/data/scenariomodifiers/IntegratedAlliesAir.xml index 92bd9440e3..8f72447cdc 100644 --- a/MekHQ/data/scenariomodifiers/IntegratedAlliesAir.xml +++ b/MekHQ/data/scenariomodifiers/IntegratedAlliesAir.xml @@ -1,10 +1,10 @@ - Your employer has deployed you alongside an integrated force. + Your force will be deployed as part of an integrated unit. true PreForceGeneration -1 - true + false 9 0 false @@ -14,11 +14,11 @@ false 5 - 0 + 2 1 - 2.0 + 1.0 Integrated Allies - 2 + 3 1 4 1 diff --git a/MekHQ/data/scenariomodifiers/IntegratedAlliesGround.xml b/MekHQ/data/scenariomodifiers/IntegratedAlliesGround.xml index 7c05288b8c..f5e0fa97cd 100644 --- a/MekHQ/data/scenariomodifiers/IntegratedAlliesGround.xml +++ b/MekHQ/data/scenariomodifiers/IntegratedAlliesGround.xml @@ -1,5 +1,5 @@ - Your employer has deployed you alongside an integrated force. + Your force will be deployed as part of an integrated unit. AllGroundTerrain SpecificGroundTerrain @@ -8,7 +8,7 @@ PreForceGeneration -1 - true + false 0 0 false @@ -18,11 +18,11 @@ false 5 - 0 + 2 1 - 2.0 + 1.0 Integrated Allies - 2 + 3 1 4 1 From 9d560a7e63b7ee0c21a7a69d1e3671e204245622 Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Tue, 19 Nov 2024 12:14:44 -0600 Subject: [PATCH 2/4] Adjust force parameters and allied ratios for scenario modifiers Updated the XML files to change briefing texts, reduce fixed unit counts, and modify force multipliers, names, and generation methods. Additionally, adjusted the allyRatio values for 'HOUSE' and 'INTEGRATED' command rights in AtBContract.java. --- MekHQ/data/scenariomodifiers/HouseOfficerAir.xml | 14 +++++++------- .../data/scenariomodifiers/HouseOfficerGround.xml | 14 +++++++------- .../data/scenariomodifiers/IntegratedAlliesAir.xml | 8 ++++---- .../scenariomodifiers/IntegratedAlliesGround.xml | 8 ++++---- MekHQ/src/mekhq/campaign/mission/AtBContract.java | 4 ++-- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/MekHQ/data/scenariomodifiers/HouseOfficerAir.xml b/MekHQ/data/scenariomodifiers/HouseOfficerAir.xml index f940f5a4e4..8da55adb10 100644 --- a/MekHQ/data/scenariomodifiers/HouseOfficerAir.xml +++ b/MekHQ/data/scenariomodifiers/HouseOfficerAir.xml @@ -1,5 +1,5 @@ - Your force will be deployed under the command of an allied commander. + Your employer is dispatching a force to assist with this objective. true PreForceGeneration @@ -14,14 +14,14 @@ false 5 - 1 - 0 - 1.0 - Commander - 3 + 0 + 1 + 0.25 + Joint Force + 2 1 4 - 3 + 2 0 5 diff --git a/MekHQ/data/scenariomodifiers/HouseOfficerGround.xml b/MekHQ/data/scenariomodifiers/HouseOfficerGround.xml index d8bcf1b865..37c4052685 100644 --- a/MekHQ/data/scenariomodifiers/HouseOfficerGround.xml +++ b/MekHQ/data/scenariomodifiers/HouseOfficerGround.xml @@ -1,5 +1,5 @@ - Your force will be deployed under the command of an allied commander. + Your employer is dispatching a force to assist with this objective. AllGroundTerrain SpecificGroundTerrain @@ -18,14 +18,14 @@ false 5 - 1 - 0 - 1.0 - Allied Commander - 3 + 0 + 1 + 0.25 + Joint Force + 2 1 4 - 3 + 2 0 0 diff --git a/MekHQ/data/scenariomodifiers/IntegratedAlliesAir.xml b/MekHQ/data/scenariomodifiers/IntegratedAlliesAir.xml index 8f72447cdc..916c90c95b 100644 --- a/MekHQ/data/scenariomodifiers/IntegratedAlliesAir.xml +++ b/MekHQ/data/scenariomodifiers/IntegratedAlliesAir.xml @@ -1,5 +1,5 @@ - Your force will be deployed as part of an integrated unit. + Your employer has deployed you alongside an integrated force. true PreForceGeneration @@ -14,11 +14,11 @@ false 5 - 2 + 0 1 - 1.0 + 0.5 Integrated Allies - 3 + 2 1 4 1 diff --git a/MekHQ/data/scenariomodifiers/IntegratedAlliesGround.xml b/MekHQ/data/scenariomodifiers/IntegratedAlliesGround.xml index f5e0fa97cd..a27462937a 100644 --- a/MekHQ/data/scenariomodifiers/IntegratedAlliesGround.xml +++ b/MekHQ/data/scenariomodifiers/IntegratedAlliesGround.xml @@ -1,5 +1,5 @@ - Your force will be deployed as part of an integrated unit. + Your employer has deployed you alongside an integrated force. AllGroundTerrain SpecificGroundTerrain @@ -18,11 +18,11 @@ false 5 - 2 + 0 1 - 1.0 + 0.5 Integrated Allies - 3 + 2 1 4 1 diff --git a/MekHQ/src/mekhq/campaign/mission/AtBContract.java b/MekHQ/src/mekhq/campaign/mission/AtBContract.java index 9b45452716..2ba72666e6 100644 --- 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% of the player's (G)BV budget + case INTEGRATED -> 0.5; // allies with half the player's (G)BV budget }; if (allyRatio > 0) { From 1d0f4dacf7705b8eba9f5a226b96808a2a92472f Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Tue, 19 Nov 2024 12:51:13 -0600 Subject: [PATCH 3/4] Adjust ally ratios for HOUSE and INTEGRATED command rights Updated the HOUSE ally ratio to match the player's (G)BV budget and INTEGRATED ratio to double the player's budget. This change aligns the ratios more accurately with the intended gameplay balance adjustments. --- MekHQ/src/mekhq/campaign/mission/AtBContract.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MekHQ/src/mekhq/campaign/mission/AtBContract.java b/MekHQ/src/mekhq/campaign/mission/AtBContract.java index 2ba72666e6..8e78f083c8 100644 --- 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 -> 0.25; // allies with 25% of the player's (G)BV budget - case INTEGRATED -> 0.5; // allies with half the player's (G)BV budget + case HOUSE -> 0.25; // allies with same (G)BV budget + case INTEGRATED -> 0.5; // allies with twice the player's (G)BV budget }; if (allyRatio > 0) { From 63db181f53886fc2b8fe18afa8969dee6815d2f8 Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Tue, 19 Nov 2024 13:09:50 -0600 Subject: [PATCH 4/4] Corrected last commit --- MekHQ/src/mekhq/campaign/mission/AtBContract.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MekHQ/src/mekhq/campaign/mission/AtBContract.java b/MekHQ/src/mekhq/campaign/mission/AtBContract.java index 8e78f083c8..12b7036503 100644 --- 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 -> 0.25; // allies with same (G)BV budget - case INTEGRATED -> 0.5; // 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) {