SoF: make it more debug safe

also show a different message when trying to recall. [ci skip]
wesnoth · Oct 19, 2018 · 06f84a7 · 06f84a7
1 parent 18a80a0
commit 06f84a7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg
@@ -562,10 +562,10 @@
                     variable=dwarves
                     kill=yes
                 [/store_unit]
-                [set_recruit]
+                # for purely flavor reasons
+                [disallow_recruit]
                     side=1
-                    recruit=
-                [/set_recruit]
+                [/disallow_recruit]
                 [show_objectives]
                 [/show_objectives]
             [/then]

diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg
@@ -6,6 +6,7 @@
     map_data="{campaigns/Sceptre_of_Fire/maps/7_Outriding_the_Outriders.map}"
     next_scenario=8_The_Dragon
     victory_when_enemies_defeated=no
+    disallow_recall=yes
 
     {SCENARIO_MUSIC "vengeful.ogg"}
 
@@ -17,7 +18,6 @@
         save_id=Rugnur
         side=1
         controller=human
-        recruit=
         shroud=yes
         fog=yes
         gold=0
@@ -78,6 +78,10 @@
             x,y=17,4
         [/unstore_unit]
 
+        [disallow_recruit]
+            side=1
+        [/disallow_recruit]
+
         [objectives]
             side=1
             [objective]

diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/Epilogue.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/Epilogue.cfg
@@ -5,6 +5,7 @@
     turns=1
     map_data="{campaigns/Sceptre_of_Fire/maps/Epilogue.map}"
     theme=Cutscene_Minimal
+    disallow_recall=yes
 
     {DEFAULT_SCHEDULE}
 
@@ -15,7 +16,6 @@
         side=1
         canrecruit=yes
         controller=human
-        recruit=Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Guardsman,Dwarvish Scout,Gryphon Rider
         team_name=alanin
         user_team_name= _ "Alanin"
     [/side]
@@ -89,6 +89,9 @@
             variable=alanin
             x,y=18,1
         [/unstore_unit]
+
+        [disallow_recruit]
+        [/disallow_recruit]
     [/event]
 
     [event]