Moved STARTING_VILLAGES macros out of prestart/start events in DiD

(and added [allow_undo] to the Hal'al signpost).

data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Halal.cfg

@@ -80,6 +80,8 @@
         [/ai]
     [/side]
 
+    {STARTING_VILLAGES 3 10}
+
     [event]
         name=prestart
 
@@ -116,8 +118,6 @@
         {PLACE_IMAGE scenery/signpost.png 27 13}
         {PLACE_IMAGE scenery/signpost.png 23 20}
 
-        # Drogan owns villages in the town
-        {STARTING_VILLAGES 3 10}
 
         # Place starting units for Drogan and Malin
         {UNIT (Spearman) (River fort guard) ( _ "River fort guard") 1 30 11}
@@ -158,6 +158,8 @@
             message=_ "Welcome to Hal'al"
             image=scenery/signpost.png
         [/message]
+
+        [allow_undo][/allow_undo]
     [/event]
 
     {EVENT_SH_EE}
@@ -240,6 +242,6 @@
         {DIALOGUE_SH_ENEMIES_DEFEATED}
         {VICTORY}
     [/event]
-    
+
     {@campaigns/Descent_Into_Darkness/utils/global-events.cfg}
 [/scenario]

data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg

@@ -53,6 +53,8 @@
         [/ai]
     [/side]
 
+    {STARTING_VILLAGES 2 8}
+
     [side]
         side=3
         controller=ai
@@ -73,6 +75,8 @@
         [/ai]
     [/side]
 
+    {STARTING_VILLAGES 3 8}
+
     [event]
         name=prestart
         [music]
@@ -109,10 +113,6 @@
         {MODIFY_UNIT (description=Malin Keshar) profile (portraits/malold.png)}
     [/event]
 
-    # Set orc villages
-    {STARTING_VILLAGES 2 8}
-    {STARTING_VILLAGES 3 8}
-
     [event]
         name=start
         {DIALOGUE_BOTR_START}
@@ -195,6 +195,6 @@
             result=victory
         [/endlevel]
     [/event]
-    
+
     {@campaigns/Descent_Into_Darkness/utils/global-events.cfg}
 [/scenario]

data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg

@@ -60,6 +60,8 @@
         [/ai]
     [/side]
 
+    {STARTING_VILLAGES 2 10}
+
     [side]
         side=3
         controller=ai
@@ -116,6 +118,8 @@
         [/ai]
     [/side]
 
+    {STARTING_VILLAGES 4 8}
+
     [event]
         name=prestart
         [music]
@@ -150,12 +154,11 @@
         {DIALOGUE_OW_START}
 
         # Set orc villages
-        {STARTING_VILLAGES 2 10}
+
         {SET_VILLAGE 3 3 29}
         {SET_VILLAGE 3 7 33}
         {SET_VILLAGE 3 5 25}
         {SET_VILLAGE 3 17 28}
-        {STARTING_VILLAGES 4 8}
         {SET_VILLAGE 4 22 30}
         {SET_VILLAGE 4 20 33}
     [/event]
@@ -256,6 +259,6 @@
             kill=yes
         [/store_unit]
     [/event]
-    
+
     {@campaigns/Descent_Into_Darkness/utils/global-events.cfg}
 [/scenario]

data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Halal.cfg

@@ -59,6 +59,8 @@
         [/ai]
     [/side]
 
+    {STARTING_VILLAGES 3 6}
+
     [side]
         side=4
         controller=ai
@@ -83,6 +85,8 @@
         [/ai]
     [/side]
 
+    {STARTING_VILLAGES 4 10}
+
     [event]
         name=prestart
         [music]
@@ -127,10 +131,6 @@
         # Place signpost
         {PLACE_IMAGE scenery/signpost.png 27 13}
 
-        # Dela owns villages in the town, Drogan those near the river fort
-        {STARTING_VILLAGES 4 10}
-        {STARTING_VILLAGES 3 6}
-
         # Drogan has some guards at the river fort
         {UNIT (Spearman) (River fort guard) ( _ "River fort guard") 3 30 11}
         {UNIT (Bowman) (River fort guard) ( _ "River fort guard") 3 31 12}
@@ -155,6 +155,8 @@
             message=_ "Welcome to Hal'al"
             image=scenery/signpost.png
         [/message]
+
+        [allow_undo][/allow_undo]
     [/event]
 
     # Defeat Conditions
@@ -242,6 +244,6 @@
             {DIALOGUE_RTH_GUARDDEATH}
         [/event]
     [/event]
-    
+
     {@campaigns/Descent_Into_Darkness/utils/global-events.cfg}
 [/scenario]

data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg

@@ -66,6 +66,8 @@
         fog=yes
     [/side]
 
+    {STARTING_VILLAGES 2 15}
+
     [event]
         name=prestart
         [music]
@@ -161,9 +163,6 @@
         [/unstore_unit]
         {CLEAR_VARIABLE darken_volk_store}
 
-        # General owns villages in the city
-        {STARTING_VILLAGES 2 15}
-
         # Event variables
         {VARIABLE undeadWarning no}
     [/event]

data/campaigns/Descent_Into_Darkness/scenarios/12_Forever_and_Ever_Amen.cfg

@@ -26,6 +26,8 @@
         save_id=Malin Keshar
     [/side]
 
+    {STARTING_VILLAGES 1 6}
+
     [side]
         # Foolish Hero
         side=2
@@ -203,8 +205,6 @@
                 [/event]
             [/then]
         [/if]
-
-        {STARTING_VILLAGES 1 6}
     [/event]
 
     [event]
@@ -277,6 +277,6 @@
         {VARIABLE_OP timesForever add 1}
         {CLEAR_VARIABLE randomHero}
     [/event]
-    
+
     {@campaigns/Descent_Into_Darkness/utils/global-events.cfg}
 [/scenario]