diff --git a/data/campaigns/An_Orcish_Incursion/maps/04_Valley_of_Trolls.map b/data/campaigns/An_Orcish_Incursion/maps/04_Valley_of_Trolls.map
index 91a552a0a92..f25694833ce 100644
--- a/data/campaigns/An_Orcish_Incursion/maps/04_Valley_of_Trolls.map
+++ b/data/campaigns/An_Orcish_Incursion/maps/04_Valley_of_Trolls.map
@@ -1,22 +1,22 @@
 Mm, Mm, Mm, Hhd, Re, Re, Gd, Re, Gd, Ww, Gd^Fp, Gd, Gd, Hhd, Mm, Mm, Mm, Mm, Xu, Xu, Xu, Xu
-Mm, Mm, Mm, Hhd, Re, Re, Gd, Re, Gd, Ww, Gd^Fp, Gd, Gd, Hhd, Mm, Mm, Mm, Mm, Xu, Xu, Xu, Xu
-Mm, Mm, Re, Re, Hhd, Hhd, Hhd^Vc, Gd, Gd, Ww, Gd^Fp, Gd^Vo, Gd, Hhd, Mm, Mm, Xu, Xu, Cud, Xu, Xu, Xu
-Mm, Mm, Uu, Mm, Mm, Mm, Hhd, Gd, Gd, Ww, Ww, Gd^Fp, Gd, Hhd, Mm, Mm, Uh, Cud, 3 Kud, Cud, Xu, Xu
-Xu, Xu, Uu, Xu, Mm, Mm, Mm, Hhd, Gd, Gd, Gd, Ww, Gd, Hhd, Hhd, Mm, Uu, Cud, Cud, Cud, Xu, Xu
-Xu, Xu, Uu, Xu, Xu, Mm, Mm, Hhd, Gd, Gd, Ww, Ww, Gd, Gd, Re, Re, Mm, Uh, Xu, Xu, Xu, Xu
+Mm, Mm, Mm, Hhd, Re, Re^Es, Gd, Re, Gd, Ww, Gd^Fp, Gd, Gd, Hhd, Mm, Mm, Mm, Mm, Xu, Xu, Xu, Xu
+Mm, Mm, Re^Edb, Re, Hhd, Hhd, Hhd^Vc, Gd, Gd, Ww, Gd^Fp, Gd^Vo, Gd, Hhd, Mm, Mm, Xu, Xu, Cte^Es, Xu, Xu, Xu
+Mm, Mm, Uu, Mm, Mm, Mm, Hhd, Gd, Gd, Ww, Ww, Gd^Fp, Gd, Hhd, Mm, Mm, Uh, Cte^Es, 3 Kte, Cte^Em, Xu, Xu
+Xu, Xu, Uu, Xu, Mm, Mm, Mm, Hhd, Gd, Gd, Gd, Ww, Gd, Hhd, Hhd, Mm, Uu, Cte^Edt, Cte^Em, Cte^Es, Xu, Xu
+Xu, Xu, Uu, Xu, Xu, Mm, Mm, Hhd, Gd, Gd, Ww^Es, Ww, Gd, Gd, Re, Re, Mm, Uh, Xu, Xu, Xu, Xu
 Xu, Xu, Uu, Uu, Uu, Mm, Hhd, Hhd, Gd, Gd, Ww, Gd, Re, Re, Gd, Hhd, Mm, Mm, Mm, Mm, Mm, Mm
-Xu, Xu, Xu, Xu, Mm, Re, Re, Gd, Gd, Gd, Ww^Bw/, Re, Gd, Gd, Hhd, Hhd, Hhd, Mm, Mm, Mm, Mm, Mm
+Xu, Xu, Xu, Xu, Mm, Re, Re^Edb, Gd, Gd, Gd, Ww^Bw/, Re, Gd, Gd, Hhd, Hhd, Hhd, Mm, Mm, Mm, Mm, Mm
 Xu, Xu, Mm, Mm, Mm, Hhd, Hhd, Re, Re, Re, Gd, Ww, Gd, Gd^Vo, Gd, Hhd, Gd, Hhd, Mm, Mm, Mm, Mm
 Mm, Mm, Mm, Mm, Mm, Hhd, Hhd^Vc, Gd, Gd, Re, Gd, Ww, Gd, Gd, Gll^Fp, Gd, Gd, Hhd, Mm, Mm, Mm, Mm
 Mm, Mm, Mm, Hhd, Hhd, Hhd, Hhd, Gd, Gd, Re, Gd, Ww, Ww, Gd, Gll^Fp, Gll^Fp, Gd, Hhd, Mm, Mm, Mm, Mm
 Mm, Mm, Mm, Mm, Mm, Mm, Mm, Hhd, Gd, Re, Re, Gd, Ww, Gd, Gd, Gd, Hhd, Hhd, Mm, Mm, Mm, Mm
-Mm, Mm, Mm, Mm, Mm, Mm, Hhd, Hhd, Re, Gd^Vo, Re, Gd, Gd, Ww, Gd, Gd, Gd, Hhd, Hhd, Mm, Mm, Mm
+Mm, Mm, Mm, Mm, Mm, Mm, Hhd, Hhd, Re, Gd^Vo, Re, Gd, Gd, Ww^Es, Gd, Gd, Gd, Hhd, Hhd, Mm, Mm, Mm
 Xu, Xu, Xu, Xu, Uh, Mm, Re, Re, Gd, Re, Gd, Re, Re, Ww, Gd, Gd, Gd, Hhd^Vc, Hhd, Mm, Mm, Mm
-Xu, Xu, Cud, Cud, Cud, Uu, Mm, Gd, Hhd, Gd, Gll^Fp, Gd, Ww, Ww^Bw\, Re, Gll^Fp, Gll^Fp, Hhd, Hhd, Mm, Mm, Mm
-Xu, Xu, Cud, 2 Kud, Cud, Uh, Mm, Mm, Hhd, Gd, Gd, Gd, Ww, Gd, Gd, Re, Gll^Fp, Gd, Hhd, Mm, Mm, Mm
-Xu, Xu, Xu, Cud, Xu, Xu, Mm, Mm, Hhd, Gd^Vc, Gd, Gd, Ww, Gd, Gd, Re, Gll^Fp, Gll^Fp, Hhd, Mm, Mm, Mm
-Xu, Xu, Xu, Xu, Mm, Mm, Mm, Mm, Hhd, Hhd, Gd, Gd, Gd, Ww, Gd, Re, Re, Gd, Gd, Hhd, Gd, Gd
-Xu, Xu, Xu, Mm, Mm, Mm, Hhd, Hhd, Gd, Gd, Gd, Gll^Fp, Gd, Ww, Gd^Vo, Gd, Ce, Ce, Ce, Gd, Gll^Fp, Gll^Fp
-Mm, Mm, Mm, Mm, Mm, Hhd, Hhd^Vc, Gd, Gd, Gd, Hhd, Gd, Gd, Ww, Ww, Gd, Ce, 1 Ke, Ce, Gd, Gd, Gd
+Xu, Xu, Cte^Es, Cte^Es, Cte^Es, Uu, Mm, Gd, Hhd, Gd, Gll^Fp, Gd, Ww, Ww^Bw\, Re, Gll^Fp, Gll^Fp, Hhd, Hhd, Mm, Mm, Mm
+Xu, Xu, Cte^Em, 2 Kte, Cte^Em, Uh, Mm, Mm, Hhd, Gd, Gd, Gd, Ww, Gd, Gd, Re, Gll^Fp, Gd, Hhd, Mm, Mm, Mm
+Xu, Xu, Xu, Cte^Edt, Xu, Xu, Mm, Mm, Hhd, Gd^Vc, Gd^Edt, Gd, Ww, Gd, Gd, Re, Gll^Fp, Gll^Fp, Hhd, Mm, Mm, Mm
+Xu, Xu, Xu, Xu, Mm, Mm, Mm, Mm, Hhd, Hhd^Edt, Gd^Edt, Gd, Gd, Ww, Gd, Re, Re, Gd, Gd, Hhd, Gd, Gd
+Xu, Xu, Xu, Mm, Mm, Mm, Hhd, Hhd, Gd^Edt, Gd^Edt, Gd^Edt, Gll^Fp, Gd, Ww, Gd^Vo, Gd, Ce^Edt, Ce, Ce, Gd, Gll^Fp, Gll^Fp
+Mm, Mm, Mm, Mm, Mm, Hhd, Hhd^Vc, Gd, Gd^Edt, Gd, Hhd, Gd, Gd, Ww, Ww^Es, Gd, Ce, 1 Ke, Ce, Gd, Gd, Gd
 Mm, Mm, Mm, Mm, Mm, Hhd, Hhd, Hhd, Hhd, Hhd, Gll^Fp, Gll^Fp, Gll^Fp, Gd, Ww, Gd, Gd, Ce, Gd, Re, Re, Re
 Mm, Mm, Mm, Mm, Mm, Hhd, Hhd, Hhd, Hhd, Hhd, Gll^Fp, Gll^Fp, Gll^Fp, Gd, Ww, Gd, Gd, Gd, Gd, Re, Re, Re
diff --git a/data/campaigns/An_Orcish_Incursion/maps/06_A_Detour_through_the_Swamp.map b/data/campaigns/An_Orcish_Incursion/maps/06_A_Detour_through_the_Swamp.map
index 1827d82a5df..5c26daedb96 100644
--- a/data/campaigns/An_Orcish_Incursion/maps/06_A_Detour_through_the_Swamp.map
+++ b/data/campaigns/An_Orcish_Incursion/maps/06_A_Detour_through_the_Swamp.map
@@ -15,8 +15,8 @@ Gg, Gs, Gs, Rb, Rb, Ss, Ss, Rb, Gs, Hh, Hh, Gs, Rb, Ss, Ss, Wwg, Wwg, Wwg, Rb, R
 Gg, Gg, Gs, Re, Ss, Ss, Ss, Rb, Rb, Gs^Em, Rb, Re, Rb, Ss, Wwg, Ss, Ss, Ss, Rb^Edp, Re, Ss, Ss
 Gs, Gs^Em, Gs, Rb, Ss^Vhs, Ss, Ss, Ss, Wwg^Bw/, Rb, Ss^Vhs, Rb, Ss, Wwg^Bw\, Rb, Rb, Re, Ss^Vhs, Rb^Es, Ss, Ss, Ss
 Gs^Fp, Gs^Fdw, Gs, Rb, Rb, Rb, Rb, Rb, Ss, Ss, Ss, Ss, Wwg, Ss, Re, Rb^Es, Rb^Es, Rb, Rb, Ss, Ss, Ss
-Gs^Fp, Gs^Fp, Gs^Fmw, Gs, Gs, Gs, Gs, Rb, Ss, Ss, Ss, Ss, Wwg, Ss, Rb^Es, Rb, Ch, Chr, Ch, Re^Es, Ss, Ss
-Gs, Gs, Gg, Gs^Fdw, Gg, Gg^Em, Gs, Rb, Rb, Ss, Ss, Ss, Wwg, Ss, Ss, Rb, Chr, 2 Kh, Chr, Ss, Ss, Ss
-Gg, Gg, Gg^Vc, Gg, Gg, Gg, Gg, Gs, Rb, Ss^Vhs, Ss, Wwg, Ss, Ss, Ss, Rb, Rb^Es, Ch, Ss, Ss, Ss, Ss
+Gs^Fp, Gs^Fp, Gs^Fmw, Gs, Gs, Gs, Gs, Rb, Ss, Ss, Ss, Ss, Wwg, Ss, Rb^Es, Rb, Cer, Cer, Cer, Re^Es, Ss, Ss
+Gs, Gs, Gg, Gs^Fdw, Gg, Gg^Em, Gs, Rb, Rb, Ss, Ss, Ss, Wwg, Ss, Ss, Rb, Cer, 2 Ker, Cer, Ss, Ss, Ss
+Gg, Gg, Gg^Vc, Gg, Gg, Gg, Gg, Gs, Rb, Ss^Vhs, Ss, Wwg, Ss, Ss, Ss, Rb, Rb^Es, Cer, Ss, Ss, Ss, Ss
 Gg, Gg, Gg, Gg, Gg, Gg, Gs, Gs^Em, Gs, Rb, Ss, Ss, Ss, Wwg, Ss, Ss^Vhs, Ss, Ss, Ss, Ss, Ss, Ss
 Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs, Gs, Rb, Ss, Ss, Ss, Wwg, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss