Merge pull request #5314 from IllianiCBT/fg3_unitSubstitution

Improved Unit Substitution
MegaMek · Dec 12, 2024 · 038e8b5 · 038e8b5
2 parents ec26416 + 1fb2f5e
commit 038e8b5
Show file tree

Hide file tree

Showing 5 changed files with 203 additions and 87 deletions.
diff --git a/MekHQ/data/scenariotemplates/Convoy Escort.xml b/MekHQ/data/scenariotemplates/Convoy Escort.xml
@@ -110,8 +110,12 @@
                 <useArtillery>false</useArtillery>
                 <roleChoices>
                     <forceRole>CIVILIAN</forceRole>
-                    <forceRole>CARGO</forceRole>
                     <forceRole>SUPPORT</forceRole>
+                    <forceRole>SUPPORT</forceRole>
+                    <forceRole>CARGO</forceRole>
+                    <forceRole>CARGO</forceRole>
+                    <forceRole>CARGO</forceRole>
+                    <forceRole>APC</forceRole>
                     <forceRole>APC</forceRole>
                 </roleChoices>
             </value>

diff --git a/MekHQ/data/scenariotemplates/Convoy Interdiction.xml b/MekHQ/data/scenariotemplates/Convoy Interdiction.xml
@@ -106,8 +106,12 @@
                 <useArtillery>false</useArtillery>
                 <roleChoices>
                     <forceRole>CIVILIAN</forceRole>
-                    <forceRole>CARGO</forceRole>
                     <forceRole>SUPPORT</forceRole>
+                    <forceRole>SUPPORT</forceRole>
+                    <forceRole>CARGO</forceRole>
+                    <forceRole>CARGO</forceRole>
+                    <forceRole>CARGO</forceRole>
+                    <forceRole>APC</forceRole>
                     <forceRole>APC</forceRole>
                 </roleChoices>
             </value>

diff --git a/MekHQ/data/scenariotemplates/Convoy Raid.xml b/MekHQ/data/scenariotemplates/Convoy Raid.xml
@@ -77,7 +77,7 @@
             <value>
                 <actualDeploymentZone>-1</actualDeploymentZone>
                 <allowAeroBombs>false</allowAeroBombs>
-                <allowedUnitType>-2</allowedUnitType>
+                <allowedUnitType>1</allowedUnitType>
                 <arrivalTurn>0</arrivalTurn>
                 <canReinforceLinked>true</canReinforceLinked>
                 <contributesToBV>false</contributesToBV>
@@ -107,7 +107,6 @@
                 <roleChoices>
                     <forceRole>CIVILIAN</forceRole>
                     <forceRole>CARGO</forceRole>
-                    <forceRole>SUPPORT</forceRole>
                     <forceRole>APC</forceRole>
                 </roleChoices>
             </value>

diff --git a/MekHQ/data/scenariotemplates/Critical Convoy Escort.xml b/MekHQ/data/scenariotemplates/Critical Convoy Escort.xml
@@ -110,8 +110,12 @@
                 <useArtillery>false</useArtillery>
                 <roleChoices>
                     <forceRole>CIVILIAN</forceRole>
-                    <forceRole>CARGO</forceRole>
                     <forceRole>SUPPORT</forceRole>
+                    <forceRole>SUPPORT</forceRole>
+                    <forceRole>CARGO</forceRole>
+                    <forceRole>CARGO</forceRole>
+                    <forceRole>CARGO</forceRole>
+                    <forceRole>APC</forceRole>
                     <forceRole>APC</forceRole>
                 </roleChoices>
             </value>