Squeezing in a couple more data things

New Sprites + Data #2345: Infantry force assignment tables + Data #2365: Incorrect battle armor manipulator location
MegaMek · Nov 9, 2020 · 13bd14e · 13bd14e
1 parent eb9aee5
commit 13bd14e
Show file tree

Hide file tree

Showing 105 changed files with 7,298 additions and 3,565 deletions.
diff --git a/megamek/data/forcegenerator/2398.xml b/megamek/data/forcegenerator/2398.xml
@@ -364,6 +364,14 @@
 		<model name='(Laser)'>
 			<availability>General:6,Periphery.Deep:5,Periphery:5</availability>
 		</model>
+    <model name='(Laser Marine)'>
+      <roles>marine</roles>
+      <availability>General:2</availability>
+    </model>
+    <model name='(Laser XCT)'>
+      <roles>xct,marine</roles>
+      <availability>General:1</availability>
+    </model>
 		<model name='(Flamer)'>
 			<availability>General:8</availability>
 		</model>
@@ -376,6 +384,13 @@
 		<model name='(Rifle)'>
 			<availability>General:8</availability>
 		</model>
+    <model name='(Rifle Light)'>
+      <availability>IS:8</availability>
+    </model>
+    <model name='(Rifle Paratrooper)'>
+      <roles>paratrooper</roles>
+      <availability>IS:3,Periphery:2</availability>
+    </model>
 	</chassis>
 	<chassis name='Hammerhead' unitType='Aero'>
 		<availability>TH:4</availability>
@@ -597,6 +612,14 @@
 		<model name='(Laser)'>
 			<availability>General:6,Periphery.Deep:5,Periphery:5</availability>
 		</model>
+    <model name='(Fieldworks)'>
+      <roles>engineer</roles>
+      <availability>IS:2,Periphery:1</availability>
+    </model>
+    <model name='(Nonlethal)'>
+      <roles>anti_infantry,urban</roles>
+      <availability>General:3</availability>
+    </model>
 	</chassis>
 	<chassis name='Narukami Destroyer' unitType='Warship'>
 		<availability>DC:3</availability>

diff --git a/megamek/data/forcegenerator/2440.xml b/megamek/data/forcegenerator/2440.xml
@@ -433,6 +433,14 @@
 		<model name='(Laser)'>
 			<availability>General:6,Periphery.Deep:5,Periphery:5</availability>
 		</model>
+    <model name='(Laser Marine)'>
+      <roles>marine</roles>
+      <availability>General:2</availability>
+    </model>
+    <model name='(Laser XCT)'>
+      <roles>xct,marine</roles>
+      <availability>General:1</availability>
+    </model>
 		<model name='(Flamer)'>
 			<availability>General:8</availability>
 		</model>
@@ -445,6 +453,13 @@
 		<model name='(Rifle)'>
 			<availability>General:8</availability>
 		</model>
+    <model name='(Rifle Light)'>
+      <availability>IS:8</availability>
+    </model>
+    <model name='(Rifle Paratrooper)'>
+      <roles>paratrooper</roles>
+      <availability>IS:3,Periphery:2</availability>
+    </model>
 	</chassis>
 	<chassis name='Hammerhead' unitType='Aero'>
 		<availability>TH:5</availability>
@@ -694,6 +709,14 @@
 		<model name='(Laser)'>
 			<availability>General:6,Periphery.Deep:5,Periphery:5</availability>
 		</model>
+    <model name='(Fieldworks)'>
+      <roles>engineer</roles>
+      <availability>IS:2,Periphery:1</availability>
+    </model>
+    <model name='(Nonlethal)'>
+      <roles>anti_infantry,urban</roles>
+      <availability>General:3</availability>
+    </model>
 	</chassis>
 	<chassis name='Narukami Destroyer' unitType='Warship'>
 		<availability>DC:4</availability>

diff --git a/megamek/data/forcegenerator/2460.xml b/megamek/data/forcegenerator/2460.xml
@@ -456,6 +456,14 @@
 		<model name='(Laser)'>
 			<availability>General:6,Periphery.Deep:5,Periphery:5</availability>
 		</model>
+    <model name='(Laser Marine)'>
+      <roles>marine</roles>
+      <availability>General:2</availability>
+    </model>
+    <model name='(Laser XCT)'>
+      <roles>xct,marine</roles>
+      <availability>General:1</availability>
+    </model>
 		<model name='(Flamer)'>
 			<availability>General:8</availability>
 		</model>
@@ -468,6 +476,13 @@
 		<model name='(Rifle)'>
 			<availability>General:8</availability>
 		</model>
+    <model name='(Rifle Light)'>
+      <availability>IS:8</availability>
+    </model>
+    <model name='(Rifle Paratrooper)'>
+      <roles>paratrooper</roles>
+      <availability>IS:3,Periphery:2</availability>
+    </model>
 	</chassis>
 	<chassis name='Gladiator' unitType='Mek'>
 		<availability>DC:1</availability>
@@ -763,7 +778,15 @@
 		<model name='(Laser)'>
 			<availability>General:6,Periphery.Deep:5,Periphery:5</availability>
 		</model>
-	</chassis>
+    <model name='(Fieldworks)'>
+      <roles>engineer</roles>
+      <availability>IS:2,Periphery:1</availability>
+    </model>
+    <model name='(Nonlethal)'>
+      <roles>anti_infantry,urban</roles>
+      <availability>General:3</availability>
+    </model>
+  </chassis>
 	<chassis name='Mustang Fighter' unitType='Conventional Fighter'>
 		<availability>FS:4</availability>
 		<model name='(Standard)'>

diff --git a/megamek/data/forcegenerator/2470.xml b/megamek/data/forcegenerator/2470.xml
@@ -507,6 +507,14 @@
 		<model name='(Laser)'>
 			<availability>General:6,Periphery.Deep:5,Periphery:5</availability>
 		</model>
+    <model name='(Laser Marine)'>
+      <roles>marine</roles>
+      <availability>General:2</availability>
+    </model>
+    <model name='(Laser XCT)'>
+      <roles>xct,marine</roles>
+      <availability>General:1</availability>
+    </model>
 		<model name='(Flamer)'>
 			<availability>General:8</availability>
 		</model>
@@ -519,6 +527,13 @@
 		<model name='(Rifle)'>
 			<availability>General:8</availability>
 		</model>
+    <model name='(Rifle Light)'>
+      <availability>IS:8</availability>
+    </model>
+    <model name='(Rifle Paratrooper)'>
+      <roles>paratrooper</roles>
+      <availability>IS:3,Periphery:2</availability>
+    </model>
 	</chassis>
 	<chassis name='Gladiator' unitType='Mek'>
 		<availability>DC:1</availability>
@@ -895,7 +910,15 @@
 		<model name='(Laser)'>
 			<availability>General:6,Periphery.Deep:5,Periphery:5</availability>
 		</model>
-	</chassis>
+    <model name='(Fieldworks)'>
+      <roles>engineer</roles>
+      <availability>IS:2,Periphery:1</availability>
+    </model>
+    <model name='(Nonlethal)'>
+      <roles>anti_infantry,urban</roles>
+      <availability>General:3</availability>
+    </model>
+  </chassis>
 	<chassis name='Mustang Fighter' unitType='Conventional Fighter'>
 		<availability>FS:5</availability>
 		<model name='(Standard)'>

diff --git a/megamek/data/forcegenerator/2490.xml b/megamek/data/forcegenerator/2490.xml
@@ -604,6 +604,14 @@
 		<model name='(Laser)'>
 			<availability>General:6,Periphery.Deep:5,Periphery:5</availability>
 		</model>
+    <model name='(Laser Marine)'>
+      <roles>marine</roles>
+      <availability>General:2</availability>
+    </model>
+    <model name='(Laser XCT)'>
+      <roles>xct,marine</roles>
+      <availability>General:1</availability>
+    </model>
 		<model name='(Flamer)'>
 			<availability>General:8</availability>
 		</model>
@@ -616,14 +624,18 @@
 		<model name='(Rifle)'>
 			<availability>General:8</availability>
 		</model>
-	</chassis>
-	<chassis name='Frogmen' unitType='Infantry'>
-		<availability>IS:1,FS:3,Periphery:1</availability>
-		<model name='Blue Water Marine Response Teams (Frogmen)'>
-			<roles>specops</roles>
-			<availability>General:8</availability>
-		</model>
-	</chassis>
+    <model name='(Light Scout)'>
+      <roles>recon</roles>
+      <availability>IS:8</availability>
+    </model>
+    <model name='(Rifle Light)'>
+      <availability>IS:7</availability>
+    </model>
+    <model name='(Rifle Paratrooper)'>
+      <roles>paratrooper</roles>
+      <availability>IS:3,Periphery:2</availability>
+    </model>
+  </chassis>
 	<chassis name='Gladiator' unitType='Mek'>
 		<availability>CC:1,OA:1,PoR:1,LA:1,FWL:1,FS:1,MERC:1,DC:1,TC:1,Periphery:1</availability>
 		<model name='GLD-3R'>
@@ -773,12 +785,6 @@
 			<availability>General:6</availability>
 		</model>
 	</chassis>
-	<chassis name='Hover Assault Infantry' unitType='Infantry'>
-		<availability>IS:4,Periphery:4</availability>
-		<model name='Johnston Industries Rapid Response Force'>
-			<availability>General:8</availability>
-		</model>
-	</chassis>
 	<chassis name='Hurricane Conventional Fighter' unitType='Conventional Fighter'>
 		<availability>TH:8,IS:6</availability>
 		<model name='(Standard)'>
@@ -842,12 +848,9 @@
 		<model name='(MG)'>
 			<availability>General:7</availability>
 		</model>
-	</chassis>
-	<chassis name='Jump Support Infantry' unitType='Infantry'>
-		<availability>IS:2,Periphery:2</availability>
-		<model name='Star Corps Jump Assault Infantry'>
-			<availability>General:8</availability>
-		</model>
+    <model name='(GL)'>
+      <availability>IS:2,Periphery:2</availability>
+    </model>
 	</chassis>
 	<chassis name='Korvin Tank' unitType='Tank'>
 		<availability>CC:7</availability>
@@ -1095,12 +1098,12 @@
 			<availability>General:8</availability>
 		</model>
 	</chassis>
-	<chassis name='Motorized Heavy Infantry' unitType='Infantry'>
-		<availability>IS:3,Periphery:3</availability>
-		<model name='Motstand/Mimir Troop'>
-			<availability>IS:8,Periphery:8</availability>
-		</model>
-	</chassis>
+  <chassis name='Motorized Heavy Infantry' unitType='Infantry'>
+    <availability>DC.PR:3</availability>
+    <model name='Motstand/Mimir Troop'>
+      <availability>DC.PR:8</availability>
+    </model>
+  </chassis>
 	<chassis name='Motorized Platoon' unitType='Infantry'>
 		<availability>IS:9,Periphery.Deep:9,Periphery:9</availability>
 		<model name='(Flamer)'>
@@ -1121,8 +1124,23 @@
 		<model name='(Laser)'>
 			<availability>General:6,Periphery.Deep:5,Periphery:5</availability>
 		</model>
-	</chassis>
-	<chassis name='Mustang Fighter' unitType='Conventional Fighter'>
+    <model name='(Fieldworks)'>
+      <roles>engineer</roles>
+      <availability>IS:2,Periphery:1</availability>
+    </model>
+    <model name='(Nonlethal)'>
+      <roles>anti_infantry,urban</roles>
+      <availability>General:3</availability>
+    </model>
+  </chassis>
+  <chassis name='Motorized Sub Platoon' unitType='Infantry'>
+    <availability>IS:1,FS:3,Periphery:1</availability>
+    <model name='(Laser SCUBA)'>
+      <roles>specops,marine</roles>
+      <availability>IS:9</availability>
+    </model>
+  </chassis>
+  <chassis name='Mustang Fighter' unitType='Conventional Fighter'>
 		<availability>FS:6</availability>
 		<model name='(Standard)'>
 			<availability>General:8</availability>
@@ -1251,13 +1269,6 @@
 			<availability>General:8</availability>
 		</model>
 	</chassis>
-	<chassis name='Scout Infantry' unitType='Infantry'>
-		<availability>IS:2</availability>
-		<model name='The Battle Corps - Baker Street Irregulars'>
-			<roles>recon</roles>
-			<availability>IS:8</availability>
-		</model>
-	</chassis>
 	<chassis name='Seydlitz' unitType='Aero'>
 		<availability>LA:3</availability>
 		<model name='SYD-21'>