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

Scenario objectives - Part III #1348

Merged
merged 7 commits into from
Nov 20, 2019
Merged

Scenario objectives - Part III #1348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f48abd6
initial work on modifier objectives
NickAragua Nov 9, 2019
50a6193
add objectives to some scenario modifiers; various bugfixes
NickAragua Nov 11, 2019
2af78a4
temporary storage
NickAragua Nov 11, 2019
503d8d0
merge from upstream
NickAragua Nov 15, 2019
7809f13
scenario modifiers data entry complete
NickAragua Nov 18, 2019
c413c54
bug and data fixes
NickAragua Nov 19, 2019
b0e339b
fix incorrect calculation of arrival turn for non-reinforcements
NickAragua Nov 20, 2019
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
46 changes: 23 additions & 23 deletions MekHQ/data/scenariomodifiers/AlliedAirGarrison.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@
<eventTiming>PreForceGeneration</eventTiming>
<forceDefinition>
<actualDeploymentZone>-1</actualDeploymentZone>
<allowAeroBombs>false</allowAeroBombs>
<allowedUnitType>-3</allowedUnitType>
<arrivalTurn>0</arrivalTurn>
<canReinforceLinked>false</canReinforceLinked>
<contributesToBV>true</contributesToBV>
<contributesToMapSize>true</contributesToMapSize>
<contributesToUnitCount>false</contributesToUnitCount>
<deployOffboard>false</deployOffboard>
<deploymentZones>
<deploymentZone>10</deploymentZone>
</deploymentZones>
<destinationZone>4</destinationZone>
<fixedUnitCount>-1</fixedUnitCount>
<forceAlignment>1</forceAlignment>
<forceMultiplier>1.0</forceMultiplier>
<forceName>Allied Air Garrison</forceName>
<generationMethod>3</generationMethod>
<generationOrder>1</generationOrder>
<maxWeightClass>4</maxWeightClass>
<retreatThreshold>75</retreatThreshold>
<startingAltitude>5</startingAltitude>
<syncDeploymentType>None</syncDeploymentType>
<useArtillery>false</useArtillery>
<allowAeroBombs>false</allowAeroBombs>
<allowedUnitType>-3</allowedUnitType>
<arrivalTurn>0</arrivalTurn>
<canReinforceLinked>false</canReinforceLinked>
<contributesToBV>true</contributesToBV>
<contributesToMapSize>true</contributesToMapSize>
<contributesToUnitCount>false</contributesToUnitCount>
<deployOffboard>false</deployOffboard>
<deploymentZones>
<deploymentZone>10</deploymentZone>
</deploymentZones>
<destinationZone>4</destinationZone>
<fixedUnitCount>-1</fixedUnitCount>
<forceAlignment>1</forceAlignment>
<forceMultiplier>1.0</forceMultiplier>
<forceName>Allied Air Garrison</forceName>
<generationMethod>3</generationMethod>
<generationOrder>2</generationOrder>
<maxWeightClass>4</maxWeightClass>
<retreatThreshold>75</retreatThreshold>
<startingAltitude>5</startingAltitude>
<syncDeploymentType>None</syncDeploymentType>
<useArtillery>false</useArtillery>
</forceDefinition>
</AtBScenarioModifier>
48 changes: 24 additions & 24 deletions MekHQ/data/scenariomodifiers/AlliedArtyGarrison.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,29 @@
<benefitsPlayer>true</benefitsPlayer>
<eventTiming>PreForceGeneration</eventTiming>
<forceDefinition>
<actualDeploymentZone>-1</actualDeploymentZone>
<allowAeroBombs>false</allowAeroBombs>
<allowedUnitType>1</allowedUnitType>
<arrivalTurn>0</arrivalTurn>
<canReinforceLinked>false</canReinforceLinked>
<contributesToBV>true</contributesToBV>
<contributesToMapSize>true</contributesToMapSize>
<contributesToUnitCount>false</contributesToUnitCount>
<deployOffboard>false</deployOffboard>
<deploymentZones>
<deploymentZone>10</deploymentZone>
</deploymentZones>
<destinationZone>4</destinationZone>
<fixedUnitCount>-1</fixedUnitCount>
<forceAlignment>1</forceAlignment>
<forceMultiplier>1.0</forceMultiplier>
<forceName>Allied Artillery Garrison</forceName>
<generationMethod>3</generationMethod>
<generationOrder>1</generationOrder>
<maxWeightClass>4</maxWeightClass>
<retreatThreshold>75</retreatThreshold>
<startingAltitude>0</startingAltitude>
<syncDeploymentType>None</syncDeploymentType>
<useArtillery>true</useArtillery>
<actualDeploymentZone>-1</actualDeploymentZone>
<allowAeroBombs>false</allowAeroBombs>
<allowedUnitType>1</allowedUnitType>
<arrivalTurn>0</arrivalTurn>
<canReinforceLinked>false</canReinforceLinked>
<contributesToBV>true</contributesToBV>
<contributesToMapSize>true</contributesToMapSize>
<contributesToUnitCount>false</contributesToUnitCount>
<deployOffboard>false</deployOffboard>
<deploymentZones>
<deploymentZone>10</deploymentZone>
</deploymentZones>
<destinationZone>4</destinationZone>
<fixedUnitCount>-1</fixedUnitCount>
<forceAlignment>1</forceAlignment>
<forceMultiplier>1.0</forceMultiplier>
<forceName>Allied Artillery Garrison</forceName>
<generationMethod>3</generationMethod>
<generationOrder>2</generationOrder>
<maxWeightClass>4</maxWeightClass>
<retreatThreshold>75</retreatThreshold>
<startingAltitude>0</startingAltitude>
<syncDeploymentType>None</syncDeploymentType>
<useArtillery>true</useArtillery>
</forceDefinition>
</AtBScenarioModifier>
30 changes: 0 additions & 30 deletions MekHQ/data/scenariomodifiers/AlliedTrainees.xml
View file
Open in desktop

This file was deleted.

68 changes: 68 additions & 0 deletions MekHQ/data/scenariomodifiers/AlliedTraineesAir.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
<AtBScenarioModifier>
<additionalBriefingText>Three trainees will deploy alongside your force. Keep them alive.</additionalBriefingText>
<benefitsPlayer>true</benefitsPlayer>
<eventTiming>PreForceGeneration</eventTiming>
<forceDefinition>
<actualDeploymentZone>-1</actualDeploymentZone>
<allowAeroBombs>false</allowAeroBombs>
<allowedUnitType>9</allowedUnitType>
<arrivalTurn>0</arrivalTurn>
<canReinforceLinked>false</canReinforceLinked>
<contributesToBV>false</contributesToBV>
<contributesToMapSize>true</contributesToMapSize>
<contributesToUnitCount>true</contributesToUnitCount>
<deployOffboard>false</deployOffboard>
<deploymentZones/>
<destinationZone>4</destinationZone>
<fixedUnitCount>3</fixedUnitCount>
<forceAlignment>0</forceAlignment>
<forceMultiplier>1.0</forceMultiplier>
<forceName>Allied Trainees</forceName>
<generationMethod>3</generationMethod>
<generationOrder>1</generationOrder>
<maxWeightClass>1</maxWeightClass>
<retreatThreshold>0</retreatThreshold>
<startingAltitude>0</startingAltitude>
<syncDeploymentType>SameEdge</syncDeploymentType>
<syncedForceName>Player</syncedForceName>
<useArtillery>false</useArtillery>
</forceDefinition>

<objectives>
<objective>
<associatedForceNames>
<associatedForceName>Allied Trainees</associatedForceName>
</associatedForceNames>
<associatedUnitIDs/>
<successEffects>
<successEffect>
<effectType>ScenarioVictory</effectType>
<effectScaling>Fixed</effectScaling>
<howMuch>1</howMuch>
</successEffect>
</successEffects>
<failureEffects>
<failureEffect>
<effectType>ScenarioDefeat</effectType>
<effectScaling>Fixed</effectScaling>
<howMuch>1</howMuch>
</failureEffect>
<failureEffect>
<effectType>ContractScoreUpdate</effectType>
<effectScaling>Inverted</effectScaling>
<howMuch>-1</howMuch>
</failureEffect>
</failureEffects>
<additionalDetails>
<additionalDetail>Each trainee irrevocably destroyed will reduce contract score by 1.</additionalDetail>
</additionalDetails>
<description>Preserve 100% of the following force(s) and unit(s):</description>
<destinationEdge>NONE</destinationEdge>
<objectiveCriterion>Preserve</objectiveCriterion>
<percentage>100</percentage>
<timeLimit>0</timeLimit>
<timeLimitAtMost>true</timeLimitAtMost>
<timeLimitType>None</timeLimitType>
</objective>
</objectives>
</AtBScenarioModifier>
68 changes: 68 additions & 0 deletions MekHQ/data/scenariomodifiers/AlliedTraineesGround.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
<AtBScenarioModifier>
<additionalBriefingText>Three trainees will deploy alongside your force. Keep them alive.</additionalBriefingText>
<benefitsPlayer>true</benefitsPlayer>
<eventTiming>PreForceGeneration</eventTiming>
<forceDefinition>
<actualDeploymentZone>-1</actualDeploymentZone>
<allowAeroBombs>false</allowAeroBombs>
<allowedUnitType>0</allowedUnitType>
<arrivalTurn>0</arrivalTurn>
<canReinforceLinked>false</canReinforceLinked>
<contributesToBV>false</contributesToBV>
<contributesToMapSize>true</contributesToMapSize>
<contributesToUnitCount>true</contributesToUnitCount>
<deployOffboard>false</deployOffboard>
<deploymentZones/>
<destinationZone>4</destinationZone>
<fixedUnitCount>3</fixedUnitCount>
<forceAlignment>0</forceAlignment>
<forceMultiplier>1.0</forceMultiplier>
<forceName>Allied Trainees</forceName>
<generationMethod>3</generationMethod>
<generationOrder>1</generationOrder>
<maxWeightClass>1</maxWeightClass>
<retreatThreshold>0</retreatThreshold>
<startingAltitude>0</startingAltitude>
<syncDeploymentType>SameEdge</syncDeploymentType>
<syncedForceName>Player</syncedForceName>
<useArtillery>false</useArtillery>
</forceDefinition>

<objectives>
<objective>
<associatedForceNames>
<associatedForceName>Allied Trainees</associatedForceName>
</associatedForceNames>
<associatedUnitIDs/>
<successEffects>
<successEffect>
<effectType>ScenarioVictory</effectType>
<effectScaling>Fixed</effectScaling>
<howMuch>1</howMuch>
</successEffect>
</successEffects>
<failureEffects>
<failureEffect>
<effectType>ScenarioDefeat</effectType>
<effectScaling>Fixed</effectScaling>
<howMuch>1</howMuch>
</failureEffect>
<failureEffect>
<effectType>ContractScoreUpdate</effectType>
<effectScaling>Inverted</effectScaling>
<howMuch>-1</howMuch>
</failureEffect>
</failureEffects>
<additionalDetails>
<additionalDetail>Each trainee irrevocably destroyed will reduce contract score by 1.</additionalDetail>
</additionalDetails>
<description>Preserve 100% of the following force(s) and unit(s):</description>
<destinationEdge>NONE</destinationEdge>
<objectiveCriterion>Preserve</objectiveCriterion>
<percentage>100</percentage>
<timeLimit>0</timeLimit>
<timeLimitAtMost>true</timeLimitAtMost>
<timeLimitType>None</timeLimitType>
</objective>
</objectives>
</AtBScenarioModifier>
3 changes: 3 additions & 0 deletions MekHQ/data/scenariomodifiers/BadIntel.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
<generationOrder>3</generationOrder>
<maxWeightClass>4</maxWeightClass>
<retreatThreshold>0</retreatThreshold>
<objectiveLinkedForces>
<objectiveLinkedForce>Primary Opfor</objectiveLinkedForce>
</objectiveLinkedForces>
<syncDeploymentType>None</syncDeploymentType>
<syncedForceName />
</forceDefinition>
Expand Down
49 changes: 26 additions & 23 deletions MekHQ/data/scenariomodifiers/EnemyAirGarrison.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,31 @@
<eventTiming>PreForceGeneration</eventTiming>
<forceDefinition>
<actualDeploymentZone>-1</actualDeploymentZone>
<allowAeroBombs>false</allowAeroBombs>
<allowedUnitType>-3</allowedUnitType>
<arrivalTurn>0</arrivalTurn>
<canReinforceLinked>false</canReinforceLinked>
<contributesToBV>false</contributesToBV>
<contributesToMapSize>true</contributesToMapSize>
<contributesToUnitCount>false</contributesToUnitCount>
<deployOffboard>false</deployOffboard>
<deploymentZones>
<deploymentZone>9</deploymentZone>
</deploymentZones>
<destinationZone>4</destinationZone>
<fixedUnitCount>-1</fixedUnitCount>
<forceAlignment>2</forceAlignment>
<forceMultiplier>1.0</forceMultiplier>
<forceName>Opfor Air Garrison</forceName>
<generationMethod>3</generationMethod>
<generationOrder>3</generationOrder>
<maxWeightClass>4</maxWeightClass>
<retreatThreshold>75</retreatThreshold>
<startingAltitude>5</startingAltitude>
<syncDeploymentType>None</syncDeploymentType>
<useArtillery>false</useArtillery>
<allowAeroBombs>false</allowAeroBombs>
<allowedUnitType>-3</allowedUnitType>
<arrivalTurn>0</arrivalTurn>
<canReinforceLinked>false</canReinforceLinked>
<contributesToBV>false</contributesToBV>
<contributesToMapSize>true</contributesToMapSize>
<contributesToUnitCount>false</contributesToUnitCount>
<deployOffboard>false</deployOffboard>
<deploymentZones>
<deploymentZone>9</deploymentZone>
</deploymentZones>
<destinationZone>4</destinationZone>
<fixedUnitCount>-1</fixedUnitCount>
<forceAlignment>2</forceAlignment>
<forceMultiplier>1.0</forceMultiplier>
<forceName>Opfor Air Garrison</forceName>
<generationMethod>3</generationMethod>
<generationOrder>5</generationOrder>
<maxWeightClass>4</maxWeightClass>
<objectiveLinkedForces>
<objectiveLinkedForce>Primary Opfor</objectiveLinkedForce>
</objectiveLinkedForces>
<retreatThreshold>75</retreatThreshold>
<startingAltitude>5</startingAltitude>
<syncDeploymentType>None</syncDeploymentType>
<useArtillery>false</useArtillery>
</forceDefinition>
</AtBScenarioModifier>
7 changes: 5 additions & 2 deletions MekHQ/data/scenariomodifiers/EnemyAirSupport.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,12 @@
<forceMultiplier>1.0</forceMultiplier>
<forceName>Opfor Aircraft</forceName>
<generationMethod>3</generationMethod>
<generationOrder>3</generationOrder>
<generationOrder>5</generationOrder>
<maxWeightClass>4</maxWeightClass>
<retreatThreshold>0</retreatThreshold>
<objectiveLinkedForces>
<objectiveLinkedForce>Primary Opfor</objectiveLinkedForce>
</objectiveLinkedForces>
<retreatThreshold>50</retreatThreshold>
<startingAltitude>5</startingAltitude>
<syncDeploymentType>None</syncDeploymentType>
<syncedForceName />
Expand Down
7 changes: 5 additions & 2 deletions MekHQ/data/scenariomodifiers/EnemyAirSupportBombers.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,12 @@
<forceMultiplier>1.0</forceMultiplier>
<forceName>Opfor Aircraft</forceName>
<generationMethod>3</generationMethod>
<generationOrder>3</generationOrder>
<generationOrder>5</generationOrder>
<maxWeightClass>4</maxWeightClass>
<retreatThreshold>0</retreatThreshold>
<objectiveLinkedForces>
<objectiveLinkedForce>Primary Opfor</objectiveLinkedForce>
</objectiveLinkedForces>
<retreatThreshold>50</retreatThreshold>
<startingAltitude>5</startingAltitude>
<syncDeploymentType>None</syncDeploymentType>
<syncedForceName />
Expand Down
Loading