Skip to content

Commit

Permalink
Merge branch 'master' into autoresolve
Browse files Browse the repository at this point in the history
  • Loading branch information
@Scoppio
Scoppio authored Nov 17, 2024
2 parents 48cc7d9 + 3979544 commit 5f81c7a
Show file tree
Hide file tree
Showing 313 changed files with 234,175 additions and 10,194 deletions.
2,184 changes: 2,184 additions & 0 deletions MekHQ/data/boards/Deserts/64x34 Deserts BFM.board
View file

Large diffs are not rendered by default.

2,184 changes: 2,184 additions & 0 deletions MekHQ/data/boards/Grasslands BattleMats/64x34 Grasslands BFM.board
View file

Large diffs are not rendered by default.

44 changes: 27 additions & 17 deletions MekHQ/data/boards/Map Set 8/64X68 Airfield.board
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
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 "GrassTheme (Auto)"
tag "Roads (Auto)"
tag "Flat (Auto)"
tag "HighHills (Auto)"
tag "MediumForest (Auto)"
tag "Woods (Auto)"
tag "LightForest (Auto)"
tag "LowHills (Auto)"
tag "DenseForest (Auto)"
hex 0101 0 "" ""
hex 0201 0 "" ""
hex 0301 0 "" ""
Expand Down Expand Up @@ -143,7 +153,7 @@ hex 0703 0 "" ""
hex 0803 0 "road:1" ""
hex 0903 0 "road:1" ""
hex 1003 0 "road:1" ""
hex 1103 0 "bldg_elev:3;bldg_class:3;building:3:0;bldg_cf:15" ""
hex 1103 0 "" ""
hex 1203 0 "" ""
hex 1303 0 "" ""
hex 1403 0 "" ""
Expand Down Expand Up @@ -205,7 +215,7 @@ hex 0504 0 "" ""
hex 0604 0 "road:1" ""
hex 0704 0 "road:1" ""
hex 0804 0 "" ""
hex 0904 0 "" ""
hex 0904 0 "bldg_elev:3;bldg_class:3;building:3:0;bldg_cf:15" ""
hex 1004 0 "" ""
hex 1104 0 "road:1" ""
hex 1204 0 "road:1" ""
Expand Down Expand Up @@ -1529,7 +1539,7 @@ hex 4924 0 "" ""
hex 5024 0 "" ""
hex 5124 0 "road:1" ""
hex 5224 0 "road:1" ""
hex 5324 0 "bldg_elev:3;bldg_class:3;building:3:0;bldg_cf:15" ""
hex 5324 0 "" ""
hex 5424 0 "" ""
hex 5524 0 "" ""
hex 5624 0 "" ""
Expand Down Expand Up @@ -1658,7 +1668,7 @@ hex 5026 0 "" ""
hex 5126 0 "" ""
hex 5226 0 "" ""
hex 5326 0 "road:1" ""
hex 5426 0 "fluff:40:3" ""
hex 5426 0 "bldg_elev:3;bldg_class:3;building:3:0;bldg_cf:15" ""
hex 5526 0 "road:1" ""
hex 5626 0 "road:1" ""
hex 5726 0 "" ""
Expand Down Expand Up @@ -1994,7 +2004,7 @@ hex 0232 0 "water:1" ""
hex 0332 0 "sand:1" ""
hex 0432 0 "water:1" ""
hex 0532 0 "bldg_elev:3;bldg_class:3;building:3:0;bldg_cf:15" ""
hex 0632 0 "bridge:1:9;bridge_cf:40;bridge_elev:1" ""
hex 0632 0 "bridge:1:9;bridge_cf:140;bridge_elev:0" ""
hex 0732 0 "" ""
hex 0832 0 "water:1" ""
hex 0932 0 "water:1" ""
Expand Down Expand Up @@ -2058,7 +2068,7 @@ hex 0233 0 "water:1" ""
hex 0333 0 "water:1" ""
hex 0433 0 "water:1" ""
hex 0533 0 "water:1" ""
hex 0633 0 "water:1;bridge:1;bridge_cf:40;bridge_elev:1" ""
hex 0633 0 "water:1;bridge:1;bridge_cf:140;bridge_elev:1" ""
hex 0733 0 "sand:1" ""
hex 0833 0 "water:1" ""
hex 0933 0 "water:1" ""
Expand Down Expand Up @@ -2122,7 +2132,7 @@ hex 0234 0 "water:1" ""
hex 0334 0 "water:1" ""
hex 0434 0 "water:1" ""
hex 0534 0 "water:1" ""
hex 0634 0 "water:1;bridge:1;bridge_cf:40;bridge_elev:1" ""
hex 0634 0 "water:1;bridge:1;bridge_cf:140;bridge_elev:1" ""
hex 0734 0 "water:1" ""
hex 0834 0 "water:1" ""
hex 0934 0 "water:1" ""
Expand Down Expand Up @@ -2186,7 +2196,7 @@ hex 0235 0 "water:1" ""
hex 0335 0 "water:1" ""
hex 0435 0 "water:1" ""
hex 0535 0 "water:1" ""
hex 0635 0 "water:1;bridge:1;bridge_cf:40;bridge_elev:1" ""
hex 0635 0 "water:1;bridge:1;bridge_cf:140;bridge_elev:1" ""
hex 0735 0 "water:1" ""
hex 0835 0 "water:1" ""
hex 0935 0 "water:1" ""
Expand Down Expand Up @@ -2250,7 +2260,7 @@ hex 0236 0 "water:1" ""
hex 0336 0 "water:1" ""
hex 0436 0 "water:1" ""
hex 0536 0 "water:1" ""
hex 0636 0 "water:1;bridge:1;bridge_cf:40;bridge_elev:1" ""
hex 0636 0 "water:1;bridge:1;bridge_cf:140;bridge_elev:1" ""
hex 0736 0 "water:1" ""
hex 0836 0 "water:1" ""
hex 0936 0 "water:1" ""
Expand Down Expand Up @@ -2314,7 +2324,7 @@ hex 0237 0 "water:1" ""
hex 0337 0 "water:1" ""
hex 0437 0 "water:1" ""
hex 0537 0 "water:1" ""
hex 0637 0 "bridge:1:9;bridge_cf:40;bridge_elev:1" ""
hex 0637 0 "bridge:1:9;bridge_cf:140;bridge_elev:0" ""
hex 0737 0 "sand:1" ""
hex 0837 0 "sand:1" ""
hex 0937 0 "water:1" ""
Expand Down Expand Up @@ -2938,7 +2948,7 @@ hex 5046 0 "" ""
hex 5146 0 "" ""
hex 5246 0 "" ""
hex 5346 0 "road:1" ""
hex 5446 0 "fluff:40:2" ""
hex 5446 0 "bldg_elev:3;bldg_class:3;building:3:0;bldg_cf:15" ""
hex 5546 0 "" ""
hex 5646 0 "road:1" ""
hex 5746 0 "road:1" ""
Expand Down Expand Up @@ -3129,7 +3139,7 @@ hex 4949 0 "" ""
hex 5049 0 "road:1" ""
hex 5149 0 "road:1" ""
hex 5249 0 "" ""
hex 5349 0 "bldg_elev:3;bldg_class:3;building:3:0;bldg_cf:15" ""
hex 5349 0 "" ""
hex 5449 0 "" ""
hex 5549 0 "" ""
hex 5649 0 "" ""
Expand Down Expand Up @@ -3253,7 +3263,7 @@ hex 4551 0 "" ""
hex 4651 0 "" ""
hex 4751 0 "bldg_elev:1;building:3:0;bldg_cf:15" ""
hex 4851 0 "road:1" ""
hex 4951 0 "" ""
hex 4951 0 "bldg_elev:3;bldg_class:3;building:3:0;bldg_cf:15" ""
hex 5051 0 "" ""
hex 5151 0 "" ""
hex 5251 0 "" ""
Expand Down Expand Up @@ -4237,10 +4247,10 @@ hex 0567 0 "" ""
hex 0667 0 "" ""
hex 0767 0 "road:1" ""
hex 0867 0 "road:1" ""
hex 0967 0 "" ""
hex 0967 0 "bldg_elev:3;bldg_class:3;building:3:0;bldg_cf:15" ""
hex 1067 0 "road:1" ""
hex 1167 0 "road:1" ""
hex 1267 0 "bldg_elev:3;bldg_class:3;building:3:0;bldg_cf:15" ""
hex 1267 0 "" ""
hex 1367 0 "" ""
hex 1467 0 "" ""
hex 1567 0 "" ""
Expand Down
Loading

0 comments on commit 5f81c7a

Please sign in to comment.