From 907103c96a375da8e57c42c9383c9c98835f77ae Mon Sep 17 00:00:00 2001 From: SuperStucco Date: Tue, 11 Jun 2024 10:00:43 -0600 Subject: [PATCH 1/5] Adjust infantry field gun availability, add anti-aircraft to appropriate types --- megamek/data/forcegenerator/2398.xml | 6 +++--- megamek/data/forcegenerator/2440.xml | 6 +++--- megamek/data/forcegenerator/2460.xml | 6 +++--- megamek/data/forcegenerator/2470.xml | 6 +++--- megamek/data/forcegenerator/2490.xml | 6 +++--- megamek/data/forcegenerator/2520.xml | 6 +++--- megamek/data/forcegenerator/2571.xml | 6 +++--- megamek/data/forcegenerator/2650.xml | 6 +++--- megamek/data/forcegenerator/2700.xml | 6 +++--- megamek/data/forcegenerator/2765.xml | 6 +++--- megamek/data/forcegenerator/2780.xml | 6 +++--- megamek/data/forcegenerator/2807.xml | 6 +++--- megamek/data/forcegenerator/2815.xml | 6 +++--- megamek/data/forcegenerator/2823.xml | 6 +++--- megamek/data/forcegenerator/2830.xml | 6 +++--- megamek/data/forcegenerator/2835.xml | 6 +++--- megamek/data/forcegenerator/2855.xml | 6 +++--- megamek/data/forcegenerator/2860.xml | 6 +++--- megamek/data/forcegenerator/2865.xml | 6 +++--- megamek/data/forcegenerator/2870.xml | 6 +++--- megamek/data/forcegenerator/2900.xml | 6 +++--- megamek/data/forcegenerator/2950.xml | 6 +++--- megamek/data/forcegenerator/3019.xml | 6 +++--- megamek/data/forcegenerator/3028.xml | 6 +++--- megamek/data/forcegenerator/3039.xml | 6 +++--- megamek/data/forcegenerator/3049.xml | 8 ++++---- megamek/data/forcegenerator/3055.xml | 6 +++--- megamek/data/forcegenerator/3058.xml | 12 ++++++------ megamek/data/forcegenerator/3060.xml | 12 ++++++------ megamek/data/forcegenerator/3067.xml | 10 +++++----- megamek/data/forcegenerator/3075.xml | 12 ++++++------ megamek/data/forcegenerator/3078.xml | 12 ++++++------ megamek/data/forcegenerator/3082.xml | 12 ++++++------ megamek/data/forcegenerator/3085.xml | 10 +++++----- megamek/data/forcegenerator/3100.xml | 12 ++++++------ megamek/data/forcegenerator/3131.xml | 12 ++++++------ megamek/data/forcegenerator/3145.xml | 12 ++++++------ megamek/data/forcegenerator/3150.xml | 12 ++++++------ megamek/data/forcegenerator/3160.xml | 10 +++++----- 39 files changed, 151 insertions(+), 151 deletions(-) diff --git a/megamek/data/forcegenerator/2398.xml b/megamek/data/forcegenerator/2398.xml index 286a19843b..9654f3633a 100644 --- a/megamek/data/forcegenerator/2398.xml +++ b/megamek/data/forcegenerator/2398.xml @@ -342,13 +342,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -356,7 +356,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 diff --git a/megamek/data/forcegenerator/2440.xml b/megamek/data/forcegenerator/2440.xml index 08a86c2364..30909eaef6 100644 --- a/megamek/data/forcegenerator/2440.xml +++ b/megamek/data/forcegenerator/2440.xml @@ -415,13 +415,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -429,7 +429,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 diff --git a/megamek/data/forcegenerator/2460.xml b/megamek/data/forcegenerator/2460.xml index 10aaf1f404..45e4dca03c 100644 --- a/megamek/data/forcegenerator/2460.xml +++ b/megamek/data/forcegenerator/2460.xml @@ -444,13 +444,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -458,7 +458,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 diff --git a/megamek/data/forcegenerator/2470.xml b/megamek/data/forcegenerator/2470.xml index 56e9020177..c4040e8ef0 100644 --- a/megamek/data/forcegenerator/2470.xml +++ b/megamek/data/forcegenerator/2470.xml @@ -486,13 +486,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -500,7 +500,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 diff --git a/megamek/data/forcegenerator/2490.xml b/megamek/data/forcegenerator/2490.xml index e27dd80801..808fa29344 100644 --- a/megamek/data/forcegenerator/2490.xml +++ b/megamek/data/forcegenerator/2490.xml @@ -576,13 +576,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -590,7 +590,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 diff --git a/megamek/data/forcegenerator/2520.xml b/megamek/data/forcegenerator/2520.xml index b7f456555b..6cd14a725b 100644 --- a/megamek/data/forcegenerator/2520.xml +++ b/megamek/data/forcegenerator/2520.xml @@ -696,13 +696,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -710,7 +710,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 diff --git a/megamek/data/forcegenerator/2571.xml b/megamek/data/forcegenerator/2571.xml index 115f49ec21..f928880434 100644 --- a/megamek/data/forcegenerator/2571.xml +++ b/megamek/data/forcegenerator/2571.xml @@ -980,13 +980,13 @@ - SL:1,IS:1,Periphery:1 + SL:4,IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -994,7 +994,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 diff --git a/megamek/data/forcegenerator/2650.xml b/megamek/data/forcegenerator/2650.xml index d4167a6221..2c2664f72c 100644 --- a/megamek/data/forcegenerator/2650.xml +++ b/megamek/data/forcegenerator/2650.xml @@ -994,13 +994,13 @@ - SL:1,IS:1,Periphery:1 + SL:4,IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -1008,7 +1008,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 diff --git a/megamek/data/forcegenerator/2700.xml b/megamek/data/forcegenerator/2700.xml index 51d95c90aa..853faf0f80 100644 --- a/megamek/data/forcegenerator/2700.xml +++ b/megamek/data/forcegenerator/2700.xml @@ -1194,13 +1194,13 @@ - SL:1,IS:1,Periphery:1 + SL:4,IS:2,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -1208,7 +1208,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 diff --git a/megamek/data/forcegenerator/2765.xml b/megamek/data/forcegenerator/2765.xml index 52ebf74d3f..a70468559f 100644 --- a/megamek/data/forcegenerator/2765.xml +++ b/megamek/data/forcegenerator/2765.xml @@ -1268,13 +1268,13 @@ - SL:1,IS:1,Periphery:1 + SL:4,IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -1282,7 +1282,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 diff --git a/megamek/data/forcegenerator/2780.xml b/megamek/data/forcegenerator/2780.xml index 571439ac87..b976f660f8 100644 --- a/megamek/data/forcegenerator/2780.xml +++ b/megamek/data/forcegenerator/2780.xml @@ -1277,13 +1277,13 @@ - SL:1,IS:1,Periphery:1 + SL:4,IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -1291,7 +1291,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 diff --git a/megamek/data/forcegenerator/2807.xml b/megamek/data/forcegenerator/2807.xml index f1ed61b33f..1895f1594b 100644 --- a/megamek/data/forcegenerator/2807.xml +++ b/megamek/data/forcegenerator/2807.xml @@ -1305,13 +1305,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -1319,7 +1319,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 diff --git a/megamek/data/forcegenerator/2815.xml b/megamek/data/forcegenerator/2815.xml index 763fb14c2b..1a291369b1 100644 --- a/megamek/data/forcegenerator/2815.xml +++ b/megamek/data/forcegenerator/2815.xml @@ -1656,13 +1656,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -1670,7 +1670,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 diff --git a/megamek/data/forcegenerator/2823.xml b/megamek/data/forcegenerator/2823.xml index 65425b8527..4b47a1a0ca 100644 --- a/megamek/data/forcegenerator/2823.xml +++ b/megamek/data/forcegenerator/2823.xml @@ -1754,13 +1754,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -1768,7 +1768,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 diff --git a/megamek/data/forcegenerator/2830.xml b/megamek/data/forcegenerator/2830.xml index efa214b003..78d9b1423c 100644 --- a/megamek/data/forcegenerator/2830.xml +++ b/megamek/data/forcegenerator/2830.xml @@ -1775,13 +1775,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -1789,7 +1789,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 diff --git a/megamek/data/forcegenerator/2835.xml b/megamek/data/forcegenerator/2835.xml index 9d21db1f49..9afb25e418 100644 --- a/megamek/data/forcegenerator/2835.xml +++ b/megamek/data/forcegenerator/2835.xml @@ -1840,13 +1840,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -1854,7 +1854,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 diff --git a/megamek/data/forcegenerator/2855.xml b/megamek/data/forcegenerator/2855.xml index 281977b3f4..ebee9da5cd 100644 --- a/megamek/data/forcegenerator/2855.xml +++ b/megamek/data/forcegenerator/2855.xml @@ -1870,13 +1870,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -1884,7 +1884,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 diff --git a/megamek/data/forcegenerator/2860.xml b/megamek/data/forcegenerator/2860.xml index 8dbb8bc8dc..b32c94d665 100644 --- a/megamek/data/forcegenerator/2860.xml +++ b/megamek/data/forcegenerator/2860.xml @@ -1791,13 +1791,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -1805,7 +1805,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 diff --git a/megamek/data/forcegenerator/2865.xml b/megamek/data/forcegenerator/2865.xml index efd9fed849..8e61fe6c46 100644 --- a/megamek/data/forcegenerator/2865.xml +++ b/megamek/data/forcegenerator/2865.xml @@ -1806,13 +1806,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -1820,7 +1820,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 diff --git a/megamek/data/forcegenerator/2870.xml b/megamek/data/forcegenerator/2870.xml index 5ea5869723..1bd3455b73 100644 --- a/megamek/data/forcegenerator/2870.xml +++ b/megamek/data/forcegenerator/2870.xml @@ -1993,13 +1993,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -2007,7 +2007,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 diff --git a/megamek/data/forcegenerator/2900.xml b/megamek/data/forcegenerator/2900.xml index c158272890..fc17e6c295 100644 --- a/megamek/data/forcegenerator/2900.xml +++ b/megamek/data/forcegenerator/2900.xml @@ -2069,13 +2069,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -2083,7 +2083,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 diff --git a/megamek/data/forcegenerator/2950.xml b/megamek/data/forcegenerator/2950.xml index cd9d44db1e..8dc9b74bed 100644 --- a/megamek/data/forcegenerator/2950.xml +++ b/megamek/data/forcegenerator/2950.xml @@ -2177,13 +2177,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -2191,7 +2191,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 diff --git a/megamek/data/forcegenerator/3019.xml b/megamek/data/forcegenerator/3019.xml index b184b6622b..24c7173503 100644 --- a/megamek/data/forcegenerator/3019.xml +++ b/megamek/data/forcegenerator/3019.xml @@ -2344,13 +2344,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -2358,7 +2358,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 diff --git a/megamek/data/forcegenerator/3028.xml b/megamek/data/forcegenerator/3028.xml index 417ee4e197..23085cc20c 100644 --- a/megamek/data/forcegenerator/3028.xml +++ b/megamek/data/forcegenerator/3028.xml @@ -2483,13 +2483,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -2497,7 +2497,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 diff --git a/megamek/data/forcegenerator/3039.xml b/megamek/data/forcegenerator/3039.xml index 3f053341e8..6d6343b31c 100644 --- a/megamek/data/forcegenerator/3039.xml +++ b/megamek/data/forcegenerator/3039.xml @@ -2588,13 +2588,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -2602,7 +2602,7 @@ General:7 - field_gun + antI_aircraft,field_gun General:8 diff --git a/megamek/data/forcegenerator/3049.xml b/megamek/data/forcegenerator/3049.xml index 88e4a8b07a..15289f7ced 100644 --- a/megamek/data/forcegenerator/3049.xml +++ b/megamek/data/forcegenerator/3049.xml @@ -3148,13 +3148,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -3162,7 +3162,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 @@ -3171,7 +3171,7 @@ field_gun - IS:4 + FWL:4 field_gun diff --git a/megamek/data/forcegenerator/3055.xml b/megamek/data/forcegenerator/3055.xml index 187e11cb0c..f8aaa65cfd 100644 --- a/megamek/data/forcegenerator/3055.xml +++ b/megamek/data/forcegenerator/3055.xml @@ -3462,13 +3462,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -3476,7 +3476,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 diff --git a/megamek/data/forcegenerator/3058.xml b/megamek/data/forcegenerator/3058.xml index 65f47b7533..576d27c947 100644 --- a/megamek/data/forcegenerator/3058.xml +++ b/megamek/data/forcegenerator/3058.xml @@ -3663,13 +3663,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -3677,7 +3677,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 @@ -3685,11 +3685,11 @@ IS:5 - field_gun + anti_aircraft,field_gun IS:4 - field_gun + anti_aircraft,field_gun IS:4 @@ -3697,7 +3697,7 @@ IS:4 - field_gun + anti_aircraft,field_gun IS:4 diff --git a/megamek/data/forcegenerator/3060.xml b/megamek/data/forcegenerator/3060.xml index 833568b713..bfae155a49 100644 --- a/megamek/data/forcegenerator/3060.xml +++ b/megamek/data/forcegenerator/3060.xml @@ -4444,13 +4444,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -4458,7 +4458,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 @@ -4466,11 +4466,11 @@ IS:5 - field_gun + anti_aircraft,field_gun IS:6 - field_gun + anti_aircraft,field_gun IS:6 @@ -4478,7 +4478,7 @@ IS:6 - field_gun + anti_aircraft,field_gun IS:6 diff --git a/megamek/data/forcegenerator/3067.xml b/megamek/data/forcegenerator/3067.xml index 4f660a95f3..7e060ddcdb 100644 --- a/megamek/data/forcegenerator/3067.xml +++ b/megamek/data/forcegenerator/3067.xml @@ -5393,13 +5393,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -5407,7 +5407,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 @@ -5423,7 +5423,7 @@ IS:4 - field_gun + anti_aircraft,field_gun IS:6 @@ -5435,7 +5435,7 @@ IS:6 - field_gun + anti_aircraft,field_gun IS:6 diff --git a/megamek/data/forcegenerator/3075.xml b/megamek/data/forcegenerator/3075.xml index b5b8d759b7..137e6aeed3 100644 --- a/megamek/data/forcegenerator/3075.xml +++ b/megamek/data/forcegenerator/3075.xml @@ -5902,13 +5902,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircaft,field_gun General:7 @@ -5916,7 +5916,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 @@ -5932,11 +5932,11 @@ IS:4 - field_gun + anti_aircraft,field_gun IS:6 - field_gun + anti_aircraft,field_gun IS:6 @@ -5944,7 +5944,7 @@ IS:6 - field_gun + anti_aircraft,field_gun IS:6 diff --git a/megamek/data/forcegenerator/3078.xml b/megamek/data/forcegenerator/3078.xml index 64a81af721..55c4edcf91 100644 --- a/megamek/data/forcegenerator/3078.xml +++ b/megamek/data/forcegenerator/3078.xml @@ -6235,13 +6235,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -6249,7 +6249,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 @@ -6265,11 +6265,11 @@ IS:4 - field_gun + anti_aircraft,field_gun IS:6 - field_gun + anti_aircraft,field_gun IS:6 @@ -6277,7 +6277,7 @@ IS:6 - field_gun + anti_aircraft,field_gun IS:6 diff --git a/megamek/data/forcegenerator/3082.xml b/megamek/data/forcegenerator/3082.xml index e367c2cd74..53965cb768 100644 --- a/megamek/data/forcegenerator/3082.xml +++ b/megamek/data/forcegenerator/3082.xml @@ -5816,13 +5816,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -5830,7 +5830,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 @@ -5846,11 +5846,11 @@ IS:4 - field_gun + anti_aircraft,field_gun IS:6 - field_gun + anti_aircraft,field_gun IS:6 @@ -5858,7 +5858,7 @@ IS:6 - field_gun + anti_aircraft,field_gun IS:6 diff --git a/megamek/data/forcegenerator/3085.xml b/megamek/data/forcegenerator/3085.xml index bd950cb0a6..cf06f1dc57 100644 --- a/megamek/data/forcegenerator/3085.xml +++ b/megamek/data/forcegenerator/3085.xml @@ -6050,13 +6050,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -6064,7 +6064,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 @@ -6080,11 +6080,11 @@ IS:4 - field_gun + anti_aircraft,field_gun IS:6 - field_gun + anti_aircraft,field_gun IS:6 diff --git a/megamek/data/forcegenerator/3100.xml b/megamek/data/forcegenerator/3100.xml index 62dd1aa6e6..a7745ff1f4 100644 --- a/megamek/data/forcegenerator/3100.xml +++ b/megamek/data/forcegenerator/3100.xml @@ -6314,13 +6314,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -6328,7 +6328,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 @@ -6344,11 +6344,11 @@ IS:4 - field_gun + anti_aircraft,field_gun IS:6 - field_gun + anti_aircraft,field_gun IS:6 @@ -6356,7 +6356,7 @@ IS:6 - field_gun + anti_aircraft,field_gun IS:6 diff --git a/megamek/data/forcegenerator/3131.xml b/megamek/data/forcegenerator/3131.xml index 30f161011a..bdb24e2985 100644 --- a/megamek/data/forcegenerator/3131.xml +++ b/megamek/data/forcegenerator/3131.xml @@ -6740,13 +6740,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -6754,7 +6754,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 @@ -6770,11 +6770,11 @@ IS:4 - field_gun + anti_aircraft,field_gun IS:6 - field_gun + anti_aircraft,field_gun IS:6 @@ -6782,7 +6782,7 @@ IS:6 - field_gun + anti_aircraft,field_gun IS:6 diff --git a/megamek/data/forcegenerator/3145.xml b/megamek/data/forcegenerator/3145.xml index 9694935dba..2f0451f8cd 100644 --- a/megamek/data/forcegenerator/3145.xml +++ b/megamek/data/forcegenerator/3145.xml @@ -6653,13 +6653,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -6667,7 +6667,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 @@ -6683,11 +6683,11 @@ IS:4 - field_gun + anti_aircraft,field_gun IS:6 - field_gun + anti_aircraft,field_gun IS:6 @@ -6695,7 +6695,7 @@ IS:6 - field_gun + anti_aircraft,field_gun IS:6 diff --git a/megamek/data/forcegenerator/3150.xml b/megamek/data/forcegenerator/3150.xml index 2c7323d7a1..861a559c12 100644 --- a/megamek/data/forcegenerator/3150.xml +++ b/megamek/data/forcegenerator/3150.xml @@ -6709,13 +6709,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -6723,7 +6723,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 @@ -6739,11 +6739,11 @@ IS:4 - field_gun + anti_aircraft,field_gun IS:6 - field_gun + anti_aircraft,field_gun IS:6 @@ -6751,7 +6751,7 @@ IS:6 - field_gun + anti_aircraft,field_gun IS:6 diff --git a/megamek/data/forcegenerator/3160.xml b/megamek/data/forcegenerator/3160.xml index 5635b52c63..b9ba3599a6 100644 --- a/megamek/data/forcegenerator/3160.xml +++ b/megamek/data/forcegenerator/3160.xml @@ -6463,13 +6463,13 @@ - IS:1,Periphery:1 + IS:4,Periphery:2 field_gun General:8 - field_gun + anti_aircraft,field_gun General:7 @@ -6477,7 +6477,7 @@ General:7 - field_gun + anti_aircraft,field_gun General:8 @@ -6493,7 +6493,7 @@ IS:4 - field_gun + anti_aircraft,field_gun IS:6 @@ -6505,7 +6505,7 @@ IS:6 - field_gun + anti_aircraft,field_gun IS:6 From 7d10925b3d4f76182f985f2aeb4e878bdf8626b9 Mon Sep 17 00:00:00 2001 From: SuperStucco Date: Tue, 11 Jun 2024 10:13:34 -0600 Subject: [PATCH 2/5] Reduced availability for Hastati foot infantry from TRO: 3085 so it isn't competing with standard foot infantry --- megamek/data/forcegenerator/2490.xml | 2 +- megamek/data/forcegenerator/2520.xml | 2 +- megamek/data/forcegenerator/2571.xml | 2 +- megamek/data/forcegenerator/2650.xml | 2 +- megamek/data/forcegenerator/2700.xml | 2 +- megamek/data/forcegenerator/2765.xml | 2 +- megamek/data/forcegenerator/2780.xml | 2 +- megamek/data/forcegenerator/2807.xml | 2 +- megamek/data/forcegenerator/2815.xml | 2 +- megamek/data/forcegenerator/2823.xml | 2 +- megamek/data/forcegenerator/2830.xml | 2 +- megamek/data/forcegenerator/2835.xml | 2 +- megamek/data/forcegenerator/2855.xml | 2 +- megamek/data/forcegenerator/2860.xml | 2 +- megamek/data/forcegenerator/2865.xml | 2 +- megamek/data/forcegenerator/2870.xml | 2 +- megamek/data/forcegenerator/2900.xml | 2 +- megamek/data/forcegenerator/2950.xml | 2 +- megamek/data/forcegenerator/3019.xml | 2 +- megamek/data/forcegenerator/3028.xml | 2 +- megamek/data/forcegenerator/3039.xml | 2 +- megamek/data/forcegenerator/3049.xml | 2 +- megamek/data/forcegenerator/3055.xml | 2 +- megamek/data/forcegenerator/3058.xml | 2 +- megamek/data/forcegenerator/3060.xml | 2 +- megamek/data/forcegenerator/3067.xml | 2 +- megamek/data/forcegenerator/3075.xml | 2 +- megamek/data/forcegenerator/3078.xml | 2 +- megamek/data/forcegenerator/3082.xml | 2 +- megamek/data/forcegenerator/3085.xml | 2 +- megamek/data/forcegenerator/3100.xml | 2 +- megamek/data/forcegenerator/3131.xml | 2 +- megamek/data/forcegenerator/3145.xml | 2 +- megamek/data/forcegenerator/3150.xml | 2 +- megamek/data/forcegenerator/3160.xml | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/megamek/data/forcegenerator/2490.xml b/megamek/data/forcegenerator/2490.xml index 808fa29344..344ae31398 100644 --- a/megamek/data/forcegenerator/2490.xml +++ b/megamek/data/forcegenerator/2490.xml @@ -614,7 +614,7 @@ - IS:10-,Periphery:10- + IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/2520.xml b/megamek/data/forcegenerator/2520.xml index 6cd14a725b..6668076231 100644 --- a/megamek/data/forcegenerator/2520.xml +++ b/megamek/data/forcegenerator/2520.xml @@ -756,7 +756,7 @@ - IS:10-,Periphery:10- + IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/2571.xml b/megamek/data/forcegenerator/2571.xml index f928880434..0e493b343c 100644 --- a/megamek/data/forcegenerator/2571.xml +++ b/megamek/data/forcegenerator/2571.xml @@ -1063,7 +1063,7 @@ - IS:10-,Periphery:10- + IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/2650.xml b/megamek/data/forcegenerator/2650.xml index 2c2664f72c..eaca9092e1 100644 --- a/megamek/data/forcegenerator/2650.xml +++ b/megamek/data/forcegenerator/2650.xml @@ -1084,7 +1084,7 @@ - IS:10-,Periphery:10- + IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/2700.xml b/megamek/data/forcegenerator/2700.xml index 853faf0f80..0d470501ff 100644 --- a/megamek/data/forcegenerator/2700.xml +++ b/megamek/data/forcegenerator/2700.xml @@ -1296,7 +1296,7 @@ - IS:10-,Periphery:10- + IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/2765.xml b/megamek/data/forcegenerator/2765.xml index a70468559f..f579347299 100644 --- a/megamek/data/forcegenerator/2765.xml +++ b/megamek/data/forcegenerator/2765.xml @@ -1370,7 +1370,7 @@ - IS:10-,Periphery:10- + IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/2780.xml b/megamek/data/forcegenerator/2780.xml index b976f660f8..07c973f680 100644 --- a/megamek/data/forcegenerator/2780.xml +++ b/megamek/data/forcegenerator/2780.xml @@ -1382,7 +1382,7 @@ - IS:10-,Periphery:10- + IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/2807.xml b/megamek/data/forcegenerator/2807.xml index 1895f1594b..0bab0a1fdb 100644 --- a/megamek/data/forcegenerator/2807.xml +++ b/megamek/data/forcegenerator/2807.xml @@ -1430,7 +1430,7 @@ - IS:10-,Periphery:10- + IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/2815.xml b/megamek/data/forcegenerator/2815.xml index 1a291369b1..8c0e31c489 100644 --- a/megamek/data/forcegenerator/2815.xml +++ b/megamek/data/forcegenerator/2815.xml @@ -1781,7 +1781,7 @@ - IS:10-,Periphery:10- + IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/2823.xml b/megamek/data/forcegenerator/2823.xml index 4b47a1a0ca..89d9d807b1 100644 --- a/megamek/data/forcegenerator/2823.xml +++ b/megamek/data/forcegenerator/2823.xml @@ -1866,7 +1866,7 @@ - IS:10-,Periphery:10- + IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/2830.xml b/megamek/data/forcegenerator/2830.xml index 78d9b1423c..508485394d 100644 --- a/megamek/data/forcegenerator/2830.xml +++ b/megamek/data/forcegenerator/2830.xml @@ -1896,7 +1896,7 @@ - IS:10-,Periphery:10-,BAN:10- + IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/2835.xml b/megamek/data/forcegenerator/2835.xml index 9afb25e418..fb4de96b77 100644 --- a/megamek/data/forcegenerator/2835.xml +++ b/megamek/data/forcegenerator/2835.xml @@ -1965,7 +1965,7 @@ - IS:10-,Periphery:10-,BAN:10- + IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/2855.xml b/megamek/data/forcegenerator/2855.xml index ebee9da5cd..c86f3fcf9a 100644 --- a/megamek/data/forcegenerator/2855.xml +++ b/megamek/data/forcegenerator/2855.xml @@ -1992,7 +1992,7 @@ - IS:10-,Periphery:10-,BAN:10- + IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/2860.xml b/megamek/data/forcegenerator/2860.xml index b32c94d665..8a2b15273a 100644 --- a/megamek/data/forcegenerator/2860.xml +++ b/megamek/data/forcegenerator/2860.xml @@ -1913,7 +1913,7 @@ - IS:10-,Periphery:10-,BAN:10- + IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/2865.xml b/megamek/data/forcegenerator/2865.xml index 8e61fe6c46..b8bd98268f 100644 --- a/megamek/data/forcegenerator/2865.xml +++ b/megamek/data/forcegenerator/2865.xml @@ -1928,7 +1928,7 @@ - IS:10-,Periphery:10-,BAN:10- + IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/2870.xml b/megamek/data/forcegenerator/2870.xml index 1bd3455b73..25f973583a 100644 --- a/megamek/data/forcegenerator/2870.xml +++ b/megamek/data/forcegenerator/2870.xml @@ -2115,7 +2115,7 @@ - IS:10-,Periphery:10-,BAN:10- + IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/2900.xml b/megamek/data/forcegenerator/2900.xml index fc17e6c295..5d4790a23f 100644 --- a/megamek/data/forcegenerator/2900.xml +++ b/megamek/data/forcegenerator/2900.xml @@ -2182,7 +2182,7 @@ - IS:10-,Periphery:10-,BAN:10- + IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/2950.xml b/megamek/data/forcegenerator/2950.xml index 8dc9b74bed..3503c5d92e 100644 --- a/megamek/data/forcegenerator/2950.xml +++ b/megamek/data/forcegenerator/2950.xml @@ -2284,7 +2284,7 @@ - IS:10-,Periphery:10-,BAN:10- + IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/3019.xml b/megamek/data/forcegenerator/3019.xml index 24c7173503..bbd97c6705 100644 --- a/megamek/data/forcegenerator/3019.xml +++ b/megamek/data/forcegenerator/3019.xml @@ -2442,7 +2442,7 @@ - IS:10-,Periphery:10-,BAN:10- + IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/3028.xml b/megamek/data/forcegenerator/3028.xml index 23085cc20c..db198723b8 100644 --- a/megamek/data/forcegenerator/3028.xml +++ b/megamek/data/forcegenerator/3028.xml @@ -2581,7 +2581,7 @@ - IS:10-,Periphery:10-,BAN:10- + IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/3039.xml b/megamek/data/forcegenerator/3039.xml index 6d6343b31c..586828a615 100644 --- a/megamek/data/forcegenerator/3039.xml +++ b/megamek/data/forcegenerator/3039.xml @@ -2693,7 +2693,7 @@ - IS:10-,Periphery:10-,BAN:10- + IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/3049.xml b/megamek/data/forcegenerator/3049.xml index 15289f7ced..d5808e829e 100644 --- a/megamek/data/forcegenerator/3049.xml +++ b/megamek/data/forcegenerator/3049.xml @@ -3308,7 +3308,7 @@ - IS:10-,Periphery:10-,BAN:10- + IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/3055.xml b/megamek/data/forcegenerator/3055.xml index f8aaa65cfd..7a8ec10171 100644 --- a/megamek/data/forcegenerator/3055.xml +++ b/megamek/data/forcegenerator/3055.xml @@ -3668,7 +3668,7 @@ - IS:10-,Periphery:10-,BAN:10- + IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/3058.xml b/megamek/data/forcegenerator/3058.xml index 576d27c947..90a56d71ae 100644 --- a/megamek/data/forcegenerator/3058.xml +++ b/megamek/data/forcegenerator/3058.xml @@ -3899,7 +3899,7 @@ - IS:10-,Periphery:10-,BAN:10- + IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/3060.xml b/megamek/data/forcegenerator/3060.xml index bfae155a49..e8c3f4ac18 100644 --- a/megamek/data/forcegenerator/3060.xml +++ b/megamek/data/forcegenerator/3060.xml @@ -4705,7 +4705,7 @@ - IS:10-,Periphery:10-,BAN:10- + IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/3067.xml b/megamek/data/forcegenerator/3067.xml index 7e060ddcdb..5a9a8fa6e5 100644 --- a/megamek/data/forcegenerator/3067.xml +++ b/megamek/data/forcegenerator/3067.xml @@ -5703,7 +5703,7 @@ - IS:10-,Periphery:10-,BAN:10- + IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/3075.xml b/megamek/data/forcegenerator/3075.xml index 137e6aeed3..4771fd468b 100644 --- a/megamek/data/forcegenerator/3075.xml +++ b/megamek/data/forcegenerator/3075.xml @@ -6241,7 +6241,7 @@ - IS:10-,Periphery:10-,BAN:10- + IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/3078.xml b/megamek/data/forcegenerator/3078.xml index 55c4edcf91..667a01167e 100644 --- a/megamek/data/forcegenerator/3078.xml +++ b/megamek/data/forcegenerator/3078.xml @@ -6574,7 +6574,7 @@ - IS:10-,Periphery:10-,BAN:10- + IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/3082.xml b/megamek/data/forcegenerator/3082.xml index 53965cb768..bf2e173668 100644 --- a/megamek/data/forcegenerator/3082.xml +++ b/megamek/data/forcegenerator/3082.xml @@ -6103,7 +6103,7 @@ - IS:10-,Periphery:10-,BAN:10- + ROS:10-,IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/3085.xml b/megamek/data/forcegenerator/3085.xml index cf06f1dc57..b14a654e08 100644 --- a/megamek/data/forcegenerator/3085.xml +++ b/megamek/data/forcegenerator/3085.xml @@ -6346,7 +6346,7 @@ - IS:10-,Periphery:10-,BAN:10- + ROS:10-,IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/3100.xml b/megamek/data/forcegenerator/3100.xml index a7745ff1f4..7ab75b593d 100644 --- a/megamek/data/forcegenerator/3100.xml +++ b/megamek/data/forcegenerator/3100.xml @@ -6629,7 +6629,7 @@ - IS:10-,Periphery:10-,BAN:10- + ROS:10-,IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/3131.xml b/megamek/data/forcegenerator/3131.xml index bdb24e2985..6d5b46cc2a 100644 --- a/megamek/data/forcegenerator/3131.xml +++ b/megamek/data/forcegenerator/3131.xml @@ -7056,7 +7056,7 @@ - IS:10-,Periphery:10-,BAN:10- + ROS:10-,IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/3145.xml b/megamek/data/forcegenerator/3145.xml index 2f0451f8cd..782a958af7 100644 --- a/megamek/data/forcegenerator/3145.xml +++ b/megamek/data/forcegenerator/3145.xml @@ -6976,7 +6976,7 @@ - IS:10-,Periphery:10-,BAN:10- + ROS:10-,IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/3150.xml b/megamek/data/forcegenerator/3150.xml index 861a559c12..279c236a86 100644 --- a/megamek/data/forcegenerator/3150.xml +++ b/megamek/data/forcegenerator/3150.xml @@ -7035,7 +7035,7 @@ - IS:10-,Periphery:10-,BAN:10- + ROS:10-,IS:3-,Periphery:3- General:10- diff --git a/megamek/data/forcegenerator/3160.xml b/megamek/data/forcegenerator/3160.xml index b9ba3599a6..94c2b581d6 100644 --- a/megamek/data/forcegenerator/3160.xml +++ b/megamek/data/forcegenerator/3160.xml @@ -6789,7 +6789,7 @@ - IS:10-,Periphery:10-,BAN:10- + IS:3-,Periphery:3- General:10- From f40027dbc42ed74fa6bf5543a11e3b93195d565d Mon Sep 17 00:00:00 2001 From: SuperStucco Date: Tue, 11 Jun 2024 10:22:58 -0600 Subject: [PATCH 3/5] Add urban role to AC20 field guns, reduce availability slightly --- megamek/data/forcegenerator/2398.xml | 4 ++-- megamek/data/forcegenerator/2440.xml | 4 ++-- megamek/data/forcegenerator/2460.xml | 4 ++-- megamek/data/forcegenerator/2470.xml | 4 ++-- megamek/data/forcegenerator/2490.xml | 4 ++-- megamek/data/forcegenerator/2520.xml | 4 ++-- megamek/data/forcegenerator/2571.xml | 4 ++-- megamek/data/forcegenerator/2650.xml | 4 ++-- megamek/data/forcegenerator/2700.xml | 4 ++-- megamek/data/forcegenerator/2765.xml | 4 ++-- megamek/data/forcegenerator/2780.xml | 4 ++-- megamek/data/forcegenerator/2807.xml | 4 ++-- megamek/data/forcegenerator/2815.xml | 4 ++-- megamek/data/forcegenerator/2823.xml | 4 ++-- megamek/data/forcegenerator/2830.xml | 4 ++-- megamek/data/forcegenerator/2835.xml | 4 ++-- megamek/data/forcegenerator/2855.xml | 4 ++-- megamek/data/forcegenerator/2860.xml | 4 ++-- megamek/data/forcegenerator/2865.xml | 4 ++-- megamek/data/forcegenerator/2870.xml | 4 ++-- megamek/data/forcegenerator/2900.xml | 4 ++-- megamek/data/forcegenerator/2950.xml | 4 ++-- megamek/data/forcegenerator/3019.xml | 4 ++-- megamek/data/forcegenerator/3028.xml | 4 ++-- megamek/data/forcegenerator/3039.xml | 4 ++-- megamek/data/forcegenerator/3049.xml | 4 ++-- megamek/data/forcegenerator/3055.xml | 4 ++-- megamek/data/forcegenerator/3058.xml | 4 ++-- megamek/data/forcegenerator/3060.xml | 4 ++-- megamek/data/forcegenerator/3067.xml | 4 ++-- megamek/data/forcegenerator/3075.xml | 4 ++-- megamek/data/forcegenerator/3078.xml | 4 ++-- megamek/data/forcegenerator/3082.xml | 4 ++-- megamek/data/forcegenerator/3085.xml | 4 ++-- megamek/data/forcegenerator/3100.xml | 4 ++-- megamek/data/forcegenerator/3131.xml | 4 ++-- megamek/data/forcegenerator/3145.xml | 4 ++-- megamek/data/forcegenerator/3150.xml | 4 ++-- megamek/data/forcegenerator/3160.xml | 4 ++-- 39 files changed, 78 insertions(+), 78 deletions(-) diff --git a/megamek/data/forcegenerator/2398.xml b/megamek/data/forcegenerator/2398.xml index 9654f3633a..5ea1ea22ae 100644 --- a/megamek/data/forcegenerator/2398.xml +++ b/megamek/data/forcegenerator/2398.xml @@ -352,8 +352,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/2440.xml b/megamek/data/forcegenerator/2440.xml index 30909eaef6..2a116686c8 100644 --- a/megamek/data/forcegenerator/2440.xml +++ b/megamek/data/forcegenerator/2440.xml @@ -425,8 +425,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/2460.xml b/megamek/data/forcegenerator/2460.xml index 45e4dca03c..87a4ca1619 100644 --- a/megamek/data/forcegenerator/2460.xml +++ b/megamek/data/forcegenerator/2460.xml @@ -454,8 +454,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/2470.xml b/megamek/data/forcegenerator/2470.xml index c4040e8ef0..1b1719b705 100644 --- a/megamek/data/forcegenerator/2470.xml +++ b/megamek/data/forcegenerator/2470.xml @@ -496,8 +496,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/2490.xml b/megamek/data/forcegenerator/2490.xml index 344ae31398..96fdca8eb2 100644 --- a/megamek/data/forcegenerator/2490.xml +++ b/megamek/data/forcegenerator/2490.xml @@ -586,8 +586,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/2520.xml b/megamek/data/forcegenerator/2520.xml index 6668076231..eaf991a25d 100644 --- a/megamek/data/forcegenerator/2520.xml +++ b/megamek/data/forcegenerator/2520.xml @@ -706,8 +706,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/2571.xml b/megamek/data/forcegenerator/2571.xml index 0e493b343c..6aacaba29e 100644 --- a/megamek/data/forcegenerator/2571.xml +++ b/megamek/data/forcegenerator/2571.xml @@ -990,8 +990,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/2650.xml b/megamek/data/forcegenerator/2650.xml index eaca9092e1..c82a23064a 100644 --- a/megamek/data/forcegenerator/2650.xml +++ b/megamek/data/forcegenerator/2650.xml @@ -1004,8 +1004,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/2700.xml b/megamek/data/forcegenerator/2700.xml index 0d470501ff..30dc8e179e 100644 --- a/megamek/data/forcegenerator/2700.xml +++ b/megamek/data/forcegenerator/2700.xml @@ -1204,8 +1204,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/2765.xml b/megamek/data/forcegenerator/2765.xml index f579347299..2249023181 100644 --- a/megamek/data/forcegenerator/2765.xml +++ b/megamek/data/forcegenerator/2765.xml @@ -1278,8 +1278,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/2780.xml b/megamek/data/forcegenerator/2780.xml index 07c973f680..17615a20dd 100644 --- a/megamek/data/forcegenerator/2780.xml +++ b/megamek/data/forcegenerator/2780.xml @@ -1287,8 +1287,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/2807.xml b/megamek/data/forcegenerator/2807.xml index 0bab0a1fdb..4649847700 100644 --- a/megamek/data/forcegenerator/2807.xml +++ b/megamek/data/forcegenerator/2807.xml @@ -1315,8 +1315,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/2815.xml b/megamek/data/forcegenerator/2815.xml index 8c0e31c489..d80604e2be 100644 --- a/megamek/data/forcegenerator/2815.xml +++ b/megamek/data/forcegenerator/2815.xml @@ -1666,8 +1666,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/2823.xml b/megamek/data/forcegenerator/2823.xml index 89d9d807b1..3653a4d3c7 100644 --- a/megamek/data/forcegenerator/2823.xml +++ b/megamek/data/forcegenerator/2823.xml @@ -1764,8 +1764,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/2830.xml b/megamek/data/forcegenerator/2830.xml index 508485394d..372c897e2f 100644 --- a/megamek/data/forcegenerator/2830.xml +++ b/megamek/data/forcegenerator/2830.xml @@ -1785,8 +1785,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/2835.xml b/megamek/data/forcegenerator/2835.xml index fb4de96b77..2621a616af 100644 --- a/megamek/data/forcegenerator/2835.xml +++ b/megamek/data/forcegenerator/2835.xml @@ -1850,8 +1850,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/2855.xml b/megamek/data/forcegenerator/2855.xml index c86f3fcf9a..5601162fdc 100644 --- a/megamek/data/forcegenerator/2855.xml +++ b/megamek/data/forcegenerator/2855.xml @@ -1880,8 +1880,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/2860.xml b/megamek/data/forcegenerator/2860.xml index 8a2b15273a..7b045a66a5 100644 --- a/megamek/data/forcegenerator/2860.xml +++ b/megamek/data/forcegenerator/2860.xml @@ -1801,8 +1801,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/2865.xml b/megamek/data/forcegenerator/2865.xml index b8bd98268f..18c856995b 100644 --- a/megamek/data/forcegenerator/2865.xml +++ b/megamek/data/forcegenerator/2865.xml @@ -1816,8 +1816,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/2870.xml b/megamek/data/forcegenerator/2870.xml index 25f973583a..186f76c4da 100644 --- a/megamek/data/forcegenerator/2870.xml +++ b/megamek/data/forcegenerator/2870.xml @@ -2003,8 +2003,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/2900.xml b/megamek/data/forcegenerator/2900.xml index 5d4790a23f..f9cce9a32e 100644 --- a/megamek/data/forcegenerator/2900.xml +++ b/megamek/data/forcegenerator/2900.xml @@ -2079,8 +2079,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/2950.xml b/megamek/data/forcegenerator/2950.xml index 3503c5d92e..0eeeb28d01 100644 --- a/megamek/data/forcegenerator/2950.xml +++ b/megamek/data/forcegenerator/2950.xml @@ -2187,8 +2187,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/3019.xml b/megamek/data/forcegenerator/3019.xml index bbd97c6705..93a2fbc710 100644 --- a/megamek/data/forcegenerator/3019.xml +++ b/megamek/data/forcegenerator/3019.xml @@ -2354,8 +2354,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/3028.xml b/megamek/data/forcegenerator/3028.xml index db198723b8..36daeb9767 100644 --- a/megamek/data/forcegenerator/3028.xml +++ b/megamek/data/forcegenerator/3028.xml @@ -2493,8 +2493,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/3039.xml b/megamek/data/forcegenerator/3039.xml index 586828a615..affff9f0f3 100644 --- a/megamek/data/forcegenerator/3039.xml +++ b/megamek/data/forcegenerator/3039.xml @@ -2598,8 +2598,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 antI_aircraft,field_gun diff --git a/megamek/data/forcegenerator/3049.xml b/megamek/data/forcegenerator/3049.xml index d5808e829e..e93eb7a2a4 100644 --- a/megamek/data/forcegenerator/3049.xml +++ b/megamek/data/forcegenerator/3049.xml @@ -3158,8 +3158,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/3055.xml b/megamek/data/forcegenerator/3055.xml index 7a8ec10171..2131f0ba7f 100644 --- a/megamek/data/forcegenerator/3055.xml +++ b/megamek/data/forcegenerator/3055.xml @@ -3472,8 +3472,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/3058.xml b/megamek/data/forcegenerator/3058.xml index 90a56d71ae..5fee1e67e7 100644 --- a/megamek/data/forcegenerator/3058.xml +++ b/megamek/data/forcegenerator/3058.xml @@ -3673,8 +3673,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/3060.xml b/megamek/data/forcegenerator/3060.xml index e8c3f4ac18..e56792c4ce 100644 --- a/megamek/data/forcegenerator/3060.xml +++ b/megamek/data/forcegenerator/3060.xml @@ -4454,8 +4454,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/3067.xml b/megamek/data/forcegenerator/3067.xml index 5a9a8fa6e5..5753316f21 100644 --- a/megamek/data/forcegenerator/3067.xml +++ b/megamek/data/forcegenerator/3067.xml @@ -5403,8 +5403,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/3075.xml b/megamek/data/forcegenerator/3075.xml index 4771fd468b..38fef450b7 100644 --- a/megamek/data/forcegenerator/3075.xml +++ b/megamek/data/forcegenerator/3075.xml @@ -5912,8 +5912,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/3078.xml b/megamek/data/forcegenerator/3078.xml index 667a01167e..1bd3d76609 100644 --- a/megamek/data/forcegenerator/3078.xml +++ b/megamek/data/forcegenerator/3078.xml @@ -6245,8 +6245,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/3082.xml b/megamek/data/forcegenerator/3082.xml index bf2e173668..b2a2c9a26c 100644 --- a/megamek/data/forcegenerator/3082.xml +++ b/megamek/data/forcegenerator/3082.xml @@ -5826,8 +5826,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/3085.xml b/megamek/data/forcegenerator/3085.xml index b14a654e08..01b279a2b0 100644 --- a/megamek/data/forcegenerator/3085.xml +++ b/megamek/data/forcegenerator/3085.xml @@ -6060,8 +6060,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/3100.xml b/megamek/data/forcegenerator/3100.xml index 7ab75b593d..5b4bc1f6fd 100644 --- a/megamek/data/forcegenerator/3100.xml +++ b/megamek/data/forcegenerator/3100.xml @@ -6324,8 +6324,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/3131.xml b/megamek/data/forcegenerator/3131.xml index 6d5b46cc2a..f5eb2718eb 100644 --- a/megamek/data/forcegenerator/3131.xml +++ b/megamek/data/forcegenerator/3131.xml @@ -6750,8 +6750,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/3145.xml b/megamek/data/forcegenerator/3145.xml index 782a958af7..7d561ac4e0 100644 --- a/megamek/data/forcegenerator/3145.xml +++ b/megamek/data/forcegenerator/3145.xml @@ -6663,8 +6663,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/3150.xml b/megamek/data/forcegenerator/3150.xml index 279c236a86..ae54ef3eef 100644 --- a/megamek/data/forcegenerator/3150.xml +++ b/megamek/data/forcegenerator/3150.xml @@ -6719,8 +6719,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun diff --git a/megamek/data/forcegenerator/3160.xml b/megamek/data/forcegenerator/3160.xml index 94c2b581d6..e6e50d5de7 100644 --- a/megamek/data/forcegenerator/3160.xml +++ b/megamek/data/forcegenerator/3160.xml @@ -6473,8 +6473,8 @@ General:7 - field_gun - General:7 + urban,field_gun + General:5 anti_aircraft,field_gun From 731ea02286e4e5d0f9bbf3fecf59dd99029dcae3 Mon Sep 17 00:00:00 2001 From: SuperStucco Date: Tue, 11 Jun 2024 11:01:34 -0600 Subject: [PATCH 4/5] INF_SUPPORT role means 'infantry support' not 'support infantry', and does not apply to infantry units --- megamek/data/forcegenerator/2490.xml | 1 - megamek/data/forcegenerator/2520.xml | 1 - megamek/data/forcegenerator/2571.xml | 1 - megamek/data/forcegenerator/2650.xml | 1 - megamek/data/forcegenerator/2700.xml | 1 - megamek/data/forcegenerator/2765.xml | 1 - megamek/data/forcegenerator/2780.xml | 1 - megamek/data/forcegenerator/2807.xml | 1 - megamek/data/forcegenerator/2815.xml | 1 - megamek/data/forcegenerator/2823.xml | 1 - megamek/data/forcegenerator/2830.xml | 1 - megamek/data/forcegenerator/2835.xml | 1 - megamek/data/forcegenerator/2855.xml | 1 - megamek/data/forcegenerator/2860.xml | 1 - megamek/data/forcegenerator/2865.xml | 1 - megamek/data/forcegenerator/2870.xml | 1 - megamek/data/forcegenerator/2900.xml | 1 - megamek/data/forcegenerator/2950.xml | 1 - megamek/data/forcegenerator/3019.xml | 1 - megamek/data/forcegenerator/3028.xml | 1 - megamek/data/forcegenerator/3039.xml | 1 - megamek/data/forcegenerator/3049.xml | 1 - megamek/data/forcegenerator/3055.xml | 1 - megamek/data/forcegenerator/3058.xml | 1 - megamek/data/forcegenerator/3060.xml | 1 - megamek/data/forcegenerator/3067.xml | 1 - megamek/data/forcegenerator/3075.xml | 1 - megamek/data/forcegenerator/3078.xml | 1 - megamek/data/forcegenerator/3082.xml | 1 - megamek/data/forcegenerator/3085.xml | 1 - megamek/data/forcegenerator/3100.xml | 1 - megamek/data/forcegenerator/3131.xml | 1 - megamek/data/forcegenerator/3145.xml | 1 - megamek/data/forcegenerator/3150.xml | 1 - megamek/data/forcegenerator/3160.xml | 1 - 35 files changed, 35 deletions(-) diff --git a/megamek/data/forcegenerator/2490.xml b/megamek/data/forcegenerator/2490.xml index 96fdca8eb2..4eecaea7cc 100644 --- a/megamek/data/forcegenerator/2490.xml +++ b/megamek/data/forcegenerator/2490.xml @@ -597,7 +597,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/2520.xml b/megamek/data/forcegenerator/2520.xml index eaf991a25d..8cdfc72fe8 100644 --- a/megamek/data/forcegenerator/2520.xml +++ b/megamek/data/forcegenerator/2520.xml @@ -717,7 +717,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/2571.xml b/megamek/data/forcegenerator/2571.xml index 6aacaba29e..5de7481931 100644 --- a/megamek/data/forcegenerator/2571.xml +++ b/megamek/data/forcegenerator/2571.xml @@ -1001,7 +1001,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/2650.xml b/megamek/data/forcegenerator/2650.xml index c82a23064a..743f88495b 100644 --- a/megamek/data/forcegenerator/2650.xml +++ b/megamek/data/forcegenerator/2650.xml @@ -1015,7 +1015,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/2700.xml b/megamek/data/forcegenerator/2700.xml index 30dc8e179e..0624c261a5 100644 --- a/megamek/data/forcegenerator/2700.xml +++ b/megamek/data/forcegenerator/2700.xml @@ -1219,7 +1219,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/2765.xml b/megamek/data/forcegenerator/2765.xml index 2249023181..d70ba2b829 100644 --- a/megamek/data/forcegenerator/2765.xml +++ b/megamek/data/forcegenerator/2765.xml @@ -1293,7 +1293,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/2780.xml b/megamek/data/forcegenerator/2780.xml index 17615a20dd..8134e44d58 100644 --- a/megamek/data/forcegenerator/2780.xml +++ b/megamek/data/forcegenerator/2780.xml @@ -1302,7 +1302,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/2807.xml b/megamek/data/forcegenerator/2807.xml index 4649847700..6d3fa39d78 100644 --- a/megamek/data/forcegenerator/2807.xml +++ b/megamek/data/forcegenerator/2807.xml @@ -1330,7 +1330,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/2815.xml b/megamek/data/forcegenerator/2815.xml index d80604e2be..8c49844d20 100644 --- a/megamek/data/forcegenerator/2815.xml +++ b/megamek/data/forcegenerator/2815.xml @@ -1681,7 +1681,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/2823.xml b/megamek/data/forcegenerator/2823.xml index 3653a4d3c7..45cb2300c7 100644 --- a/megamek/data/forcegenerator/2823.xml +++ b/megamek/data/forcegenerator/2823.xml @@ -1779,7 +1779,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/2830.xml b/megamek/data/forcegenerator/2830.xml index 372c897e2f..1d2a17a58f 100644 --- a/megamek/data/forcegenerator/2830.xml +++ b/megamek/data/forcegenerator/2830.xml @@ -1800,7 +1800,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/2835.xml b/megamek/data/forcegenerator/2835.xml index 2621a616af..7cb2784de6 100644 --- a/megamek/data/forcegenerator/2835.xml +++ b/megamek/data/forcegenerator/2835.xml @@ -1861,7 +1861,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/2855.xml b/megamek/data/forcegenerator/2855.xml index 5601162fdc..7ce6c3ec0a 100644 --- a/megamek/data/forcegenerator/2855.xml +++ b/megamek/data/forcegenerator/2855.xml @@ -1891,7 +1891,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/2860.xml b/megamek/data/forcegenerator/2860.xml index 7b045a66a5..9922fae1cc 100644 --- a/megamek/data/forcegenerator/2860.xml +++ b/megamek/data/forcegenerator/2860.xml @@ -1812,7 +1812,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/2865.xml b/megamek/data/forcegenerator/2865.xml index 18c856995b..beb06efa24 100644 --- a/megamek/data/forcegenerator/2865.xml +++ b/megamek/data/forcegenerator/2865.xml @@ -1827,7 +1827,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/2870.xml b/megamek/data/forcegenerator/2870.xml index 186f76c4da..ca69ef802b 100644 --- a/megamek/data/forcegenerator/2870.xml +++ b/megamek/data/forcegenerator/2870.xml @@ -2014,7 +2014,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/2900.xml b/megamek/data/forcegenerator/2900.xml index f9cce9a32e..b47157af6e 100644 --- a/megamek/data/forcegenerator/2900.xml +++ b/megamek/data/forcegenerator/2900.xml @@ -2090,7 +2090,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/2950.xml b/megamek/data/forcegenerator/2950.xml index 0eeeb28d01..6aae81b250 100644 --- a/megamek/data/forcegenerator/2950.xml +++ b/megamek/data/forcegenerator/2950.xml @@ -2198,7 +2198,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/3019.xml b/megamek/data/forcegenerator/3019.xml index 93a2fbc710..cdb8ddf1df 100644 --- a/megamek/data/forcegenerator/3019.xml +++ b/megamek/data/forcegenerator/3019.xml @@ -2365,7 +2365,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/3028.xml b/megamek/data/forcegenerator/3028.xml index 36daeb9767..c0b49851f1 100644 --- a/megamek/data/forcegenerator/3028.xml +++ b/megamek/data/forcegenerator/3028.xml @@ -2504,7 +2504,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/3039.xml b/megamek/data/forcegenerator/3039.xml index affff9f0f3..06bbcac1d7 100644 --- a/megamek/data/forcegenerator/3039.xml +++ b/megamek/data/forcegenerator/3039.xml @@ -2613,7 +2613,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/3049.xml b/megamek/data/forcegenerator/3049.xml index e93eb7a2a4..d84f137638 100644 --- a/megamek/data/forcegenerator/3049.xml +++ b/megamek/data/forcegenerator/3049.xml @@ -3181,7 +3181,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/3055.xml b/megamek/data/forcegenerator/3055.xml index 2131f0ba7f..ec3fa133b3 100644 --- a/megamek/data/forcegenerator/3055.xml +++ b/megamek/data/forcegenerator/3055.xml @@ -3507,7 +3507,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/3058.xml b/megamek/data/forcegenerator/3058.xml index 5fee1e67e7..91a6279298 100644 --- a/megamek/data/forcegenerator/3058.xml +++ b/megamek/data/forcegenerator/3058.xml @@ -3732,7 +3732,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/3060.xml b/megamek/data/forcegenerator/3060.xml index e56792c4ce..694ae1cf2a 100644 --- a/megamek/data/forcegenerator/3060.xml +++ b/megamek/data/forcegenerator/3060.xml @@ -4513,7 +4513,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/3067.xml b/megamek/data/forcegenerator/3067.xml index 5753316f21..101f4fa642 100644 --- a/megamek/data/forcegenerator/3067.xml +++ b/megamek/data/forcegenerator/3067.xml @@ -5470,7 +5470,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/3075.xml b/megamek/data/forcegenerator/3075.xml index 38fef450b7..6f5d4060c4 100644 --- a/megamek/data/forcegenerator/3075.xml +++ b/megamek/data/forcegenerator/3075.xml @@ -5979,7 +5979,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/3078.xml b/megamek/data/forcegenerator/3078.xml index 1bd3d76609..5c394e0922 100644 --- a/megamek/data/forcegenerator/3078.xml +++ b/megamek/data/forcegenerator/3078.xml @@ -6312,7 +6312,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/3082.xml b/megamek/data/forcegenerator/3082.xml index b2a2c9a26c..dbdd0c8009 100644 --- a/megamek/data/forcegenerator/3082.xml +++ b/megamek/data/forcegenerator/3082.xml @@ -5893,7 +5893,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/3085.xml b/megamek/data/forcegenerator/3085.xml index 01b279a2b0..d4a1554941 100644 --- a/megamek/data/forcegenerator/3085.xml +++ b/megamek/data/forcegenerator/3085.xml @@ -6127,7 +6127,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/3100.xml b/megamek/data/forcegenerator/3100.xml index 5b4bc1f6fd..c3725d1f81 100644 --- a/megamek/data/forcegenerator/3100.xml +++ b/megamek/data/forcegenerator/3100.xml @@ -6391,7 +6391,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/3131.xml b/megamek/data/forcegenerator/3131.xml index f5eb2718eb..93c4ff03be 100644 --- a/megamek/data/forcegenerator/3131.xml +++ b/megamek/data/forcegenerator/3131.xml @@ -6817,7 +6817,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/3145.xml b/megamek/data/forcegenerator/3145.xml index 7d561ac4e0..e62e08c4aa 100644 --- a/megamek/data/forcegenerator/3145.xml +++ b/megamek/data/forcegenerator/3145.xml @@ -6730,7 +6730,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/3150.xml b/megamek/data/forcegenerator/3150.xml index ae54ef3eef..1c48d15d2f 100644 --- a/megamek/data/forcegenerator/3150.xml +++ b/megamek/data/forcegenerator/3150.xml @@ -6786,7 +6786,6 @@ IS:4,Periphery:4 - inf_support General:4 diff --git a/megamek/data/forcegenerator/3160.xml b/megamek/data/forcegenerator/3160.xml index e6e50d5de7..06ee8b76da 100644 --- a/megamek/data/forcegenerator/3160.xml +++ b/megamek/data/forcegenerator/3160.xml @@ -6540,7 +6540,6 @@ IS:4,Periphery:4 - inf_support General:4 From 5ae8afcea3024aebdf7a35b7b1cb5e96cd30b17a Mon Sep 17 00:00:00 2001 From: SuperStucco Date: Tue, 11 Jun 2024 11:43:56 -0600 Subject: [PATCH 5/5] MARINE role refers to space combat, not blue water combat. It only applies to conventional infantry and battle armor. --- megamek/data/forcegenerator/2490.xml | 2 +- megamek/data/forcegenerator/2520.xml | 2 +- megamek/data/forcegenerator/2571.xml | 2 +- megamek/data/forcegenerator/2700.xml | 2 +- megamek/data/forcegenerator/2765.xml | 2 +- megamek/data/forcegenerator/2780.xml | 2 +- megamek/data/forcegenerator/2807.xml | 2 +- megamek/data/forcegenerator/2815.xml | 2 +- megamek/data/forcegenerator/2823.xml | 2 +- megamek/data/forcegenerator/2830.xml | 2 +- megamek/data/forcegenerator/2835.xml | 2 +- megamek/data/forcegenerator/2855.xml | 2 +- megamek/data/forcegenerator/2860.xml | 2 +- megamek/data/forcegenerator/2865.xml | 2 +- megamek/data/forcegenerator/2870.xml | 2 +- megamek/data/forcegenerator/2900.xml | 2 +- megamek/data/forcegenerator/2950.xml | 2 +- megamek/data/forcegenerator/3019.xml | 2 +- megamek/data/forcegenerator/3028.xml | 2 +- megamek/data/forcegenerator/3039.xml | 2 +- megamek/data/forcegenerator/3049.xml | 2 +- megamek/data/forcegenerator/3055.xml | 2 +- megamek/data/forcegenerator/3058.xml | 2 +- megamek/data/forcegenerator/3060.xml | 2 +- megamek/data/forcegenerator/3067.xml | 2 +- megamek/data/forcegenerator/3075.xml | 5 +---- megamek/data/forcegenerator/3078.xml | 7 +------ megamek/data/forcegenerator/3082.xml | 8 +------- megamek/data/forcegenerator/3085.xml | 9 +-------- megamek/data/forcegenerator/3100.xml | 9 +-------- megamek/data/forcegenerator/3131.xml | 9 +-------- megamek/data/forcegenerator/3145.xml | 9 +-------- megamek/data/forcegenerator/3150.xml | 9 +-------- megamek/data/forcegenerator/3160.xml | 9 +-------- 34 files changed, 34 insertions(+), 90 deletions(-) diff --git a/megamek/data/forcegenerator/2490.xml b/megamek/data/forcegenerator/2490.xml index 4eecaea7cc..bcfda62586 100644 --- a/megamek/data/forcegenerator/2490.xml +++ b/megamek/data/forcegenerator/2490.xml @@ -1179,7 +1179,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 diff --git a/megamek/data/forcegenerator/2520.xml b/megamek/data/forcegenerator/2520.xml index 8cdfc72fe8..3c14ad952d 100644 --- a/megamek/data/forcegenerator/2520.xml +++ b/megamek/data/forcegenerator/2520.xml @@ -1350,7 +1350,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 diff --git a/megamek/data/forcegenerator/2571.xml b/megamek/data/forcegenerator/2571.xml index 5de7481931..2a9aab26eb 100644 --- a/megamek/data/forcegenerator/2571.xml +++ b/megamek/data/forcegenerator/2571.xml @@ -1951,7 +1951,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 diff --git a/megamek/data/forcegenerator/2700.xml b/megamek/data/forcegenerator/2700.xml index 0624c261a5..d146667209 100644 --- a/megamek/data/forcegenerator/2700.xml +++ b/megamek/data/forcegenerator/2700.xml @@ -2512,7 +2512,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 diff --git a/megamek/data/forcegenerator/2765.xml b/megamek/data/forcegenerator/2765.xml index d70ba2b829..97594fd710 100644 --- a/megamek/data/forcegenerator/2765.xml +++ b/megamek/data/forcegenerator/2765.xml @@ -2641,7 +2641,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 diff --git a/megamek/data/forcegenerator/2780.xml b/megamek/data/forcegenerator/2780.xml index 8134e44d58..971589a389 100644 --- a/megamek/data/forcegenerator/2780.xml +++ b/megamek/data/forcegenerator/2780.xml @@ -2663,7 +2663,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 diff --git a/megamek/data/forcegenerator/2807.xml b/megamek/data/forcegenerator/2807.xml index 6d3fa39d78..059bba857a 100644 --- a/megamek/data/forcegenerator/2807.xml +++ b/megamek/data/forcegenerator/2807.xml @@ -2747,7 +2747,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 diff --git a/megamek/data/forcegenerator/2815.xml b/megamek/data/forcegenerator/2815.xml index 8c49844d20..c4e0d02677 100644 --- a/megamek/data/forcegenerator/2815.xml +++ b/megamek/data/forcegenerator/2815.xml @@ -3119,7 +3119,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 diff --git a/megamek/data/forcegenerator/2823.xml b/megamek/data/forcegenerator/2823.xml index 45cb2300c7..158c50f633 100644 --- a/megamek/data/forcegenerator/2823.xml +++ b/megamek/data/forcegenerator/2823.xml @@ -3247,7 +3247,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 diff --git a/megamek/data/forcegenerator/2830.xml b/megamek/data/forcegenerator/2830.xml index 1d2a17a58f..74fb6f6606 100644 --- a/megamek/data/forcegenerator/2830.xml +++ b/megamek/data/forcegenerator/2830.xml @@ -3338,7 +3338,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 diff --git a/megamek/data/forcegenerator/2835.xml b/megamek/data/forcegenerator/2835.xml index 7cb2784de6..1f21fc2bf3 100644 --- a/megamek/data/forcegenerator/2835.xml +++ b/megamek/data/forcegenerator/2835.xml @@ -3549,7 +3549,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 diff --git a/megamek/data/forcegenerator/2855.xml b/megamek/data/forcegenerator/2855.xml index 7ce6c3ec0a..0d4fd7ea97 100644 --- a/megamek/data/forcegenerator/2855.xml +++ b/megamek/data/forcegenerator/2855.xml @@ -3581,7 +3581,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 diff --git a/megamek/data/forcegenerator/2860.xml b/megamek/data/forcegenerator/2860.xml index 9922fae1cc..2a413f3f93 100644 --- a/megamek/data/forcegenerator/2860.xml +++ b/megamek/data/forcegenerator/2860.xml @@ -3499,7 +3499,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 diff --git a/megamek/data/forcegenerator/2865.xml b/megamek/data/forcegenerator/2865.xml index beb06efa24..e0ae3cbb25 100644 --- a/megamek/data/forcegenerator/2865.xml +++ b/megamek/data/forcegenerator/2865.xml @@ -3526,7 +3526,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 diff --git a/megamek/data/forcegenerator/2870.xml b/megamek/data/forcegenerator/2870.xml index ca69ef802b..0e30bc057b 100644 --- a/megamek/data/forcegenerator/2870.xml +++ b/megamek/data/forcegenerator/2870.xml @@ -3814,7 +3814,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 diff --git a/megamek/data/forcegenerator/2900.xml b/megamek/data/forcegenerator/2900.xml index b47157af6e..09ddfbb317 100644 --- a/megamek/data/forcegenerator/2900.xml +++ b/megamek/data/forcegenerator/2900.xml @@ -3917,7 +3917,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 diff --git a/megamek/data/forcegenerator/2950.xml b/megamek/data/forcegenerator/2950.xml index 6aae81b250..a623cbf925 100644 --- a/megamek/data/forcegenerator/2950.xml +++ b/megamek/data/forcegenerator/2950.xml @@ -4061,7 +4061,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 diff --git a/megamek/data/forcegenerator/3019.xml b/megamek/data/forcegenerator/3019.xml index cdb8ddf1df..4d8d1f6f03 100644 --- a/megamek/data/forcegenerator/3019.xml +++ b/megamek/data/forcegenerator/3019.xml @@ -4306,7 +4306,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 diff --git a/megamek/data/forcegenerator/3028.xml b/megamek/data/forcegenerator/3028.xml index c0b49851f1..864a895467 100644 --- a/megamek/data/forcegenerator/3028.xml +++ b/megamek/data/forcegenerator/3028.xml @@ -4509,7 +4509,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 diff --git a/megamek/data/forcegenerator/3039.xml b/megamek/data/forcegenerator/3039.xml index 06bbcac1d7..300718d86b 100644 --- a/megamek/data/forcegenerator/3039.xml +++ b/megamek/data/forcegenerator/3039.xml @@ -4732,7 +4732,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 diff --git a/megamek/data/forcegenerator/3049.xml b/megamek/data/forcegenerator/3049.xml index d84f137638..d26f0cd89d 100644 --- a/megamek/data/forcegenerator/3049.xml +++ b/megamek/data/forcegenerator/3049.xml @@ -5753,7 +5753,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 diff --git a/megamek/data/forcegenerator/3055.xml b/megamek/data/forcegenerator/3055.xml index ec3fa133b3..bc9d0f6841 100644 --- a/megamek/data/forcegenerator/3055.xml +++ b/megamek/data/forcegenerator/3055.xml @@ -6448,7 +6448,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 diff --git a/megamek/data/forcegenerator/3058.xml b/megamek/data/forcegenerator/3058.xml index 91a6279298..50f3cac95f 100644 --- a/megamek/data/forcegenerator/3058.xml +++ b/megamek/data/forcegenerator/3058.xml @@ -6861,7 +6861,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 diff --git a/megamek/data/forcegenerator/3060.xml b/megamek/data/forcegenerator/3060.xml index 694ae1cf2a..00e5e42344 100644 --- a/megamek/data/forcegenerator/3060.xml +++ b/megamek/data/forcegenerator/3060.xml @@ -8439,7 +8439,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 diff --git a/megamek/data/forcegenerator/3067.xml b/megamek/data/forcegenerator/3067.xml index 101f4fa642..855bc51faa 100644 --- a/megamek/data/forcegenerator/3067.xml +++ b/megamek/data/forcegenerator/3067.xml @@ -10478,7 +10478,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 diff --git a/megamek/data/forcegenerator/3075.xml b/megamek/data/forcegenerator/3075.xml index 6f5d4060c4..265003a33b 100644 --- a/megamek/data/forcegenerator/3075.xml +++ b/megamek/data/forcegenerator/3075.xml @@ -2859,7 +2859,6 @@ General:2+,DC:2+ - marine General:2 @@ -6148,7 +6147,6 @@ CLAN:4,IS:1+,DC:1+ - marine General:2 @@ -11292,7 +11290,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 @@ -16359,7 +16357,6 @@ CHH:8,CW:8,CNC:8,CJF:8,CCO:8 - marine CLAN:2 diff --git a/megamek/data/forcegenerator/3078.xml b/megamek/data/forcegenerator/3078.xml index 5c394e0922..b8e95f2ead 100644 --- a/megamek/data/forcegenerator/3078.xml +++ b/megamek/data/forcegenerator/3078.xml @@ -1468,7 +1468,6 @@ FS:2 - marine General:2 @@ -3060,7 +3059,6 @@ General:2+,DC:2+ - marine General:2 @@ -6048,7 +6046,6 @@ General:2 - marine General:2 @@ -6481,7 +6478,6 @@ CLAN:4,IS:1+,DC:1+ - marine General:2 @@ -11847,7 +11843,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 @@ -17216,7 +17212,6 @@ CHH:8,CW:8,CNC:8,CJF:8,CCO:8 - marine CLAN:2 diff --git a/megamek/data/forcegenerator/3082.xml b/megamek/data/forcegenerator/3082.xml index dbdd0c8009..efd05394e2 100644 --- a/megamek/data/forcegenerator/3082.xml +++ b/megamek/data/forcegenerator/3082.xml @@ -1277,7 +1277,6 @@ ROS:1,FS:2 - marine General:2 @@ -2797,7 +2796,6 @@ General:3+,DC:3+ - marine General:2 @@ -4805,7 +4803,6 @@ General:4 - marine General:3 @@ -5632,7 +5629,6 @@ ROS:2,General:2 - marine General:2 @@ -6026,7 +6022,6 @@ CLAN:4,IS:2+,DC:2+ - marine General:2 @@ -11046,7 +11041,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 @@ -16011,7 +16006,6 @@ CHH:8,CW:8,CNC:8,CJF:8,CCO:8 - marine CLAN:2 diff --git a/megamek/data/forcegenerator/3085.xml b/megamek/data/forcegenerator/3085.xml index d4a1554941..126987dc3c 100644 --- a/megamek/data/forcegenerator/3085.xml +++ b/megamek/data/forcegenerator/3085.xml @@ -1271,7 +1271,6 @@ ROS:2,FS:2 - marine General:2 @@ -2837,7 +2836,6 @@ General:3+,DC:3+ - marine General:2 @@ -4957,7 +4955,6 @@ General:4 - marine General:3 @@ -5866,7 +5863,6 @@ ROS:2,General:2 - marine General:2 @@ -6260,7 +6256,6 @@ CLAN:4,IS:2+,DC:2+ - marine General:2 @@ -6965,7 +6960,6 @@ RA:4 - marine RA:4 @@ -11498,7 +11492,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 @@ -16841,7 +16835,6 @@ CHH:8,CW:8,CNC:8,CJF:8,CCO:8 - marine CLAN:2 diff --git a/megamek/data/forcegenerator/3100.xml b/megamek/data/forcegenerator/3100.xml index c3725d1f81..4d92d6e69b 100644 --- a/megamek/data/forcegenerator/3100.xml +++ b/megamek/data/forcegenerator/3100.xml @@ -1330,7 +1330,6 @@ ROS:2,FS:2 - marine General:2 @@ -2955,7 +2954,6 @@ General:3+,DC:3+ - marine General:2 @@ -5157,7 +5155,6 @@ General:4 - marine General:3 @@ -6108,7 +6105,6 @@ LA:2 - marine General:2 @@ -6543,7 +6539,6 @@ CLAN:4,IS:3,DC:3 - marine General:2 @@ -7273,7 +7268,6 @@ RA:4 - marine RA:4 @@ -11973,7 +11967,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 @@ -17539,7 +17533,6 @@ CHH:8,CW:8,CNC:8,CJF:8 - marine CLAN:2 diff --git a/megamek/data/forcegenerator/3131.xml b/megamek/data/forcegenerator/3131.xml index 93c4ff03be..4a8715217b 100644 --- a/megamek/data/forcegenerator/3131.xml +++ b/megamek/data/forcegenerator/3131.xml @@ -1510,7 +1510,6 @@ ROS:2,FS:2 - marine General:2 @@ -3213,7 +3212,6 @@ General:3+,DC:3+ - marine General:2 @@ -5550,7 +5548,6 @@ General:4 - marine General:3 @@ -6524,7 +6521,6 @@ LA:3,ROS:2,MERC:2 - marine General:2 @@ -6970,7 +6966,6 @@ CLAN:4,IS:3,DC:3 - marine General:2 @@ -7737,7 +7732,6 @@ RA:4 - marine RA:4 @@ -12685,7 +12679,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 @@ -18566,7 +18560,6 @@ CHH:6,SE:2,CEI:2,CP:4,CJF:8 - marine CLAN:2 diff --git a/megamek/data/forcegenerator/3145.xml b/megamek/data/forcegenerator/3145.xml index e62e08c4aa..9f50ec8620 100644 --- a/megamek/data/forcegenerator/3145.xml +++ b/megamek/data/forcegenerator/3145.xml @@ -1321,7 +1321,6 @@ ROS:2,FS:2 - marine General:2 @@ -3045,7 +3044,6 @@ General:3+,DC:3+ - marine General:2 @@ -5435,7 +5433,6 @@ General:4 - marine General:3 @@ -6434,7 +6431,6 @@ LA:3,ROS:2,MERC:2 - marine General:2 @@ -6887,7 +6883,6 @@ CLAN:4,IS:3,DC:3 - marine General:2 @@ -7656,7 +7651,6 @@ RA:4 - marine RA:4 @@ -12701,7 +12695,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 @@ -18696,7 +18690,6 @@ CHH:6,SE:2,CP:4,CJF:8 - marine CLAN:2 diff --git a/megamek/data/forcegenerator/3150.xml b/megamek/data/forcegenerator/3150.xml index 1c48d15d2f..e7fd4cad37 100644 --- a/megamek/data/forcegenerator/3150.xml +++ b/megamek/data/forcegenerator/3150.xml @@ -1350,7 +1350,6 @@ ROS:2,FS:2 - marine General:2 @@ -3092,7 +3091,6 @@ General:3+,DC:3+ - marine General:2 @@ -5479,7 +5477,6 @@ General:4 - marine General:3 @@ -6478,7 +6475,6 @@ LA:3,ROS:2,MERC:2 - marine General:2 @@ -6943,7 +6939,6 @@ CLAN:4,IS:3,DC:3 - marine General:2 @@ -7715,7 +7710,6 @@ RA:4 - marine RA:4 @@ -12778,7 +12772,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 @@ -18796,7 +18790,6 @@ CHH:6,CP:4,CJF:8 - marine CLAN:2 diff --git a/megamek/data/forcegenerator/3160.xml b/megamek/data/forcegenerator/3160.xml index 06ee8b76da..3f8b60473a 100644 --- a/megamek/data/forcegenerator/3160.xml +++ b/megamek/data/forcegenerator/3160.xml @@ -1314,7 +1314,6 @@ FS:2 - marine General:2 @@ -2995,7 +2994,6 @@ General:3+,DC:3+ - marine General:2 @@ -5274,7 +5272,6 @@ General:4 - marine General:3 @@ -6232,7 +6229,6 @@ LA:3,MERC:2 - marine General:2 @@ -6697,7 +6693,6 @@ CLAN:4,IS:3,DC:3 - marine General:2 @@ -7452,7 +7447,6 @@ RA:4 - marine RA:4 @@ -12420,7 +12414,7 @@ IS:1,FS:3,Periphery:1 - specops,marine + specops IS:9 @@ -18061,7 +18055,6 @@ CHH:6,CP:4,CJF:8 - marine CLAN:2