diff --git a/data/ai/micro_ais/scenarios/scenario_micro_ai.cfg b/data/ai/micro_ais/scenarios/scenario_micro_ai.cfg
index f7c56d0767fd..2c6a183aeaab 100644
--- a/data/ai/micro_ais/scenarios/scenario_micro_ai.cfg
+++ b/data/ai/micro_ais/scenarios/scenario_micro_ai.cfg
@@ -5,7 +5,7 @@
     name= _ "Micro AI Tests"
     next_scenario=null
 
-    map_data="{multiplayer/maps/Dark_Forecast.map}"
+    map_data="{multiplayer/maps/Dark_Forecast_basic.map}"
 
     {DEFAULT_SCHEDULE}
     turns=-1
diff --git a/data/ai/micro_ais/scenarios/simple_attack.cfg b/data/ai/micro_ais/scenarios/simple_attack.cfg
index ef64584d5862..b33d789412a1 100644
--- a/data/ai/micro_ais/scenarios/simple_attack.cfg
+++ b/data/ai/micro_ais/scenarios/simple_attack.cfg
@@ -5,7 +5,7 @@
     name= _ "Simple Attack"
     next_scenario=micro_ai_test
 
-    map_data="{multiplayer/maps/Dark_Forecast.map}"
+    map_data="{multiplayer/maps/Dark_Forecast_basic.map}"
 
     {DEFAULT_SCHEDULE}
     turns=-1
diff --git a/data/multiplayer/maps/Dark_Forecast.map b/data/multiplayer/maps/Dark_Forecast.map
deleted file mode 100644
index 5616753f2e2f..000000000000
--- a/data/multiplayer/maps/Dark_Forecast.map
+++ /dev/null
@@ -1,24 +0,0 @@
-_off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr
-_off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr
-_off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr
-_off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr
-_off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr
-_off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr
-_off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, Ai, _off^_usr
-_off^_usr, Xv, Xv, Xv, Xv, Xv, Xv, Xv, Xv, Xv, Xv, Xv, Xv, Xv, Xv, Xv, Xv, _off^_usr, Ai, _off^_usr, Ai, _off^_usr
-_off^_usr, Ww^Vm, Ww, Gs^Fp, Mm, Hh, Gs^Fp, Re, Gs^Fp, Ss, Ss, Ss, Ss, Ds, Ds, Ss, Mm^Xm, Xu, Xu, Ai, Ai, _off^_usr
-_off^_usr, Ww, Ww, Mm, Mm, Mm, Re, Re, Gg, Ss^Vhs, Gs^Fp, Gs^Fp, Ds, Ds, Re^Uf, Ss, Mm^Xm, Xu, Cud, Xu, Ai, _off^_usr
-_off^_usr, Mm, Gs^Fp, Ww, Ww, Gg, Gg, Re, Gg, Hh, Gs^Fp, Hh, Gg, Gg^Vh, Gg, Re^Uf, Mm^Xm, Xu, Cud, Xu, Ai, _off^_usr
-_off^_usr, Hh, Gs, Gs^Ft, Gs, Wwf, Wwf, Gg, Gg, Hh, Gg, Gg, Gg, Gg, Re, Re, Mm^Xm, Xu, Cud, Xu, Ai, _off^_usr
-_off^_usr, Gs^Vht, Re, Gs, Gs^Ft, Gs, Ss^Vhs, Ds, Hh, Gg, Gg, Gg, Re, Re, Ch, Ch, Mm^Xm, Xu, Cud, Xu, Ai, _off^_usr
-_off^_usr, Re, Re, Re, Gs^Ft, Ds, Ss, Wwf, Gg, Gg, Re, Re, Ch, Ch, Re^Gvs, Ch, Mm^Xm, Xu, Cud, Xu, Ai, _off^_usr
-_off^_usr, Gg, Hh, Re, Re, Hh, Gs^Fp, Wwf, Gg, Gg, Re, Ch, Gg^Efm, Re^Gvs, Gg, 4 Kh, Mm^Xm, Xu, Cud, Xu, Ai, _off^_usr
-_off^_usr, Gg, Gg^Vh, Re^Uf, Re, Gg, Gg, Gg, Ww, Gg, Re, Gg^Ve, Re^Gvs, Gg, Re^Gvs, Gg^Vh, Mm^Xm, Xu, Cud, Xu, Ai, _off^_usr
-_off^_usr, Gg, Gs^Fp, Hh, Re, Re, Gg, Mm, Ww, Gg, Re, Ch, Ch, Re^Gvs, Gg^Efm, 3 Kh, Mm^Xm, Xu, Cud, Xu, Ai, _off^_usr
-_off^_usr, Gg, Gg, Gg, Mm, Re, Gg, Ds, Ww, Gs^Fp, Gg, Re, Re, Ch, Ch, Ch, Mm^Xm, Xu, Cud, Xu, Ai, _off^_usr
-_off^_usr, Gg, Gg, Gs^Fp, Hh, Re, Gg^Ve, Gs^Fp, Mm, Ww, Gg, Gg, Gs^Fp, Re, Re, Ch, Mm^Xm, Xu, Cud, Xu, Ai, _off^_usr
-_off^_usr, Gg, Gs^Ft, Gg, Gg, Re, Re, Gg, Gs^Fp, Ww, Gg, Gs^Fp, Gg, Gg, Gg, Re, Mm^Xm, Xu, Cud, Xu, Ai, _off^_usr
-_off^_usr, Gs^Ft, Hd, Dd, Dd, Gg, Gg, Re, Ss^Bw\, Ss, Gg, Gg, Hh, Gg, Gg, Hh, Mm^Xm, Xu, Cud, Xu, Ai, _off^_usr
-_off^_usr, Dd, Md, Dd^Do, Dd, Dd, Dd, Gs^Ft, Ss, Re, Gg, Mm, Ww, Wwf, Gg, Hh, Mm^Xm, Xu, Xu, Xu, Ai, _off^_usr
-_off^_usr, Md, Dd^Dc, Hd, Dd, Dd^Vda, Gs^Ft, Hh, Ss, Re, Re, Mm, Ww, Gg^Ve, Gs^Fp, Gg^Fet, Mm^Xm, Xu, Ai, Ai, Ai, _off^_usr
-_off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr, _off^_usr
diff --git a/data/multiplayer/maps/Dark_Forecast_basic.map b/data/multiplayer/maps/Dark_Forecast_basic.map
new file mode 100644
index 000000000000..22804199f5c8
--- /dev/null
+++ b/data/multiplayer/maps/Dark_Forecast_basic.map
@@ -0,0 +1,17 @@
+Ww, Ww, Ww, Gg, Mm, Hh, Re, Gg, Ss, Ss, Ss, Ss, Ss, Ds, Ds, Ss, Mm^Xm, Ai, Ai, Ai, Ai
+Ww, Ww^Vm, Ww, Gs^Fp, Mm, Hh, Gs^Fp, Re, Gs^Fp, Ss, Ss, Ss, Ss, Ds, Ds, Ss, Mm^Xm, Xu, Xu, Ai, Ai
+Hh, Ww, Ww, Mm, Mm, Mm, Re, Re, Gg, Ss^Vhs, Gs^Fp, Gs^Fp, Ds, Ds, Re^Uf, Ss, Mm^Xm, Xu, Cud, Xu, Ai
+Hh, Mm, Gs^Fp, Ww, Ww, Gg, Gg, Re, Gg, Hh, Gs^Fp, Hh, Gg, Gg^Vh, Gg, Re^Uf, Mm^Xm, Xu, Cud, Xu, Ai
+Gs, Hh, Gs, Gs^Ft, Gs, Wwf, Wwf, Gg, Gg, Hh, Gg, Gg, Gg, Gg, Re, Re, Mm^Xm, Xu, Cud, Xu, Ai
+Re, Gs^Vht, Re, Gs, Gs^Ft, Gs, Ss^Vhs, Ds, Hh, Gg, Gg, Gg, Re, Re, Ch, Ch, Mm^Xm, Xu, Cud, Xu, Ai
+Gg, Re, Re, Re, Gs^Ft, Ds, Ss, Wwf, Gg, Gg, Re, Re, Ch, Ch, Re^Gvs, Ch, Mm^Xm, Xu, Cud, Xu, Ai
+Gg, Gg, Hh, Re, Re, Hh, Gs^Fp, Wwf, Gg, Gg, Re, Ch, Gg^Efm, Re^Gvs, Gg, 4 Kh, Mm^Xm, Xu, Cud, Xu, Ai
+Gg, Gg, Gg^Vh, Re^Uf, Re, Gg, Gg, Gg, Ww, Gg, Re, Gg^Ve, Re^Gvs, Gg, Re^Gvs, Gg^Vh, Mm^Xm, Xu, Cud, Xu, Ai
+Gg, Gg, Gs^Fp, Hh, Re, Re, Gg, Mm, Ww, Gg, Re, Ch, Ch, Re^Gvs, Gg^Efm, 3 Kh, Mm^Xm, Xu, Cud, Xu, Ai
+Gg, Gg, Gg, Gg, Mm, Re, Gg, Ds, Ww, Gs^Fp, Gg, Re, Re, Ch, Ch, Ch, Mm^Xm, Xu, Cud, Xu, Ai
+Gg, Gg, Gg, Gs^Fp, Hh, Re, Gg^Ve, Gs^Fp, Mm, Ww, Gg, Gg, Gs^Fp, Re, Re, Ch, Mm^Xm, Xu, Cud, Xu, Ai
+Gs^Ft, Gg, Gs^Ft, Gg, Gg, Re, Re, Gg, Gs^Fp, Ww, Gg, Gs^Fp, Gg, Gg, Gg, Re, Mm^Xm, Xu, Cud, Xu, Ai
+Gs^Ft, Gs^Ft, Hd, Dd, Dd, Gg, Gg, Re, Ss^Bw\, Ss, Gg, Gg, Hh, Gg, Gg, Hh, Mm^Xm, Xu, Cud, Xu, Ai
+Dd, Dd, Md, Dd^Do, Dd, Dd, Dd, Gs^Ft, Ss, Re, Gg, Mm, Ww, Wwf, Gg, Hh, Mm^Xm, Xu, Xu, Xu, Ai
+Md, Md, Dd^Dc, Hd, Dd, Dd^Vda, Gs^Ft, Hh, Ss, Re, Re, Mm, Ww, Gg^Ve, Gs^Fp, Gg^Fet, Mm^Xm, Xu, Ai, Ai, Ai
+Md, Md, Dd, Dd, Dd, Dd, Hd, Gs^Ft, Ss, Ss, Re, Ww, Ww, Ww, Gs^Fp, Gs^Fp, Mm^Xm, Ai, Ai, Ai, Ai
diff --git a/data/multiplayer/maps/Dark_Forecast_basic.mask b/data/multiplayer/maps/Dark_Forecast_basic.mask
deleted file mode 100644
index 46886c213178..000000000000
--- a/data/multiplayer/maps/Dark_Forecast_basic.mask
+++ /dev/null
@@ -1,22 +0,0 @@
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
-_s, _s, _s, _s, _s, _s, _s, Gs, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, Ai
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, Ai, _s, Ai
-Ww^Vm, Ww, Gs^Fp, Mm, Hh, Gs^Fp, Re, Gs^Fp, Ss, Ss, Ss, Ss, Ds, Ds, Ss, Mm^Xm, Xu, Xu, Ai, Ai
-Ww, Ww, Mm, Mm, Mm, Re, Re, Gg, Ss^Vhs, Gs^Fp, Gs^Fp, Ds, Ds, Re^Uf, Ss, Mm^Xm, Xu, Cud, Xu, Ai
-Mm, Gs^Fp, Ww, Ww, Gg, Gg, Re, Gg, Hh, Gs^Fp, Hh, Gg, Gg^Vh, Gg, Re^Uf, Mm^Xm, Xu, Cud, Xu, Ai
-Hh, Gs, Gs^Ft, Gs, Wwf, Wwf, Gg, Gg, Hh, Gg, Gg, Gg, Gg, Re, Re, Mm^Xm, Xu, Cud, Xu, Ai
-Gs^Vht, Re, Gs, Gs^Ft, Gs, Ss^Vhs, Ds, Hh, Gg, Gg, Gg, Re, Re, Ch, Ch, Mm^Xm, Xu, Cud, Xu, Ai
-Re, Re, Re, Gs^Ft, Ds, Ss, Wwf, Gg, Gg, Re, Re, Ch, Ch, Re^Gvs, Ch, Mm^Xm, Xu, Cud, Xu, Ai
-Gg, Hh, Re, Re, Hh, Gs^Fp, Wwf, Gg, Gg, Re, Ch, Gg^Efm, Re^Gvs, Gg, Kh, Mm^Xm, Xu, Cud, Xu, Ai
-Gg, Gg^Vh, Re^Uf, Re, Gg, Gg, Gg, Ww, Gg, Re, Gg^Ve, Re^Gvs, Gg, Re^Gvs, Gg^Vh, Mm^Xm, Xu, Cud, Xu, Ai
-Gg, Gs^Fp, Hh, Re, Re, Gg, Mm, Ww, Gg, Re, Ch, Ch, Re^Gvs, Gg^Efm, Kh, Mm^Xm, Xu, Cud, Xu, Ai
-Gg, Gg, Gg, Mm, Re, Gg, Ds, Ww, Gs^Fp, Gg, Re, Re, Ch, Ch, Ch, Mm^Xm, Xu, Cud, Xu, Ai
-Gg, Gg, Gs^Fp, Hh, Re, Gg^Ve, Gs^Fp, Mm, Ww, Gg, Gg, Gs^Fp, Re, Re, Ch, Mm^Xm, Xu, Cud, Xu, Ai
-Gg, Gs^Ft, Gg, Gg, Re, Re, Gg, Gs^Fp, Ww, Gg, Gs^Fp, Gg, Gg, Gg, Re, Mm^Xm, Xu, Cud, Xu, Ai
-Gs^Ft, Hd, Dd, Dd, Gg, Gg, Re, Ss^Bw\, Ss, Gg, Gg, Hh, Gg, Gg, Hh, Mm^Xm, Xu, Cud, Xu, Ai
-Dd, Md, Dd^Do, Dd, Dd, Dd, Gs^Ft, Ss, Re, Gg, Mm, Ww, Wwf, Gg, Hh, Mm^Xm, Xu, Xu, Xu, Ai
-Md, Dd^Dc, Hd, Dd, Dd^Vda, Gs^Ft, Hh, Ss, Re, Re, Mm, Ww, Gg^Ve, Gs^Fp, Gg^Fet, Mm^Xm, Xu, Ai, Ai, Ai
diff --git a/data/multiplayer/maps/Dark_Forecast_drought.map b/data/multiplayer/maps/Dark_Forecast_drought.map
new file mode 100644
index 000000000000..110f831d68a2
--- /dev/null
+++ b/data/multiplayer/maps/Dark_Forecast_drought.map
@@ -0,0 +1,17 @@
+Wwf, Wwf, Wwf, Re, Mm, Hh, Re, Re, Re, Re^Uf, Re^Uf, Re, Ds, Ds, Ds, _s, Mm^Xm, Ai, Ai, Ai, Ai
+Wwf, Ww^Vm, Wwf, Gs^Fp, Mm, Hh, Re^Uf, Re, Re^Uf, Re, Re, Re, Dd^Do, Ds, Ds, Re, Mm^Xm, Xu, Xu, Ai, Ai
+Hh, Wwf, Wwf, Mm, Mm, Mm, Re, Re, Re, Ss^Vhs, Re^Uf, Re^Uf, Ds, Ds, Re^Uf, Re, Mm^Xm, Xu, Cud, Xu, Ai
+Hh, Mm, Gs^Fp, Wwf, Wwf, Ds, Re, Re, Gs, Hh, Gs^Fp, Hh, Gs, Gg^Vh, Ds, Re^Uf, Mm^Xm, Xu, Cud, Xu, Ai
+Re, Hh, Re, Re^Uf, Re, Wwf, Wwf, Gs, Gs, Hh, Gs, Gs, Re, Ds, Re, Re, Mm^Xm, Xu, Cud, Xu, Ai
+Re, Gs^Vht, Re, Re, Re^Uf, Re, Ss^Vhs, Ds, Hh, Gs, Re, Re, Re, Re, Ch, Ch, Mm^Xm, Xu, Cud, Xu, Ai
+Dd, Re, Re, Re, Re^Uf, Ds, Re, Ds, Gs, Re, Re, Re, Ch, Ch, Re, Ch, Mm^Xm, Xu, Cud, Xu, Ai
+Dd, Ds, Hd, Re, Re, Hh, Re^Uf, Ds, Gs, Re, Re, Ch, Re, Re, Re, Kh, Mm^Xm, Xu, Cud, Xu, Ai
+Dd, Dd, Gg^Vh, Re^Uf, Re, Re, Re, Gs, Wwf, Re, Re, Gg^Ve, Re, Re, Re, Gg^Vh, Mm^Xm, Xu, Cud, Xu, Ai
+Dd, Dd, Dd^Dr, Hd, Rd, Re, Re, Mm, Wwf, Re, Re, Ch, Ch, Re, Re, Kh, Mm^Xm, Xu, Cud, Xu, Ai
+Dd^Dr, Dd, Rd, Rd, Md, Re, Re, Ds, Wwf, Re^Uf, Re, Re, Re, Ch, Ch, Ch, Mm^Xm, Xu, Cud, Xu, Ai
+Dd, Dd, Rd, Dd^Dr, Hd, Re, Gg^Ve, Gs^Fp, Mm, Wwf, Gs, Re, Re^Uf, Re, Re, Ch, Mm^Xm, Xu, Cud, Xu, Ai
+Dd, Dd, Rd, Dd, Dd, Rd, Rd, Rd, Gs^Fp, Wwf, Gs, Gs^Fp, Gs, Re, Re, Re, Mm^Xm, Xu, Cud, Xu, Ai
+Dd, Dd^Dr, Hd, Rd, Dd, Dd, Rd, Dd, Dd^Do, Re, Gs, Gs, Hh, Gs, Gs, Hh, Mm^Xm, Xu, Cud, Xu, Ai
+Dd^Ftd, Dd, Md, Dd^Do, Dd, Dd, Dd, Dd, Dd, Re, Gs, Mm, Wwf, Ds, Gs, Hh, Mm^Xm, Xu, Xu, Xu, Ai
+Md, Md, Dd^Dc, Hd, Dd, Dd^Vda, Dd^Dr, Hd, Dd, Re, Re, Mm, Wwf, Gg^Ve, Gs^Fp, Re^Uf, Mm^Xm, Xu, Ai, Ai, Ai
+Md, Md, Dd, Dd, Dd, Dd, Dd, Dd, Dd, Dd, Re, Wwf, Wwf, Wwf, Re^Uf, Gs^Fp, Mm^Xm, Ai, Ai, Ai, Ai
diff --git a/data/multiplayer/maps/Dark_Forecast_drought.mask b/data/multiplayer/maps/Dark_Forecast_drought.mask
deleted file mode 100644
index 2ff0d8c4d696..000000000000
--- a/data/multiplayer/maps/Dark_Forecast_drought.mask
+++ /dev/null
@@ -1,22 +0,0 @@
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
-_s, _s, _s, _s, _s, _s, _s, Dd, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, Ai
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, Ai, _s, Ai
-Ww^Vm, Wwf, Gs^Fp, Mm, Hh, Re^Uf, Re, Re^Uf, Re, Re, Re, Dd^Do, Ds, Ds, Re, Mm^Xm, Xu, Ai, Ai, Ai
-Wwf, Wwf, Mm, Mm, Mm, Re, Re, Re, Ss^Vhs, Re^Uf, Re^Uf, Ds, Ds, Re^Uf, Re, Mm^Xm, Xu, Xu, Ai, Ai
-Mm, Gs^Fp, Wwf, Wwf, Ds, Re, Re, Gs, Hh, Gs^Fp, Hh, Gs, Gg^Vh, Ds, Re^Uf, Mm^Xm, Xu, Cud, Xu, Ai
-Hh, Re, Re^Uf, Re, Wwf, Wwf, Gs, Gs, Hh, Gs, Gs, Re, Ds, Re, Re, Mm^Xm, Xu, Cud, Xu, Ai
-Gs^Vht, Re, Re, Re^Uf, Re, Ss^Vhs, Ds, Hh, Gs, Re, Re, Re, Re, Ch, Ch, Mm^Xm, Xu, Cud, Xu, Ai
-Re, Re, Re, Re^Uf, Ds, Re, Ds, Gs, Re, Re, Re, Ch, Ch, Re, Ch, Mm^Xm, Xu, Cud, Xu, Ai
-Ds, Hd, Re, Re, Hh, Re^Uf, Ds, Gs, Re, Re, Ch, Re, Re, Re, Kh, Mm^Xm, Xu, Cud, Xu, Ai
-Ds, Gg^Vh, Re^Uf, Re, Re, Re, Gs, Wwf, Re, Re, Gg^Ve, Re, Re, Re, Gg^Vh, Mm^Xm, Xu, Cud, Xu, Ai
-Dd, Dd^Dr, Hd, Rd, Re, Re, Mm, Wwf, Re, Re, Ch, Ch, Re, Re, Kh, Mm^Xm, Xu, Cud, Xu, Ai
-Dd, Rd, Rd, Md, Re, Re, Ds, Wwf, Re^Uf, Re, Re, Re, Ch, Ch, Ch, Mm^Xm, Xu, Cud, Xu, Ai
-Dd, Rd, Dd^Dr, Hd, Re, Gg^Ve, Gs^Fp, Mm, Wwf, Gs, Re, Re^Uf, Re, Re, Ch, Mm^Xm, Xu, Cud, Xu, Ai
-Dd, Rd, Dd, Dd, Rd, Rd, Rd, Gs^Fp, Wwf, Gs, Gs^Fp, Gs, Re, Re, Re, Mm^Xm, Xu, Cud, Xu, Ai
-Dd^Dr, Hd, Rd, Dd, Dd, Rd, Dd, Dd^Do, Re, Gs, Gs, Hh, Gs, Gs, Hh, Mm^Xm, Xu, Cud, Xu, Ai
-Dd, Md, Dd^Do, Dd, Dd, Dd, Dd, Dd, Re, Gs, Mm, Wwf, Ds, Gs, Hh, Mm^Xm, Xu, Xu, Xu, Ai
-Md, Dd^Dc, Hd, Dd, Dd^Vda, Dd^Dr, Hd, Dd, Re, Re, Mm, Wwf, Gg^Ve, Gs^Fp, Re^Uf, Mm^Xm, Xu, Ai, Ai, Ai
diff --git a/data/multiplayer/maps/Dark_Forecast_firstsnow.map b/data/multiplayer/maps/Dark_Forecast_firstsnow.map
new file mode 100644
index 000000000000..a5fb79d9e1e9
--- /dev/null
+++ b/data/multiplayer/maps/Dark_Forecast_firstsnow.map
@@ -0,0 +1,17 @@
+Ww, Ww, Ww, _s, Ms, Ha, Aa, Aa, Ss, Ss, Ss, Ss, Ss, Ds, Ds, Ss, Mm^Xm, Ai, Ai, Ai, Ai
+Ww, Ww^Vm, Ww, Aa^Fpa, Mm, Ha, Aa^Fpa, Aa, Gs^Fp, Ss, Ss, Ss, Ss, Ds, Ds, Ss, Mm^Xm, Xu, Xu, Ai, Ai
+Ha, Ww, Ww, Mm, Mm, Mm, Re, Re, Gg, Ss^Vhs, Aa^Fpa, Gs^Fp, Ds, Ds, Aa, Ss, Mm^Xm, Xu, Cud, Xu, Ai
+Hh, Mm, Gs^Fp, Ww, Ww, Aa, Gg, Re, Aa, Ha, Aa^Fpa, Ha, Gg, Aa^Vha, Aa, Re^Uf, Mm^Xm, Xu, Cud, Xu, Ai
+Gg, Hh, Gs, Gs^Ft, Aa, Ai, Ai, Gg, Gg, Ha, Aa, Gg, Gg, Gg, Re, Re, Mm^Xm, Xu, Cud, Xu, Ai
+Gg, Gs^Vht, Re, Gs, Gs^Ft, Aa, Ss^Vhs, Aa, Hh, Gg, Gg, Gg, Re, Re, Ch, Ch, Mm^Xm, Xu, Cud, Xu, Ai
+Gg, Re, Re, Re, Gs^Ft, Aa, Ss, Ai, Gg, Gg, Re, Re, Ch, Ch, Re^Gvs, Ch, Mm^Xm, Xu, Cud, Xu, Ai
+Aa, Aa, Ha, Re, Re, Ha, Aa^Fpa, Ai, Gg, Gg, Re, Ch, Aa, Re^Gvs, Aa, Kh, Mm^Xm, Xu, Cud, Xu, Ai
+Gg, Aa, Aa^Vha, Re^Uf, Re, Gg, Gg, Gg, Ww, Aa, Aa, Aa^Vea, Re^Gvs, Aa, Re^Gvs, Aa^Vha, Mm^Xm, Xu, Cud, Xu, Ai
+Aa, Gg, Aa^Fpa, Ha, Re, Re, Gg, Mm, Ww, Aa, Re, Ch, Ch, Re^Gvs, Aa, Kh, Mm^Xm, Xu, Cud, Xu, Ai
+Aa, Gg, Gg, Gg, Mm, Re, Gg, Ds, Ww, Aa^Fpa, Gg, Re, Re, Ch, Ch, Ch, Mm^Xm, Xu, Cud, Xu, Ai
+Aa, Aa, Gg, Aa^Fpa, Ha, Re, Gg^Ve, Gs^Fp, Mm, Ai, Gg, Gg, Gs^Fp, Re, Re, Ch, Mm^Xm, Xu, Cud, Xu, Ai
+Aa, Aa, Gs^Ft, Gg, Gg, Re, Re, Gg, Gs^Fp, Ww, Gg, Gs^Fp, Gg, Aa, Aa, Re, Mm^Xm, Xu, Cud, Xu, Ai
+Aa^Fpa, Gs^Ft, Hd, Dd, Dd, Gg, Gg, Re, Ss^Bw\, Ss, Gg, Gg, Hh, Gg, Gg, Ha, Mm^Xm, Xu, Cud, Xu, Ai
+Aa, Dd, Md, Dd^Do, Dd, Dd, Dd, Gs^Ft, Ss, Re, Gg, Mm, Ww, Ai, Gg, Hh, Mm^Xm, Xu, Xu, Xu, Ai
+Ms, Md, Dd^Dc, Hd, Dd, Dd^Vda, Gs^Ft, Hh, Ss, Re, Re, Mm, Ww, Aa^Vha, Aa^Fpa, Gg^Fet, Mm^Xm, Xu, Ai, Ai, Ai
+Md, Md, Dd, Dd, Dd, Dd, Aa, Aa, Ss, Ss, Re, Ww, Ww, Ww, Aa, Aa^Fpa, Mm^Xm, Ai, Ai, Ai, Ai
diff --git a/data/multiplayer/maps/Dark_Forecast_firstsnow.mask b/data/multiplayer/maps/Dark_Forecast_firstsnow.mask
deleted file mode 100644
index 47661cd24e39..000000000000
--- a/data/multiplayer/maps/Dark_Forecast_firstsnow.mask
+++ /dev/null
@@ -1,22 +0,0 @@
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
-_s, _s, _s, _s, _s, _s, _s, Ai, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, Ai
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, Ai, _s, Ai
-Ww^Vm, Ww, Aa^Fpa, Mm, Ha, Aa^Fpa, Aa, Gs^Fp, Ss, Ss, Ss, Ss, Ds, Ds, Ss, Mm^Xm, Xu, Ai, Ai, Ai
-Ww, Ww, Mm, Mm, Mm, Re, Re, Gg, Ss^Vhs, Aa^Fpa, Gs^Fp, Ds, Ds, Aa, Ss, Mm^Xm, Xu, Xu, Ai, Ai
-Mm, Gs^Fp, Ww, Ww, Aa, Gg, Re, Aa, Ha, Aa^Fpa, Ha, Gg, Aa^Vha, Aa, Re^Uf, Mm^Xm, Xu, Cud, Xu, Ai
-Hh, Gs, Gs^Ft, Aa, Ai, Ai, Gg, Gg, Ha, Aa, Gg, Gg, Gg, Re, Re, Mm^Xm, Xu, Cud, Xu, Ai
-Gs^Vht, Re, Gs, Gs^Ft, Aa, Ss^Vhs, Aa, Hh, Gg, Gg, Gg, Re, Re, Ch, Ch, Mm^Xm, Xu, Cud, Xu, Ai
-Re, Re, Re, Gs^Ft, Aa, Ss, Ai, Gg, Gg, Re, Re, Ch, Ch, Re^Gvs, Ch, Mm^Xm, Xu, Cud, Xu, Ai
-Aa, Ha, Re, Re, Ha, Aa^Fpa, Ai, Gg, Gg, Re, Ch, Aa, Re^Gvs, Aa, Kh, Mm^Xm, Xu, Cud, Xu, Ai
-Aa, Aa^Vha, Re^Uf, Re, Gg, Gg, Gg, Ww, Aa, Aa, Aa^Vea, Re^Gvs, Aa, Re^Gvs, Aa^Vha, Mm^Xm, Xu, Cud, Xu, Ai
-Gg, Aa^Fpa, Ha, Re, Re, Gg, Mm, Ww, Aa, Re, Ch, Ch, Re^Gvs, Aa, Kh, Mm^Xm, Xu, Cud, Xu, Ai
-Gg, Gg, Gg, Mm, Re, Gg, Ds, Ww, Aa^Fpa, Gg, Re, Re, Ch, Ch, Ch, Mm^Xm, Xu, Cud, Xu, Ai
-Aa, Gg, Aa^Fpa, Ha, Re, Gg^Ve, Gs^Fp, Mm, Ai, Gg, Gg, Gs^Fp, Re, Re, Ch, Mm^Xm, Xu, Cud, Xu, Ai
-Aa, Gs^Ft, Gg, Gg, Re, Re, Gg, Gs^Fp, Ww, Gg, Gs^Fp, Gg, Aa, Aa, Re, Mm^Xm, Xu, Cud, Xu, Ai
-Gs^Ft, Hd, Dd, Dd, Gg, Gg, Re, Ss^Bw\, Ss, Gg, Gg, Hh, Gg, Gg, Ha, Mm^Xm, Xu, Cud, Xu, Ai
-Dd, Md, Dd^Do, Dd, Dd, Dd, Gs^Ft, Ss, Re, Gg, Mm, Ww, Ai, Gg, Hh, Mm^Xm, Xu, Xu, Xu, Ai
-Md, Dd^Dc, Hd, Dd, Dd^Vda, Gs^Ft, Hh, Ss, Re, Re, Mm, Ww, Aa^Vha, Aa^Fpa, Gg^Fet, Mm^Xm, Xu, Ai, Ai, Ai
diff --git a/data/multiplayer/maps/Dark_Forecast_rain.map b/data/multiplayer/maps/Dark_Forecast_rain.map
new file mode 100644
index 000000000000..28c3fc703b1c
--- /dev/null
+++ b/data/multiplayer/maps/Dark_Forecast_rain.map
@@ -0,0 +1,17 @@
+Wo, Wo, Wo, Ss, Mm, Gs^Fp, Re, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Mm^Xm, Xu, Ai, Ai, Ai
+Wo, Ww^Vm, Wo, Gs^Fp, Mm, Hh, Gs^Fp, Re, Gs^Fp, Ss, Ss, Ss, Ss, Ds, Ss, Ss, Mm^Xm, Xu, Xu, Ai, Ai
+Hh, Wo, Wo, Mm, Mm, Mm, Re, Re, Ss, Ss^Vhs, Gs^Fp, Gs^Fp, Ss, Ds, Ss, Ss, Mm^Xm, Xu, Cud, Xu, Ai
+Hh, Mm, Gs^Fp, Wo, Wo, Wwf, Wwf, Re, Wwf, Hh, Gs^Fp, Hh, Ss, Gg^Vh, Ss, Re^Uf, Mm^Xm, Xu, Cud, Xu, Ai
+Gg, Hh, Wwf, Gs^Ft, Wwf, Ww, Ww, Wwf, Wwf, Hh, Ww, Ww, Gg^Efm, Re^Gvs, Re^Gvs, Re^Gvs, Mm^Xm, Xu, Cud, Xu, Ai
+Gg, Gs^Vht, Re, Wwf, Gs^Ft, Ww, Ss^Vhs, Wwf, Hh, Gg^Efm, Wwf, Wwf, Gg^Efm, Re^Gvs, Ch, Ch, Mm^Xm, Xu, Cud, Xu, Ai
+Gg, Re, Re, Re, Gs^Ft, Wwf, Wwf, Ww, Ww, Gg^Efm, Gg^Efm, Gg^Efm, Ch, Ch, Re^Gvs, Ch, Mm^Xm, Xu, Cud, Xu, Ai
+Gg, Gg^Efm, Hh, Re, Re, Hh, Gs^Fp, Ww, Wwf, Gg^Efm, Re^Gvs, Ch, Gg^Efm, Re^Gvs, Gg^Efm, Kh, Mm^Xm, Xu, Cud, Xu, Ai
+Gg, Gg, Gg^Vh, Re^Uf, Re, Wwf, Wwf, Wwf, Wo, Gg^Efm, Re^Gvs, Gg^Ve, Re^Gvs, Re^Gvs, Re^Gvs, Gg^Vh, Mm^Xm, Xu, Cud, Xu, Ai
+Gg, Gg^Efm, Gs^Fp, Hh, Wwf, Wwf, Gg^Efm, Mm, Wo, Wwf, Re^Gvs, Ch, Ch, Re^Gvs, Gg^Efm, Kh, Mm^Xm, Xu, Cud, Xu, Ai
+Ww, Ww, Ww, Wwf, Mm, Re, Gg^Efm, Wwf, Wo, Gs^Fp, Wwf, Re^Gvs, Re^Gvs, Ch, Ch, Ch, Mm^Xm, Xu, Cud, Xu, Ai
+Ww, Ww, Gg^Efm, Gs^Fp, Hh, Re, Gg^Ve, Gs^Fp, Mm, Wo, Wwf, Gg^Efm, Gs^Fp, Re^Gvs, Re^Gvs, Ch, Mm^Xm, Xu, Cud, Xu, Ai
+Wwf, Gg^Efm, Gs^Ft, Gg^Efm, Gg^Efm, Re, Re, Gg^Efm, Gs^Fp, Wo, Wwf, Gs^Fp, Wwf, Gg^Efm, Gg^Efm, Re^Gvs, Mm^Xm, Xu, Cud, Xu, Ai
+Gs^Ft, Gs^Ft, Hh, Gs, Gs, Gg^Efm, Ss, Ss, Ss^Bw\, Ss, Gg^Efm, Wwf, Hh, Wwf, Wwf, Hh, Mm^Xm, Xu, Cud, Xu, Ai
+Gg, Gs, Mm, Dd^Do, Dd, Gs, Ss, Gs^Ft, Ss, Re, Gg^Efm, Mm, Wo, Ww, Wwf, Hh, Mm^Xm, Xu, Xu, Xu, Ai
+Mm, Mm, Wwf, Hh, Gs, Dd^Vda, Gs^Ft, Hh, Ss, Re, Re, Mm, Wo, Gg^Ve, Gs^Fp, Gg^Fet, Mm^Xm, Xu, Ai, Ai, Ai
+Mm, Mm, Gg, Gg, Gg, Gg, Gg, Ss, Ss, Ss, Re, Wo, Wo, Ww, Gs^Fp, Gs^Fp, Mm^Xm, Xu, Ai, Ai, Ai
diff --git a/data/multiplayer/maps/Dark_Forecast_rain.mask b/data/multiplayer/maps/Dark_Forecast_rain.mask
deleted file mode 100644
index 2701c7143b55..000000000000
--- a/data/multiplayer/maps/Dark_Forecast_rain.mask
+++ /dev/null
@@ -1,22 +0,0 @@
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
-_s, _s, _s, _s, _s, _s, _s, Ss, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, Ai
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, Ai, _s, Ai
-Ww^Vm, Wo, Gs^Fp, Mm, Hh, Gs^Fp, Re, Gs^Fp, Ss, Ss, Ss, Ss, Ds, Ss, Ss, Mm^Xm, Xu, Ai, Ai, Ai
-Wo, Wo, Mm, Mm, Mm, Re, Re, Ss, Ss^Vhs, Gs^Fp, Gs^Fp, Ss, Ds, Ss, Ss, Mm^Xm, Xu, Xu, Ai, Ai
-Mm, Gs^Fp, Wo, Wo, Wwf, Wwf, Re, Wwf, Hh, Gs^Fp, Hh, Ss, Gg^Vh, Ss, Re^Uf, Mm^Xm, Xu, Cud, Xu, Ai
-Hh, Wwf, Gs^Ft, Wwf, Ww, Ww, Wwf, Wwf, Hh, Ww, Ww, Gg^Efm, Re^Gvs, Re^Gvs, Re^Gvs, Mm^Xm, Xu, Cud, Xu, Ai
-Gs^Vht, Re, Wwf, Gs^Ft, Ww, Ss^Vhs, Wwf, Hh, Gg^Efm, Wwf, Wwf, Gg^Efm, Re^Gvs, Ch, Ch, Mm^Xm, Xu, Cud, Xu, Ai
-Re, Re, Re, Gs^Ft, Wwf, Wwf, Ww, Ww, Gg^Efm, Gg^Efm, Gg^Efm, Ch, Ch, Re^Gvs, Ch, Mm^Xm, Xu, Cud, Xu, Ai
-Gg^Efm, Hh, Re, Re, Hh, Gs^Fp, Ww, Wwf, Gg^Efm, Re^Gvs, Ch, Gg^Efm, Re^Gvs, Gg^Efm, Kh, Mm^Xm, Xu, Cud, Xu, Ai
-Gg^Efm, Gg^Vh, Re^Uf, Re, Wwf, Wwf, Wwf, Wo, Gg^Efm, Re^Gvs, Gg^Ve, Re^Gvs, Re^Gvs, Re^Gvs, Gg^Vh, Mm^Xm, Xu, Cud, Xu, Ai
-Gg^Efm, Gs^Fp, Hh, Wwf, Wwf, Gg^Efm, Mm, Wo, Wwf, Re^Gvs, Ch, Ch, Re^Gvs, Gg^Efm, Kh, Mm^Xm, Xu, Cud, Xu, Ai
-Ww, Ww, Wwf, Mm, Re, Gg^Efm, Wwf, Wo, Gs^Fp, Wwf, Re^Gvs, Re^Gvs, Ch, Ch, Ch, Mm^Xm, Xu, Cud, Xu, Ai
-Ww, Gg^Efm, Gs^Fp, Hh, Re, Gg^Ve, Gs^Fp, Mm, Wo, Wwf, Gg^Efm, Gs^Fp, Re^Gvs, Re^Gvs, Ch, Mm^Xm, Xu, Cud, Xu, Ai
-Gg^Efm, Gs^Ft, Gg^Efm, Gg^Efm, Re, Re, Gg^Efm, Gs^Fp, Wo, Wwf, Gs^Fp, Wwf, Gg^Efm, Gg^Efm, Re^Gvs, Mm^Xm, Xu, Cud, Xu, Ai
-Gs^Ft, Hh, Gs, Gs, Gg^Efm, Ss, Ss, Ss^Bw\, Ss, Gg^Efm, Wwf, Hh, Wwf, Wwf, Hh, Mm^Xm, Xu, Cud, Xu, Ai
-Gs, Mm, Dd^Do, Dd, Gs, Ss, Gs^Ft, Ss, Re, Gg^Efm, Mm, Wo, Ww, Wwf, Hh, Mm^Xm, Xu, Xu, Xu, Ai
-Mm, Wwf, Hh, Gs, Dd^Vda, Gs^Ft, Hh, Ss, Re, Re, Mm, Wo, Gg^Ve, Gs^Fp, Gg^Fet, Mm^Xm, Xu, Ai, Ai, Ai
diff --git a/data/multiplayer/maps/Dark_Forecast_secondsnow.map b/data/multiplayer/maps/Dark_Forecast_secondsnow.map
new file mode 100644
index 000000000000..cb39c3ed4866
--- /dev/null
+++ b/data/multiplayer/maps/Dark_Forecast_secondsnow.map
@@ -0,0 +1,17 @@
+Ai, Ai, Ha, _s, Ms, Ha, Aa, Aa, Aa, Ai, Ai, Ai, Ai, Ai, Aa, Ai, Mm^Xm, _s, Ai, Ai, Ai
+Ai, Ww^Vm, Ai, Aa^Fpa, Mm, Ha, Aa^Fpa, Aa, Aa^Fpa, Ai, Ss, Ai, Ai, Aa, Aa, Ai, Mm^Xm, Xu, Xu, Ai, Ai
+Ha, Ai, Ai, Mm, Mm, Mm, Re, Re, Aa, Ss^Vhs, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Ai, Mm^Xm, Xu, Cud, Xu, Ai
+Ha, Mm, Aa^Fpa, Ai, Ai, Aa, Gg, Re, Aa, Ha, Aa^Fpa, Ha, Aa, Aa^Vha, Aa, Aa, Mm^Xm, Xu, Cud, Xu, Ai
+Gg, Ha, Aa, Aa^Fpa, Aa, Ai, Ai, Gg, Gg, Ha, Aa, Gg, Aa, Gg, Aa, Aa, Mm^Xm, Xu, Cud, Xu, Ai
+Re, Gs^Vht, Re, Aa, Aa^Fpa, Aa, Ss^Vhs, Aa, Ha, Gg, Gg, Gg, Re, Re, Ch, Ch, Mm^Xm, Xu, Cud, Xu, Ai
+Aa, Re, Re, Aa, Aa^Fpa, Aa, Ai, Ai, Aa, Aa, Re, Re, Ch, Ch, Re, Ch, Mm^Xm, Xu, Cud, Xu, Ai
+Aa, Aa, Ha, Re, Re, Ha, Aa^Fpa, Ai, Gg, Gg, Re, Ch, Aa, Re, Aa, Kh, Mm^Xm, Xu, Cud, Xu, Ai
+Aa, Aa, Aa^Vha, Aa, Re, Aa, Gg, Gg, Ai, Aa, Aa, Aa^Vea, Re, Aa, Re, Aa^Vha, Mm^Xm, Xu, Cud, Xu, Ai
+Aa, Gg, Aa^Fpa, Ha, Re, Re, Aa, Mm, Ai, Aa, Re, Ch, Ch, Re, Aa, Kh, Mm^Xm, Xu, Cud, Xu, Ai
+Aa, Gg, Gg, Gg, Mm, Re, Aa, Aa, Ai, Aa^Fpa, Gg, Re, Re, Ch, Ch, Ch, Mm^Xm, Xu, Cud, Xu, Ai
+Aa, Aa, Gg, Aa^Fpa, Ha, Re, Aa^Vea, Aa^Fpa, Mm, Ai, Gg, Aa, Aa^Fpa, Aa, Aa, Ch, Mm^Xm, Xu, Cud, Xu, Ai
+Aa, Aa, Aa^Fpa, Gg, Aa, Re, Re, Aa, Aa^Fpa, Ai, Gg, Aa^Fpa, Gg, Aa, Aa, Aa, Mm^Xm, Xu, Cud, Xu, Ai
+Aa^Fpa, Aa^Fpa, Ha, Aa, Aa, Aa, Aa, Re, Ss^Bw\, Ai, Gg, Gg, Ha, Gg, Gg, Ha, Mm^Xm, Xu, Cud, Xu, Ai
+Aa, Aa, Md, Dd^Do, Dd, Dd, Aa, Aa^Fpa, Ai, Re, Aa, Mm, Ai, Ai, Gg, Ha, Mm^Xm, Xu, Xu, Xu, Ai
+Ms, Md, Dd^Dc, Hd, Dd, Dd^Vda, Aa^Fpa, Ha, Ai, Aa, Aa, Mm, Ai, Aa^Vha, Aa^Fpa, Aa^Fpa, Mm^Xm, Xu, Ai, Ai, Ai
+Md, Md, Dd, Dd, Dd, Dd, Gg, Aa^Fpa, Ai, Aa, Aa, Ai, Ai, Ai, Aa^Fpa, Aa^Fpa, Mm^Xm, Ai, Ai, Ai, Ai
diff --git a/data/multiplayer/maps/Dark_Forecast_secondsnow.mask b/data/multiplayer/maps/Dark_Forecast_secondsnow.mask
deleted file mode 100644
index d1c7c8ce3cae..000000000000
--- a/data/multiplayer/maps/Dark_Forecast_secondsnow.mask
+++ /dev/null
@@ -1,22 +0,0 @@
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
-_s, _s, _s, _s, _s, _s, _s, Aa, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, Ai
-_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, Ai, _s, Ai
-Ww^Vm, Ai, Aa^Fpa, Mm, Ha, Aa^Fpa, Aa, Aa^Fpa, Ai, Ss, Ai, Ai, Aa, Aa, Ai, Mm^Xm, Xu, Ai, Ai, Ai
-Ai, Ai, Mm, Mm, Mm, Re, Re, Aa, Ss^Vhs, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Ai, Mm^Xm, Xu, Xu, Ai, Ai
-Mm, Aa^Fpa, Ai, Ai, Aa, Gg, Re, Aa, Ha, Aa^Fpa, Ha, Aa, Aa^Vha, Aa, Aa, Mm^Xm, Xu, Cud, Xu, Ai
-Ha, Aa, Aa^Fpa, Aa, Ai, Ai, Gg, Gg, Ha, Aa, Gg, Aa, Gg, Aa, Aa, Mm^Xm, Xu, Cud, Xu, Ai
-Gs^Vht, Re, Aa, Aa^Fpa, Aa, Ss^Vhs, Aa, Ha, Gg, Gg, Gg, Re, Re, Ch, Ch, Mm^Xm, Xu, Cud, Xu, Ai
-Re, Re, Aa, Aa^Fpa, Aa, Ai, Ai, Aa, Aa, Re, Re, Ch, Ch, Re, Ch, Mm^Xm, Xu, Cud, Xu, Ai
-Aa, Ha, Re, Re, Ha, Aa^Fpa, Ai, Gg, Gg, Re, Ch, Aa, Re, Aa, Kh, Mm^Xm, Xu, Cud, Xu, Ai
-Aa, Aa^Vha, Aa, Re, Aa, Gg, Gg, Ai, Aa, Aa, Aa^Vea, Re, Aa, Re, Aa^Vha, Mm^Xm, Xu, Cud, Xu, Ai
-Gg, Aa^Fpa, Ha, Re, Re, Aa, Mm, Ai, Aa, Re, Ch, Ch, Re, Aa, Kh, Mm^Xm, Xu, Cud, Xu, Ai
-Gg, Gg, Gg, Mm, Re, Aa, Aa, Ai, Aa^Fpa, Gg, Re, Re, Ch, Ch, Ch, Mm^Xm, Xu, Cud, Xu, Ai
-Aa, Gg, Aa^Fpa, Ha, Re, Aa^Vea, Aa^Fpa, Mm, Ai, Gg, Aa, Aa^Fpa, Aa, Aa, Ch, Mm^Xm, Xu, Cud, Xu, Ai
-Aa, Aa^Fpa, Gg, Aa, Re, Re, Aa, Aa^Fpa, Ai, Gg, Aa^Fpa, Gg, Aa, Aa, Aa, Mm^Xm, Xu, Cud, Xu, Ai
-Aa^Fpa, Ha, Aa, Aa, Aa, Aa, Re, Ss^Bw\, Ai, Gg, Gg, Ha, Gg, Gg, Ha, Mm^Xm, Xu, Cud, Xu, Ai
-Aa, Md, Dd^Do, Dd, Dd, Aa, Aa^Fpa, Ai, Re, Aa, Mm, Ai, Ai, Gg, Ha, Mm^Xm, Xu, Xu, Xu, Ai
-Md, Dd^Dc, Hd, Dd, Dd^Vda, Gs^Ft, Ha, Ai, Aa, Aa, Mm, Ai, Aa^Vha, Aa^Fpa, Aa^Fpa, Mm^Xm, Xu, Ai, Ai, Ai
diff --git a/data/multiplayer/scenarios/2p_Dark_Forecast.cfg b/data/multiplayer/scenarios/2p_Dark_Forecast.cfg
index f68eba520ebf..7c51b976a954 100644
--- a/data/multiplayer/scenarios/2p_Dark_Forecast.cfg
+++ b/data/multiplayer/scenarios/2p_Dark_Forecast.cfg
@@ -8,7 +8,7 @@
 Note: You need to use the default map settings for the scenario to work right."
     turns="45"
     experience_modifier="100"
-    map_data="{multiplayer/maps/Dark_Forecast.map}"
+    map_data="{multiplayer/maps/Dark_Forecast_basic.map}"
     victory_when_enemies_defeated=no
     define=MULTIPLAYER_2P_DARK_FORECAST_LOAD
 
@@ -55,7 +55,7 @@ Note: You need to use the default map settings for the scenario to work right."
             side=1,2
             [not]
                 x=1-15
-                y=8-22
+                y=1-15
             [/not]
         [/filter]
     [/store_unit]
@@ -107,7 +107,7 @@ Note: You need to use the default map settings for the scenario to work right."
             side=1,2
             [not]
                 x=1-15
-                y=8-22
+                y=1-15
             [/not]
         [/filter]
     [/store_unit]
@@ -176,7 +176,7 @@ Note: You need to use the default map settings for the scenario to work right."
 #enddef
 
 #define SPAWN_UNIT SIDE TYPE ID TIER_NUMBER NUMBER
-    {VARIABLE y "$(21-{NUMBER})"} # 10 + 11 - NUMBER
+    {VARIABLE y "$(15-{NUMBER})"} # 10 + 11 - NUMBER
     {VARIABLE x 18}
     {VARIABLE this_tier {TIER_NUMBER}}
     [if]
@@ -276,7 +276,7 @@ Note: You need to use the default map settings for the scenario to work right."
                             random_traits=no
                             name="none"
                             x=20
-                            y=22
+                            y=15
                             to_variable=advancement
                         [/unit]
                         {VARIABLE upgrade_cost $advancement.cost}
@@ -351,7 +351,7 @@ Note: You need to use the default map settings for the scenario to work right."
                 [have_unit]
                     side=1,2
                     x=1-15
-                    y=8-22
+                    y=1-15
                 [/have_unit]
             [/not]
         [/filter_condition]
@@ -837,7 +837,7 @@ Note: You need to use the default map settings for the scenario to work right."
         mask={NAME}
         x=1
         y=1
-        border=no
+        border=yes
     [/terrain_mask]
 #enddef
 
@@ -859,7 +859,7 @@ Note: You need to use the default map settings for the scenario to work right."
         [case]
             value=4
             # second snow
-            {WEATHER_MAP "{multiplayer/maps/Dark_Forecast_secondsnow.mask}"}
+            {WEATHER_MAP "{multiplayer/maps/Dark_Forecast_secondsnow.map}"}
             [sound]
                 name=bat-flapping.wav
             [/sound]
@@ -869,7 +869,7 @@ Note: You need to use the default map settings for the scenario to work right."
         [case]
             value=3
             # first snow
-            {WEATHER_MAP "{multiplayer/maps/Dark_Forecast_firstsnow.mask}"}
+            {WEATHER_MAP "{multiplayer/maps/Dark_Forecast_firstsnow.map}"}
             [sound]
                 name=wail.wav
             [/sound]
@@ -879,7 +879,7 @@ Note: You need to use the default map settings for the scenario to work right."
         [case]
             value=2
             # heavy rains
-            {WEATHER_MAP "{multiplayer/maps/Dark_Forecast_rain.mask}"}
+            {WEATHER_MAP "{multiplayer/maps/Dark_Forecast_rain.map}"}
             [sound]
                 name=magic-faeriefire-miss.ogg
             [/sound]
@@ -895,7 +895,7 @@ Note: You need to use the default map settings for the scenario to work right."
         [case]
             value=1
             # drought
-            {WEATHER_MAP "{multiplayer/maps/Dark_Forecast_drought.mask}"}
+            {WEATHER_MAP "{multiplayer/maps/Dark_Forecast_drought.map}"}
             [sound]
                 name=gryphon-shriek-1.ogg
             [/sound]
@@ -904,7 +904,7 @@ Note: You need to use the default map settings for the scenario to work right."
 
         [else]
             # clear weather
-            {WEATHER_MAP "{multiplayer/maps/Dark_Forecast_basic.mask}"}
+            {WEATHER_MAP "{multiplayer/maps/Dark_Forecast_basic.map}"}
             [sound]
                 name=magic-holy-miss-2.ogg
             [/sound]
@@ -1071,10 +1071,10 @@ Note: You need to use the default map settings for the scenario to work right."
         {SET_TIMID_AI_AND_BOLD_AI 2 1}
         {VARIABLE location 0}
         {VARIABLE turn_limit 40}
-        {DEFINE_SPAWN_LOCATION "3-14" "22"} #south
-        {DEFINE_SPAWN_LOCATION "1" "11-20"} #west
-        {DEFINE_SPAWN_LOCATION "2-13" "8"} #north
-        {DEFINE_SPAWN_LOCATION "1" "9-22"} #west
+        {DEFINE_SPAWN_LOCATION "3-14" "15"} #south
+        {DEFINE_SPAWN_LOCATION "1" "4-13"} #west
+        {DEFINE_SPAWN_LOCATION "2-13" "1"} #north
+        {DEFINE_SPAWN_LOCATION "1" "2-15"} #west
 
         {VARIABLE main_group 0}
 
@@ -1167,17 +1167,17 @@ Note: You need to use the default map settings for the scenario to work right."
 
         {VARIABLE fixed_group 0}
 
-        {DEFINE_FIXED_GROUP 1 22}
+        {DEFINE_FIXED_GROUP 1 15}
         {ADD_FIXED_SPAWN "Fire Dragon"}
         {ADD_FIXED_SPAWN "Gryphon Master"}
         {ADD_FIXED_SPAWN "Hurricane Drake"}
 
-        {DEFINE_FIXED_GROUP 5 8}
+        {DEFINE_FIXED_GROUP 5 1}
         {ADD_FIXED_SPAWN "Yeti"}
         {ADD_FIXED_SPAWN "Elvish Druid"}
         {ADD_FIXED_SPAWN "Elvish Druid"}
 
-        {DEFINE_FIXED_GROUP 1 14}
+        {DEFINE_FIXED_GROUP 1 7}
         {ADD_FIXED_SPAWN "Lich"}
         {ADD_FIXED_SPAWN "Walking Corpse"}
         {ADD_FIXED_SPAWN "Walking Corpse"}
@@ -1188,7 +1188,7 @@ Note: You need to use the default map settings for the scenario to work right."
         {ADD_FIXED_SPAWN "Walking Corpse"}
         {ADD_FIXED_SPAWN "Walking Corpse"}
 
-        {DEFINE_FIXED_GROUP 11 22}
+        {DEFINE_FIXED_GROUP 11 15}
         {ADD_FIXED_SPAWN "Elvish Champion"}
         {ADD_FIXED_SPAWN "Dwarvish Stalwart"}
         {ADD_FIXED_SPAWN "Dwarvish Stalwart"}