SoF - S6 - fix #6146 and related side-storing issue causing auto-defe…

…at (#6181)
wesnoth · Oct 10, 2021 · 57078c4 · 57078c4
1 parent 374104d
commit 57078c4
Showing 1 changed file with 7 additions and 2 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
@@ -21,6 +21,7 @@
         team_name=dwarves
         user_team_name= _ "Dwarves"
         {FLAG_VARIANT knalgan}
+        defeat_condition=no_units_left
     [/side]
 
     # Rugnur starts with all villages within the captured Shorbear keep.
@@ -609,6 +610,10 @@
             id=Rugnur
             x,y=36,3
         [/filter]
+
+        # we cannot just put this in the victory event because units are stored and rune variables are not cleared
+        {SOF_CLEAR_RUNE_VARS 1}
+
         [if]
             [have_unit]
                 id=Alanin
@@ -668,6 +673,8 @@
     [event]
         name=enemies defeated
 
+        {SOF_CLEAR_RUNE_VARS 1}
+
         [endlevel]
             result=victory
             bonus=yes
@@ -678,8 +685,6 @@
     [event]
         name=victory
 
-        {SOF_CLEAR_RUNE_VARS 1}
-
         # This [if] is used only in the case the player happened to defeat all
         # the enemy leaders and didn't move Alanin to the signpost
         [if]