Merge branch 'refs/heads/master' into Forcegen-chassis-availability-u…

…pdate
MegaMek · Dec 5, 2024 · d29e18e · d29e18e
2 parents 1dde064 + 65a4651
commit d29e18e
Show file tree

Hide file tree

Showing 1,214 changed files with 66,006 additions and 49,453 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+/tmp/
 /.metadata
 /.recommenders/
 /RemoteSystemsTempFiles/

diff --git a/megamek/data/boards/AGoAC Maps/16x17 Desert 2.board b/megamek/data/boards/AGoAC Maps/16x17 Desert 2.board
@@ -1,6 +1,7 @@
 size 16 17
 option exit_roads_to_pavement false
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "ground_fluff:4" "desert"

diff --git a/megamek/data/boards/Alien Worlds/32x17 Caustic Valley (Water).board b/megamek/data/boards/Alien Worlds/32x17 Caustic Valley (Water).board
@@ -1,7 +1,8 @@
 size 32 17
 tag "Cliffs (Auto)"
-tag "Water (Auto)"
 tag "MarsTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 hex 0101 0 "" "mars"
 hex 0201 0 "rough:1" "mars"

diff --git a/megamek/data/boards/Alien Worlds/32x17 Lunar Base.board b/megamek/data/boards/Alien Worlds/32x17 Lunar Base.board
@@ -1,5 +1,6 @@
 size 32 17
 tag "LunarTheme (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1" "lunar"
 hex 0201 0 "" "lunar"
 hex 0301 0 "" "lunar"

diff --git a/...mek/data/boards/Battle of Tukayyid Pack/32x17 Devil's Bath (CSV) - cold bath option.board b/...mek/data/boards/Battle of Tukayyid Pack/32x17 Devil's Bath (CSV) - cold bath option.board
@@ -1,9 +1,10 @@
 size 32 17
-tag "Water (Auto)"
 tag "Cliffs (Auto)"
+tag "Water (Auto)"
 tag "Swamp (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
 hex 0101 7 "" "desert"
 hex 0201 5 "" "desert"
 hex 0301 0 "" "desert"

diff --git a/megamek/data/boards/Battle of Tukayyid Pack/32x17 Holth Forest (CGB).board b/megamek/data/boards/Battle of Tukayyid Pack/32x17 Holth Forest (CGB).board
@@ -2,9 +2,10 @@ size 32 17
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "MediumForest (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
 hex 0101 0 "woods:1;foliage_elev:2" "tropical"
 hex 0201 0 "woods:1;foliage_elev:2" "tropical"
 hex 0301 0 "woods:1;foliage_elev:2" "tropical"

diff --git a/megamek/data/boards/Battle of Tukayyid Pack/32x17 Kozice Valley (CDS).board b/megamek/data/boards/Battle of Tukayyid Pack/32x17 Kozice Valley (CDS).board
@@ -1,10 +1,11 @@
 size 32 17
 option exit_roads_to_pavement false
-tag "LightForest (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "LightForest (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"

diff --git a/megamek/data/boards/Battle of Tukayyid Pack/32x17 Lake Losiije (CNC).board b/megamek/data/boards/Battle of Tukayyid Pack/32x17 Lake Losiije (CNC).board
@@ -1,10 +1,11 @@
 size 32 17
 tag "Rough (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
-tag "LowHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "LowHills (Auto)"
 hex 0101 0 "woods:1;foliage_elev:2" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "woods:1;foliage_elev:2" "desert"

diff --git a/...ta/boards/Battle of Tukayyid Pack/32x17 Pozoristu Mountains (CW) - Thin Snow + road.board b/...ta/boards/Battle of Tukayyid Pack/32x17 Pozoristu Mountains (CW) - Thin Snow + road.board
@@ -1,10 +1,11 @@
 size 32 17
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
 hex 0101 3 "woods:1;foliage_elev:2" "grass"
 hex 0201 2 "woods:1;foliage_elev:2" "grass"

diff --git a/...ta/boards/Battle of Tukayyid Pack/32x17 Pozoristu Mountains (CW) - Thin Snow option.board b/...ta/boards/Battle of Tukayyid Pack/32x17 Pozoristu Mountains (CW) - Thin Snow option.board
@@ -1,9 +1,10 @@
 size 32 17
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
 hex 0101 3 "woods:1;foliage_elev:2" "grass"
 hex 0201 2 "woods:1;foliage_elev:2" "grass"

diff --git a/...ek/data/boards/Battle of Tukayyid Pack/32x17 Pozoristu Mountains (CW) - road option.board b/...ek/data/boards/Battle of Tukayyid Pack/32x17 Pozoristu Mountains (CW) - road option.board
@@ -1,10 +1,11 @@
 size 32 17
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 3 "woods:1;foliage_elev:2" "grass"
 hex 0201 2 "woods:1;foliage_elev:2" "grass"
 hex 0301 2 "" "grass"

diff --git a/megamek/data/boards/Battle of Tukayyid Pack/32x17 Pozoristu Mountains (CW).board b/megamek/data/boards/Battle of Tukayyid Pack/32x17 Pozoristu Mountains (CW).board
@@ -1,9 +1,10 @@
 size 32 17
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 3 "woods:1;foliage_elev:2" "grass"
 hex 0201 2 "woods:1;foliage_elev:2" "grass"
 hex 0301 2 "" "grass"

diff --git a/megamek/data/boards/Battle of Tukayyid Pack/32x17 Racice River Delta (CSJ).board b/megamek/data/boards/Battle of Tukayyid Pack/32x17 Racice River Delta (CSJ).board
@@ -1,9 +1,10 @@
 size 32 17
 option exit_roads_to_pavement false
 tag "Foliage (Auto)"
-tag "LightForest (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
+tag "LightForest (Auto)"
 tag "Woods (Auto)"
 hex 0101 1 "" "desert"
 hex 0201 1 "" "desert"

diff --git a/megamek/data/boards/Battle of Tukayyid Pack/32x17 Robyn's Crossing (CJF).board b/megamek/data/boards/Battle of Tukayyid Pack/32x17 Robyn's Crossing (CJF).board
@@ -1,7 +1,8 @@
 size 32 17
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 hex 0101 4 "woods:1;foliage_elev:2" "grass"

diff --git a/megamek/data/boards/Deserts/16x17 Badlands 2.board b/megamek/data/boards/Deserts/16x17 Badlands 2.board
@@ -1,7 +1,8 @@
 size 16 17
 tag "Cliffs (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"

diff --git a/megamek/data/boards/Deserts/16x17 Mines 2.board b/megamek/data/boards/Deserts/16x17 Mines 2.board
@@ -1,5 +1,6 @@
 size 16 17
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"

diff --git a/megamek/data/boards/Deserts/16x17 Oasis.board b/megamek/data/boards/Deserts/16x17 Oasis.board
@@ -1,6 +1,7 @@
 size 16 17
 tag "Water (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "desert"

diff --git a/megamek/data/boards/Deserts/64x34 Deserts BFM.board b/megamek/data/boards/Deserts/64x34 Deserts BFM.board
@@ -2,6 +2,7 @@ size 64 34
 tag "Rough (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"

diff --git a/megamek/data/boards/Essentials Box Maps/16x17 Steiner Stadium.board b/megamek/data/boards/Essentials Box Maps/16x17 Steiner Stadium.board
@@ -1,6 +1,8 @@
 size 16 17
 tag "Cliffs (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
+tag "Elevator (Auto)"
 hex 0101 5 "impassable:5" "volcano"
 hex 0201 5 "impassable:5" "volcano"
 hex 0301 5 "impassable:5" "volcano"

diff --git a/megamek/data/boards/GrassLands/16x17 Grasslands Forward Base.board b/megamek/data/boards/GrassLands/16x17 Grasslands Forward Base.board
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""

diff --git a/megamek/data/boards/Grasslands BattleMats/32x17 Grasslands B BattleMat.board b/megamek/data/boards/Grasslands BattleMats/32x17 Grasslands B BattleMat.board
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""

diff --git a/megamek/data/boards/Grasslands BattleMats/32x17 Tundra BattleMat.board b/megamek/data/boards/Grasslands BattleMats/32x17 Tundra BattleMat.board
@@ -1,7 +1,8 @@
 size 32 17
 tag "GrassTheme (Auto)"
-tag "Woods (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 0 "woods:1;ground_fluff:4:2;foliage_elev:2" "grass"
 hex 0201 0 "woods:2;ground_fluff:4:2;foliage_elev:2" "grass"
 hex 0301 0 "ground_fluff:4:2" "grass"

diff --git a/megamek/data/boards/Map Set 6/16x17 City (Downtown).board b/megamek/data/boards/Map Set 6/16x17 City (Downtown).board
@@ -1,9 +1,11 @@
 size 16 17
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:2;building:1:8;bldg_cf:15" ""
 hex 0201 0 "" ""
 hex 0301 0 "bldg_elev:2;building:1:0;bldg_cf:15" ""

diff --git a/megamek/data/boards/Map Set 6/16x17 City (Residential).board b/megamek/data/boards/Map Set 6/16x17 City (Residential).board
@@ -1,9 +1,11 @@
 size 16 17
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:2;building:1:8;bldg_cf:15" ""
 hex 0201 0 "" ""
 hex 0301 0 "bldg_elev:3;building:1:12;bldg_cf:15" ""

diff --git a/megamek/data/boards/Map Set 6/16x17 City (Skyscraper).board b/megamek/data/boards/Map Set 6/16x17 City (Skyscraper).board
@@ -2,7 +2,9 @@ size 16 17
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""

diff --git a/megamek/data/boards/Map Set 6/16x17 City (Suburbs).board b/megamek/data/boards/Map Set 6/16x17 City (Suburbs).board
@@ -1,9 +1,10 @@
 size 16 17
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "bldg_elev:2;building:2:8;bldg_cf:40" ""
 hex 0201 0 "woods:1;foliage_elev:2" ""

diff --git a/megamek/data/boards/Map Set 7/16x17 Dropport 2.board b/megamek/data/boards/Map Set 7/16x17 Dropport 2.board
@@ -2,6 +2,7 @@ size 16 17
 tag "GrassTheme (Auto)"
 tag "Flat (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "woods:1;foliage_elev:2" ""
 hex 0201 0 "bldg_elev:3;building:2:30;bldg_cf:40" ""
 hex 0301 0 "bldg_elev:3;building:2:28;bldg_cf:40" ""

diff --git a/megamek/data/boards/Map Set 7/16x17 Military Base 1.board b/megamek/data/boards/Map Set 7/16x17 Military Base 1.board
@@ -1,8 +1,9 @@
 size 16 17
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "road:1:36" ""
 hex 0201 0 "road:1" ""
 hex 0301 0 "" ""

diff --git a/megamek/data/boards/Map Set 7/16x17 Military Base 2.board b/megamek/data/boards/Map Set 7/16x17 Military Base 2.board
@@ -1,8 +1,9 @@
 size 16 17
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""

diff --git a/megamek/data/boards/Map Set 7/16x17 Seaport.board b/megamek/data/boards/Map Set 7/16x17 Seaport.board
@@ -1,10 +1,11 @@
 size 16 17
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "" ""

diff --git a/megamek/data/boards/Map Set 8/64x68 Airfield.board b/megamek/data/boards/Map Set 8/64x68 Airfield.board
@@ -1,20 +1,13 @@
 size 64 68
-tag "Rough (Auto)"
-tag "Foliage (Auto)"
-tag "Swamp (Auto)"
 tag "Roads (Auto)"
-tag "Fields (Auto)"
 tag "LightForest (Auto)"
-tag "SnowTerrain (Auto)"
-tag "Water (Auto)"
-tag "Cliffs (Auto)"
+tag "Hangar (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Flat (Auto)"
-tag "HighHills (Auto)"
-tag "MediumForest (Auto)"
 tag "Woods (Auto)"
-tag "LowHills (Auto)"
-tag "DenseForest (Auto)"
+tag "GunEmplacement (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""

diff --git a/megamek/data/boards/Map Set 8/64x68 Courtyard.board b/megamek/data/boards/Map Set 8/64x68 Courtyard.board
@@ -1,12 +1,8 @@
 size 64 68
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
-tag "Fields (Auto)"
 tag "Roads (Auto)"
-tag "Flat (Auto)"
-tag "MediumForest (Auto)"
 tag "Woods (Auto)"
-tag "LightForest (Auto)"
 tag "LowHills (Auto)"
 hex 0101 2 "road:1:36" ""
 hex 0201 2 "road:1" ""

diff --git a/megamek/data/boards/Map Set 8/64x68 Peak.board b/megamek/data/boards/Map Set 8/64x68 Peak.board
@@ -1,6 +1,7 @@
 size 64 68
 tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 tag "DenseForest (Auto)"

diff --git a/megamek/data/boards/Map Set 8/64x68 Resort.board b/megamek/data/boards/Map Set 8/64x68 Resort.board
@@ -1,13 +1,14 @@
 size 64 68
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Swamp (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "DenseForest (Auto)"
 hex 0101 -3 "sand:1" ""
 hex 0201 -3 "sand:1" ""