diff --git a/changelog b/changelog
index e7ec2cfa8b4..98cb6a19cb7 100644
--- a/changelog
+++ b/changelog
@@ -49,6 +49,9 @@ Version 1.9.9+svn:
* Allowed function debug.traceback()
* wesnoth.set_village_owner takes a bool argument determining
whether to fire capture events
+ * Multiplayer:
+ * New map: Aethermaw
+ * Updated maps: Hamlets, Howling Ghost Badlands, Thousand Stings Garrison
* Terrain:
* Oasis may be placed on any terrain, aliased to base
* New terrain macro: MOUNTAIN_SINGLE_RANDOM
diff --git a/data/multiplayer/maps/2p_Hamlets.map b/data/multiplayer/maps/2p_Hamlets.map
index 9e54eae293f..f1e9e971e0e 100644
--- a/data/multiplayer/maps/2p_Hamlets.map
+++ b/data/multiplayer/maps/2p_Hamlets.map
@@ -4,30 +4,30 @@ usage=map
Mm , Wwf , Wwf , Gs^Fp , Hh^Fp , Hh , Mm , Hh , Gs^Fp , Hh , Gs^Fp , Gs^Fp , Hh , Hh , Wwf , Wwf , Hh , Hh , Mm , Gs^Fp , Wwf , Hh , Gs^Fp , Mm , Mm , Mm , Mm , Mm , Mm
Hh^Fp , Hh^Fp , Wwf , Mm , Hh^Uf , Hh^Fms , Gg^Fms , Hh^Fms , Gs^Fp , Hh , Hh , Gg , Gs^Fms , Gs^Fp , Wwf , Wwf , Mm , Gs^Fms , Gs^Fms , Wwf , Wwf , Hh , Hh , Hh^Fp , Gs^Fms , Mm , Mm , Mm^Xm , Mm
Wwf , Gg^Uf , Gg , Wwf , Wwf , Hh , Gg^Vh , Gg^Efm , Gg , Mm , Hh , Gg , Gg , Gg , Wwf , Wwf , Wwf , Hh , Wwf , Wwf , Gg^Efm , Gs^Fp , Mm , Hh , Mm , Hh , Gg^Efm , Mm , Wwf
-Mm , Wwf , Wwf , Gg , Hh , Wwf , Gg , Gg , Gg , Gg , Gg , Gg , Wwf , Wwf , Hh , Wwf , Gg , Wwf , Gg , Gg , Gg^Uf , Hh , Wwf , Wwf , Wwf , Hh , Wwf , Wwf , Wwf
+Mm , Wwf , Wwf , Gg^Fms , Hh , Wwf , Gg , Gg , Gg , Gg , Gg , Gg , Wwf , Wwf , Hh , Wwf , Gg , Wwf , Gg , Gg , Gg^Uf , Hh , Wwf , Wwf , Wwf , Hh , Wwf , Wwf , Wwf
Mm , Mm^Xm , Wwf , Mm , Gg , Wwf , Wwf , Wwf , Wwf , Gg , Wwf , Wwf , Gg , Wwf , 1 Kh , Gg^Fp , Ch , Gg , Gg , Gg , Wwf , Wwf , Gg^Fp , Gg^Fms , Hh , Wwf , Gg , Hh^Fms , Mm
-Mm , Mm , Wwf , Wwf , Hh , Gg , Gg^Fp , Gg^Fms , Wwf , Wwf , Gg , Gg^Vh , Gg , Ch , Ch , Ch , Wwf , Ch , Wwf , Wwf , Gs^Fp , Gg^Vh , Re^Gvs , Re^Gvs , Re^Gvs , Re^Uf , Gg , Hh , Mm
-Wwf , Wwf , Wwf , Wwf , Wwf , Gg^Vh , Wwf , Wwf , Gg^Fms , Gg , Re^Gvs , Re^Gvs , Gg , Ch , Wwf , Wwf , Gg , Wwf , Gg , Mm , Gg , Gg , Re^Gvs , Re^Gvs , Gg^Wm , Re^Gvs , Re^Gvs , Hh^Fp , Hh
+Mm , Mm , Wwf , Wwf , Hh , Gg , Gg^Fp , Gg^Fms , Wwf , Wwf , Gg , Gg^Vh , Gg , Gg , Ch , Ch , Wwf , Ch , Wwf , Wwf , Gs^Fp , Gg^Vh , Re^Gvs , Re^Gvs , Re^Gvs , Re^Uf , Gg , Hh , Mm
+Wwf , Wwf , Wwf , Wwf , Wwf , Gg^Vh , Wwf , Wwf , Gg^Fms , Gg , Re^Gvs , Re^Gvs , Ch , Ch , Wwf , Wwf , Gg , Wwf , Gg , Mm , Gg , Gg , Re^Gvs , Re^Gvs , Gg^Wm , Re^Gvs , Re^Gvs , Hh^Fp , Hh
Wwf , Wwf , Gs^Fp , Mm , Hh , Wwf , Gg , Hh , Re^Gvs , Re^Gvs , Gg , Gg , Wwf , Wwf , Wwf , Gs^Fms , Mm , Hh , Gg , Gg , Re^Gvs , Re^Gvs , Hh , Gg^Fms , Gg^Efm , Gs^Fp , Gg , Gg , Gg
-Hh^Fms , Gg , Gg^Efm , Hh^Uf , Hh^Fp , Gs^Fms , Gg , Gg , Gg , Gg , Wwf , Wwf , Hh , Kh , Wwf , Gs^Fp , Gg , Gg , Re^Gvs , Re^Gvs , Gg , Gg , Gg , Gg , Gg , Gg , Gs^Fp , Gg , Gg
-Mm , Hh^Fms , Gg , Hh , Mm , Gg , Wwf , Wwf , Wwf , Wwf , Gg , Mm , Gg , Wwf , Wwf , Gg , Gg , Gg , Gg , Re^Gvs , Gg , Gg , Gs^Fp , Gg , Gg , Hh^Fms , Mm , Hh^Uf , Hh
-Hh^Fms , Gg^Uf , Wwf , Wwf , Wwf , Wwf , Gs^Fms , Gg , Gg , Gg , Gg , Gg , Ss^Vhs , Wwf , Ww , Gg , Gg^Efm , Gg , Ch , Gg , Wwf , Gg^Vh , Hh , Gg^Uf , Wwf , Gg , Hh^Fp , Gg^Uf , Gg
-Wwf , Wwf , Gg , Gg , Hh , Hh , Hh^Fds , Gg^Vh , Gg , Gg , Gg , Gg , Ss , Hh , Ww , Gs^Fms , Mm , Gs^Fp , Wwf , Wwf , Gg , Wwf , Wwf , Wwf , Gg , Wwf , Wwf , Wwf , Wwf
-Gg , Gg , Gg^Efm , Gg , Gg , Gg^Wm , Gg , Gg^Efm , Gg , Gg , Gg , Gg , Hh^Uf , Wwf , Ww , Hh , Wwf , Wwf , Gg , Gg , Hh^Fds , Gg , Gg , Gg , Gg , Gg , Gg , Mm , Hh^Fms
-Hh , Hh , Ch , Hh^Fds , Re^Gvs , Re^Gvs , Re^Gvs , Gg , Re^Gvs , Re^Gvs , Gg , Gg^Uf , Mm , Gs^Fp , Ww , Wo , Wwf , Gg , Gg , Hh , Gg^Uf , Gg^Fms , Gg , Gg , Gs^Fp , Gg , Gg , Hh^Fms , Hh^Fds
-Hh , Gg^Uf , Gg , Re^Gvs , Gg , Re^Gvs , Ch , Re^Gvs , Re^Gvs , Re^Gvs , Gg , Hh , Wwf , Wwf , Gg , Gg^Efm , Gg^Fms , Wwf , Gg , Hh , Gg , Gg^Efm , Hh^Fms , Gg , Gg , Gg^Uf , Gg , Gs^Fms , Mm
-Mm , Gg , Gg , Gg , Gg , Mm , Hh^Fms , Ch , Gg , Gg , Gg , Wwf , Gg^Fp , Gg^Uf , Gg , Gg^Uf , Wwf , Wwf , Gg , Gg , Re^Gvs , Ch , Ch , Mm , Gg , Gg , Gg , Hh^Fms , Hh
-Hh^Fds , Gg^Fms , Gg , Gg^Uf , Gs^Fp , Gg , Gg , Gg^Efm , Gg^Uf , Hh , Gg , Wwf , Wwf , Gg^Efm , Ww , Wwf , Mm , Hh , Gg , Re^Gvs , Re^Gvs , Re^Gvs , Re^Gvs , Re^Gvs , Re^Gvs , Re^Gvs , Ch , Gg^Uf , Hh
-Hh^Fms , Hh^Fms , Gg^Efm , Gg , Gg , Gg , Gg , Gg^Fp , Hh^Fds , Hh , Gg , Gg , Wwf , Wo , Ww , Gs^Fp , Hh^Uf , Gg^Uf , Gg , Re^Gvs , Gg , Gg , Gg , Re^Gvs , Gg , Hh^Fds , Gg , Hh , Gg
-Wwf , Mm , Wwf , Gg , Gg , Gg , Wwf , Gg , Gg , Gg , Wwf , Wwf , Mm , Hh , Ww , Wwf , Ss , Gg , Gg , Gg , Gg , Gg^Efm , Hh^Fds , Gg^Wm , Hh , Gg , Gg , Gg , Wwf
-Gg , Wwf , Hh^Fp , Wwf , Wwf , Wwf , Hh , Wwf , Wwf , Wwf , Ch , Gs^Fms , Gg , Gs^Fp , Ww , Hh , Ss^Vhs , Gg , Gg , Gg , Gg , Gg^Vh , Gs^Fms , Hh , Wwf , Gg , Wwf , Wwf , Hh^Fms
-Hh , Gg^Uf , Mm , Gg , Gg , Gg^Uf , Gs^Fp , Gg^Vh , Gg , Gg , Gg , Gg^Efm , Gg , Gg , Wwf , Wwf , Gg , Gg , Gg , Gg , Wwf , Gg , Wwf , Wwf , Mm , Wwf , Gg , Gg^Uf , Mm
-Gg^Efm , Hh^Uf , Gs^Fp , Hh^Fms , Gg , Gg , Gg , Gg , Gg , Re^Gvs , Re^Gvs , Gg , Gg , Gg , Wwf , Wwf , Hh , Mm , Wwf , Wwf , Gg , Wwf , Gg , Gg^Efm , Hh^Fp , Hh , Gg , Hh^Fds , Hh^Fds
-Gg , Gg , Gg , Gg^Efm , Gg , Gg , Hh , Gg , Re^Gvs , Re^Gvs , Gg , Gg , Mm , Gs^Fms , Wwf , Kh , Wwf , Wwf , Gg , Gg , Re^Gvs , Gg , Gg , Gs^Fp , Hh , Hh^Uf , Gs^Fp , Gg , Wwf
-Hh , Gg , Re^Gvs , Gs^Fp , Gg^Wm , Gg^Fms , Re^Gvs , Re^Gvs , Gg , Gg , Gg , Hh , Gg , Gg^Fms , Wwf , Wwf , Gg , Gg , Re^Gvs , Re^Gvs , Gg^Fp , Hh , Wwf , Wwf , Wwf , Mm , Wwf , Wwf , Wwf
+Hh^Fms , Gg , Gg^Efm , Hh^Uf , Hh^Fp , Gs^Fms , Gg , Gg , Gg , Gg , Wwf , Wwf , Hh^Fms , Wwf , Wwf , Gg^Fp , Gg , Gg , Re^Gvs , Re^Gvs , Gg , Gg , Gg , Gg , Gg , Gg , Gs^Fp , Gg , Hh
+Mm , Hh^Fms , Gg , Hh , Mm , Gg , Wwf , Wwf , Wwf , Wwf , Gg , Mm , Gg , Gg , Wwf , Wwf , Gg , Gg , Gg , Re^Gvs , Gg , Gg , Gg^Fms , Gg , Gg , Hh^Fms , Mm , Hh^Uf , Hh
+Hh^Fms , Gg^Uf , Wwf , Wwf , Wwf , Wwf , Gs^Fms , Gg , Gg , Gg , Gg , Gg , Ss^Vhs , Gg , Ww , Gg , Gg^Efm , Gg , Ch , Gg , Wwf , Gs^Vh , Hh , Gg^Uf , Gg , Gg , Hh^Fp , Hh , Hh
+Wwf , Wwf , Hh , Gg , Gg , Hh , Hh^Fds , Gg^Vh , Gg , Gg , Gg , Gg^Efm , Ss , Hh , Ww , Gs^Fms , Mm , Gs^Fp , Wwf , Wwf , Gg , Wwf , Wwf , Gg , Wwf , Wwf , Wwf , Wwf , Wwf
+Gg^Fp , Gg^Fms , Gg^Efm , Gg , Gg , Gg^Wm , Gg , Gg^Efm , Gg , Gg , Gg , Gg , Hh , Wwf , Ww , Hh , Wwf , Wwf , Gg , Gg , Gg^Efm , Gg , Gg , Wwf , Gg , Gg , Gg , Mm , Hh^Fms
+Hh , Hh , Ch , Hh^Fds , Re^Gvs , Re^Gvs , Re^Gvs , Gg , Gg^Fms , Gg , Gg , Hh^Uf , Mm , Gs^Fp , Ww , Wo , Wwf , Gg , Gg , Hh^Fms , Gg^Uf , Gg , Gg , Gg , Gs^Fp , Gg , Gg , Hh^Fms , Hh^Fds
+Hh , Gg^Uf , Gg , Re^Gvs , Gg , Re^Gvs , Ch , Hh , Gg , Gg , Gg , Hh , Wwf , Wwf , Gg , Gg^Efm , Gg^Fms , Wwf , Gg , Hh , Gg , Gg , Hh^Fms , Gg^Efm , Gg , Gg^Uf , Gg , Gs^Fp , Mm
+Mm , Gg , Gg , Gg , Gg , Mm , Hh^Fms , Ch , Gg^Efm , Gg , Gg , Wwf , Gg^Fp , Gg^Uf , Gg , Gg^Uf , Wwf , Wwf , Gg , Gg , Gg , Ch , Ch , Mm , Gg , Gg , Gg , Hh^Fms , Hh
+Hh^Fds , Gg^Fms , Gg , Gg^Uf , Gs^Fp , Gg^Efm , Gg , Gg , Gg^Uf , Hh , Gg , Wwf , Wwf , Gg^Efm , Ww , Wwf , Mm , Hh , Gg , Gg , Gg^Fms , Hh , Re^Gvs , Re^Gvs , Re^Gvs , Re^Gvs , Ch , Gg^Uf , Hh
+Hh^Fms , Hh^Fms , Gg^Efm , Gg , Gg , Gg , Gg , Gg , Gg , Hh^Fms , Gg , Gg , Wwf , Wo , Ww , Gs^Fp , Hh , Hh^Uf , Gg , Gg , Gg , Gg , Gg , Re^Gvs , Gg , Hh^Fds , Gg , Hh , Gg^Fms
+Wwf , Mm , Wwf , Gg , Wwf , Wwf , Wwf , Gg , Gg , Gg , Wwf , Wwf , Mm , Hh , Ww , Wwf , Ss , Gg , Gg , Gg , Gg , Gg^Efm , Hh^Fds , Gg^Wm , Gg , Gg , Hh , Gg^Fms , Wwf
+Hh , Wwf , Hh^Fp , Wwf , Gg , Gg , Hh , Wwf , Wwf , Wwf , Ch , Gs^Fms , Gg , Gs^Fp , Ww , Hh , Ss^Vhs , Gg^Efm , Gg , Gg , Gg , Gg^Vh , Gs^Fms , Hh , Wwf , Gg , Wwf , Wwf , Hh^Fms
+Hh , Hh , Mm , Gg , Gg , Gg^Uf , Gs^Fp , Gs^Vh , Gg , Gg , Gg , Gg^Efm , Gg , Gg , Wwf , Gg , Gg , Gg , Gg , Gg , Wwf , Gg , Wwf , Wwf , Mm , Wwf , Gg , Gg^Uf , Mm
+Gg^Efm , Hh^Uf , Gs^Fp , Hh^Fms , Gg , Gg , Gg , Gg , Gg , Re^Gvs , Re^Gvs , Gg , Gg , Wwf , Wwf , Gg , Hh^Fms , Mm , Wwf , Wwf , Gg , Wwf , Gg , Gg^Efm , Hh^Fp , Hh , Gg , Hh^Fds , Hh^Fds
+Gg , Gg , Gg , Gg^Efm , Gg , Gg , Hh , Gg , Re^Gvs , Re^Gvs , Gg , Gg , Mm , Gg^Fms , Wwf , Wwf , Wwf , Wwf , Gg , Gg , Re^Gvs , Gg , Gg , Gs^Fp , Hh , Hh^Uf , Gs^Fp , Gg , Wwf
+Hh , Gg , Re^Gvs , Gs^Fp , Gg^Wm , Gg^Fms , Re^Gvs , Re^Gvs , Gg , Gg , Gg , Hh , Gg , Gg^Fp , Wwf , Wwf , Ch , Gg , Re^Gvs , Re^Gvs , Gg^Fp , Hh , Wwf , Wwf , Wwf , Mm , Wwf , Wwf , Wwf
Mm , Hh^Fms , Gg , Re^Gvs , Re^Gvs , Re^Gvs , Re^Gvs , Gg , Gs^Fp , Mm , Wwf , Wwf , Wwf , Wwf , Ch , Ch , Gg , Re^Gvs , Gg , Gg , Wwf , Wwf , Gg^Fp , Gg^Vh , Hh , Wwf , Wwf , Wwf , Mm
-Mm , Hh , Gg , Re^Uf , Hh , Re^Gvs , Gg^Fp , Gg^Vh , Wwf , Wwf , Gg , Ch , Ch , Ch , 2 Kh , Ch , Gg , Gg^Vh , Wwf , Wwf , Wwf , Gg^Fms , Wwf , Gg , Gg , Gg , Wwf , Mm , Mm
+Mm , Hh , Gg , Re^Uf , Hh , Re^Gvs , Gg^Fp , Gg^Vh , Wwf , Wwf , Gg , Ch , Ch , Ch , 2 Kh , Gg , Gg , Gg^Vh , Wwf , Wwf , Wwf , Gg^Fms , Wwf , Gg , Gg , Gg , Wwf , Mm , Mm
Wwf , Hh^Fms , Wwf , Wwf , Wwf , Gg^Fms , Wwf , Wwf , Gg^Uf , Gg , Gg , Gg , Gg , Gg^Fp , Hh , Wwf , Wwf , Wwf , Gg , Gg , Gg , Wwf , Gg , Wwf , Hh^Fms , Hh , Wwf , Mm^Xm , Mm
Wwf , Wwf , Gg^Efm , Hh , Mm , Wwf , Mm , Hh , Gg , Gg , Wwf , Wwf , Wwf , Wwf , Wwf , Wwf , Gs^Fms , Gg , Hh , Gg , Gg , Gg , Gg^Vh , Wwf , Wwf , Mm , Gg^Uf , Wwf , Wwf
-Mm , Mm , Mm , Hh , Gs^Fms , Hh^Fp , Hh , Gs^Fp , Wwf , Wwf , Gs^Fms , Hh , Mm , Wwf , Wwf , Wwf , Hh^Fms , Mm , Gg^Uf , Gg^Efm , Gs^Fp , Gg^Efm , Gs^Fp , Hh , Hh^Fp , Wwf , Wwf , Gg , Hh^Fms
+Mm , Mm , Mm , Hh , Gs^Fms , Hh^Fp , Hh , Gs^Fp , Wwf , Wwf , Gs^Fms , Hh , Mm , Wwf , Wwf , Wwf , Hh^Fms , Mm , Gg^Uf , Gg^Efm , Gs^Fp , Gg^Efm , Gs^Fp , Hh , Hh^Fp , Wwf , Wwf , Gg^Fms , Hh^Fms
Mm , Mm , Mm , Mm^Xo , Mm , Hh^Fp , Gs^Fp , Hh , Wwf , Wwf , Mm , Gs^Fms , Hh , Gg , Wwf , Wwf , Hh , Hh , Mm , Hh^Fp , Gs^Fp , Hh , Gs^Fp , Hh^Fp , Mm , Mm , Wwf , Hh , Mm
diff --git a/data/multiplayer/maps/2p_Howling_Ghost_Badlands.map b/data/multiplayer/maps/2p_Howling_Ghost_Badlands.map
index 9fdcff613d1..f7dd3d2a144 100644
--- a/data/multiplayer/maps/2p_Howling_Ghost_Badlands.map
+++ b/data/multiplayer/maps/2p_Howling_Ghost_Badlands.map
@@ -5,33 +5,33 @@ _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr
_off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , Dd , _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 , Dd , Dd , Rd , Dd , Rd , _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 , Hd , Md , Dd , Md , Dd , Rd , Rd , Rd , Rd , _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 , Dd , Dd , Rd , Dd , Rd , Rd , Rd , Rd , Gs , Rd , Gs , _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 , Rd , Dd^Vdt , Rd , Rd , Rd^Ft , Hh , Gs , Gs , Wwf , Wwf , Wwf , Mm , Hh , _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 , Rd , Rd , Rd , Rd , Chr , Gs , Wwf , Wwf , Gs^Ft , Gs , Gs , Wwf , Wwf , Wwf , Gs^Ft , _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 , Gs , Rd , Chr , 2 Kh , Chr , Chr , Wwf , Gs , Hh , Mm , Rd , Gs , Gs , Gs , Gs^Ft , Hh , Rd , _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 , Wwf , Gs , Chr , Chr , Wwf , Wwf , Gs , Gs^Vht , Rd , Rd , Rd , Rd , Rd , Rd , Rd , Rd , Rd , Ss^Vhs , Wwf , _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 , Gs , Wwf , Wwf , Hh , Wwf , Gs , Rd , Rd , Rd , Rd , Rd^Ft , Md , Dd , Rd^Uf , Rd , Rd , Rd , Gs , Gs , Wwf , Gs^Ft , _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 , Rp , Gs^Ft , Gs^Ft , Wwf , Wwf , Gs , Gs , Rd , Rd , Rd , Rd , Hd , Dd^Vdt , Rd^Edp , Hd , Md , Rd^Ft , Rd , Gs , Chw , Chw , Gs , Rd , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr
+_off^_usr , _off^_usr , Dd , Dd , Rd , Dd , Rd , Rd , Rd , Rd , Gs , Md , Gs , _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 , Rd , Dd^Vdt , Rd , Rd , Rd^Ft , Hh , Gs , Gs , Wwf , Wwf , Wwf , Hh , Hh , _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 , Rd , Rd , Rd , Rd , Chr , Gs , Wwf , Wwf , Gs^Ft , Gs , Gs , Wwf , Wwf , Wwf , Wwg , _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 , Gs , Rd , Chr , 2 Kh , Chr , Chr , Wwf , Gs , Hh , Mm , Rd , Gs , Gs , Gs , Gs^Ft , Wwg , Wwf , _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 , Wwf , Gs , Chr , Chr , Wwf , Wwf , Gs , Gs^Vht , Rd , Rd , Rd , Rd , Rd , Rd , Rd , Gs , Gs , Ss^Vhs , Wwf , _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 , Gs , Wwf , Wwf , Hh , Wwf , Gs , Rd , Rd , Rd , Rd , Dd^Ft , Rd , Dd , Rd^Uf , Md , Rd , Gs^Ft , Wwg , Wwg , Wwf , Gs^Ft , _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 , Rp , Gs^Ft , Gs^Ft , Wwf , Wwf , Gs , Gs , Rd , Rd , Rd , Rd , Hd , Dd^Vdt , Hd , Hd , Rd , Rd , Gs , Gs , Chw , Chw , Gs , Rd , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr
_off^_usr , _off^_usr , Rd , Rp , Rp , Gs , Gs^Ft , Wwf , Gs , Rd , Rd , Rd , Kh , Rd , Rd , Dd , Dd^Edp , Hd , Rd^Uf , Rd , Rd , Gs , Wwf , Gs , Gs , Gs^Ft , Wwf , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr
-_off^_usr , _off^_usr , Rd^Edp , Rd , Rp , Gs , Wwf , Wwf , Gs , Rd , Rd , Chr , Chr , Chr , Rd , Rd , Rd , Rd^Ft , Rd , Rd , Rd , Gs , Hh , Wwf , Wwf , Gs , Wwf , Gs , Rp , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr
-_off^_usr , _off^_usr , Hh , Rd , Rp , Hh , Wwf , Gs^Ft , Gs^Vht , Gs^Ft , Gs^Ft , Rd , Rd , Chr , Rd , Rd , Ce , Rd , Rd , Rd , Gs , Mm , Wwf , Wwf , Mm , Wwf , Gs , Gs , Rp , Mm , Rd , _off^_usr , _off^_usr , _off^_usr , _off^_usr
-_off^_usr , _off^_usr , Gs^Ft , Rd , Rp , Mm , Gs^Ft , Wwf , Wwf , Wwf , Wwf , Gs , Gs , Rd , Gs , Rd , Ke , Ce , Gs^Uf , Gs , Wwf , Wwf , Gs , Hh , Hh , Gs^Ft , Rp , Rp , Rd , Rd , Dd , Rd^Edpp , _off^_usr , _off^_usr , _off^_usr
-_off^_usr , _off^_usr , Gs^Ft , Rd , Rd , Rp , Rp , Gs , Gs , Hh , Gs^Ft , Wwf , Ss^Vhs , Gs , Wwf , Wwf , Wwf , Gs^Ft , Hh , Chw , Gs , Gs^Ft , Hh , Gs , Rp , Rp , Rd , Rd , Gs^Ft , Hh , Gs^Ft , Dd^Uf , _off^_usr , _off^_usr , _off^_usr
-_off^_usr , _off^_usr , Md , Hh , Rd^Edp , Rd , Rd , Rp , Rp , Gs , Hh , Wwf , Wwf , Wwf , Hh , Wwf , Hh , Wwf , Wwf , Wwf , Gs , Gs , Gs^Ft , Rp , Rd , Rd , Rd , Hh , Dd^Vdt , Hh , Hd , Gs^Ft , _off^_usr , _off^_usr , _off^_usr
-_off^_usr , _off^_usr , Gs^Ft , Hd , Rd^Uf , Rd , Rp , Rp , Ke , Mm , Gs , Gs^Ft , Gs , Wwf , Mm^Xm , Mm , Mm^Xm , Mm^Xm , Mm^Xm , Wwf , Wwf , Gs , Gs , Rp , Rp , Rd , Ce , Rd , Rd , Hd , Hh , Md , _off^_usr , _off^_usr , _off^_usr
-_off^_usr , _off^_usr , Hd^Uf , Dd , Gs^Ft , Rd , Rd , Ce , Ce , Rp , Gs^Vht , Gs , Gs , Wwf , Hh , Mm^Xm , Mm , Mm , Mm^Xm , Hh , Wwf , Gs , Gs , Gs^Vht , Rp , Ce , Ce , Rd , Rd , Rd^Uf , Gs^Ft , Gs^Ft , _off^_usr , _off^_usr , _off^_usr
-_off^_usr , _off^_usr , Md , Hh , Hh , Rd , Rd , Ce , Rd , Rp , Rp , Gs , Gs , Wwf , Wwf , Mm^Xm , Mm^Xm , Mm^Xm , Mm , Mm^Xm , Wwf , Gs , Hh , Gs , Mm , Ke , Rp , Rd , Rd , Rd^Edp , Dd , Md , _off^_usr , _off^_usr , _off^_usr
-_off^_usr , _off^_usr , Gs^Ft , Hd^Uf , Hd , Dd^Vdt , Hh , Rd , Rd , Rd , Rp , Gs^Ft , Gs , Gs , Wwf , Wwf , Wwf , Hh , Wwf , Hh , Wwf , Wwf , Wwf , Gs^Ft , Hh , Rp , Gs , Rp , Rp , Rd , Gs^Ft , Hd^Uf , _off^_usr , _off^_usr , _off^_usr
-_off^_usr , _off^_usr , Rd^Edp , Gs^Ft , Dd , Gs^Ft , Rd , Rd , Rd , Rd , Rp , Hh , Gs^Ft , Gs , Chw , Hh , Gs^Ft , Wwf , Wwf , Wwf , Gs , Ss^Vhs , Wwf , Gs^Ft , Gs , Gs , Hh , Gs , Rp , Rd , Rd , Hh , _off^_usr , _off^_usr , _off^_usr
-_off^_usr , _off^_usr , Rd , Rd , Rd , Rd , Rp , Rp , Rp , Rp , Mm , Gs , Wwf , Wwf , Gs , Gs^Uf , Ce , Ke , Rd , Gs , Rd , Gs , Gs^Ft , Wwf , Wwf , Wwf , Wwf , Mm , Gs^Ft , Rp , Rd , Gs^Ft , _off^_usr , _off^_usr , _off^_usr
-_off^_usr , _off^_usr , _off^_usr , Mm , Rp , Rp , Gs , Gs , Gs^Ft , Hh , Hh , Wwf , Hh , Gs , Rd , Rd , Rd , Ce , Rd , Rd , Chr , Rd , Rd , Hh , Gs^Ft , Gs^Vht , Gs^Ft , Wwf , Gs , Rp , Rd , Rd^Edp , _off^_usr , _off^_usr , _off^_usr
-_off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , Gs , Wwf , Wwf , Wwf , Wwf , Wwf , Wwf , Mm , Rd , Rd , Rd , Rd^Ft , Rd , Rd , Rd , Chr , Chr , Chr , Rd , Rd , Gs , Wwf , Wwf , Gs , Rp , Rd , Rd , _off^_usr , _off^_usr , _off^_usr
+_off^_usr , _off^_usr , Rd^Edp , Rd , Rp , Gs , Wwf , Wwf , Gs , Rd , Rd , Chr , Chr , Chr , Rd , Rd , Rd , Rd^Ft , Rd^Edpp , Rd , Rd , Gs , Hh , Wwf , Wwf , Gs , Wwf , Gs , Rp , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr
+_off^_usr , _off^_usr , Hhd , Rd , Rp , Hh , Wwf , Gs^Ft , Gs^Vht , Gs^Ft , Gs^Ft , Rd , Rd , Chr , Rd , Rd , Ce , Rd , Rd , Rd , Gs , Mm , Wwf , Wwf , Mm , Wwf , Gs^Uf , Gs , Rp , Mm , Rd , _off^_usr , _off^_usr , _off^_usr , _off^_usr
+_off^_usr , _off^_usr , Rd^Ft , Rd , Rp , Mm , Gs^Ft , Wwf , Wwf , Wwf , Wwf , Gs , Gs , Rd , Gs , Gs , Ke , Ce , Hh , Gs , Wwf , Wwf , Gs , Hh , Hh , Gs^Ft , Rp , Rp , Rd , Rd , Dd , Rd^Edpp , _off^_usr , _off^_usr , _off^_usr
+_off^_usr , _off^_usr , Hhd^Ft , Rd , Rd , Rp , Rp , Gs , Gs , Hh , Gs^Ft , Wwf , Ss^Vhs , Gs , Wwf , Wwg , Wwrg , Gs^Ft , Hh^Uf , Chw , Wwf , Gs^Ft , Hh , Gs , Rp , Rp , Rd , Rd , Rd^Ft , Hhd , Rd^Ft , Dd^Uf , _off^_usr , _off^_usr , _off^_usr
+_off^_usr , _off^_usr , Md , Hhd , Rd^Edp , Rd , Rd , Rp , Rp , Gs , Hh , Wwf , Wwf , Wwf , Hh , Gs^Ft , Hh , Wwg , Wwf , Wwf , Gs , Gs , Gs^Ft , Rp , Rd , Rd , Rd , Hhd , Dd^Vdt , Hhd , Hd , Dd^Ft , _off^_usr , _off^_usr , _off^_usr
+_off^_usr , _off^_usr , Dd^Ft , Hd , Rd^Uf , Rd , Rp , Rp , Ke , Mm , Gs , Gs^Ft , Wwf , Wwg , Mm^Xm , Mm , Mm^Xm , Mm^Xm , Mm^Xm , Wwf , Wwf , Gs , Gs , Rp , Rp , Rd , Ce , Rd , Rd , Hd , Hhd , Md , _off^_usr , _off^_usr , _off^_usr
+_off^_usr , _off^_usr , Hd^Uf , Dd , Rd^Ft , Rd , Rd , Ce , Ce , Rp , Gs^Vht , Gs , Wwf , Wwg , Hh , Mm^Xm , Mm , Mm , Mm^Xm , Hh , Wwg , Wwf , Gs , Gs^Vht , Rp , Ce , Ce , Rd , Rd , Rd^Uf , Rd^Ft , Rd^Ft , _off^_usr , _off^_usr , _off^_usr
+_off^_usr , _off^_usr , Md , Hhd , Hhd , Rd , Rd , Ce , Rd , Rp , Rp , Gs , Gs , Wwf , Wwf , Mm^Xm , Mm^Xm , Mm^Xm , Mm , Mm^Xm , Wwg , Wwf , Hh , Gs , Mm , Ke , Rp , Rd , Rd , Rd^Edp , Dd , Md , _off^_usr , _off^_usr , _off^_usr
+_off^_usr , _off^_usr , Rd^Ft , Hd^Uf , Hd , Dd^Vdt , Hhd , Rd , Rd , Rd , Rp , Gs^Ft , Gs , Gs , Wwf , Wwf , Wwg , Hh , Gs^Ft , Hh , Wwf , Wwf , Wwf , Gs^Ft , Hh , Rp , Gs , Rp , Rp , Rd , Rd^Ft , Hd^Uf , _off^_usr , _off^_usr , _off^_usr
+_off^_usr , _off^_usr , Rd^Edp , Rd^Ft , Dd , Rd^Ft , Rd , Rd , Rd , Rd , Rp , Hh , Gs^Ft , Wwf , Chw , Hh^Uf , Gs^Ft , Wwrg , Wwg , Wwf , Gs , Ss^Vhs , Wwf , Gs^Ft , Gs , Gs , Hh , Gs , Rp , Rd , Rd , Hhd , _off^_usr , _off^_usr , _off^_usr
+_off^_usr , _off^_usr , Rd , Rd , Rd , Rd , Rp , Rp , Rp , Rp , Mm , Gs , Wwf , Wwf , Gs , Hh , Ce , Ke , Gs , Gs , Rd , Gs , Gs^Ft , Wwf , Wwf , Wwf , Wwf , Mm , Gs^Ft , Rp , Rd , Rd^Ft , _off^_usr , _off^_usr , _off^_usr
+_off^_usr , _off^_usr , _off^_usr , Mm , Rp , Rp , Gs , Gs^Uf , Gs^Ft , Hh , Hh , Wwf , Hh , Gs , Rd , Rd , Rd , Ce , Rd , Rd , Chr , Rd , Rd , Hh , Gs^Ft , Gs^Vht , Gs^Ft , Wwf , Gs , Rp , Rd , Rd^Edp , _off^_usr , _off^_usr , _off^_usr
+_off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , Gs , Wwf , Wwf , Wwf , Wwf , Wwf , Wwf , Mm , Rd , Rd , Rd^Edpp , Rd^Ft , Rd , Rd , Rd , Chr , Chr , Chr , Rd , Rd , Gs , Wwf , Wwf , Gs , Rp , Rd , Rd , _off^_usr , _off^_usr , _off^_usr
_off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , Gs^Ft , Gs , Gs , Gs , Wwf , Gs , Rd , Rd , Rd^Uf , Hd , Dd^Edp , Dd , Rd , Rd , Kh , Rd , Rd , Rd , Gs , Wwf , Hh , Gs , Rp , Rp , Rd , _off^_usr , _off^_usr , _off^_usr
-_off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , Rd , Gs , Chw , Chw , Gs , Rd , Rd^Ft , Md , Hd , Rd , Dd^Vdt , Hd , Rd , Rd , Rd , Rd , Gs , Gs , Wwf , Wwf , Gs^Ft , Gs^Ft , Rp , _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 , Gs^Ft , Wwf , Gs , Gs , Rd , Rd , Rd^Edp , Rd^Uf , Dd , Md , Rd^Ft , Rd , Rd , Rd , Rd , Gs , Wwf , Hh , Wwf , Wwf , Gs , _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 , Wwf , Ss^Vhs , Rd , Rd , Rd , Rd , Rd , Rd , Rd , Rd , Rd , Gs^Vht , Gs , Wwf , Wwf , Chr , Chr , Gs , Wwf , _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 , Rd , Hh , Gs^Ft , Gs , Gs , Gs , Rd , Mm , Hh , Gs , Wwf , Chr , Chr , 1 Kh , Chr , Rd , Gs , _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 , Gs^Ft , Wwf , Wwf , Wwf , Gs , Gs , Gs^Ft , Wwf , Wwf , Gs , Chr , Rd , Rd , Rd , Rd , _off^_usr , _off^_usr , _off^_usr
+_off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , _off^_usr , Rd , Gs , Chw , Chw , Gs , Gs , Rd , Rd , Hd , Hd , Dd^Vdt , Hd , Rd , Rd , Rd , Rd , Gs , Gs , Wwf , Wwf , Gs^Ft , Gs^Ft , Rp , _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 , Gs^Ft , Wwf , Wwg , Wwg , Gs^Ft , Rd , Md , Rd^Uf , Dd , Rd , Dd^Ft , Rd , Rd , Rd , Rd , Gs , Wwf , Hh , Wwf , Wwf , Gs , _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 , Wwf , Ss^Vhs , Gs , Gs , Rd , Rd , Rd , Rd , Rd , Rd , Rd , Gs^Vht , Gs , Wwf , Wwf , Chr , Chr , Gs , Wwf , _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 , Wwf , Wwg , Gs^Ft , Gs , Gs , Gs , Rd , Mm , Hh , Gs , Wwf , Chr , Chr , 1 Kh , Chr , Rd , Gs , _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 , Wwg , Wwf , Wwf , Wwf , Gs , Gs , Gs^Ft , Wwf , Wwf , Gs , Chr , Rd , Rd , Rd , Rd , _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 , Gs , Gs , Wwf , Wwf , Wwf , Gs^Ft , Wwf , Gs , Rd , Rd , Rd , Dd^Vdt , Rd , _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 , Hh , Mm , Gs , Rd , Gs , Rd , Rd , Dd , Rd , Dd , Dd , _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 , Rd , Rd , Rd , Dd , Md , Dd , Hd , Hd , Md , _off^_usr , _off^_usr , _off^_usr
diff --git a/data/multiplayer/maps/2p_Sablestone_Delta.map b/data/multiplayer/maps/2p_Sablestone_Delta.map
index 242b913fd6c..e904dd94d41 100644
--- a/data/multiplayer/maps/2p_Sablestone_Delta.map
+++ b/data/multiplayer/maps/2p_Sablestone_Delta.map
@@ -2,31 +2,31 @@ border_size=1
usage=map
Ss , Gs , Gs , Gs , Ss , Ss , Ss , Ss , Gs , Gs , Gs , Ss , Ss , Gs , Gs , Gs , Ww , Ww , Gs , Uh , Xu , Xu , Xu
-Gs , Gs^Ft , Gs^Ft , Ss , Ss , Ss , Gs^Ft , Ss , Ss , Gs , Gs , Gs^Ft , Gs , Ss^Vhs , Gs , Gs^Ft , Ww , Ww , Gs^Ft , Uh , Xu , Xu , Xu
-Ww , Ww , Gs , Gs , Gs , Gs , Gs , Ss , Cud , Ss , Gs , Gs , Gs , Gs , Ww , Gs , Gs , Gs , Gs , Uu^Uf , Uu^Vu , Xu , Xu
-Xu , Xu , Gs , Ww , Ww , Ww , Ww , Gs , 1 Kud , Gs , Ww , Ww , Ww , Ww , Gs , Gs , Ww , Gs , Xu , Rb , Rb , Cud , Ss
-Xu , Xu , Gs , Gs , Gs , Ww , Cud , Wo , Cud , Wo , Cud , Ww , Gs , Gs , Gs , Ww , Ww , Gs , Rb , Ss , Rb , Rb , Ss
-Gs , Gs^Ft , Gs , Ww , Ww , Gs , Gs , Kud , Ww , Kud , Gs , Gs , Ww , Ww , Ww , Gs , Gs , Gs , Rb , Rb , Cud , Rb , Rb
-Ww , Ww , Ww , Gs , Gs , Ww , Gs , Gs , Wwf , Gs , Gs , Gs , Gs , Gs , Ww , Ww , Gs , Xu , Rb , Uu^Vud , Rb , Rb , Xu
-Gs , Gs , Ww , Gs , Ww , Gs , Gd , Gd , Uu^Vud , Gd , Gd , Hh , Kud , Gs , Gs , Gs , Kud , Xu , Xu , Cud , Xu , Rb , Xu
-Ww , Ww , Gs , Ww , Gs , Gs , Gd^Ft , Xu , Xu , Xu , Gd , Gs^Ft , Cud , Gs , Gs , Cud , Ss^Vhs , Uh , Ww , Xu , Xu , Cud , Ww
-Gs , Gs , Gs^Vht , Gs , Gs , Gs , Gs , Cud , Wwf , Wwf , Wwf , Gs , Cud , Cud , Gs , Gd , Gd , Gs , Gs , Cud , Wwf , Ww , Ww
-Ww , Gs^Ft , Wwf , Cud , Re^Uf , Gs , Wwf , Wwf , Ss^Vhs , Gs^Ft , Gs , Wwf , Wwf , Re , Re^Ft , Gs , Gs , Gs , Ww , Xu , Kud , Cud , Xu
-Gs , Ww , Xu , Kud , Re , Gs , Wwf , Gs , Gs , Re , Re , Gs , Wwf , Mm , Re^Ft , Re , Gs , Gs^Ft , Uh , Xu , Xu , Uh , Xu
+Gs , Gs^Ft , Gs^Ft , Ss , Ss , Ss , 1 Gs^Ft , Ss , Ss , Gs , Gs , Gs^Ft , Gs , Ss^Vhs , Gs , Gs^Ft , Ww , Ww , Gs^Ft , Uh , Xu , Xu , Xu
+Ww , Ww , Gs , Gs , Gs , Gs , Gs , Ss , Gs , Ss , Gs , Gs , Gs , Gs , Ww , Gs , Gs , Gs , Gs , Uu^Uf , Uu^Vu , Xu , Xu
+Xu , Xu , Gs , Ww , Ww , Ww , Ww , Gs , Kud , Gs , Ww , Ww , Ww , Ww , Gs , Gs , Ww , Gs , Xu , Rb , Rb , Cud , Ss
+Xu , Xu , Gs , Gs , Gs , Ww , Gs , Wo , Cud , Wo , Gs , Ww , Gs , Gs , Gs , Ww , Ww , Gs , Rb , Ss , Rb , Rb , Ss
+Gs , Gs^Ft , Gs , Ww , Ww , Gs , Gs , Kud , Cud , Kud , Gs , Gs , Ww , Ww , Ww , Gs , Gs , Gs , Rb , Rb , Uu^Vud , Rb , Rb
+Ww , Ww , Ww , Gs , Gs , Ww , Gs , Gs , Wwf , Gs , Gs , Gs , Gs , Gs , Ww , Ww , Gs , Xu , Rb , Rb , Cud , Rb , Xu
+Gs , Gs , Ww , Gs , Ww , Gs , Gd , Gd , Uu^Vud , Gd , Gd , Hh , Kud , Gs , Gs , Gs , Kud , Xu , Xu , Rb , Xu , Kud , Xu
+Ww , Ww , Gs , Ww , Gs , Gs , Gd^Ft , Xu , Xu , Xu , Gd , Cud , Cud , Cud , Gs , Gd , Ss^Vhs , Cud , Ww , Xu , Xu , Cud , Ww
+Gs , Gs , Gs^Vht , Gs , Gs , Gs , Gs , Cud , Wwf , Wwf , Wwf , Gs , Gs , Gs , Gs , Gd , Gd , Gs , Gs , Cud , Wwf , Ww , Ww
+Ww , Gs^Ft , Wwf , Cud , Re^Uf , Gs , Wwf , Wwf , Ss^Vhs , Gs^Ft , Gs , Wwf , Gs , Re , Re^Ft , Gs , Gs , Gs , Ww , Xu , Kud , Cud , Xu
+Gs , Ww , Xu , Kud , Re , Gs , Wwf , Ss , Gs , Re , Re , Wwf , Gs , Mm , Re^Ft , Re , Gs , Gs^Ft , Uh , Xu , Xu , Uh , Xu
Ww , Gs^Ft , Xu , Re^Ft , Re , Gs , Gs , Wwf , Wwf , Gs , Wwf , Wwf , Wwf , Gs , Gs , Re , Re^Uf , Gd , Kud , Xu , Xu , Gs^Ft , Gs^Ft
-Uh , Ww , Xu , Cud , Xu , Re , Re , Gs , Gs^Ft , Wwf , Hh , Hh^Uf , Gs , Wwf , Gs , Uh , Cud , Re^Ft , Cud , Re^Ft , Xu , Cud , Xu
-Xu , Uh , Xu , Uu^Uf , Cud , Xu , Cud , Gd , Gs , Wwf , Gs , Mm , Hh , Wwf , Gs^Ft , Gd , Re , Xu , Xu , Uu^Uf , Xu , Uh , Uh
+Uh , Ww , Xu , Cud , Xu , Re , Re , Gs , Wwf , Wwf , Hh , Hh^Uf , Gs , Wwf , Wwf , Uh , Cud , Re^Ft , Cud , Re^Ft , Xu , Cud , Xu
+Xu , Uh , Xu , Uu^Uf , Cud , Xu , Cud , Gs , Wwf , Gs^Ft , Gs , Mm , Hh , Gs^Ft , Wwf , Gs , Re , Xu , Xu , Uu^Uf , Xu , Uh , Uh
Gs , Cud , Xu , Re^Ft , Kud , Re^Ft , Re^Uf , Uh , Gs , Wwf , Wwf , Hh^Uf , Wwf , Wwf , Wwf , Gs , Gs , Re , Re , Cud , Xu , Ww , Ww
-Xu , Gs^Ft , Xu , Xu , Uh , Gd , Gs , Re , Re^Ft , Gs , Wwf , Wwf , Re , Gs , Gs , Wwf , Wwf , Gs , Re , Re^Ft , Xu , Gs^Ft , Gs^Ft
-Xu , Uh , Kud , Xu , Ww , Gs^Ft , Gs , Re , Re^Ft , Mm , Wwf , Gs , Gs , Re , Ss^Vhs , Gs , Wwf , Gs , Re^Uf , Kud , Wwf , Ww , Ww
-Ww , Cud , Wwf , Xu , Gs , Gs , Gd , Gs , Gs , Re , Cud , Wwf , Wwf , Gs^Ft , Wwf , Wwf , Gs , Gs , Re , Cud , Gs^Vht , Gs^Ft , Gs
-Ww , Ww , Xu , Cud , Ww , Gg , Ss^Vhs , Gd , Gs , Cud , Cud , Gs , Gd , Wwf , Xu , Cud , Gd^Ft , Gs , Gs , Gs , Gs , Gs , Gs
-Xu , Cud , Xu , Xu , Xu , Uh , Kud , Cud , Gs , Gs , Kud , Gs^Ft , Gd , Xu , Uu^Vud , Xu , Gd , Gs , Ww , Ww , Ww , Ww , Ww
-Xu , Rb , Rb , Cud , Rb , Xu , Gs , Gs , Ww , Gs , Gs , Hh , Gs , Gd , Wwf , Gd , Gs , Gs , Gs , Gs , Ww , Gs , Gs
-Rb , Rb , Cud , Uu^Vud , Rb , Xu , Gs , Ww , Ww , Gs , Ww , Gs , Gs , Gs , Ww , Gs , Gs , Ww , Ww , Gs , Gs , Ww , Ww
-Ss , Rb , Rb , Rb , Rb , Gs , Ww , Gs , Gs , Ww , Gs , Gs , Cud , 2 Kud , Cud , Kud , Cud , Gs , Gs , Ww , Gs , Gs^Ft , Gs
+Xu , Gs^Ft , Xu , Xu , Uh , Gd , Gs , Re , Re^Ft , Gs , Gs , Wwf , Gs , Gs , Gs , Wwf , Wwf , Gs , Re , Re^Ft , Xu , Gs^Ft , Gs^Ft
+Xu , Uh , Kud , Xu , Ww , Gs^Ft , Gs , Re , Re^Ft , Mm , Gs , Wwf , Gs , Re , Ss^Vhs , Ss , Wwf , Gs , Re^Uf , Kud , Wwf , Ww , Ww
+Ww , Cud , Wwf , Xu , Gs , Gs , Gd , Gs , Gs , Re , Gs , Wwf , Wwf , Gs^Ft , Wwf , Wwf , Gs , Gs , Re , Cud , Gs^Vht , Gs^Ft , Gs
+Ww , Ww , Xu , Cud , Ww , Gg , Ss^Vhs , Gd , Gs , Gs , Cud , Gs , Gd , Wwf , Xu , Cud , Gd^Ft , Gs , Gs , Gs , Gs , Gs , Gs
+Xu , Cud , Xu , Xu , Xu , Cud , Kud , Gd , Gs , Cud , Kud , Cud , Gd , Xu , Uu^Vud , Xu , Gd , Gs , Ww , Ww , Ww , Ww , Ww
+Xu , Kud , Cud , Rb , Rb , Xu , Gs , Gs , Ww , Gs , Gs , Hh , Gs , Gd , Wwf , Gd , Gs , Gs , Gs , Gs , Ww , Gs , Gs
+Rb , Rb , Uu^Vud , Rb , Rb , Xu , Gs , Ww , Ww , Gs , Ww , Gs , Gs , Gs , Cud , Gs , Gs , Ww , Ww , Gs , Gs , Ww , Ww
+Ss , Rb , Rb , Rb , Rb , Gs , Ww , Gs , Gs , Ww , Gs , Gs , Gs , 2 Kud , Cud , Kud , Gs , Gs , Gs , Ww , Gs , Gs^Ft , Gs
Ss , Rb , Rb , Ss , Xu , Gs , Ww , Ww , Gs , Gs , Ww , Ww , Ww , Wo , Kud , Wo , Ww , Ww , Ww , Gs , Gs , Xu , Xu
-Cud , Cud , Uu^Vu , Rb , Gs , Gs , Gs , Gs , Ww , Ww , Gs , Ww , Gs , Gs , Cud , Gs , Gs , Ww , Gs , Ww , Gs , Xu , Xu
+Cud , Cud , Uu^Vu , Rb , Gs , Gs , Gs , Gs , Ww , Ww , Gs , Ww , Gs , Gs , Gs , Gs , Gs , Ww , Gs , Ww , Gs , Xu , Xu
Xu , Xu , Xu , Uu^Uf , Gs^Ft , Gs , Ww , Gs , Gs , Gs , Gs , Gs , Gs , Ss , Ss , Ss , Gs , Gs , Ss , Gs , Gs^Ft , Ww , Ww
Xu , Xu , Xu , Uh , Xu , Ww , Gs^Ft , Gs , Ss , Ss^Vhs , Ss , Gs^Ft , Gs , Gs , Ss , Gs , Gs^Ft , Ss , Ss , Ss , Ss , Uh , Uh
Ww , Ww , Ww , Xu , Xu , Xu , Ss , Gs , Ss , Xu , Xu , Xu , Ss , Ss , Gs , Xu , Xu , Xu , Xu , Gs^Ft , Ss , Xu , Xu
diff --git a/data/multiplayer/scenarios/2p_Aethermaw.cfg b/data/multiplayer/scenarios/2p_Aethermaw.cfg
new file mode 100644
index 00000000000..351b14880b8
--- /dev/null
+++ b/data/multiplayer/scenarios/2p_Aethermaw.cfg
@@ -0,0 +1,400 @@
+#textdomain wesnoth-multiplayer
+[multiplayer]
+ id=multiplayer_Aethermaw
+ name= _ "2p — Aethermaw"
+ description= _ "Long ago, the Great Mage Sulla was imprisoned in the Aethermaw, a nexus of mystical energy whose chaotic nature was able to prevent her escape. Over the centuries, however, Sulla gradually attuned her powers to the maelstrom of disorder that is the Aethermaw, and has now begun to project its influence onto the material plane, drawing in entire regions of land from hundreds of different worlds, realities and time-periods. She experiments with these disparate pieces of the cosmos, manipulating them, merging them and sending them back and forth between the Aethermaw and their place of origin. Perhaps, as her mastery over the Aethermaw grows, Sulla will one day break free of its bonds. Until that time comes, she will continue to amuse herself by arranging battles between the mortal beings unlucky enough to be drawn into its depths. Designed by Doc Paterson."
+ map_data="{multiplayer/maps/2p_Aethermaw.map}"
+ random_start_time="no"
+
+ {DEFAULT_SCHEDULE}
+ {DEFAULT_MUSIC_PLAYLIST}
+
+ [side]
+ [ai]
+ villages_per_scout=8
+ [/ai]
+ side=1
+ canrecruit=yes
+ controller=human
+ gold=75
+ team_name=north
+ user_team_name= _ "teamname^North"
+ fog=yes
+ [/side]
+ [side]
+ [ai]
+ villages_per_scout=8
+ [/ai]
+ side=2
+ canrecruit=yes
+ controller=human
+ gold=75
+ team_name=south
+ user_team_name= _ "teamname^South"
+ fog=yes
+ [/side]
+
+ [event]
+ name=prestart
+
+ [item]
+ x,y=25,21
+ halo=halo/illuminates-aura.png
+ [/item]
+ [item]
+ x,y=25,21
+ halo="units/human-magi/great-mage+female.png~RC(magenta>black)~FL():444,units/human-magi/great-mage+female-attack-magic-1.png~RC(magenta>black)~FL():444,units/human-magi/great-mage+female-attack-magic-2.png~RC(magenta>black)~FL():444,units/human-magi/great-mage+female-attack-magic-1.png~RC(magenta>black)~FL():444"
+ [/item]
+
+ {PLACE_IMAGE scenery/rock-cairn.png 23 19}
+ {PLACE_IMAGE scenery/rock-cairn.png 24 18}
+ {PLACE_IMAGE scenery/rock-cairn.png 25 18}
+ {PLACE_IMAGE scenery/rock-cairn.png 26 18}
+ {PLACE_IMAGE scenery/rock-cairn.png 27 19}
+ {PLACE_IMAGE scenery/whirlpool.png 22 19}
+
+ {PLACE_IMAGE scenery/rock-cairn.png 23 23}
+ {PLACE_IMAGE scenery/rock-cairn.png 24 23}
+ {PLACE_IMAGE scenery/rock-cairn.png 25 24}
+ {PLACE_IMAGE scenery/rock-cairn.png 26 23}
+ {PLACE_IMAGE scenery/rock-cairn.png 27 23}
+ {PLACE_IMAGE scenery/whirlpool.png 28 22}
+
+ {PLACE_IMAGE "units/saurians/ambusher/ambusher-se-run11.png~RC(magenta>5)" 44 6}
+ {PLACE_IMAGE "units/saurians/soothsayer/soothsayer-ne-run6.png~FL()~RC(magenta>5)" 42 8}
+ {PLACE_IMAGE "units/saurians/oracle/oracle-se-melee3.png~FL()~RC(magenta>5)" 36 4}
+
+ {PLACE_IMAGE "units/goblins/impaler-death-8.png~RC(magenta>1)" 38 6}
+ {PLACE_IMAGE "units/goblins/impaler-attack-n.png~RC(magenta>1)" 36 5}
+ {PLACE_IMAGE "units/goblins/spearman-attack-ne2.png~RC(magenta>1)" 35 5}
+ {PLACE_IMAGE "units/goblins/spearman-defend.png~FL()~RC(magenta>1)" 37 6}
+ {PLACE_IMAGE "units/goblins/impaler-death-8.png~FL()~RC(magenta>1)" 40 4}
+ {PLACE_IMAGE "units/goblins/impaler-death-8.png~RC(magenta>1)" 41 5}
+ {PLACE_IMAGE "units/goblins/spearman-attack-ne2.png~FL()~RC(magenta>1)" 45 7}
+ {PLACE_IMAGE "units/goblins/spearman-defend.png~RC(magenta>1)" 42 5}
+ {PLACE_IMAGE "units/goblins/rouser-ne-defend.png~FL()~RC(magenta>1)" 46 7}
+ {PLACE_IMAGE "units/goblins/rouser-attack1.png~RC(magenta>1)" 41 8}
+ {PLACE_IMAGE "units/goblins/spearman-ne.png~RC(magenta>1)" 41 9}
+ {PLACE_IMAGE "units/goblins/pillager-moving.png~FL()~RC(magenta>1)" 48 1}
+ {PLACE_IMAGE "units/goblins/pillager-moving.png~FL()~RC(magenta>1)" 49 1}
+ {PLACE_IMAGE "units/goblins/pillager-moving.png~FL()~RC(magenta>1)" 47 3}
+ {PLACE_IMAGE "units/goblins/pillager-attack2.png~FL()~RC(magenta>1)" 47 2}
+ {PLACE_IMAGE "units/goblins/wolf-rider-moving.png~FL()~RC(magenta>1)" 49 2}
+ {PLACE_IMAGE "units/goblins/pillager-attack2.png~FL()~RC(magenta>1)" 45 4}
+ {PLACE_IMAGE "units/goblins/wolf-rider-moving.png~FL()~RC(magenta>1)" 48 2}
+ {PLACE_IMAGE "units/goblins/wolf-rider-moving.png~FL()~RC(magenta>1)" 46 2}
+
+ {PLACE_IMAGE "units/undead/shadow-s-attack-1.png~RC(magenta>5)" 44 18}
+ {PLACE_IMAGE "units/undead/shadow-n-attack-2.png~RC(magenta>5)" 45 24}
+ {PLACE_IMAGE "units/undead-skeletal/revenant-attack-4.png~RC(magenta>5)" 45 21}
+ {PLACE_IMAGE "units/undead-skeletal/chocobone-attack-2.png~RC(magenta>5)" 45 18}
+ {PLACE_IMAGE "units/undead-skeletal/chocobone-attack-2.png~RC(magenta>5)" 43 22}
+ {PLACE_IMAGE "units/undead-skeletal/chocobone-attack-1.png~RC(magenta>5)" 46 17}
+ {PLACE_IMAGE "units/undead-skeletal/chocobone-defend-2.png~RC(magenta>5)" 45 20}
+ {PLACE_IMAGE "units/undead-skeletal/deathknight-melee-attack-5.png~RC(magenta>5)" 46 19}
+ {PLACE_IMAGE "units/undead-skeletal/skeleton-attack-2.png~RC(magenta>5)" 47 19}
+ {PLACE_IMAGE "units/undead/ghast-attack-2.png~FL()~RC(magenta>5)" 49 19}
+ {PLACE_IMAGE "units/undead/ancient-lich-magic-1.png~FL()~RC(magenta>5)" 48 17}
+ {PLACE_IMAGE "units/undead-skeletal/deathknight-lead-2.png~RC(magenta>5)" 48 18}
+ {PLACE_IMAGE "units/undead/zombie-troll-attack.png~RC(magenta>5)" 45 19}
+ {PLACE_IMAGE "units/undead/zombie-troll-attack-n.png~RC(magenta>5)" 49 25}
+ {PLACE_IMAGE "units/undead/shadow-n-3.png~FL()~RC(magenta>5)" 49 23}
+ {PLACE_IMAGE "units/undead/ghoul-attack-2.png~RC(magenta>5)" 46 22}
+ {PLACE_IMAGE "units/undead/shadow-s-attack-4.png~RC(magenta>5)" 43 21}
+ {PLACE_IMAGE "units/undead/zombie-dwarf-attack-n.png~RC(magenta>5)" 48 24}
+ {PLACE_IMAGE "units/undead/zombie-dwarf-attack-n.png~RC(magenta>5)" 48 23}
+ {PLACE_IMAGE "units/undead/zombie-dwarf-attack-n.png~RC(magenta>5)" 47 25}
+ {PLACE_IMAGE "units/undead/zombie-dwarf-attack-n.png~RC(magenta>5)" 47 27}
+ {PLACE_IMAGE "units/undead/zombie-dwarf-attack-n.png~RC(magenta>5)" 48 26}
+ {PLACE_IMAGE "units/undead/zombie-troll-attack-s.png~RC(magenta>5)" 49 18}
+ {PLACE_IMAGE "units/undead/soulless-bat-ne-3.png~RC(magenta>5)" 45 25}
+ {PLACE_IMAGE "units/undead/necrophage-attack-1.png~RC(magenta>5)" 44 22}
+ {PLACE_IMAGE "units/undead-skeletal/archer-die-13.png~RC(magenta>5)" 47 23}
+ {PLACE_IMAGE "units/undead-skeletal/deathblade-idle-2.png~RC(magenta>5)" 48 17}
+ {PLACE_IMAGE "units/undead/soulless-dwarf-attack-s.png~RC(magenta>5)" 47 17}
+ {PLACE_IMAGE "units/undead/soulless-bat-ne-1.png~RC(magenta>5)" 46 26}
+ {PLACE_IMAGE "units/undead-skeletal/skeleton-dying-7.png~RC(magenta>5)" 45 22}
+
+ {PLACE_IMAGE "units/elves-wood/lady.png~FL()" 48 20}
+ {PLACE_IMAGE "units/elves-wood/lady.png~FL()" 47 21}
+ {PLACE_IMAGE "units/elves-wood/lady.png" 48 21}
+
+ {PLACE_IMAGE "units/dwarves/arcanister.png~FL()~RC(magenta>4)" 48 22}
+ {PLACE_IMAGE "units/dwarves/explorer-ranged-1.png~RC(magenta>4)" 49 21}
+ {PLACE_IMAGE "units/dwarves/explorer-melee-3.png~FL()~RC(magenta>4)" 46 20}
+ {PLACE_IMAGE "units/dwarves/explorer-ranged-1.png~FL()~RC(magenta>4)" 47 20}
+ {PLACE_IMAGE "units/dwarves/dragonguard-attack-ranged-ne.png~RC(magenta>4)" 48 19}
+ {PLACE_IMAGE "units/dwarves/runesmith-attack-se-2.png~FL()~RC(magenta>4)" 46 21}
+ {PLACE_IMAGE "units/dwarves/runesmith-attack-se-4.png~RC(magenta>4)" 49 22}
+ {PLACE_IMAGE "units/dwarves/sentinel-defend-2.png~RC(magenta>4)" 49 20}
+ {PLACE_IMAGE "units/dwarves/lord-hammer.png~FL()~RC(magenta>4)" 47 22}
+
+ {PLACE_IMAGE "units/human-magi/elder-mage-ranged3.png~FL()~RC(magenta>4)" 44 32}
+ {PLACE_IMAGE "units/human-magi/mage+female-attack-staff1.png" 46 37}
+ {PLACE_IMAGE "units/human-magi/mage+female-attack-staff2.png~FL()" 47 37}
+ {PLACE_IMAGE "units/human-magi/mage+female-attack-magic2.png~FL()" 40 36}
+ {PLACE_IMAGE "units/human-magi/mage+female-attack-staff1.png" 39 36}
+ {PLACE_IMAGE "units/human-magi/mage+female-defend.png~FL()" 43 34}
+ {PLACE_IMAGE "units/human-magi/mage+female-attack-staff2.png" 42 33}
+ {PLACE_IMAGE "units/human-magi/mage+female-attack-staff1.png" 48 32}
+ {PLACE_IMAGE "units/human-magi/mage+female-attack-staff1.png~FL()" 49 32}
+
+ {PLACE_IMAGE "units/human-loyalists/pikeman-attack-ne.png~RC(magenta>2)" 2 36}
+ {PLACE_IMAGE "units/human-loyalists/pikeman-attack-n.png~RC(magenta>2)" 4 36}
+ {PLACE_IMAGE "units/human-loyalists/javelineer-attack-melee-3.png~RC(magenta>2)" 3 35}
+ {PLACE_IMAGE "units/human-loyalists/halberdier-pierce-ne.png~FL()~RC(magenta>2)" 5 36}
+ {PLACE_IMAGE "units/human-loyalists/lieutenant-die-4.png~RC(magenta>2)" 8 37}
+ {PLACE_IMAGE "units/human-loyalists/fencer-defend-1-2.png~RC(magenta>2)" 6 37}
+ {PLACE_IMAGE "units/human-loyalists/halberdier-pierce-n.png~RC(magenta>2)" 7 38}
+ {PLACE_IMAGE "units/human-loyalists/pikeman-idle-3.png~FL()~RC(magenta>2)" 6 35}
+ {PLACE_IMAGE "units/human-loyalists/shocktrooper-attack-2.png~FL()~RC(magenta>2)" 10 37}
+ {PLACE_IMAGE "units/human-loyalists/spearman-death4.png~RC(magenta>2)" 5 37}
+ {PLACE_IMAGE "units/human-loyalists/spearman-attack-se-10.png~RC(magenta>2)" 13 36}
+ {PLACE_IMAGE "units/human-loyalists/spearman-attack-s-6.png~RC(magenta>2)" 14 35}
+ {PLACE_IMAGE "units/human-loyalists/spearman-attack-se-9.png~FL()~RC(magenta>2)" 15 36}
+ {PLACE_IMAGE "units/human-loyalists/pikeman-die-2.png~FL()~RC(magenta>2)" 14 37}
+ {PLACE_IMAGE "units/human-loyalists/spearman-idle3.png~RC(magenta>2)" 15 37}
+ {PLACE_IMAGE "units/human-loyalists/spearman-death3.png~RC(magenta>2)" 13 37}
+ {PLACE_IMAGE "units/human-loyalists/pikeman-die-5.png~RC(magenta>2)" 10 38}
+ {PLACE_IMAGE "units/human-loyalists/general-idle-5.png~RC(magenta>2)" 9 36}
+ {PLACE_IMAGE "units/human-loyalists/fencer-die5.png~RC(magenta>2)" 1 35}
+ {PLACE_IMAGE "units/human-loyalists/fencer-die3.png~RC(magenta>2)" 9 39}
+ {PLACE_IMAGE "units/human-loyalists/master-at-arms-victory-6.png~RC(magenta>2)" 8 33}
+ {PLACE_IMAGE "units/human-loyalists/duelist-die8.png~FL()~RC(magenta>2)" 9 34}
+ {PLACE_IMAGE "units/human-loyalists/spearman-death4.png~FL()~RC(magenta>2)" 8 34}
+ {PLACE_IMAGE "units/human-loyalists/lieutenant-die-9.png~RC(magenta>2)" 7 34}
+ {PLACE_IMAGE "units/human-loyalists/bowman-bow-attack-2.png~RC(magenta>2)" 1 33}
+ {PLACE_IMAGE "units/human-loyalists/master-at-arms-melee-2-1.png~RC(magenta>2)" 1 34}
+ {PLACE_IMAGE "units/human-loyalists/halberdier-pierce-s.png~RC(magenta>2)" 2 32}
+ {PLACE_IMAGE "units/human-loyalists/javelineer-attack-ranged-2.png~FL()~RC(magenta>2)" 4 32}
+ {PLACE_IMAGE "units/human-loyalists/pikeman-die-5.png~FL()~RC(magenta>2)" 2 34}
+ {PLACE_IMAGE "units/human-loyalists/spearman-death4.png~FL()~RC(magenta>2)" 3 34}
+ {PLACE_IMAGE "units/human-loyalists/sergeant-idle-4.png~RC(magenta>2)" 3 39}
+ {PLACE_IMAGE "units/human-loyalists/sergeant-crossbow-attack2.png~RC(magenta>2)" 1 39}
+ {PLACE_IMAGE "units/human-loyalists/pikeman-attack-s.png~RC(magenta>2)" 2 38}
+ {PLACE_IMAGE "units/human-loyalists/spearman-death4.png~FL()~RC(magenta>2)" 2 40}
+ {PLACE_IMAGE "units/human-loyalists/pikeman-attack-ne.png~RC(magenta>2)" 1 40}
+ {PLACE_IMAGE "units/human-loyalists/spearman-death4.png~RC(magenta>2)" 7 40}
+
+ {PLACE_IMAGE "units/woses/wose-ancient-attack-2.png~RC(magenta>7)" 4 35}
+ {PLACE_IMAGE "units/woses/wose-elder-attack-1.png~FL()~RC(magenta>7)" 9 38}
+ {PLACE_IMAGE "units/woses/wose-ancient-defend.png~FL()~RC(magenta>7)" 7 37}
+ {PLACE_IMAGE "units/woses/wose-elder-attack-2.png~FL()~RC(magenta>7)" 14 36}
+ {PLACE_IMAGE "units/woses/wose-ancient.png~FL()~RC(magenta>7)" 2 33}
+ {PLACE_IMAGE "units/woses/wose-die-fall-2.png~FL()~RC(magenta>7)" 2 39}
+
+ {PLACE_IMAGE "units/elves-wood/druid-magic-3.png" 0 17}
+ {PLACE_IMAGE "units/elves-wood/druid-magic-3.png" 1 17}
+ {PLACE_IMAGE "units/elves-wood/druid-magic-3.png" 2 16}
+ {PLACE_IMAGE "units/elves-wood/druid-magic-3.png" 3 16}
+ {PLACE_IMAGE "units/elves-wood/druid-magic-3.png" 4 15}
+ {PLACE_IMAGE "units/elves-wood/druid-magic-4.png~FL()" 3 15}
+ {PLACE_IMAGE "units/elves-wood/druid-magic-4.png~FL()" 2 15}
+ {PLACE_IMAGE "units/elves-wood/druid-magic-4.png~FL()" 1 16}
+ {PLACE_IMAGE "units/elves-wood/druid-magic-4.png~FL()" 0 16}
+ {PLACE_IMAGE "units/elves-wood/druid-magic-3.png" 0 15}
+ {PLACE_IMAGE "units/elves-wood/druid-magic-3.png" 1 15}
+ {PLACE_IMAGE "units/elves-wood/druid-magic-3.png" 2 14}
+
+ {PLACE_IMAGE "units/goblins/spearman-ne-defend.png~FL()~RC(magenta>1)" 4 18}
+ {PLACE_IMAGE "units/goblins/spearman-ne.png~FL()~RC(magenta>1)" 6 18}
+ {PLACE_IMAGE "units/goblins/spearman-ne.png~FL()~RC(magenta>1)" 7 18}
+ {PLACE_IMAGE "units/goblins/spearman-ne.png~FL()~RC(magenta>1)" 4 19}
+ {PLACE_IMAGE "units/goblins/spearman-ne.png~RC(magenta>1)" 2 20}
+ {PLACE_IMAGE "units/goblins/spearman-ne.png~RC(magenta>1)" 3 20}
+ {PLACE_IMAGE "units/goblins/spearman-idle-4.png~RC(magenta>1)" 6 19}
+ {PLACE_IMAGE "units/goblins/spearman-idle-4.png~FL()~RC(magenta>1)" 5 20}
+ {PLACE_IMAGE "units/goblins/spearman-idle-4.png~FL()~RC(magenta>1)" 5 18}
+ {PLACE_IMAGE "units/goblins/spearman-defend.png~RC(magenta>1)" 4 20}
+ {PLACE_IMAGE "units/goblins/spearman-ne.png~RC(magenta>1)" 6 17}
+ {PLACE_IMAGE "units/goblins/spearman-idle-4.png~RC(magenta>1)" 3 19}
+ {PLACE_IMAGE "units/goblins/impaler-ne-defend.png~FL()~RC(magenta>1)" 5 19}
+
+ {PLACE_IMAGE "units/trolls/lobber-attack-melee.png~RC(magenta>6)" 7 6}
+ {PLACE_IMAGE "units/trolls/warrior-attack-3.png~RC(magenta>6)" 7 4}
+ {PLACE_IMAGE "units/trolls/whelp-attack-2.png~RC(magenta>6)" 9 4}
+ {PLACE_IMAGE "units/trolls/troll-hero-attack-se-2.png~RC(magenta>6)" 6 5}
+ {PLACE_IMAGE "units/trolls/troll-hero-attack-ne-2.png~RC(magenta>6)" 7 7}
+ {PLACE_IMAGE "units/trolls/shaman-fist-4.png~RC(magenta>6)" 9 5}
+ {PLACE_IMAGE "units/trolls/grunt-attack-1.png~RC(magenta>6)" 5 5}
+ {PLACE_IMAGE "units/trolls/shaman-defend-2.png~RC(magenta>6)" 5 6}
+ {PLACE_IMAGE "units/trolls/grunt-attack-2.png~RC(magenta>6)" 8 6}
+ {PLACE_IMAGE "units/trolls/shaman-fist-3.png~RC(magenta>6)" 8 3}
+ {PLACE_IMAGE "units/trolls/whelp-attack-1.png~RC(magenta>6)" 7 5}
+ {PLACE_IMAGE "units/trolls/warrior-attack-2.png~RC(magenta>6)" 8 5}
+ {PLACE_IMAGE "units/trolls/whelp-attack-2.png~RC(magenta>6)" 4 6}
+ {PLACE_IMAGE "units/trolls/grunt-attack-1.png~RC(magenta>6)" 10 3}
+ {PLACE_IMAGE "units/trolls/lobber-attack-melee.png~RC(magenta>6)" 4 4}
+ {PLACE_IMAGE "units/trolls/shaman-ranged-3.png~RC(magenta>6)" 10 4}
+ {PLACE_IMAGE "units/trolls/grunt-attack-3.png~RC(magenta>6)" 4 7}
+ {PLACE_IMAGE "units/trolls/grunt-attack-3.png~RC(magenta>6)" 10 5}
+ {PLACE_IMAGE "units/trolls/whelp-attack-1.png~RC(magenta>6)" 3 8}
+ {PLACE_IMAGE "units/trolls/grunt-attack-1.png~RC(magenta>6)" 12 3}
+ {PLACE_IMAGE "units/trolls/troll-hero-attack-se-2.png~RC(magenta>6)" 2 8}
+ {PLACE_IMAGE "units/trolls/warrior-attack-2.png~RC(magenta>6)" 2 7}
+
+ {PLACE_IMAGE "units/human-outlaws/bandit-melee-3.png~FL()~RC(magenta>1)" 13 3}
+ {PLACE_IMAGE "units/human-outlaws/highwayman-melee-4.png~FL()~RC(magenta>1)" 12 4}
+ {PLACE_IMAGE "units/human-outlaws/thug-melee-4.png~FL()~RC(magenta>1)" 21 1}
+ {PLACE_IMAGE "units/human-outlaws/thug-melee-2.png~FL()~RC(magenta>1)" 18 1}
+ {PLACE_IMAGE "units/human-outlaws/outlaw+female-melee-2.png~FL()~RC(magenta>1)" 12 5}
+ {PLACE_IMAGE "units/human-outlaws/thief+female-defend-2-2.png~FL()~RC(magenta>1)" 13 5}
+ {PLACE_IMAGE "units/human-outlaws/assassin-melee-2-2.png~FL()~RC(magenta>1)" 15 3}
+ {PLACE_IMAGE "units/human-outlaws/bandit-melee-4.png~FL()~RC(magenta>1)" 14 4}
+ {PLACE_IMAGE "units/human-outlaws/footpad-melee-1.png~FL()~RC(magenta>1)" 16 3}
+ {PLACE_IMAGE "units/human-outlaws/outlaw-melee-1.png~FL()~RC(magenta>1)" 16 2}
+ {PLACE_IMAGE "units/human-outlaws/fugitive+female-melee-1.png~FL()~RC(magenta>1)" 17 4}
+ {PLACE_IMAGE "units/human-outlaws/thief+female-attack.png~FL()~RC(magenta>1)" 17 2}
+ {PLACE_IMAGE "units/human-outlaws/trapper-attack-melee.png~FL()~RC(magenta>1)" 18 2}
+ {PLACE_IMAGE "units/human-outlaws/ranger-sword-attack4.png~FL()~RC(magenta>1)" 18 3}
+ {PLACE_IMAGE "units/human-outlaws/highwayman-melee-6.png~FL()~RC(magenta>1)" 19 1}
+ {PLACE_IMAGE "units/human-outlaws/assassin-defend-2.png~FL()~RC(magenta>1)" 15 4}
+
+ {PLACE_IMAGE "units/saurians/soothsayer/soothsayer-ne-run6.png~FL()~RC(magenta>5)" 6 9}
+ {PLACE_IMAGE "units/saurians/soothsayer/soothsayer-ne-run4.png~FL()~RC(magenta>5)" 14 7}
+ {PLACE_IMAGE "units/saurians/soothsayer/soothsayer-ne-run5.png~FL()~RC(magenta>5)" 10 8}
+ {PLACE_IMAGE "units/saurians/flanker/flanker-ne-run2.png~FL()~RC(magenta>5)" 10 7}
+ {PLACE_IMAGE "units/saurians/flanker/flanker-ne-throw2.png~FL()~RC(magenta>5)" 6 8}
+ {PLACE_IMAGE "units/saurians/flanker/flanker-ne-run6.png~FL()~RC(magenta>5)" 8 9}
+ {PLACE_IMAGE "units/saurians/flanker/flanker-ne-throw3.png~FL()~RC(magenta>5)" 11 7}
+ {PLACE_IMAGE "units/saurians/flanker/flanker-ne-melee2.png~FL()~RC(magenta>5)" 9 8}
+ {PLACE_IMAGE "units/saurians/flanker/flanker-n-melee9.png~FL()~RC(magenta>5)" 5 9}
+ {PLACE_IMAGE "units/saurians/ambusher/ambusher-ne-run6.png~FL()~RC(magenta>5)" 12 6}
+ {PLACE_IMAGE "units/saurians/ambusher/ambusher-ne-run1.png~FL()~RC(magenta>5)" 13 10}
+ {PLACE_IMAGE "units/saurians/ambusher/ambusher-ne-run4.png~FL()~RC(magenta>5)" 7 9}
+ {PLACE_IMAGE "units/saurians/ambusher/ambusher-ne-throw6.png~FL()~RC(magenta>5)" 12 9}
+ {PLACE_IMAGE "units/saurians/ambusher/ambusher-ne-melee9.png~FL()~RC(magenta>5)" 5 8}
+ {PLACE_IMAGE "units/saurians/ambusher/ambusher-ne-run12.png~FL()~RC(magenta>5)" 11 8}
+ {PLACE_IMAGE "units/saurians/oracle/oracle-ne-run12.png~FL()~RC(magenta>5)" 11 9}
+ {PLACE_IMAGE "units/saurians/oracle/oracle-ne-run9.png~FL()~RC(magenta>5)" 14 9}
+ [/event]
+
+ [event]
+ name=start
+
+ [message]
+ caption= _"Aethermaw - Created by Doc Paterson"
+ speaker=narrator
+ image=scenery/rock-cairn.png
+ #wmllint: local spellings Note
+ #wmllint: display on
+ message= _ "The Arch Mage Sulla has transported your armies to this bizarre nexus, and demands that you amuse her by doing battle.
+
+
+
+
+Note:
+
+Units may not move into a hex with a rock cairn. They may, however, be recruited to, and move from, such hexes.
+
+Beginning on turn 4, the Arch Mage Sulla will begin to unite the two halves of the battlefield. The process will be complete by the end of turn 6.
+"
+ #wmllint: display off
+ [/message]
+ [/event]
+
+ [event]
+ name=side 1 turn 4
+ first_time_only=yes
+
+ {FLASH_WHITE {QUAKE lightning.ogg}}
+
+ [message]
+ speaker=narrator
+ message= _ "The Aethermaw growls."
+ image=wesnoth-icon.png
+ [/message]
+ [terrain]
+ x=13,14,15
+ y=13,13,14
+ terrain=Chw
+ [/terrain]
+ [/event]
+ [event]
+ name=side 2 turn 4
+ first_time_only=yes
+
+ {FLASH_WHITE {QUAKE lightning.ogg}}
+
+ [message]
+ speaker=narrator
+ message= _ "The Aethermaw growls."
+ image=wesnoth-icon.png
+ [/message]
+ [terrain]
+ x=37,36,35
+ y=29,28,28
+ terrain=Chw
+ [/terrain]
+ [/event]
+
+ [event]
+ name=side 1 turn 5
+ first_time_only=yes
+
+ {FLASH_WHITE {QUAKE lightning.ogg}}
+ [terrain]
+ x=19,18
+ y=17,16
+ terrain=Wwf
+ [/terrain]
+ [/event]
+ [event]
+ name=side 2 turn 5
+ first_time_only=yes
+
+ {FLASH_WHITE {QUAKE lightning.ogg}}
+
+ [terrain]
+ x=31,32
+ y=25,25
+ terrain=Wwf
+ [/terrain]
+ [/event]
+
+ [event]
+ name=side 1 turn 6
+ first_time_only=yes
+
+ {FLASH_WHITE {QUAKE lightning.ogg}}
+
+ [terrain]
+ x=17,19,20,17,16
+ y=16,18,18,15,14
+ terrain=Wwf
+ [/terrain]
+ [/event]
+ [event]
+ name=side 2 turn 6
+ first_time_only=yes
+
+ {FLASH_WHITE {QUAKE lightning.ogg}}
+
+ [terrain]
+ x=33,30,31,33,34
+ y=26,23,24,27,27
+ terrain=Wwf
+ [/terrain]
+ [/event]
+
+ [event]
+ name=side 1 turn 6
+ first_time_only=yes
+
+ [terrain]
+ x=22
+ y=19
+ terrain=Chw^Xo
+ [/terrain]
+ [/event]
+ [event]
+ name=side 2 turn 6
+ first_time_only=yes
+
+ [terrain]
+ x=28
+ y=22
+ terrain=Chw^Xo
+ [/terrain]
+ [/event]
+[/multiplayer]
diff --git a/data/multiplayer/scenarios/2p_Hamlets.cfg b/data/multiplayer/scenarios/2p_Hamlets.cfg
index 3ff018e8027..70bcd898f84 100644
--- a/data/multiplayer/scenarios/2p_Hamlets.cfg
+++ b/data/multiplayer/scenarios/2p_Hamlets.cfg
@@ -33,8 +33,8 @@
user_team_name= _ "teamname^South"
fog=yes
[village]
- x=18
- y=24
+ x=22
+ y=27
[/village]
[/side]
[/multiplayer]
diff --git a/data/multiplayer/scenarios/2p_Howling_Ghost_Badlands.cfg b/data/multiplayer/scenarios/2p_Howling_Ghost_Badlands.cfg
index 8a3b680793d..fd6ece87b62 100644
--- a/data/multiplayer/scenarios/2p_Howling_Ghost_Badlands.cfg
+++ b/data/multiplayer/scenarios/2p_Howling_Ghost_Badlands.cfg
@@ -6,14 +6,7 @@
description= _ "Little remains of this once wealthy mining colony, now a haven for raiders and thieves."
map_data="{multiplayer/maps/2p_Howling_Ghost_Badlands.map}"
random_start_time="no"
-
- {MORNING}
- {AFTERNOON}
- {DUSK}
- {FIRST_WATCH}
- {SECOND_WATCH}
- {DAWN}
-
+ {DEFAULT_SCHEDULE}
{DEFAULT_MUSIC_PLAYLIST}
{PLACE_IMAGE scenery/village-human-burned3.png 6 1}
diff --git a/data/multiplayer/scenarios/2p_Thousand_Stings_Garrison.cfg b/data/multiplayer/scenarios/2p_Thousand_Stings_Garrison.cfg
index 6eb0ff1b2a6..069ea8f2e06 100644
--- a/data/multiplayer/scenarios/2p_Thousand_Stings_Garrison.cfg
+++ b/data/multiplayer/scenarios/2p_Thousand_Stings_Garrison.cfg
@@ -39,12 +39,7 @@
description= _ "A strange place. Designed by Doc Paterson"
random_start_time="no"
- {MORNING}
- {AFTERNOON}
- {DUSK}
- {FIRST_WATCH}
- {SECOND_WATCH}
- {DAWN}
+ {DEFAULT_SCHEDULE}
{DEFAULT_MUSIC_PLAYLIST}
diff --git a/players_changelog b/players_changelog
index 3d4bf418a33..38e1e841676 100644
--- a/players_changelog
+++ b/players_changelog
@@ -31,6 +31,10 @@ Version 1.9.9+svn:
Indonesian, Irish, Italian, Japanese, Korean, Latin, Lithuanian,
Old English, Portuguese (Brazil), Russian, Slovak, Swedish.
+ * Multiplayer:
+ * New map: Aethermaw.
+ * Updated maps: Hamlets, Howling Ghost Badlands, Thousand Stings Garrison.
+
* Terrain:
* Oasis may be placed on any terrain, aliased to base.
* New rotting variant for wooden bridge.