From 31447a05532063379bd6d4bcce607f796e368c68 Mon Sep 17 00:00:00 2001
From: IllianiCBT <danielfarbrace@icloud.com>
Date: Mon, 4 Nov 2024 13:22:14 -0600
Subject: [PATCH] Update infantry generation method and trainee settings

Changed infantry generation method in two scenario templates to improve realism. Updated text and settings in several scenario modifiers for trainee forces, including dynamic unit count and objective linkage to player forces.
---
 .../scenariomodifiers/AlliedTraineesAir.xml   | 41 ++++---------------
 .../AlliedTraineesGround.xml                  | 39 +++---------------
 .../LocalGarrisonInfantry.xml                 |  2 +-
 .../Irregular Force Assault.xml               |  2 +-
 .../Irregular Force Suppression.xml           |  2 +-
 5 files changed, 16 insertions(+), 70 deletions(-)

diff --git a/MekHQ/data/scenariomodifiers/AlliedTraineesAir.xml b/MekHQ/data/scenariomodifiers/AlliedTraineesAir.xml
index 12d891360b..c542231e58 100644
--- a/MekHQ/data/scenariomodifiers/AlliedTraineesAir.xml
+++ b/MekHQ/data/scenariomodifiers/AlliedTraineesAir.xml
@@ -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>
@@ -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>
diff --git a/MekHQ/data/scenariomodifiers/AlliedTraineesGround.xml b/MekHQ/data/scenariomodifiers/AlliedTraineesGround.xml
index 541eb29e03..3bfd740ce1 100644
--- a/MekHQ/data/scenariomodifiers/AlliedTraineesGround.xml
+++ b/MekHQ/data/scenariomodifiers/AlliedTraineesGround.xml
@@ -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>
@@ -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>
diff --git a/MekHQ/data/scenariomodifiers/LocalGarrisonInfantry.xml b/MekHQ/data/scenariomodifiers/LocalGarrisonInfantry.xml
index abe7e5156d..3e38fe8a32 100644
--- a/MekHQ/data/scenariomodifiers/LocalGarrisonInfantry.xml
+++ b/MekHQ/data/scenariomodifiers/LocalGarrisonInfantry.xml
@@ -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>
diff --git a/MekHQ/data/scenariotemplates/Irregular Force Assault.xml b/MekHQ/data/scenariotemplates/Irregular Force Assault.xml
index dd580c0567..61250f98a3 100644
--- a/MekHQ/data/scenariotemplates/Irregular Force Assault.xml	
+++ b/MekHQ/data/scenariotemplates/Irregular Force Assault.xml	
@@ -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>
diff --git a/MekHQ/data/scenariotemplates/Irregular Force Suppression.xml b/MekHQ/data/scenariotemplates/Irregular Force Suppression.xml
index 888e0afc3d..00e585486c 100644
--- a/MekHQ/data/scenariotemplates/Irregular Force Suppression.xml	
+++ b/MekHQ/data/scenariotemplates/Irregular Force Suppression.xml	
@@ -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>