diff --git a/megamek/data/forcegenerator/2398.xml b/megamek/data/forcegenerator/2398.xml
index 8355ed1e83a..8f06ce78242 100644
--- a/megamek/data/forcegenerator/2398.xml
+++ b/megamek/data/forcegenerator/2398.xml
@@ -364,6 +364,14 @@
General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ General:2
+
+
+ xct,marine
+ General:1
+
General:8
@@ -376,6 +384,13 @@
General:8
+
+ IS:8
+
+
+ paratrooper
+ IS:3,Periphery:2
+
TH:4
@@ -597,6 +612,14 @@
General:6,Periphery.Deep:5,Periphery:5
+
+ engineer
+ IS:2,Periphery:1
+
+
+ anti_infantry,urban
+ General:3
+
DC:3
diff --git a/megamek/data/forcegenerator/2440.xml b/megamek/data/forcegenerator/2440.xml
index e9a8349836f..566109b6697 100644
--- a/megamek/data/forcegenerator/2440.xml
+++ b/megamek/data/forcegenerator/2440.xml
@@ -433,6 +433,14 @@
General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ General:2
+
+
+ xct,marine
+ General:1
+
General:8
@@ -445,6 +453,13 @@
General:8
+
+ IS:8
+
+
+ paratrooper
+ IS:3,Periphery:2
+
TH:5
@@ -694,6 +709,14 @@
General:6,Periphery.Deep:5,Periphery:5
+
+ engineer
+ IS:2,Periphery:1
+
+
+ anti_infantry,urban
+ General:3
+
DC:4
diff --git a/megamek/data/forcegenerator/2460.xml b/megamek/data/forcegenerator/2460.xml
index 0d23ecac527..fdf18788954 100644
--- a/megamek/data/forcegenerator/2460.xml
+++ b/megamek/data/forcegenerator/2460.xml
@@ -456,6 +456,14 @@
General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ General:2
+
+
+ xct,marine
+ General:1
+
General:8
@@ -468,6 +476,13 @@
General:8
+
+ IS:8
+
+
+ paratrooper
+ IS:3,Periphery:2
+
DC:1
@@ -763,7 +778,15 @@
General:6,Periphery.Deep:5,Periphery:5
-
+
+ engineer
+ IS:2,Periphery:1
+
+
+ anti_infantry,urban
+ General:3
+
+
FS:4
diff --git a/megamek/data/forcegenerator/2470.xml b/megamek/data/forcegenerator/2470.xml
index d497ef1d164..6e40cd736f7 100644
--- a/megamek/data/forcegenerator/2470.xml
+++ b/megamek/data/forcegenerator/2470.xml
@@ -507,6 +507,14 @@
General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ General:2
+
+
+ xct,marine
+ General:1
+
General:8
@@ -519,6 +527,13 @@
General:8
+
+ IS:8
+
+
+ paratrooper
+ IS:3,Periphery:2
+
DC:1
@@ -895,7 +910,15 @@
General:6,Periphery.Deep:5,Periphery:5
-
+
+ engineer
+ IS:2,Periphery:1
+
+
+ anti_infantry,urban
+ General:3
+
+
FS:5
diff --git a/megamek/data/forcegenerator/2490.xml b/megamek/data/forcegenerator/2490.xml
index b484e2b8ec9..a63c9182cb4 100644
--- a/megamek/data/forcegenerator/2490.xml
+++ b/megamek/data/forcegenerator/2490.xml
@@ -604,6 +604,14 @@
General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ General:2
+
+
+ xct,marine
+ General:1
+
General:8
@@ -616,14 +624,18 @@
General:8
-
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
+
+ recon
+ IS:8
+
+
+ IS:7
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
CC:1,OA:1,PoR:1,LA:1,FWL:1,FS:1,MERC:1,DC:1,TC:1,Periphery:1
@@ -773,12 +785,6 @@
General:6
-
- IS:4,Periphery:4
-
- General:8
-
-
TH:8,IS:6
@@ -842,12 +848,9 @@
General:7
-
-
- IS:2,Periphery:2
-
- General:8
-
+
+ IS:2,Periphery:2
+
CC:7
@@ -1095,12 +1098,12 @@
General:8
-
- IS:3,Periphery:3
-
- IS:8,Periphery:8
-
-
+
+ DC.PR:3
+
+ DC.PR:8
+
+
IS:9,Periphery.Deep:9,Periphery:9
@@ -1121,8 +1124,23 @@
General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ engineer
+ IS:2,Periphery:1
+
+
+ anti_infantry,urban
+ General:3
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
FS:6
General:8
@@ -1251,13 +1269,6 @@
General:8
-
- IS:2
-
- recon
- IS:8
-
-
LA:3
diff --git a/megamek/data/forcegenerator/2520.xml b/megamek/data/forcegenerator/2520.xml
index 3683f97e705..733d48902e4 100644
--- a/megamek/data/forcegenerator/2520.xml
+++ b/megamek/data/forcegenerator/2520.xml
@@ -728,6 +728,14 @@
General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ General:2
+
+
+ xct,marine
+ General:1
+
General:8
@@ -740,14 +748,18 @@
General:8
-
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
+
+ recon
+ IS:8
+
+
+ IS:7
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
TH:4,IS:6,Periphery.Deep:6,Periphery:6
@@ -904,12 +916,6 @@
General:5
-
- IS:4,Periphery:4
-
- General:8
-
-
TH:8,IS:6
@@ -974,12 +980,9 @@
General:7
-
-
- IS:2,Periphery:2
-
- General:8
-
+
+ IS:2,Periphery:2
+
CC:7
@@ -1248,12 +1251,12 @@
General:8
-
- IS:3,Periphery:3
-
- IS:8,Periphery:8
-
-
+
+ DC.PR:3
+
+ DC.PR:8
+
+
IS:9,Periphery.Deep:9,Periphery:9
@@ -1274,8 +1277,23 @@
General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ engineer
+ IS:2,Periphery:1
+
+
+ anti_infantry,urban
+ General:3
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
FS:6
General:8
@@ -1463,13 +1481,6 @@
General:8
-
- IS:2
-
- recon
- IS:8
-
-
LA:4,FWL:2,FS:2,MERC:2,DC:2
diff --git a/megamek/data/forcegenerator/2571.xml b/megamek/data/forcegenerator/2571.xml
index 519d5293ba1..5e59ce8ee76 100644
--- a/megamek/data/forcegenerator/2571.xml
+++ b/megamek/data/forcegenerator/2571.xml
@@ -281,9 +281,9 @@
General:2
-
+
IS:2
-
+
anti_mek
IS:8
@@ -993,6 +993,14 @@
General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ General:2,OA:3,SL:4
+
+
+ xct,marine
+ General:2
+
General:8
@@ -1005,7 +1013,32 @@
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:5
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+
+ IS:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ General:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
LA:3,SL:5,IS:3,RWR:2,FS:3
@@ -1013,13 +1046,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
SL:5
@@ -1218,12 +1244,6 @@
MOC:8,OA:8,SL:8,FS:8
-
- IS:4,Periphery:4
-
- General:8
-
-
CC:4,MOC:2,IS:4,RWR:2,FS:4,Periphery:2,TC:2,OA:2,LA:4,Periphery.MW:4,SL:5,Periphery.ME:4,FWL:4,DC:4
@@ -1316,12 +1336,9 @@
General:7
-
-
- IS:2,Periphery:2
-
- General:8
-
+
+ IS:2,Periphery:2
+
PIR:2,IS:4,Periphery.Deep:4,Periphery:4
@@ -1719,9 +1736,9 @@
- IS:3,Periphery:3
+ DC.PR:3
- IS:8,Periphery:8
+ DC.PR:8
@@ -1744,8 +1761,27 @@
General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ xct
+ IS:2,SL:4
+
+
+ engineer
+ IS:2,Periphery:1
+
+
+ anti_infantry,urban
+ General:3
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
FS:4
General:8
@@ -2055,13 +2091,6 @@
LA:8,General:8,Periphery.Deep:8,MERC:8,Periphery:8
-
- IS:2
-
- recon
- IS:8
-
-
MOC:3,Periphery.R:3,OA:3,LA:4,FWL:3,FS:3,MERC:3,DC:3,Periphery:3,TC:2
@@ -2418,13 +2447,13 @@
General:6
-
- MOC:1,OA:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
LA:5
diff --git a/megamek/data/forcegenerator/2650.xml b/megamek/data/forcegenerator/2650.xml
index 0979084cabf..96c161d3ff6 100644
--- a/megamek/data/forcegenerator/2650.xml
+++ b/megamek/data/forcegenerator/2650.xml
@@ -280,9 +280,9 @@
General:2
-
+
IS:2
-
+
anti_mek
IS:8
@@ -1026,19 +1026,59 @@
General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ General:2,OA:3,SL:4
+
+
+ xct,marine
+ General:2,SL:3,TC:4
+
General:8
General:5
+
+ IS:2,MERC:3
+
General:5
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:5
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ General:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
LA:4,SL:6,IS:4,RWR:3,FS:4,Periphery:2
@@ -1046,13 +1086,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
SL:6
@@ -1278,12 +1311,6 @@
MOC:8,OA:8,SL:8,FS:8
-
- IS:4,Periphery:4
-
- General:8
-
-
CC:5,MOC:4,IS:5,Periphery.Deep:4,RWR:4,FS:5,Periphery:4,TC:4,OA:4,LA:5,Periphery.MW:5,SL:6,Periphery.ME:5,FWL:5,DC:5
@@ -1384,12 +1411,9 @@
General:7
-
-
- IS:2,Periphery:2
-
- General:8
-
+
+ IS:2,Periphery:2
+
SL:4
@@ -1742,6 +1766,10 @@
General:8
+
+ recon,engineer
+ General:2,SL:5
+
SL:7,IS:7,Periphery.Deep:7,Periphery:7
@@ -1856,9 +1884,9 @@
- IS:3,Periphery:3
+ DC.PR:3
- IS:8,Periphery:8
+ DC.PR:8
@@ -1881,8 +1909,27 @@
General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ xct
+ IS:2,SL:4
+
+
+ engineer
+ IS:4,Periphery:2
+
+
+ anti_infantry,urban
+ General:3
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
FS:2
General:8
@@ -2234,13 +2281,6 @@
LA:8,General:8,Periphery.Deep:8,MERC:8,Periphery:8
-
- IS:2
-
- recon
- IS:8
-
-
CC:2,LA:7,SL:4,FWL:2,RWR:2,FS:2,DC:2
@@ -2701,13 +2741,13 @@
General:5
-
- MOC:1,OA:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
LA:5
diff --git a/megamek/data/forcegenerator/2700.xml b/megamek/data/forcegenerator/2700.xml
index eecb8557f16..057e6a41161 100644
--- a/megamek/data/forcegenerator/2700.xml
+++ b/megamek/data/forcegenerator/2700.xml
@@ -312,9 +312,9 @@
General:2
-
+
IS:2
-
+
anti_mek
IS:8
@@ -1224,19 +1224,59 @@
General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ General:2,OA:3,SL:4
+
+
+ xct,marine
+ General:2,SL:3,TC:3
+
General:8
General:5
+
+ IS:2,MERC:3
+
General:5
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:5
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:2+,SL.R:4,Periphery:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ General:2+,SL.R:4+
+
+ recon,specops,paratrooper
+ General:8
+
+
LA:5,SL:6,IS:5,RWR:4,FS:5,Periphery:3
@@ -1244,13 +1284,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
CC:2,LA:2,SL:6,FWL:2,RWR:2,FS:2,MERC:2,DC:2
@@ -1534,12 +1567,6 @@
General:8
-
- IS:4,Periphery:4
-
- General:8
-
-
CC:5,MOC:5,IS:5,Periphery.Deep:5,RWR:5,FS:5,Periphery:5,TC:5,OA:5,LA:5,Periphery.MW:5,SL:6,Periphery.ME:5,FWL:5,DC:5
@@ -1664,13 +1691,17 @@
General:7
-
-
- IS:2,Periphery:2
-
- General:8
-
-
+
+ IS:2,Periphery:2
+
+
+
+ IS:2
+
+ specops
+ IS:5,DC:7
+
+
CC:2,LA:2,SL:5,FWL:2,RWR:2,FS:2,DC:2
@@ -2097,6 +2128,10 @@
General:8
+
+ recon,engineer
+ General:2,SL:5
+
SL:7,IS:7,Periphery.Deep:7,Periphery:7
@@ -2232,9 +2267,9 @@
- IS:3,Periphery:3
+ DC.RR:3
- IS:8,Periphery:8
+ DC.RR:8
@@ -2257,8 +2292,27 @@
General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ xct
+ IS:2,SL:4
+
+
+ engineer
+ IS:4,Periphery:2
+
+
+ anti_infantry,urban
+ General:3
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
SL:5,IS:5,Periphery.Deep:4,Periphery:4
SL:3
@@ -2730,13 +2784,6 @@
LA:8,General:8,Periphery.Deep:8,MERC:8,Periphery:8
-
- IS:2
-
- recon
- IS:8
-
-
CC:2,MOC:2,OA:2,LA:2,SL:4,FWL:2,FS:2,DC:2,TC:2
@@ -3361,13 +3408,13 @@
General:4
-
- MOC:1,OA:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
LA:3
diff --git a/megamek/data/forcegenerator/2765.xml b/megamek/data/forcegenerator/2765.xml
index fa7f4e0eac1..5a33a7688f0 100644
--- a/megamek/data/forcegenerator/2765.xml
+++ b/megamek/data/forcegenerator/2765.xml
@@ -326,9 +326,9 @@
General:2
-
+
IS:2
-
+
anti_mek
IS:8
@@ -1281,19 +1281,59 @@
General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ General:2,OA:3,SL:4
+
+
+ xct,marine
+ General:2,SL:3,TC:4
+
General:8
General:5
+
+ IS:2,MERC:3
+
General:5
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:5
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:2+,SL.R:4,Periphery:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ General:2+,SL.R:4+
+
+ recon,specops,paratrooper
+ General:8
+
+
LA:5,SL:6,IS:5,RWR:4,FS:5,Periphery:3
@@ -1301,13 +1341,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
CC:3,LA:3,SL:7,FWL:3,RWR:3,FS:4,MERC:3,DC:3
@@ -1597,12 +1630,6 @@
General:8
-
- IS:4,Periphery:4
-
- General:8
-
-
CC:5,MOC:5,IS:5,Periphery.Deep:5,RWR:5,FS:5,Periphery:5,TC:5,OA:5,LA:5,Periphery.MW:5,SL:5,Periphery.ME:5,FWL:5,DC:5
@@ -1751,13 +1778,17 @@
General:7
-
-
- IS:2,Periphery:2
-
- General:8
-
-
+
+ IS:2,Periphery:2
+
+
+
+ IS:2
+
+ specops
+ IS:5,DC:7
+
+
CC:3,LA:3,SL:5,FWL:4,RWR:2,FS:3,DC:3
@@ -2182,6 +2213,10 @@
General:8
+
+ recon,engineer
+ General:2,SL:5
+
SL:7,IS:7,Periphery.Deep:7,Periphery:7
@@ -2344,9 +2379,9 @@
- IS:3,Periphery:3
+ DC.RR:3
- IS:8,Periphery:8
+ DC.RR:8
@@ -2369,8 +2404,27 @@
General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ xct
+ IS:2,SL:4
+
+
+ engineer
+ IS:4,Periphery:2
+
+
+ anti_infantry,urban
+ General:3
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
SL:5,IS:6,Periphery.Deep:6,Periphery:6
SL:4
@@ -2871,13 +2925,6 @@
LA:8,General:8,Periphery.Deep:8,MERC:8,Periphery:8
-
- IS:2
-
- recon
- IS:8
-
-
CC:3,MOC:3,OA:3,LA:3,SL:4,FWL:3,IS:2,FS:3,DC:3,TC:3
@@ -3554,13 +3601,13 @@
General:8
-
- MOC:1,OA:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
LA:3
diff --git a/megamek/data/forcegenerator/2780.xml b/megamek/data/forcegenerator/2780.xml
index 6bfdb3edfa4..7bc5b66e0c5 100644
--- a/megamek/data/forcegenerator/2780.xml
+++ b/megamek/data/forcegenerator/2780.xml
@@ -338,9 +338,9 @@
SLIE:8
-
+
IS:2
-
+
anti_mek
IS:8
@@ -1376,19 +1376,59 @@
General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ General:2,OA:3
+
+
+ xct,marine
+ General:2,SL:3,TC:4
+
General:8
General:5
+
+ IS:2,MERC:3
+
General:5
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:5
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:2+,SL.R:4,Periphery:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ General:2+,SL.R:4+
+
+ recon,specops,paratrooper
+ General:8
+
+
CS:4,LA:5,SL:6,IS:5,NIOPS:4,FS:5,Periphery:3
@@ -1396,13 +1436,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
CC:5,LA:5,SL:7,FWL:5,FS:6,MERC:5,DC:5
@@ -1724,12 +1757,6 @@
General:8
-
- IS:4,Periphery:4
-
- General:8
-
-
IS:1,Periphery:1
@@ -1905,14 +1932,18 @@
General:7
-
-
- IS:2,Periphery:2
-
- General:8
-
-
-
+
+ IS:2,Periphery:2
+
+
+
+ IS:2
+
+ specops
+ IS:5,DC:7
+
+
+
PP:5,CC:3,CS:2,SLIE:5,LA:3,SL:5,FWL:4,NIOPS:2,FS:3,DC:3
PP:4,General:8
@@ -2355,6 +2386,10 @@
General:8
+
+ recon,engineer
+ General:2,SL:3
+
SL:7,IS:7,Periphery.Deep:7,Periphery:7
@@ -2508,9 +2543,9 @@
- IS:3,Periphery:3
+ DC.RR:3
- IS:8,Periphery:8
+ DC.RR:8
@@ -2533,8 +2568,27 @@
General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ xct
+ IS:2
+
+
+ engineer
+ IS:4,Periphery:2
+
+
+ anti_infantry,urban
+ General:3,SL:5,CS:7
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
SL:5,IS:7,Periphery.Deep:8,Periphery:8
SL:4
@@ -3043,13 +3097,6 @@
LA:8,General:8,Periphery.Deep:8,MERC:8,Periphery:8
-
- IS:2
-
- recon
- IS:8
-
-
CC:4,MOC:3,IS:4,FS:4,CIR:3,Periphery:2,TC:3,CS:5,OA:3,LA:4,SL:4,FWL:4,NIOPS:5,DC:4
@@ -3763,13 +3810,13 @@
General:8
-
- MOC:1,OA:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
LA:3-
diff --git a/megamek/data/forcegenerator/2807.xml b/megamek/data/forcegenerator/2807.xml
index 27a4a950dc3..89ebe4258bd 100644
--- a/megamek/data/forcegenerator/2807.xml
+++ b/megamek/data/forcegenerator/2807.xml
@@ -342,9 +342,9 @@
General:2
-
+
IS:2
-
+
anti_mek
IS:8
@@ -1382,19 +1382,59 @@
General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ IS:3,OA:3,Periphery:2
+
+
+ xct,marine
+ General:3,TC:4
+
General:8
General:5
+
+ IS:2,MERC:3
+
General:5
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:6
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:2+,Periphery:1
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ General:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
PP:6,CS:4,LA:5,IS:5,NIOPS:4,FS:5,Periphery:3
@@ -1402,13 +1442,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
PP:7,CC:5,LA:5,FWL:5,FS:6,MERC:5,DC:5
@@ -1738,12 +1771,6 @@
General:8
-
- IS:4,Periphery:4
-
- General:8
-
-
IS:1,Periphery:1
@@ -1919,14 +1946,18 @@
General:7
-
-
- IS:2,Periphery:2
-
- General:8
-
-
-
+
+ IS:2,Periphery:2
+
+
+
+ IS:2
+
+ specops
+ IS:5,DC:7
+
+
+
PP:5,CC:3,CS:2,LA:3,FWL:4,NIOPS:2,FS:3,DC:3
PP:4,General:8
@@ -2359,6 +2390,10 @@
General:8
+
+ recon,engineer
+ General:2
+
IS:7,Periphery.Deep:7,Periphery:7
@@ -2506,9 +2541,9 @@
- IS:3,Periphery:3
+ DC.RR:3
- IS:8,Periphery:8
+ DC.RR:8
@@ -2531,8 +2566,27 @@
General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ xct
+ IS:2
+
+
+ engineer
+ IS:4,Periphery:2
+
+
+ anti_infantry,urban
+ General:4,CS:7
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
IS:7,Periphery.Deep:8,Periphery:8
cargo,civilian
@@ -3007,13 +3061,6 @@
LA:8,General:8,Periphery.Deep:8,MERC:8,Periphery:8
-
- IS:2
-
- recon
- IS:8
-
-
PP:4,CC:4,MOC:3,IS:4,FS:4,CIR:3,TC:3,Periphery:2,CS:5,OA:3,LA:4,FWL:4,NIOPS:5,DC:4
@@ -3709,13 +3756,13 @@
General:8
-
- MOC:1,OA:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
LA:3-
diff --git a/megamek/data/forcegenerator/2815.xml b/megamek/data/forcegenerator/2815.xml
index 00a3a34cec3..e31e286e8ce 100644
--- a/megamek/data/forcegenerator/2815.xml
+++ b/megamek/data/forcegenerator/2815.xml
@@ -522,9 +522,9 @@
CSA:8,CLAN:8,CCO:8
-
+
IS:2
-
+
anti_mek
IS:8
@@ -1715,19 +1715,59 @@
General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ IS:3,OA:3,Periphery:2
+
+
+ xct,marine
+ General:3,TC:4
+
General:8
General:5
+
+ IS:2,MERC:3
+
General:5
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:7
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:1+,Periphery:1
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ General:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
PP:6,CS:4,CHH:4,LA:5,CBS:4,CLAN:4,IS:5,NIOPS:4,FS:5,Periphery:3
@@ -1735,13 +1775,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
PP:7,CC:4,CHH:8,CW:8,LA:4,CLAN:8,FWL:4,FS:4,MERC:4,CJF:8,DC:4,CGB:8
@@ -2074,12 +2107,6 @@
General:8
-
- IS:4,Periphery:4
-
- General:8
-
-
IS:1,Periphery:1
@@ -2259,14 +2286,18 @@
General:7
-
-
- IS:2,Periphery:2
-
- General:8
-
-
-
+
+ IS:2,Periphery:2
+
+
+
+ IS:2
+
+ specops
+ IS:5,DC:7
+
+
+
PP:5,CC:3,CS:2,CHH:6,LA:3,CLAN:5,FWL:4,NIOPS:2,FS:3,DC:3
PP:4,General:8
@@ -2702,6 +2733,10 @@
General:8
+
+ recon,engineer
+ General:2
+
IS:7,Periphery.Deep:7,Periphery:7
@@ -2860,9 +2895,9 @@
- IS:3,Periphery:3
+ DC.RR:3
- IS:8,Periphery:8
+ DC.RR:8
@@ -2885,8 +2920,27 @@
General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ xct
+ IS:2
+
+
+ engineer
+ IS:4,Periphery:2
+
+
+ anti_infantry,urban
+ General:4,CS:7
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
CLAN:5,IS:7,Periphery.Deep:8,Periphery:8
cargo,civilian
@@ -3398,13 +3452,6 @@
LA:8,General:8,Periphery.Deep:8,MERC:8,Periphery:8
-
- IS:2
-
- recon
- IS:8
-
-
PP:4,CC:4,MOC:3,IS:4,FS:4,CIR:3,Periphery:2,TC:3,CS:5,OA:3,LA:4,FWL:4,NIOPS:5,DC:4
@@ -4127,13 +4174,13 @@
General:8
-
- MOC:1,OA:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
LA:3-
diff --git a/megamek/data/forcegenerator/2823.xml b/megamek/data/forcegenerator/2823.xml
index fd316886ed5..70968c9823f 100644
--- a/megamek/data/forcegenerator/2823.xml
+++ b/megamek/data/forcegenerator/2823.xml
@@ -601,9 +601,9 @@
CLAN:3
-
+
IS:2
-
+
anti_mek
IS:8
@@ -1788,19 +1788,59 @@
General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ IS:3,OA:3,Periphery:2
+
+
+ xct,marine
+ General:3,TC:4
+
General:8
General:5
+
+ IS:2,MERC:3
+
General:5
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:7
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:1+,Periphery:1
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ IS:1+,Periphery:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
CS:4,CHH:4,LA:4,CBS:4,CLAN:4,IS:4,NIOPS:4,FS:4,Periphery:3
@@ -1808,13 +1848,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
CC:4,CHH:8,CW:8,LA:4,CLAN:8,FWL:4,FS:4,MERC:4,CJF:8,DC:4,CGB:8
@@ -2158,12 +2191,6 @@
General:8
-
- IS:4,Periphery:4
-
- General:8
-
-
IS:1,Periphery:1
@@ -2353,14 +2380,18 @@
General:7
-
-
- IS:2,Periphery:2
-
- General:8
-
-
-
+
+ IS:2,Periphery:2
+
+
+
+ IS:2
+
+ specops
+ IS:5,DC:7
+
+
+
CC:2,CS:2,CHH:6,LA:2,CLAN:5,FWL:4,NIOPS:2,FS:2,DC:2
General:8
@@ -2801,6 +2832,10 @@
General:8
+
+ recon,engineer
+ General:2
+
IS:7,Periphery.Deep:7,Periphery:7
@@ -2969,9 +3004,9 @@
- IS:3,Periphery:3
+ DC.RR:3
- IS:8,Periphery:8
+ DC.RR:8
@@ -2994,8 +3029,27 @@
General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ xct
+ IS:2
+
+
+ engineer
+ IS:4,Periphery:2
+
+
+ anti_infantry,urban
+ General:4,CS:7
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
CLAN:5,IS:7,Periphery.Deep:8,Periphery:8
cargo,civilian
@@ -3519,13 +3573,6 @@
LA:8,General:8,Periphery.Deep:8,MERC:8,Periphery:8
-
- IS:2
-
- recon
- IS:8
-
-
CC:4,MOC:3,IS:5,FS:4,CIR:3,Periphery:2,TC:3,CS:5,OA:3,LA:4,FWL:4,NIOPS:5,DC:4
@@ -4324,13 +4371,13 @@
General:8
-
- MOC:1,OA:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
CHH:4,CIH:4,CSR:4,CLAN:4,CFM:4,CSJ:6
diff --git a/megamek/data/forcegenerator/2830.xml b/megamek/data/forcegenerator/2830.xml
index af4d604e56e..344bfc0054f 100644
--- a/megamek/data/forcegenerator/2830.xml
+++ b/megamek/data/forcegenerator/2830.xml
@@ -600,9 +600,9 @@
CLAN:4,BAN:1
-
+
IS:2
-
+
anti_mek
IS:8
@@ -866,13 +866,6 @@
IS:6-,Periphery.Deep:6-,Periphery:6-
-
- CS:3
-
- engineer
- General:8
-
-
CS:3,CLAN:4,IS:6,NIOPS:3,Periphery.Deep:7,MERC:5,BAN:5,Periphery:7
@@ -1808,19 +1801,59 @@
General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ IS:3,OA:3,Periphery:2
+
+
+ xct,marine
+ General:3,TC:4
+
General:8
General:5
+
+ IS:2,MERC:3
+
General:5
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:7
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:1+,Periphery:1
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ IS:1+,Periphery:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
CS:4,CHH:4,LA:4,CBS:4,CLAN:4,IS:3,NIOPS:4,FS:4,Periphery:3
@@ -1828,13 +1861,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
CC:3,CHH:8,CW:8,LA:3,CLAN:8,FWL:3,FS:4,MERC:3,CJF:8,DC:3,CGB:8
@@ -2191,12 +2217,6 @@
General:8
-
- IS:4,Periphery:4
-
- General:8
-
-
IS:1,Periphery:1
@@ -2410,14 +2430,18 @@
General:7
-
-
- IS:2,Periphery:2
-
- General:8
-
-
-
+
+ IS:2,Periphery:2
+
+
+
+ IS:2
+
+ specops
+ IS:5,DC:7
+
+
+
CC:2,CS:2,CHH:6,LA:2,CLAN:5,FWL:3,NIOPS:2,FS:2,DC:2
General:8,BAN:4
@@ -2863,6 +2887,10 @@
General:8
+
+ recon,engineer
+ General:2
+
IS:7,Periphery.Deep:7,Periphery:7
@@ -2884,7 +2912,11 @@
General:5
-
+
+ engineer
+ General:1,FS:2,LA:2,CS:3
+
+
IS:7,Periphery.Deep:7,Periphery:7
@@ -3029,14 +3061,14 @@
- IS:3,Periphery:3
+ DC.RR:3
- IS:8,Periphery:8
+ DC.RR:8
-
+
BAN:8
-
+
BAN:8
@@ -3060,8 +3092,27 @@
General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ xct
+ IS:2
+
+
+ engineer
+ IS:4,Periphery:2
+
+
+ anti_infantry,urban
+ General:4,CS:7
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
CLAN:5,IS:7,Periphery.Deep:8,BAN:4,Periphery:8
cargo,civilian
@@ -3589,13 +3640,6 @@
LA:8,General:8,Periphery.Deep:8,MERC:8,Periphery:8
-
- IS:2
-
- recon
- IS:8
-
-
CC:4,MOC:3,IS:5,FS:4,CIR:3,Periphery:2,TC:3,CS:5,OA:3,LA:4,FWL:4,NIOPS:5,DC:4
@@ -4394,13 +4438,13 @@
General:8
-
- MOC:1,OA:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
CHH:4,CIH:4,CSR:4,CLAN:4,CFM:4,CSJ:6
diff --git a/megamek/data/forcegenerator/2835.xml b/megamek/data/forcegenerator/2835.xml
index bd2885e515d..12307192fd4 100644
--- a/megamek/data/forcegenerator/2835.xml
+++ b/megamek/data/forcegenerator/2835.xml
@@ -604,9 +604,9 @@
CLAN:6,BAN:1
-
+
IS:2
-
+
anti_mek
IS:8
@@ -900,13 +900,6 @@
IS:8,Periphery.Deep:8,Periphery:8
-
- CS:3
-
- engineer
- General:8
-
-
CS:3,CLAN:4,IS:6,NIOPS:3,Periphery.Deep:7,MERC:5,BAN:5,Periphery:7
@@ -1869,19 +1862,59 @@
General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ IS:3,OA:3,Periphery:2
+
+
+ xct,marine
+ General:3,TC:4
+
General:8
General:5
+
+ IS:2,MERC:3
+
General:5
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:8
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:1+,Periphery:1
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ IS:1+,Periphery:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
CS:4,CHH:4,LA:3,CBS:4,CLAN:3,IS:3,NIOPS:4,FS:3,Periphery:3
@@ -1889,13 +1922,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
CC:2,CHH:8,CW:8,LA:2,CLAN:7,FWL:2,FS:3,MERC:2,CJF:8,DC:2,CGB:8
@@ -2283,12 +2309,6 @@
General:8
-
- IS:4,Periphery:4
-
- General:8
-
-
IS:1,Periphery:1
@@ -2533,20 +2553,27 @@
General:6,Periphery.Deep:5,Periphery:5
+
+ General:4+,Periphery:3+
+
General:8
General:7
-
-
- IS:2,Periphery:2
-
- General:8
-
-
-
+
+ IS:2,Periphery:2
+
+
+
+ IS:2
+
+ specops
+ IS:5,DC:7
+
+
+
CC:1,CS:2,CHH:5,LA:1,CLAN:4,FWL:3,NIOPS:2,FS:1,DC:1
General:8,BAN:3
@@ -3035,6 +3062,10 @@
General:8
+
+ recon,engineer
+ General:2
+
IS:7,Periphery.Deep:7,Periphery:7
@@ -3056,7 +3087,11 @@
General:5
-
+
+ engineer
+ General:1,FS:2,LA:2,CS:3
+
+
IS:7,Periphery.Deep:7,Periphery:7
@@ -3215,14 +3250,14 @@
- IS:3,Periphery:3
+ DC.RR:3
- IS:8,Periphery:8
+ DC.RR:8
-
+
BAN:8
-
+
BAN:8
@@ -3246,8 +3281,27 @@
General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ xct
+ IS:2
+
+
+ engineer
+ IS:4,Periphery:2
+
+
+ anti_infantry,urban
+ General:4,CS:7
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
CC:2
civilian
@@ -3834,13 +3888,6 @@
LA:8,General:8,Periphery.Deep:8,MERC:8,Periphery:8
-
- IS:2
-
- recon
- IS:8
-
-
CC:4,MOC:3,IS:5,FS:4,CIR:3,Periphery:2,TC:3,CS:5,OA:3,LA:4,FWL:4,NIOPS:5,DC:4
@@ -4721,13 +4768,13 @@
TC:8
-
- MOC:1,OA:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
CHH:5,CIH:5,CSR:5,CLAN:5,CFM:5,CSJ:7
diff --git a/megamek/data/forcegenerator/2855.xml b/megamek/data/forcegenerator/2855.xml
index 78da4955571..f97927a882d 100644
--- a/megamek/data/forcegenerator/2855.xml
+++ b/megamek/data/forcegenerator/2855.xml
@@ -604,9 +604,9 @@
CLAN:6,BAN:1
-
+
IS:2
-
+
anti_mek
IS:8
@@ -903,13 +903,6 @@
IS:8,Periphery.Deep:8,Periphery:8
-
- CS:3
-
- engineer
- General:8
-
-
CS:3,CLAN:4,IS:6,NIOPS:3,Periphery.Deep:7,MERC:5,BAN:5,Periphery:7
@@ -1885,19 +1878,59 @@
General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ IS:3,OA:3,Periphery:2
+
+
+ xct,marine
+ General:3,TC:4
+
General:8
General:5
+
+ IS:2,MERC:3
+
General:5
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:8
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:1+,Periphery:1
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ IS:1+,Periphery:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
CS:4,CHH:4,LA:3,CBS:3,CLAN:2,IS:2,NIOPS:4,FS:3,Periphery:3
@@ -1905,13 +1938,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
CC:1,CHH:8,CW:8,LA:1,CLAN:7,FWL:1,FS:2,MERC:1,CJF:8,DC:1,CGB:8
@@ -2305,12 +2331,6 @@
General:8
-
- IS:4,Periphery:4
-
- General:8
-
-
IS:1,Periphery:1
@@ -2570,14 +2590,18 @@
General:7
-
-
- IS:2,Periphery:2
-
- General:8
-
-
-
+
+ IS:2,Periphery:2
+
+
+
+ IS:2
+
+ specops
+ IS:5,DC:7
+
+
+
CC:1,CS:2,CHH:4,LA:1,CLAN:3,FWL:2,NIOPS:2,FS:1,DC:1
General:8,BAN:3
@@ -3072,6 +3096,10 @@
General:8
+
+ recon,engineer
+ General:2
+
IS:7,Periphery.Deep:7,Periphery:7
@@ -3093,7 +3121,11 @@
General:5
-
+
+ engineer
+ General:1,FS:2,LA:2,CS:3
+
+
IS:7,Periphery.Deep:7,Periphery:7
@@ -3239,14 +3271,14 @@
- IS:3,Periphery:3
+ DC.RR:3
- IS:8,Periphery:8
+ DC.RR:8
-
+
BAN:8
-
+
BAN:8
@@ -3270,8 +3302,27 @@
General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ xct
+ IS:2
+
+
+ engineer
+ IS:4,Periphery:2
+
+
+ anti_infantry,urban
+ General:4,CS:7
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
CC:2
civilian
@@ -3863,13 +3914,6 @@
LA:8,General:8,Periphery.Deep:8,MERC:8,Periphery:8
-
- IS:2
-
- recon
- IS:8
-
-
CC:4,MOC:3,IS:5,FS:4,CIR:3,Periphery:2,TC:3,CS:5,OA:3,LA:4,FWL:4,NIOPS:5,DC:4
@@ -4735,13 +4779,13 @@
TC:8
-
- MOC:1,OA:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
CHH:5,CIH:5,CSR:5,CLAN:5,CFM:5,CSJ:7
diff --git a/megamek/data/forcegenerator/2860.xml b/megamek/data/forcegenerator/2860.xml
index 31308a8752a..244f802d95f 100644
--- a/megamek/data/forcegenerator/2860.xml
+++ b/megamek/data/forcegenerator/2860.xml
@@ -598,9 +598,9 @@
CLAN:6,BAN:1
-
+
IS:2
-
+
anti_mek
IS:8
@@ -877,13 +877,6 @@
IS:8,Periphery.Deep:8,Periphery:8
-
- CS:3
-
- engineer
- General:8
-
-
CS:3,CLAN:4,IS:6,NIOPS:3,Periphery.Deep:7,MERC:5,BAN:5,Periphery:7
@@ -1793,19 +1786,59 @@
General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ IS:3,OA:3,Periphery:2
+
+
+ xct,marine
+ General:1,TC:3
+
General:8
General:5
+
+ IS:2,MERC:3
+
General:5
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:7
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:1
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ IS:2+,Periphery:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
CS:4,CHH:4,LA:3,CBS:3,CLAN:2,IS:2,NIOPS:4,FS:3,Periphery:3
@@ -1813,13 +1846,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
CC:1,CHH:8,CW:8,LA:1,CLAN:6,FWL:1,FS:1,MERC:1,CJF:8,DC:1,CGB:8
@@ -2219,12 +2245,6 @@
General:8
-
- IS:4,Periphery:4
-
- General:8
-
-
IS:1,Periphery:1
@@ -2487,14 +2507,18 @@
General:7
-
-
- IS:2,Periphery:2
-
- General:8
-
-
-
+
+ IS:2,Periphery:2
+
+
+
+ IS:2
+
+ specops
+ IS:5,DC:7
+
+
+
CC:1,CS:2,CHH:4,LA:1,CLAN:3,FWL:2,NIOPS:2,FS:1,DC:1
General:8,BAN:3
@@ -2971,6 +2995,10 @@
General:8
+
+ recon,engineer
+ General:2
+
IS:7,Periphery.Deep:7,Periphery:7
@@ -2992,7 +3020,11 @@
General:5
-
+
+ engineer
+ General:1,FS:2,LA:2,CS:3
+
+
IS:7,Periphery.Deep:7,Periphery:7
@@ -3138,14 +3170,14 @@
- IS:3,Periphery:3
+ DC.RR:3
- IS:8,Periphery:8
+ DC.RR:8
-
+
BAN:8
-
+
BAN:8
@@ -3169,8 +3201,27 @@
General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ xct
+ IS:2
+
+
+ engineer
+ IS:4,Periphery:2
+
+
+ anti_infantry,urban
+ General:3,CS:7
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
CC:2
civilian
@@ -3729,13 +3780,6 @@
LA:8,General:8,Periphery.Deep:8,MERC:8,Periphery:8
-
- IS:2
-
- recon
- IS:8
-
-
CC:4,MOC:3,IS:5,FS:4,CIR:3,Periphery:2,TC:3,CS:5,OA:3,LA:4,FWL:4,NIOPS:5,DC:4
@@ -4577,13 +4621,13 @@
TC:8
-
- MOC:1,OA:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
CHH:5,CIH:5,CSR:5,CLAN:5,CFM:5,CSJ:7
diff --git a/megamek/data/forcegenerator/2865.xml b/megamek/data/forcegenerator/2865.xml
index feeccb3ad63..6470ef6f392 100644
--- a/megamek/data/forcegenerator/2865.xml
+++ b/megamek/data/forcegenerator/2865.xml
@@ -602,9 +602,9 @@
CLAN:6,BAN:1
-
+
IS:2
-
+
anti_mek
IS:8
@@ -874,13 +874,6 @@
IS:8,Periphery.Deep:8,Periphery:8
-
- CS:3
-
- engineer
- General:8
-
-
CS:3,CLAN:4,IS:6,NIOPS:3,Periphery.Deep:7,MERC:5,BAN:5,Periphery:7
@@ -1808,19 +1801,59 @@
General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ IS:3,OA:3,Periphery:2
+
+
+ xct,marine
+ General:1,TC:3
+
General:8
General:5
+
+ IS:2,MERC:3
+
General:5
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:7
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:1
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ IS:2+,Periphery:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
CS:4,CHH:4,LA:3,CBS:3,CLAN:2,IS:1,NIOPS:4,FS:3,Periphery:3
@@ -1828,13 +1861,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
CC:1,CHH:8,CW:8,LA:1,CLAN:6,FWL:1,FS:1,MERC:1,CJF:8,DC:1,CGB:8
@@ -2243,12 +2269,6 @@
General:8
-
- IS:4,Periphery:4
-
- General:8
-
-
IS:1,Periphery:1
@@ -2515,14 +2535,18 @@
General:7
-
-
- IS:2,Periphery:2
-
- General:8
-
-
-
+
+ IS:2,Periphery:2
+
+
+
+ IS:2
+
+ specops
+ IS:5,DC:7
+
+
+
CC:1,CS:2,CHH:4,LA:1,CLAN:3,FWL:2,NIOPS:2,FS:1,DC:1
General:8,BAN:3
@@ -2992,6 +3016,10 @@
General:8
+
+ recon,engineer
+ General:2
+
IS:7,Periphery.Deep:7,Periphery:7
@@ -3013,7 +3041,11 @@
General:5
-
+
+ engineer
+ General:1,FS:2,LA:2,CS:3
+
+
IS:7,Periphery.Deep:7,Periphery:7
@@ -3159,14 +3191,14 @@
- IS:3,Periphery:3
+ DC.RR:3
- IS:8,Periphery:8
+ DC.RR:8
-
+
BAN:8
-
+
BAN:8
@@ -3190,8 +3222,27 @@
General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ xct
+ IS:2
+
+
+ engineer
+ IS:4,Periphery:2
+
+
+ anti_infantry,urban
+ General:3,CS:7
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
CC:2
civilian
@@ -3751,13 +3802,6 @@
LA:8,General:8,Periphery.Deep:8,MERC:8,Periphery:8
-
- IS:2
-
- recon
- IS:8
-
-
CC:4,MOC:3,IS:5,FS:4,CIR:3,Periphery:2,TC:3,CS:5,OA:3,LA:4,FWL:4,NIOPS:5,DC:4
@@ -4605,13 +4649,13 @@
TC:8
-
- MOC:1,OA:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
CHH:5,CIH:5,CSR:5,CLAN:5,CFM:5,CSJ:7
diff --git a/megamek/data/forcegenerator/2870.xml b/megamek/data/forcegenerator/2870.xml
index 240c30f234e..c3281569412 100644
--- a/megamek/data/forcegenerator/2870.xml
+++ b/megamek/data/forcegenerator/2870.xml
@@ -593,9 +593,9 @@
CLAN:6,BAN:1
-
+
IS:2
-
+
anti_mek
IS:8
@@ -980,13 +980,6 @@
General:8
-
- CS:3
-
- engineer
- General:8
-
-
CS:3,CLAN:4,IS:6,NIOPS:3,Periphery.Deep:7,MERC:5,BAN:5,Periphery:7
@@ -1995,19 +1988,59 @@
General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ IS:2,OA:3,Periphery:2
+
+
+ xct,marine
+ General:1,Periphery:1,TC:3
+
General:8
General:5
+
+ IS:2,MERC:3
+
General:5
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:7
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:1
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ IS:2+,Periphery:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
CS:4,CHH:4,LA:3,CBS:3,CLAN:2,IS:1,NIOPS:4,FS:3,Periphery:3
@@ -2015,13 +2048,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
CHH:7,CW:7,CLAN:5,CJF:7,CGB:7
@@ -2454,12 +2480,6 @@
General:8
-
- IS:4,Periphery:4
-
- General:8
-
-
IS:1,Periphery:1
@@ -2733,14 +2753,18 @@
General:7
-
-
- IS:2,Periphery:2
-
- General:8
-
-
-
+
+ IS:2,Periphery:2
+
+
+
+ IS:2
+
+ specops
+ IS:5,DC:7
+
+
+
CS:2,CHH:4,CLAN:3,FWL:1,NIOPS:2
General:8,BAN:3
@@ -3259,6 +3283,10 @@
General:8
+
+ recon,engineer
+ General:2
+
IS:7,Periphery.Deep:7,Periphery:7
@@ -3280,7 +3308,11 @@
General:5
-
+
+ engineer
+ General:1,FS:2,LA:2,CS:3
+
+
IS:7,Periphery.Deep:7,Periphery:7
@@ -3426,14 +3458,14 @@
- IS:3,Periphery:3
+ DC.RR:3
- IS:8,Periphery:8
+ DC.RR:8
-
+
BAN:8
-
+
BAN:8
@@ -3457,8 +3489,23 @@
General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ engineer
+ IS:4,Periphery:2
+
+
+ anti_infantry,urban
+ General:2,CS:7
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
CC:2
civilian
@@ -4039,13 +4086,6 @@
LA:8,General:8,Periphery.Deep:8,MERC:8,Periphery:8
-
- IS:2
-
- recon
- IS:8
-
-
CC:4,MOC:3,IS:5,FS:4,CIR:3,Periphery:2,TC:3,CS:5,OA:3,LA:4,FWL:4,NIOPS:5,DC:4
@@ -4984,13 +5024,13 @@
TC:8
-
- MOC:1,OA:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
CHH:5,CIH:5,CSR:5,CLAN:5,CFM:5,CSJ:7
diff --git a/megamek/data/forcegenerator/2900.xml b/megamek/data/forcegenerator/2900.xml
index 59fa6ae8d6e..9fc66d28a1d 100644
--- a/megamek/data/forcegenerator/2900.xml
+++ b/megamek/data/forcegenerator/2900.xml
@@ -591,9 +591,9 @@
CLAN:6,BAN:1
-
+
IS:2
-
+
anti_mek
IS:8
@@ -1007,13 +1007,6 @@
CHH:8,CLAN:8
-
- CS:3
-
- engineer
- General:8
-
-
CS:3,HL:5,CLAN:4,IS:6,NIOPS:3,Periphery.Deep:6,MERC:5,BAN:5,Periphery:7
@@ -2058,6 +2051,14 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ IS:2,OA:3,Periphery:2
+
+
+ xct,marine
+ General:1,Periphery:1,TC:3
+
General:8
@@ -2070,7 +2071,36 @@
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:7
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:1
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ IS:2+,Periphery:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
CS:4,CHH:3,LA:2,CBS:2,CLAN:1,NIOPS:4,FS:2,Periphery:2
@@ -2078,13 +2108,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
CHH:6,CW:6,CLAN:4,CJF:6,CGB:6
@@ -2504,12 +2527,6 @@
General:8
-
- IS:4,Periphery:4
-
- General:8
-
-
IS:1,Periphery:1
@@ -2782,14 +2799,18 @@
General:7
-
-
- IS:2,Periphery:2
-
- General:8
-
-
-
+
+ IS:2,Periphery:2
+
+
+
+ IS:2
+
+ specops
+ IS:5,DC:7
+
+
+
CS:2,CHH:2,CLAN:2,FWL:1,NIOPS:2
General:8,BAN:3
@@ -3355,6 +3376,10 @@
General:8
+
+ recon,engineer
+ General:2
+
HL:5,IS:7,Periphery.Deep:6,Periphery:7
@@ -3376,7 +3401,11 @@
General:5
-
+
+ engineer
+ General:1,FS:2,LA:2,CS:3
+
+
HL:5,IS:7,Periphery.Deep:6,Periphery:7
@@ -3524,14 +3553,14 @@
- IS:3,Periphery:3
+ DC.RR:3
- IS:8,Periphery:8
+ DC.RR:8
-
+
BAN:8
-
+
BAN:8
@@ -3546,6 +3575,9 @@
General:5
+
+ IS:2,MERC:3
+
General:7
@@ -3555,8 +3587,23 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ engineer
+ IS:4,Periphery:2
+
+
+ anti_infantry,urban
+ General:2,CS:7
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
CC:2
civilian
@@ -4200,13 +4247,6 @@
HL:6,LA:8,General:8,Periphery.Deep:7,MERC:8,Periphery:8
-
- IS:2
-
- recon
- IS:8
-
-
CC:4,MOC:3,IS:5,FS:4,CIR:3,Periphery:2,TC:3,CS:5,OA:3,LA:4,FWL:4,NIOPS:5,DC:4
@@ -5208,13 +5248,13 @@
TC:8
-
- MOC:1,OA:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
CHH:5,CIH:5,CSR:5,CLAN:5,CFM:5,CSJ:7
diff --git a/megamek/data/forcegenerator/2950.xml b/megamek/data/forcegenerator/2950.xml
index f4ae8cdc42a..caa8d6d6daf 100644
--- a/megamek/data/forcegenerator/2950.xml
+++ b/megamek/data/forcegenerator/2950.xml
@@ -605,9 +605,9 @@
CLAN:6,BAN:1
-
+
IS:2
-
+
anti_mek
IS:8
@@ -1061,13 +1061,6 @@
CHH:6,CLAN:4
-
- CS:3
-
- engineer
- General:8
-
-
CSA:6,CHH:6,CCC:6,CSR:6,CSV:6,CLAN:6,CGS:6
@@ -2134,19 +2127,63 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ IS:2,OA:3,Periphery:2,CS.EC:4
+
+
+ xct,marine
+ IS:1,Periphery:1,TC:3,CS.EC:4
+
+
+ xct
+ IS:1,TC:1+,OA:1+,CS.EC:1+
+
General:8
General:5
+
+ IS:2,MERC:3
+
General:5
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:5
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:1
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ IS:2+,Periphery:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
CS:4,CHH:3,LA:1,CBS:2,CLAN:1,NIOPS:4,FS:1,Periphery:2
@@ -2161,13 +2198,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
CHH:6,CW:5,CLAN:3,CJF:5,CGB:6
@@ -2590,12 +2620,6 @@
General:8
-
- IS:4,Periphery:4
-
- General:8
-
-
IS:1,Periphery:1
@@ -2883,14 +2907,18 @@
General:7
-
-
- IS:2,Periphery:2
-
- General:8
-
-
-
+
+ IS:2,Periphery:2
+
+
+
+ IS:2
+
+ specops
+ IS:5,DC:7
+
+
+
CS:2,CHH:1,CLAN:1,NIOPS:2
General:8,BAN:2
@@ -3451,6 +3479,10 @@
General:8
+
+ recon,engineer
+ General:2
+
HL:5,IS:7,Periphery.Deep:6,Periphery:7
@@ -3472,7 +3504,11 @@
General:5
-
+
+ engineer
+ General:1,FS:2,LA:2,CS:3
+
+
HL:5,IS:7,Periphery.Deep:6,Periphery:7
@@ -3620,14 +3656,14 @@
- IS:3,Periphery:3
+ DC.RR:3
- IS:8,Periphery:8
+ DC.RR:8
-
+
BAN:8
-
+
BAN:8
@@ -3651,8 +3687,23 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ engineer
+ IS:4,Periphery:2
+
+
+ anti_infantry,urban
+ IS:2,Periphery:2,CS:7
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
CC:2
civilian
@@ -4320,13 +4371,6 @@
HL:6,LA:8,General:8,Periphery.Deep:7,MERC:8,Periphery:8
-
- IS:2
-
- recon
- IS:8
-
-
CC:4,MOC:3,IS:5,FS:4,CIR:3,Periphery:2,TC:3,CS:5,OA:3,LA:4,FWL:4,NIOPS:5,DC:4
@@ -5402,13 +5446,13 @@
TC:8
-
- MOC:1,OA:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
CHH:5,CIH:5,CSR:6,CLAN:5,CFM:6,CSJ:7
diff --git a/megamek/data/forcegenerator/3000.xml b/megamek/data/forcegenerator/3000.xml
index 675aa6eb94b..0b7f9cf84ec 100644
--- a/megamek/data/forcegenerator/3000.xml
+++ b/megamek/data/forcegenerator/3000.xml
@@ -618,9 +618,9 @@
CLAN:6,BAN:1
-
+
IS:2
-
+
anti_mek
IS:8
@@ -1156,13 +1156,6 @@
CHH:5
-
- CS:3
-
- engineer
- General:8
-
-
CSA:6,CHH:6,CCC:6,CSR:6,CSV:7,CLAN:7,CGS:7
@@ -2314,19 +2307,63 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ IS:2,OA:3,Periphery:2,TC:3,CS.EC:4
+
+
+ xct,marine
+ IS:1,Periphery:1
+
+
+ xct
+ IS:1,TC:1+,OA:1+,CS.EC:1+
+
General:8
General:5
+
+ IS:2,MERC:3
+
General:5
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:7
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:1
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ IS:2+,Periphery:1+,HL:2
+
+ recon,specops,paratrooper
+ General:8
+
+
CS:4,CHH:2,LA:2,CBS:1,NIOPS:4,FS:1,Periphery:1
@@ -2341,13 +2378,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
CHH:5,CW:4,CLAN:3,CJF:4,CGB:5
@@ -2796,12 +2826,6 @@
General:8
-
- IS:4,Periphery:4
-
- General:8
-
-
IS:1,Periphery:1
@@ -3094,14 +3118,18 @@
General:7
-
-
- IS:2,Periphery:2
-
- General:8
-
-
-
+
+ IS:2,Periphery:2
+
+
+
+ IS:2
+
+ specops
+ IS:5,DC:7
+
+
+
CS:2,NIOPS:2
General:8
@@ -3725,6 +3753,10 @@
General:8
+
+ recon,engineer
+ General:2,DC:3
+
HL:5,IS:7,Periphery.Deep:6,Periphery:7
@@ -3746,7 +3778,11 @@
General:5
-
+
+ engineer
+ General:1,FS:2,LA:2,CS:3
+
+
HL:5,IS:7,Periphery.Deep:6,Periphery:7
@@ -3896,14 +3932,14 @@
- IS:3,Periphery:3
+ DC.RR:3
- IS:8,Periphery:8
+ DC.RR:8
-
+
BAN:8
-
+
BAN:8
@@ -3927,8 +3963,23 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ engineer
+ IS:4,Periphery:2
+
+
+ anti_infantry,urban
+ IS:2,Periphery:2,CS:7
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
CC:2
civilian
@@ -4645,13 +4696,6 @@
HL:6,LA:8,General:8,Periphery.Deep:7,MERC:8,Periphery:8
-
- IS:2
-
- recon
- IS:8
-
-
CC:4,MOC:3,IS:5,FS:4,CIR:3,Periphery:2,TC:3,CS:5,OA:3,LA:4,FWL:4,NIOPS:5,DC:4
@@ -5791,13 +5835,13 @@
TC:8
-
- MOC:1,OA:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
CHH:5,CIH:5,CSR:6,CLAN:5,CFM:6,CSJ:7
diff --git a/megamek/data/forcegenerator/3028.xml b/megamek/data/forcegenerator/3028.xml
index 17d4e285cbe..fa4e01e18b8 100644
--- a/megamek/data/forcegenerator/3028.xml
+++ b/megamek/data/forcegenerator/3028.xml
@@ -662,9 +662,9 @@
CLAN:6,BAN:1
-
+
IS:2
-
+
anti_mek
IS:8
@@ -1224,13 +1224,6 @@
CHH:5
-
- CS:3
-
- engineer
- General:8
-
-
CSA:6,CHH:6,CCC:6,CSR:6,CSV:7,CLAN:7,CGS:8
@@ -2431,16 +2424,60 @@
General:8
+
+ marine
+ IS:3,OA:3,Periphery:2,CS.EC:4
+
+
+ xct,marine
+ IS:1,Periphery:1,TC:3,CS.EC:4
+
+
+ xct
+ IS:1,TC:1+,OA:1+,CS.EC:1+
+
General:5
+
+ IS:2,MERC:3
+
General:5
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:7
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:1,FS:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ IS:2+,Periphery:1+,HL:2
+
+ recon,specops,paratrooper
+ General:8
+
+
CS:4,CHH:2,LA:3,CBS:1,NIOPS:4,SIC:2,FS:2,Periphery:1
@@ -2455,13 +2492,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
CHH:5,CW:4,CLAN:3,CJF:4,CGB:5
@@ -2953,12 +2983,6 @@
General:8
-
- IS:4,Periphery:4
-
- General:8
-
-
IS:1,Periphery:1
@@ -3263,14 +3287,18 @@
General:7
-
-
- IS:2,Periphery:2
-
- General:8
-
-
-
+
+ IS:2,Periphery:2
+
+
+
+ IS:2
+
+ specops
+ IS:5,DC:7
+
+
+
CS:2,NIOPS:2
General:8
@@ -3904,6 +3932,10 @@
General:8
+
+ recon,engineer
+ General:2,DC:3
+
HL:5,IS:7,Periphery.Deep:6,Periphery:7
@@ -3925,7 +3957,11 @@
General:5
-
+
+ engineer
+ General:1,FS:2,LA:2,CS:3
+
+
HL:5,IS:7,Periphery.Deep:6,Periphery:7
@@ -4079,14 +4115,14 @@
- IS:3,Periphery:3
+ DC.RR:3
- IS:8,Periphery:8
+ DC.RR:8
-
+
BAN:8
-
+
BAN:8
@@ -4110,8 +4146,23 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ engineer
+ IS:4,Periphery:2
+
+
+ anti_infantry,urban
+ IS:2,Periphery:2,CS:5
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
CC:2,SIC:2
civilian
@@ -4876,13 +4927,6 @@
HL:6,LA:8,FRR:8,General:8,Periphery.Deep:7,MERC:8,Periphery:8
-
- IS:2
-
- recon
- IS:8
-
-
MOC:3,CC:4,FRR:4,IS:5,SIC:4,FS:4,CIR:3,Periphery:2,TC:3,CS:5,OA:3,LA:4,FWL:4,NIOPS:5,DC:4
@@ -6041,13 +6085,13 @@
TC:8
-
- MOC:1,OA:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
CHH:5,CIH:5,CSR:6,CLAN:5,CFM:6,CSJ:7
diff --git a/megamek/data/forcegenerator/3039.xml b/megamek/data/forcegenerator/3039.xml
index 67a617bf026..8e78bf0dfb0 100644
--- a/megamek/data/forcegenerator/3039.xml
+++ b/megamek/data/forcegenerator/3039.xml
@@ -714,9 +714,9 @@
CLAN:6,BAN:1
-
+
IS:2
-
+
anti_mek
IS:8
@@ -1299,13 +1299,6 @@
CHH:5
-
- CS:3
-
- engineer
- General:8
-
-
CSA:6,CHH:6,CCC:6,CSR:6,CSV:8,CLAN:7,CGS:8
@@ -1826,13 +1819,6 @@
CS:4,NIOPS:4
-
- IS:4,Periphery:2
-
- engineer
- General:8
-
-
CSA:5,CSR:5,CW:3,CBS:5,CSV:5,CLAN:4,CSJ:3,CGS:4,CJF:3
@@ -2569,19 +2555,67 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ IS:3,OA:3,Periphery:2,CS.EC:4
+
+
+ spotter
+ CC:1+
+
+
+ xct,marine
+ IS:1,Periphery:1,TC:3,CS.EC:4
+
+
+ xct
+ IS:1,TC:1+,OA:1+,CS.EC:1+
+
General:8
General:5
+
+ IS:2,MERC:3
+
General:5
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:7
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:1,FS:1+,DC:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ IS:2+,Periphery:1+,HL:2
+
+ recon,specops,paratrooper
+ General:8
+
+
CS:4,CHH:2,LA:4,CBS:1,NIOPS:4,SIC:2,FS:3,Periphery:1
@@ -2596,13 +2630,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
CHH:5,CW:4,CLAN:3,CJF:4,CGB:5
@@ -2807,13 +2834,6 @@
CS:8,CLAN:8,NIOPS:8,MERC.SI:8,BAN:8
-
- IS:4,Periphery:3
-
- paratrooper
- General:8
-
-
CSA:6,CHH:7,CBS:6,CLAN:5
@@ -3149,12 +3169,6 @@
General:8
-
- IS:4,Periphery:4
-
- General:8
-
-
IS:1,Periphery:1
@@ -3484,14 +3498,18 @@
General:7
-
-
- IS:2,Periphery:2
-
- General:8
-
-
-
+
+ IS:2,Periphery:2
+
+
+
+ IS:2
+
+ specops
+ IS:5,DC:7
+
+
+
CS:2,NIOPS:2
General:8
@@ -4150,6 +4168,10 @@
General:8
+
+ recon,engineer
+ General:3
+
HL:5,IS:7,Periphery.Deep:6,Periphery:7
@@ -4171,7 +4193,11 @@
General:5
-
+
+ engineer
+ General:1,FS:2,LA:2,CS:3
+
+
HL:5,IS:7,Periphery.Deep:6,Periphery:7
@@ -4335,14 +4361,14 @@
- IS:3,Periphery:3
+ FRR:3
- IS:8,Periphery:8
+ FRR:8
-
+
BAN:8
-
+
BAN:8
@@ -4366,8 +4392,23 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ engineer
+ IS:4,Periphery:2
+
+
+ anti_infantry,urban
+ IS:2,Periphery:2
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
CC:2,SIC:2
civilian
@@ -5210,13 +5251,6 @@
HL:6,LA:6,FRR:8,General:8,Periphery.Deep:7,MERC:8,Periphery:8
-
- IS:2
-
- recon
- IS:8
-
-
MOC:3,CC:4,FRR:4,IS:5,SIC:4,FS:4,CIR:3,Periphery:2,TC:3,CS:5,OA:3,LA:4,FWL:4,NIOPS:5,DC:4
@@ -6437,13 +6471,13 @@
TC:8
-
- MOC:1,OA:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
CHH:5,CIH:5,CSR:6,CLAN:5,CFM:6,CSJ:7
diff --git a/megamek/data/forcegenerator/3050.xml b/megamek/data/forcegenerator/3050.xml
index c4005f61a2b..9606d77ed69 100644
--- a/megamek/data/forcegenerator/3050.xml
+++ b/megamek/data/forcegenerator/3050.xml
@@ -901,9 +901,9 @@
CLAN:6,BAN:1
-
+
IS:2
-
+
anti_mek
IS:8
@@ -1609,13 +1609,6 @@
CHH:5
-
- CS:3,WOB:3
-
- engineer
- General:8
-
-
CSA:6,CHH:6,CCC:6,CSR:6,CSV:8,CLAN:7,CGS:8
@@ -2230,13 +2223,6 @@
CS:4,NIOPS:4,WOB:4
-
- IS:4,Periphery:2
-
- engineer
- General:8
-
-
CSA:5,CSR:5,CW:4,CBS:5,CSV:5,CLAN:5,CSJ:4,CGS:4,CJF:3
@@ -3124,19 +3110,67 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ IS:3,OA:3,Periphery:2,CS.EC:4
+
+
+ spotter
+ IS:2,CC:2+
+
+
+ xct,marine
+ IS:1,Periphery:1,TC:3,CS.EC:4
+
+
+ xct
+ IS:1,TC:1+,OA:1+,CS.EC:1+
+
General:8
General:5
+
+ IS:2,MERC:3
+
General:5
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:5
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ IS:2+,Periphery:1+,HL:2
+
+ recon,specops,paratrooper
+ General:8
+
+
CS:4,CHH:1,LA:4,CBS:1,NIOPS:4,SIC:2,FS:4,Periphery:1
@@ -3151,13 +3185,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
CS:3,CHH:5,CW:4,CLAN:2,CJF:4,CGB:5
@@ -3455,13 +3482,6 @@
General:8
-
- IS:4,Periphery:3
-
- paratrooper
- General:8
-
-
CSA:6,CHH:7,CBS:6,CLAN:5
@@ -3621,12 +3641,6 @@
PIR:5-,Periphery.Deep:5-,IS.pm:4,Periphery:5-
-
- DC:3+
-
- DC:8
-
-
General:5
@@ -3868,12 +3882,6 @@
General:8
-
- IS:4,Periphery:4
-
- General:8
-
-
IS:1,Periphery:1
@@ -4276,14 +4284,18 @@
General:7
-
-
- IS:2,Periphery:2
-
- General:8
-
-
-
+
+ IS:2,Periphery:2
+
+
+
+ IS:2
+
+ specops
+ IS:5,DC:7
+
+
+
CS:2,NIOPS:2
General:8
@@ -5056,6 +5068,10 @@
General:8
+
+ recon,engineer
+ General:3
+
HL:5,IS:7,Periphery.Deep:6,Periphery:7
@@ -5077,7 +5093,11 @@
General:5
-
+
+ engineer
+ General:2,CS:3,WOB:3
+
+
HL:5,IS:7,Periphery.Deep:6,Periphery:7
@@ -5265,14 +5285,14 @@
- IS:3,Periphery:3
+ FRR:3
- IS:8,Periphery:8
+ FRR:8
-
+
BAN:8
-
+
BAN:8
@@ -5296,8 +5316,23 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ engineer
+ IS:4,Periphery:2
+
+
+ anti_infantry,urban
+ IS:2,Periphery:2,Clan.IS:2
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
CC:2,SIC:2
civilian
@@ -6328,13 +6363,6 @@
IS:4
-
- IS:2
-
- recon
- IS:8
-
-
MOC:3,CC:4,FRR:4,IS:5,WOB:5,SIC:4,FS:4,CIR:3,Periphery:2,TC:3,CS:5,OA:3,LA:4,FWL:4,NIOPS:5,DC:4
@@ -7780,13 +7808,13 @@
TC:8
-
- MOC:1,OA:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
CHH:5,CIH:5,CSR:6,CLAN:5,CFM:6,CSJ:7
diff --git a/megamek/data/forcegenerator/3055.xml b/megamek/data/forcegenerator/3055.xml
index a1c60a6e1fe..b4b7e0d7c5e 100644
--- a/megamek/data/forcegenerator/3055.xml
+++ b/megamek/data/forcegenerator/3055.xml
@@ -970,9 +970,9 @@
CLAN:6,BAN:1
-
+
IS:2
-
+
anti_mek
IS:8
@@ -1792,13 +1792,6 @@
CHH:5
-
- CS:3,WOB:3
-
- engineer
- General:8
-
-
CSA:6,CHH:6,CCC:6,CSR:6,CSV:8,CLAN:7,CGS:8
@@ -2476,13 +2469,6 @@
CS:4,NIOPS:4,WOB:4
-
- IS:4,Periphery:2
-
- engineer
- General:8
-
-
CSA:5,CSR:5,CW:4,CBS:5,CSV:6,CLAN:5,CSJ:4,CGS:4,CJF:3,CWIE:4
@@ -3266,8 +3252,8 @@
HL:2,IS:3,Periphery:3
missile_artillery
- CC:5,IS:4
-
+ CC:5,IS:4,MOC:1,MH:1,CIR:1
+
artillery
General:6
@@ -3495,19 +3481,67 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ IS:3,OA:3,Periphery:2,CS.EC:4
+
+
+ spotter
+ IS:2,CC:2+
+
+
+ xct,marine
+ IS:1,Periphery:1,TC:4,CS.EC:4
+
+
+ xct
+ IS:1,TC:1+,OA:1+,CS.EC:1+
+
General:8
General:5
+
+ IS:2,MERC:3
+
General:5
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:5
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:1+,Periphery:1,MOC:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ IS:2+,Periphery:1+,HL:2
+
+ recon,specops,paratrooper
+ General:8
+
+
CS:4,CHH:1,LA:4,CBS:1,NIOPS:4,SIC:2,FS:4,Periphery:1
@@ -3529,13 +3563,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
LA:7,FS:6,MERC:3
@@ -3890,13 +3917,6 @@
General:8
-
- IS:4,Periphery:3
-
- paratrooper
- General:8
-
-
CSA:6,CHH:7,CBS:6,CLAN:5
@@ -4049,12 +4069,6 @@
General:8
-
- MERC:3
-
- General:8
-
-
CHH:6,HL:4,CLAN:4,IS:6,Periphery.Deep:5,TC:6,Periphery:5
@@ -4074,12 +4088,6 @@
PIR:5-,Periphery.Deep:5-,IS.pm:4,Periphery:5-
-
- DC:3+
-
- DC:8
-
-
General:5
@@ -4346,12 +4354,6 @@
General:6
-
- IS:4,Periphery:4
-
- General:8
-
-
IS:1,Periphery:1
@@ -4785,14 +4787,18 @@
General:7
-
-
- IS:2,Periphery:2
-
- General:8
-
-
-
+
+ IS:2,Periphery:2
+
+
+
+ IS:2
+
+ specops
+ IS:5,DC:7
+
+
+
DC:4
recon
@@ -5721,6 +5727,10 @@
General:8
+
+ recon,engineer
+ General:3
+
HL:6,IS:7,Periphery.Deep:6,Periphery:7
@@ -5742,7 +5752,11 @@
General:5
-
+
+ engineer
+ General:2,CS:3,WOB:3
+
+
HL:6,IS:7,Periphery.Deep:6,Periphery:7
@@ -5828,7 +5842,7 @@
- CC:3,MOC:1,OA:1,IS:1,MH:1,CIR:1
+ CC:3
missile_artillery
General:8
@@ -5930,14 +5944,14 @@
- IS:3,Periphery:3
+ FRR:3
- IS:8,Periphery:8
+ FRR:8
-
+
BAN:8
-
+
BAN:8
@@ -5961,8 +5975,23 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ engineer
+ IS:4,Periphery:2
+
+
+ anti_infantry,urban
+ IS:2,Periphery:2,Clan.IS:2
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
CC:2,SIC:2
civilian
@@ -7201,13 +7230,6 @@
IS:5
-
- IS:2
-
- recon
- IS:8
-
-
MOC:3,CC:4,FRR:4,IS:5,WOB:5,SIC:4,FS:4,CIR:3,Periphery:2,TC:3,CS:5,OA:3,LA:4,FWL:4,NIOPS:5,DC:4
@@ -8846,13 +8868,13 @@
TC:8
-
- MOC:1,OA:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
CHH:5,CIH:5,CSR:6,CLAN:5,CFM:6,CSJ:7
diff --git a/megamek/data/forcegenerator/3058.xml b/megamek/data/forcegenerator/3058.xml
index 62756063ff6..f8e1ac936e3 100644
--- a/megamek/data/forcegenerator/3058.xml
+++ b/megamek/data/forcegenerator/3058.xml
@@ -1016,9 +1016,9 @@
CLAN:6,BAN:1
-
+
IS:2
-
+
anti_mek
IS:8
@@ -1889,13 +1889,6 @@
CHH:5
-
- CS:3,WOB:3
-
- engineer
- General:8
-
-
CSA:6,CHH:6,CCC:6,CSR:6,CSV:8,CLAN:7,CGS:8
@@ -2598,13 +2591,6 @@
CS:4,NIOPS:4,WOB:4
-
- IS:4,Periphery:2
-
- engineer
- General:8
-
-
CSA:5,CSR:5,CW:4,CBS:5,CSV:6,CLAN:5,CSJ:4,CGS:4,CJF:3,CWIE:4
@@ -3463,8 +3449,8 @@
HL:2,IS:3,Periphery:3
missile_artillery
- CC:5,IS:4
-
+ CC:5,IS:4,MOC:1,MH:1,CIR:1
+
artillery
General:6
@@ -3729,19 +3715,67 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ IS:2,OA:3,Periphery:2,CS.EC:4
+
+
+ spotter
+ IS:2+,CC:3+,FWL:3+
+
+
+ xct,marine
+ IS:1,Periphery:1,TC:4,CS.EC:4
+
+
+ xct
+ IS:1,TC:1+,OA:1+,CS.EC:1+
+
General:8
General:5
+
+ IS:2,MERC:3
+
General:5
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:5
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:1+,Periphery:1,MOC:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ IS:2+,Periphery:1+,HL:2
+
+ recon,specops,paratrooper
+ General:8
+
+
CS:4,CHH:1,LA:4,CBS:1,NIOPS:4,SIC:2,FS:4,Periphery:1
@@ -3767,13 +3801,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
LA:7,FS:6,MERC:3,Periphery:1
@@ -4146,13 +4173,6 @@
General:8
-
- IS:4,Periphery:3
-
- paratrooper
- General:8
-
-
CSA:6,CHH:7,CBS:6,CLAN:5
@@ -4319,12 +4339,6 @@
General:8
-
- MERC:3
-
- General:8
-
-
CHH:6,HL:4,CLAN:4,IS:6,Periphery.Deep:5,TC:6,Periphery:5
@@ -4344,12 +4358,6 @@
PIR:5-,Periphery.Deep:5-,IS.pm:4,Periphery:5-
-
- DC:3+
-
- DC:8
-
-
MOC:6,OA:5,HL:3,Periphery.CM:5,Periphery.MW:4,Periphery.HR:5,Periphery.ME:5,MH:5,MERC:3,Periphery.OS:4,TC:5,Periphery:4
@@ -4657,12 +4665,6 @@
General:6
-
- IS:4,Periphery:4
-
- General:8
-
-
IS:1,Periphery:1
@@ -5138,14 +5140,18 @@
General:7
-
-
- IS:2,Periphery:2
-
- General:8
-
-
-
+
+ IS:2,Periphery:2
+
+
+
+ IS:2
+
+ specops
+ IS:5,DC:7
+
+
+
DC:2
General:8
@@ -6134,6 +6140,10 @@
General:8
+
+ recon,engineer
+ General:3
+
HL:6,IS:7,Periphery.Deep:6,Periphery:7
@@ -6155,7 +6165,11 @@
General:5
-
+
+ engineer
+ General:2,CS:3,WOB:3
+
+
HL:6,IS:7,Periphery.Deep:6,Periphery:7
@@ -6247,7 +6261,7 @@
- CC:3,MOC:1,OA:1,IS:1,MH:1,CIR:1
+ CC:3
missile_artillery
General:8
@@ -6349,14 +6363,14 @@
- IS:3,Periphery:3
+ FRR:3
- IS:8,Periphery:8
+ FRR:8
-
+
BAN:8
-
+
BAN:8
@@ -6380,8 +6394,23 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ engineer
+ IS:4,Periphery:2
+
+
+ anti_infantry,urban
+ IS:2,Periphery:2,Clan.IS:2
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
CS.EC:6
recon,xct
@@ -7793,13 +7822,6 @@
IS:5
-
- IS:2
-
- recon
- IS:8
-
-
MOC:3,CC:4,FRR:4,IS:5,WOB:5,SIC:4,FS:4,CIR:3,Periphery:2,TC:3,CS:5,OA:3,LA:4,FWL:4,NIOPS:5,DC:4
@@ -9525,13 +9547,13 @@
TC:8
-
- MOC:1,OA:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
CHH:5,CIH:5,CSR:6,CLAN:5,CFM:6,CSJ:7
diff --git a/megamek/data/forcegenerator/3060.xml b/megamek/data/forcegenerator/3060.xml
index 5c2b2941081..49a00da73f0 100644
--- a/megamek/data/forcegenerator/3060.xml
+++ b/megamek/data/forcegenerator/3060.xml
@@ -940,7 +940,7 @@
- FWL:4
+ FWL:2
anti_aircraft
General:8
@@ -1120,20 +1120,13 @@
CLAN:6,BAN:1
-
+
IS:2
-
+
anti_mek
IS:8
-
- LA:3,FS:2
-
- incendiary,anti_infantry
- General:8
-
-
CC:2,MOC:4,NCR:5,TC:3
@@ -2285,13 +2278,6 @@
CHH:4
-
- CS:3,WOB:3
-
- engineer
- General:8
-
-
PIR:4
@@ -3104,13 +3090,6 @@
IS:8
-
- IS:4,Periphery:2
-
- engineer
- General:8
-
-
CSA:5,CSR:5,CW:4,CBS:5,CSV:6,CLAN:5,CSJ:4,CGS:4,CJF:3,CWIE:4
@@ -4210,8 +4189,8 @@
HL:2,IS:3,Periphery:3
missile_artillery
- CC:5,IS:4
-
+ CC:5,IS:4,MOC:2,MH:2,CIR:2
+
artillery
General:6
@@ -4355,13 +4334,6 @@
LA:4,FS:4,MERC:4
-
- IS:4,Periphery:4
-
- engineer
- General:8
-
-
CS:6,MERC.WD:2,CIH:4,CLAN:2,WOB:5,BAN:1
@@ -4511,19 +4483,67 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ IS:2,OA:3,Periphery:2,CS.EC:2
+
+
+ spotter
+ IS:2+,CC:3+,FWL:3+
+
+
+ xct,marine
+ IS:1,Periphery:1,TC:4,CS.EC:2
+
+
+ xct
+ IS:1,TC:1+,OA:1+,CS.EC:1+
+
General:8
General:5
+
+ IS:2,MERC:3
+
General:5
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:5
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:1+,Periphery:1,MOC:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ IS:2+,Periphery:1+,HL:2
+
+ recon,specops,paratrooper
+ General:8
+
+
CS:4,CHH:1,LA:4,CBS:1,NIOPS:4,SIC:2,FS:4,Periphery:1
@@ -4549,13 +4569,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
LA:7,FS:6,MERC:3,Periphery:2
@@ -5048,13 +5061,6 @@
WOB:8
-
- IS:4,Periphery:3
-
- paratrooper
- General:8
-
-
CDS:4,CBS:2,LA:3,CNC:3,CFM:2,DC:4
@@ -5281,12 +5287,6 @@
General:8
-
- MERC:3
-
- General:8
-
-
CHH:6,HL:4,CLAN:4,IS:6,Periphery.Deep:5,TC:6,Periphery:5
@@ -5306,22 +5306,15 @@
PIR:5-,Periphery.Deep:5-,IS.pm:4,Periphery:5-
-
- IS:4,Periphery:4
-
- urban
- General:8
-
-
-
- MOC:2+,OA:2+,FWL:4+,IS:2+,DC:3+
-
- General:8,DC:4
-
-
- DC:8
-
-
+
+ FWL:4+,DC:3+
+
+ FWL:8
+
+
+ DC:8
+
+
CC:2,MOC:8,HL:4,MERC:4,Periphery.OS:5,TC:7,Periphery:5,OA:7,Periphery.CM:7,Periphery.MW:5,Periphery.HR:7,Periphery.ME:7,MH:7
@@ -5349,12 +5342,6 @@
DC:2
-
- IS:3,Periphery:3
-
- General:8
-
-
CHH:7,HL:5,CLAN:5,IS:7,Periphery.Deep:5,Periphery:6,TC:7
@@ -5711,12 +5698,6 @@
General:5
-
- IS:4,Periphery:4
-
- General:8
-
-
IS:1,Periphery:1
@@ -6300,19 +6281,30 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
+
+ IS:4
+
General:8
General:7
-
-
- IS:2,Periphery:2
-
- General:8
-
-
+
+ IS:2,Periphery:2
+
+
+
+ IS:2
+
+ specops,incindiary,anti_infantry
+ IS:5,CC:7
+
+
+ specops
+ IS:5,DC:7
+
+
DC:3
@@ -7507,7 +7499,7 @@
- CS:3,WOB:5
+ WOB:5
xct
General:8
@@ -7540,6 +7532,10 @@
General:8
+
+ recon,engineer
+ General:3
+
HL:6,IS:7,Periphery.Deep:6,Periphery:7
@@ -7561,7 +7557,11 @@
General:5
-
+
+ engineer
+ General:2,CS:3,WOB:3
+
+
HL:6,IS:7,Periphery.Deep:6,Periphery:7
@@ -7573,6 +7573,10 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
+
+ xct
+ IS:2+,CS:2,WOB:3
+
General:7
@@ -7710,7 +7714,7 @@
- CC:4,MOC:2,OA:2,IS:2,MH:2,CIR:2
+ CC:4
missile_artillery
General:8
@@ -7832,14 +7836,14 @@
- IS:3,Periphery:3
+ FRR:3
- IS:8,Periphery:8
+ FRR:8
-
+
BAN:8
-
+
BAN:8
@@ -7866,8 +7870,42 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ xct
+ IS:2
+
+
+ incendiary,anti_infantry
+ LA:3,FS:2
+
+
+ engineer
+ IS:4,Periphery:2
+
+
+ engineer
+ IS:2
+
+
+ urban
+ CC:2+
+
+
+ FWL:2+
+
+
+ anti_infantry,urban
+ IS:2,Periphery:2,Clan.IS:2
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
CS.EC:6
recon,xct
@@ -9666,13 +9704,6 @@
IS:6
-
- IS:2
-
- recon
- IS:8
-
-
MOC:3,CC:4,FRR:4,IS:5,WOB:5,SIC:4,FS:4,CIR:3,Periphery:2,TC:3,CS:5,OA:3,LA:4,FWL:4,NIOPS:5,DC:4
@@ -11909,13 +11940,13 @@
TC:8
-
- MOC:1,OA:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
CHH:6,CIH:5,CSR:6,CLAN:5,CFM:6,CSJ:7
diff --git a/megamek/data/forcegenerator/3067.xml b/megamek/data/forcegenerator/3067.xml
index 162eaf076d2..afb3c3f3ed7 100644
--- a/megamek/data/forcegenerator/3067.xml
+++ b/megamek/data/forcegenerator/3067.xml
@@ -928,7 +928,7 @@
- FWL:4
+ FWL:2
anti_aircraft
General:8
@@ -1152,20 +1152,13 @@
CLAN:6,BAN:1
-
+
IS:2
-
+
anti_mek
IS:8
-
- LA:3,FS:2
-
- incendiary,anti_infantry
- General:8
-
-
CC:3,MOC:5,PIR:3,TC:3
@@ -2641,13 +2634,6 @@
CHH:4
-
- CS:3,WOB:3
-
- engineer
- General:8
-
-
PIR:5,MH:2,CIR:2,MERC:2,TC:3
@@ -3650,13 +3636,6 @@
General:8
-
- IS:4,Periphery:2
-
- engineer
- General:8
-
-
CSA:5,CSR:5,CW:4,CBS:5,CSV:6,CLAN:5,CGS:4,CJF:3,CWIE:4
@@ -5167,8 +5146,8 @@
HL:2,IS:3,Periphery:3
missile_artillery
- CC:5,IS:4
-
+ CC:5,IS:4,MOC:3,MH:2,CIR:2
+
artillery
General:6
@@ -5335,13 +5314,6 @@
General:4-
-
- IS:4,Periphery:4
-
- engineer
- General:8
-
-
CS:6,MERC.WD:2,CIH:4,CLAN:2,WOB:5,BAN:1
@@ -5520,19 +5492,67 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ IS:3,OA:3,Periphery:2,CS.EC:2
+
+
+ spotter
+ IS:2+,CC:3+,FWL:3+
+
+
+ xct,marine
+ IS:1,Periphery:1,TC:4,CS.EC:2
+
+
+ xct
+ IS:1,TC:1+,OA:1+,CS.EC:1+
+
General:8
General:5
+
+ IS:2,MERC:3
+
General:5
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:5
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:1+,Periphery:1,MOC:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ IS:2+,MERC.WD:4,Periphery:1+,HL:2
+
+ recon,specops,paratrooper
+ General:8
+
+
CS:4,LA:4,CBS:1,NIOPS:4,FS:4,Periphery:1
@@ -5564,13 +5584,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
LA:8,FS:6,MERC:3,Periphery:2
@@ -6276,13 +6289,6 @@
WOB:8
-
- IS:4,Periphery:3
-
- paratrooper
- General:8
-
-
CHH:2,CDS:5,CBS:3,LA:4,CNC:5,CFM:3,DC:4
@@ -6564,12 +6570,6 @@
General:8
-
- MERC:3
-
- General:8
-
-
CHH:6,HL:4,CLAN:4,IS:6,Periphery.Deep:5,TC:6,Periphery:5
@@ -6593,22 +6593,15 @@
PIR:5-,Periphery.Deep:5-,IS.pm:4,Periphery:5-
-
- IS:4,Periphery:4
-
- urban
- General:8
-
-
-
- MOC:2+,OA:2+,FWL:4+,IS:2+,DC:3+
-
- General:8,DC:4
-
-
- DC:8
-
-
+
+ FWL:4+,DC:3+
+
+ FWL:8
+
+
+ DC:8
+
+
CC:4,MOC:8,HL:4,MERC:4,Periphery.OS:5,TC:7,Periphery:5,OA:7,Periphery.CM:7,Periphery.MW:5,Periphery.HR:7,Periphery.ME:7,MH:7
@@ -6643,12 +6636,6 @@
DC:2
-
- IS:3,Periphery:3
-
- General:8
-
-
CHH:7,HL:5,CLAN:5,IS:7,Periphery.Deep:5,Periphery:6,TC:7
@@ -7086,12 +7073,6 @@
General:4-
-
- IS:4,Periphery:4
-
- General:8
-
-
IS:1,Periphery:1
@@ -7832,7 +7813,7 @@
anti_aircraft
- IS:6
+ IS:3
General:5
@@ -7843,20 +7824,31 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
+
+ IS:4
+
General:8
General:7
-
-
- IS:2,Periphery:2
-
- General:8
-
-
-
+
+ IS:2,Periphery:2
+
+
+
+ IS:2
+
+ specops,incindiary,anti_infantry
+ IS:5,CC:7
+
+
+ specops
+ IS:5,DC:7
+
+
+
CJF:2
General:8
@@ -9474,7 +9466,7 @@
- CS:3,WOB:5
+ WOB:5
xct
General:8
@@ -9511,6 +9503,10 @@
General:8
+
+ recon,engineer
+ General:3
+
HL:6,IS:7,Periphery.Deep:6,Periphery:7
@@ -9536,6 +9532,10 @@
General:5
+
+ engineer
+ General:2,CS:3,WOB:3
+
HL:6,IS:7,Periphery.Deep:6,Periphery:7
@@ -9552,6 +9552,10 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
+
+ xct
+ IS:2+,CS:2,WOB:3
+
General:7
@@ -9718,7 +9722,7 @@
- CC:4,MOC:3,OA:2,IS:2,MH:2,CIR:2
+ CC:4
missile_artillery
General:8
@@ -9860,14 +9864,14 @@
- IS:3,Periphery:3
+ FRR:3
- IS:8,Periphery:8
+ FRR:8
-
+
BAN:8
-
+
BAN:8
@@ -9901,8 +9905,42 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ xct
+ IS:2
+
+
+ incendiary,anti_infantry
+ LA:3,FS:2
+
+
+ engineer
+ IS:4,Periphery:2
+
+
+ engineer
+ IS:2
+
+
+ urban
+ CC:2+
+
+
+ IS:2+,FWL:3
+
+
+ anti_infantry,urban
+ IS:2,Periphery:2,Clan.IS:2
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
CS.EC:6
recon,xct
@@ -12403,13 +12441,6 @@
WOB:4
-
- IS:2
-
- recon
- IS:8
-
-
MOC:3,CC:4,FRR:4,IS:5,WOB:5,FS:4,CIR:3,Periphery:2,TC:3,CS:5,OA:3,LA:4,FWL:4,NIOPS:5,DC:4
@@ -15404,13 +15435,13 @@
General:2-
-
- MOC:1,OA:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
CHH:7,CIH:5,CSR:6,CLAN:5,CFM:6
diff --git a/megamek/data/forcegenerator/3075.xml b/megamek/data/forcegenerator/3075.xml
index 6e27cd4fb54..4952895bc68 100644
--- a/megamek/data/forcegenerator/3075.xml
+++ b/megamek/data/forcegenerator/3075.xml
@@ -1166,7 +1166,7 @@
- FWL:4
+ FWL:2
anti_aircraft
General:8
@@ -1416,20 +1416,13 @@
MERC.WD:4,CLAN:6,IS:2,BAN:1
-
+
IS:2
-
+
anti_mek
IS:8
-
- LA:3,FS:2
-
- incendiary,anti_infantry
- General:8
-
-
CC:4,MOC:6,PIR:3,TC:3
@@ -3012,13 +3005,6 @@
CHH:4
-
- CS:3,WOB:3
-
- engineer
- General:8
-
-
PIR:5,MH:2,MERC:2,CIR:2,TC:3
@@ -4028,13 +4014,6 @@
General:8
-
- IS:4,Periphery:2
-
- engineer
- General:8
-
-
CSA:5,CSR:5,CW:4,CBS:5,CSV:6,CLAN:5,CGS:4,CJF:3,CWIE:4
@@ -5665,8 +5644,8 @@
HL:2,IS:3,Periphery:3
missile_artillery
- CC:5,IS:4
-
+ CC:5,IS:4,MOC:3,MH:2,CIR:2
+
artillery
General:6
@@ -5836,13 +5815,6 @@
General:4-
-
- IS:4,Periphery:4
-
- engineer
- General:8
-
-
CS:6,MERC.WD:2,CLAN:2,WOB:5,BAN:1
@@ -6047,19 +6019,67 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ IS:4,OA:3,Periphery:2,CS.EC:2
+
+
+ spotter
+ IS:2+,CC:3+,FWL:3+
+
+
+ xct,marine
+ IS:2,Periphery:1,TC:4,CS.EC:2
+
+
+ xct
+ IS:1,TC:1+,OA:1+,CS.EC:1+
+
General:8
General:5
+
+ IS:2,MERC:3
+
General:5
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:5
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:2+,Periphery:1,MOC:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ IS:2+,MERC.WD:4,Periphery:1+,HL:2
+
+ recon,specops,paratrooper
+ General:8
+
+
CS:4,LA:4,NIOPS:4,FS:4,Periphery:1
@@ -6098,13 +6118,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
LA:8,FS:6,MERC:3,Periphery:2
@@ -6853,13 +6866,6 @@
WOB:8
-
- IS:4,Periphery:3
-
- paratrooper
- General:8
-
-
CHH:3,CDS:5,CBS:3,LA:4,CNC:5,DC:4
@@ -7163,12 +7169,6 @@
General:8
-
- MERC:3
-
- General:8
-
-
CHH:6,HL:4,CLAN:4,IS:6,Periphery.Deep:5,TC:6,Periphery:5
@@ -7192,22 +7192,15 @@
PIR:5-,Periphery.Deep:5-,IS.pm:4,Periphery:5-
-
- IS:4,Periphery:4
-
- urban
- General:8
-
-
-
- MOC:2+,OA:2+,FWL:4+,IS:2+,DC:3+
-
- General:8,DC:4
-
-
- DC:8
-
-
+
+ FWL:4+,DC:3+
+
+ FWL:8
+
+
+ DC:8
+
+
CC:3,MOC:6,HL:4,MERC:3,Periphery.OS:4,FS:3,TC:6,Periphery:5,OA:6,Periphery.CM:7,Periphery.MW:5,Periphery.HR:7,Periphery.ME:7,FWL:3,MH:6
@@ -7248,12 +7241,6 @@
DC:2
-
- IS:3,Periphery:3
-
- General:8
-
-
CHH:7,HL:5,CLAN:5,IS:7,Periphery.Deep:5,Periphery:6,TC:7
@@ -7721,12 +7708,6 @@
General:3-
-
- IS:4,Periphery:4
-
- General:8
-
-
IS:1,Periphery:1
@@ -8513,7 +8494,7 @@
anti_aircraft
- IS:6
+ IS:4
General:5
@@ -8524,20 +8505,31 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
+
+ IS:4,Periphery:2+
+
General:8
General:7
-
-
- IS:2,Periphery:2
-
- General:8
-
-
-
+
+ IS:2,Periphery:2
+
+
+
+ IS:2
+
+ specops,incindiary,anti_infantry
+ IS:5,CC:7
+
+
+ specops
+ IS:5,DC:7
+
+
+
CHH:2,CJF:3
CJF:4
@@ -10233,7 +10225,7 @@
- CS:3,WOB:5
+ WOB:5
xct
General:8
@@ -10270,6 +10262,10 @@
General:8
+
+ recon,engineer
+ General:3
+
HL:6,IS:7,Periphery.Deep:6,Periphery:7
@@ -10295,7 +10291,11 @@
General:5
-
+
+ engineer
+ General:2,CS:3,WOB:3
+
+
HL:6,IS:7,Periphery.Deep:6,Periphery:7
@@ -10311,6 +10311,10 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
+
+ xct
+ IS:3,CS:3,WOB:5
+
General:7
@@ -10481,7 +10485,7 @@
- CC:4,MOC:3,OA:2,IS:2,MH:2,CIR:2
+ CC:4
missile_artillery
General:8
@@ -10653,14 +10657,14 @@
- IS:3,Periphery:3
+ FRR:3
- IS:8,Periphery:8
+ FRR:8
-
+
BAN:8
-
+
BAN:8
@@ -10694,8 +10698,42 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ xct
+ IS:3+
+
+
+ incendiary,anti_infantry
+ LA:3,FS:2
+
+
+ engineer
+ IS:4,Periphery:2
+
+
+ engineer
+ IS:2
+
+
+ urban
+ IS:2+,CC:3
+
+
+ IS:3,Periphery:2
+
+
+ anti_infantry,urban
+ IS:4,Periphery:2,Clan.IS:4,WOB.PM:4
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
CS.EC:6
recon,xct
@@ -13325,13 +13363,6 @@
WOB:4
-
- IS:2
-
- recon
- IS:8
-
-
MOC:3,CC:4,FRR:4,IS:5,WOB:5,FS:4,CIR:3,Periphery:2,TC:3,CS:5,OA:3,LA:4,FWL:4,NIOPS:5,DC:4
@@ -16536,13 +16567,13 @@
CC:4,MOC:4,LA:4,MERC:4
-
- MOC:1,OA:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
CHH:7,CSR:6,CLAN:5
diff --git a/megamek/data/forcegenerator/3078.xml b/megamek/data/forcegenerator/3078.xml
index 345e039c03c..64288e345d6 100644
--- a/megamek/data/forcegenerator/3078.xml
+++ b/megamek/data/forcegenerator/3078.xml
@@ -1306,7 +1306,7 @@
- FWL:4
+ FWL:2
anti_aircraft
General:8
@@ -1572,20 +1572,13 @@
MERC.WD:4,CLAN:6,IS:2,BAN:1
-
+
IS:2
-
+
anti_mek
IS:8
-
- LA:3,FS:2
-
- incendiary,anti_infantry
- General:8
-
-
CC:4,MOC:6,PIR:2,TC:3
@@ -3247,13 +3240,6 @@
General:8
-
- CS:3,WOB:3
-
- engineer
- General:8
-
-
PIR:5,MH:2,MERC:2,CIR:2,TC:2
@@ -4275,13 +4261,6 @@
General:8
-
- IS:4,Periphery:2
-
- engineer
- General:8
-
-
CSA:5,CSR:3,CW:4,CBS:5,CLAN:5,CGS:4,CJF:3,CWIE:4
@@ -5998,8 +5977,8 @@
HL:2,IS:3,Periphery:3
missile_artillery
- CC:5,IS:4
-
+ CC:5,IS:4,MOC:3,OA:1,MH:2,CIR:2
+
artillery
General:6
@@ -6169,13 +6148,6 @@
General:3-
-
- IS:4,Periphery:4
-
- engineer
- General:8
-
-
CS:6,MERC.WD:1,CLAN:1,WOB:5,BAN:1
@@ -6380,19 +6352,67 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ IS:4,OA:3,Periphery:2,CS.EC:2
+
+
+ spotter
+ IS:2+,CC:3+,FWL:3+
+
+
+ xct,marine
+ IS:2,Periphery:1,TC:3,CS.EC:2
+
+
+ xct
+ IS:1,TC:1+,OA:1+,CS.EC:1+
+
General:8
General:5
+
+ IS:2,MERC:3
+
General:5
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:5
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:2+,Periphery:1,MOC:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ IS:2+,MERC.WD:4,Periphery:1+,HL:2
+
+ recon,specops,paratrooper
+ General:8
+
+
CS:4,LA:4,NIOPS:4,FS:4,Periphery:1
@@ -6431,13 +6451,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
LA:8,FS:6,MERC:3,Periphery:2
@@ -7242,13 +7255,6 @@
General:8
-
- IS:4,Periphery:3
-
- paratrooper
- General:8
-
-
CHH:3,CDS:5,CBS:3,LA:4,CNC:5,DC:4
@@ -7558,12 +7564,6 @@
General:8
-
- MERC:3
-
- General:8
-
-
CHH:6,HL:4,CLAN:4,IS:6,Periphery.Deep:5,TC:6,Periphery:5
@@ -7587,22 +7587,15 @@
PIR:5-,Periphery.Deep:5-,IS.pm:4,Periphery:5-
-
- IS:4,Periphery:4
-
- urban
- General:8
-
-
-
- MOC:2+,OA:2+,FWL:4+,IS:2+,DC:3+
-
- General:8,DC:4
-
-
- DC:8
-
-
+
+ FWL:4+,DC:3+
+
+ FWL:8
+
+
+ DC:8
+
+
CC:3,MOC:5,HL:4,MERC:3,Periphery.OS:4,FS:3,TC:5,Periphery:5,OA:6,Periphery.CM:7,Periphery.MW:5,Periphery.HR:7,Periphery.ME:7,FWL:3,MH:6
@@ -7643,12 +7636,6 @@
DC:2
-
- IS:3,Periphery:3
-
- General:8
-
-
CHH:7,HL:5,CLAN:5,IS:7,Periphery.Deep:5,Periphery:6,TC:7
@@ -8126,12 +8113,6 @@
General:3-
-
- IS:4,Periphery:4
-
- General:8
-
-
IS:1,Periphery:1
@@ -8951,7 +8932,7 @@
anti_aircraft
- IS:6
+ IS:4
General:5
@@ -8962,20 +8943,31 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
+
+ IS:4,Periphery:2+
+
General:8
General:7
-
-
- IS:2,Periphery:2
-
- General:8
-
-
-
+
+ IS:2,Periphery:2
+
+
+
+ IS:2
+
+ specops,incindiary,anti_infantry
+ IS:5,CC:7
+
+
+ specops
+ IS:5,DC:7
+
+
+
CHH:2,CJF:3
CJF:4
@@ -10758,7 +10750,7 @@
- CS:3,WOB:5
+ WOB:5
xct
General:8
@@ -10795,6 +10787,10 @@
General:8
+
+ recon,engineer
+ General:3
+
HL:6,IS:7,Periphery.Deep:6,Periphery:7
@@ -10820,7 +10816,11 @@
General:5
-
+
+ engineer
+ General:2,CS:3,WOB:3
+
+
HL:6,IS:7,Periphery.Deep:6,Periphery:7
@@ -10836,6 +10836,10 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
+
+ xct
+ IS:3+,CS:3,WOB:5
+
General:7
@@ -11017,7 +11021,7 @@
- CC:4,MOC:3,OA:2,IS:2,MH:2,CIR:2
+ CC:4
missile_artillery
General:8
@@ -11203,14 +11207,14 @@
- IS:3,Periphery:3
+ FRR:3
- IS:8,Periphery:8
+ FRR:8
-
+
BAN:8
-
+
BAN:8
@@ -11244,8 +11248,42 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ xct
+ IS:3+
+
+
+ incendiary,anti_infantry
+ LA:3,FS:2
+
+
+ engineer
+ IS:4,Periphery:2
+
+
+ engineer
+ IS:2
+
+
+ urban
+ IS:2+,CC:3
+
+
+ IS:3,MOC:2+,Periphery:2
+
+
+ anti_infantry,urban
+ IS:4,Periphery:2,Clan.IS:4,WOB.PM:4
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
CS.EC:6
recon,xct
@@ -14056,13 +14094,6 @@
CS:3,CC:3,FRR:2,CGB.FRR:3,FWL:5,MERC:3,DC:3
-
- IS:2
-
- recon
- IS:8
-
-
MOC:3,CC:4,FRR:4,IS:5,WOB:5,FS:4,CIR:3,Periphery:2,TC:3,CS:5,OA:3,LA:4,CGB.FRR:4,FWL:4,NIOPS:5,DC:4
@@ -17443,13 +17474,13 @@
CC:4,MOC:4,LA:4,MERC:4
-
- MOC:1,OA:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
CHH:7,CSR:3,CLAN:5
diff --git a/megamek/data/forcegenerator/3082.xml b/megamek/data/forcegenerator/3082.xml
index 53796210ce0..984287ace5d 100644
--- a/megamek/data/forcegenerator/3082.xml
+++ b/megamek/data/forcegenerator/3082.xml
@@ -1123,7 +1123,7 @@
- MOC:2,FWL:4,IS:2,MH:2,RA:2
+ FWL:2
anti_aircraft
General:8
@@ -1372,20 +1372,13 @@
MERC.WD:5,CLAN:6,IS:3,BAN:1
-
+
IS:2
-
+
anti_mek
IS:8
-
- LA:3,IS:2,FS:2,Periphery:2
-
- incendiary,anti_infantry
- General:8
-
-
CC:5,MOC:6,DA:2,TC:3
@@ -3957,13 +3950,6 @@
General:8
-
- IS:4,Periphery:2
-
- engineer
- General:8
-
-
CSA:5,CSR:3,CW:4,CBS:5,CLAN:5,CJF:3,RA:4,CWIE:4
@@ -5548,8 +5534,8 @@
HL:2,IS:3,Periphery:3
missile_artillery
- CC:5,IS:4
-
+ CC:5,IS:4,MOC:3,RA.OA:1,PIR:2,MH:2
+
artillery
General:6
@@ -5707,13 +5693,6 @@
CC:3,MOC:3
-
- IS:4,Periphery:4
-
- engineer
- General:8
-
-
HL:6,LA:6,IS:5,NIOPS:3,Periphery.Deep:6,Periphery:7
@@ -5877,19 +5856,67 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ IS:4,OA:4,Periphery:2,CS.EC:2
+
+
+ spotter
+ IS:2+,CC:3+,FWL:3+
+
+
+ xct,marine
+ IS:2,Periphery:1,TC:3,CS.EC:2
+
+
+ xct
+ IS:1,TC:1+,OA:1+,CS.EC:1+
+
General:8
General:5
+
+ IS:2,MERC:3
+
General:5
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:5
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:2+,Periphery:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ IS:2+,Periphery:1+,HL:2
+
+ recon,specops,paratrooper
+ General:8
+
+
LA:4,NIOPS:4,FS:4,Periphery:1
@@ -5949,13 +5976,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
FS:2
@@ -6685,13 +6705,6 @@
General:8
-
- IS:4,Periphery:3
-
- paratrooper
- General:8
-
-
CHH:3,CDS:5,LA:4,CBS:3,CNC:5,IS:3,DC:4,CWIE:3
@@ -6988,12 +7001,6 @@
General:8
-
- MERC:3
-
- General:8
-
-
CHH:6,HL:4,CLAN:4,IS:6,Periphery.Deep:5,TC:6,Periphery:5
@@ -7017,22 +7024,15 @@
PIR:5-,Periphery.Deep:5-,IS.pm:4,Periphery:5-
-
- IS:4,Periphery:4
-
- urban
- General:8
-
-
-
- MOC:2+,RA.OA:2+,OA:2+,FWL:4+,IS:2+,DC:3+
-
- General:8,DC:4
-
-
- DC:8
-
-
+
+ FWL:4+,DC:3+
+
+ FWL:8
+
+
+ DC:8
+
+
CC:2,MOC:5,HL:4,MERC:3,Periphery.OS:4,FS:3,TC:5,Periphery:5,RA.OA:5,OA:5,Periphery.CM:7,Periphery.MW:5,Periphery.HR:7,Periphery.ME:7,FWL:3,MH:5
@@ -7080,12 +7080,6 @@
DC:2
-
- IS:3,Periphery:3
-
- General:8
-
-
CHH:7,HL:5,CLAN:5,IS:7,Periphery.Deep:5,Periphery:6,TC:7
@@ -7502,12 +7496,6 @@
General:2-
-
- IS:4,Periphery:4
-
- General:8
-
-
IS:1,Periphery:1
@@ -8266,8 +8254,8 @@
anti_aircraft
- IS:6
-
+ MOC:2,IS:4,MH:2,RA:2
+
General:5
@@ -8277,20 +8265,31 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
+
+ IS:4,Periphery:2+
+
General:8
General:7
-
-
- IS:2,Periphery:2
-
- General:8
-
-
-
+
+ IS:2,Periphery:2
+
+
+
+ IS:2
+
+ specops,incindiary,anti_infantry
+ IS:5,CC:7
+
+
+ specops
+ IS:5,DC:7
+
+
+
CHH:3,ROS:1,CJF:4
CJF:4
@@ -9950,6 +9949,10 @@
General:8
+
+ recon,engineer
+ General:3
+
HL:6,IS:7,Periphery.Deep:6,Periphery:7
@@ -9991,6 +9994,10 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
+
+ xct
+ IS:3+,CS:3,WOB:5
+
General:7
@@ -10174,7 +10181,7 @@
- CC:4,MOC:3,RA.OA:2,OA:2,PIR:2,IS:2,MH:2
+ CC:4
missile_artillery
General:8
@@ -10354,14 +10361,14 @@
- IS:3,Periphery:3
+ FRR:3
- IS:8,Periphery:8
+ FRR:8
-
+
BAN:8
-
+
BAN:8
@@ -10395,8 +10402,42 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ xct
+ IS:3+
+
+
+ incendiary,anti_infantry
+ LA:3,FS:2,IS:2,Periphery:2
+
+
+ engineer
+ IS:4,Periphery:2
+
+
+ engineer
+ IS:2
+
+
+ urban
+ IS:2+,CC:3
+
+
+ IS:3,MOC:3,Periphery:2+
+
+
+ anti_infantry,urban
+ IS:4,Periphery:2,Clan.IS:4,WOB.PM:4
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
IS:4,Periphery:4
mountaineer
@@ -13016,13 +13057,6 @@
CC:4,MOC:3,CGB.FRR:4,ROS:4,FWL:6,MERC:4,DC:4
-
- IS:2
-
- recon
- IS:8
-
-
MOC:3,CC:4,IS:5,FS:4,Periphery:2,TC:3,RA.OA:3,OA:3,LA:4,CGB.FRR:4,FWL:4,NIOPS:5,DC:4
@@ -16120,13 +16154,13 @@
CC:5,MOC:5,LA:5,ROS:5,MERC:5
-
- MOC:1,OA:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
CHH:7,CSR:3,CLAN:5,RA:4
diff --git a/megamek/data/forcegenerator/3085.xml b/megamek/data/forcegenerator/3085.xml
index cd6002bbb86..d1274a18364 100644
--- a/megamek/data/forcegenerator/3085.xml
+++ b/megamek/data/forcegenerator/3085.xml
@@ -1111,7 +1111,7 @@
- MOC:2,FWL:4,IS:2,MH:2,RA:2
+ FWL:2
anti_aircraft
General:8
@@ -1377,20 +1377,13 @@
MERC.WD:5,CLAN:6,IS:3,BAN:1
-
+
IS:2
-
+
anti_mek
IS:8
-
- LA:3,IS:2,FS:2,Periphery:2
-
- incendiary,anti_infantry
- General:8
-
-
CC:5,MOC:6,DA:3,TC:3
@@ -2937,7 +2930,7 @@
- MOC:6,OA.RA:5,FS:2,Periphery:4,DC:2
+ MOC:6,RA.OA:5,FS:2,Periphery:4,DC:2
General:6
@@ -4066,13 +4059,6 @@
General:8
-
- IS:4,Periphery:2
-
- engineer
- General:8
-
-
CSA:5,CW:4,CLAN:5,CJF:3,RA:5,CWIE:4
@@ -5760,8 +5746,8 @@
HL:2,IS:3,Periphery:3
missile_artillery
- CC:5,IS:4
-
+ CC:5,IS:4,MOC:3,RA.OA:2,PIR:2,MH:2
+
artillery
General:6
@@ -5919,13 +5905,6 @@
CC:6,MOC:6
-
- IS:4,Periphery:4
-
- engineer
- General:8
-
-
HL:6,LA:6,IS:5,NIOPS:3,Periphery.Deep:6,Periphery:7
@@ -6098,19 +6077,74 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
+
+ marine
+ IS:3,RA.OA:4,Periphery:2,CS.EC:2
+
+
+ spotter
+ IS:2+,CC:3+,FWL:3+
+
+
+ xct,marine
+ IS:2,Periphery:1,TC:3,CS.EC:2
+
+
+ xct
+ IS:1,TC:1+,RA.OA:1+,CS.EC:1+
+
General:8
General:5
+
+ IS:2,MERC:3
+
General:5
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:7
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:2+,Periphery:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ IS:2+,Periphery:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ IS:2+,Periphery:1+,HL:2
+
+ recon,specops,paratrooper
+ General:8
+
+
LA:4,NIOPS:4,FS:4,Periphery:1
@@ -6170,13 +6204,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
FS:2
@@ -6945,13 +6972,6 @@
General:8
-
- IS:4,Periphery:3
-
- paratrooper
- General:8
-
-
CHH:3,CDS:5,LA:4,CNC:5,IS:4,DC:4,CWIE:4
@@ -7255,12 +7275,6 @@
General:8
-
- MERC:3
-
- General:8
-
-
CHH:6,HL:4,CLAN:4,IS:6,Periphery.Deep:5,TC:6,Periphery:5
@@ -7284,22 +7298,15 @@
PIR:5-,Periphery.Deep:5-,IS.pm:4,Periphery:5-
-
- IS:4,Periphery:4
-
- urban
- General:8
-
-
-
- MOC:2+,RA.OA:2+,FWL:4+,IS:2+,DC:3+
-
- General:8,DC:4
-
-
- DC:8
-
-
+
+ FWL:4+,DC:3+
+
+ FWL:8
+
+
+ DC:8
+
+
CC:2,MOC:4,HL:4,MERC:3,Periphery.OS:4,FS:3,TC:4,Periphery:5,RA.OA:5,Periphery.CM:7,Periphery.MW:5,Periphery.HR:7,Periphery.ME:7,FWL:3,MH:5
@@ -7347,12 +7354,6 @@
DC:2
-
- IS:3,Periphery:3
-
- General:8
-
-
CHH:7,HL:5,CLAN:5,IS:7,Periphery.Deep:5,Periphery:6,TC:7
@@ -7790,12 +7791,6 @@
General:8
-
- IS:4
-
- General:8
-
-
IS:1,Periphery:1
@@ -8570,8 +8565,8 @@
anti_aircraft
- IS:6
-
+ MOC:2,IS:4,MH:2,RA:2
+
General:5
@@ -8581,20 +8576,31 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
+
+ IS:4,Periphery:3+
+
General:8
General:7
-
-
- IS:2
-
- General:8
-
-
-
+
+ IS:2
+
+
+
+ IS:2
+
+ specops,incindiary,anti_infantry
+ IS:5,CC:7
+
+
+ specops
+ IS:5,DC:7
+
+
+
CHH:3,ROS:2,CJF:4
CJF:4
@@ -10363,6 +10369,10 @@
General:8
+
+ recon,engineer
+ General:3
+
HL:6,IS:7,Periphery.Deep:6,Periphery:7
@@ -10404,6 +10414,10 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
+
+ xct
+ IS:3
+
General:7
@@ -10584,7 +10598,7 @@
- CC:4,MOC:3,RA.OA:2,PIR:2,IS:2,MH:2
+ CC:4
missile_artillery
General:8
@@ -10792,14 +10806,14 @@
- IS:3,Periphery:3
+ FRR:3
- IS:8,Periphery:8
+ FRR:3
-
+
BAN:8
-
+
BAN:8
@@ -10833,8 +10847,42 @@
HL:3,General:6,Periphery.Deep:5,Periphery:5
-
-
+
+ xct
+ IS:2
+
+
+ incendiary,anti_infantry
+ LA:3,FS:2,IS:2,Periphery:2
+
+
+ engineer
+ IS:4,Periphery:2
+
+
+ engineer
+ IS:2
+
+
+ urban
+ IS:3
+
+
+ IS:3,MOC:3,Periphery:2+
+
+
+ anti_infantry,urban
+ IS:4,Periphery:2,Clan.IS:4
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
IS:4,Periphery:4
mountaineer
@@ -13616,13 +13664,6 @@
CC:4,MOC:3,CGB.FRR:4,ROS:4,FWL:6,MERC:4,DC:4
-
- IS:2
-
- recon
- IS:8
-
-
MOC:3,CC:4,RA.OA:3,LA:4,CGB.FRR:4,IS:5,FWL:4,NIOPS:5,FS:4,Periphery:2,TC:3,DC:4
@@ -17028,13 +17069,13 @@
CC:5,MOC:5,LA:5,ROS:5,MERC:5
-
- MOC:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
CHH:7,CLAN:5,RA:6
diff --git a/megamek/data/forcegenerator/3100.xml b/megamek/data/forcegenerator/3100.xml
index 40f2cd25504..7feb7303523 100644
--- a/megamek/data/forcegenerator/3100.xml
+++ b/megamek/data/forcegenerator/3100.xml
@@ -1148,7 +1148,7 @@
- MOC:2,RD:2,FWL:4,IS:2,MH:2,RA:2
+ FWL:2
anti_aircraft
General:8
@@ -1437,20 +1437,13 @@
MERC.WD:6,CLAN:6,IS:4,BAN:1
-
+
IS:2
-
+
anti_mek
IS:8
-
- LA:3,IS:2,FS:2,Periphery:2
-
- incendiary,anti_infantry
- General:8
-
-
FS:2
@@ -3017,7 +3010,7 @@
- MOC:6,OA.RA:5,FS:2,Periphery:4,DC:2
+ MOC:6,RA.OA:5,FS:2,Periphery:4,DC:2
General:6
@@ -4179,13 +4172,6 @@
General:8
-
- IS:4,Periphery:2
-
- engineer
- General:8
-
-
CW:4,CLAN:5,CJF:3,RA:5,CWIE:4
@@ -5931,8 +5917,8 @@
IS:3,Periphery:3
missile_artillery
- CC:5,IS:4
-
+ CC:5,IS:4,MOC:3,RA.OA:2,PIR:2,MH:2
+
artillery
General:6
@@ -6090,13 +6076,6 @@
CC:8,MOC:8
-
- IS:4,Periphery:4
-
- engineer
- General:8
-
-
LA:6,IS:5,Periphery.Deep:5,Periphery:7
@@ -6280,19 +6259,67 @@
General:6,Periphery:5
+
+ marine
+ IS:2,RA.OA:4,Periphery:2,CS.EC:2
+
+
+ spotter
+ IS:2+,CC:3+,FWL:3+
+
+
+ xct,marine
+ IS:1,Periphery:1,TC:3,CS.EC:2
+
+
+ xct
+ IS:1,TC:1+,RA.OA:1+,CS.EC:1+
+
General:8
General:5
+
+ IS:2,MERC:3
+
General:5
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:8
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:2+,Periphery:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ IS:2+,Periphery:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
LA:4,FS:4
@@ -6352,13 +6379,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
FS:3
@@ -7202,13 +7222,6 @@
General:8
-
- IS:4,Periphery:3
-
- paratrooper
- General:8
-
-
CHH:3,CDS:5,LA:4,CNC:5,IS:4,DC:4,CWIE:4
@@ -7527,12 +7540,6 @@
General:8
-
- MERC:3
-
- General:8
-
-
CHH:6,CLAN:4,IS:6,TC:6,Periphery:5
@@ -7556,22 +7563,15 @@
PIR:5-,IS.pm:4,Periphery:5-
-
- IS:4,Periphery:4
-
- urban
- General:8
-
-
-
- MOC:2+,RA.OA:2+,FWL:4+,IS:2+,DC:3+
-
- General:8,DC:4
-
-
- DC:8
-
-
+
+ FWL:4+,DC:3+
+
+ FWL:8
+
+
+ DC:8
+
+
MOC:2,Periphery.OS:4,MERC:3,FS:3,TC:2,Periphery:5,RA.OA:4,Periphery.CM:7,Periphery.MW:5,Periphery.HR:7,Periphery.ME:7,FWL:3,MH:3
@@ -7619,12 +7619,6 @@
DC:2
-
- IS:3,Periphery:3
-
- General:8
-
-
CHH:7,CLAN:5,IS:7,Periphery.Deep:4,Periphery:6,TC:7
@@ -8071,12 +8065,6 @@
General:8
-
- IS:4
-
- General:8
-
-
IS:1,Periphery:1
@@ -8823,8 +8811,8 @@
anti_aircraft
- IS:6
-
+ MOC:2,RD:2,IS:4,MH:2,RA:2
+
General:5
@@ -8834,20 +8822,31 @@
General:6,Periphery:5
+
+ IS:4,Periphery:3+
+
General:8
General:7
-
-
- IS:2
-
- General:8
-
-
-
+
+ IS:2
+
+
+
+ IS:2
+
+ specops,incindiary,anti_infantry
+ IS:5,CC:7
+
+
+ specops
+ IS:5,DC:7
+
+
+
CHH:4,ROS:2,CJF:5
CJF:4
@@ -10633,6 +10632,10 @@
General:8
+
+ recon,engineer
+ General:3
+
IS:7,Periphery.Deep:5,Periphery:7
@@ -10674,6 +10677,10 @@
General:6,Periphery:5
+
+ xct
+ IS:2
+
General:7
@@ -10854,7 +10861,7 @@
- CC:4,MOC:3,RA.OA:2,PIR:2,IS:2,MH:2
+ CC:4
missile_artillery
General:8
@@ -11071,14 +11078,14 @@
- IS:3,Periphery:3
+ FRR:3
- IS:8,Periphery:8
+ FRR:8
-
+
BAN:8
-
+
BAN:8
@@ -11112,8 +11119,42 @@
General:6,Periphery:5
-
-
+
+ xct
+ IS:2
+
+
+ incendiary,anti_infantry
+ LA:3,FS:2,IS:2,Periphery:2
+
+
+ engineer
+ IS:4,Periphery:2
+
+
+ engineer
+ IS:2,Periphery:1
+
+
+ urban
+ IS:3
+
+
+ IS:3,Periphery:3
+
+
+ anti_infantry,urban
+ IS:4,Periphery:2,Clan.IS:4
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
IS:4,Periphery:4
mountaineer
@@ -13962,13 +14003,6 @@
OP:8,LA:8,FWL:8
-
- IS:2
-
- recon
- IS:8
-
-
MOC:3,CC:4,RA.OA:3,LA:4,IS:5,FWL:4,FS:4,Periphery:2,TC:3,DC:4
@@ -17476,13 +17510,13 @@
CC:6,MOC:6,LA:6,ROS:6,MERC:6
-
- MOC:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
CHH:7,CLAN:5,RA:6
diff --git a/megamek/data/forcegenerator/3135.xml b/megamek/data/forcegenerator/3135.xml
index 15c3a881833..71ad581abff 100644
--- a/megamek/data/forcegenerator/3135.xml
+++ b/megamek/data/forcegenerator/3135.xml
@@ -1317,7 +1317,7 @@
- MOC:2,RD:2,FWL:4,IS:2,MH:2,CP:4,RA:2
+ FWL:2
anti_aircraft
General:8
@@ -1606,20 +1606,13 @@
MERC.WD:6,CLAN:6,IS:4,BAN:1
-
+
IS:2
-
+
anti_mek
IS:8
-
- LA:3,IS:2,FS:2,Periphery:2
-
- incendiary,anti_infantry
- General:8
-
-
FS:3,MERC:1
@@ -3260,7 +3253,7 @@
- MOC:6,OA.RA:5,FS:2,Periphery:4,DC:2
+ MOC:6,RA.OA:5,FS:2,Periphery:4,DC:2
General:6
@@ -4487,13 +4480,6 @@
General:8
-
- IS:4,Periphery:2
-
- engineer
- General:8
-
-
CWE:4,CW:4,CLAN:5,CJF:3,RA:5,CWIE:4
@@ -6285,8 +6271,8 @@
IS:3,Periphery:3
missile_artillery
- CC:5,IS:4
-
+ CC:5,IS:4,MOC:3,RA.OA:2,PIR:2,MH:2
+
artillery
General:6
@@ -6441,13 +6427,6 @@
CC:8,MOC:8
-
- IS:4,Periphery:4
-
- engineer
- General:8
-
-
LA:6,IS:5,Periphery.Deep:5,Periphery:7
@@ -6631,19 +6610,67 @@
General:6,Periphery:5
+
+ marine
+ IS:3,RA.OA:4,Periphery:2,CS.EC:2
+
+
+ spotter
+ IS:2+,CC:3+,FWL:3+
+
+
+ xct,marine
+ IS:1,Periphery:1,TC:3,CP:3,CS.EC:2
+
+
+ xct
+ IS:1,TC:1+,RA.OA:1+,CP:1+,CS.EC:1+
+
General:8
General:5
+
+ IS:2,MERC:3
+
General:5
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:7
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:2+,Periphery:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ IS:2+,Periphery:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
LA:4,FS:4
@@ -6703,13 +6730,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
FS:3
@@ -7632,13 +7652,6 @@
General:8
-
- IS:4,Periphery:3
-
- paratrooper
- General:8
-
-
CHH:3,CDS:5,LA:4,CNC:5,IS:4,CP:5,DC:4,CWIE:4
@@ -7979,12 +7992,6 @@
General:8
-
- MERC:3
-
- General:8
-
-
CHH:6,CLAN:4,IS:6,TC:6,Periphery:5
@@ -8008,22 +8015,15 @@
PIR:5-,IS.pm:4,Periphery:5-
-
- IS:4,Periphery:4
-
- urban
- General:8
-
-
-
- MOC:2+,RA.OA:2+,FWL:4+,IS:2+,DC:3+
-
- General:8,DC:4
-
-
- DC:8
-
-
+
+ FWL:4+,DC:3+
+
+ FWL:8
+
+
+ DC:8
+
+
Periphery.OS:4,MERC:3,FS:3,CP:3,TC:2,Periphery:5,RA.OA:3,Periphery.CM:7,Periphery.MW:5,Periphery.HR:7,Periphery.ME:7,FWL:3,MH:1
@@ -8071,12 +8071,6 @@
DC:2
-
- IS:3,Periphery:3
-
- General:8
-
-
CHH:7,CLAN:5,IS:7,Periphery.Deep:4,Periphery:6,TC:7
@@ -8524,12 +8518,6 @@
General:8
-
- IS:4
-
- General:8
-
-
IS:1,Periphery:1
@@ -9313,8 +9301,8 @@
anti_aircraft
- IS:6
-
+ MOC:2,RD:2,IS:4,MH:2,CP:4,RA:2
+
General:5
@@ -9324,20 +9312,31 @@
General:6,Periphery:5
+
+ IS:4,Periphery:3+
+
General:8
General:7
-
-
- IS:2
-
- General:8
-
-
-
+
+ IS:2
+
+
+
+ IS:2
+
+ specops,incindiary,anti_infantry
+ IS:5,CC:7
+
+
+ specops
+ IS:5,DC:7
+
+
+
CHH:4,ROS:2,CJF:5
CJF:4
@@ -11209,6 +11208,10 @@
General:8
+
+ recon,engineer
+ General:3
+
IS:7,Periphery.Deep:5,Periphery:7
@@ -11250,6 +11253,10 @@
General:6,Periphery:5
+
+ xct
+ IS:2
+
General:7
@@ -11433,7 +11440,7 @@
- CC:4,MOC:3,RA.OA:2,PIR:2,IS:2,MH:2
+ CC:4
missile_artillery
General:8
@@ -11642,25 +11649,25 @@
General:8
-
- CC:4,MOC:4,OP:4,RF:4,FWL:4,MSC:4,DA:4,MERC:4,CP:4
-
- urban
- General:8
-
-
- CC:4,OP:2,MERC:2
-
-
-
- IS:3,Periphery:3
-
- IS:8,Periphery:8
-
-
-
+
+ CC:4,MOC:4,OP:4,RF:4,FWL:4,MSC:4,DA:4,MERC:4,CP:4
+
+ urban
+ General:8
+
+
+ CC:4,OP:2,MERC:2
+
+
+
+ RD:3
+
+ RD:8
+
+
+
BAN:8
-
+
BAN:8
@@ -11694,7 +11701,37 @@
General:6,Periphery:5
-
+
+ incendiary,anti_infantry
+ LA:3,FS:2,IS:2,Periphery:2
+
+
+ engineer
+ IS:4,Periphery:2
+
+
+ engineer
+ IS:2,Periphery:1
+
+
+ urban
+ IS:3
+
+
+ IS:3,Periphery:3
+
+
+ anti_infantry,urban
+ IS:2,Periphery:2,Clan.IS:2
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
IS:4,Periphery:4
@@ -14696,13 +14733,6 @@
OP:8,LA:8,FWL:8,CP:8
-
- IS:2
-
- recon
- IS:8
-
-
MOC:3,CC:4,RA.OA:3,LA:4,IS:5,FWL:4,FS:4,CP:4,Periphery:2,TC:3,DC:4
@@ -18388,13 +18418,13 @@
CC:6,MOC:6,LA:6,ROS:6,MERC:6
-
- MOC:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
CHH:7,CLAN:5,RA:6
diff --git a/megamek/data/forcegenerator/3145.xml b/megamek/data/forcegenerator/3145.xml
index dfa4e2e0510..9b1759160c0 100644
--- a/megamek/data/forcegenerator/3145.xml
+++ b/megamek/data/forcegenerator/3145.xml
@@ -1141,7 +1141,7 @@
- MOC:2,RD:2,FWL:4,IS:2,MH:2,CP:4,RA:2
+ FWL:2
anti_aircraft
General:8
@@ -1430,20 +1430,13 @@
MERC.WD:6,CLAN:6,IS:4,BAN:1
-
+
IS:2
-
+
anti_mek
IS:8
-
- LA:3,IS:2,FS:2,Periphery:2
-
- incendiary,anti_infantry
- General:8
-
-
FS:3,MERC:1
@@ -3081,7 +3074,7 @@
- MOC:6,OA.RA:5,FS:2,Periphery:4,DC:2
+ MOC:6,RA.OA:5,FS:2,Periphery:4,DC:2
General:6
@@ -4308,13 +4301,6 @@
General:8
-
- IS:4,Periphery:2
-
- engineer
- General:8
-
-
CWE:4,CLAN:5,CJF:3,RA:5,CWIE:4
@@ -6100,8 +6086,8 @@
IS:3,Periphery:3
missile_artillery
- CC:5,IS:4
-
+ CC:5,IS:4,MOC:3,RA.OA:2,PIR:2,MH:2
+
artillery
General:6
@@ -6256,13 +6242,6 @@
CC:8,MOC:8
-
- IS:4,Periphery:4
-
- engineer
- General:8
-
-
LA:6,IS:5,Periphery.Deep:5,Periphery:7
@@ -6446,19 +6425,67 @@
General:6,Periphery:5
+
+ marine
+ IS:3,RA.OA:4,Periphery:2,CS.EC:2
+
+
+ spotter
+ IS:2+,CC:3+,FWL:3+
+
+
+ xct,marine
+ IS:1,Periphery:1,TC:3,CP:3,CS.EC:2
+
+
+ xct
+ IS:1,TC:1+,CP:1+,RA.OA:1+,CS.EC:1+
+
General:8
General:5
+
+ IS:2,MERC:3
+
General:5
General:8
-
+
+ recon
+ IS:8
+
+
+ IS:5
+
+
+ paratrooper
+ IS:3,Periphery:2
+
+
+ mountaineer
+ IS:3,Periphery:3
+
+
+
+ IS:2+,Periphery:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
+
+ IS:2+,Periphery:1+
+
+ recon,specops,paratrooper
+ General:8
+
+
LA:4,FS:4
@@ -6518,13 +6545,6 @@
General:8
-
- IS:1,FS:3,Periphery:1
-
- specops
- General:8
-
-
FS:3
@@ -7440,13 +7460,6 @@
General:8
-
- IS:4,Periphery:3
-
- paratrooper
- General:8
-
-
CHH:3,CDS:5,LA:4,IS:4,CP:5,DC:4,CWIE:4
@@ -7787,12 +7800,6 @@
General:8
-
- MERC:3
-
- General:8
-
-
CHH:6,CLAN:4,IS:6,TC:6,Periphery:5
@@ -7816,21 +7823,14 @@
PIR:5-,IS.pm:4,Periphery:5-
-
- IS:4,Periphery:4
-
- urban
- General:8
-
-
- MOC:2+,RA.OA:2+,FWL:4+,IS:2+,DC:3+
+ FWL:4+,DC:3+
- General:8,DC:4
-
-
- DC:8
+ FWL:8
+
+ DC:8
+
Periphery.OS:4,MERC:3,FS:3,CP:3,TC:2,Periphery:5,RA.OA:3,Periphery.CM:7,Periphery.MW:5,Periphery.HR:7,Periphery.ME:7,FWL:3,MH:1
@@ -7879,12 +7879,6 @@
DC:2
-
- IS:3,Periphery:3
-
- General:8
-
-
CHH:7,CLAN:5,IS:7,Periphery.Deep:4,Periphery:6,TC:7
@@ -8326,12 +8320,6 @@
General:8
-
- IS:4
-
- General:8
-
-
IS:1,Periphery:1
@@ -9106,8 +9094,8 @@
anti_aircraft
- IS:6
-
+ MOC:2,RD:2,IS:4,MH:2,CP:4,RA:2
+
General:5
@@ -9117,20 +9105,31 @@
General:6,Periphery:5
+
+ IS:4,Periphery:3
+
General:8
General:7
-
-
- IS:2
-
- General:8
-
-
-
+
+ IS:2
+
+
+
+ IS:2
+
+ specops,incindiary,anti_infantry
+ IS:5,CC:7
+
+
+ specops
+ IS:5,DC:7
+
+
+
CHH:4,ROS:2,CJF:5
CJF:4
@@ -10982,6 +10981,10 @@
General:8
+
+ recon,engineer
+ General:3
+
IS:7,Periphery.Deep:5,Periphery:7
@@ -11023,6 +11026,10 @@
General:6,Periphery:5
+
+ xct
+ IS:2
+
General:7
@@ -11206,7 +11213,7 @@
- CC:4,MOC:3,RA.OA:2,PIR:2,IS:2,MH:2
+ CC:4
missile_artillery
General:8
@@ -11429,15 +11436,15 @@
CC:4,MERC:2
-
- IS:3,Periphery:3
-
- IS:8,Periphery:8
-
-
-
+
+ RD:3
+
+ RD:8
+
+
+
BAN:8
-
+
BAN:8
@@ -11471,8 +11478,42 @@
General:6,Periphery:5
-
-
+
+ xct
+ IS:2
+
+
+ incendiary,anti_infantry
+ LA:3,FS:2,IS:2,Periphery:2
+
+
+ engineer
+ IS:4,Periphery:2
+
+
+ engineer
+ IS:4,Periphery:2
+
+
+ urban
+ IS:3
+
+
+ IS:3,Periphery:3
+
+
+ anti_infantry,urban
+ IS:2,Periphery:2,Clan.IS:2
+
+
+
+ IS:1,FS:3,Periphery:1
+
+ specops,marine
+ IS:9
+
+
+
IS:4,Periphery:4
mountaineer
@@ -14453,13 +14494,6 @@
LA:8,FWL:8,CP:8
-
- IS:2
-
- recon
- IS:8
-
-
MOC:3,CC:4,RA.OA:3,LA:4,IS:5,FWL:4,FS:4,CP:4,Periphery:2,TC:3,DC:4
@@ -18125,13 +18159,13 @@
CC:6,MOC:6,LA:6,ROS:6,MERC:6
-
- MOC:1,IS:1
-
- xct
- General:8
-
-
+
+ FWL:1
+
+ xct
+ FWL:5
+
+
CHH:7,CLAN:5,RA:6
diff --git a/megamek/data/images/units/mechs/Duan Gung D9-G10.png b/megamek/data/images/units/mechs/Duan Gung D9-G10.png
deleted file mode 100644
index 69c1f6df4f9..00000000000
Binary files a/megamek/data/images/units/mechs/Duan Gung D9-G10.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Duan Gung.png b/megamek/data/images/units/mechs/Duan Gung.png
deleted file mode 100644
index d1ee8067d38..00000000000
Binary files a/megamek/data/images/units/mechs/Duan Gung.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/DuanGung.png b/megamek/data/images/units/mechs/DuanGung.png
new file mode 100644
index 00000000000..6269dcef770
Binary files /dev/null and b/megamek/data/images/units/mechs/DuanGung.png differ
diff --git a/megamek/data/images/units/mechs/DuanGung_G10.png b/megamek/data/images/units/mechs/DuanGung_G10.png
new file mode 100644
index 00000000000..ad48a28c554
Binary files /dev/null and b/megamek/data/images/units/mechs/DuanGung_G10.png differ
diff --git a/megamek/data/images/units/mechs/Koshi (Standard) 3.png b/megamek/data/images/units/mechs/Koshi (Standard) 3.png
deleted file mode 100644
index 416ad5cffb3..00000000000
Binary files a/megamek/data/images/units/mechs/Koshi (Standard) 3.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/KoshiSTD.png b/megamek/data/images/units/mechs/KoshiSTD.png
new file mode 100644
index 00000000000..f0b01ecf4f9
Binary files /dev/null and b/megamek/data/images/units/mechs/KoshiSTD.png differ
diff --git a/megamek/data/images/units/mechs/KoshiSTD_3.png b/megamek/data/images/units/mechs/KoshiSTD_3.png
new file mode 100644
index 00000000000..0c2e6228116
Binary files /dev/null and b/megamek/data/images/units/mechs/KoshiSTD_3.png differ
diff --git a/megamek/data/images/units/mechs/Sling SL-1H.png b/megamek/data/images/units/mechs/Sling SL-1H.png
deleted file mode 100644
index d04c6ae3c6d..00000000000
Binary files a/megamek/data/images/units/mechs/Sling SL-1H.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Sling.png b/megamek/data/images/units/mechs/Sling.png
index 92913f903ef..fad44803c97 100644
Binary files a/megamek/data/images/units/mechs/Sling.png and b/megamek/data/images/units/mechs/Sling.png differ
diff --git a/megamek/data/images/units/mechs/Sling_1H.png b/megamek/data/images/units/mechs/Sling_1H.png
new file mode 100644
index 00000000000..a848abfa96b
Binary files /dev/null and b/megamek/data/images/units/mechs/Sling_1H.png differ
diff --git a/megamek/data/images/units/mechset.txt b/megamek/data/images/units/mechset.txt
index 65daac8fc7d..e47a862ca9e 100644
--- a/megamek/data/images/units/mechset.txt
+++ b/megamek/data/images/units/mechset.txt
@@ -1365,8 +1365,8 @@ exact "Dragoon AEM-05C" "mechs/Dragoon AEM05C.png"
chassis "Drift Shag" "mechs/DriftShag.png"
chassis "Dreadnought MK I" "mechs/dreadnought_DNT-1-UK.png"
exact "Dreadnought MK I DNT-1-UK" "mechs/dreadnought_DNT-1-UK.png"
-chassis "Duan Gung" "mechs/Duan Gung.png"
-exact "Duan Gung D9-G10" "mechs/Duan Gung D9-G10.png"
+chassis "Duan Gung" "mechs/DuanGung.png"
+exact "Duan Gung D9-G10" "mechs/DuanGung_G10.png"
#chassis "Eagle" "mechs/eagle.png"
exact "Eagle EGL-1M" "mechs/Eagle.png"
exact "Eagle EGL-2M" "mechs/Eagle.png"
@@ -2061,8 +2061,8 @@ exact "Koschei KSC-5MC" "mechs/Koschei KSC-5MC.png"
exact "Koschei KSC-5X" "mechs/Koschei KSC-5X.png"
exact "Koschei KSC-6L" "mechs/Koschei KSC-6L.png"
#Koshi (Standard)
-chassis "Koshi" "mechs/Koshi.png"
-exact "Koshi (Standard) 3" "mechs/Koshi (Standard) 3.png"
+chassis "Koshi" "mechs/KoshiSTD.png"
+exact "Koshi (Standard) 3" "mechs/KoshiSTD_3.png"
#Kishi (Omni)
chassis "Koshi (Mist Lynx)" "mechs/Koshi.png"
exact "Koshi (Mist Lynx) A" "mechs/Koshi_A.png"
@@ -3122,7 +3122,7 @@ exact "Sirocco SRC-6C" "mechs/Sirocco SRC-6C.png"
chassis "Slagmaiden" "mechs/Slagmaiden.png"
#chassis "Sledgehammer" " .png"
chassis "Sling" "mechs/Sling.png"
-exact "Sling SL-1H" "mechs/Sling SL-1H.png"
+exact "Sling SL-1H" "mechs/Sling_1H.png"
#chassis "Slug" " .png"
chassis "Snake" "mechs/Snake.png"
exact "Snake SNK-2Br" "mechs/Snake SNK-2Br.png"
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Cavalier Battle Armor [Flamer].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Cavalier Battle Armor [Flamer].blk
new file mode 100644
index 00000000000..2bc77051c0f
--- /dev/null
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Cavalier Battle Armor [Flamer].blk
@@ -0,0 +1,98 @@
+#building block data file
+
+1
+
+
+##Write the version number just in case...
+
+MAM0
+
+
+
+BattleArmor
+
+
+
+Cavalier Battle Armor
+
+
+
+[Flamer]
+
+
+
+3058
+
+
+
+3058
+
+
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
+
+
+1
+
+
+
+28
+
+
+
+3
+
+
+
+CLBAFlamer:RA
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+biped
+
+
+
+3
+
+
+
+9
+
+
+
+4
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Cavalier Battle Armor [Laser].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Cavalier Battle Armor [Laser].blk
new file mode 100644
index 00000000000..3fed49d96b1
--- /dev/null
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Cavalier Battle Armor [Laser].blk
@@ -0,0 +1,98 @@
+#building block data file
+
+1
+
+
+##Write the version number just in case...
+
+MAM0
+
+
+
+BattleArmor
+
+
+
+Cavalier Battle Armor
+
+
+
+[Laser]
+
+
+
+3058
+
+
+
+3058
+
+
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
+
+
+1
+
+
+
+28
+
+
+
+3
+
+
+
+ISBASmallLaser:RA
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+biped
+
+
+
+3
+
+
+
+9
+
+
+
+4
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Cavalier Battle Armor [MG].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Cavalier Battle Armor [MG].blk
new file mode 100644
index 00000000000..ae0a8ca22e1
--- /dev/null
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Cavalier Battle Armor [MG].blk
@@ -0,0 +1,98 @@
+#building block data file
+
+1
+
+
+##Write the version number just in case...
+
+MAM0
+
+
+
+BattleArmor
+
+
+
+Cavalier Battle Armor
+
+
+
+[MG]
+
+
+
+3058
+
+
+
+3058
+
+
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
+
+
+1
+
+
+
+28
+
+
+
+3
+
+
+
+CLBAMG:RA
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+biped
+
+
+
+3
+
+
+
+9
+
+
+
+4
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Cavalier Battle Armor [SRM].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Cavalier Battle Armor [SRM].blk
new file mode 100644
index 00000000000..9f4e44bd520
--- /dev/null
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Cavalier Battle Armor [SRM].blk
@@ -0,0 +1,99 @@
+#building block data file
+
+1
+
+
+##Write the version number just in case...
+
+MAM0
+
+
+
+BattleArmor
+
+
+
+Cavalier Battle Armor
+
+
+
+[SRM]
+
+
+
+3058
+
+
+
+3058
+
+
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
+
+
+1
+
+
+
+28
+
+
+
+3
+
+
+
+ISBASRM1:RA
+BA-SRM1 Ammo:Body:Shots4#
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+biped
+
+
+
+3
+
+
+
+9
+
+
+
+4
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor (Headhunter).blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor (Headhunter).blk
index a5eaf290782..2baa89e7b96 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor (Headhunter).blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor (Headhunter).blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,60 +20,87 @@ Elemental Battle Armor
(Headhunter)
-
-biped
-
+
+3050
+
-
-2
-
+
+3050
+
-
-5
-
+
+Clan Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+28
+
-
-10
-
+
+2
+
-Clan BA Machine Gun:RA
+CLBAMG:RA
CLImprovedSensors:Body
-CLBAHeatSensor:Body
-Clan BA Remote Sensor Dispenser:Body
-BABattleClaw:RA
+ISBAHeatSensor:Body
+ISBARemoteSensorDispenser:Body
BAAPMount:LA
-InfantryAssaultRifle:LA:APM
+InfantryAssaultRifle:APM:LA
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-Clan Level 2
-
+
+
-
-3050
-
+
+
-
-Jump
-
+
+
+
+
+
+
+
+
-
-28
-
+
+biped
+
-
+
+3
+
+
+
+10
+
+
+
+5
+
+
+
2
-
\ No newline at end of file
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor [AP Gauss].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor [AP Gauss].blk
index e2d976f20ff..7eb464092e0 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor [AP Gauss].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor [AP Gauss].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,59 +20,86 @@ Elemental Battle Armor
[AP Gauss]
-
-biped
-
+
+3069
+
-
-2
-
+
+3069
+
-
-5
-
+
+Clan Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+28
+
-
-10
-
+
+2
+
CLBAAPGaussRifle:RA
CLBASRM2:Body
-BASRM2 Ammo:Body:Shots2#
-BABattleClaw:RA
+BA-SRM2 Ammo:Body:Shots2#
BAAPMount:LA
-InfantryAssaultRifle:LA:APM
+InfantryAssaultRifle:APM:LA
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-Clan Level 2
-
+
+
-
-3069
-
+
+
-
-Jump
-
+
+
+
+
+
+
+
+
-
-28
-
+
+biped
+
-
+
+3
+
+
+
+10
+
+
+
+5
+
+
+
2
-
\ No newline at end of file
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor [ER Laser].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor [ER Laser].blk
index 07f48171f67..29403533d83 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor [ER Laser].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor [ER Laser].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,59 +20,86 @@ Elemental Battle Armor
[ER Laser]
-
-biped
-
+
+3060
+
-
-2
-
+
+3060
+
-
-5
-
+
+Clan Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+28
+
-
-10
-
+
+2
+
CLBAERMicroLaser:RA
CLBASRM2:Body
-BASRM2 Ammo:Body:Shots2#
-BABattleClaw:RA
+BA-SRM2 Ammo:Body:Shots2#
BAAPMount:LA
-InfantryAssaultRifle:LA:APM
+InfantryAssaultRifle:APM:LA
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-Clan Level 2
-
+
+
-
-3060
-
+
+
-
-Jump
-
+
+
+
+
+
+
+
+
-
-28
-
+
+biped
+
-
+
+3
+
+
+
+10
+
+
+
+5
+
+
+
2
-
\ No newline at end of file
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor [Flamer].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor [Flamer].blk
index 3d7e778b027..2d87dae74c1 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor [Flamer].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor [Flamer].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,59 +20,86 @@ Elemental Battle Armor
[Flamer]
-
-biped
-
+
+2868
+
-
-2
-
+
+2868
+
-
-5
-
+
+Clan Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+28
+
-
-10
-
+
+2
+
CLBAFlamer:RA
CLBASRM2:Body
-BASRM2 Ammo:Body:Shots2#
-BABattleClaw:RA
+BA-SRM2 Ammo:Body:Shots2#
BAAPMount:LA
-InfantryAssaultRifle:LA:APM
+InfantryAssaultRifle:APM:LA
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-Clan Level 2
-
+
+
-
-2868
-
+
+
-
-Jump
-
+
+
+
+
+
+
+
+
-
-28
-
+
+biped
+
-
+
+3
+
+
+
+10
+
+
+
+5
+
+
+
2
-
\ No newline at end of file
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor [HMG].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor [HMG].blk
index c5cf5b4f04b..58abd9de9d5 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor [HMG].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor [HMG].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,59 +20,86 @@ Elemental Battle Armor
[HMG]
-
-biped
-
+
+3059
+
-
-2
-
+
+3059
+
-
-5
-
+
+Clan Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+28
+
-
-10
-
+
+2
+
-Clan BA Heavy Machine Gun:RA
+CLBAHeavyMG:RA
CLBASRM2:Body
-BASRM2 Ammo:Body:Shots2#
-BABattleClaw:RA
+BA-SRM2 Ammo:Body:Shots2#
BAAPMount:LA
-InfantryAssaultRifle:LA:APM
+InfantryAssaultRifle:APM:LA
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-Clan Level 2
-
+
+
-
-3059
-
+
+
-
-Jump
-
+
+
+
+
+
+
+
+
-
-28
-
+
+biped
+
-
+
+3
+
+
+
+10
+
+
+
+5
+
+
+
2
-
\ No newline at end of file
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor [Laser].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor [Laser].blk
index 009864fbc95..f4f696c09c6 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor [Laser].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor [Laser].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,59 +20,86 @@ Elemental Battle Armor
[Laser]
-
-biped
-
+
+2868
+
-
-2
-
+
+2868
+
-
-5
-
+
+Clan Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+28
+
-
-10
-
+
+2
+
-CLBASmallLaser:RA
+CLBASmall Laser:RA
CLBASRM2:Body
-BASRM2 Ammo:Body:Shots2#
-BABattleClaw:RA
+BA-SRM2 Ammo:Body:Shots2#
BAAPMount:LA
-InfantryAssaultRifle:LA:APM
+InfantryAssaultRifle:APM:LA
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-Clan Level 2
-
+
+
-
-2868
-
+
+
-
-Jump
-
+
+
+
+
+
+
+
+
-
-28
-
+
+biped
+
-
+
+3
+
+
+
+10
+
+
+
+5
+
+
+
2
-
\ No newline at end of file
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor [MG].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor [MG].blk
index 5cc55cd3582..3fff744689a 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor [MG].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor [MG].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,59 +20,86 @@ Elemental Battle Armor
[MG]
-
-biped
-
+
+2868
+
-
-2
-
+
+2868
+
-
-5
-
+
+Clan Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+28
+
-
-10
-
+
+2
+
-Clan BA Machine Gun:RA
+CLBAMG:RA
CLBASRM2:Body
-BASRM2 Ammo:Body:Shots2#
-BABattleClaw:RA
+BA-SRM2 Ammo:Body:Shots2#
BAAPMount:LA
-InfantryAssaultRifle:LA:APM
+InfantryAssaultRifle:APM:LA
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-Clan Level 2
-
+
+
-
-2868
-
+
+
-
-Jump
-
+
+
+
+
+
+
+
+
-
-28
-
+
+biped
+
-
+
+3
+
+
+
+10
+
+
+
+5
+
+
+
2
-
\ No newline at end of file
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor [MicroPL].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor [MicroPL].blk
new file mode 100644
index 00000000000..c10e6efa25f
--- /dev/null
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Elemental Battle Armor [MicroPL].blk
@@ -0,0 +1,105 @@
+#building block data file
+
+1
+
+
+##Write the version number just in case...
+
+MAM0
+
+
+
+BattleArmor
+
+
+
+Elemental Battle Armor
+
+
+
+[MicroPL]
+
+
+
+3060
+
+
+
+3060
+
+
+
+Clan Level 2
+
+
+
+Jump
+
+
+
+
+
+
+1
+
+
+
+28
+
+
+
+2
+
+
+
+CLBAMicroPulseLaser:RA
+CLBASRM2:Body
+BA-SRM2 Ammo:Body:Shots2#
+BAAPMount:LA
+InfantryAssaultRifle:APM:LA
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+biped
+
+
+
+3
+
+
+
+10
+
+
+
+5
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Gnome Battle Armor (LRM).blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Gnome Battle Armor (LRM).blk
new file mode 100644
index 00000000000..911a6dd79b5
--- /dev/null
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Gnome Battle Armor (LRM).blk
@@ -0,0 +1,99 @@
+#building block data file
+
+1
+
+
+##Write the version number just in case...
+
+MAM0
+
+
+
+BattleArmor
+
+
+
+Gnome Battle Armor
+
+
+
+(LRM)
+
+
+
+3073
+
+
+
+3073
+
+
+
+Clan Level 2
+
+
+
+Jump
+
+
+
+
+
+
+1
+
+
+
+28
+
+
+
+2
+
+
+
+CLBAAPGaussRifle:RA
+CLBALRM4:Body
+BACL Ammo LRM-4:Body:Shots4#
+BAHeavyBattleClaw:LA
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+biped
+
+
+
+2
+
+
+
+14
+
+
+
+5
+
+
+
+3
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Gnome Battle Armor (Standard).blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Gnome Battle Armor (Standard).blk
new file mode 100644
index 00000000000..0ffae04f8da
--- /dev/null
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Gnome Battle Armor (Standard).blk
@@ -0,0 +1,99 @@
+#building block data file
+
+1
+
+
+##Write the version number just in case...
+
+MAM0
+
+
+
+BattleArmor
+
+
+
+Gnome Battle Armor
+
+
+
+(Standard)
+
+
+
+3056
+
+
+
+3056
+
+
+
+Clan Level 2
+
+
+
+Jump
+
+
+
+
+
+
+1
+
+
+
+28
+
+
+
+2
+
+
+
+CLBAERSmallLaser:RA
+CLAdvancedSRM2:Body
+BA-Advanced SRM-2 Ammo:Body:Shots2#
+BAHeavyBattleClaw:LA
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+biped
+
+
+
+2
+
+
+
+14
+
+
+
+5
+
+
+
+3
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Gnome Battle Armor (Upgrade) [Bearhunter].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Gnome Battle Armor (Upgrade) [Bearhunter].blk
new file mode 100644
index 00000000000..2a9ffcb8cd1
--- /dev/null
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Gnome Battle Armor (Upgrade) [Bearhunter].blk
@@ -0,0 +1,100 @@
+#building block data file
+
+1
+
+
+##Write the version number just in case...
+
+MAM0
+
+
+
+BattleArmor
+
+
+
+Gnome Battle Armor
+
+
+
+(Upgrade) [Bearhunter]
+
+
+
+3069
+
+
+
+3069
+
+
+
+Clan Level 2
+
+
+
+Jump
+
+
+
+
+
+
+1
+
+
+
+28
+
+
+
+2
+
+
+
+CLAdvancedSRM2:Body
+BA-Advanced SRM-2 Ammo:Body:Shots2#
+Machine Gun (Bearhunter AC):RA
+Machine Gun (Bearhunter AC):LA
+BAHeavyBattleClaw:LA
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+biped
+
+
+
+2
+
+
+
+14
+
+
+
+5
+
+
+
+3
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Gnome Battle Armor (Upgrade) [MRR].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Gnome Battle Armor (Upgrade) [MRR].blk
index b7d763b892b..7c5d1a6059c 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Gnome Battle Armor (Upgrade) [MRR].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Gnome Battle Armor (Upgrade) [MRR].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,58 +20,81 @@ Gnome Battle Armor
(Upgrade) [MRR]
-
-biped
-
+
+3069
+
-
-3
-
+
+3069
+
-
-5
-
+
+Clan Level 2
+
+
+
+Jump
+
+
+
+
1
-
-2
-
+
+28
+
-
-14
-
+
+2
+
CLBAMedium Recoilless Rifle:RA
CLBALRM2OS:Body
-Clan Advanced SRM-2:Body
+CLAdvancedSRM2:Body
BA-Advanced SRM-2 Ammo:Body:Shots2#
-BAHeavyBattleClaw:RA
+BAHeavyBattleClaw:LA
-
-Clan Level 2
-
+
+
-
-3069
-
+
+
-
-Jump
-
+
+
+
+
+
+
+
+
-
-28
-
+
+biped
+
-
+
2
-
+
+
+
+14
+
+
+
+5
+
+
+
+3
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Gnome Battle Armor (Upgrade) [Pulse Laser].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Gnome Battle Armor (Upgrade) [Pulse Laser].blk
index 29eb4e64735..3604aa90c22 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Gnome Battle Armor (Upgrade) [Pulse Laser].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Gnome Battle Armor (Upgrade) [Pulse Laser].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,58 +20,81 @@ Gnome Battle Armor
(Upgrade) [Pulse Laser]
-
-biped
-
+
+3069
+
-
-3
-
+
+3069
+
-
-5
-
+
+Clan Level 2
+
+
+
+Jump
+
+
+
+
1
-
-2
-
+
+28
+
-
-14
-
+
+2
+
CLBAMicroPulseLaser:RA
CLBAMicroPulseLaser:LA
-Clan Advanced SRM-2:Body
+CLAdvancedSRM2:Body
BA-Advanced SRM-2 Ammo:Body:Shots2#
-BAHeavyBattleClaw:RA
+BAHeavyBattleClaw:LA
-
-Clan Level 2
-
+
+
-
-3069
-
+
+
-
-Jump
-
+
+
+
+
+
+
+
+
-
-28
-
+
+biped
+
-
+
2
-
+
+
+
+14
+
+
+
+5
+
+
+
+3
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Gray Death Standard Suit [Flamer].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Gray Death Standard Suit [Flamer].blk
index 63ea6c8c676..3fcd852338d 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Gray Death Standard Suit [Flamer].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Gray Death Standard Suit [Flamer].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,54 +20,82 @@ Gray Death Standard Suit
[Flamer]
-
-biped
-
+
+3052
+
-
-2
-
+
+3052
+
-
-4
-
+
+IS Level 2
+
+
+
+Leg
+
+
+
+
3
-
-9
-
-
28
+
+3
+
+
-ISBAFlamer:RA
-BABattleClaw:RA
+CLBAFlamer:RA
BAAPMount:LA
-InfantryAssaultRifle:LA:APM
-ISBAImprovedSensors:Body
+InfantryAssaultRifle:APM:LA
+ISImprovedSensors:Body
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-IS Level 2
-
+
+
-
-3052
-
+
+
-
-Leg
-
+
+
+
+
+
-
-3
-
\ No newline at end of file
+
+biped
+
+
+
+0
+
+
+
+9
+
+
+
+4
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Gray Death Standard Suit [LRR].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Gray Death Standard Suit [LRR].blk
index cf7879ba131..5dd6c9bde4e 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Gray Death Standard Suit [LRR].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Gray Death Standard Suit [LRR].blk
@@ -2,10 +2,12 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
+
BattleArmor
@@ -18,54 +20,82 @@ Gray Death Standard Suit
[LRR]
-
-biped
-
+
+3069
+
-
-2
-
+
+3069
+
-
-4
-
+
+IS Level 2
+
+
+
+Leg
+
+
+
+
3
-
-9
-
-
28
+
+3
+
+
-ISLight Recoilless Rifle:RA
-BABattleClaw:RA
+CLBALight Recoilless Rifle:RA
BAAPMount:LA
-InfantryAssaultRifle:LA:APM
+InfantryAssaultRifle:APM:LA
ISImprovedSensors:Body
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-IS Level 2
-
+
+
-
-3069
-
+
+
-
-Leg
-
+
+
+
+
+
-
-3
-
\ No newline at end of file
+
+biped
+
+
+
+0
+
+
+
+9
+
+
+
+4
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Gray Death Standard Suit [Laser].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Gray Death Standard Suit [Laser].blk
index 1dc8e339dd8..8122c6ba29b 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Gray Death Standard Suit [Laser].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Gray Death Standard Suit [Laser].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,54 +20,82 @@ Gray Death Standard Suit
[Laser]
-
-biped
-
+
+3052
+
-
-2
-
+
+3052
+
-
-4
-
+
+IS Level 2
+
+
+
+Leg
+
+
+
+
3
-
-9
-
-
28
+
+3
+
+
ISBASmallLaser:RA
-BABattleClaw:RA
BAAPMount:LA
-InfantryAssaultRifle:LA:APM
+InfantryAssaultRifle:APM:LA
ISImprovedSensors:Body
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-IS Level 2
-
+
+
-
-3052
-
+
+
-
-Leg
-
+
+
+
+
+
-
-3
-
\ No newline at end of file
+
+biped
+
+
+
+0
+
+
+
+9
+
+
+
+4
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Gray Death Standard Suit [MG].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Gray Death Standard Suit [MG].blk
index 191e72358d4..e264daac95f 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Gray Death Standard Suit [MG].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Gray Death Standard Suit [MG].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,54 +20,82 @@ Gray Death Standard Suit
[MG]
-
-biped
-
+
+3052
+
-
-2
-
+
+3052
+
-
-4
-
+
+IS Level 2
+
+
+
+Leg
+
+
+
+
3
-
-9
-
-
28
+
+3
+
+
-BA Machine Gun:RA
-BABattleClaw:RA
+CLBAMG:RA
BAAPMount:LA
-InfantryAssaultRifle:LA:APM
+InfantryAssaultRifle:APM:LA
ISImprovedSensors:Body
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-IS Level 2
-
+
+
-
-3052
-
+
+
-
-Leg
-
+
+
+
+
+
-
-3
-
\ No newline at end of file
+
+biped
+
+
+
+0
+
+
+
+9
+
+
+
+4
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Gray Death Standard Suit [SRM].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Gray Death Standard Suit [SRM].blk
index ea2153c804f..321c03e66fa 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Gray Death Standard Suit [SRM].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Gray Death Standard Suit [SRM].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,55 +20,83 @@ Gray Death Standard Suit
[SRM]
-
-biped
-
+
+3052
+
-
-2
-
+
+3052
+
-
-4
-
+
+IS Level 2
+
+
+
+Leg
+
+
+
+
3
-
-9
-
-
28
+
+3
+
+
ISBASRM1:RA
-BASRM1 Ammo:Body:Shots4#
-BABattleClaw:RA
+BA-SRM1 Ammo:Body:Shots4#
BAAPMount:LA
-InfantryAssaultRifle:LA:APM
-ISBAImprovedSensors:Body
+InfantryAssaultRifle:APM:LA
+ISImprovedSensors:Body
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-IS Level 2
-
+
+
-
-3052
-
+
+
-
-Leg
-
+
+
+
+
+
-
-3
-
\ No newline at end of file
+
+biped
+
+
+
+0
+
+
+
+9
+
+
+
+4
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor (Level I) [Flamer].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor (Level I) [Flamer].blk
index 44510811116..d66ed3a0672 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor (Level I) [Flamer].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor (Level I) [Flamer].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,55 +20,85 @@ IS Standard Battle Armor
(Level I) [Flamer]
-
-biped
-
+
+3052
+
-
-2
-
+
+3052
+
-
-6
-
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+28
+
-
-9
-
+
+3
+
-ISBAFlamer:RA
-BABattleClaw:RA
+CLBAFlamer:RA
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-IS Level 2
-
+
+
-
-3052
-
+
+
-
-Jump
-
+
+
+
+
+
+
+
+
+
+
+
-
-28
-
+
+biped
+
-
+
3
-
\ No newline at end of file
+
+
+
+9
+
+
+
+6
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor (Level I) [LRR].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor (Level I) [LRR].blk
index 679fb20b7c9..1ab1e9143a0 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor (Level I) [LRR].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor (Level I) [LRR].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,55 +20,85 @@ IS Standard Battle Armor
(Level I) [LRR]
-
-biped
-
+
+3061
+
-
-2
-
+
+3061
+
-
-6
-
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+28
+
-
-9
-
+
+3
+
-ISLight Recoilless Rifle:RA
-BABattleClaw:RA
+CLBALight Recoilless Rifle:RA
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-IS Level 2
-
+
+
-
-3061
-
+
+
-
-Jump
-
+
+
+
+
+
+
+
+
+
+
+
-
-28
-
+
+biped
+
-
+
3
-
\ No newline at end of file
+
+
+
+9
+
+
+
+6
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor (Level I) [Laser].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor (Level I) [Laser].blk
index 77699942367..0ce2a6d2605 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor (Level I) [Laser].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor (Level I) [Laser].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,55 +20,85 @@ IS Standard Battle Armor
(Level I) [Laser]
-
-biped
-
+
+3052
+
-
-2
-
+
+3052
+
-
-6
-
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+28
+
-
-9
-
+
+3
+
ISBASmallLaser:RA
-BABattleClaw:RA
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-IS Level 2
-
+
+
-
-3052
-
+
+
-
-Jump
-
+
+
+
+
+
+
+
+
+
+
+
-
-28
-
+
+biped
+
-
+
3
-
\ No newline at end of file
+
+
+
+9
+
+
+
+6
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor (Level I) [MG].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor (Level I) [MG].blk
index 77736d42f52..8f9fc8fbe45 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor (Level I) [MG].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor (Level I) [MG].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,55 +20,85 @@ IS Standard Battle Armor
(Level I) [MG]
-
-biped
-
+
+3052
+
-
-2
-
+
+3052
+
-
-6
-
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+28
+
-
-9
-
+
+3
+
-BA Machine Gun:RA
-BABattleClaw:RA
+CLBAMG:RA
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-IS Level 2
-
+
+
-
-3052
-
+
+
-
-Jump
-
+
+
+
+
+
+
+
+
+
+
+
-
-28
-
+
+biped
+
-
+
3
-
\ No newline at end of file
+
+
+
+9
+
+
+
+6
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor (Level I) [SRM].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor (Level I) [SRM].blk
index 89e1d05bdd3..e326ee4d550 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor (Level I) [SRM].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor (Level I) [SRM].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,55 +20,85 @@ IS Standard Battle Armor
(Level I) [SRM]
-
-biped
-
+
+3052
+
-
-2
-
+
+3052
+
-
-6
-
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+28
+
-
-9
-
+
+3
+
ISBASRM2OS:RA
-BABattleClaw:RA
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-IS Level 2
-
+
+
-
-3052
-
+
+
-
-Jump
-
+
+
+
+
+
+
+
+
+
+
+
-
-28
-
+
+biped
+
-
+
3
-
\ No newline at end of file
+
+
+
+9
+
+
+
+6
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor [Flamer].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor [Flamer].blk
index e45cfa0258d..16b99d9a7aa 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor [Flamer].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor [Flamer].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,55 +20,79 @@ IS Standard Battle Armor
[Flamer]
-
-biped
-
+
+3052
+
-
-2
-
+
+3052
+
-
-4
-
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+28
+
-
-9
-
+
+3
+
-ISBAFlamer:RA
-BABattleClaw:RA
+CLBAFlamer:RA
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-IS Level 2
-
+
+
-
-3052
-
+
+
-
-Jump
-
+
+
+
+
+
-
-28
-
+
+biped
+
-
+
3
-
\ No newline at end of file
+
+
+
+9
+
+
+
+4
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor [LRR].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor [LRR].blk
index 08ef762586b..a06ef093a58 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor [LRR].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor [LRR].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,55 +20,79 @@ IS Standard Battle Armor
[LRR]
-
-biped
-
+
+3061
+
-
-2
-
+
+3061
+
-
-4
-
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+28
+
-
-9
-
+
+3
+
-ISLight Recoilless Rifle:RA
-BABattleClaw:RA
+CLBALight Recoilless Rifle:RA
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-IS Level 2
-
+
+
-
-3061
-
+
+
-
-Jump
-
+
+
+
+
+
-
-28
-
+
+biped
+
-
+
3
-
\ No newline at end of file
+
+
+
+9
+
+
+
+4
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor [Laser].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor [Laser].blk
index 70fb5a7bd0a..26cedc825df 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor [Laser].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor [Laser].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,55 +20,79 @@ IS Standard Battle Armor
[Laser]
-
-biped
-
+
+3052
+
-
-2
-
+
+3052
+
-
-4
-
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+28
+
-
-9
-
+
+3
+
ISBASmallLaser:RA
-BABattleClaw:RA
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-IS Level 2
-
+
+
-
-3052
-
+
+
-
-Jump
-
+
+
+
+
+
-
-28
-
+
+biped
+
-
+
3
-
\ No newline at end of file
+
+
+
+9
+
+
+
+4
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor [MG].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor [MG].blk
index b9f73075bc7..f449ad3c281 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor [MG].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor [MG].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,55 +20,79 @@ IS Standard Battle Armor
[MG]
-
-biped
-
+
+3052
+
-
-2
-
+
+3052
+
-
-4
-
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+28
+
-
-9
-
+
+3
+
-BA Machine Gun:RA
-BABattleClaw:RA
+CLBAMG:RA
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-IS Level 2
-
+
+
-
-3052
-
+
+
-
-Jump
-
+
+
+
+
+
-
-28
-
+
+biped
+
-
+
3
-
+
+
+
+9
+
+
+
+4
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor [SRM].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor [SRM].blk
index 4afc51f5d6c..7efc15c0482 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor [SRM].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/IS Standard Battle Armor [SRM].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,55 +20,79 @@ IS Standard Battle Armor
[SRM]
-
-biped
-
+
+3052
+
-
-2
-
+
+3052
+
-
-4
-
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+28
+
-
-9
-
+
+3
+
ISBASRM2OS:RA
-BABattleClaw:RA
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-IS Level 2
-
+
+
-
-3052
-
+
+
-
-Jump
-
+
+
+
+
+
-
-28
-
+
+biped
+
-
+
3
-
\ No newline at end of file
+
+
+
+9
+
+
+
+4
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [David] (WoB).blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [David] (WoB).blk
index dddaf3f6dc4..5be4ea70091 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [David] (WoB).blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [David] (WoB).blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,63 +20,93 @@ Longinus Battle Armor
[David] (WoB)
-
-biped
-
+
+3063
+
-
-2
-
+
+3063
+
-
-6
-
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+30
+
-
-9
-
+
+3
+
-ISBADavidLightGaussRifle:RA
+BADavidLightGaussRifle:RA
ISBASRM2OS:Body
-BABattleClaw:RA
BAAPMount:LA
-InfantryAssaultRifle:LA:APM
-IS BA Advanced:RA
-IS BA Advanced:RA
-IS BA Advanced:LA
-IS BA Advanced:LA
-IS BA Advanced:Body
+InfantryAssaultRifle:APM:LA
+BA Advanced:RA
+BA Advanced:RA
+BA Advanced:LA
+BA Advanced:LA
+BA Advanced:Body
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-IS Level 2
-
+
+
-
-3063
-
+
+
-
-Jump
-
+
+
+
+
+
+
+
+
+
+
+
-
-30
-
+
+biped
+
-
+
3
-
\ No newline at end of file
+
+
+
+9
+
+
+
+6
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [David].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [David].blk
index 65ee2b8b798..5ed680b166d 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [David].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [David].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,63 +20,87 @@ Longinus Battle Armor
[David]
-
-biped
-
+
+3063
+
-
-2
-
+
+3063
+
-
-4
-
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+30
+
-
-9
-
+
+3
+
-ISBADavidLightGaussRifle:RA
+BADavidLightGaussRifle:RA
ISBASRM2OS:Body
-BABattleClaw:RA
BAAPMount:LA
-InfantryAssaultRifle:LA:APM
-IS BA Advanced:RA
-IS BA Advanced:RA
-IS BA Advanced:LA
-IS BA Advanced:LA
-IS BA Advanced:Body
+InfantryAssaultRifle:APM:LA
+BA Advanced:RA
+BA Advanced:RA
+BA Advanced:LA
+BA Advanced:LA
+BA Advanced:Body
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:RA
-
-IS Level 2
-
+
+
-
-3063
-
+
+
-
-Jump
-
+
+
+
+
+
-
-30
-
+
+biped
+
-
+
3
-
\ No newline at end of file
+
+
+
+9
+
+
+
+4
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [Flamer] (WoB).blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [Flamer] (WoB).blk
index 13ec19cd98e..f7fc168b174 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [Flamer] (WoB).blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [Flamer] (WoB).blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,63 +20,93 @@ Longinus Battle Armor
[Flamer] (WoB)
-
-biped
-
+
+3061
+
-
-2
-
+
+3061
+
-
-6
-
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+30
+
-
-9
-
+
+3
+
-ISBAFlamer:RA
+CLBAFlamer:RA
ISBASRM2OS:Body
-BABattleClaw:RA
BAAPMount:LA
-InfantryAssaultRifle:LA:APM
-IS BA Advanced:RA
-IS BA Advanced:RA
-IS BA Advanced:LA
-IS BA Advanced:LA
-IS BA Advanced:Body
+InfantryAssaultRifle:APM:LA
+BA Advanced:RA
+BA Advanced:RA
+BA Advanced:LA
+BA Advanced:LA
+BA Advanced:Body
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-IS Level 2
-
+
+
-
-3061
-
+
+
-
-Jump
-
+
+
+
+
+
+
+
+
+
+
+
-
-30
-
+
+biped
+
-
+
3
-
\ No newline at end of file
+
+
+
+9
+
+
+
+6
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [Flamer].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [Flamer].blk
index fe9775896ab..b64aeb37de6 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [Flamer].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [Flamer].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,63 +20,87 @@ Longinus Battle Armor
[Flamer]
-
-biped
-
+
+3057
+
-
-2
-
+
+3057
+
-
-4
-
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+30
+
-
-9
-
+
+3
+
-ISBAFlamer:RA
+CLBAFlamer:RA
ISBASRM2OS:Body
-BABattleClaw:RA
BAAPMount:LA
-InfantryAssaultRifle:LA:APM
-IS BA Advanced:RA
-IS BA Advanced:RA
-IS BA Advanced:LA
-IS BA Advanced:LA
-IS BA Advanced:Body
+InfantryAssaultRifle:APM:LA
+BA Advanced:RA
+BA Advanced:RA
+BA Advanced:LA
+BA Advanced:LA
+BA Advanced:Body
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-IS Level 2
-
+
+
-
-3057
-
+
+
-
-Jump
-
+
+
+
+
+
-
-30
-
+
+biped
+
-
+
3
-
\ No newline at end of file
+
+
+
+9
+
+
+
+4
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [Laser] (WoB).blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [Laser] (WoB).blk
index a76ab10e718..8035fbe3544 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [Laser] (WoB).blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [Laser] (WoB).blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,63 +20,93 @@ Longinus Battle Armor
[Laser] (WoB)
-
-biped
-
+
+3061
+
-
-2
-
+
+3061
+
-
-6
-
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+30
+
-
-9
-
+
+3
+
ISBASmallLaser:RA
ISBASRM2OS:Body
-BABattleClaw:RA
BAAPMount:LA
-InfantryAssaultRifle:LA:APM
-IS BA Advanced:RA
-IS BA Advanced:RA
-IS BA Advanced:LA
-IS BA Advanced:LA
-IS BA Advanced:Body
+InfantryAssaultRifle:APM:LA
+BA Advanced:RA
+BA Advanced:RA
+BA Advanced:LA
+BA Advanced:LA
+BA Advanced:Body
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-IS Level 2
-
+
+
-
-3061
-
+
+
-
-Jump
-
+
+
+
+
+
+
+
+
+
+
+
-
-30
-
+
+biped
+
-
+
3
-
\ No newline at end of file
+
+
+
+9
+
+
+
+6
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [Laser].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [Laser].blk
index e7e4b4400e9..b97159dbe92 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [Laser].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [Laser].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,63 +20,87 @@ Longinus Battle Armor
[Laser]
-
-biped
-
+
+3057
+
-
-2
-
+
+3057
+
-
-4
-
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+30
+
-
-9
-
+
+3
+
ISBASmallLaser:RA
ISBASRM2OS:Body
-BABattleClaw:RA
BAAPMount:LA
-InfantryAssaultRifle:LA:APM
-IS BA Advanced:RA
-IS BA Advanced:RA
-IS BA Advanced:LA
-IS BA Advanced:LA
-IS BA Advanced:Body
+InfantryAssaultRifle:APM:LA
+BA Advanced:RA
+BA Advanced:RA
+BA Advanced:LA
+BA Advanced:LA
+BA Advanced:Body
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-IS Level 2
-
+
+
-
-3057
-
+
+
-
-Jump
-
+
+
+
+
+
-
-30
-
+
+biped
+
-
+
3
-
\ No newline at end of file
+
+
+
+9
+
+
+
+4
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [MG] (WoB).blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [MG] (WoB).blk
index 9bb84c6b144..8cb5472fccb 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [MG] (WoB).blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [MG] (WoB).blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,63 +20,93 @@ Longinus Battle Armor
[MG] (WoB)
-
-biped
-
+
+3061
+
-
-2
-
+
+3061
+
-
-6
-
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+30
+
-
-9
-
+
+3
+
-BA Machine Gun:RA
+CLBAMG:RA
ISBASRM2OS:Body
-BABattleClaw:RA
BAAPMount:LA
-InfantryAssaultRifle:LA:APM
-IS BA Advanced:RA
-IS BA Advanced:RA
-IS BA Advanced:LA
-IS BA Advanced:LA
-IS BA Advanced:Body
+InfantryAssaultRifle:APM:LA
+BA Advanced:RA
+BA Advanced:RA
+BA Advanced:LA
+BA Advanced:LA
+BA Advanced:Body
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-IS Level 2
-
+
+
-
-3061
-
+
+
-
-Jump
-
+
+
+
+
+
+
+
+
+
+
+
-
-30
-
+
+biped
+
-
+
3
-
\ No newline at end of file
+
+
+
+9
+
+
+
+6
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [MG].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [MG].blk
index a99baf4fc92..2eda614f3ac 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [MG].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Longinus Battle Armor [MG].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,63 +20,87 @@ Longinus Battle Armor
[MG]
-
-biped
-
+
+3057
+
-
-2
-
+
+3057
+
-
-4
-
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+30
+
-
-9
-
+
+3
+
-BA Machine Gun:RA
+CLBAMG:RA
ISBASRM2OS:Body
-BABattleClaw:RA
BAAPMount:LA
-InfantryAssaultRifle:LA:APM
-IS BA Advanced:RA
-IS BA Advanced:RA
-IS BA Advanced:LA
-IS BA Advanced:LA
-IS BA Advanced:Body
+InfantryAssaultRifle:APM:LA
+BA Advanced:RA
+BA Advanced:RA
+BA Advanced:LA
+BA Advanced:LA
+BA Advanced:Body
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-IS Level 2
-
+
+
-
-3057
-
+
+
-
-Jump
-
+
+
+
+
+
-
-30
-
+
+biped
+
-
+
3
-
\ No newline at end of file
+
+
+
+9
+
+
+
+4
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Purifier Adaptive Battle Armor [Laser] (RAF).blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Purifier Adaptive Battle Armor [Laser] (RAF).blk
new file mode 100644
index 00000000000..85541af8594
--- /dev/null
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Purifier Adaptive Battle Armor [Laser] (RAF).blk
@@ -0,0 +1,105 @@
+#building block data file
+
+1
+
+
+##Write the version number just in case...
+
+MAM0
+
+
+
+BattleArmor
+
+
+
+Purifier Adaptive Battle Armor
+
+
+
+[Laser] (RAF)
+
+
+
+3086
+
+
+
+3086
+
+
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
+
+
+1
+
+
+
+36
+
+
+
+1
+
+
+
+ISBAERSmallLaser:LA
+BA Mimetic:RA
+BA Mimetic:Body
+BA Mimetic:Body
+BA Mimetic:LA
+BA Mimetic:Body
+BA Mimetic:RA
+BA Mimetic:Body
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:RA
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+biped
+
+
+
+3
+
+
+
+6
+
+
+
+4
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Purifier Adaptive Battle Armor [Laser].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Purifier Adaptive Battle Armor [Laser].blk
index 3e895eaf6f1..77a1f961bab 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Purifier Adaptive Battle Armor [Laser].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Purifier Adaptive Battle Armor [Laser].blk
@@ -3,7 +3,7 @@
1
-# Write the version number just in case...
+##Write the version number just in case...
MAM0
@@ -24,6 +24,10 @@ Purifier Adaptive Battle Armor
3062
+
+3062
+
+
IS Level 2
@@ -32,6 +36,9 @@ IS Level 2
Jump
+
+
+
1
@@ -45,19 +52,19 @@ Jump
-BABattleClaw:LA
ISBAERSmallLaser:LA
SwarmMek
SwarmWeaponMek
StopSwarm
LegAttack
-IS BA Mimetic:RA
-IS BA Mimetic:Body
-IS BA Mimetic:RA
-IS BA Mimetic:Body
-IS BA Mimetic:Body
-IS BA Mimetic:Body
-IS BA Mimetic:RA
+BA Mimetic:RA
+BA Mimetic:Body
+BA Mimetic:RA
+BA Mimetic:Body
+BA Mimetic:Body
+BA Mimetic:Body
+BA Mimetic:RA
+BABattleClaw:RA
@@ -101,3 +108,4 @@ biped
2
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Purifier Adaptive Battle Armor [Narc] (RAF).blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Purifier Adaptive Battle Armor [Narc] (RAF).blk
new file mode 100644
index 00000000000..d3b5347e6eb
--- /dev/null
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Purifier Adaptive Battle Armor [Narc] (RAF).blk
@@ -0,0 +1,112 @@
+#building block data file
+
+1
+
+
+##Write the version number just in case...
+
+MAM0
+
+
+
+BattleArmor
+
+
+
+Purifier Adaptive Battle Armor
+
+
+
+[Narc] (RAF)
+
+
+
+3086
+
+
+
+3086
+
+
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
+
+
+1
+
+
+
+36
+
+
+
+1
+
+
+
+BA Mimetic:RA
+BA Mimetic:Body
+BA Mimetic:Body
+BA Mimetic:LA
+BA Mimetic:Body
+BA Mimetic:Body
+BA Mimetic:RA
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:RA
+
+
+
+CLBACompactNarc:LA
+BA-Compact Narc Ammo:LA:Shots2#
+
+
+
+CLBACompactNarc:LA
+BA-Compact Narc Ammo:LA:Shots2#
+
+
+
+CLBACompactNarc:LA
+BA-Compact Narc Ammo:LA:Shots2#
+
+
+
+CLBACompactNarc:LA
+BA-Compact Narc Ammo:LA:Shots2#
+
+
+
+
+
+biped
+
+
+
+3
+
+
+
+6
+
+
+
+4
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Purifier Adaptive Battle Armor [Narc].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Purifier Adaptive Battle Armor [Narc].blk
index 2c1a9cc70a3..2354db15133 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Purifier Adaptive Battle Armor [Narc].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Purifier Adaptive Battle Armor [Narc].blk
@@ -3,7 +3,7 @@
1
-# Write the version number just in case...
+##Write the version number just in case...
MAM0
@@ -24,6 +24,10 @@ Purifier Adaptive Battle Armor
3062
+
+3062
+
+
IS Level 2
@@ -32,6 +36,9 @@ IS Level 2
Jump
+
+
+
1
@@ -45,47 +52,47 @@ Jump
-IS BA Mimetic:RA
-IS BA Mimetic:Body
-IS BA Mimetic:Body
-IS BA Mimetic:LA
-IS BA Mimetic:Body
-IS BA Mimetic:Body
-IS BA Mimetic:RA
-BABattleClaw:LA
+BA Mimetic:RA
+BA Mimetic:Body
+BA Mimetic:Body
+BA Mimetic:LA
+BA Mimetic:Body
+BA Mimetic:Body
+BA Mimetic:RA
SwarmMek
SwarmWeaponMek
StopSwarm
LegAttack
+BABattleClaw:RA
-ISBACompactNarc:LA
+CLBACompactNarc:LA
BA-Compact Narc Ammo:LA:Shots2#
-ISBACompactNarc:LA
+CLBACompactNarc:LA
BA-Compact Narc Ammo:LA:Shots2#
-ISBACompactNarc:LA
+CLBACompactNarc:LA
BA-Compact Narc Ammo:LA:Shots2#
-ISBACompactNarc:LA
+CLBACompactNarc:LA
BA-Compact Narc Ammo:LA:Shots2#
-ISBACompactNarc:LA
+CLBACompactNarc:LA
BA-Compact Narc Ammo:LA:Shots2#
-ISBACompactNarc:LA
+CLBACompactNarc:LA
BA-Compact Narc Ammo:LA:Shots2#
@@ -112,3 +119,4 @@ biped
2
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Purifier Adaptive Battle Armor [PPC] (RAF).blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Purifier Adaptive Battle Armor [PPC] (RAF).blk
new file mode 100644
index 00000000000..e609a674600
--- /dev/null
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Purifier Adaptive Battle Armor [PPC] (RAF).blk
@@ -0,0 +1,105 @@
+#building block data file
+
+1
+
+
+##Write the version number just in case...
+
+MAM0
+
+
+
+BattleArmor
+
+
+
+Purifier Adaptive Battle Armor
+
+
+
+[PPC] (RAF)
+
+
+
+3086
+
+
+
+3086
+
+
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
+
+
+1
+
+
+
+36
+
+
+
+1
+
+
+
+ISBASupportPPC:LA
+BA Mimetic:RA
+BA Mimetic:Body
+BA Mimetic:Body
+BA Mimetic:LA
+BA Mimetic:Body
+BA Mimetic:RA
+BA Mimetic:Body
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:RA
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+biped
+
+
+
+3
+
+
+
+6
+
+
+
+4
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Purifier Adaptive Battle Armor [PPC].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Purifier Adaptive Battle Armor [PPC].blk
index 2831d966641..fa78dc37ae5 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Purifier Adaptive Battle Armor [PPC].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Purifier Adaptive Battle Armor [PPC].blk
@@ -3,7 +3,7 @@
1
-# Write the version number just in case...
+##Write the version number just in case...
MAM0
@@ -24,6 +24,10 @@ Purifier Adaptive Battle Armor
3069
+
+3069
+
+
IS Level 2
@@ -32,6 +36,9 @@ IS Level 2
Jump
+
+
+
1
@@ -45,19 +52,19 @@ Jump
-BABattleClaw:LA
ISBASupportPPC:LA
-IS BA Mimetic:RA
-IS BA Mimetic:Body
-IS BA Mimetic:Body
-IS BA Mimetic:LA
-IS BA Mimetic:Body
-IS BA Mimetic:RA
-IS BA Mimetic:Body
+BA Mimetic:RA
+BA Mimetic:Body
+BA Mimetic:Body
+BA Mimetic:LA
+BA Mimetic:Body
+BA Mimetic:RA
+BA Mimetic:Body
SwarmMek
SwarmWeaponMek
StopSwarm
LegAttack
+BABattleClaw:RA
@@ -101,3 +108,4 @@ biped
2
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Purifier Adaptive Battle Armor [TAG] (RAF).blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Purifier Adaptive Battle Armor [TAG] (RAF).blk
new file mode 100644
index 00000000000..25fca9a40a4
--- /dev/null
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Purifier Adaptive Battle Armor [TAG] (RAF).blk
@@ -0,0 +1,105 @@
+#building block data file
+
+1
+
+
+##Write the version number just in case...
+
+MAM0
+
+
+
+BattleArmor
+
+
+
+Purifier Adaptive Battle Armor
+
+
+
+[TAG] (RAF)
+
+
+
+3086
+
+
+
+3086
+
+
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
+
+
+1
+
+
+
+36
+
+
+
+1
+
+
+
+CLBALightTAG:LA
+BA Mimetic:RA
+BA Mimetic:Body
+BA Mimetic:Body
+BA Mimetic:LA
+BA Mimetic:Body
+BA Mimetic:RA
+BA Mimetic:Body
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:RA
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+biped
+
+
+
+3
+
+
+
+6
+
+
+
+4
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Purifier Adaptive Battle Armor [TAG].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Purifier Adaptive Battle Armor [TAG].blk
index bfa853580c4..22fe0d4c6da 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Purifier Adaptive Battle Armor [TAG].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Purifier Adaptive Battle Armor [TAG].blk
@@ -3,7 +3,7 @@
1
-# Write the version number just in case...
+##Write the version number just in case...
MAM0
@@ -24,6 +24,10 @@ Purifier Adaptive Battle Armor
3062
+
+3062
+
+
IS Level 2
@@ -32,6 +36,9 @@ IS Level 2
Jump
+
+
+
1
@@ -45,19 +52,19 @@ Jump
-BABattleClaw:LA
-ISBALightTag:LA
-IS BA Mimetic:RA
-IS BA Mimetic:Body
-IS BA Mimetic:Body
-IS BA Mimetic:LA
-IS BA Mimetic:Body
-IS BA Mimetic:RA
-IS BA Mimetic:Body
+CLBALightTAG:LA
+BA Mimetic:RA
+BA Mimetic:Body
+BA Mimetic:Body
+BA Mimetic:LA
+BA Mimetic:Body
+BA Mimetic:RA
+BA Mimetic:Body
SwarmMek
SwarmWeaponMek
StopSwarm
LegAttack
+BABattleClaw:RA
@@ -101,3 +108,4 @@ biped
2
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Raiden Battle Armor [Flamer].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Raiden Battle Armor [Flamer].blk
index 4aa879b51f4..35fb76382ff 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Raiden Battle Armor [Flamer].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Raiden Battle Armor [Flamer].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,55 +20,79 @@ Raiden Battle Armor
[Flamer]
-
-biped
-
+
+3055
+
-
-2
-
+
+3055
+
-
-4
-
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+28
+
-
-9
-
+
+3
+
-ISBAFlamer:RA
-BABattleClaw:RA
+CLBAFlamer:RA
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-IS Level 2
-
+
+
-
-3055
-
+
+
-
-Jump
-
+
+
-
-28
-
+
+
-
+
+biped
+
+
+
3
-
+
+
+
+9
+
+
+
+4
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Raiden Battle Armor [Laser].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Raiden Battle Armor [Laser].blk
index 34f1d6cc0a4..6e9dd7df706 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Raiden Battle Armor [Laser].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Raiden Battle Armor [Laser].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,55 +20,79 @@ Raiden Battle Armor
[Laser]
-
-biped
-
+
+3055
+
-
-2
-
+
+3055
+
-
-4
-
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+28
+
-
-9
-
+
+3
+
ISBASmallLaser:RA
-BABattleClaw:RA
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-IS Level 2
-
+
+
-
-3055
-
+
+
-
-Jump
-
+
+
-
-28
-
+
+
-
+
+biped
+
+
+
3
-
\ No newline at end of file
+
+
+
+9
+
+
+
+4
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Raiden Battle Armor [MG].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Raiden Battle Armor [MG].blk
index 77400486e34..5e0c6b9e8aa 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Raiden Battle Armor [MG].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Raiden Battle Armor [MG].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,63 +20,83 @@ Raiden Battle Armor
[MG]
-
-biped
-
+
+3055
+
-
-2
-
+
+3055
+
-
-4
-
+
+IS Level 2
+
-
-4
-
+
+Jump
+
-
-161
-
+
+
1
-
-3
-
+
+28
+
-
-9
-
+
+3
+
-BA Machine Gun:RA
-BABattleClaw:RA
+CLBAMG:RA
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-IS Level 2
-
+
+
-
-3055
-
+
+
-
-Jump
-
+
+
-
-28
-
+
+
-
+
+biped
+
+
+
3
-
\ No newline at end of file
+
+
+
+9
+
+
+
+4
+
+
+
+2
+
+
+
+161
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Raiden Battle Armor [MRM].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Raiden Battle Armor [MRM].blk
index 435d141a4be..0c527f10fcb 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Raiden Battle Armor [MRM].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Raiden Battle Armor [MRM].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,56 +20,80 @@ Raiden Battle Armor
[MRM]
-
-biped
-
+
+3064
+
-
-2
-
+
+3064
+
-
-4
-
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+28
+
-
-9
-
+
+3
+
ISBAMRM1:RA
-ISMRM1 Ammo:Body:Shots4#
-BABattleClaw:RA
+IS MRM 1 Ammo:Body:Shots4#
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-IS Level 2
-
+
+
-
-3064
-
+
+
-
-Jump
-
+
+
-
-28
-
+
+
-
+
+biped
+
+
+
3
-
\ No newline at end of file
+
+
+
+9
+
+
+
+4
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Raiden Battle Armor [Tsunami].blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Raiden Battle Armor [Tsunami].blk
index a8cc0237c03..c76f743ec5b 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Raiden Battle Armor [Tsunami].blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Raiden Battle Armor [Tsunami].blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,55 +20,79 @@ Raiden Battle Armor
[Tsunami]
-
-biped
-
+
+3056
+
-
-2
-
+
+3056
+
-
-4
-
+
+IS Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+28
+
-
-9
-
+
+3
+
-BA-ISTsunamiHeavyGaussRifle:RA
-BABattleClaw:RA
+ISBATsunamiHeavyGaussRifle:RA
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-IS Level 2
-
+
+
-
-3056
-
+
+
-
-Jump
-
+
+
+
+
+
-
-28
-
+
+biped
+
-
+
3
-
\ No newline at end of file
+
+
+
+9
+
+
+
+4
+
+
+
+2
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Sylph Battle Armor (Standard).blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Sylph Battle Armor (Standard).blk
new file mode 100644
index 00000000000..df7d4f36be9
--- /dev/null
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Sylph Battle Armor (Standard).blk
@@ -0,0 +1,102 @@
+#building block data file
+
+1
+
+
+##Write the version number just in case...
+
+MAM0
+
+
+
+BattleArmor
+
+
+
+Sylph Battle Armor
+
+
+
+(Standard)
+
+
+
+3060
+
+
+
+3060
+
+
+
+Clan Level 2
+
+
+
+VTOL
+
+
+
+
+
+
+1
+
+
+
+28
+
+
+
+2
+
+
+
+CLBAMicroPulseLaser:RA
+CLBAMicroBomb:Body
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+biped
+
+
+
+5
+
+
+
+5
+
+
+
+5
+
+
+
+1
+
+
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Sylph Battle Armor (Upgrade).blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Sylph Battle Armor (Upgrade).blk
index f8dba0ed8f8..819572d5e05 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Sylph Battle Armor (Upgrade).blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Sylph Battle Armor (Upgrade).blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,57 +20,84 @@ Sylph Battle Armor
(Upgrade)
-
-biped
-
+
+3065
+
-
-1
-
+
+3065
+
-
-5
-
+
+Clan Level 2
+
+
+
+VTOL
+
+
+
+
1
-
-5
-
+
+28
+
-
-5
-
+
+2
+
-Clan BA Heavy Machine Gun:RA
-Clan BA Machine Gun:LA
-BABattleClaw:RA
+CLBAHeavyMG:RA
+CLBAMG:LA
BASearchlight:Body
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-Clan Level 2
-
+
+
-
-3065
-
+
+
-
-VTOL
-
+
+
+
+
+
+
+
+
-
-28
-
+
+biped
+
+
+
+5
+
+
+
+5
+
+
+
+5
+
+
+
+1
+
-
-2
-
\ No newline at end of file
diff --git a/megamek/data/mechfiles/battlearmor/RS3058Uu/Undine Battle Armor (Upgrade).blk b/megamek/data/mechfiles/battlearmor/RS3058Uu/Undine Battle Armor (Upgrade).blk
index e6dbd2ab688..8748aec5e29 100644
--- a/megamek/data/mechfiles/battlearmor/RS3058Uu/Undine Battle Armor (Upgrade).blk
+++ b/megamek/data/mechfiles/battlearmor/RS3058Uu/Undine Battle Armor (Upgrade).blk
@@ -2,7 +2,8 @@
1
-#Write the version number just in case...
+
+##Write the version number just in case...
MAM0
@@ -19,57 +20,84 @@ Undine Battle Armor
(Upgrade)
-
-biped
-
+
+3069
+
-
-2
-
+
+3069
+
-
-5
-
+
+Clan Level 2
+
+
+
+Jump
+
+
+
+
1
-
-3
-
+
+28
+
-
-8
-
+
+2
+
CLBAERMicroLaser:RA
CLBALRM3:Body
-BACLLRM3 Ammo:Body:Shots4#
-BABattleClaw:RA
+BACL Ammo LRM-3:Body:Shots4#
+SwarmMek
+SwarmWeaponMek
+StopSwarm
+LegAttack
+BABattleClaw:LA
-
-Clan Level 2
-
+
+
-
-3069
-
+
+
-
-jump
-
+
+
+
+
+
+
+
+
-
-28
-
+
+biped
+
-
+
+3
+
+
+
+8
+
+
+
+5
+
+
+
2
-
\ No newline at end of file
+
+
diff --git a/megamek/docs/history.txt b/megamek/docs/history.txt
index 311694c1392..75be3a550ac 100644
--- a/megamek/docs/history.txt
+++ b/megamek/docs/history.txt
@@ -1,6 +1,8 @@
VERSION HISTORY:
----------------
0.47.13-SNAPSHOT
++ Data #2345: Infantry force assignment tables
++ Data #2365: Incorrect battle armor manipulator location
0.47.12 (2020-11-08 2230 UTC)
+ PR #2310: Implement "Static Ammo Feed" quirk