Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjusted Command Rights Scenario Modifiers #5223

Merged
merged 4 commits into from
Nov 23, 2024
Merged

Adjusted Command Rights Scenario Modifiers #5223

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cce2ebd
Rolled Back Command Rights Scenario Modifiers
IllianiCBT Nov 19, 2024
9d560a7
Adjust force parameters and allied ratios for scenario modifiers
IllianiCBT Nov 19, 2024
1d0f4da
Adjust ally ratios for HOUSE and INTEGRATED command rights
IllianiCBT Nov 19, 2024
63db181
Corrected last commit
IllianiCBT Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions MekHQ/data/scenariomodifiers/HouseOfficerAir.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions MekHQ/data/scenariomodifiers/HouseOfficerGround.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions MekHQ/data/scenariomodifiers/IntegratedAlliesAir.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions MekHQ/data/scenariomodifiers/IntegratedAlliesGround.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions MekHQ/src/mekhq/campaign/mission/AtBContract.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 same (G)BV budget
case INTEGRATED -> 0.5; // allies with twice the player's (G)BV budget
};

if (allyRatio > 0) {
Expand Down