Rewrote 'Training the Ogres'

changelog

@@ -3,6 +3,9 @@ Version 1.11.9+dev:
    * Fixed faulty add-on _info.cfg files causing the game to display obscure
      error messages or crash to desktop.
  * Campaigns:
+   * Eastern Invasion:
+     * Rewrote scenario 'Training the Ogres' and renamed it to
+       'Capturing the Ogres'.
    * Heir to the Throne:
      * Fixed Delfador clobbering whichever unit happens to be standing on
        31,11 at the end of The Bay of Pearls, causing it to disappear

data/campaigns/Eastern_Invasion/maps/08_Training_the_Ogres.map

@@ -1,25 +1,30 @@
 border_size=1
 usage=map
 
-Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm
+Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fmf, Gll^Fmf, Gll^Fp, Gll^Fmf, Gll^Fmf, Gll^Fdf, Gll^Fdf, Gs, Gs, Gd, Gd, Gs, Gs, Gs, Gs, Gd, Gs, Gs, Gs, Gs, Gs, Gs, Gs, Gd, Gs, Gd, Gs, Gd, Gs, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh
-Mm, Mm^Vhh, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm^Vhh, Mm
+Gll^Fmf, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fmf, Gll^Fp, Gs, Gs, Gs, Gs, Gs, Gs, Gs, Gs, Gs, Gs, Gs, Gd, Gs, Gd, Gs, Gs, Gd, Gd, Gs, Gd, Gd, Gd, Gs, Gd, Gd, Hh, Gd, Hh, Gs, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh
-Mm, Mm, Mm, Mm, Mm, Mm, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Mm, Mm, Mm, Mm, Mm, Mm
+Gll^Fmf, Gd^Fmf, Gd^Fp, Gd^Fmf, Gd^Fmf, Gd, Gs, Gs, Gd, Gs, Gd, Gd, Gs, Gd, Gll^Fp, Gd, Gll^Fp, Gs, Gll^Fp, Gll^Fp, Gll^Fp, Gs, Gs, Gs, Gs, Gs, Gll^Fp, Gs, Gs, Gs, Gs, Gs, Gs, Gs, Gd, Gs, Gs, Gll^Fp, Gll^Fp, Gs, Hh, Hh, Hh, Hh, Hh, Hh
-Mm, Mm, Mm, Mm, Mm, Hh, Hh, Gg, Gs, Gg, Hh, Hh, Gg, Hh, Gs, Gg, Gg^Efm, Gg, Hh, Hh, Hh, Hh, Hh, Mm, Mm, Mm
+Gd^Fmf, Gd^Fp, Gd^Fp, Gd^Fp, Gd^Fp, Gd, Gd, Gd, Gs, Gs, Gs, Gs, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Hh, Gll^Fp, Hh, Hh, Hh, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Hh^Fp, Gll^Fp, Gll^Fp, Gs, Gs, Gs, Gs, Gd, Gs, Gs, Gll^Fp, Gll^Fp, Gll^Fp, Gs, Gs, Hh, Hh, Hh, Hh, Hh
-Mm, Mm, Mm, Hh, Hh, Hh, Gs, Gs, Gs, Gg, Gg, Hh^Fp, Gs^Fms, Gs, Gll^Fp, Gs, Gg^Efm, Hh, Gs, Gs, Gs, Gg, Hh, Hh, Mm, Mm
+Gll^Fdf, Gd^Fmf, Gll^Fdf, Gd^Fmf, Gd, Gd, Gd, Gd, Gd, Gs, Gs, Gs, Gll^Fp, Gll^Fp, Hh^Fp, Hh^Fp, Hh, Hh, Mm, Hh, Mm, Hh, Hh, Gll^Fp, Hh, Hh^Fp, Mm, Hh^Fp, Hh^Fp, Hh^Fp, Hh^Fp, Hh^Fp, Hh^Fp, Gs, Hh, Gs, Gs, Gll^Fp, Gs, Gll^Fp, Gll^Fp, Gs, Hh, Hh, Hh, Hh
-Mm, Mm, Hh, Hh, Gs, Gll, Gll^Fp, Gll^Fp, Gll^Fp, Gg, Gs^Es, Gs, Gg, Gll, Gs, Gs^Fp, Gs^Efm, Hh^Fp, Gs^Fp, Gs^Fp, Hh^Fp, Gg^Es, Gg, Hh, Mm, Mm
+Gll^Fmf, Gll^Fmf, Gd, Gd, Gd, Gs, Gs, Gs, Gs, Gs, Gs, Hh, Hh, Hh^Fp, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Hh, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Hh, Gs, Hh, Gd, Gs, Gs, Gs, Gll^Fp, Gs, Gs, Gs, Gd, Hh
-Mm, Mm, Hh, Gs, Gg, Gs, Gll^Fp, Gll, Gll, Gs, Gg, Gg, Gs, Gg, Gd, Gd, Gs, Gs, Gll^Fp, Hh^Fp, Gg, Hh^Fp, Hh, Hh, Mm, Mm
+Gs, Gll^Fdf, Gd, Gs, Gs, Gs, Gll^Fdf, Gs, Gs, Hh, Hh, Hh, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Hh, Hh, Gd, Gd, Gs, Gll^Fp, Gll^Fp, Gd, Gd, Gs, Hh
-Mm, Mm, Hh, Hh, Gs, Gs^Es, Gll^Fp, Gll^Fp, Gg, Gg, Gg, Gg, Gg^Efm, Gs, Gs, Gd^Es, Gs, Gll, Gll^Fms, Gs^Fms, Hh, Hh, Mm, Mm, Mm, Mm
+Gs, Gs, Gd, Gd, Gd, Gll^Fdf, Gll^Fdf, Gs, Hh, Hh, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Gs, Mm, Gs, Mm, Mm, Mm, Mm^Vc, Mm, Mm, Hh, Hh, Hh, Gd, Gs, Gs, Gs, Gs, Gd, Gs, Hh
-Mm, Mm, Hh, Gg, Gs, Gs, Hh^Fp, Hh^Fp, Gg, Gg, Gg^Efm, Gg, Gg, Gg, Gg, Gg, Gg, Gll, Hh, Gs, Gs, Hh, Hh, Mm, Mm, Mm
+Gd, Gd, Gs, Gs, Gs, Gs, Gs, Gs, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Gs, Gs, Gd^Vc, Gs, Gs, Hh, Hh, Mm, Hh, Hh, Gs^Fdf, Gs, Gs^Fdf, Gs, Gs, Mm, Mm, Mm, Mm, Mm, Hh, Hh, Hh, Gd, Gs, Gs, Gs, Gs, Gs, Gs
-Mm, Mm, Mm, Hh, Hh, Hh, Gll, Gg, Gg, Gg^Es, Gg, Gg, Gg^Efm, Gg, Gg, Gg^Efm, Gs, Hh, Gg, Hh, Gg, Hh, Hh, Mm, Mm, Mm
+Gs, Gd, Gs, Gs, Gs, Gs, Hh, Hh, Mm, Mm, Mm, Mm, Gs, Mm, Gs, Mm, Wwg, Gs, Gs, Gs, Wwg, Hh^Fdf, Hh^Fdf, Hh, Hh^Fdf, Gs^Fdf, Wwg, Gs^Fdf, Gs^Fdf, Gs^Fdf, Gs, Gs, Mm, Mm, Mm, Mm, Mm, Hh, Hh, Gs, Gs, Gs, Gs, Gs, Gd, Gs
-Mm, Mm, Mm, Mm, Hh, Hh, Gll, Gll^Fp, Gll, Gs^Efm, Gs, Gs, Gs, Gs, Gs, Gs, Gd, Gs, Gll^Fp, Gs^Fp, Hh, Hh, Mm, Mm, Mm, Mm
+Gd, Gd, Gs, Gs, Hh, Hh, Hh, Mm, Mm, Mm, Mm, Gs, Gs, Gs, Gs, Gs, Gg^Fdf, Wwg, Wwg, Wwg, Wwg, Wwg, Wwg, Wwg, Wwg, Wwg, Gg^Efm, Gll^Fdf, Gll^Fdf, Gll^Fdf, Gll^Fdf, Gs, Gs, Mm, Mm, Mm, Mm, Mm, Mm, Hh, Gs, Gs, Gd, Gs, Gd, Gs
-Mm, Mm, Mm, Hh, Hh, Gll, Gll^Fp, Gll^Fms, Gs, Gd, Gs, Gs, Gg, Gg^Efm, Gg, Gd^Es, Gg, Gll, Hh, Gg, Hh, Mm, Mm, Mm, Mm, Mm
+Gd, Gs, Gs, Hh, Hh, Hh, Mm, Mm, Mm, Mm, Hh, Gs, Gll^Gvs, Gll^Gvs, Gs, Gs, Gg^Fdf, Ds, Ds, Wwg, Gs, Wwg, Gs, Wwg, Gs, Gg, Gg, Gs, Gll^Fdf, Gll^Fdf, Gs, Gll^Fdf, Gs, Gs, Gs, Mm, Mm, Mm, Mm, Hh, Gs, Gs, Gd, Gd, Gd, Gd
-Mm, Mm, Mm, Hh, Gg, Gll, Gll^Fp, Gll, Gs, Gd, Gg^Efm, Gg, Gs, Gs, Gg, Gs, Gll^Fp, Gg, Hh^Fp, Gg, Hh, Mm, Mm, Mm, Mm, Mm
+Gs, Gs, Gs, Hh, Hh, Mm, Mm, Mm, Mm, Hh, Hh, Gs, Gs, Gs, Gd, Gs, Gg^Fdf, Gg^Fdf, Gs, Gs, Gs, Gs^Vc, Gs, Gs, Gg, Gg, Gs, Gs, Gll^Fdf, Gll^Fdf, Gs, Gs, Gs, Gs, Hh, Hh, Mm, Mm, Mm, Mm, Hh, Gd, Gs, Gs, Gd, Gs
-Mm, Mm, Mm, Hh, Hh, Gs^Es, Gs, Gll^Fp, Gs, Gg, Gs, Gs, Gg, Gg^Efm, Gg, Gll, Gll^Fp, Gll^Fp, Gll^Em, Hh^Fp, Hh, Hh, Mm, Mm, Mm, Mm
+Gs, Gs, Gd, Gs, Mm, Mm, Mm, Mm, Mm, Hh, Hh, Hh, Gs, Gs, Gd^Vc, Gs, Gs, Gs, Gs, Gg, Gg^Efm, Gg, Gs, Gs, Gg, Gg, Gs, Gs, Gs, Gs, Gll^Vc, Gs, Gs, Gs, Hh, Hh, Hh, Mm, Mm, Mm, Mm, Gd, Gs, Gd, Gd, Gs
-Mm, Mm, Mm, Mm, Hh, Hh, Gg, Gs, Gs^Es, Gs, Gs, 1 Gg, Gg, Gg, Gg, Gll, Gll^Fp, Gll^Fms, Hh^Fp, Gg, Gg^Efm, Hh, Mm, Mm, Mm, Mm
+Gd, Gs, Gd, Gd, Gs, Mm, Mm, Mm^Vc, Mm, Mm, Hh, Hh, Hh, Gd, Gs, Gd, Gs, Gs, Gs, Gs, Gg, Gg, Gg^Efm, Gg, Gg, Gg^Efm, Gs, Gs, Gs, Gs, Gs, Gll, Gll^Gvs, Hh, Hh, Hh^Fdf, Hh^Fdf, Mm, Mm, Mm, Mm, Gd, Gd, Gd, Gd, Gs
-Mm, Mm, Mm, Mm, Mm, Hh, Hh, Hh, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Hh, Gll, Gll^Fp, Gs, Gg, Hh, Hh, Mm, Mm, Mm, Mm
+Gs, Gd, Gs, Gd, Gs, Mm, Mm, Mm, Mm, Mm, Hh, Hh, Hh, Gs, Gs, Gs, Gs, Gll^Fdf, Gg, Gg^Efm, Gs, Gg, Gg, Gg, Gg, Gg, Gs, Gs, Gll^Fdf, Gll^Fdf, Gs, Gs, Gs, Hh, Wwg, Hh^Fdf, Hh, Mm, Mm, Mm, Hh, Gs, Gs, Gd, Gd, Gd
-Mm, Mm, Mm, Mm, Mm, Mm, Hh, Hh, Hh, Hh, Gs^Efm, Gg^Efm, Gs, Gs, Gs^Es, Gg, Hh, Gs, Hh, Gg, Hh, Mm, Mm, Mm, Mm, Mm
+Gs, Gs, Gs, Gs, Gs, Hh, Mm, Mm, Mm, Mm, Mm, Hh, Hh, Hh, Hh, Gs, Gll^Fdf, Gll^Fdf, Gg, Gg, Gg, Gg, Gg, Gg^Efm, Gg, Gs^Vc, Gd, Gs, Gs, Gs, Gs, Gs, Gs, Wwg, Wwg, Wwg, Hh, Mm, Mm, Hh, Mm, Gs, Gs, Gs, Gd, Gd
-Mm, Mm, Mm, Mm, Mm, Mm, Hh, Hh, Gg, Gs, Gll, Gs, Gll^Fp, Gs, Gg, Gg, Gg, Hh, Hh, Hh, Hh, Mm, Mm, Mm, Mm, Mm
+Gd, Gs, Gs, Gs, Gs, Gd, Gd, Hh, Hh, Mm, Mm, Mm, Mm, Hh, Gs, Gll^Fdf, Gll^Fdf, Gs^Vc, Gg, Gg, Gg^Efm, Gg, Gs, Gg, Gs, Gs, Gll^Fdf, Gs, Gll^Fdf, Gs, Gll^Gvs, Gll^Gvs, Gs, Gs, Hh, Hh, Mm, Mm, Mm, Mm, Gs, Gs, Gs, Gd, Gd, Gd
-Mm, Mm, Mm, Mm, Mm, Mm, Mm, Hh, Hh, Hh, Hh^Fp, Gll^Fms, Gll^Fp, Gll, Hh, Hh, Hh, Hh, Hh, Mm, Mm, Mm, Mm, Mm, Mm, Mm
+Gs, Gd, Gd, Gs, Hh, Gs, Hh, Gd, Hh, Mm, Mm, Hh, Hh, Mm, Mm, Gs, Gs, Gll^Fdf, Gg, Gs, Gs, Gs, Gs, Gg^Efm, Gs, Gs, Hh, Hh^Fdf, Hh, Gll^Fdf, Gs, Gs, Hh, Hh, Mm, Mm, Mm, Mm, Hh, Hh, Gs, Gs, Gd, Gd, Gs, Gs
-Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Hh^Fp, Gs^Fms, Gll, Hh^Fp, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm
+Gs, Gd, Gd, Gs, Gs, Hh, Hh, Gs, Gs, Hh, Hh, Mm, Mm, Mm, Mm, Hh, Hh, Gs, Mm, Gs, Hh, Gs, Hh, Hh, Hh, Hh, Mm, Hh, Hh^Fdf, Hh, Hh, Hh, Mm, Mm, Mm, Mm, Hh, Hh, Gs, Gs, Gs, Gs, Gs, Gd, Gs, Gs
-Mm, Mm^Vhh, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Gll, Gll^Fp, Gs, Hh, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm^Vhh, Mm
+Gd, Gd, Gd, Gs, Gs, Gs, Hh, Hh, Gd, Gd, Hh, Mm, Mm, Mm, Mm, Hh, Mm, Mm, Hh, Hh, Hh, Hh, Hh, Hh, Mm, Mm, Mm, Hh, Mm, Hh, Mm, Mm, Hh, Mm, Hh, Hh, Gs, Gs, Gs, Gs, Gd, Gd, Gd, Gd, Gs, Gs
-Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Gg, Gg, Gg, Hh, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm
+Gs, Gs, Gd, Gd, Gs, Gs, Hh, Hh, Hh, Gs, Gs, Mm, Mm, Mm, Mm, Mm, Mm, Hh, Mm, Hh, Hh, Hh, Ce, Mm, Gs, Mm, Gs, Mm, Mm, Mm, Hh, Hh, Hh, Hh, Gs, Gd, Gd, Gs, Gd, Gd, Gs, Gs, Gs, Gs, Gs, Gs
+Gs, Gd, Gs, Gs, Gs, Gs, Gs, Gs, Gs, Hh, Gs, Gs, Gs, Mm, Gs, Mm, Mm, Gs, Gs, Gs, Gs, Ce, 1 Ke, Ce, Re, Gs, Gs, Gs, Hh, Hh, Gs, Hh, Gs, Gs, Gs, Gs, Gd, Gd, Gs, Gd, Gs, Gd, Gd, Gs, Wwg, Wwg
+Gs, Gd, Gd, Gd, Gd, Gs, Gs, Gs, Gs, Gs, Gs, Gs, Gd, Gs, Gs, Gs, Gs, Gs, Gd, Gd, Gs, Ce, Ce, Ce, Gs, Re, Gd, Gs, Gs, Gs, Gs, Gs, Re, Gs, Gd, Gd, Gd, Gd, Gd, Gd, Gs, Gd, Wwg, Wwg, Wwg, Wwg
+Gd, Gd, Gd, Gs, Gd, Gs, Gs, Gs, Gs, Gs, Gs, Gd, Gd, Gd, Gs, Gs, Gd, Gd, Gd, Gs, Gs, Gs, Gs, Gd, Gd, Gs, Gs, Re, Re, Gs, Re, Re, Gd, Re, Gd, Re, Re, Re, Re, Gs, Wwg, Wwg, Wwg, Wwg, Gd, Gd
+Gs, Gs, Gd, Gs, Gs, Gd, Gs, Gs, Gd, Gd, Gs, Gs, Gd, Gs, Gd, Gd, Gs, Gs, Gs, Gs, Gs, Gs, Gd, Gs, Gs, Gd, Gd, Gs, Gd, Gd, Gd, Gd, Gs, Gs, Gd, Gd, Gs, Gs, Gd, Gd, Wwg^Bw\r, Wwg, Wwg, Gs, Gs, Gd
+Gd, Gd, Gd, Gs, Gs, Gd, Gd, Gd, Gs, Gs, Gs, Gs, Gs, Gd, Gs, Gd, Gd, Gs, Gd, Gd, Gd, Gd, Gs, Gs, Gs, Gs, Gs, Gd, Gs, Gd, Gs, Gs, Gs, Gd, Gs, Gs, Gs, Gs, Wwg, Wwg, Wwg, Wwg^Bw\r, Gd, Gd, Gs, Gs

data/campaigns/Eastern_Invasion/scenarios/08_Training_the_Ogres.cfg

@@ -1,23 +1,28 @@
 #textdomain wesnoth-ei
 [scenario]
     id=08_Training_the_Ogres
-    name= _ "Training the Ogres"
+    name= _ "Capturing the Ogres"
     next_scenario=09_Xenophobia
     map_data="{campaigns/Eastern_Invasion/maps/08_Training_the_Ogres.map}"
     victory_when_enemies_defeated=no
-    {TURNS 4 5 6}
+    turns=-1
     {DEFAULT_SCHEDULE}
 
-    {INTRO_AND_SCENARIO_MUSIC breaking_the_chains.ogg knolls.ogg}
+    {INTRO_AND_SCENARIO_MUSIC revelation.ogg traveling_minstrels.ogg}
-    {EXTRA_SCENARIO_MUSIC revelation.ogg}
+    {EXTRA_SCENARIO_MUSIC journeys_end.ogg}
-    {EXTRA_SCENARIO_MUSIC traveling_minstrels.ogg}
 
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 
+#define MAP_EDGES_SLF
+    [filter_adjacent_location]
+        count=1-5
+    [/filter_adjacent_location]
+#enddef
+
     [story]
         [part]
             show_title=yes
-            {TO_TRAINING_THE_OGRES}
+            {TO_CAPTURING_THE_OGRES}
         [/part]
     [/story]
 
@@ -26,7 +31,6 @@
         id=Gweddry
         name= _ "Gweddry"
         side=1
-        income=-2
         canrecruit=no
         controller=human
         team_name=wesnothians
@@ -39,35 +43,78 @@
         side=2
         controller=ai
         no_leader=yes
-        team_name=monster
+        team_name=ogres
-        user_team_name=_"Monsters"
+        user_team_name=_"Ogres"
+        [ai]
+            {AI_SIMPLE_ALWAYS_ASPECT aggression 0.0}
+            [goal]
+                # This ought to make the ogres run for the map edges
+                name=target_location
+                [criteria]
+                    {MAP_EDGES_SLF}
+                [/criteria]
+                value=99
+            [/goal]
+        [/ai]
     [/side]
 
-#define OGRE
-    [unit]
-        type=Young Ogre
-        side=2
-        x=12
-        y=10
-    [/unit]
-#enddef
-
     [event]
         name=prestart
 
-        # {SCATTER_IMAGE (terrain=Gs^Fp) 8 scenery/pine2.png}
+        [set_variables]
+            name=ogre_escape_msgs
+
+            [literal]
+                message= _ "Waah! Run!"
+            [/literal]
+
+            [literal]
+                message= _ "Run for your lives!"
+            [/literal]
+
+            [literal]
+                message= _ "Help!"
+            [/literal]
+        [/set_variables]
+        {VARIABLE next_ogre_escape_msg 0}
+
+        [set_variables]
+            name=ogre_capture_msgs
+
+            [literal]
+                message= _ "$ogre_name surrender!"
+            [/literal]
+
+            [literal]
+                message= _ "Don't hurt $ogre_name|!"
+            [/literal]
+
+            [literal]
+                message= _ "$ogre_name will be good! Promise!"
+            [/literal]
+        [/set_variables]
+        {VARIABLE next_ogre_capture_msg 0}
+
+        {SCATTER_UNITS 8 "Ogre,Young Ogre" 1 (
+            x=13,15,16,17,19,20,22,24,24,27,27,31,31
+            y=12,14,18,11,16,13,17,12,15,12,14,14,16
+            [not]
+                [filter]
+                [/filter]
+            [/not]
+        ) (
+            side=2
+            generate_name=yes
+            random_traits=yes
+        )}
 
         [objectives]
             side=1
             [objective]
-                description= _ "Survive until end of turns"
+                description= _ "Capture as many ogres as you can" + "<span foreground='white'> <small>" + _"(captured ogres will be made available for recall)" + "</small></span>"
                 condition=win
                 show_turn_counter=yes
             [/objective]
-            [objective]
-                description= _ "To add ogres to your army, keep two on the grass until end of turns"
-                condition=win
-            [/objective]
             [objective]
                 description= _ "Death of Gweddry"
                 condition=lose
@@ -81,6 +128,13 @@
                 condition=lose
             [/objective]
 
+            [note]
+                description= _ "An ogre is captured when it starts a turn being unable to move more than one hex."
+            [/note]
+            [note]
+                description= _ "If an ogre reaches the edge of the map, it will escape."
+            [/note]
+
             [gold_carryover]
                 carryover_percentage=100
             [/gold_carryover]
@@ -89,106 +143,222 @@
 
     [event]
         name=start
+
         [recall]
             id=Dacyn
+            x,y=23,22
         [/recall]
         [recall]
             id=Owaec
+            x,y=21,22
         [/recall]
-        {OGRE}
+
-        {OGRE}
-        {OGRE}
-#ifdef NORMAL
-        {OGRE}
-#endif
-#ifdef HARD
-        {OGRE}
-        {OGRE}
-#endif
         [message]
             speaker=Gweddry
-            message= _ "Look, we have found a pack of ogres. We should try to capture some to train."
+            message= _ "Look, this valley is inhabited by a tribe of ogres. We should try to capture some to train."
         [/message]
         [message]
-            speaker=Dacyn
+            race=ogre
-            message= _ "All right, we have to keep at least two of these ogres on the grass where they can’t escape until our troops get here to capture them."
+            message= _ "Humans are coming! Run!"
         [/message]
         [message]
             speaker=Owaec
-            message= _ "We should try to surround them. Gweddry, you stay where you are. Dacyn, you go north-east. I’ll go north-west."
+            message= _ "Looks like they are fleeing. I think they will surrender easily if we can surround them."
+        [/message]
+        [message]
+            speaker=Dacyn
+            message= _ "All right, we have to capture them one by one."
+        [/message]
+    [/event]
+
+    [event]
+        name=moveto
+
+        [filter]
+            race=ogre
+            [filter_location]
+                {MAP_EDGES_SLF}
+            [/filter_location]
+        [/filter]
+
+        [message]
+            speaker=Gweddry
+            message= _ "We have let one escape. Let’s hope they don’t all!"
         [/message]
-        [teleport]
-            [filter]
-                id=Owaec
-            [/filter]
-            x=7
-            y=7
-        [/teleport]
-        [teleport]
-            [filter]
-                id=Dacyn
-            [/filter]
-            x=17
-            y=7
-        [/teleport]
     [/event]
 
     [event]
         name=moveto
         first_time_only=no
+
         [filter]
-            type=Young Ogre
+            race=ogre
-            x=1-25,1-2,23-24,1-25
+            [filter_location]
-            y=1-2,1-20,1-20,18-20
+                {MAP_EDGES_SLF}
+            [/filter_location]
         [/filter]
+
         [message]
-            speaker=Gweddry
+            speaker=unit
-            message= _ "We have let one escape. Let’s hope they don’t all!"
+            message=$ogre_escape_msgs[$next_ogre_escape_msg].message
         [/message]
+
+        {VARIABLE_OP next_ogre_escape_msg add 1}
+        {VARIABLE_OP next_ogre_escape_msg modulo $ogre_escape_msgs.length}
+
         [kill]
-            type=Young Ogre
+            x,y=$x1,$y1
-            x=1-25,1-2,23-24,1-25
-            y=1-2,1-20,1-20,18-20
         [/kill]
     [/event]
 
     [event]
-        name=time over
+        name=side 2 turn
-        [role]
+        first_time_only=no
-            type=Young Ogre
+
-            role=ogre
+        # This stores all ogres which have no free adjacent locations which
-        [/role]
+        # aren't adjacent to a side 1 unit; that is, the ones which are
-        [kill]
+        # ZoC-trapped so that they can't move more than one hex.
-            role=ogre
+        [store_unit]
-        [/kill]
+            [filter]
-        [if]
+                side=2
-            [have_unit]
+
-                type=Young Ogre
+                [filter_location]
-            [/have_unit]
+                    [not]
-            [then]
+                        [filter_adjacent_location]
-                [message]
+                            [not]
-                    speaker=Dacyn
+                                [filter]
-                    message= _ "Our troops have caught up! Now, we will be able to recruit ogres!"
+                                    side=1
-                [/message]
+                                [/filter]
-                {VARIABLE have_ogres yes}
+                            [/not]
-                [allow_recruit]
+
-                    side=1
+                            [not]
-                    type=Young Ogre
+                                [filter_adjacent_location]
-                [/allow_recruit]
+                                    [filter]
-            [/then]
+                                        side=1
-            [else]
+                                    [/filter]
-                [message]
+                                [/filter_adjacent_location]
-                    speaker=Gweddry
+                            [/not]
-                    message= _ "We didn’t capture enough of the ogres here. We will have to go on without them."
+                        [/filter_adjacent_location]
-                [/message]
+                    [/not]
-            [/else]
+                [/filter_location]
-        [/if]
+            [/filter]
+
+            kill=no
+            variable=ogres_to_capture
+        [/store_unit]
+
+        {FOREACH ogres_to_capture i}
+            {VARIABLE ogre_name $ogres_to_capture[$i].name}
+
+            [message]
+                x,y=$ogres_to_capture[$i].x,$ogres_to_capture[$i].y
+                message=$ogre_capture_msgs[$next_ogre_capture_msg].message
+            [/message]
+
+            {VARIABLE_OP next_ogre_capture_msg add 1}
+            {VARIABLE_OP next_ogre_capture_msg modulo $ogre_capture_msgs.length}
+
+            [kill]
+                x,y=$ogres_to_capture[$i].x,$ogres_to_capture[$i].y
+            [/kill]
+
+            {VARIABLE ogres_to_capture[$i].side 1}
+
+            [unstore_unit]
+                variable=ogres_to_capture[$i]
+                x,y=recall,recall
+            [/unstore_unit]
+        {NEXT i}
+
+        {CLEAR_VARIABLE ogres_to_capture,ogre_name}
+    [/event]
+
+    [event]
+        name=new turn
+
+        [filter_condition]
+            [not]
+                [have_unit]
+                    side=2
+                [/have_unit]
+            [/not]
+        [/filter_condition]
+
         [endlevel]
             result=victory
-            bonus=yes
             {NEW_GOLD_CARRYOVER 100}
         [/endlevel]
     [/event]
 
+    [event]
+        name=time over
+
+        [endlevel]
+            result=victory
+            {NEW_GOLD_CARRYOVER 100}
+        [/endlevel]
+    [/event]
+
+    [event]
+        name=victory
+
+        [store_unit]
+            [filter]
+                side=1
+                race=ogre
+            [/filter]
+
+            kill=no
+            variable=ogres
+        [/store_unit]
+
+        [switch]
+            variable=ogres.length
+
+            [case]
+                value=0
+
+                [message]
+                    speaker=Gweddry
+                    message= _ "We failed to capture any of them!"
+                [/message]
+            [/case]
+
+            [case]
+                value=1
+
+                [message]
+                    speaker=Gweddry
+                    message= _ "We only captured one ogre."
+                [/message]
+            [/case]
+
+            [case]
+                value=2
+
+                [message]
+                    speaker=Gweddry
+                    message= _ "We failed to capture more than two of the ogres."
+                [/message]
+            [/case]
+
+            [case]
+                value=3
+
+                [message]
+                    speaker=Gweddry
+                    message= _ "We failed to capture any of them!"
+                [/message]
+            [/case]
+
+            [else]
+                [message]
+                    speaker=Gweddry
+                    message= _ "We managed to capture many ogres! They will make a good addition to our troops."
+                [/message]
+            [/else]
+        [/switch]
+    [/event]
+
     {FOREIGN_DEFEAT}
 [/scenario]

players_changelog

@@ -4,6 +4,9 @@ changelog: https://github.com/wesnoth/wesnoth-old/blob/master/changelog
 
 Version 1.11.9+dev:
  * Campaigns:
+   * Eastern Invasion:
+     * Rewrote scenario 'Training the Ogres' and renamed it to
+       'Capturing the Ogres'.
    * Heir to the Throne:
      * Fixed Delfador clobbering whichever unit happens to be standing on
        31,11 at the end of The Bay of Pearls, causing it to disappear