Merge branch 'master' into bug/3273

changelog.md

@@ -2,6 +2,9 @@
  ### Add-ons client
    * Ensure the client doesn't re-download dependencies that have just been updated during an Update All
      run by re-reading add-on versions after each update batch (issue #3273).
+ ### Campaigns
+   * Delfador's Memoirs:
+     * S12: Fix a few case where dialog and events sound odd or fire out of order (issue #4614)
 
 ## Version 1.15.3
  ### AI

data/campaigns/Delfadors_Memoirs/maps/14_Shadows_in_the_Dark.map

@@ -1,7 +1,7 @@
-Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Ce, Ce, Ce, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Ww, Ww, Ww, Ww, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Ce, Ce, Ce, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp
-Gs^Fds, Gs^Fds, Gs^Fp, Gs^Fp, Ce, Ce, Ce, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fmw, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Ww, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Ce, Ce, Ce, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fp
-Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Ce, 3 Ke, Ce, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Hh^Fms, Gs^Fp, Gs^Fp, Gs^Fmw, Hh^Fms, Gs^Fp, Gs^Fp, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fmw, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg^Ve, Gs^Fp, Gs^Fp, Ce, 2 Ke, Ce, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp
-Gs^Fp, Gs^Fds, Gs^Fds, Gs^Fp, Gs^Fp, Gs^Fp, Ce, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fds, Gs^Fds, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Ce, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fp
+Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Cer, Cer, Cer, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Ww, Ww, Ww, Ww, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Cer, Cer, Cer, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp
+Gs^Fds, Gs^Fds, Gs^Fp, Gs^Fp, Cer, Cer, Cer, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fmw, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Ww, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Cer, Cer, Cer, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fp
+Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Cer, 3 Ker, Cer, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Hh^Fms, Gs^Fp, Gs^Fp, Gs^Fmw, Hh^Fms, Gs^Fp, Gs^Fp, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fmw, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg^Ve, Gs^Fp, Gs^Fp, Cer, 2 Ker, Cer, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp
+Gs^Fp, Gs^Fds, Gs^Fds, Gs^Fp, Gs^Fp, Gs^Fp, Cer, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fds, Gs^Fds, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Cer, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fp
 Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Hh^Fms, Gs^Fds, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fds, Gs^Fp, Gs^Fp, Gg^Ve, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fmw, Gs^Fp, Gs^Fp, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fmw, Re, Re, Gs^Fp, Gs^Fp, Gs^Fp, Re, Re, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fp, Rd, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp
 Gs^Fp, Gs^Fp, Gs^Fds, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fds, Gs^Fp, Gs^Fp, Gs^Fp, Gg^Ve, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fmw, Rd, Rd, Gs^Fp, Gs^Fp, Gg^Ve, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp
 Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Hh^Fms, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg^Ve, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fp, Rd, Gs^Fmw, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp
@@ -17,7 +17,7 @@ Gs^Fp, Gs^Fp, Gs^Fds, Gs^Fp, Gs^Fp, Gs^Fp, Gs, Gs^Fp, Hh^Fms, Hh^Fms, Gs^Fp, Gs^
 Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fp, Re, Re, Gs, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fds, Gs^Fp, Hh^Fms, Ss, Gs^Fp, Gs^Fp, Ww, Ww, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Re, Gs^Fp, Re, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp
 Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fds, Gs^Fp, Gs^Fds, Gs^Fds, Gs^Fmw, Gs^Fmw, Gs^Fp, Gs^Fp, Gs^Fp, Ww, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fp, Gs^Fp, Ww, Ww, Ww, Ww, Gs^Fp, Ww, Gs^Fds, Gs^Fp, Gs^Fp, Gs^Fp, Hh^Fms, Gs^Fmw, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Re, Re, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp
 Hh^Fms, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fds, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fds, Gs^Fmw, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Wwf, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fmw, Gs^Fmw, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fp, Rd, Re, Re, Gs^Fp, Gs^Fp
-Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fds, Gs^Fds, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fds, Gs^Fp, Gs^Fds, Gs^Fp, Gs^Fp, Gs^Fds, Gs^Fds, Gs^Fp, Gs^Fp, Wwf, Gs^Fp, Gs^Fp, Ce, Ce, Ce, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fds, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Ww, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Rd, Gs^Fp, Re, Gs^Fp
-Gs^Fp, Gs^Fds, Gs^Fds, Gs^Fp, Gs^Fds, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fds, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fds, Gs^Fp, Gs^Fp, Gs^Fp, Ww, Ww, Gs^Fp, Gs^Fp, Ce, 4 Ke, Ce, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fmw, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fp, Ww, Ww, Gs^Fp, Gs^Fmw, Gs^Fmw, Gs^Fp, Gs^Fp, Gs^Fp, Re, Gs^Fp
-Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fds, Gs^Fp, Gs^Fmw, Gs^Fds, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fds, Gs^Fp, Gs^Fp, Ww, Ww, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Ce, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Ww, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Re, Gs^Fp
-Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fds, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Ww, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Ce, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Re, Gs^Fp
+Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fds, Gs^Fds, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fds, Gs^Fp, Gs^Fds, Gs^Fp, Gs^Fp, Gs^Fds, Gs^Fds, Gs^Fp, Gs^Fp, Wwf, Gs^Fp, Gs^Fp, Cer, Cer, Cer, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fds, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Ww, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Rd, Gs^Fp, Re, Gs^Fp
+Gs^Fp, Gs^Fds, Gs^Fds, Gs^Fp, Gs^Fds, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fds, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fds, Gs^Fp, Gs^Fp, Gs^Fp, Ww, Ww, Gs^Fp, Gs^Fp, Cer, 4 Ker, Cer, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fmw, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fp, Ww, Ww, Gs^Fp, Gs^Fmw, Gs^Fmw, Gs^Fp, Gs^Fp, Gs^Fp, Re, Gs^Fp
+Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fds, Gs^Fp, Gs^Fmw, Gs^Fds, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fds, Gs^Fp, Gs^Fp, Ww, Ww, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Cer, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Ww, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Re, Gs^Fp
+Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fds, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Ww, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Cer, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Re, Gs^Fp

data/campaigns/Delfadors_Memoirs/maps/15_Save_the_King.map

@@ -8,8 +8,8 @@ Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Mm, Mm, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg
 Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg^Ve, Mm, Mm, Ww, Ww, Ww, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Mm, Mm, Mm, Mm, Gg, Gg, Hh, Hh, Mm, Mm, Mm, Mm
 Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Gg^Ve, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Ss, Hh, Hh, Mm, Mm, Mm, Mm
 Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg^Ve, Hh, Mm, Mm, Mm, Mm, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Hh, Hh, Hh, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm
-Ww, Ww, Ww, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Gg, Gg, Gg, Gg, Hh, Hh, Hh, Hh, Hh, Hh, Mm, Mm, Ce, Ce, Ce, Mm, Ww, Ww, Ww
-Ww, Ww, Ww, Ww, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Gg, Ce, Ce, Ce, Hh, Hh, Hh, Mm, Mm, Gg^Ve, Mm, Ce, 6 Ke, Ce, Ww, Ww, Ww, Ww
+Ww, Ww, Ww, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Gg, Gg, Gg, Gg, Hh, Hh, Hh, Hh, Hh, Hh, Mm, Mm, Cte, Cte, Cte, Mm, Ww, Ww, Ww
+Ww, Ww, Ww, Ww, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Gg, Ce, Ce, Ce, Hh, Hh, Hh, Mm, Mm, Gg^Ve, Mm, Cte, 6 Kte, Cte, Ww, Ww, Ww, Ww
 Mm, Mm, Ww, Ww, Ww, Wwr, Wwr, Hh, Hh, Hh, Hh, Hh, Hh, Gg, Gg, Ce, 3 Ke, Ce, Hh, Hh, Mm, Mm, Mm, Mm, Ww, Ww, Ww, Ww, Ww, Gs^Fp, Hh, Hh
 Mm, Mm, Mm, Mm, Mm, Mm, Ww, Ww, Ww, Wwr, Gs^Fp, Hh, Hh, Gg, Gg, Ce, Ce, Ce, Gg, Hh, Hh, Mm, Ww, Ww, Ww, Ww, Gg, Wwf, Gg, Hh, Hh, Hh
 Mm, Mm, Mm, Mm, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Wwr, Ww, Ww, Ww, Ww, Gg, Gg, Gg, Gg, Gg, Hh, Hh, Hh, Ww, Ww, Ww, Ww, Wwf, Gg, Gg, Hh, Hh, Hh, Hh

data/campaigns/Delfadors_Memoirs/maps/18_The_Portal_of_Doom.map

@@ -14,13 +14,13 @@ Ms, Aa^Fpa, Aa^Fpa, Re, Aa, Aa^Fpa, Aa^Vha, Gs^Fp, Gs^Fp, Hh, Gs^Fmw, Wwf, Ww, R
 Ms, Aa^Fpa, Aa^Fpa, Aa, Aa, Re, Gs^Fp, Gs^Fp, Hh, Hh, Hh, Ww, Ww, Aa^Fpa, Aa^Fpa, Re, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa
 Ms, Aa^Fpa, Aa^Fpa, Re, Re, Hh, Hh, Hh, Hh, Gs^Fp, Wwf, Ww, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa
 Aa^Fpa, Aa^Fpa, Aa^Fpa, Re, Ms, Ms, Ce, Re, Re, Aa, Ww, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Re, Re, Aa^Fpa, Aa^Fpa, Aa^Fpa, Ms, Ms
-Aa^Fpa, Aa, Re, Ms, Ms, Ce, Ce, Re, Aa, Aa, Ww, Aa, Aa, Aa, Aa^Fpa, Re, Aa^Fpa, Aa^Fpa, Aa^Fpa, Ms, Ms, Ms
-Re, Ms, Re, Ms, Ce, Ke, Ce, Aa, Aa, Ai, Ai, Aa, Aa, Re, Aa, Aa, Aa^Fpa, Aa, Ms, Ch, Ch, Ms
-Ms, Ms, Aa^Vha, Ms, Ha, Ce, Ha, Aa, Ww, Ai, Aa, Aa, Re, Aa, Aa, Aa, Aa, Aa, Aa, Ch, Ch, Ch
+Aa^Fpa, Aa, Re, Ms, Ms, Cea, Ce, Re, Aa, Aa, Ww, Aa, Aa, Aa, Aa^Fpa, Re, Aa^Fpa, Aa^Fpa, Aa^Fpa, Ms, Ms, Ms
+Re, Ms, Re, Ms, Cea, Ke, Cea, Aa, Aa, Ai, Ai, Aa, Aa, Re, Aa, Aa, Aa^Fpa, Aa, Ms, Cha, Cha, Ms
+Ms, Ms, Aa^Vha, Ms, Ha, Cea, Ha, Aa, Ww, Ai, Aa, Aa, Re, Aa, Aa, Aa, Aa, Aa, Aa, Cha, Cha, Cha
 Ms, Ms, 1 Ha, Ha, Ms, Ha, Aa, Aa, Ai, Aa, Aa, Aa, Aa, Ha, Aa, Aa, Re, Re, Aa, Aa, 3 Kh, Ch
 Aa, Ms, Ms, Ms, Ms, Ha, Aa, Ww, Ww, Aa, Aa, Aa^Vha, Aa, Ha, Aa, Aa, Aa, Aa, Rb, Rb, Ur, Qxua
 Ms, Ms, Aa^Vha, Aa, Ms, Aa, Aa, Ww, Aa, Aa, Aa, Ha, Ha, Ha, Ha, Ms, Aa, Aa, Rb, Ur, Qxua, Qxua
 Ha, Ha, Ha, Aa, Aa, Aa, Ai, Ai, Aa, Ha, Ha, Ha, Ha, Ha, Ms, Ms, Aa, Ms, Rb, Ur, Qxua, Qxua
-Ms, Ms, Ha, Ha, Ha, Aa, Ww, Ai, Aa, Ha, Ms, Ms, Ha, Ha, Ms, Ms, Ms, Ms, Ch, 2 Kh, Ch, Qxua
-Ms, Ms, Ms, Ms, Ha, Ha, Aa, Ai, Aa, Ha, Ms, Ms, Ms, Ms, Ms, Ms, Ms, Ms, Ch, Ch, Ch, Ch
-Ms, Ms, Ms, Ms, Ha, Ha, Aa, Ai, Aa, Ha, Ms, Ms, Ms, Ms, Ms, Ms, Ms, Ms, Ch, Ch, Ch, Ch
+Ms, Ms, Ha, Ha, Ha, Aa, Ww, Ai, Aa, Ha, Ms, Ms, Ha, Ha, Ms, Ms, Ms, Ms, Cha, 2 Kh, Ch, Qxua
+Ms, Ms, Ms, Ms, Ha, Ha, Aa, Ai, Aa, Ha, Ms, Ms, Ms, Ms, Ms, Ms, Ms, Ms, Cha, Ch, Ch, Ch
+Ms, Ms, Ms, Ms, Ha, Ha, Aa, Ai, Aa, Ha, Ms, Ms, Ms, Ms, Ms, Ms, Ms, Ms, Cha, Cha, Cha, Cha

data/campaigns/Delfadors_Memoirs/maps/19_Showdown_in_the_Northern_Swamp.map

@@ -27,9 +27,9 @@ Gs^Fmw, Gs^Fmw, Gs^Fmw, Gg, Gg, Gg, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gg,
 Gs^Fmw, Gs^Fmw, Gg, Gg, Gg, Gg, Gg, Gg, Re^Gvs, Re^Gvs, Gg, Gg, Gg, Gs^Fmw, Ww, Ww, Wo, Ww, Gs^Fmw, Ww, Ww, Gs^Fp, Gs^Fp, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs
 Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Re^Gvs, Gg, Gg, Gg, Gg, Ww, Ww, Wo, Ww, Gs^Fp, Gs^Fp, Gs^Fp, Ww, Ww, Gg, Gg, Gg, Gg, Gg, Gs^Fmw, Gs^Fmw, Ss, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Gg
 Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Ww, Wo, Ww, Gg, Gg, Gg, Gg, Gs^Fp, Gg, Ww, Ww, Wwf, Wwf, Gs^Fmw, Ss, Ss, Ww, Ss, Ss, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Gg
-Gg, Gg, Gg, Gg, Ce, Ce, Ce, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Ww, Ww, Wo, Ww, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Ww, Ww, Ww, Ww, Ww, Ww, Ss, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Re^Gvs, Re^Gvs, Gg
-Gg, Gg, Gg, Gg, Ce, 5 Ke, Ce, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Ww, Wo, Ww, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Ww, Ww, Ww, Ww, Ss, Gg, Gg, Gg, Gg, Ww, Ww, Ww, Gg, Gg, Gg^Vl, Re^Gvs, Gg
-Gg, Gg, Gg, Gg, Gg, Ce, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Ww, Wo, Ww, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fmw, Gs^Fds, Ww, Ww, Gg, Ww, Ww, Gg, Ww, Gg, Ww, Ww, Gg, Gg, Gg
-Gg, Gg, Gg, Gg, Gg, Ce, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Ww, Ww, Wo, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fmw, Gs^Fds, Ww, Gg, Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fmw, Ww, Ww, Ww
+Gg, Gg, Gg, Gg, Cer, Cer, Cer, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Ww, Ww, Wo, Ww, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Ww, Ww, Ww, Ww, Ww, Ww, Ss, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Re^Gvs, Re^Gvs, Gg
+Gg, Gg, Gg, Gg, Cer, 5 Ker, Cer, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Ww, Wo, Ww, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Ww, Ww, Ww, Ww, Ss, Gg, Gg, Gg, Gg, Ww, Ww, Ww, Gg, Gg, Gg^Vl, Re^Gvs, Gg
+Gg, Gg, Gg, Gg, Gg, Cer, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Ww, Wo, Ww, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fmw, Gs^Fds, Ww, Ww, Gg, Ww, Ww, Gg, Ww, Gg, Ww, Ww, Gg, Gg, Gg
+Gg, Gg, Gg, Gg, Gg, Cer, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Ww, Ww, Wo, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fmw, Gs^Fds, Ww, Gg, Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fmw, Ww, Ww, Ww
 Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Ww, Ww, Wo, Ww, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gg, Gs^Fp, Gs^Fmw, Gs^Fp, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fds, Gg, Gg
 Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Ww, Ww, Wo, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg

data/campaigns/Delfadors_Memoirs/scenarios/12_Terror_at_the_Ford_of_Parthyn.cfg

@@ -118,13 +118,8 @@
             # moveto event sights and have the event trigger on the
             # side change (observer during playtest).
             [avoid]
-                x,y=34,25
-            [/avoid]
-            [avoid]
-                x,y=29,26
-            [/avoid]
-            [avoid]
-                x,y=29,24
+                x=34,29,29
+                y=25,26,24
             [/avoid]
         [/ai]
     [/side]
@@ -223,7 +218,7 @@
     [/event]
 
     {PLACE_IMAGE scenery/village-human-burned1.png 34 6}    # has moveto
-    {PLACE_IMAGE scenery/village-human-burned2.png 29 13}   # has moveto
+    {PLACE_IMAGE scenery/village-human-burned2.png 30 12}   # has moveto
     {PLACE_IMAGE scenery/village-human-burned3.png 31 10}   # has moveto
     {PLACE_IMAGE scenery/village-human-burned4.png 37 17}
     {PLACE_IMAGE scenery/village-human-burned4.png 35 17}
@@ -301,7 +296,7 @@
             [then]
                 [message]
                     speaker=unit
-                    message= _ "What in the wide green world is this abomination?"
+                    message= _ "There's something there in the mist!"
                 [/message]
             [/then]
         [/if]
@@ -324,11 +319,15 @@
 
         [message]
             speaker=unit
-            message= _ "Orcs! Orcs at the Ford!"
+            message= _ "Orcs!"
+        [/message]
+        [message]
+            speaker=Chantal
+            message= _ "It seems there are orcs this far south after all. This is strange."
         [/message]
         [message]
             speaker=Delfador
-            message= _ "Prepare to fight them! We must clear the Ford!"
+            message= _ "Prepare to fight them! We must keep the Ford clear!"
         [/message]
         [fire_event]
             name=enemies
@@ -581,12 +580,12 @@
         [/message]
     [/event]
 
-    # Move to 29,13 burned village (north edge of farmed patch): empty
+    # Move to 30,12 burned village (north edge of farmed patch): empty
     [event]
         name=moveto
         [filter]
             side=1
-            x,y=29,13
+            x,y=30,12
         [/filter]
         [message]
             speaker=unit
@@ -1024,7 +1023,7 @@
             [then]
                 [message]
                     speaker=Delfador
-                    message= _ "They have unleashed a second wave. Soldiers, stand firm and send these abominations back to the darkness!"
+                    message= _ "This unnatural night will surely bring another wave of the undead. Soldiers, stand firm and send these abominations back to the darkness!"
                 [/message]
             [/then]
         [/if]

data/core/units/dunefolk/Alchemist.cfg

@@ -22,7 +22,7 @@ units/dunefolk/herbalist/#enddef
     [abilities]
         {ABILITY_REGENERATES}
     [/abilities]
-    description= _ "To the Dunefolk, alchemy is less a form of philosophy or science, and more of an extension of the phytology that is practiced by herbalists. However, in contrast to their brethrens’ focus on herbs for medicine and healing, Alchemists utilize various plants and naturally occurring venoms to concoct potent poisons. Though useful for weakening tough enemies, the Alchemists’ art is viewed warily by other Dunefolk, for it is often employed for espionage and assassination. Nevertheless, almost every caravan will contain at least one Alchemist for precisely this reason — the political advantage from the threat of nearly untraceable poisons is not to be underestimated."
+    description= _ "To the Dunefolk, alchemy is less a form of philosophy or science, and more an extension of the phytology that is practiced by herbalists. However, in contrast to their brethrens’ focus on herbs for medicine and healing, many alchemists utilize various plants and naturally occurring venoms to concoct lethal poisons. While useful for weakening tough enemies, this art is viewed warily by other Dunefolk as a potent means for espionage and assassination. At the same time, such a tool presents a tremendous political advantage, so much so that almost every caravan will hire or train a few alchemists to maintain a reasonable level of threat at all times."
     {NOTE_POISON}
     {NOTE_REGENERATES}
     die_sound={SOUND_LIST:HUMAN_DIE}