Skip to content

Commit

Permalink
Merging PR's
Browse files Browse the repository at this point in the history 
Includes missed board from early commit.
  • Loading branch information
@HammerGS
HammerGS committed Jun 8, 2024
1 parent 86e2cbe commit ab32854
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 20 deletions.
47 changes: 27 additions & 20 deletions megamek/data/boards/unofficial/VictorMorson/192x128_Texlos_-_Livius_-_Valencia_City.board
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
size 128 192
option exit_roads_to_pavement false
tag "Water (Auto)"
tag "HeavyUrban (Auto)"
tag "Roads (Auto)"
tag "Swamp (Auto)"
tag "TropicalTheme (Auto)"
tag "Jungle (Auto)"
tag "DenseForest (Auto)"
hex 0101 0 "pavement:1:8;road:1:36" "tropical"
hex 0201 0 "pavement:1:8;road:1" "tropical"
hex 0301 0 "bldg_elev:2;pavement:1:36;bldg_fluff:34:0;building:2:0;bldg_cf:50" "tropical"
Expand Down Expand Up @@ -1944,7 +1951,7 @@ hex 2116 0 "" "tropical"
hex 2216 0 "bldg_elev:1;pavement:1:36;bldg_fluff:28:0;building:2:0;bldg_cf:100" "tropical"
hex 2316 0 "pavement:1:8;road:1" "tropical"
hex 2416 0 "bldg_elev:2;pavement:1:36;bldg_fluff:19:0;building:3:0;bldg_cf:150" "tropical"
hex 2516 0 "fuel_tank_cf:5;fuel_tank_elev:2;fuel_tank_magn:30;pavement:1;fuel_tank:1" "tropical"
hex 2516 0 "fuel_tank_cf:5;fuel_tank_elev:2;fuel_tank_magn:30;pavement:1;fuel_tank:1:0" "tropical"
hex 2616 0 "pavement:1;jungle:1;foliage_elev:2" "tropical"
hex 2716 0 "pavement:1;jungle:1;foliage_elev:2" "tropical"
hex 2816 0 "pavement:1;jungle:1;foliage_elev:2" "tropical"
Expand All @@ -1971,7 +1978,7 @@ hex 4816 0 "bldg_elev:1;pavement:1:36;building:2:5;bldg_cf:20" "tropical"
hex 4916 0 "pavement:1:8;road:1" "tropical"
hex 5016 0 "pavement:1:8;road:1" "tropical"
hex 5116 0 "pavement:1:8;road:1" "tropical"
hex 5216 0 "fuel_tank_cf:5;fuel_tank_elev:2;fuel_tank_magn:30;pavement:1;fuel_tank:1" "tropical"
hex 5216 0 "fuel_tank_cf:5;fuel_tank_elev:2;fuel_tank_magn:30;pavement:1;fuel_tank:1:0" "tropical"
hex 5316 0 "pavement:1;jungle:1;foliage_elev:2" "tropical"
hex 5416 0 "pavement:1;jungle:1;foliage_elev:2" "tropical"
hex 5516 0 "bldg_elev:3;pavement:1;bldg_fluff:18:7;building:4:3;bldg_cf:100" "grass"
Expand Down Expand Up @@ -2996,7 +3003,7 @@ hex 4924 0 "pavement:1:8;road:1" "tropical"
hex 5024 0 "pavement:1:8;road:1" "tropical"
hex 5124 0 "bldg_elev:2;pavement:1:36;bldg_fluff:34:0;building:2:0;bldg_cf:50" "tropical"
hex 5224 0 "bldg_elev:2;pavement:1:36;bldg_fluff:34:0;building:2:0;bldg_cf:50" "tropical"
hex 5324 0 "fuel_tank_cf:5;fuel_tank_elev:2;fuel_tank_magn:60;pavement:1;fuel_tank:3" "tropical"
hex 5324 0 "fuel_tank_cf:5;fuel_tank_elev:2;fuel_tank_magn:60;pavement:1;fuel_tank:3:0" "tropical"
hex 5424 0 "pavement:1:8;road:1" "tropical"
hex 5524 0 "pavement:1:8;road:1" "tropical"
hex 5624 0 "pavement:1:8;road:1" "tropical"
Expand Down Expand Up @@ -3733,7 +3740,7 @@ hex 1830 0 "bldg_elev:1;pavement:1:36;bldg_fluff:4;building:1:0;bldg_cf:100" "tr
hex 1930 0 "pavement:1:8;road:1" "tropical"
hex 2030 0 "pavement:1;jungle:1;foliage_elev:2" "tropical"
hex 2130 0 "pavement:1;jungle:1;foliage_elev:2" "tropical"
hex 2230 0 "bldg_elev:3;pavement:1;bldg_fluff:51:7;building:4;bldg_cf:100" "grass"
hex 2230 0 "bldg_elev:3;pavement:1;bldg_fluff:51:7;building:4:0;bldg_cf:100" "grass"
hex 2330 0 "bldg_elev:1;pavement:1:36;bldg_fluff:12:0;building:3:0;bldg_cf:100" "tropical"
hex 2430 0 "pavement:1:8;road:1" "tropical"
hex 2530 0 "bldg_elev:1;pavement:1:36;bldg_fluff:26;building:2:0;bldg_cf:100" "tropical"
Expand Down Expand Up @@ -5541,7 +5548,7 @@ hex 3444 0 "bldg_elev:2;heavy_industrial:100;bldg_class:2;pavement:1:36;building
hex 3544 0 "bldg_elev:2;heavy_industrial:100;bldg_class:2;pavement:1:36;building:4:58;bldg_cf:100" "tropical"
hex 3644 0 "bldg_elev:1;pavement:1:36;bldg_fluff:2;building:3:8;bldg_cf:100" "tropical"
hex 3744 0 "pavement:1" "tropical"
hex 3844 0 "fuel_tank_cf:5;fuel_tank_elev:2;fuel_tank_magn:30;pavement:1;fuel_tank:1" "tropical"
hex 3844 0 "fuel_tank_cf:5;fuel_tank_elev:2;fuel_tank_magn:30;pavement:1;fuel_tank:1:0" "tropical"
hex 3944 0 "woods:1;pavement:1;foliage_elev:2;fluff:81:20" "tropical"
hex 4044 0 "pavement:1" "tropical"
hex 4144 0 "pavement:1" "tropical"
Expand Down Expand Up @@ -6072,7 +6079,7 @@ hex 5348 0 "pavement:1" "tropical"
hex 5448 0 "pavement:1" "tropical"
hex 5548 0 "pavement:1:8;road:1" "tropical"
hex 5648 0 "pavement:1:8;road:1" "tropical"
hex 5748 0 "bldg_elev:3;pavement:1;bldg_fluff:51:7;building:4;bldg_cf:100" "grass"
hex 5748 0 "bldg_elev:3;pavement:1;bldg_fluff:51:7;building:4:0;bldg_cf:100" "grass"
hex 5848 0 "pavement:1:8;road:1" "tropical"
hex 5948 0 "bldg_elev:2;pavement:1:36;building:1:0;bldg_cf:200" "tropical"
hex 6048 0 "pavement:1" "tropical"
Expand Down Expand Up @@ -6201,13 +6208,13 @@ hex 5449 0 "pavement:1;jungle:1;foliage_elev:2" "tropical"
hex 5549 0 "pavement:1" "tropical"
hex 5649 0 "pavement:1" "tropical"
hex 5749 0 "pavement:1:8;road:1" "tropical"
hex 5849 0 "fuel_tank_cf:5;fuel_tank_elev:2;fuel_tank_magn:30;pavement:1;fuel_tank:1" "tropical"
hex 5849 0 "fuel_tank_cf:5;fuel_tank_elev:2;fuel_tank_magn:30;pavement:1;fuel_tank:1:0" "tropical"
hex 5949 0 "pavement:1:8;road:1" "tropical"
hex 6049 0 "pavement:1:8;road:1" "tropical"
hex 6149 0 "bldg_elev:2;pavement:1:36;bldg_fluff:11;building:2:8;bldg_cf:150" "tropical"
hex 6249 0 "pavement:1:8;road:1" "tropical"
hex 6349 0 "pavement:1" "tropical"
hex 6449 0 "fuel_tank_cf:5;fuel_tank_elev:2;fuel_tank_magn:60;pavement:1;fuel_tank:3" "tropical"
hex 6449 0 "fuel_tank_cf:5;fuel_tank_elev:2;fuel_tank_magn:60;pavement:1;fuel_tank:3:0" "tropical"
hex 6549 0 "" "tropical"
hex 6649 0 "road:1" "tropical"
hex 6749 0 "road:1" "tropical"
Expand Down Expand Up @@ -7873,7 +7880,7 @@ hex 6262 0 "bldg_elev:2;heavy_industrial:100;bldg_class:2;pavement:1:36;building
hex 6362 0 "pavement:1" "tropical"
hex 6462 0 "pavement:1" "tropical"
hex 6562 0 "pavement:1" "tropical"
hex 6662 0 "fuel_tank_cf:5;fuel_tank_elev:2;fuel_tank_magn:30;pavement:1;fuel_tank:1" "tropical"
hex 6662 0 "fuel_tank_cf:5;fuel_tank_elev:2;fuel_tank_magn:30;pavement:1;fuel_tank:1:0" "tropical"
hex 6762 0 "pavement:1;fluff:7" "tropical"
hex 6862 0 "woods:1;pavement:1;foliage_elev:2;fluff:81:15" "tropical"
hex 6962 0 "pavement:1;heavy_industrial:1" "tropical"
Expand Down Expand Up @@ -8510,7 +8517,7 @@ hex 5967 0 "pavement:1" "tropical"
hex 6067 0 "pavement:1" "tropical"
hex 6167 0 "pavement:1;fluff:7" "tropical"
hex 6267 0 "pavement:1" "tropical"
hex 6367 0 "fuel_tank_cf:5;fuel_tank_elev:2;fuel_tank_magn:60;pavement:1;fuel_tank:3" "tropical"
hex 6367 0 "fuel_tank_cf:5;fuel_tank_elev:2;fuel_tank_magn:60;pavement:1;fuel_tank:3:0" "tropical"
hex 6467 0 "pavement:1" "tropical"
hex 6567 0 "pavement:1" "tropical"
hex 6667 0 "pavement:1;fluff:71:71" "tropical"
Expand Down Expand Up @@ -9673,7 +9680,7 @@ hex 7076 0 "bldg_elev:2;pavement:1:36;bldg_fluff:2;building:1:0;bldg_cf:100" "tr
hex 7176 0 "pavement:1;jungle:1;foliage_elev:2" "tropical"
hex 7276 0 "pavement:1:8;road:1" "tropical"
hex 7376 0 "pavement:1:8;road:1" "tropical"
hex 7476 0 "bldg_elev:3;pavement:1;building:4;bldg_cf:100" "grass"
hex 7476 0 "bldg_elev:3;pavement:1;building:4:0;bldg_cf:100" "grass"
hex 7576 0 "bldg_elev:2;pavement:1;bldg_fluff:4:1;building:3:0;bldg_cf:50" "tropical"
hex 7676 0 "pavement:1" "tropical"
hex 7776 0 "pavement:1:8;road:1" "tropical"
Expand Down Expand Up @@ -10157,7 +10164,7 @@ hex 4280 0 "" "tropical"
hex 4380 0 "pavement:1" "tropical"
hex 4480 0 "pavement:1" "tropical"
hex 4580 0 "pavement:1;jungle:1;foliage_elev:2" "tropical"
hex 4680 0 "bldg_elev:3;pavement:1;bldg_fluff:18;building:4;bldg_cf:100" "grass"
hex 4680 0 "bldg_elev:3;pavement:1;bldg_fluff:18;building:4:0;bldg_cf:100" "grass"
hex 4780 0 "pavement:1;road:1;fluff:5:6" "tropical"
hex 4880 0 "pavement:1:8;road:1" "tropical"
hex 4980 0 "bldg_elev:2;bldg_class:1;pavement:1:36;building:1:35;bldg_cf:100" "tropical"
Expand Down Expand Up @@ -10188,7 +10195,7 @@ hex 7380 0 "pavement:1;road:1;fluff:5:3" "tropical"
hex 7480 0 "bldg_elev:3;pavement:1:36;bldg_fluff:20:0;building:3:0;bldg_cf:200" "tropical"
hex 7580 0 "pavement:1" "tropical"
hex 7680 0 "pavement:1" "tropical"
hex 7780 0 "fuel_tank_cf:5;fuel_tank_elev:2;fuel_tank_magn:60;pavement:1;fuel_tank:3" "tropical"
hex 7780 0 "fuel_tank_cf:5;fuel_tank_elev:2;fuel_tank_magn:60;pavement:1;fuel_tank:3:0" "tropical"
hex 7880 0 "pavement:1" "tropical"
hex 7980 0 "pavement:1:8;road:1" "tropical"
hex 8080 0 "pavement:1;jungle:1;foliage_elev:2" "tropical"
Expand Down Expand Up @@ -10950,7 +10957,7 @@ hex 6786 0 "pavement:1:8;road:1" "tropical"
hex 6886 0 "bldg_elev:1;pavement:1:36;building:3:0;bldg_cf:50" "tropical"
hex 6986 0 "pavement:1:8;road:1" "tropical"
hex 7086 0 "bldg_elev:2;pavement:1:36;building:1:0;bldg_cf:200" "tropical"
hex 7186 0 "bldg_elev:3;pavement:1;building:4;bldg_cf:100" "grass"
hex 7186 0 "bldg_elev:3;pavement:1;building:4:0;bldg_cf:100" "grass"
hex 7286 0 "pavement:1" "tropical"
hex 7386 0 "pavement:1" "tropical"
hex 7486 0 "pavement:1" "tropical"
Expand Down Expand Up @@ -11339,7 +11346,7 @@ hex 7289 0 "pavement:1:3;fluff:92:4" "tropical"
hex 7389 0 "pavement:1:8;road:1" "tropical"
hex 7489 0 "pavement:1:8;road:1" "tropical"
hex 7589 0 "bldg_elev:3;pavement:1;bldg_fluff:51:7;building:4:35;bldg_cf:100" "grass"
hex 7689 0 "bldg_elev:2;pavement:1;bldg_fluff:16:1;building:3;bldg_cf:50" "tropical"
hex 7689 0 "bldg_elev:2;pavement:1;bldg_fluff:16:1;building:3:0;bldg_cf:50" "tropical"
hex 7789 0 "pavement:1:8;road:1" "tropical"
hex 7889 0 "pavement:1;jungle:1;foliage_elev:2" "tropical"
hex 7989 0 "pavement:1" "tropical"
Expand Down Expand Up @@ -11722,7 +11729,7 @@ hex 7192 0 "pavement:1;jungle:1;foliage_elev:2" "tropical"
hex 7292 0 "pavement:1;jungle:1;foliage_elev:2" "tropical"
hex 7392 0 "pavement:1:8;road:1" "tropical"
hex 7492 0 "pavement:1:8;road:1" "tropical"
hex 7592 0 "bldg_elev:3;pavement:1:36;bldg_fluff:10;building:3;bldg_cf:200" "tropical"
hex 7592 0 "bldg_elev:3;pavement:1:36;bldg_fluff:10;building:3:0;bldg_cf:200" "tropical"
hex 7692 0 "pavement:1:8;road:1" "tropical"
hex 7792 0 "bldg_elev:1;pavement:1:36;building:4:0;bldg_cf:50" "tropical"
hex 7892 0 "pavement:1;jungle:1;foliage_elev:2" "tropical"
Expand Down Expand Up @@ -13105,7 +13112,7 @@ hex 46103 0 "jungle:1:18;foliage_elev:2" "tropical"
hex 47103 0 "road:1" "tropical"
hex 48103 0 "pavement:1:8;road:1" "tropical"
hex 49103 0 "pavement:1" "tropical"
hex 50103 0 "bldg_elev:2;pavement:1;bldg_fluff:16:1;building:3;bldg_cf:50" "tropical"
hex 50103 0 "bldg_elev:2;pavement:1;bldg_fluff:16:1;building:3:0;bldg_cf:50" "tropical"
hex 51103 0 "pavement:1:8;road:1" "tropical"
hex 52103 0 "pavement:1:8;road:1" "tropical"
hex 53103 0 "pavement:1:8;road:1" "tropical"
Expand Down Expand Up @@ -15549,7 +15556,7 @@ hex 58122 0 "pavement:1" "tropical"
hex 59122 0 "pavement:1;jungle:1;foliage_elev:2" "tropical"
hex 60122 0 "pavement:1" "tropical"
hex 61122 0 "pavement:1" "tropical"
hex 62122 0 "bldg_elev:3;pavement:1:36;bldg_fluff:10;building:3;bldg_cf:200" "tropical"
hex 62122 0 "bldg_elev:3;pavement:1:36;bldg_fluff:10;building:3:0;bldg_cf:200" "tropical"
hex 63122 0 "pavement:1:8;road:1" "tropical"
hex 64122 0 "bldg_elev:2;pavement:1:36;bldg_fluff:1;building:2:8;bldg_cf:50" "tropical"
hex 65122 0 "pavement:1:8;road:1" "tropical"
Expand Down Expand Up @@ -16063,7 +16070,7 @@ hex 60126 0 "pavement:1;jungle:1;foliage_elev:2" "tropical"
hex 61126 0 "pavement:1;jungle:1;foliage_elev:2" "tropical"
hex 62126 0 "pavement:1;jungle:1;foliage_elev:2" "tropical"
hex 63126 0 "pavement:1;jungle:1;foliage_elev:2" "tropical"
hex 64126 0 "bldg_elev:3;pavement:1:36;bldg_fluff:10;building:3;bldg_cf:200" "tropical"
hex 64126 0 "bldg_elev:3;pavement:1:36;bldg_fluff:10;building:3:0;bldg_cf:200" "tropical"
hex 65126 0 "pavement:1:8;road:1:11" "tropical"
hex 66126 0 "pavement:1;jungle:1;foliage_elev:2" "tropical"
hex 67126 0 "pavement:1:8;road:1" "tropical"
Expand Down Expand Up @@ -18747,7 +18754,7 @@ hex 56147 0 "pavement:1:8;road:1:18" "tropical"
hex 57147 0 "pavement:1:8;road:1" "tropical"
hex 58147 0 "bldg_elev:2;pavement:1:36;bldg_fluff:21:0;building:2:0;bldg_cf:150" "tropical"
hex 59147 0 "pavement:1" "tropical"
hex 60147 0 "bldg_elev:3;pavement:1:36;bldg_fluff:10;building:3;bldg_cf:200" "tropical"
hex 60147 0 "bldg_elev:3;pavement:1:36;bldg_fluff:10;building:3:0;bldg_cf:200" "tropical"
hex 61147 0 "pavement:1:8;road:1" "tropical"
hex 62147 0 "" "tropical"
hex 63147 0 "" "tropical"
Expand Down
2 changes: 2 additions & 0 deletions megamek/docs/history.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ MEGAMEK VERSION HISTORY:
+ Fix #5542: Fixing the game not progressing to a round that has reinforcements
+ PR #5550: The default state of Edge usage is now "true" (also in MHQ)
+ PR #5549: ModelRecord unit analysis has been upgraded and expanded
+ Fix #5556: Fixing Nameplates
+ Fix #5394: Fixing a logo file name

0.49.19.1 (2024-05-14 1800 UTC)
+ Milestone Release. Backported fixes.
Expand Down

0 comments on commit ab32854

Please sign in to comment.