Skip to content

Commit

Permalink
Merge branch 'MegaMek:master' into fleeAtEndOfMovement
Browse files Browse the repository at this point in the history
  • Loading branch information
@kuronekochomusuke
kuronekochomusuke authored Nov 29, 2024
2 parents f975114 + b4f534e commit 84ffea3
Show file tree
Hide file tree
Showing 1,190 changed files with 65,761 additions and 49,381 deletions.
1 change: 1 addition & 0 deletions megamek/data/boards/AGoAC Maps/16x17 Desert 2.board
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
3 changes: 2 additions & 1 deletion megamek/data/boards/Alien Worlds/32x17 Caustic Valley (Water).board
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
1 change: 1 addition & 0 deletions megamek/data/boards/Alien Worlds/32x17 Lunar Base.board
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
5 changes: 3 additions & 2 deletions ...mek/data/boards/Battle of Tukayyid Pack/32x17 Devil's Bath (CSV) - cold bath option.board
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
3 changes: 2 additions & 1 deletion megamek/data/boards/Battle of Tukayyid Pack/32x17 Holth Forest (CGB).board
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions megamek/data/boards/Battle of Tukayyid Pack/32x17 Kozice Valley (CDS).board
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
5 changes: 3 additions & 2 deletions megamek/data/boards/Battle of Tukayyid Pack/32x17 Lake Losiije (CNC).board
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
5 changes: 3 additions & 2 deletions ...ta/boards/Battle of Tukayyid Pack/32x17 Pozoristu Mountains (CW) - Thin Snow + road.board
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
5 changes: 3 additions & 2 deletions ...ta/boards/Battle of Tukayyid Pack/32x17 Pozoristu Mountains (CW) - Thin Snow option.board
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
5 changes: 3 additions & 2 deletions ...ek/data/boards/Battle of Tukayyid Pack/32x17 Pozoristu Mountains (CW) - road option.board
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
5 changes: 3 additions & 2 deletions megamek/data/boards/Battle of Tukayyid Pack/32x17 Pozoristu Mountains (CW).board
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
3 changes: 2 additions & 1 deletion megamek/data/boards/Battle of Tukayyid Pack/32x17 Racice River Delta (CSJ).board
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
5 changes: 3 additions & 2 deletions megamek/data/boards/Battle of Tukayyid Pack/32x17 Robyn's Crossing (CJF).board
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
3 changes: 2 additions & 1 deletion megamek/data/boards/Deserts/16x17 Badlands 2.board
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
1 change: 1 addition & 0 deletions megamek/data/boards/Deserts/16x17 Mines 2.board
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
size 16 17
tag "Water (Auto)"
tag "MultipleTheme (Auto)"
tag "DesertTheme (Auto)"
tag "LightForest (Auto)"
tag "Woods (Auto)"
Expand Down
1 change: 1 addition & 0 deletions megamek/data/boards/Deserts/16x17 Oasis.board
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
1 change: 1 addition & 0 deletions megamek/data/boards/Deserts/64x34 Deserts BFM.board
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down
2 changes: 2 additions & 0 deletions megamek/data/boards/Essentials Box Maps/16x17 Steiner Stadium.board
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
1 change: 1 addition & 0 deletions megamek/data/boards/GrassLands/16x17 Grasslands Forward Base.board
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 "" ""
Expand Down
1 change: 1 addition & 0 deletions megamek/data/boards/Grasslands BattleMats/32x17 Grasslands B BattleMat.board
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 "" ""
Expand Down
3 changes: 2 additions & 1 deletion megamek/data/boards/Grasslands BattleMats/32x17 Tundra BattleMat.board
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 3 additions & 1 deletion megamek/data/boards/Map Set 6/16x17 City (Downtown).board
View file
Original file line number Diff line number Diff line change
@@ -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" ""
Expand Down
4 changes: 3 additions & 1 deletion megamek/data/boards/Map Set 6/16x17 City (Residential).board
View file
Original file line number Diff line number Diff line change
@@ -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" ""
Expand Down
2 changes: 2 additions & 0 deletions megamek/data/boards/Map Set 6/16x17 City (Skyscraper).board
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 "" ""
Expand Down
3 changes: 2 additions & 1 deletion megamek/data/boards/Map Set 6/16x17 City (Suburbs).board
View file
Original file line number Diff line number Diff line change
@@ -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" ""
Expand Down
1 change: 1 addition & 0 deletions megamek/data/boards/Map Set 7/16x17 Dropport 2.board
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" ""
Expand Down
3 changes: 2 additions & 1 deletion megamek/data/boards/Map Set 7/16x17 Military Base 1.board
View file
Original file line number Diff line number Diff line change
@@ -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 "" ""
Expand Down
3 changes: 2 additions & 1 deletion megamek/data/boards/Map Set 7/16x17 Military Base 2.board
View file
Original file line number Diff line number Diff line change
@@ -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 "" ""
Expand Down
5 changes: 3 additions & 2 deletions megamek/data/boards/Map Set 7/16x17 Seaport.board
View file
Original file line number Diff line number Diff line change
@@ -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 "" ""
Expand Down
15 changes: 4 additions & 11 deletions megamek/data/boards/Map Set 8/64x68 Airfield.board
View file
Original file line number Diff line number Diff line change
@@ -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 "" ""
Expand Down
4 changes: 0 additions & 4 deletions megamek/data/boards/Map Set 8/64x68 Courtyard.board
View file
Original file line number Diff line number Diff line change
@@ -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" ""
Expand Down
1 change: 1 addition & 0 deletions megamek/data/boards/Map Set 8/64x68 Peak.board
View file
Original file line number Diff line number Diff line change
@@ -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)"
Expand Down
3 changes: 2 additions & 1 deletion megamek/data/boards/Map Set 8/64x68 Resort.board
View file
Original file line number Diff line number Diff line change
@@ -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" ""
Expand Down
8 changes: 2 additions & 6 deletions megamek/data/boards/Map Set 8/64x68 River Valley.board
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
size 64 68
tag "Rough (Auto)"
tag "Foliage (Auto)"
tag "Fields (Auto)"
tag "Roads (Auto)"
tag "Swamp (Auto)"
tag "LightForest (Auto)"
tag "Roads (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)"
hex 0101 0 "water:1" ""
hex 0201 0 "water:1" ""
hex 0301 0 "water:1" ""
Expand Down
Loading

0 comments on commit 84ffea3

Please sign in to comment.