UtBS S06b: hermit enhancement and tentacle fix. (#6200)

data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg

@@ -206,6 +206,7 @@
     # place item images on map
     # recall main heroes
     # initialize starting variables
+    # create tentacle location variable
     # remove keep
     # create elf units
     # create AI=guardian starting units
@@ -287,6 +288,22 @@
             value=0
         [/set_variable]
 
+        {VARIABLE hermit_trigger no}
+
+        #possible locations for tentacle spawning (27-30 & 13-17 -> 4*5=20)
+
+        [for]
+            end=20
+            [do]
+                [store_locations]
+                    x=27-30
+                    y=13-17
+                    terrain=Ww*, Wo*
+                    variable=locs
+                [/store_locations]
+            [/do]
+        [/for]
+
         # Pre-set units
 
         # Event 2.1
@@ -1230,7 +1247,6 @@
 #define CREATE_TENTACLE
     {RANDOM 1..$locs.length}
     {VARIABLE_OP random sub 1}
-
     [unit]
         type=Tentacle of the Deep
         side=5
@@ -1265,15 +1281,6 @@
             [/variable]
         [/filter_condition]
 
-        [store_locations]
-            x=27-30
-            y=13-17
-            terrain=Ww*, Wo*
-            [filter]
-            [/filter]
-            variable=locs
-        [/store_locations]
-
         {CREATE_TENTACLE}
         {CREATE_TENTACLE}
 #ifndef EASY
@@ -1282,7 +1289,6 @@
 #ifdef HARD
         {CREATE_TENTACLE}
 #endif
-        {CLEAR_VARIABLE locs}
 
         #choose what message to say
         [if]
@@ -1339,6 +1345,9 @@
                         message= _ "The movement under the water has stopped. I think we killed the last of them. Whatever ‘them’ was."
                     [/message]
 
+                    #once all the tentacles have been killed, locs is no longer needed
+                    {CLEAR_VARIABLE locs}
+
                     [modify_side]
                         side=4
                         income=2
@@ -1507,9 +1516,9 @@
 
     # Hermit lives alone on island in the lake, guarding his amulet
 
-    [event]
-        #name=sighted
+    # The two following events are mutually exclusive
 
+    [event]
         name=moveto
 
         [filter]
@@ -1517,10 +1526,41 @@
             side=1
         [/filter]
 
-        [message]
-            speaker=Dwarf Hermit
-            message= _ "They’ve come for my precious. It’s mine, yes it is. They shan’t have it, no they shan’t. We shall kill them all, yes, yes we will."
-        [/message]
+        [if]
+            [variable]
+                name=hermit_trigger
+                equals=no
+            [/variable]
+            [then]
+                [message]
+                    speaker=Dwarf Hermit
+                    message= _ "They’ve come for my precious. It’s mine, yes it is. They shan’t have it, no they shan’t. We shall kill them all, yes, yes we will."
+                [/message]
+                {CLEAR_VARIABLE hermit_trigger}
+            [/then]
+        [/if]
+    [/event]
+
+    [event]
+        name=attack
+
+        [filter]
+            id=Dwarf Hermit
+        [/filter]
+
+        [if]
+            [variable]
+                name=hermit_trigger
+                equals=no
+            [/variable]
+            [then]
+                [message]
+                    speaker=Dwarf Hermit
+                    message= _ "They’ve come for my precious. It’s mine, yes it is. They shan’t have it, no they shan’t. We shall kill them all, yes, yes we will."
+                [/message]
+                {CLEAR_VARIABLE hermit_trigger}
+            [/then]
+        [/if]
     [/event]
 
     [event]