diff --git a/changelog.md b/changelog.md
index 0f9dbd0e5705..1d0b8964932a 100644
--- a/changelog.md
+++ b/changelog.md
@@ -4,9 +4,11 @@
    * Efficiency improvements to filter evaluations in the Goto Micro AI and some
      AI helper functions
  ### Campaigns
-   * Dead Water
+   * Dead Water:
      * Fix possibility of villagers blocking pickup of sword in S10 The Flaming
        Sword (issue #3207).
+   * Descent Into Darkness:
+     * New Parthyn map in S1 and S6.
    * Northern Rebirth:
      * Reduced starting gold and income in scenarios 10 to 13
    * Secrets of the Ancients:
diff --git a/data/campaigns/Descent_Into_Darkness/maps/01_Saving_Parthyn.map b/data/campaigns/Descent_Into_Darkness/maps/01_Saving_Parthyn.map
index c79dcdbb2ce0..f433c52537d1 100644
--- a/data/campaigns/Descent_Into_Darkness/maps/01_Saving_Parthyn.map
+++ b/data/campaigns/Descent_Into_Darkness/maps/01_Saving_Parthyn.map
@@ -1,22 +1,22 @@
-Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Gll^Fp, Gs^Fp, Gll^Fp, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Mm, Mm, Mm, Gg, Gg, Gg, Gg, Re, Re, Gg, Mm, Hh, Mm, Hh, Hh, Hh, Hh, Gg, Gg
-Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Gll^Fp, Gll^Fp, Gll^Fp, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Mm, Mm, Mm, Gg, Gs, Ce, Ce, Ce, Gs, Gg, Mm, Hh^Vhh, Mm, Hh, Hh, Hh, Hh, Gg, Gg
-Mm, Mm, Mm, Mm, Hh, Hh, Hh, Hh, Hh, Gs^Fp, Gll^Fp, Gg, Gg, Gg, Gs^Fds, Gs, Gs, Gs, Gs^Fms, Gg, Gg, Gg, Gg, Gs^Fms, Gs^Fms, Gs^Fds, Gs^Es, Gs, Ce, 2 Ke, Ce, Gs, Gs^Fms, Hh, Hh, Hh^Es, Hh, Hh, Gs^Fp, Gg, Ww, Ww
-Hh, Hh, Hh, Hh, Hh, Hh, Gll^Fp, Hh, Gll^Fp, Gll^Fp, Gs, Gs, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fms, Gs^Fms, Gs^Fms, Gg^Vh, Gs^Fms, Gg, Gs^Fds, Gg, Gg, Gg, Hh, Gs, Gs, Ce, Gg, Gll^Fp, Gs^Fms, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fms, Gs^Fms, Gg, Ww, Ww, Ww
-Hh, Hh, Hh, Hh, Gg, Gs^Fp, Gll^Fp, Gll^Fp, Gs^Fp, Gll^Fp, Gs, Gs, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fms, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fms, Gs^Fds, Gs^Fms, Gg, Gg^Vh, Hh, Gll^Fp, Gs, Gg, Gs, Gll^Fp, Gs^Fms, Gs^Fds, Gg, Gs^Fds, Gg, Gg, Ww, Ww, Ww, Ww
-Hh, Hh, Ww, Gg, Ww, Ww, Ww, Gg, Ww, Gg, Ww, Gg, Gg, Gg, Ww, Gs^Fms, Gs^Fms, Gs^Fms, Gg, Gs^Fds, Gs, Gs^Fms, Gs^Fms, Gs^Fms, Gg, Gs^Fms, Gs^Fms, Gll^Fp, Gg, Gs, Gg, Gs, Gg, Gg, Gg, Gg^Vh, Ww, Ww, Ww, Ww, Wo, Wo
-Ww, Ww, Wo, Ww, Wo, Ww, Wo, Ww, Wo, Ww, Wo, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Gg, Gg, Gg, Gg, Gg, Ww, Gg, Ww, Gs, Gs^Fds, Gs, Gg, Gs^Fds, Wwf, Ww, Ww, Ww, Ww, Wo, Wo, Wo
-Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Ww, Wo, Wo, Wo, Ww, Ww, Ww, Ww, Ww, Wo, Ww, Wo, Ww, Ww, Ww, Wwf^Es, Ww, Wwf, Wwf, Ww, Ww, Wo, Wo, Wo, Wo
-Wo, Wo, Ww, Wo, Ww, Wo, Ww, Wo, Ww, Wo, Ww, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Gs^Fms, Gs^Fms, Gs^Fms, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Wwf, Ww, Wwf, Ww, Ww, Wo, Wo, Wo, Wo
-Ww, Ww, Hh, Ww, Re, Re, Gs^Fms, Ww, Gs^Fms, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Wo, Wo, Gs^Fms, Wo, Gg, Wo, Wo, Wo, Wo, Ww, Wo, Ww, Ww, Ww, Ww, Ww, Wwf, Wwf^Es, Wwf, Ww, Ww, Ww, Ww, Ww, Wo
-Hh, Hh, Hh, Gg, Re^Gvs, Gs^Wm, Gs, Gs^Fms, Gg, Gs^Fds, Gs^Fms, Gs^Fms, Gs^Fms, Gg, Gg, Gg, Gg, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Wwf, Wwf, Wwf^Es, Wwf, Wwf, Ww, Ww, Ww, Ww, Ww
-Hh, Hh, Gs^Fds, Gg, Re^Gvs, Re^Gvs, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg^Vh, Gg, Gg, Gg, Ww, Gg, Ww, Ce, Ww, Gg, Ww, Wwf, Wwf, Ww, Ww, Gg, Gg, Gg, Gg
-Gg, Gg, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Ce, Gg, Gg, Gg, Gg, Gs^Fds, Gg^Efm, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gg^Efm, Gg^Efm, Gg, Gg, Gg^Vh, Gg, Gg, Gg, Gs^Ecf, Ce, 1 Ket, Ce, Gs, Gg, Gg, Ww, Gs, Gs, Gs^Fds, Gg, Gg, Gg
-Gg, Gg, Gg^Vh, Re^Es, Gs, Gs, Gg, Ce, Re, Gg, Gg, Gg, Gg^Efm, Gg^Efm, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gg, Gg, Re, Gg, Re, Gg, Re, Gg, Re, Re, Ce, Ce, Gs, Gg, Gg, Gs, Gs, Gs^Fds, Gs^Fms, Gs^Fds, Gg, Gg
-Gs^Fms, Gg, Gg, Re, Re, Gg, Gg^Vh, Gg, Re, Ce, Ce, Gg^Eff, Gg^Eff, Gg, Gg^Eff, Gg^Eff, Gg, Gs^Fds, Re^Es, Gg, Re, Re, Gs^Fds, Re, Gg, Re, Gg, Re, Gg, Gg, Gg, Gg, Gs, Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fms, Gs^Fms, Gg, Gg
-Gs^Fms, Gg, Ww, Gg^Fet, Ww, Re, Re^Es, Re, Gg, Gg, Gs, Ce, Gg, Gg, Re, Re, Re, Re, Gg, Re, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Re, Gg, Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs, Gs, Gs^Fds, Gg, Gg, Gg, Gg, Gg
-Gs^Fds, Gg, Ww, Ww, Gg, Gg, Re, Gg^Efm, Gg, Gg^Vh, Gs, Gs, Re, Re, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Re, Gg, Gg, Gs, Gg, Gs^Vl, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fms, Gs^Vh, Gs^Fms, Gg, Gs^Fms, Gg, Gg, Gg
-Gg, Gg^Wm, Re, Gg, Gs, Ce, Ce, Re, Re, Re, Re, Re, Ce, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gg, Gg, Gg, Gg, Gg, Re, Re, Gs^Fds, Gg, Gs^Fms, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gs^Fms, Gs^Fms, Gs^Fds, Gg, Gg
-Gg, Re^Gvs, Re^Gvs, Gg, Re, 3 Ket, Ce, Gg, Re, Gg, Gg^Vh, Gg, Ce, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gs^Fds, Gg, Gg, Gg, Gs^Fds, Gg, Re, Gs^Fds, Gs^Fds, Gs^Fms, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fms, Gg, Gg, Gg, Gs^Fds, Gs^Fms, Gs^Fds, Gg, Gg
-Re^Gvs, Re^Gvs, Re^Gvs, Re, Gg, Gs, Gg, Gg, Gs, Re, Re, Gg, Ce, Gg, Gg, Gs^Fds, Gg, Gg, Gs^Fds, Gg, Gg, Gs^Fds, Gs^Fms, Gs^Fms, Re, Gs^Fds, Gs^Fds, Gs^Fds, Hh, Gs^Fds, Hh, Hh^Fms, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fms, Gg, Gg, Gg, Gg, Gg
-Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Gs^Fds, Gg, Gs^Fds, Gg, Gs^Fds, Gs, Re, Gg, Gg, Gs^Fds, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fms, Gs^Fds, Re, Gs, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Gs^Fds, Gs^Fms, Gs^Fds, Gs^Fms, Gg, Gg, Gg, Gg, Gg
-Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs, Gg, Gs^Fds, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fms, Re, Gs, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh^Fds, Gs^Fds, Gs^Fms, Gs^Fms, Gg, Gg, Gg, Gg, Gg
+Wo, Wo, Wo, Mm, Mm, Mm, Mm, Mm, Gll^Fp, Gs^Fp, Gll^Fp, Gs^Fp, Gll^Fp, Gg, Re, Gg, Hh, Hh, Mm, Mm, Hh, Mm, Mm, Mm, Mm, Mm, Mm, Hh, Hh, Re, Re, Re, Gg, Mm, Mm, Mm, Mm, Hh, Mm, Hh, Mm, Mm
+Wo, Wo, Wo, Mm, Wo, Mm, Mm, Mm, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Re, Ce, Gg, Gg, Hh, Mm, Mm, Hh, Mm, Hh, Mm, Mm, Mm, Hh^Fp, Hh, Re, Re, Gs, Gs, Gs, Mm, Hh^Vhh, Mm, Mm, Mm, Mm, Hh, Mm, Mm
+Wo, Wo, Wo, Wo, Wo, Mm, Mm, Hh, Gll^Em, Gs^Fp, Gll^Fp, Gg^Vct, Gs, Ce^Es, 2 Ke, Ce, Re, Gs, Gs^Fms, Mm, Hh^Vhh, Gg, Gg, Gll^Fp, Gll^Fp, Gs^Fds, Gs^Es, Re, Re, Gg, Gs^Efm, Gs, Gs, Hh, Hh, Hh^Es, Mm, Mm, Hh^Fp, Hh, Hh, Mm
+Wo, Wo, Wo, Wo, Wo, Mm, Wwg, Mm, Sm, Sm, Sm, Gg, Gs, Ce^Es, Ce, Ce, Re, Gs^Fms, Gs^Fms, Gg, Gs^Fms, Gg, Re^Fds, Gg, Re, Re, Re, Re, Re, Re, Gg, Gll^Fp, Gs^Fms, Gs^Fds, Gs^Fds, Mm, Mm, Mm, Hh, Hh, Wwg, Hh
+Mm, Wo, Wo, Wo, Wo, Mm, Mm, Ss, Sm^Em, Ss, Sm, Gg, Gg, Gg, Gg, Gg, Gs^Fms, Re^Fds, Gs^Fds, Gs^Fds, Re^Fds, Re^Fms, Gs^Fds, Re^Es, Re^Es, Wwf, Wwg, Wwg, Re, Re, Gg^Efm, Gll^Fp, Gs^Fms, Gs^Fds, Gg, Gs^Fds, Gg, Gg, Hh, Hh, Wwg, Wwg
+Mm, Wo, Wo, Wo, Wo, Wo, Wo, Ss, Ss, Ss, Wwg, Sm, Wwg, Wwg, Wwg, Gs^Fms, Gg, Re, Re, Gs^Fds, Re, Re^Fms, Gs^Fms, Gs^Fms, Wwf, Wwf, Re, Re, Re, Gg^Fet, Gg^Efm, Gs, Gg, Gg, Gg, Gg, Wwg, Gg, Wwg, Wwg, Wwg, Wwg
+Mm, Mm, Wwg, Wwg, Wo, Wo, Wo, Wo, Wo, Wwg, Wo, Wo, Wo, Wwg, Wwg, Wwg, Wwg, Gg, Chr, Re, Wwg, Gg, Gg, Gg, Wwg, Wwf, Wwf, Wwf, Wwf, Re, Re, Gs^Efm, Gg, Gs^Fds, Wwf, Wwg, Wwg, Wwg, Wo, Wo, Wo, Wwg
+Mm, Mm, Mm, Wwg^Es, Wwg^Es, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Chr, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wwg, Wwf, Wwf, Wwf, Wwg, Wwg, Wwg, Ww, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo
+Mm, Mm, Mm, Wwg, Wwg, Wwg, Wo^Bw/, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wwf, Wwf, Wwg, Wwf, Wwf, Wwg, Wo, Wwg, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo
+Mm, Mm, Mm, Mm, Re, Re, Gs^Fms, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wwg, Wwf, Wwf, Wwf, Wwf, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo
+Mm, Mm, Hh, Gg, Re^Gvs, Gs^Wm, Gs, Wo, Wwg, Wo, Wwg, Wwg, Gg, Wo, Re, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wwg, Wwf^Es, Wwg, Wwf, Wwf, Wo, Wo, Wo, Wo, Gg, Wo, Wwg, Wo, Wo, Wo, Wo, Ds
+Hh, Hh, Gs^Fds, Gg, Re^Gvs, Re^Gvs, Gg, Gg, Wwg, Wwg, Wwg, Gg^Wm, Gg^Gvs, Gg^Fet, Re^Vh, Re^Es, Gg, Wo, Wo, Wo, Wwg, Wo, Wo, Wo, Wwg, Wwf, Wwf, Wwf, Gg^Eff, Re^Eff, Re^Eff, Ww, Ce, Re, Re, Wwg, Re, Wwg, Ds, Ds, Ds, Ds
+Hh, Gg, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Ce, Gg, Gg, Wwg, Gg, Wwg, Gg^Gvs, Re^Gvs, Re, Gg^Es, Wwg, Wwg, Wwg, Wwg, Wwg, Wwg, Wwg, Wwg, Gg, Gg^Efm, Gll^Fp, Gll^Fp, Gg, Gg, Re, Re, 1 Ket, Ce, Re^Ecf, Gg, Re, Ds, Gg, Gg, Gll^Fp, Gg
+Hh, Hh, Gg^Vh, Re^Es, Gs, Gs, Gg, Ce, Re, Gg, Gg, Gg, Gg^Efm, Re, Gg, Gg, Gs^Fds, Gg, Gg, Wwg, Gg, Wwg, Gg, Gg^Efm, Gg^Efm, Gll^Fp, Gll^Fp, Gll^Fp, Re, Re, Re, Ce, Ce, Ce, Gll^Fp, Gg, Gs^Vl, Gg, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp
+Gs^Fms, Gg, Gg, Re, Re, Gg, Gg^Vhc, Gg, Re, Ce, Ce, Gg, Gg, Re, Re, Gg^Eff, Gg^Eff, Gs^Fds, Gg, Gg, Gg^Efm, Gg, Gs^Vh, Gg^Efm, Gg^Efm, Gg, Re, Re, Re, Re, Gg, Gg, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp
+Gs^Fms, Gg, Ww^Ewf, Gg^Fet, Ww, Re, Re^Es, Re, Gg, Gg, Gg, Ch, Gg, Gg, Re, Re, Re, Gg, Re, Re, Re, Re^Efm, Re, Re, Re, Re, Re, Re, Gg, Re, Re, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp
+Gs^Fds, Gg, Ww, Ww, Gg, Gg, Re, Gg^Efm, Gg, Gg^Vh, Gg, Gg, Re, Re, Gg, Gg, Gg, Re, Gg, Gg, Gg, Re, Re^Es, Re, Re^Eff, Re^Eff, Re^Eff, Gg, Gs^Vh, Gg, Re, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp
+Gg, Gg^Wm, Re, Gg, Gs^Ecf, Ch, Ch, Re, Re, Re, Re, Re, Ch, Gg, Gs^Fds, Ce, Gs^Fds, Gs^Fds, Gg, Gg^Vwm, Gg, Re^Eff, Re^Gvs, Re, Re^Gvs, Gg^Gvs, Gg^Gvs, Gg^Eff, Re^Eff, Gs, Gll^Fp, Re, Re, Gll^Fp, Re, Gll^Fp, Re, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp
+Gg, Re^Gvs, Re^Gvs, Gg, Re, 3 Ket, Ch, Gg, Re, Gg, Gg^Vhc, Gg, Ce, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Re^Eff, Gg, Rb^Gvs, Re^Gvs, Rb^Gvs, Rb^Gvs, Rb^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gll^Fp, Gll^Fp, Gll^Fp, Re, Gll^Fp, Re, Gll^Fp, Re, Re, Gll^Fp, Gll^Fp, Gll^Fp
+Re^Gvs, Re^Gvs, Re^Gvs, Re, Gg, Gs, Gg, Gg, Gs, Re, Re, Gg, Ce, Gg, Gg, Gs^Fds, Gg^Eff, Re^Eff, Re^Gvs, Rb^Gvs, Rb^Gvs, Rb^Gvs, Rb^Gvs, Rb^Gvs, Rb^Gvs, Rb^Gvs, Rb^Gvs, Re^Gvs, Re^Gvs, Gg, Gg^Eff, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Re, Gll^Fp, Gll^Fp, Gll^Fp
+Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Gs^Fds, Gg, Gs^Fds, Gg, Gs^Fds, Gs, Re, Gg, Gg, Gs^Fds, Gg, Gg, Gg, Gg^Gvs, Re^Gvs, Rb^Gvs, Rb^Gvs, Rb^Gvs, Rb^Gvs, Rb^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re, Re^Eff, Re^Eff, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Re, Re, Gll^Fp
+Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs, Gg, Gs^Fds, Gg, Gg, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Rb^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re, Re^Eff, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Re
diff --git a/data/campaigns/Descent_Into_Darkness/maps/06_Return_to_Parthyn.map b/data/campaigns/Descent_Into_Darkness/maps/06_Return_to_Parthyn.map
index ea0613901232..cd23436caa6e 100644
--- a/data/campaigns/Descent_Into_Darkness/maps/06_Return_to_Parthyn.map
+++ b/data/campaigns/Descent_Into_Darkness/maps/06_Return_to_Parthyn.map
@@ -1,22 +1,22 @@
-Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Gll^Fp, Gs^Fp, Gll^Fp, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Mm, Mm, Mm, Gg, Gg, Gg, Gg, Re, Re, Gg, Mm, Hh, Mm, Hh, Hh, Hh, Hh, Gg, Gg
-Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Gll^Fp, Gll^Fp, Gll^Fp, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Mm, Mm, Mm, Gg, Gs, Ce, Ce, Ce, Gs, Gg, Mm, Hh^Vhh, Mm, Hh, Hh, Hh, Hh, Gg, Gg
-Mm, Mm, Mm, Mm, Hh, Hh, Hh, Hh, Hh, Gs^Fp, Gll^Fp, Gg, Gg, Gg, Gs^Fds, Gs, Gs, Gs, Gs^Fms, Gg, Gg, Gg, Gg, Gs^Fms, Gs^Fms, Gs^Fds, Gs^Es, Gs, Ce, 2 Ke, Ce, Gs, Gs^Fms, Hh, Hh, Hh^Es, Hh, Hh, Gs^Fp, Gg, Ww, Ww
-Hh, Hh, Hh, Hh, Hh, Hh, Gll^Fp, Hh, Gll^Fp, Gll^Fp, Gs, Gs, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fms, Gs^Fms, Gs^Fms, Gg^Vh, Gs^Fms, Gg, Gs^Fds, Gg, Gg, Gg, Hh, Gs, Gs, Ce, Gg, Gll^Fp, Gs^Fms, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fms, Gs^Fms, Gg, Ww, Ww, Ww
-Hh, Hh, Hh, Hh, Gg, Gs^Fp, Gll^Fp, Gll^Fp, Gs^Fp, Gll^Fp, Gs, Gs, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fms, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fms, Gs^Fds, Gs^Fms, Gg, Gg^Vh, Hh, Gll^Fp, Gs, Gg, Gs, Gll^Fp, Gs^Fms, Gs^Fds, Gg, Gs^Fds, Gg, Gg, Ww, Ww, Ww, Ww
-Hh, Hh, Ww, Gg, Ww, Ww, Ww, Gg, Ww, Gg, Ww, Gg, Gg, Gg, Ww, Gs^Fms, Gs^Fms, Gs^Fms, Gg, Gs^Fds, Gs, Gs^Fms, Gs^Fms, Gs^Fms, Gg, Gs^Fms, Gs^Fms, Gll^Fp, Gg, Gs, Gg, Gs, Gg, Gg, Gg, Gg^Vh, Ww, Ww, Ww, Ww, Wo, Wo
-Ww, Ww, Wo, Ww, Wo, Ww, Wo, Ww, Wo, Ww, Wo, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Gg, Gg, Gg, Gg, Gg, Ww, Gg, Ww, Gs, Gs^Fds, Gs, Gg, Gs^Fds, Wwf, Ww, Ww, Ww, Ww, Wo, Wo, Wo
-Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Ww, Wo, Wo, Wo, Ww, Ww, Ww, Ww, Ww, Wo, Ww, Wo, Ww, Ww, Ww, Wwf^Es, Ww, Wwf, Wwf, Ww, Ww, Wo, Wo, Wo, Wo
-Wo, Wo, Ww, Wo, Ww, Wo, Ww, Wo, Ww, Wo, Ww, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Gs^Fms, Gs^Fms, Gs^Fms, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Wwf, Ww, Wwf, Ww, Ww, Wo, Wo, Wo, Wo
-Ww, Ww, Hh, Ww, Re, Re, Gs^Fms, Ww, Gs^Fms, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Wo, Wo, Gs^Fms, Wo, Gg, Wo, Wo, Wo, Wo, Ww, Wo, Ww, Ww, Ww, Ww, Ww, Wwf, Wwf^Es, Wwf, Ww, Ww, Ww, Ww, Ww, Wo
-Hh, Hh, Hh, Gg, Re^Gvs, Gs^Wm, Gs, Gs^Fms, Gg, Gs^Fds, Gs^Fms, Gs^Fms, Gs^Fms, Gg, Gg, Gg, Gg, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Wwf, Wwf, Wwf^Es, Wwf, Wwf, Ww, Ww, Ww, Ww, Ww
-Hh, Hh, Gs^Fds, Gg, Re^Gvs, Re^Gvs, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg^Vh, Gg, Gg, Gg, Ww, Gg, Ww, Ce, Ww, Gg, Ww, Wwf, Wwf, Ww, Ww, Gg, Gg, Gg, Gg
-Gg, Gg, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Ce, Gg, Gg, Gg, Gg, Gs^Fds, Gg^Efm, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gg^Efm, Gg^Efm, Gg, Gg, Gg^Vh, Gg, Gg, Gg, Gs^Ecf, Ce, 3 Ket, Ce, Gs, Gg, Gg, Ww, Gs, Gs, Gs^Fds, Gg, Gg, Gg
-Gg, Gg, Gg^Vh, Re^Es, Gs, Gs, Gg, Ce, Re, Gg, Gg, Gg, Gg^Efm, Gg^Efm, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gg, Gg, Re, Gg, Re, Gg, Re, Gg, Re, Re, Ce, Ce, Gs, Gg, Gg, Gs, Gs, Gs^Fds, Ce, Gs^Fds, Gg, Gg
-Gs^Fms, Gg, Gg, Re, Re, Gg, Gg^Vh, Gg, Re, Ce, Ce, Gg^Eff, Gg^Eff, Gg, Gg^Eff, Gg^Eff, Gg, Gs^Fds, Re^Es, Gg, Re, Re, Gs^Fds, Re, Gg, Re, Gg, Re, Gg, Gg, Gg, Gg, Gs, Gg, Gg, Gg, Gg, Ce, 1 Ke, Ce, Gg, Gg
-Gs^Fms, Gg, Ww, Gg^Fet, Ww, Re, Re^Es, Re, Gg, Gg, Gs, Ce, Gg, Gg, Re, Re, Re, Re, Gg, Re, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Re, Gg, Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs, Gs, Gs^Fds, Ce, Ce, Ce, Gg, Gg
-Gs^Fds, Gg, Ww, Ww, Gg, Gg, Re, Gg^Efm, Gg, Gg^Vh, Gs, Gs, Re, Re, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Re, Gg, Gg, Gs, Gg, Gs^Vl, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fms, Gs^Vh, Gs^Fms, Gg, Gs^Fms, Gg, Gg, Gg
-Gg, Gg^Wm, Re, Gg, Gs, Ce, Ce, Re, Re, Re, Re, Re, Ce, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gg, Gg, Gg, Gg, Gg, Re, Re, Gs^Fds, Gg, Gs^Fms, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gs^Fms, Gs^Fms, Gs^Fds, Gg, Gg
-Gg, Re^Gvs, Re^Gvs, Gg, Re, 4 Ket, Ce, Gg, Re, Gg, Gg^Vh, Gg, Ce, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gs^Fds, Gg, Gg, Gg, Gs^Fds, Gg, Re, Gs^Fds, Gs^Fds, Gs^Fms, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fms, Gg, Gg, Gg, Gs^Fds, Gs^Fms, Gs^Fds, Gg, Gg
-Re^Gvs, Re^Gvs, Re^Gvs, Re, Gg, Gs, Gg, Gg, Gs, Re, Re, Gg, Ce, Gg, Gg, Gs^Fds, Gg, Gg, Gs^Fds, Gg, Gg, Gs^Fds, Gs^Fms, Gs^Fms, Re, Gs^Fds, Gs^Fds, Gs^Fds, Hh, Gs^Fds, Hh, Hh^Fms, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fms, Gg, Gg, Gg, Gg, Gg
-Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Gs^Fds, Gg, Gs^Fds, Gg, Gs^Fds, Gs, Re, Gg, Gg, Gs^Fds, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fms, Gs^Fds, Re, Gs, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Gs^Fds, Gs^Fms, Gs^Fds, Gs^Fms, Gg, Gg, Gg, Gg, Gg
-Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs, Gg, Gs^Fds, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fms, Re, Gs, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh^Fds, Gs^Fds, Gs^Fms, Gs^Fms, Gg, Gg, Gg, Gg, Gg
+Wo, Wo, Wo, Mm, Mm, Mm, Mm, Mm, Gll^Fp, Gs^Fp, Gll^Fp, Gs^Fp, Gll^Fp, Gg, Re, Gg, Hh, Hh, Mm, Mm, Hh, Mm, Mm, Mm, Mm, Mm, Mm, Hh, Hh, Re, Re, Re, Gg, Mm, Mm, Mm, Mm, Hh, Mm, Hh, Mm, Mm
+Wo, Wo, Wo, Mm, Wo, Mm, Mm, Mm, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Re, Ce, Gg, Gg, Hh, Mm, Mm, Hh, Mm, Hh, Mm, Mm, Mm, Hh^Fp, Hh, Re, Re, Gs, Gs, Gs, Mm, Hh^Vhh, Mm, Mm, Mm, Mm, Hh, Mm, Mm
+Wo, Wo, Wo, Wo, Wo, Mm, Mm, Hh, Gll^Em, Gs^Fp, Gll^Fp, Gg^Vct, Gs, Ce^Es, 2 Ke, Ce, Re, Gs, Gs^Fms, Mm, Hh^Vhh, Gg, Gg, Gll^Fp, Gll^Fp, Gs^Fds, Gs^Es, Re, Re, Gg, Gs^Efm, Gs, Gs, Hh, Hh, Hh^Es, Mm, Mm, Hh^Fp, Hh, Hh, Mm
+Wo, Wo, Wo, Wo, Wo, Mm, Wwg, Mm, Sm, Sm, Sm, Gg, Gs, Ce^Es, Ce, Ce, Re, Gs^Fms, Gs^Fms, Gg, Gs^Fms, Gg, Re^Fds, Gg, Re, Re, Re, Re, Re, Re, Gg, Gll^Fp, Gs^Fms, Gs^Fds, Gs^Fds, Mm, Mm, Mm, Hh, Hh, Wwg, Hh
+Mm, Wo, Wo, Wo, Wo, Mm, Mm, Ss, Sm^Em, Ss, Sm, Gg, Gg, Gg, Gg, Gg, Gs^Fms, Re^Fds, Gs^Fds, Gs^Fds, Re^Fds, Re^Fms, Gs^Fds, Re^Es, Re^Es, Wwf, Wwg, Wwg, Re, Re, Gg^Efm, Gll^Fp, Gs^Fms, Gs^Fds, Gg, Gs^Fds, Gg, Gg, Hh, Hh, Wwg, Wwg
+Mm, Wo, Wo, Wo, Wo, Wo, Wo, Ss, Ss, Ss, Wwg, Sm, Wwg, Wwg, Wwg, Gs^Fms, Gg, Re, Re, Gs^Fds, Re, Re^Fms, Gs^Fms, Gs^Fms, Wwf, Wwf, Re, Re, Re, Gg^Fet, Gg^Efm, Gs, Gg, Gg, Gg, Gg, Wwg, Gg, Wwg, Wwg, Wwg, Wwg
+Mm, Mm, Wwg, Wwg, Wo, Wo, Wo, Wo, Wo, Wwg, Wo, Wo, Wo, Wwg, Wwg, Wwg, Wwg, Gg, Chr, Re, Wwg, Gg, Gg, Gg, Wwg, Wwf, Wwf, Wwf, Wwf, Re, Re, Gs^Efm, Gg, Gs^Fds, Wwf, Wwg, Wwg, Wwg, Wo, Wo, Wo, Wwg
+Mm, Mm, Mm, Wwg^Es, Wwg^Es, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Chr, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wwg, Wwf, Wwf, Wwf, Wwg, Wwg, Wwg, Ww, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo
+Mm, Mm, Mm, Wwg, Wwg, Wwg, Wo^Bw/, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wwf, Wwf, Wwg, Wwf, Wwf, Wwg, Wo, Wwg, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo
+Mm, Mm, Mm, Mm, Re, Re, Gs^Fms, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wwg, Wwf, Wwf, Wwf, Wwf, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo
+Mm, Mm, Hh, Gg, Re^Gvs, Gs^Wm, Gs, Wo, Wwg, Wo, Wwg, Wwg, Gg, Wo, Re, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wwg, Wwf^Es, Wwg, Wwf, Wwf, Wo, Wo, Wo, Wo, Gg, Wo, Wwg, Wo, Wo, Wo, Wo, Ds
+Hh, Hh, Gs^Fds, Gg, Re^Gvs, Re^Gvs, Gg, Gg, Wwg, Wwg, Wwg, Gg^Wm, Gg^Gvs, Gg^Fet, Re^Vh, Re^Es, Gg, Wo, Wo, Wo, Wwg, Wo, Wo, Wo, Wwg, Wwf, Wwf, Wwf, Gg^Eff, Re^Eff, Re^Eff, Ww, Ce, Re, Re, Wwg, Re, Wwg, Ds, Ds, Ds, Ds
+Hh, Gg, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Ce, Gg, Gg, Wwg, Gg, Wwg, Gg^Gvs, Re^Gvs, Re, Gg^Es, Wwg, Wwg, Wwg, Wwg, Wwg, Wwg, Wwg, Wwg, Gg, Gg^Efm, Gll^Fp, Gll^Fp, Gg, Gg, Re, Re, 3 Ket, Ce, Re^Ecf, Gg, Re, Ds, Gg, Gg, Gll^Fp, Gg
+Hh, Hh, Gg^Vh, Re^Es, Gs, Gs, Gg, Ce, Re, Gg, Gg, Gg, Gg^Efm, Re, Gg, Gg, Gs^Fds, Gg, Gg, Wwg, Gg, Wwg, Gg, Gg^Efm, Gg^Efm, Gll^Fp, Gll^Fp, Gll^Fp, Re, Re, Re, Ce, Ce, Ce, Gll^Fp, Gg, Gs^Vl, Gg, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp
+Gs^Fms, Gg, Gg, Re, Re, Gg, Gg^Vhc, Gg, Re, Ce, Ce, Gg, Gg, Re, Re, Gg^Eff, Gg^Eff, Gs^Fds, Gg, Gg, Gg^Efm, Gg, Gs^Vh, Gg^Efm, Gg^Efm, Gg, Re, Re, Re, Re, Gg, Gg, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp
+Gs^Fms, Gg, Ww^Ewf, Gg^Fet, Ww, Re, Re^Es, Re, Gg, Gg, Gg, Ch, Gg, Gg, Re, Re, Re, Gg, Re, Re, Re, Re^Efm, Re, Re, Re, Re, Re, Re, Gg, Re, Re, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp
+Gs^Fds, Gg, Ww, Ww, Gg, Gg, Re, Gg^Efm, Gg, Gg^Vh, Gg, Gg, Re, Re, Gg, Gg, Gg, Re, Gg, Gg, Gg, Re, Re^Es, Re, Re^Eff, Re^Eff, Re^Eff, Gg, Gs^Vh, Gg, Re, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp
+Gg, Gg^Wm, Re, Gg, Gs^Ecf, Ch, Ch, Re, Re, Re, Re, Re, Ch, Gg, Gs^Fds, Ce, Gs^Fds, Gs^Fds, Gg, Gg^Vwm, Gg, Re^Eff, Re^Gvs, Re, Re^Gvs, Gg^Gvs, Gg^Gvs, Gg^Eff, Re^Eff, Gs, Gll^Fp, Re, Re, Gll^Fp, Re, Gll^Fp, Re, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp
+Gg, Re^Gvs, Re^Gvs, Gg, Re, 4 Ket, Ch, Gg, Re, Gg, Gg^Vhc, Gg, Ce, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Re^Eff, Gg, Rb^Gvs, Re^Gvs, Rb^Gvs, Rb^Gvs, Rb^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gll^Fp, Gll^Fp, Gll^Fp, Re, Gll^Fp, Re, Ce, Re, Re, Gll^Fp, Gll^Fp, Gll^Fp
+Re^Gvs, Re^Gvs, Re^Gvs, Re, Gg, Gs, Gg, Gg, Gs, Re, Re, Gg, Ce, Gg, Gg, Gs^Fds, Gg^Eff, Re^Eff, Re^Gvs, Rb^Gvs, Rb^Gvs, Rb^Gvs, Rb^Gvs, Rb^Gvs, Rb^Gvs, Rb^Gvs, Rb^Gvs, Re^Gvs, Re^Gvs, Gg, Gg^Eff, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Ce, 1 Ke, Ce, Re, Gll^Fp, Gll^Fp, Gll^Fp
+Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Gs^Fds, Gg, Gs^Fds, Gg, Gs^Fds, Gs, Re, Gg, Gg, Gs^Fds, Gg, Gg, Gg, Gg^Gvs, Re^Gvs, Rb^Gvs, Rb^Gvs, Rb^Gvs, Rb^Gvs, Rb^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re, Re^Eff, Re^Eff, Gll^Fp, Gll^Fp, Ce, Ce, Ce, Gll^Fp, Re, Re, Gll^Fp
+Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs, Gg, Gs^Fds, Gg, Gg, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Rb^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re, Re^Eff, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Re
diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg
index 0ec3e4078da4..f456672e98b2 100644
--- a/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg
+++ b/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg
@@ -62,8 +62,8 @@
         facing=nw
 
         # Starting units for Malin
-        {LOYAL_UNIT 1 (Spearman) 30 11}
-        {LOYAL_UNIT 1 (Bowman)   31 12}
+        {LOYAL_UNIT 1 (Spearman) 32 11}
+        {LOYAL_UNIT 1 (Bowman)   33 13}
         {LOYAL_UNIT 1 (Spearman) 31 13}
     [/side]
     # wmllint: validate-on
@@ -82,7 +82,7 @@
         name= _ "Kreg’a’shar Trr"
         canrecruit=yes
 
-        facing=sw
+        facing=se
 
         [ai]
             aggression=0.8
@@ -138,8 +138,8 @@
     {STARTING_VILLAGES 3 10}
 
     # Signpost to mark area defended
-    {PLACE_IMAGE scenery/signpost.png 27 13}
-    {PLACE_IMAGE scenery/signpost.png 24 20}
+    {PLACE_IMAGE scenery/signpost.png 30 14}
+    {PLACE_IMAGE scenery/signpost.png 20 14}
 
     [event]
         name=prestart
@@ -244,7 +244,7 @@
         name=moveto
         [filter]
             side=1
-            x,y=27,13
+            x,y=30,14
         [/filter]
 
         [message]
@@ -259,7 +259,7 @@
     [event]
         name=moveto
         [filter]
-            x,y=24,20
+            x,y=20,14
             id=Malin Keshar
         [/filter]
         [message]
diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
index c018ba9c0464..fa0f5bf2c5d0 100644
--- a/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
+++ b/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
@@ -67,7 +67,7 @@
         profile=portraits/orcs/warlord.png
         canrecruit=yes
 
-        facing=sw
+        facing=se
 
         [ai]
             aggression=0.8
@@ -94,8 +94,8 @@
         facing=se
 
         # Drogan has some guards at the river fort
-        {NAMED_LOYAL_UNIT 3 (Spearman) 30 11 () ( _ "River fort guard")}
-        {NAMED_LOYAL_UNIT 3 (Bowman)   31 12 () ( _ "River fort guard")}
+        {NAMED_LOYAL_UNIT 3 (Spearman) 32 11 () ( _ "River fort guard")}
+        {NAMED_LOYAL_UNIT 3 (Bowman)   33 13 () ( _ "River fort guard")}
         {NAMED_LOYAL_UNIT 3 (Spearman) 31 13 () ( _ "River fort guard")}
 
         [ai]
@@ -143,7 +143,7 @@
     {STARTING_VILLAGES 4 10}
 
     # Signpost
-    {PLACE_IMAGE scenery/signpost.png 27 13}
+    {PLACE_IMAGE scenery/signpost.png 30 14}
 
 #define DID_RTP_HAS_ORC_LEADER
     [have_unit]
@@ -309,7 +309,7 @@
         name=moveto
         [filter]
             side=1
-            x,y=27,13
+            x,y=30,14
         [/filter]
 
         [message]