diff --git a/data/campaigns/The_Rise_Of_Wesnoth/maps/04a_The_Swamp_of_Esten.map b/data/campaigns/The_Rise_Of_Wesnoth/maps/04a_The_Swamp_of_Esten.map
index bad8046a1faf..0023fe912d7d 100644
--- a/data/campaigns/The_Rise_Of_Wesnoth/maps/04a_The_Swamp_of_Esten.map
+++ b/data/campaigns/The_Rise_Of_Wesnoth/maps/04a_The_Swamp_of_Esten.map
@@ -1,8 +1,8 @@
 Ss, Ss, Gs, Re, Gs, Gs^Fdw, Ss, Ss, Gs^Fdw, Ww, Ww, Ww, Gs^Fdw, Gs^Fdw, Ss, Gs^Fdw, Gs, Hhd, Hhd, Hhd, Hhd, Hhd, Hhd, Hhd, Hhd, Hhd, Gs^Fdw, Gs^Fdw, Ww, Ww, Ww, Gs^Fdw, Gs^Fdw, Gs^Fdw, Ss, Gs^Fdw, Gs^Fdw
 Ss, Ss, Gd^Vh, Re, Gs, Gs^Fdw, Ss, Ss, Gs^Fdw, Ww, Ww, Ww, Gs^Fdw, Gs^Fdw, Ss, Gs^Fdw, Gs^Vh, Hhd, Hhd^Fdw, Hhd^Fdw, Hhd^Fdw, Hhd, Hhd, Hhd, Hhd, Hhd, Gs^Fdw, Gs^Fdw, Ww, Ww, Ww, Gs^Fdw, Gs^Fdw, Gs^Fdw, Ss, Gs^Fdw, Gs^Fdw
-Ss, Ss, Gd^Fdw, Re, Re, Ss, Ss, Gs^Fdw, Gs^Fdw, Ww, Wo, Ww, Gs^Fdw, Ss, Ss, Ss, Gs, Hhd, Gs^Fdw, Gs^Fdw, Gs^Fdw, Hhd, Hhd, Hhd, Ce, Re, Re, Gs^Vh, Ww, Ww, Ww, Ss, Ss, Ss, Ss, Ss, Ss
-Ss, Ss, Gs^Fdw, Gd^Fdw, Re, Gd, Gd^Fdw, Gs^Fdw, Gs^Fdw, Ww, Wo, Ww, Ss, Ss, Ss^Vhs, Ss, Gs, Gs, Re, Gs^Vh, Re, Re, Re, Re, 2 Ke, Ce, Re, Ss, Ww, Ww, Ww, Ss, Ss, Ss, Ss, Gd, Gd
-Ss, Ss, Ss, Gs, Re, Gd, Ss, Gs^Vht, Ss, Ww, Ww, Ww, Ss, Ss, Gs^Fdw, Ss, Re, Re, Re, Re, Gs^Fdw, Hhd^Fdw, Hhd, Ce, Ce, Ss, Ss, Ss, Ww, Ww, Gs, Gs, Gs, Ss, Ss, Gd, Gd
+Ss, Ss, Gd^Fdw, Re, Re, Ss, Ss, Gs^Fdw, Gs^Fdw, Ww, Wo, Ww, Gs^Fdw, Ss, Ss, Ss, Gs, Hhd, Gs^Fdw, Gs^Fdw, Gs^Fdw, Hhd, Hhd, Hhd, Cer, Re, Re, Gs^Vh, Ww, Ww, Ww, Ss, Ss, Ss, Ss, Ss, Ss
+Ss, Ss, Gs^Fdw, Gd^Fdw, Re, Gd, Gd^Fdw, Gs^Fdw, Gs^Fdw, Ww, Wo, Ww, Ss, Ss, Ss^Vhs, Ss, Gs, Gs, Re, Gs^Vh, Re, Re, Re, Re, 2 Ker, Cer, Re, Ss, Ww, Ww, Ww, Ss, Ss, Ss, Ss, Gd, Gd
+Ss, Ss, Ss, Gs, Re, Gd, Ss, Gs^Vht, Ss, Ww, Ww, Ww, Ss, Ss, Gs^Fdw, Ss, Re, Re, Re, Re, Gs^Fdw, Hhd^Fdw, Hhd, Cer, Cer, Ss, Ss, Ss, Ww, Ww, Gs, Gs, Gs, Ss, Ss, Gd, Gd
 Ss, Ss, Ss^Vhs, Ss, Ss, Re, Ss, Ss, Ss, Ss, Ww, Ww, Wwf, Ss, Rr, Re, Ss, Ss, Ss, Re, Gs^Fdw, Gs^Fdw, Hhd^Fdw, Hhd, Gs^Fdw, Re, Ss, Ww, Ww, Ss, Gs^Fdw, Gs^Fdw, Gd, Ss, Gd, Gd, Gd
 Ss, Ss, Ss, Ss, Ss, Re, Re, Ss, Ss, Ss, Wwf, Wwf, Wwf, Wwf, Wwf, Gs^Fdw, Ss, Gs^Ft, Ss, Ss, Gs^Fdw, Hhd^Fdw, Hhd, Gs^Fdw, Ss, Ss, Ss, Ww, Ww, Gs^Fdw, Hhd^Fdw, Gs^Fdw, Gd, Gs^Vht, Gs^Fdw, Gs^Fdw, Gs^Fdw
 Ss, Ss, Ss, Ss, Gs, Ss, Ss, Rr, Ss, Ss, Rr, Wwf, Wwf, Ww, Ww, Gs^Fdw, Gs^Fdw, Ss, Ss, Ss, Gs^Fdw, Gs^Fdw, Gs^Fdw, Gs^Vh, Ss, Ss, Ss, Ww, Ww, Gs^Fdw, Hhd^Fdw, Hhd^Fdw, Gd, Gd, Gd, Gs^Fdw, Gs^Fdw
diff --git a/data/campaigns/The_Rise_Of_Wesnoth/maps/17c_Troll_Hole.map b/data/campaigns/The_Rise_Of_Wesnoth/maps/17c_Troll_Hole.map
index 82f827d8c0f8..0266d28b4541 100644
--- a/data/campaigns/The_Rise_Of_Wesnoth/maps/17c_Troll_Hole.map
+++ b/data/campaigns/The_Rise_Of_Wesnoth/maps/17c_Troll_Hole.map
@@ -2,8 +2,8 @@ Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu,
 Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
 Xu, Xu, Xu, Xu, Uu^Tf, Uu^Vu, Uh, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu^Vu, Xu, Uu^Tf, Xu, Uu^Vu, Xu, Uu^Tf, Xu, Xu, Xu
 Xu, Xu, Uh, Uh, Uu^Tf, Uu^Tf, Uu^Tf, Uu, Uu^Vu, Xu, Xu, Xu, Uu, Uu^Vu, Uu, Uu^Tf, Uu, Xu, Xu, Xu, Xu, Uh, Uu^Tf, Uu^Tf, Uu, Uu, Uu, Uu, Uu^Tf, Xu, Xu, Xu
-Xu, Xu, Uu, Uu, Cud, Uh, Cud, Uu, Uu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Uu, Uu, Cud, Uu, Cud, Uu, Uu^Vu, Xu, Xu, Xu
-Xu, Xu, Uu^Vu, Uu, Cud, 2 Kud, Cud, Uu, Xu, Xu, Xu, Xu, Uu, Uu, Xu, Xu, Xu, Uu, Xu, Xu, Xu, Xu, Uu, Ur, Cud, 3 Kud, Cud, Uu, Uh, Uh, Xu, Xu
+Xu, Xu, Uu, Uu, Cte, Uh, Cte, Uu, Uu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Uu, Uu, Cte, Uu, Cte, Uu, Uu^Vu, Xu, Xu, Xu
+Xu, Xu, Uu^Vu, Uu, Cte, 2 Kte, Cte, Uu, Xu, Xu, Xu, Xu, Uu, Uu, Xu, Xu, Xu, Uu, Xu, Xu, Xu, Xu, Uu, Ur, Cte, 3 Kte, Cte, Uu, Uh, Uh, Xu, Xu
 Xu, Xu, Uu, Uu, Uu, Uu, Uu, Uu, Uu, Uu^Vu, Uu, Uu, Uu^Tf, Uu, Uu, Xu, Uu, Uu, Uh, Uh, Xu, Uu^Vu, Ur, Ur, Uu, Ur, Ur, Uu, Uh, Uh, Xu, Xu
 Xu, Xu, Uh, Uu, Uh, Uu, Uu, Uu, Xu, Uu, Uu, Uu^Tf, Xu, Xu, Uu, Uu, Uu, Xu, Xu, Uh, Uu, Uu, Uu, Xu, Uu, Ur, Uu^Vu, Uu, Xu, Uh, Xu, Xu
 Xu, Xu, Uh, Uu^Vu, Xu, Xu, Uh, Uu, Uu, Xu, Uu, Xu, Uu, Uu, Xu, Uu^Vu, Xu, Uu, Uu, Xu, Uu, Xu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
@@ -22,8 +22,8 @@ Xu, Xu, Xu, Xu, Xu, Xu, Uh, Uu, Uu, Xu, Xu, Xu, Uu, Xu, Xu, Uh^Ii, Uh, Xu, Uu^Ii
 Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Ur, Uu^Tf, Xu, Uh, Uu, Xu, Xu, Xu, Xu, Xu, Uu, Xu, Xu, Uu^Vu, Uu, Uu, Uu, Uu^Vu, Xu, Xu, Xu, Xu, Xu, Xu
 Xu, Xu, Xu, Xu, Xu, Uu^Vu, Uu, Uu^Tf, Xu, Ur, Ur, Ur, Xu, Uu, Uu, Uu^Vu, Uu, Uu, Xu, Uu, Uu, Uu, Xu, Uu, Ur, Uu, Uu, Xu, Uu^Vu, Xu, Xu, Xu
 Xu, Xu, Uh, Uu^Vu, Uu, Uu, Uu, Xu, Uu, Uu^Vu, Uu, Uu, Uu^Tf, Xu, Uu, Uu, Uu, Xu, Uu, Uu, Xu, Uu, Uu, Xu, Ur, Ur, Uu, Uu, Uu^Tf, Xu, Xu, Xu
-Xu, Xu, Uu, Uu, Cud, Uu, Cud, Uu, Xu, Uu, Uu^Tf, Uu, Uu, Uu, Xu, Xu, Xu, Uu, Uu, Xu, Xu, Xu, Xu, Uu, Cud, Ur, Cud, Uu, Uu^Tf, Uu^Tf, Xu, Xu
-Xu, Xu, Uu^Tf, Uu, Cud, 4 Kud, Cud, Uu, Uh, Xu, Xu, Xu, Xu, Uu, Xu, Uu^Vu, Uu, Uu, Uh, Uh, Xu, Xu, Uu, Uu^Vu, Cud, 5 Kud, Cud, Uu^Tf, Uu^Tf, Xu, Xu, Xu
+Xu, Xu, Uu, Uu, Cte, Uu, Cte, Uu, Xu, Uu, Uu^Tf, Uu, Uu, Uu, Xu, Xu, Xu, Uu, Uu, Xu, Xu, Xu, Xu, Uu, Cte, Ur, Cte, Uu, Uu^Tf, Uu^Tf, Xu, Xu
+Xu, Xu, Uu^Tf, Uu, Cte, 4 Kte, Cte, Uu, Uh, Xu, Xu, Xu, Xu, Uu, Xu, Uu^Vu, Uu, Uu, Uh, Uh, Xu, Xu, Uu, Uu^Vu, Cte, 5 Kte, Cte, Uu^Tf, Uu^Tf, Xu, Xu, Xu
 Xu, Xu, Uu^Tf, Uu, Uu, Uu, Uh, Uh, Uh, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Uu^Tf, Xu, Xu, Uu, Xu, Uu, Uu, Uh, Uh, Uu^Tf, Uh, Xu, Xu, Xu
 Xu, Xu, Xu, Uu^Vu, Uu, Uu, Uh, Uh, Uh, Xu, Xu, Xu, Xu, Xu, Xu, Uu^Tf, Xu, Uu^Tf, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Uh, Xu, Xu, Xu
 Xu, Xu, Xu, Xu, Uu^Tf, Uu^Vu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu^Vu, Xu, Uh, Xu, Xu, Xu, Xu
diff --git a/data/campaigns/The_Rise_Of_Wesnoth/maps/19_The_Vanguard.map b/data/campaigns/The_Rise_Of_Wesnoth/maps/19_The_Vanguard.map
index 8be2418b297e..f76188d18201 100644
--- a/data/campaigns/The_Rise_Of_Wesnoth/maps/19_The_Vanguard.map
+++ b/data/campaigns/The_Rise_Of_Wesnoth/maps/19_The_Vanguard.map
@@ -2,9 +2,9 @@ Gg, Gg, Gg, Gg, Gs^Fds, Gg, Gg, Gg, Ss, Ss, Hh^Fds, Hh, Gs^Fds, Gs^Fds, Gs^Fds,
 Gg, Gg, Gg, Gg, Gs^Fds, Gg, Gg^Vc, Gg, Ss, Ss, Hh^Fds, Hh^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Ss, Gs^Fds, Gs^Fds, Gg^Vc, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gs^Fds, Gs^Fds, Gs^Fds
 Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gg^Vc, Hh, Mm, Hh^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Qxe, Gg, Gs^Fds, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds
 Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Hh, Mm, Mm, Hh^Fds, Gs^Fds, Gg^Vc, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gg^Vc, Gs^Fds, Ss, Ss, Gs^Fds, Gs^Fds
-Gg, Gg, Gg, Qxe, Gg, Gs^Fds, Gg, Gg, Gg, Hh, Hh, Hh, Gg, Gg, Gs^Fds, Chr, Chr, Gg, Gg, Gg, Qxe, Qxe, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Ss, Ss, Gs^Fds, Gs^Fds
-Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gg, Qxe, Gg, Qxe, Qxe, Gg, Gg, Hh, Gg, Gs^Fds, Chr, 4 Khr, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds
-Gg, Gg, Gs^Fds, Gg, Gg, Gg, Gg, Gg, Gg, Qxe, Gg, Gg, Gg, Gg, Gg, Chr, Gg, Gg, Gg, Qxe, Gg, Gg, Gg, Gg, Gg^Vc, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gg^Vc, Gg
+Gg, Gg, Gg, Qxe, Gg, Gs^Fds, Gg, Gg, Gg, Hh, Hh, Hh, Gg, Gg, Gs^Fds, Cte, Cte, Gg, Gg, Gg, Qxe, Qxe, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Ss, Ss, Gs^Fds, Gs^Fds
+Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gg, Qxe, Gg, Qxe, Qxe, Gg, Gg, Hh, Gg, Gs^Fds, Cte, 4 Kte, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds
+Gg, Gg, Gs^Fds, Gg, Gg, Gg, Gg, Gg, Gg, Qxe, Gg, Gg, Gg, Gg, Gg, Cte, Gg, Gg, Gg, Qxe, Gg, Gg, Gg, Gg, Gg^Vc, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gg^Vc, Gg
 Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Qxe, Gg, Gg, Gg, Gs^Fds, Gg^Vc, Gg, Qxe, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds
 Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gg^Vc, Gs^Fds, Gg, Gg, Gg, Gg, Gg, Gg, Qxe, Qxe, Gg, Gs^Fds, Gs^Fds, Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gg, Gs^Fds, Gg, Gs^Fds, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds
 Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Ss, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Qxe, Gs^Fds, Gg, Qxe, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gg^Ecf, Gg, Gg, Gg, Gg, Gg, Ss, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds
diff --git a/data/campaigns/The_Rise_Of_Wesnoth/maps/20_Return_of_the_Fleet.map b/data/campaigns/The_Rise_Of_Wesnoth/maps/20_Return_of_the_Fleet.map
index d668d9739bad..07bdae168210 100644
--- a/data/campaigns/The_Rise_Of_Wesnoth/maps/20_Return_of_the_Fleet.map
+++ b/data/campaigns/The_Rise_Of_Wesnoth/maps/20_Return_of_the_Fleet.map
@@ -17,9 +17,9 @@ Wo, Wo, Wo, Wo, Ww, Ww, Ww, Ww, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Ww, Ww, Ww, Gg, Ww,
 Wo, Wo, Wo, Ww, Ww, Ww, Ww, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Gg, Gg, Gg, Gg, Gs^Fds, Gg^Vc, Gg, Ww, Ww, Ww, Ww, Ww, Ss, Ss^Vhs, Ww, Ww, Ss, Ww, Ss, Ww, Ss, Ss, Gs^Fds, Gg, Gs^Fds, Gs^Fds
 Wo, Wo, Ww, Ww, Gg, Ww, Ww, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Ww, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gg, Gg, Ww^Bw\, Ww, Gg, Gg, Gg, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Gs^Fds, Gs^Fds, Gg, Gg, Gg
 Wo, Wo, Ww, Gg^Vc, Hh, Gg, Gg^Vc, Ww, Ww, Wo, Wo, Wo, Wo, Ww, Ww, Ds, Gs^Fds, Gs^Fds, Ww, Ww, Ww, Gg, Ww, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Ss, Gg, Ss, Ss, Gs^Fds, Ss, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gg^Vh, Gg, Gg
-Wo, Wo, Ww, Gs^Fds, Ch, Gg, Gg, Ds, Ww, Wo, Wo, Wo, Wo, Ww, Wo, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Gg, Gg, Gs^Fds, Gs^Fds, Ss, Ss, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gg
-Wo, Wo, Ww, Ds, 2 Kh, Gs^Fds, Gg, Ds, Ww, Ww, Ww, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Gg, Gg, Gg, Ww, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Ss, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Ss, Gs^Fds, Gs^Fds, Ss, Gs^Fds, Gs^Fds, Gg, Gg, Gs^Fds, Gs^Fds
-Wo, Wo, Ww, Ch, Hh, Ch, Gg, Gg, Ww, Ww, Ww, Wo, Wo, Wo, Ww, Ww, Ds, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg^Vh, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Ss, Gg^Ve, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gs^Fds, Gs^Fds, Gs^Fds
+Wo, Wo, Ww, Gs^Fds, Chr, Gg, Gg, Ds, Ww, Wo, Wo, Wo, Wo, Ww, Wo, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Gg, Gg, Gs^Fds, Gs^Fds, Ss, Ss, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gg
+Wo, Wo, Ww, Ds, 2 Khr, Gs^Fds, Gg, Ds, Ww, Ww, Ww, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Gg, Gg, Gg, Ww, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Ss, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Ss, Gs^Fds, Gs^Fds, Ss, Gs^Fds, Gs^Fds, Gg, Gg, Gs^Fds, Gs^Fds
+Wo, Wo, Ww, Chr, Hh, Chr, Gg, Gg, Ww, Ww, Ww, Wo, Wo, Wo, Ww, Ww, Ds, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg^Vh, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Ss, Gg^Ve, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gs^Fds, Gs^Fds, Gs^Fds
 Wo, Wo, Ww, Gs^Fds, Mm, Hh, Gs^Fds, Gg, Ww, Ww, Wo, Wo, Wo, Wo, Ww, Ww, Ds, Gg, Gg, Gg, Gg^Vh, Gg, Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gg, Gs^Fds, Gs^Fds, Gg, Gg
 Wo, Wo, Ww, Ds, Gg, Hh, Gg^Vc, Gg, Ww, Ww, Wo, Wo, Wo, Wo, Ww, Ww, Ds, Ds, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gg^Vh, Gs^Fds, Gs^Fds, Gs^Fds
 Wo, Wo, Wo, Ww, Ww, Gg, Ww, Ww, Ww, Ww, Ww, Wo, Wo, Ww, Ww, Ww, Ds, Ds, Gg, Gg, Ss, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fms, Gs^Fds, Gs^Fms, Gs^Fds, Gs^Fms, Gs^Fds
diff --git a/data/campaigns/The_Rise_Of_Wesnoth/maps/22_The_Rise_of_Wesnoth.map b/data/campaigns/The_Rise_Of_Wesnoth/maps/22_The_Rise_of_Wesnoth.map
index 785d99f92e02..da2c302bc4dd 100644
--- a/data/campaigns/The_Rise_Of_Wesnoth/maps/22_The_Rise_of_Wesnoth.map
+++ b/data/campaigns/The_Rise_Of_Wesnoth/maps/22_The_Rise_of_Wesnoth.map
@@ -33,9 +33,9 @@ Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Ww, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Ww, Ww, Ds,
 Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Wo, Ww, Ww, Ww, Ds, Gg^Vc, Gg, Re, Re, Re, Ce, Ce, Gs^Fds, Gs^Fds, Gs^Fdw, Ss, Gs^Fdw, Rb^Fdw, Rb^Fdw, Rb^Fdw, Rb^Fdw, Rb^Vc, Gg, Gg, Re, Rb, Rb, Ww, Rb, Ww, Ww, Ww, Ww, Gg, Ww, Ww
 Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Gg, Gg, Gg, Re, Gg, Gg, Gg, Gg, Gs^Fdw, Rb^Fdw, Rb^Fdw, Gg, Rb^Fdw, Rb, Rb^Fdw, Rb, Gg, Rb, Re, Rb^Vc, Rb, Rb, Ss, Rb^Vc, Rb, Ss, Ww, Ww, Ww, Ww, Ww
 Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Ww, Gg^Ve, Gs^Fds, Ww, Ww, Ww, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Gg, Gg, Re, Re, Gg, Rb^Vc, Gg, Gg, Rb, Ss, Rb, Re, Rb, Re, Ss, Rb, Re, Rb, Ss, Rb, Rb, Ss, Rb, Ss, Rb, Rb, Ww, Rb, Rb
-Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Hh, Gs^Fds, Ch, Gs^Fds, Ww, Ww, Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ww^Bw\, Ds, Gg, Gg, Re, Re, Re, Rb, Rb, Rb, Re, Re, Rb, Re, Rb, Re, Re, Re, Re, Rb, Rb, Rb, Rb, Ss, Ss, Ss, Rb, Rb, Rb^Vc, Rb
-Wo, Wo, Wo, Wo, Wo, Wo, Ww, Hh, Mm, Mm, 3 Kh, Ww, Ww, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Ds, Re, Gg, Re, Gg^Ecf, Rb, Re, Re, Re, Rb, Rb, Rb, Rb, Ss, Rb, Rb, Rb, Rb, Urb, Urb, Rb, Rb, Ss, Rb^Vc, Ss, Rb, Rb, Rb, Rb
-Wo, Wo, Wo, Wo, Wo, Ww, Ww^Bw/, Ds, Mm, Ch, Hh, Ch, Gs^Fds, Ww, Ww, Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww^Bw\, Ds, Gg, Re, Gg, Gg, Gs^Fdw, Ss, Re, Hhd, Mm, Hhd, Rb, Ss, Ss, Rb^Vc, Rb, Rb, Qxe, Cud, Urb, Cud, Qxe, Rb, Rb, Rb, Ss, Rb, Rb, Rb
+Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Hh, Gs^Fds, Chr, Gs^Fds, Ww, Ww, Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ww^Bw\, Ds, Gg, Gg, Re, Re, Re, Rb, Rb, Rb, Re, Re, Rb, Re, Rb, Re, Re, Re, Re, Rb, Rb, Rb, Rb, Ss, Ss, Ss, Rb, Rb, Rb^Vc, Rb
+Wo, Wo, Wo, Wo, Wo, Wo, Ww, Hh, Mm, Mm, 3 Khr, Ww, Ww, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Ds, Re, Gg, Re, Gg^Ecf, Rb, Re, Re, Re, Rb, Rb, Rb, Rb, Ss, Rb, Rb, Rb, Rb, Urb, Urb, Rb, Rb, Ss, Rb^Vc, Ss, Rb, Rb, Rb, Rb
+Wo, Wo, Wo, Wo, Wo, Ww, Ww^Bw/, Ds, Mm, Chr, Hh, Chr, Gs^Fds, Ww, Ww, Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww^Bw\, Ds, Gg, Re, Gg, Gg, Gs^Fdw, Ss, Re, Hhd, Mm, Hhd, Rb, Ss, Ss, Rb^Vc, Rb, Rb, Qxe, Cud, Urb, Cud, Qxe, Rb, Rb, Rb, Ss, Rb, Rb, Rb
 Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ds, Hh, Mm, Mm, Gs^Fds, Gg^Vc, Ww, Ww, Ww, Ww, Wo, Wo, Wo, Ww, Ww, Ww, Ds, Ds, Gg, Gs^Fds, Gs^Fdw, Rb, Rb, Re, Hhd, Mm, Mm, Rb, Ss, Rb, Rb, Rb, Qxe, Cud, Cud, Urb, Cud, Cud, Qxe, Rb, Rb, Rb^Fdw, Rb^Fdw, Ss, Ss
 Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ds, Gg, Hh, Gs^Fds, Gs^Fds, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ds, Gg, Gs^Fds, Gs^Fdw, Gg, Re, Rb, Hhd, Ss, Hhd, Rb, Rb, Ss, Rb, Qxe, Cud, Urb, Ss, Urb, Ss, Urb, Cud, Qxe, Rb, Rb^Vc, Ss, Ss, Ss
 Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Gg^Vc, Gs^Fds, Ww, Wo, Ww, Ww, Ww, Ww, Ww, Wo, Ww, Wo, Ww, Ww, Ww^Bw\, Ds, Gs^Fds, Gs^Fds, Gs^Fds, Rb, Re, Rb, Rb, Rb^Fdw, Rb^Fdw, Rb, Rb, Rb, Rb, Qxe, Cud, Ss, Cud, 2 Kud, Cud, Ss, Cud, Qxe, Rb, Rb, Rb^Fdw, Rb, Rb