Skip to content

Commit

Permalink
Merge pull request #5167 from IllianiCBT/fg3_trainees
Browse files Browse the repository at this point in the history
[FG3] Updated Infantry Generation Method and Trainee Settings
  • Loading branch information
IllianiCBT authored Nov 7, 2024
2 parents 31221ca + 31447a0 commit 47baf16
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 70 deletions.
41 changes: 7 additions & 34 deletions MekHQ/data/scenariomodifiers/AlliedTraineesAir.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<AtBScenarioModifier>
<additionalBriefingText>Three trainees will deploy alongside your force. Keep them alive.</additionalBriefingText>
<additionalBriefingText>A force of trainees will deploy alongside your force. Keep them alive.</additionalBriefingText>
<allowedMapLocations>
<allowedMapLocation>Space</allowedMapLocation>
<allowedMapLocation>LowAtmosphere</allowedMapLocation>
Expand All @@ -18,47 +18,20 @@
<deployOffboard>false</deployOffboard>
<deploymentZones />
<destinationZone>5</destinationZone>
<fixedUnitCount>3</fixedUnitCount>
<fixedUnitCount>-1</fixedUnitCount>
<forceAlignment>0</forceAlignment>
<forceMultiplier>1.0</forceMultiplier>
<forceName>Allied Trainees</forceName>
<forceMultiplier>0.25</forceMultiplier>
<forceName>Trainees</forceName>
<generationMethod>3</generationMethod>
<generationOrder>1</generationOrder>
<maxWeightClass>1</maxWeightClass>
<retreatThreshold>0</retreatThreshold>
<startingAltitude>5</startingAltitude>
<objectiveLinkedForces>
<objectiveLinkedForce>Player</objectiveLinkedForce>
</objectiveLinkedForces>
<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>
</failureEffects>
<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>
39 changes: 6 additions & 33 deletions MekHQ/data/scenariomodifiers/AlliedTraineesGround.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<AtBScenarioModifier>
<additionalBriefingText>Three trainees will deploy alongside your lance. Keep them alive.</additionalBriefingText>
<additionalBriefingText>A force of trainees will deploy alongside your lance. Keep them alive.</additionalBriefingText>
<allowedMapLocations>
<allowedMapLocation>AllGroundTerrain</allowedMapLocation>
<allowedMapLocation>SpecificGroundTerrain</allowedMapLocation>
Expand All @@ -18,47 +18,20 @@
<deployOffboard>false</deployOffboard>
<deploymentZones />
<destinationZone>5</destinationZone>
<fixedUnitCount>3</fixedUnitCount>
<fixedUnitCount>-1</fixedUnitCount>
<forceAlignment>0</forceAlignment>
<forceMultiplier>1.0</forceMultiplier>
<forceName>Allied Trainees</forceName>
<forceName>Trainees</forceName>
<generationMethod>3</generationMethod>
<generationOrder>1</generationOrder>
<maxWeightClass>1</maxWeightClass>
<retreatThreshold>0</retreatThreshold>
<startingAltitude>0</startingAltitude>
<objectiveLinkedForces>
<objectiveLinkedForce>Player</objectiveLinkedForce>
</objectiveLinkedForces>
<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>
</failureEffects>
<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>
2 changes: 1 addition & 1 deletion MekHQ/data/scenariomodifiers/LocalGarrisonInfantry.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<AtBScenarioModifier>
<additionalBriefingText>Planetary garrison infantry have been reported in the area.</additionalBriefingText>
<additionalBriefingText>Planetary garrison infantry are reported in the area.</additionalBriefingText>
<allowedMapLocations>
<allowedMapLocation>AllGroundTerrain</allowedMapLocation>
<allowedMapLocation>SpecificGroundTerrain</allowedMapLocation>
Expand Down
2 changes: 1 addition & 1 deletion MekHQ/data/scenariotemplates/Irregular Force Assault.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
<forceAlignment>2</forceAlignment>
<forceMultiplier>1.0</forceMultiplier>
<forceName>Infantry</forceName>
<generationMethod>1</generationMethod>
<generationMethod>2</generationMethod>
<generationOrder>5</generationOrder>
<maxWeightClass>4</maxWeightClass>
<minWeightClass>0</minWeightClass>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<forceAlignment>2</forceAlignment>
<forceMultiplier>1.0</forceMultiplier>
<forceName>Infantry</forceName>
<generationMethod>1</generationMethod>
<generationMethod>2</generationMethod>
<generationOrder>5</generationOrder>
<maxWeightClass>4</maxWeightClass>
<minWeightClass>0</minWeightClass>
Expand Down

0 comments on commit 47baf16

Please sign in to comment.