From 9f1fa791df90a659bf259602a121c43bfa22d77c Mon Sep 17 00:00:00 2001
From: DisherProject <pycchio@tiscali.it>
Date: Thu, 11 Apr 2019 21:05:35 +0200
Subject: [PATCH 01/16] UtBS: Update objectives automatically via [show_if]

---
 .../scenarios/01_The_Morning_After.cfg        |  60 +----
 .../scenarios/02_Across_the_Harsh_Sands.cfg   |  47 +---
 .../scenarios/03_Stirring_in_the_Night.cfg    | 206 +++++-------------
 .../scenarios/05_A_Subterranean_Struggle.cfg  | 175 ++++++---------
 .../scenarios/08_Out_of_the_Frying_Pan.cfg    | 166 +++++---------
 .../09_Blood_is_Thicker_Than_Water.cfg        |  85 +++-----
 .../11_Battle_for_Zocthanol_Isle.cfg          | 114 ++++------
 .../scenarios/12_The_Final_Confrontation.cfg  |  30 +--
 .../Under_the_Burning_Suns/utils/deaths.cfg   |   2 +-
 9 files changed, 294 insertions(+), 591 deletions(-)

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
index 59d2b11e435a..a95fb75cf223 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
@@ -118,11 +118,19 @@
 
         # Can't end scenario until all elves have been rescued (5 events)
         [objectives]
-            summary= _ "Starting Objectives:"
             [objective]
                 description= _ "Rescue surviving elves"
                 condition=win
             [/objective]
+            [objective]
+                description= _ "Defeat Xanthos"
+                condition=win
+                [show_if]
+                    [have_unit]
+                        id=Xanthos
+                    [/have_unit]
+                [/show_if]
+            [/objective]
             [objective]
                 description= _ "Death of Kaleh"
                 condition=lose
@@ -1126,54 +1134,8 @@
             y=1-5
         [/place_shroud]
 
-        [objectives]
-            summary= _ "New Objectives:"
-            silent=no
-            [objective]
-                description= _ "Rescue surviving elves"
-                condition=win
-            [/objective]
-            [objective]
-                description= _ "Defeat Xanthos"
-                condition=win
-            [/objective]
-            [objective]
-                description= _ "Death of Kaleh"
-                condition=lose
-            [/objective]
-            [objective]
-                description= _ "Death of Nym"
-                condition=lose
-            [/objective]
-            [objective]
-                description= _ "Death of Garak"
-                condition=lose
-                [show_if]
-                    # We could just use [have_unit], but if Garak or Zhul dies and the player
-                    # checks the objectives, the respective objective won't be displayed,
-                    # and disappearing objectives for no good reason would look buggy.
-                    [variable]
-                        name=found_garak
-                        boolean_equals=yes
-                    [/variable]
-                [/show_if]
-            [/objective]
-            [objective]
-                description= _ "Death of Zhul"
-                condition=lose
-                [show_if]
-                    [variable]
-                        name=found_zhul
-                        boolean_equals=yes
-                    [/variable]
-                [/show_if]
-            [/objective]
-
-            [gold_carryover]
-                bonus=yes
-                carryover_percentage=40
-            [/gold_carryover]
-        [/objectives]
+        [show_objectives]
+        [/show_objectives]
     [/event]
 
     # This event prevents player from running to the dark sorcerer's base
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
index a6e8aba7ab74..a97be8d04b06 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
@@ -195,11 +195,19 @@
         # Set starting scenario objectives
 
         [objectives]
-            summary= _ "Starting Objectives:"
             [objective]
                 description= _ "Kaleh must reach the northern edge of the desert"
                 condition=win
             [/objective]
+            [objective]
+                description= _ "Defeat outlaw leader"
+                condition=win
+                [show_if]
+                    [have_unit]
+                        id=Thorn
+                    [/have_unit]
+                [/show_if]
+            [/objective]
             [objective]
                 description= _ "Death of Kaleh"
                 condition=lose
@@ -1354,40 +1362,6 @@
         [/message]
         {CLEAR_VARIABLE explorer}
 
-        [objectives]
-            summary= _ "New Objectives:"
-            silent=no
-            [objective]
-                description= _ "Kaleh must reach the northern edge of the desert"
-                condition=win
-            [/objective]
-            [objective]
-                description= _ "Defeat outlaw leader"
-                condition=win
-            [/objective]
-            [objective]
-                description= _ "Death of Kaleh"
-                condition=lose
-            [/objective]
-            [objective]
-                description= _ "Death of Nym"
-                condition=lose
-            [/objective]
-            [objective]
-                description= _ "Death of Garak"
-                condition=lose
-            [/objective]
-            [objective]
-                description= _ "Death of Zhul"
-                condition=lose
-            [/objective]
-
-            [gold_carryover]
-                bonus=yes
-                carryover_percentage=40
-            [/gold_carryover]
-        [/objectives]
-
         [unit]
             side=2
             id=Thorn
@@ -1408,6 +1382,9 @@
             {INCOME 9 11 13}
             {GOLD 100 125 150}
         [/modify_side]
+
+        [show_objectives]
+        [/show_objectives]
     [/event]
 
     #Encounter 7 Mirage
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
index 672ff09e0f17..473724ad2728 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
@@ -182,41 +182,6 @@
 
     {STARTING_VILLAGES 1 30}
 
-#define VILLAGE_CONTROL_OBJECTIVE
-    [objective]
-        description= _ "You lose control (even temporarily) of more than 6 villages"
-        condition=lose
-    [/objective]
-#enddef
-#define DEFEAT_AZKOTEP_OBJECTIVE
-    [objective]
-        description= _ "Defeat Azkotep"
-        condition=win
-    [/objective]
-#enddef
-#define DEFEAT_YSTARA_OBJECTIVE
-    [objective]
-        description= _ "Defeat Ystara"
-        condition=win
-    [/objective]
-#enddef
-#define HERO_DEATH_OBJECTIVE
-    [objective]
-        description= _ "Death of Kaleh"
-        condition=lose
-    [/objective]
-
-    [objective]
-        description= _ "Death of Nym"
-        condition=lose
-    [/objective]
-
-    [objective]
-        description= _ "Death of Zhul"
-        condition=lose
-    [/objective]
-#enddef
-
     #! -- setting up objectives,variables and map objects
     #! -- sets variables : $sneak_up, $defiant_death,
     #! -- $casualties_count
@@ -225,18 +190,64 @@
 
         # set starting scenario objectives
         [objectives]
-            summary= _ "Starting Objectives:"
             [objective]
                 description= _ "Survive until dawn"
                 condition=win
                 show_turn_counter=yes
+                [show_if]
+                    {VARIABLE_CONDITIONAL turn_number less_than 12}
+                [/show_if]
             [/objective]
             [objective]
                 {ALTERNATIVE_OBJECTIVE_CAPTION}
                 description= _ "Defeat all undead leaders"
                 condition=win
+                [show_if]
+                    {VARIABLE_CONDITIONAL turn_number less_than 12}
+                [/show_if]
+            [/objective]
+            [objective]
+                description= _ "Defeat all undead leaders"
+                condition=win
+                [show_if]
+                    {VARIABLE_CONDITIONAL defiant_death boolean_equals yes}
+                [/show_if]
+            [/objective]
+            [objective]
+                description= _ "Defeat Possessed Garak"
+                condition=win
+                [show_if]
+                    [have_unit]
+                        id=Possessed Garak
+                    [/have_unit]
+                [/show_if]
+            [/objective]
+            [objective]
+                {ALTERNATIVE_OBJECTIVE_CAPTION}
+                description= _ "Defeat Azkotep"
+                condition=win
+                [show_if]
+                    [have_unit]
+                        id=Possessed Garak
+                    [/have_unit]
+                    [have_unit]
+                        id=Azkotep
+                    [/have_unit]
+                [/show_if]
+            [/objective]
+            [objective]
+                {ALTERNATIVE_OBJECTIVE_CAPTION}
+                description= _ "Defeat Ystara"
+                condition=win
+                [show_if]
+                    [have_unit]
+                        id=Possessed Garak
+                    [/have_unit]
+                    [have_unit]
+                        id=Ystara
+                    [/have_unit]
+                [/show_if]
             [/objective]
-            {VILLAGE_CONTROL_OBJECTIVE}
             [objective]
                 description= _ "Death of Kaleh"
                 condition=lose
@@ -248,11 +259,18 @@
             [objective]
                 description= _ "Death of Garak"
                 condition=lose
+                [show_if]
+                    {VARIABLE_CONDITIONAL turn_number less_than 12}
+                [/show_if]
             [/objective]
             [objective]
                 description= _ "Death of Zhul"
                 condition=lose
             [/objective]
+            [objective]
+                description= _ "You lose control (even temporarily) of more than 6 villages"
+                condition=lose
+            [/objective]
 
             [gold_carryover]
                 bonus=yes
@@ -1266,18 +1284,6 @@
                 [/set_variables]
 
                 {VARIABLE event_to_fire "lich_lord_fails_possession"}
-
-                [objectives]
-                    summary= _ "New Objectives:"
-                    silent=no
-                    {DEFEAT_AZKOTEP_OBJECTIVE}
-                    {VILLAGE_CONTROL_OBJECTIVE}
-                    {HERO_DEATH_OBJECTIVE}
-
-                    [gold_carryover]
-                        carryover_percentage=40
-                    [/gold_carryover]
-                [/objectives]
             [/then]
         [/if]
         [if]
@@ -1297,25 +1303,6 @@
                 [/set_variables]
 
                 {VARIABLE event_to_fire "lich_lord_possesses_garak"}
-
-                [objectives]
-                    summary= _ "New Objectives:"
-                    silent=no
-                    [objective]
-                        description=_"Defeat Possessed Garak"
-                        condition=win
-                    [/objective]
-                    {DEFEAT_YSTARA_OBJECTIVE}
-                    [+objective]
-                        {ALTERNATIVE_OBJECTIVE_CAPTION}
-                    [/objective]
-                    {VILLAGE_CONTROL_OBJECTIVE}
-                    {HERO_DEATH_OBJECTIVE}
-
-                    [gold_carryover]
-                        carryover_percentage=40
-                    [/gold_carryover]
-                [/objectives]
             [/then]
         [/if]
         [if]
@@ -1334,25 +1321,6 @@
                 [/set_variables]
 
                 {VARIABLE event_to_fire "lich_lord_possesses_garak"}
-
-                [objectives]
-                    summary= _ "New Objectives:"
-                    silent=no
-                    [objective]
-                        description=_"Defeat Possessed Garak"
-                        condition=win
-                    [/objective]
-                    {DEFEAT_AZKOTEP_OBJECTIVE}
-                    [+objective]
-                        {ALTERNATIVE_OBJECTIVE_CAPTION}
-                    [/objective]
-                    {VILLAGE_CONTROL_OBJECTIVE}
-                    {HERO_DEATH_OBJECTIVE}
-
-                    [gold_carryover]
-                        carryover_percentage=40
-                    [/gold_carryover]
-                [/objectives]
             [/then]
         [/if]
         [if]
@@ -1371,18 +1339,6 @@
                 [/set_variables]
 
                 {VARIABLE event_to_fire "lich_lord_fails_possession"}
-
-                [objectives]
-                    summary= _ "New Objectives:"
-                    silent=no
-                    {DEFEAT_AZKOTEP_OBJECTIVE}
-                    {VILLAGE_CONTROL_OBJECTIVE}
-                    {HERO_DEATH_OBJECTIVE}
-
-                    [gold_carryover]
-                        carryover_percentage=40
-                    [/gold_carryover]
-                [/objectives]
             [/then]
         [/if]
         [if]
@@ -1401,25 +1357,6 @@
                 [/set_variables]
 
                 {VARIABLE event_to_fire "lich_lord_resuscitates_inside_garak"}
-
-                [objectives]
-                    summary= _ "New Objectives:"
-                    silent=no
-                    [objective]
-                        description=_"Defeat Possessed Garak"
-                        condition=win
-                    [/objective]
-                    {DEFEAT_AZKOTEP_OBJECTIVE}
-                    [+objective]
-                        {ALTERNATIVE_OBJECTIVE_CAPTION}
-                    [/objective]
-                    {VILLAGE_CONTROL_OBJECTIVE}
-                    {HERO_DEATH_OBJECTIVE}
-
-                    [gold_carryover]
-                        carryover_percentage=40
-                    [/gold_carryover]
-                [/objectives]
             [/then]
         [/if]
         [if]
@@ -1438,18 +1375,6 @@
                 [/set_variables]
 
                 {VARIABLE event_to_fire "lich_lord_fails_possession"}
-
-                [objectives]
-                    summary= _ "New Objectives:"
-                    silent=no
-                    {DEFEAT_YSTARA_OBJECTIVE}
-                    {VILLAGE_CONTROL_OBJECTIVE}
-                    {HERO_DEATH_OBJECTIVE}
-
-                    [gold_carryover]
-                        carryover_percentage=40
-                    [/gold_carryover]
-                [/objectives]
             [/then]
         [/if]
         [if]
@@ -1468,25 +1393,6 @@
                 [/set_variables]
 
                 {VARIABLE event_to_fire "lich_lord_resuscitates_inside_garak"}
-
-                [objectives]
-                    summary= _ "New Objectives:"
-                    silent=no
-                    [objective]
-                        description=_"Defeat Possessed Garak"
-                        condition=win
-                    [/objective]
-                    {DEFEAT_YSTARA_OBJECTIVE}
-                    [+objective]
-                        {ALTERNATIVE_OBJECTIVE_CAPTION}
-                    [/objective]
-                    {VILLAGE_CONTROL_OBJECTIVE}
-                    {HERO_DEATH_OBJECTIVE}
-
-                    [gold_carryover]
-                        carryover_percentage=40
-                    [/gold_carryover]
-                [/objectives]
             [/then]
         [/if]
 
@@ -1527,6 +1433,8 @@
         [modify_turns]
             value=-1
         [/modify_turns]
+        [show_objectives]
+        [/show_objectives]
 
         {CLEAR_VARIABLE event_to_fire,undead_casualties,casualties_count,lich_lord,other_lord}
     [/event]
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
index c9cc70b2c45b..2b8256b0c6c4 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
@@ -305,14 +305,46 @@
         #set starting scenario objectives
 
         [objectives]
-            summary= _ "Starting Objectives:"
             [objective]
                 description= _ "Explore underground"
                 condition=win
+                [show_if]
+                    [have_unit]
+                        race=troll,dwarf
+                        count=0
+                    [/have_unit]
+                [/show_if]
             [/objective]
             [objective]
-                description= _ "Defeat enemy leaders"
+                description= _ "Defeat troll leaders"
                 condition=win
+                [show_if]
+                    {VARIABLE_CONDITIONAL ally_race equals "dwarf"}
+                    [have_unit]
+                        canrecruit=yes
+                        race=troll
+                    [/have_unit]
+                [/show_if]
+            [/objective]
+            [objective]
+                description= _ "Defeat dwarf leaders"
+                condition=win
+                [show_if]
+                    {VARIABLE_CONDITIONAL ally_race equals "troll"}
+                    [have_unit]
+                        canrecruit=yes
+                        race=dwarf
+                    [/have_unit]
+                [/show_if]
+            [/objective]
+            [objective]
+                description= _ "Defeat the Cloaked Figure"
+                condition=win
+                [show_if]
+                    [have_unit]
+                        id=Cloaked Figure
+                    [/have_unit]
+                [/show_if]
             [/objective]
             [objective]
                 description= _ "Death of Kaleh"
@@ -326,6 +358,35 @@
                 description= _ "Death of Zhul"
                 condition=lose
             [/objective]
+            [objective]
+                description= _ "Death of Fundin"
+                condition=lose
+                [show_if]
+                    {VARIABLE_CONDITIONAL ally_race equals "dwarf"}
+                [/show_if]
+            [/objective]
+            [objective]
+                description= _ "Death of Nori"
+                condition=lose
+                [show_if]
+                    {VARIABLE_CONDITIONAL ally_race equals "dwarf"}
+                [/show_if]
+            [/objective]
+            [objective]
+                description= _ "Death of Thungar"
+                condition=lose
+                [show_if]
+                    {VARIABLE_CONDITIONAL ally_race equals "troll"}
+                [/show_if]
+            [/objective]
+            [objective]
+                description= _ "Death of Gnarl"
+                condition=lose
+                [show_if]
+                    {VARIABLE_CONDITIONAL ally_race equals "troll"}
+                [/show_if]
+            [/objective]
+
 
             [gold_carryover]
                 bonus=yes
@@ -730,34 +791,6 @@
         [/message]
     [/event]
 
-#define CLOAK_KILL_OBJECTIVES
-    [objectives]
-        summary= _ "New Objectives:"
-        silent=no
-        [objective]
-            description= _ "Defeat the Cloaked Figure"
-            condition=win
-        [/objective]
-        [objective]
-            description= _ "Death of Kaleh"
-            condition=lose
-        [/objective]
-        [objective]
-            description= _ "Death of Nym"
-            condition=lose
-        [/objective]
-        [objective]
-            description= _ "Death of Zhul"
-            condition=lose
-        [/objective]
-
-        [gold_carryover]
-            bonus=yes
-            carryover_percentage=40
-        [/gold_carryover]
-    [/objectives]
-#enddef
-
     # Event 2: Entering the large cavern
 
     #player chooses one side (trolls or dwarves) then:
@@ -1069,42 +1102,6 @@
                         speaker=Troll Leader
                         message= _ "Bah! Your kind all the same. Everyone turns on trolls. But you’ll see, Griknagh will smash you all."
                     [/message]
-
-                    #set new scenario objectives
-
-                    [objectives]
-                        summary= _ "New Objectives:"
-                        silent=no
-                        [objective]
-                            description= _ "Defeat troll leaders"
-                            condition=win
-                        [/objective]
-                        [objective]
-                            description= _ "Death of Kaleh"
-                            condition=lose
-                        [/objective]
-                        [objective]
-                            description= _ "Death of Nym"
-                            condition=lose
-                        [/objective]
-                        [objective]
-                            description= _ "Death of Zhul"
-                            condition=lose
-                        [/objective]
-                        [objective]
-                            description= _ "Death of Fundin"
-                            condition=lose
-                        [/objective]
-                        [objective]
-                            description= _ "Death of Nori"
-                            condition=lose
-                        [/objective]
-
-                        [gold_carryover]
-                            bonus=yes
-                            carryover_percentage=40
-                        [/gold_carryover]
-                    [/objectives]
                 [/command]
             [/option]
 
@@ -1127,41 +1124,6 @@
                         speaker=Dwarf Leader
                         message= _ "I knew elves couldn’t be trusted. Foolish boy, you will regret your betrayal. Taste dwarven steel!"
                     [/message]
-
-                    #set new scenario objectives
-                    [objectives]
-                        summary= _ "New Objectives:"
-                        silent=no
-                        [objective]
-                            description= _ "Defeat dwarf leaders"
-                            condition=win
-                        [/objective]
-                        [objective]
-                            description= _ "Death of Kaleh"
-                            condition=lose
-                        [/objective]
-                        [objective]
-                            description= _ "Death of Nym"
-                            condition=lose
-                        [/objective]
-                        [objective]
-                            description= _ "Death of Zhul"
-                            condition=lose
-                        [/objective]
-                        [objective]
-                            description= _ "Death of Thungar"
-                            condition=lose
-                        [/objective]
-                        [objective]
-                            description= _ "Death of Gnarl"
-                            condition=lose
-                        [/objective]
-
-                        [gold_carryover]
-                            bonus=yes
-                            carryover_percentage=40
-                        [/gold_carryover]
-                    [/objectives]
                 [/command]
             [/option]
         [/message]
@@ -1450,6 +1412,9 @@
             side=5
         [/capture_village]
 
+        [show_objectives]
+        [/show_objectives]
+
         [fire_event]
             name=queue_battle_events
         [/fire_event]
@@ -2466,9 +2431,8 @@
                     message= _ "Wait a moment, Zurg, we must deal with this mysterious cloaked figure before we can follow you."
                 [/message]
 
-                #set new scenario objectives
-
-                {CLOAK_KILL_OBJECTIVES}
+                [show_objectives]
+                [/show_objectives]
             [/then]
 
             [else]
@@ -2563,7 +2527,8 @@
                     message= _ "Wait a moment, Grimnir, we must deal with this mysterious cloaked figure before we can follow you."
                 [/message]
 
-                {CLOAK_KILL_OBJECTIVES}
+                [show_objectives]
+                [/show_objectives]
             [/then]
 
             [else]
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
index 0b2f92fef3fd..43b608070355 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
@@ -336,7 +336,7 @@
 
         [set_variable]
             name=ally_must_live
-            value=1
+            value=yes
         [/set_variable]
 
         [set_variable]
@@ -387,10 +387,33 @@
 
         # set starting scenario objectives
         [objectives]
-            summary= _ "Starting Objectives:"
             [objective]
                 description= _ "Escape the caves"
                 condition=win
+                [show_if]
+                    {VARIABLE_CONDITIONAL ally_must_live boolean_equals yes}
+                [/show_if]
+            [/objective]
+            [objective]
+                description= _ "Explore outside"
+                condition=win
+                [show_if]
+                    [not]
+                        [have_unit]
+                            id=Sergeant Durstrag,Esanoo
+                        [/have_unit]
+                    [/not]
+                    {VARIABLE_CONDITIONAL ally_must_live boolean_equals no}
+                [/show_if]
+            [/objective]
+            [objective]
+                description= _ "Defeat Sergeant Durstrag"
+                condition=win
+                [show_if]
+                    [have_unit]
+                        id=Sergeant Durstrag
+                    [/have_unit]
+                [/show_if]
             [/objective]
             [objective]
                 description= _ "Death of Kaleh"
@@ -408,43 +431,49 @@
                 description= _ "Death of Grog"
                 condition=lose
                 [show_if]
-                    [variable]
-                        name=ally_name
-                        equals=Grog
-                    [/variable]
+                    {VARIABLE_CONDITIONAL ally_name equals "Grog"}
+                    {VARIABLE_CONDITIONAL ally_must_live boolean_equals yes}
                 [/show_if]
             [/objective]
             [objective]
                 description= _ "Death of Nog"
                 condition=lose
                 [show_if]
-                    [variable]
-                        name=ally_name
-                        equals=Nog
-                    [/variable]
+                    {VARIABLE_CONDITIONAL ally_name equals "Nog"}
+                    {VARIABLE_CONDITIONAL ally_must_live boolean_equals yes}
                 [/show_if]
             [/objective]
             [objective]
                 description= _ "Death of Rogrimir"
                 condition=lose
                 [show_if]
-                    [variable]
-                        name=ally_name
-                        equals=Rogrimir
-                    [/variable]
+                    {VARIABLE_CONDITIONAL ally_name equals "Rogrimir"}
+                    {VARIABLE_CONDITIONAL ally_must_live boolean_equals yes}
                 [/show_if]
             [/objective]
             [objective]
                 description= _ "Death of Jarl"
                 condition=lose
                 [show_if]
-                    [variable]
-                        name=ally_name
-                        equals=Jarl
-                    [/variable]
+                    {VARIABLE_CONDITIONAL ally_name equals "Jarl"}
+                    {VARIABLE_CONDITIONAL ally_must_live boolean_equals yes}
+                [/show_if]
+            [/objective]
+            [objective]
+                description= _ "A human messenger escapes the valley"
+                condition=lose
+                [show_if]
+                    {VARIABLE_CONDITIONAL messengers_incoming boolean_equals yes}
                 [/show_if]
             [/objective]
 
+            [note]
+                description= _  "The messenger is the leader of the special white colored units"
+                [show_if]
+                    {VARIABLE_CONDITIONAL messengers_incoming boolean_equals yes}
+                [/show_if]
+            [/note]
+
             [gold_carryover]
                 bonus=yes
                 carryover_percentage=40
@@ -2681,31 +2710,10 @@
                 message= _ "Well, Nym’s right, we don’t know what’s out there. So we should set up a perimeter guard around the cave mouth and start discovering what this side of the mountains looks like."
             [/message]
 
-            [objectives]
-                summary= _ "New Objectives:"
-                silent=no
-                [objective]
-                    description= _ "Explore outside"
-                    condition=win
-                [/objective]
-                [objective]
-                    description= _ "Death of Kaleh"
-                    condition=lose
-                [/objective]
-                [objective]
-                    description= _ "Death of Nym"
-                    condition=lose
-                [/objective]
-                [objective]
-                    description= _ "Death of Zhul"
-                    condition=lose
-                [/objective]
-
-                [gold_carryover]
-                    bonus=yes
-                    carryover_percentage=40
-                [/gold_carryover]
-            [/objectives]
+            {VARIABLE ally_must_live no}
+
+            [show_objectives]
+            [/show_objectives]
 
             [event]
                 name=new turn
@@ -2764,11 +2772,6 @@
     [event]
         name=ally_conversation
 
-        [set_variable]
-            name=ally_must_live
-            value=0
-        [/set_variable]
-
         {MESSAGE_DEPEND_ON_ALLY
         (
             [message]
@@ -3475,31 +3478,8 @@
             side=2
         [/capture_village]
 
-        [objectives]
-            summary= _ "New Objectives:"
-            silent=no
-            [objective]
-                description= _ "Defeat Sergeant Durstrag"
-                condition=win
-            [/objective]
-            [objective]
-                description= _ "Death of Kaleh"
-                condition=lose
-            [/objective]
-            [objective]
-                description= _ "Death of Nym"
-                condition=lose
-            [/objective]
-            [objective]
-                description= _ "Death of Zhul"
-                condition=lose
-            [/objective]
-
-            [gold_carryover]
-                bonus=yes
-                carryover_percentage=40
-            [/gold_carryover]
-        [/objectives]
+        [show_objectives]
+        [/show_objectives]
 
         [event]
             name=new turn
@@ -3576,46 +3556,16 @@
             message= _ "Then we’ll just have to make sure that no messenger escapes this valley to summon reinforcements."
         [/message]
 
-        [objectives]
-            summary= _ "New Objectives:"
-            silent=no
-            [objective]
-                description= _ "Defeat Sergeant Durstrag"
-                condition=win
-            [/objective]
-            [objective]
-                description= _ "A human messenger escapes the valley"
-                condition=lose
-            [/objective]
-            [objective]
-                description= _ "Death of Kaleh"
-                condition=lose
-            [/objective]
-            [objective]
-                description= _ "Death of Nym"
-                condition=lose
-            [/objective]
-            [objective]
-                description= _ "Death of Zhul"
-                condition=lose
-            [/objective]
-
-            [gold_carryover]
-                bonus=yes
-                carryover_percentage=40
-            [/gold_carryover]
-
-            [note]
-                description= _  "The messenger is the leader of the special white colored units"
-            [/note]
-        [/objectives]
-
         #set messenger timer at 2, so first messenger goes in 6,5,4 turns
 
         [set_variable]
             name=messenger_timer
             value=2
         [/set_variable]
+        {VARIABLE messengers_incoming yes}
+
+        [show_objectives]
+        [/show_objectives]
 
         # schedule events that occur after the humans start fighting
         [event]
@@ -4529,7 +4479,7 @@
 
         {CLEAR_VARIABLE healing_rune1,healing_rune2}
 
-        {CLEAR_VARIABLE messenger_timer}
+        {CLEAR_VARIABLE messenger_timer,messengers_incoming}
     [/event]
 
     # set time for all underground areas to be always night/underground
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
index c61a56456be8..79e04c6fcd55 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
@@ -318,10 +318,28 @@
         # set starting scenario objectives
 
         [objectives]
-            summary= _ "Starting Objectives:"
             [objective]
                 description= _ "Rescue at least two merfolk by turn 16"
                 condition=win
+                [show_if]
+                    {VARIABLE_CONDITIONAL turn_number less_than 16}
+                [/show_if]
+            [/objective]
+            [objective]
+                description= _ "Defeat Tanstafaal and Eloh"
+                condition=win
+                [show_if]
+                    [have_unit]
+                        id=Tanstafaal,Eloh
+                    [/have_unit]
+                [/show_if]
+            [/objective]
+            [objective]
+                description= _ "Capture all 4 human ships"
+                condition=win
+                [show_if]
+                    {VARIABLE_CONDITIONAL capture_ships boolean_equals yes}
+                [/show_if]
             [/objective]
             [objective]
                 description= _ "Three merfolk must survive"
@@ -1878,36 +1896,8 @@
             message= _ "Then we will make do with those few that we have."
         [/message]
 
-        # change scenario objectives
-
-        [objectives]
-            summary= _ "New Objectives:"
-            [objective]
-                description= _ "Defeat Tanstafaal and Eloh"
-                condition=win
-            [/objective]
-            [objective]
-                description= _ "Three merfolk must survive"
-                condition=win
-            [/objective]
-            [objective]
-                description= _ "Death of Kaleh"
-                condition=lose
-            [/objective]
-            [objective]
-                description= _ "Death of Nym"
-                condition=lose
-            [/objective]
-            [objective]
-                description= _ "Death of Zhul"
-                condition=lose
-            [/objective]
-
-            [gold_carryover]
-                bonus=yes
-                carryover_percentage=40
-            [/gold_carryover]
-        [/objectives]
+        [show_objectives]
+        [/show_objectives]
 
         # move tanstafaal to keep
 
@@ -2532,36 +2522,10 @@
             message= _ "Though the cost be high, we do what we must. Come let us go capture those boats."
         [/message]
 
-        # change scenario objectives
-
-        [objectives]
-            summary= _ "New Objectives:"
-            [objective]
-                description= _ "Capture all 4 human ships"
-                condition=win
-            [/objective]
-            [objective]
-                description= _ "Three merfolk must survive"
-                condition=win
-            [/objective]
-            [objective]
-                description= _ "Death of Kaleh"
-                condition=lose
-            [/objective]
-            [objective]
-                description= _ "Death of Nym"
-                condition=lose
-            [/objective]
-            [objective]
-                description= _ "Death of Zhul"
-                condition=lose
-            [/objective]
+        {VARIABLE capture_ships yes}
 
-            [gold_carryover]
-                bonus=yes
-                carryover_percentage=40
-            [/gold_carryover]
-        [/objectives]
+        [show_objectives]
+        [/show_objectives]
 
         # allow player’s elves to recruit units again
         [set_recruit]
@@ -2795,6 +2759,7 @@
         {PLACE_IMAGE "units/transport/galleon.png~RC(magenta>red)~FL()" 9 25}
         {CLEAR_VARIABLE number_merfolk_caged}
         {CLEAR_VARIABLE number_merfolk_deaths}
+        {CLEAR_VARIABLE capture_ships}
     [/event]
 
     {UTBS_INCLUDE utils/deaths.cfg}
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg
index 5f13a7ad28aa..b6a864e851db 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg
@@ -367,10 +367,44 @@
         # set starting scenario objectives
 
         [objectives]
-            summary= _ "Starting Objectives:"
             [objective]
                 description= _ "Kaleh must capture a keep"
                 condition=win
+                [show_if]
+                    {VARIABLE_CONDITIONAL keep_reached boolean_equals no}
+                [/show_if]
+            [/objective]
+            [objective]
+                description= _ "Reach the black citadel in the center of the island"
+                condition=win
+                [show_if]
+                    {VARIABLE_CONDITIONAL keep_reached boolean_equals yes}
+                    {VARIABLE_CONDITIONAL found_door   boolean_equals no}
+                [/show_if]
+            [/objective]
+            [objective]
+                description= _ "Defeat enemy leaders, find both keys"
+                condition=win
+                [show_if]
+                    {VARIABLE_CONDITIONAL found_door boolean_equals yes}
+                    [have_unit]
+                        canrecruit=yes
+                        side=2,3
+                    [/have_unit]
+                [/show_if]
+            [/objective]
+            [objective]
+                description= _ "Any unit must reach the black citadel"
+                condition=win
+                [show_if]
+                    {VARIABLE_CONDITIONAL found_door boolean_equals yes}
+                    [not]
+                        [have_unit]
+                            canrecruit=yes
+                            side=2,3
+                        [/have_unit]
+                    [/not]
+                [/show_if]
             [/objective]
             [objective]
                 description= _ "Death of Kaleh"
@@ -783,29 +817,10 @@
             id=jungle_warning
         [/remove_event]
 
-        [objectives]
-            summary= _ "New Objectives:"
-            [objective]
-                description= _ "Reach the black citadel in the center of the island"
-                condition=win
-            [/objective]
-            [objective]
-                description= _ "Death of Kaleh"
-                condition=lose
-            [/objective]
-            [objective]
-                description= _ "Death of Nym"
-                condition=lose
-            [/objective]
-            [objective]
-                description= _ "Death of Zhul"
-                condition=lose
-            [/objective]
+        {VARIABLE keep_reached yes}
 
-            [gold_carryover]
-                carryover_percentage=0
-            [/gold_carryover]
-        [/objectives]
+        [show_objectives]
+        [/show_objectives]
 
         # change the music playing
         [music]
@@ -923,29 +938,8 @@
 
                 {VARIABLE found_door yes}
 
-                [objectives]
-                    summary= _ "New Objectives:"
-                    [objective]
-                        description= _ "Defeat enemy leaders, find both keys"
-                        condition=win
-                    [/objective]
-                    [objective]
-                        description= _ "Death of Kaleh"
-                        condition=lose
-                    [/objective]
-                    [objective]
-                        description= _ "Death of Nym"
-                        condition=lose
-                    [/objective]
-                    [objective]
-                        description= _ "Death of Zhul"
-                        condition=lose
-                    [/objective]
-
-                    [gold_carryover]
-                        carryover_percentage=0
-                    [/gold_carryover]
-                [/objectives]
+                [show_objectives]
+                [/show_objectives]
             [/else]
         [/if]
     [/event]
@@ -972,29 +966,8 @@
             message= _ "We’ve found both keys. Now we just have to take them and open the door to the black citadel. I tire of all this bloodshed. Wherever Yechnagoth hides, we will find her and make her pay for all she has done."
         [/message]
 
-        [objectives]
-            summary= _ "New Objectives:"
-            [objective]
-                description= _ "Any unit must reach the black citadel"
-                condition=win
-            [/objective]
-            [objective]
-                description= _ "Death of Kaleh"
-                condition=lose
-            [/objective]
-            [objective]
-                description= _ "Death of Nym"
-                condition=lose
-            [/objective]
-            [objective]
-                description= _ "Death of Zhul"
-                condition=lose
-            [/objective]
-
-            [gold_carryover]
-                carryover_percentage=0
-            [/gold_carryover]
-        [/objectives]
+        [show_objectives]
+        [/show_objectives]
         [remove_shroud]
             [filter_side]
                 side=1
@@ -1072,7 +1045,7 @@
         [if]
             [variable]
                 name=found_door
-                numerical_equals=yes
+                boolean_equals=yes
             [/variable]
 
             [then]
@@ -1468,6 +1441,7 @@
         )}
 
         {CLEAR_VARIABLE found_door}
+        {CLEAR_VARIABLE keep_reached}
     [/event]
 
     # create bats at dusk function
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg
index 5264bdfc6d21..a3f2f76c86cf 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg
@@ -253,10 +253,23 @@
         # set starting scenario objectives
 
         [objectives]
-            summary= _ "Starting Objectives:"
             [objective]
                 description= _ "Defeat the false Eloh"
                 condition=win
+                [show_if]
+                    [have_unit]
+                        id=Eloh
+                    [/have_unit]
+                [/show_if]
+            [/objective]
+            [objective]
+                description= _ "Defeat Yechnagoth"
+                condition=win
+                [show_if]
+                    [have_unit]
+                        id=Yechnagoth
+                    [/have_unit]
+                [/show_if]
             [/objective]
             [objective]
                 description= _ "Death of Kaleh"
@@ -905,19 +918,8 @@
             message= _ "It must have some sort of weak point. Look at those pulsing spires, I thought they were stone, but they seem to be alive. Maybe if we destroy them it will weaken the creature. No matter what horrors appear, we must keep attacking it. We can’t stop now!"
         [/message]
 
-        [objectives]
-            summary= _ "New Objectives:"
-            [objective]
-                description= _ "Defeat Yechnagoth"
-                condition=win
-            [/objective]
-            [objective]
-                description= _ "Death of Kaleh"
-                condition=lose
-            [/objective]
-
-            {IS_LAST_SCENARIO}
-        [/objectives]
+        [show_objectives]
+        [/show_objectives]
 
         # Start spawning minions, increasing the number each turn.
         {VARIABLE number_minions_to_spawn 1}
diff --git a/data/campaigns/Under_the_Burning_Suns/utils/deaths.cfg b/data/campaigns/Under_the_Burning_Suns/utils/deaths.cfg
index 0cf498c2dc82..8acd7e7c22f5 100644
--- a/data/campaigns/Under_the_Burning_Suns/utils/deaths.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/utils/deaths.cfg
@@ -121,7 +121,7 @@
     [if]
         [variable]
             name=ally_must_live
-            numerical_equals=1
+            boolean_equals=yes
         [/variable]
 
         [then]

From d477f1590ca6b508a9073b0cd19c39e596ce4a33 Mon Sep 17 00:00:00 2001
From: DisherProject <pycchio@tiscali.it>
Date: Thu, 11 Apr 2019 22:42:48 +0200
Subject: [PATCH 02/16] UtBS: Fix some TODOs

---
 .../scenarios/03_Stirring_in_the_Night.cfg    | 21 +++------
 .../scenarios/05_A_Subterranean_Struggle.cfg  | 36 ++++++++-------
 .../06b_In_the_Domain_of_Dwarves.cfg          | 36 ++++++++++-----
 .../09_Blood_is_Thicker_Than_Water.cfg        | 45 ++++++++++++-------
 4 files changed, 79 insertions(+), 59 deletions(-)

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
index 473724ad2728..8600b96f2e76 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
@@ -54,11 +54,8 @@
         controller=ai
         {GOLD 125 150 175}
         {INCOME 15 18 21}
-#ifdef HARD
-        recruit=Deathblade,Revenant,Bone Shooter,Skeleton Rider
-#else
+
         recruit=Skeleton,Skeleton Archer,Skeleton Rider
-#endif
 
         [ai]
             {AI_SIMPLE_ALWAYS_ASPECT aggression 0.9}
@@ -113,11 +110,8 @@
         controller=ai
         {GOLD 125 150 175}
         {INCOME 15 18 21}
-#ifdef HARD
-        recruit=Blood Bat,Necrophage,Wraith,Soulless
-#else
+
         recruit=Vampire Bat,Ghoul,Ghost,Walking Corpse
-#endif
 
         [ai]
             {AI_SIMPLE_ALWAYS_ASPECT aggression 0.9}
@@ -617,13 +611,12 @@
     # Instead with providing AI with higher lvl units on medium
     # and hard give it highly experienced lvl1's
 
-#ifdef NORMAL
+#ifndef EASY
     # Change the difficulty increase model from having computer
     # recruit some lvl2 and 3 units outright to advancing or
     # half-advancing recruited lvl 1. At the same time, guarantees
     # broader spectrum of opposing units, as AI advancement is random.
     # Internal variables : $factor
-    # TODO: Should this happen on HARD too (would need to change recruit list to match)
     [event]
         name=recruit
         first_time_only=no
@@ -631,15 +624,13 @@
             side=2,3,4
         [/filter]
 
-        {VARIABLE factor $unit.max_experience}
-        {VARIABLE_OP factor multiply 0.5}
-        {VARIABLE_OP factor round 0}
-        {RANDOM $factor..$unit.max_experience}
+        {VARIABLE min_experience "$(floor($unit.max_experience * {ON_DIFFICULTY 0 0.5 0.75}))"}
+        {RANDOM "$min_experience..$($unit.max_experience - 1)"}
         {VARIABLE unit.experience $random}
         [unstore_unit]
             variable=unit
         [/unstore_unit]
-        {CLEAR_VARIABLE factor}
+        {CLEAR_VARIABLE min_experience,random}
     [/event]
 #endif
 
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
index 2b8256b0c6c4..d1c3ab5a7a7f 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
@@ -270,19 +270,6 @@
         [ai]
             aggression=0.90
             caution=0.10
-
-#ifdef WIP
-            # TODO: make assassin attack Kaleh more than other units
-            # This goal doesn't have that effect
-
-            [goal]
-                name=target
-                [criteria]
-                    id=Kaleh
-                [/criteria]
-                value=20
-            [/goal]
-#endif
         [/ai]
     [/side]
 
@@ -2088,6 +2075,19 @@
             [/modifications]
         [/unit]
 
+        [micro_ai]
+            side=7
+            ai_type=assassin
+            action=add
+
+            [filter]
+                id=Cloaked Figure
+            [/filter]
+            [filter_second]
+                id=Kaleh
+            [/filter_second]
+        [/micro_ai]
+
         [message]
             speaker=Cloaked Figure
             image=portraits/cloaked.png
@@ -2120,11 +2120,9 @@
             {ALLY_REINFORCEMENTS}
         [/event]
 
-        #TODO 23 turns after the player entered the big cave?
-        #isn't that a little too long?
         [set_variable]
             name=assassin_turn
-            rand=13..23
+            rand=13..18
         [/set_variable]
         [event]
             name="turn $($turn_number|+$assassin_turn|)"
@@ -2563,6 +2561,12 @@
             fire_event=no
         [/kill]
 
+        [micro_ai]
+            side=7
+            ai_type=assassin
+            action=delete
+        [/micro_ai]
+
         [message]
             speaker=Kaleh
             message= _ "Where did he go? How does he disappear like that? And what in Uria’s name was he ranting about? Whoever that is is starting to make me get edgy."
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
index c94f01c037ef..ab9ba29c5c7f 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
@@ -139,17 +139,6 @@
         [ai]
             aggression=0.90
             caution=0.10
-#ifdef WIP
-            # TODO: Make them attack Kaleh more
-            # This goal doesn't have that effec
-            [goal]
-                name=target
-                [criteria]
-                    id=Kaleh
-                [/criteria]
-                value=20
-            [/goal]
-#endif
         [/ai]
     [/side]
 
@@ -260,6 +249,25 @@
 
         {INCREASE_RECRUIT_COSTS 1}
 
+        # Try simulating tentacles preferring Kaleh as a target.
+        # No more than 2 tentacles should focus him, the others
+        # will choose other victims.
+        [micro_ai]
+            side=5
+            ai_type=simple_attack
+            action=add
+
+            [filter_second]
+                id=Kaleh
+                [not]
+                    [filter_adjacent]
+                        side=5
+                        count=3-6
+                    [/filter_adjacent]
+                [/not]
+            [/filter_second]
+        [/micro_ai]
+
         #secret tomb furnishings
         {PLACE_IMAGE items/rune-violet2.png 45 21}
         {PLACE_IMAGE items/coffin-closed.png 49 24}
@@ -1733,6 +1741,12 @@
     [event]
         name=victory
 
+        [micro_ai]
+            side=5
+            ai_type=simple_attack
+            action=delete
+        [/micro_ai]
+
         {CLEAR_VARIABLE tentacle_count}
     [/event]
 
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
index 79e04c6fcd55..935bf79d9dc2 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
@@ -1706,18 +1706,37 @@
             speaker=Tanstafaal
             message= _ "Behold, our goddess has returned to us. All bow down to Eloh, our savior!"
         [/message]
-        #TODO: add better role-based speaker selection
-        [message]
+
+        [role]
             type_adv_tree=Quenoth Mystic
+            side=1
             [not]
                 id=Zhul
             [/not]
+            role=mystic_speaker
+        [/role]
+        [role]
+            type_adv_tree=Quenoth Fighter
+            side=1
+            role=fighter_speaker
+        [/role]
+        [role]
+            type_adv_tree=Quenoth Scout
             side=1
+            role=scout_speaker
+        [/role]
+        [role]
+            type_adv_tree=Tauroch Rider
+            side=1
+            role=rider_speaker
+        [/role]
+
+        [message]
+            role=mystic_speaker
             message= _ "The Goddess!"
         [/message]
         [message]
-            type_adv_tree=Quenoth Fighter
-            side=1
+            role=fighter_speaker
             message= _ "Forgive me my sins!"
         [/message]
         [message]
@@ -1733,21 +1752,15 @@
             message= _ "I come to you with dire news: one of you has betrayed me, and is a traitor to your cause."
         [/message]
         [message]
-            type_adv_tree=Quenoth Mystic
-            [not]
-                id=Zhul
-            [/not]
-            side=1
+            role=mystic_speaker
             message= _ "What?"
         [/message]
         [message]
-            type_adv_tree=Quenoth Scout
-            side=1
+            role=scout_speaker
             message= _ "No!"
         [/message]
         [message]
-            type_adv_tree=Tauroch Rider
-            side=1
+            role=rider_speaker
             message= _ "Who?"
         [/message]
         [message]
@@ -1777,8 +1790,7 @@
                     message= _ "Wait, my people, do not be deceived. This thing that appears by Tanstafaal’s side is not our god. I too was fooled at first, but I have come to realize by her actions that she is an impostor. When she appeared to me the night before Garak died, she told me to kill all that lived under the mountains, even the dwarves who ended up helping us. Likewise when we escaped from the caves, she appeared to me again, and told me to bow down to the humans, else she would destroy me. Never has Eloh threatened one of us or dictated our actions."
                 [/message]
                 [message]
-                    type_adv_tree=Quenoth Fighter,Quenoth Scout
-                    side=1
+                    role=fighter_speaker
                     message= _ "Why should we trust you? We have not heard Eloh’s words directly. Only now that you have led us into this folly has Eloh appeared to us."
                 [/message]
                 [message]
@@ -1792,8 +1804,7 @@
                     message= _ "Wait, my people, do not be deceived. This thing that appears by Tanstafaal’s side is not our god. I too was fooled at first, but I have come to realize by her actions that she is an impostor. When she appeared to me the night before Garak died, she told me to kill all that lived under the mountains, even the trolls who ended up helping us. Likewise when we escaped from the caves, she appeared to me again, and told me to bow down to the humans, else she would destroy me. Never has Eloh threatened one of us or dictated our actions."
                 [/message]
                 [message]
-                    type_adv_tree=Quenoth Fighter,Quenoth Scout
-                    side=1
+                    role=fighter_speaker
                     message= _ "Why should we trust you? We have not heard these words directly. Only now that you have led us into this folly has she appeared to us."
                 [/message]
                 [message]

From fa4169f1883429bbb3960606cf5c61eb3d479065 Mon Sep 17 00:00:00 2001
From: DisherProject <pycchio@tiscali.it>
Date: Thu, 11 Apr 2019 22:50:49 +0200
Subject: [PATCH 03/16] UtBS S2-S4: Adjust some filters and conditions

---
 .../scenarios/02_Across_the_Harsh_Sands.cfg   | 22 ++++++-------------
 .../scenarios/04_Descending_into_Darkness.cfg | 10 +++++----
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
index a97be8d04b06..4b0bc4ad783f 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
@@ -1161,7 +1161,7 @@
         [if]
             [have_unit]
                 side=1
-                x=28-40
+                x=28-39
                 y=22-33
                 [filter_location]
                     [not]
@@ -1169,13 +1169,6 @@
                     [/not]
                 [/filter_location]
             [/have_unit]
-            [or]
-                [have_unit]
-                    x=27-37
-                    y=30-33
-                    side=1
-                [/have_unit]
-            [/or]
 
             #!***Do wraith event***
             [then]
@@ -1395,12 +1388,9 @@
         [filter]
             side=1
             x=9-13
-            y=18-19
+            y=13-19
         [/filter]
 
-        #x coor: 9 to 13
-        #y coor: 19 to 18
-
         [terrain]
             terrain=Dd
             x=10,10,11,11,11,12,12
@@ -1755,15 +1745,17 @@
 
                 [store_locations]
                     variable=spawn
-                    x=$ghost_spawn_locs[$random].x
-                    y=$ghost_spawn_locs[$random].y
-                    radius=8
                     terrain=Hd, Dd, Rr
                     [filter_adjacent_location]
                         [filter]
                             side=1
                         [/filter]
                     [/filter_adjacent_location]
+                    [and]
+                        x=$ghost_spawn_locs[$random].x
+                        y=$ghost_spawn_locs[$random].y
+                        radius=8
+                    [/and]
                 [/store_locations]
 
                 {CLEAR_VARIABLE ghost_spawn_locs}
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/04_Descending_into_Darkness.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/04_Descending_into_Darkness.cfg
index 06d2f1852ea4..91598c1d484c 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/04_Descending_into_Darkness.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/04_Descending_into_Darkness.cfg
@@ -1014,10 +1014,12 @@
         [/message]
 
         [if]
-            [variable]
-                name=leaders_killed
-                numerical_equals=3
-            [/variable]
+            [not]
+                [have_unit]
+                    side=2,3,4
+                    canrecruit=yes
+                [/have_unit]
+            [/not]
 
             [then]
                 [message]

From d0bab23e8f5dc4c135b1ac9d38ac9c22fe5dfb49 Mon Sep 17 00:00:00 2001
From: DisherProject <pycchio@tiscali.it>
Date: Fri, 12 Apr 2019 21:10:27 +0200
Subject: [PATCH 04/16] UtBS: Update and add visual and sound effects

---
 .../scenarios/05_A_Subterranean_Struggle.cfg  |  8 +++
 .../06a_In_the_Tunnels_of_Trolls.cfg          | 10 +++
 .../06b_In_the_Domain_of_Dwarves.cfg          | 25 +++++++
 .../scenarios/08_Out_of_the_Frying_Pan.cfg    | 71 ++++++++++++-------
 .../09_Blood_is_Thicker_Than_Water.cfg        |  3 +
 .../units/monsters/Darawf.cfg                 |  2 +-
 .../units/monsters/Dust_Devil.cfg             |  2 +-
 .../units/quenoth/Youth.cfg                   |  4 +-
 8 files changed, 95 insertions(+), 30 deletions(-)

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
index d1c3ab5a7a7f..15e1aed76917 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
@@ -1487,6 +1487,10 @@
                 [redraw]
                 [/redraw]
 
+                [sound]
+                    name=fire.wav
+                [/sound]
+
                 [delay]
                     time=100
                 [/delay]
@@ -1675,6 +1679,10 @@
                 [redraw]
                 [/redraw]
 
+                [sound]
+                    name=thunderstick.ogg
+                [/sound]
+
                 [delay]
                     time=100
                 [/delay]
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
index f467da915e38..57dec3731d67 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
@@ -208,6 +208,9 @@ _ "These undead trolls fight again in death as they did in life, except this tim
 
         {INCREASE_RECRUIT_COSTS 1}
 
+        # show where to go at start
+        {PLACE_IMAGE items/gohere.png 15 7}
+
         #secret troll tomb furnishings
         {PLACE_IMAGE items/coffin-closed.png 3 28}
         {PLACE_IMAGE items/bones.png 6 24}
@@ -441,6 +444,8 @@ _ "These undead trolls fight again in death as they did in life, except this tim
             message= _ "Once you are done moving your people into position, I will blow the charges."
         [/message]
 
+        {REMOVE_IMAGE 15 7}
+
         # at start of player’s next turn, blow charges and destroy wall
         [event]
             name=new turn
@@ -823,6 +828,7 @@ _ "These undead trolls fight again in death as they did in life, except this tim
             [/filter]
             amount=25
             damage_type=fire
+            animate=yes
         [/harm_unit]
     [/event]
 
@@ -1038,6 +1044,10 @@ _ "These undead trolls fight again in death as they did in life, except this tim
                 role="Guardian Phoenix"
                 random_traits=no
             [/unit]
+
+            [sound]
+                name=flame-big.ogg
+            [/sound]
         )}
 
         [scroll_to_unit]
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
index ab9ba29c5c7f..3d0d54a4ac8c 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
@@ -504,6 +504,10 @@
             [redraw]
             [/redraw]
 
+            [sound]
+                name=explosion.ogg
+            [/sound]
+
             [delay]
                 time=100
             [/delay]
@@ -518,6 +522,9 @@
             # Have wall shake, then be replaced by dirt, then add rubble
 
             {UTBS_SHAKE_SCREEN}
+            [sound]
+                name=rumble.ogg
+            [/sound]
 
             [terrain]
                 x=27-28
@@ -840,7 +847,13 @@
                     y=30,30,29,28,27,27,26,25
                 [/move_unit_fake]
 
+                [sound]
+                    name=explosion.ogg
+                [/sound]
                 {UTBS_SHAKE_SCREEN}
+                [sound]
+                    name=rumble.ogg
+                [/sound]
 
                 [terrain]
                     x,y=22,30
@@ -911,7 +924,13 @@
                     y=31,30,29,28,27,26,25,24,24,23
                 [/move_unit_fake]
 
+                [sound]
+                    name=explosion.ogg
+                [/sound]
                 {UTBS_SHAKE_SCREEN}
+                [sound]
+                    name=rumble.ogg
+                [/sound]
 
                 [terrain]
                     x,y=16,31
@@ -999,7 +1018,13 @@
     # directly to main dwarf base
 
 #define BACKUP_CHARGES
+    [sound]
+        name=explosion.ogg
+    [/sound]
     {UTBS_SHAKE_SCREEN}
+    [sound]
+        name=rumble.ogg
+    [/sound]
 
     [terrain]
         x=12,12
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
index 43b608070355..a5c1bc4102db 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
@@ -1202,6 +1202,10 @@
             x,y=24,50
             terrain=Uu
         [/terrain]
+
+        [redraw]
+            clear_shroud=yes
+        [/redraw]
     [/event]
 
     # Event 4b: discover exit from secret tunnel
@@ -1264,6 +1268,10 @@
             y=48,49
             terrain=Wwg
         [/terrain]
+
+        [redraw]
+            clear_shroud=yes
+        [/redraw]
     [/event]
 
     # Event 5: Enter warded cave
@@ -1295,6 +1303,10 @@
         [redraw]
         [/redraw]
 
+        [sound]
+            name=magic-dark-big-miss.ogg
+        [/sound]
+
         [delay]
             time=100
         [/delay]
@@ -1444,6 +1456,10 @@
         [redraw]
         [/redraw]
 
+        [sound]
+            name=heal.wav
+        [/sound]
+
         [delay]
             time=100
         [/delay]
@@ -1751,6 +1767,9 @@
 
             [then]
                 {NAMED_UNIT 3 (Ghost) 12 42 (Novice Dani) ( _ "Novice Dani") (upkeep=free)}
+                [+unit]
+                    animate=yes
+                [/unit]
             [/then]
         [/if]
 
@@ -1763,6 +1782,9 @@
 
             [then]
                 {NAMED_UNIT 3 (Ghost) 11 41 (Novice Iona) ( _ "Novice Iona") (upkeep=free)}
+                [+unit]
+                    animate=yes
+                [/unit]
             [/then]
         [/if]
 
@@ -1775,6 +1797,9 @@
 
             [then]
                 {NAMED_UNIT 3 (Ghost) 9 43 (Novice Pior) ( _ "Novice Pior") (upkeep=free)}
+                [+unit]
+                    animate=yes
+                [/unit]
             [/then]
         [/if]
     [/event]
@@ -1878,6 +1903,10 @@
             terrain=Uu
         [/terrain]
 
+        [redraw]
+            clear_shroud=yes
+        [/redraw]
+
         [message]
             speaker=unit
             message= _ "What do you know? A secret door!"
@@ -1928,6 +1957,10 @@
         [redraw]
         [/redraw]
 
+        [sound]
+            name=magic-dark-big-miss.ogg
+        [/sound]
+
         [delay]
             time=100
         [/delay]
@@ -2156,6 +2189,10 @@
             [redraw]
             [/redraw]
 
+            [sound]
+                name=magic-dark-big-miss.ogg
+            [/sound]
+
             [delay]
                 time=100
             [/delay]
@@ -2227,6 +2264,9 @@
                     [/remove_event]
 
                     {UTBS_SHAKE_SCREEN}
+                    [sound]
+                        name=rumble.ogg
+                    [/sound]
 
                     [terrain]
                         x=9,9
@@ -2507,13 +2547,7 @@
                         message= _ "Kaleh, I think you should come up and see this."
                     [/message]
 
-                    [teleport]
-                        [filter]
-                            id=Kaleh
-                        [/filter]
-                        x=$x1
-                        y=$y1
-                    [/teleport]
+                    {MOVE_UNIT (id=Kaleh) $x1 $y1}
                 [/then]
             [/if]
 
@@ -2635,7 +2669,7 @@
 
             [kill]
                 id=Keratur
-                animate=no
+                animate=yes
                 fire_event=no
             [/kill]
 
@@ -3080,12 +3114,7 @@
                     message= _ "Am I dreaming? Is this real? I’m coming, I’m coming."
                 [/message]
 
-                [teleport]
-                    [filter]
-                        id=Kaleh
-                    [/filter]
-                    x,y=25,23
-                [/teleport]
+                {MOVE_UNIT (id=Kaleh) 25 23}
             [/then]
 
             [else]
@@ -3157,12 +3186,7 @@
 
         #troll/dwarf ally teleports to just outside of cave
 
-        [teleport]
-            [filter]
-                id=$ally_name
-            [/filter]
-            x,y=21,23
-        [/teleport]
+        {MOVE_UNIT (id=$ally_name) 21 23}
 
         [message]
             speaker=$ally_name
@@ -3428,12 +3452,7 @@
             message= _ "Well, now we’re really in for it. I hope you know what you’re doing, Kaleh."
         [/message]
 
-        [teleport]
-            [filter]
-                id=Kaleh
-            [/filter]
-            x,y=18,19
-        [/teleport]
+        {MOVE_UNIT (id=Kaleh) 18 19}
 
         {MESSAGE_DEPEND_ON_ALLY
         (
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
index 935bf79d9dc2..6d740fe8de6e 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
@@ -2338,6 +2338,9 @@
             [/filter]
             side=1
         [/modify_unit]
+        [redraw]
+            clear_shroud=yes
+        [/redraw]
 
         [message]
             speaker=Kaleh
diff --git a/data/campaigns/Under_the_Burning_Suns/units/monsters/Darawf.cfg b/data/campaigns/Under_the_Burning_Suns/units/monsters/Darawf.cfg
index 8849375ad2c2..031a6331ecb5 100644
--- a/data/campaigns/Under_the_Burning_Suns/units/monsters/Darawf.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/units/monsters/Darawf.cfg
@@ -4,7 +4,7 @@
     name= _ "Dawarf"
     race=monster
     image="units/monsters/dawarf.png"
-    {DEFENSE_ANIM "units/monsters/dawarf-growl.png" "units/monsters/dawarf.png" groan.wav }
+    {DEFENSE_ANIM "units/monsters/dawarf-growl.png" "units/monsters/dawarf.png" {SOUND_LIST:ZOMBIE_WEAK_HIT} }
     hitpoints=22
     movement_type=dwarvishfoot
     movement=4
diff --git a/data/campaigns/Under_the_Burning_Suns/units/monsters/Dust_Devil.cfg b/data/campaigns/Under_the_Burning_Suns/units/monsters/Dust_Devil.cfg
index d56a8952c8a3..0a044539db93 100644
--- a/data/campaigns/Under_the_Burning_Suns/units/monsters/Dust_Devil.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/units/monsters/Dust_Devil.cfg
@@ -13,7 +13,7 @@
     alignment=neutral
     cost=20
     description= _ "A swirl of dust and desert sand, quick as a wind, impossible to spot when resting and as dangerous as sand storm when riled."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_SWARM}+{SPECIAL_NOTES_ARCANE}
-    {DEFENSE_ANIM "units/monsters/dust-devil.png" "units/monsters/dust-devil.png" groan.wav }
+    {DEFENSE_ANIM "units/monsters/dust-devil.png" "units/monsters/dust-devil.png" wose-hit.ogg }
     die_sound=groan.wav
     movement_type=undeadfly
     movement=8
diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Youth.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Youth.cfg
index 6d0fb053cd81..ccdd525a5ff5 100644
--- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Youth.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Youth.cfg
@@ -319,12 +319,12 @@ _"Nym is Kaleh’s childhood friend, a young, rebellious lady with quick wits an
 #define KALEH_ANIMATIONS
     {LEADING_ANIM "units/quenoth/kaleh-lead2.png" "units/quenoth/kaleh-lead1.png" (12,-32)}
     {DEFENSE_ANIM_RANGE "units/quenoth/kaleh-defend-2.png" "units/quenoth/kaleh-defend-1.png" {SOUND_LIST:ELF_HIT} melee}
-    {DEFENSE_ANIM_FILTERED "units/quenoth/kaleh-bow-defend-2.png" "units/quenoth/kaleh-bow-defend-1.png" {SOUND_LIST:ELF_FEMALE_HIT} (
+    {DEFENSE_ANIM_FILTERED "units/quenoth/kaleh-bow-defend-2.png" "units/quenoth/kaleh-bow-defend-1.png" {SOUND_LIST:ELF_HIT} (
         [filter_second_attack]
             name=bow
         [/filter_second_attack]
     )}
-    {DEFENSE_ANIM_FILTERED "units/quenoth/kaleh-defend-2.png" "units/quenoth/kaleh-defend-1.png" {SOUND_LIST:ELF_FEMALE_HIT} (
+    {DEFENSE_ANIM_FILTERED "units/quenoth/kaleh-defend-2.png" "units/quenoth/kaleh-defend-1.png" {SOUND_LIST:ELF_HIT} (
         [filter_second_attack]
             name=bolas
         [/filter_second_attack]

From b99297cdaf1da1f9af50e122358eb311bb26bfab Mon Sep 17 00:00:00 2001
From: DisherProject <pycchio@tiscali.it>
Date: Fri, 12 Apr 2019 21:11:15 +0200
Subject: [PATCH 05/16] UtBS S6a-S6b: Remove unnecessary objects

...and correct Zurg's side, because he belongs to
side 3
---
 .../06a_In_the_Tunnels_of_Trolls.cfg          | 24 -------------------
 .../06b_In_the_Domain_of_Dwarves.cfg          |  2 +-
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
index 57dec3731d67..242a64ecd387 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
@@ -1270,17 +1270,6 @@ _ "These undead trolls fight again in death as they did in life, except this tim
             [modifications]
                 {TRAIT_LOYAL}
                 {TRAIT_INTELLIGENT}
-                [object]
-                    id=t2
-                    [effect]
-                        apply_to=movement_costs
-                        replace=yes
-                        [movement_costs]
-                            cave={UNREACHABLE}
-                            flat={UNREACHABLE}
-                        [/movement_costs]
-                    [/effect]
-                [/object]
             [/modifications]
             {IS_LOYAL}
         [/unit]
@@ -1316,17 +1305,6 @@ _ "These undead trolls fight again in death as they did in life, except this tim
             [modifications]
                 {TRAIT_LOYAL}
                 {TRAIT_RESILIENT}
-                [object]
-                    id=t1
-                    [effect]
-                        apply_to=movement_costs
-                        replace=yes
-                        [movement_costs]
-                            cave={UNREACHABLE}
-                            flat={UNREACHABLE}
-                        [/movement_costs]
-                    [/effect]
-                [/object]
             [/modifications]
             {IS_LOYAL}
         [/unit]
@@ -1796,8 +1774,6 @@ _ "These undead trolls fight again in death as they did in life, except this tim
     [event]
         name=victory
 
-        {CLEAR_VARIABLE i}
-
         {CLEAR_VARIABLE heat_damage}
         {CLEAR_VARIABLE summon_flame_guardian}
         {CLEAR_VARIABLE flame_guardian_turn_counter}
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
index 3d0d54a4ac8c..f2974816aff5 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
@@ -1448,7 +1448,7 @@
             y=21,19
         [/move_unit_fake]
 
-        {NAMED_NOTRAIT_UNIT 2 (Troll Shaman) 6 19 (Zurg) ( _ "Zurg")}
+        {NAMED_NOTRAIT_UNIT 3 (Troll Shaman) 6 19 (Zurg) ( _ "Zurg")}
 
         [delay]
             time=200

From fce15425fcd59f142d481410cfbe319dd0a407b1 Mon Sep 17 00:00:00 2001
From: DisherProject <pycchio@tiscali.it>
Date: Fri, 12 Apr 2019 21:11:51 +0200
Subject: [PATCH 06/16] UtBS S5: Avoid duplicating the defeat condition

---
 .../scenarios/05_A_Subterranean_Struggle.cfg                   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
index 15e1aed76917..b2f703cdfbd2 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
@@ -2304,6 +2304,9 @@
                     side=1
                 [/allied_with]
             [/filter_side]
+            [not]
+                side=1
+            [/not]
         [/filter]
 
         [endlevel]

From 0ed90552dc011ca5e6823b5fc51f53134111710f Mon Sep 17 00:00:00 2001
From: DisherProject <pycchio@tiscali.it>
Date: Sat, 13 Apr 2019 15:51:44 +0200
Subject: [PATCH 07/16] Update 09_Blood_is_Thicker_Than_Water.cfg

---
 .../scenarios/09_Blood_is_Thicker_Than_Water.cfg                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
index 6d740fe8de6e..ae876c7ce1e0 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
@@ -322,7 +322,7 @@
                 description= _ "Rescue at least two merfolk by turn 16"
                 condition=win
                 [show_if]
-                    {VARIABLE_CONDITIONAL turn_number less_than 16}
+                    {VARIABLE_CONDITIONAL number_merfolk_caged greater_than 0}
                 [/show_if]
             [/objective]
             [objective]

From 097514b9b71ced8b9f6e6cb02a4850de30c4be08 Mon Sep 17 00:00:00 2001
From: DisherProject <pycchio@tiscali.it>
Date: Thu, 18 Apr 2019 23:30:04 +0200
Subject: [PATCH 08/16] UtBS S8: Make flooding independent of player's moves

---
 .../maps/08_Out_of_the_Frying_Pan.map         | 84 +++++++++----------
 .../scenarios/08_Out_of_the_Frying_Pan.cfg    | 74 ++++------------
 2 files changed, 56 insertions(+), 102 deletions(-)

diff --git a/data/campaigns/Under_the_Burning_Suns/maps/08_Out_of_the_Frying_Pan.map b/data/campaigns/Under_the_Burning_Suns/maps/08_Out_of_the_Frying_Pan.map
index e8a019fd1947..f971dbed13ba 100644
--- a/data/campaigns/Under_the_Burning_Suns/maps/08_Out_of_the_Frying_Pan.map
+++ b/data/campaigns/Under_the_Burning_Suns/maps/08_Out_of_the_Frying_Pan.map
@@ -11,45 +11,45 @@ Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu,
 Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Md, Md, Hd, Hd, Dd, Dd, Dd, Dd, Dd, Dd, Rd, Dd, Dd, Hd, Hd, Hd, Hd, Hd, Md, Md, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md, Md, Hd, Md, Hd, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
 Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Md, Md, Md, Hd, Hd, Hd, Hd, Dd, Dd, Hd, Hd, Dd, Rd, Dd, Hd, Hd, Hd, Hd, Hd, Hd, Md, Md, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md, Md^Xm, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
 Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Mm^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Md, Md, Md, Hd, Hd, Hd, Hd, Dd, Dd, Hd, Hd, Hd, Rd, Dd, Hd, Hd, Hd, Hd, Hd, Hd, Md, Md, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Mm^Xm, Xu, Xu, Xu, Xu, Xu, Uu, Xu, Uu, Xu, Xu, Xu, Md, Md, Md, Hd, Hd, Hd, Hd, Dd, Hd, Hd, Hd, Hd, Hd, Dd, Hd, Hd, Dd, Hd, Hd, Hd, Md, Md, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Mm^Xm, Mm^Xm, Uu, Uu, Uu, Xu, Uu, Xu, Uu, Xu, Xu, Xu, Md, Md, Md, Hd, Hd, Hd, Hd, Hd, Hd, Dd, Dd, Rd, Dd, Dd, Dd, Dd, Dd, Hd, Md, Md, Md, Md, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Mm^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Xu, Xu, Md, Md, Md, Hd, Hd, Hd, Dd, Dd, Dd, Hd, Hd, Rd, Hd, Hd, Dd, Dd, Hd, Hd, Md, Md, Md, Md, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Xu, Xu, Xu, Xu, Xu, Uu^Vud, Xu, Uu, Xu, Xu, Xu, Xu, Uu, Xu, Xu, Md, Md, Md, Hd, Hd, Hd, Dd, Dd, Hd, Hd, Dd, Rd, Rd, Hd, Hd, Hd, Hd, Md, Md, Md, Md, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Xu, Uu, Uu, Uu, Uu, Uu, Uu, Re, Xu, Xu, Xu, Xu, Uu, Uu, Xu, Md, Md, Dd, Hd, Dd, Dd, Dd, Dd, Hd, Hd, Hd, Dd, Dd, Rd, Dd, Hd^Edp, Hd, Hd, Hd, Hd, Md, Md, Md, Md^Xm, Md, Md, Md, Md^Xm, Md^Xm, Md^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Xu, Re, Re, Uu, Chr, Uu, Uu, Re, Re, Xu, Xu, Xu, Xu, Dd, Dd, Dd, Md, Dd, Hd, Hd, Hd, Hd, Hd, Hd, Hd, Dd, Dd, Rd, Rd, Dd, Dd, Hd, Hd, Hd, Md, Md, Md, Md, Md, Md, Md, Md, Md^Xm, Md^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Khr, Chr, Uu, Uu, Uu, Uu^Vud, Xu, Xu, Md, Md, Md, Md, Md, Hd, Hd, Hd, Dd^Vdt, Hd, Hd, Hd, Hd, Hd, Rd^Edp, Rd, Dd^Vdt, Rd, Rd, Dd^Edp, Hd, Hd, Hd, Hd, Hd, Md, Md, Md, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Chr, Re, Uu, Uu, Uu, Re, Xu, Md, Md, Md, Md, Hd, Hd, Hd, Hd, Hd, Hd, Hd, Hd, Dd, Dd, Rd, Gs^Edp, Wwt, Gs, Gs^Edp, Rd, Rd, Dd^Vdt, Rd, Hd, Hd, Hd, Hd, Md, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uh, Uu, Uu, Uh, Uu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Uu^Vud, Re, Uu, Uu, Md, Md, Md, Md, Md, Md, Hd, Hd, Hd, Hd^Edp, Hd, Hd, Dd, Dd, Dd^Edp, Rd, Gs, Gs, Wwt, Wwt, Gs, Rd, Hd, Rd, Hd, Rd, Rd, Hd, Hd, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Xu, Xos, Xos, Xos, Uu, Uu, Uu, Re, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Re, Md, Md, Hd, Hd, Hd, Hd, Dd^Vdt, Hd, Hd, Hd, Dd, Hd, Dd, Dd, Dd^Edp, Dd, Dd, Rd, Rd, Dd^Vdt, Gs, Wwt, Gs, Rd^Edp, Hd, Hd, Hd, Dd^Vdt, Rd, Hd, Hd, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xos, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Md, Md, Md, Md, Hd, Hd, Hd, Hd, Hd, Rd, Rd, Rd, Rd, Dd^Edp, Rd, Rd, Rd^Edp, Dd, Dd, Dd, Dd^Edp, Rd, Rd, Dd^Vdt, Rd, Rd, Hd, Hd, Rd, Rd, Hd, Hd, Hd, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xos, Uu, Xos, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Md, Md, Md, Hd, Hd, Hd, Hd, Hd, Hd, Hd, Dd^Vdt, Hd, Hd, Rd, Gs, Gs^Edp, Gs, Rd, Rd, Dd, Rd, Rd, Dd, Rd, Dd, Hd, Hd, Hd, Rd, Dd^Vdt, Hd, Hd, Hd, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xos, Xos, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Md, Md, Md, Dd^Vdt, Hd, Hd, Hd, Hd, Hd, Hd, Hd, Hd, Hd, Rd^Edp, Dd^Vdt, Wwt, Wwt, Dd^Vdt, Rd, Rd^Edp, Rd, Rd, Dd, Dd, Hd, Hd, Hd, Hd, Rd, Hd, Hd, Hd, Md, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Md, Md, Md, Md, Hd, Md, Hd, Md, Hd, Hd, Hd, Hd, Hd, Hd, Wwt, Dd^Vdt, Gs^Edp, Rd, Dd, Dd, Rd, Rd, Hd, Chr, Hd, Rd, Rd, Hd, Hd, Md, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Uu, Xu, Xu, Xu, Xu, Md, Md, Md, Md, Md, Md, Md, Hd, Hd, Hd, Hd, Hd^Edp, Hd, Hd, Rd, Hd, Dd, Dd, Dd, Hd, Chr, 2 Khr, Chr, Hd, Hd, Hd, Md, Md, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Md, Md, Md, Md, Md, Md, Hd, Md, Hd, Md, Hd, Hd, Hd, Hd, Hd, Hd, Hd, Hd, Chr, Chr, Chr, Hd, Hd, Md, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Md, Md, Md, Md, Md, Md, Md, Md, Md, Md, Md, Md, Hd, Hd, Hd, Hd, Hd, Hd, Hd, Md, Md, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Md, Md, Md, Md, Md, Md, Md, Md, Md, Md, Md, Md, Md, Hd, Hd, Hd, Md, Md, Md, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Wo, Wo
-Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Md, Md, Md, Xu, Xu, Xu, Md, Md, Md, Md, Md, Md, Md, Md, Md, Md, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Wo, Wo, Wo, Wo
-Xu, Xu, Xu, Xu, Xos, Xu, Urb, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Md, Xu, Md, Xu, Md, Md, Md, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo
-Xu, Xu, Xu, Xos, Uu, Urb, Urb, Urb, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Md, Md, Md, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Xu, Xu
-Xu, Xu, Xu, Xos, Uu, Urb, Urb, Urb, Uu, Xos, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Xu, Xu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Wo, Wo, Wo, Wo, Wo, Wo, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Xu, Xu, Xu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Wo, Wo, Wo, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Xu, Xos, Xu, Re, Uu, Xos, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Xu, Uu, Uu, Cud, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Xu, Uu, Uu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Cud, Kud, Cud, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Wo, Wo, Wo, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Xu, Xom, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Uu, Re, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Cud, Cud, Cud, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Wo, Wo, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Xu, Iwr, Xom, Xom, Uu, Xu, Uu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Wo, Wo, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Re, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Wo, Wo, Wo, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xom, Iwr, Iwr, Iwr, Iwr, Iwr, Xom, Xu, Re, Re, Xu, Xu, Xu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Wo, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Re, Uu, Xu, Xu, Xu, Xu, Xu, Uu, Ww, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Wo, Xu, Xu, Xu, Xu, Xom, Iwr, Iwr, Iwr, Iwr, Iwr, Xom, Xom, Xu, Xu, Xu, Xu, Xos, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Ce, Uu, Uu, Xu, Xu, Xu, Uu, Uh, Ww, Ww, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Wo, Xu, Xu, Xu, Xu, Xom, Iwr, Iwr, Iwr, Iwr, Iwr, Iwr, Xom, Xu, Xos, Re, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uh, Uu, 1 Ke, Ce, Uu, Uu, Uh, Uh, Xu, Uu, Wo, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Wo, Xu, Xu, Xu, Xu, Xu, Xom, Iwr, Iwr, Iwr, Iwr, Iwr, Xos, Xu, Uu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uh, Uh, Uu, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Ce, Uu, Uu, Uu, Uu, Wwg, Uu, Wwg, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Iwr, Iwr, Iwr, Uu, Xos, Uu, Uu, Uu, Uu, Uu, Uu, Uu, Re, Xos, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Xu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Re, Uu, Uu, Uh, Uu, Wwg, Wwg, Wo, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xom, Xu, Xu, Xu, Uu, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Xos, Uu, Re, Re, Xu, Xu, Xu, Xu, Re, Uu, Uh, Uu, Uu, Re, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Re, Xu, Xu, Xu, Xu, Xu, Xu, Re, Uu, Uu, Uu, Uu, Uu, Uu, Wo, Wo, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Xu, Uu, Xu, Uu, Uu, Xu, Xu, Xu, Xos, Uu, Uu, Uu, Uu, Chr, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Re, Uu, Uu^Em, Xu, Xu, Xu, Uu, Uu, Uu, Re, Uu, Uu, Wwg, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Wo, Wo, Xu, Wo, Wo, Uu, Uu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Re, Uu, Uu, Uu, Urb, Xos, Xos, Xu, Xu, Xu, Uh, Xu, Uu, Re, Uu^Uf, Uu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Uu, Uh, Uu, Uu, Xu, Uu, Uu, Uu, Xu, Xu, Uu, Wwg, Wwg, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Wo, Xu, Wo, Wo, Wo, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Chr, Xos, Uu, Uu, Uu, Uu, Xu, Re, Uh, Xu, Re, Xu, Re, Uu, Xu, Uu, Xu, Xu, Uu, Uu, Uu^Em, Re, Xu, Xu, Uu, Re, Re, Re, Uu, Xu, Xu, Xu, Uu, Wo, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Wo, Wo, Wo, Wo, Uu, Re, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xos, Xu, Uu, Uh, Uu, Xu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Xu, Uu, Uu, Uu, Uu, Uu, Re, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Wwg, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Xu, Xu, Wo, Re, Re, Xu, Xu, Xu, Uu, Uu, Re, Re, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu^Em, Uu, Uu, Uu^Uf, Uu^Uf, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Wwg, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Re, Re, Uu, Uu, Xu, Uh, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Re, Uu, Uu^Uf, Uu^Uf, Uu^Uf, Uu^Uf, Uu^Uf, Xu, Xu, Xu, Wo, Xu, Xu, Xu, Uu, Wwg, Wo, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uh, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uh, Uh, Re, Uu^Uf, Uu^Uf, Xu, Uu^Uf, Wo, Xu, Wo, Wo, Wo, Wo, Wo, Wo, Ww, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uh, Xu, Xu, Xu, Xu, Xu, Xu, Wo, Xu, Xu, Xu, Wo, Xu, Wo, Xu, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Mm^Xm, Xu, Xu, Xu, Xu, Xu, Uu, Xu, Uu, Xu, Xu, Xu, Md, Md, Md, Hd, Hd, Hd, Hd, Dd, Hd, Hd, Hd, Hd, Hd, Dd, Hd, Hd, Dd, Hd, Hd, Hd, Md, Md, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Wo, Wwg, Xu, Re, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Mm^Xm, Mm^Xm, Uu, Uu, Uu, Xu, Uu, Xu, Uu, Xu, Xu, Xu, Md, Md, Md, Hd, Hd, Hd, Hd, Hd, Hd, Dd, Dd, Rd, Dd, Dd, Dd, Dd, Dd, Hd, Md, Md, Md, Md, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Wwg, Uh, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Mm^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Xu, Xu, Md, Md, Md, Hd, Hd, Hd, Dd, Dd, Dd, Hd, Hd, Rd, Hd, Hd, Dd, Dd, Hd, Hd, Md, Md, Md, Md, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Xu, Xu, Xu, Xu, Xu, Uu^Vud, Xu, Uu, Xu, Xu, Xu, Xu, Uu, Xu, Xu, Md, Md, Md, Hd, Hd, Hd, Dd, Dd, Hd, Hd, Dd, Rd, Rd, Hd, Hd, Hd, Hd, Md, Md, Md, Md, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Re, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Xu, Uu, Uu, Uu, Uu, Uu, Uu, Re, Xu, Xu, Xu, Xu, Uu, Uu, Xu, Md, Md, Dd, Hd, Dd, Dd, Dd, Dd, Hd, Hd, Hd, Dd, Dd, Rd, Dd, Hd^Edp, Hd, Hd, Hd, Hd, Md, Md, Md, Md^Xm, Md, Md, Md, Md^Xm, Md^Xm, Md^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Re, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Xu, Re, Re, Uu, Chr, Uu, Uu, Re, Re, Xu, Xu, Xu, Xu, Dd, Dd, Dd, Md, Dd, Hd, Hd, Hd, Hd, Hd, Hd, Hd, Dd, Dd, Rd, Rd, Dd, Dd, Hd, Hd, Hd, Md, Md, Md, Md, Md, Md, Md, Md, Md^Xm, Md^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Khr, Chr, Uu, Uu, Uu, Uu^Vud, Xu, Xu, Md, Md, Md, Md, Md, Hd, Hd, Hd, Dd^Vdt, Hd, Hd, Hd, Hd, Hd, Rd^Edp, Rd, Dd^Vdt, Rd, Rd, Dd^Edp, Hd, Hd, Hd, Hd, Hd, Md, Md, Md, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Uu^Uf, Uu^Uf, Uu, Xu, Xu, Xu, Xu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Chr, Re, Uu, Uu, Uu, Re, Xu, Md, Md, Md, Md, Hd, Hd, Hd, Hd, Hd, Hd, Hd, Hd, Dd, Dd, Rd, Gs^Edp, Wwt, Gs, Gs^Edp, Rd, Rd, Dd^Vdt, Rd, Hd, Hd, Hd, Hd, Md, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Uu^Uf, Xu, Uu, Xu, Xu, Xu, Uh, Uu, Uu, Uh, Uu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Uu^Vud, Re, Uu, Uu, Md, Md, Md, Md, Md, Md, Hd, Hd, Hd, Hd^Edp, Hd, Hd, Dd, Dd, Dd^Edp, Rd, Gs, Gs, Wwt, Wwt, Gs, Rd, Hd, Rd, Hd, Rd, Rd, Hd, Hd, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Uu, Xu, Xu, Re, Xos, Xos, Xos, Uu, Uu, Uu, Re, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Re, Md, Md, Hd, Hd, Hd, Hd, Dd^Vdt, Hd, Hd, Hd, Dd, Hd, Dd, Dd, Dd^Edp, Dd, Dd, Rd, Rd, Dd^Vdt, Gs, Wwt, Gs, Rd^Edp, Hd, Hd, Hd, Dd^Vdt, Rd, Hd, Hd, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Uu, Xu, Xu, Re, Xu, Xu, Xu, Xos, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Md, Md, Md, Md, Hd, Hd, Hd, Hd, Hd, Rd, Rd, Rd, Rd, Dd^Edp, Rd, Rd, Rd^Edp, Dd, Dd, Dd, Dd^Edp, Rd, Rd, Dd^Vdt, Rd, Rd, Hd, Hd, Rd, Rd, Hd, Hd, Hd, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Re, Xu, Xu, Uu, Re, Xu, Xu, Xos, Uu, Xos, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Md, Md, Md, Hd, Hd, Hd, Hd, Hd, Hd, Hd, Dd^Vdt, Hd, Hd, Rd, Gs, Gs^Edp, Gs, Rd, Rd, Dd, Rd, Rd, Dd, Rd, Dd, Hd, Hd, Hd, Rd, Dd^Vdt, Hd, Hd, Hd, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Xu, Uu, Uu, Xu, Uu, Xu, Xu, Xos, Xos, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Md, Md, Md, Dd^Vdt, Hd, Hd, Hd, Hd, Hd, Hd, Hd, Hd, Hd, Rd^Edp, Dd^Vdt, Wwt, Wwt, Dd^Vdt, Rd, Rd^Edp, Rd, Rd, Dd, Dd, Hd, Hd, Hd, Hd, Rd, Hd, Hd, Hd, Md, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Xu, Xu, Uh, Uh, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Md, Md, Md, Md, Hd, Md, Hd, Md, Hd, Hd, Hd, Hd, Hd, Hd, Wwt, Dd^Vdt, Gs^Edp, Rd, Dd, Dd, Rd, Rd, Hd, Chr, Hd, Rd, Rd, Hd, Hd, Md, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Xu, Xu, Uu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Uu, Xu, Xu, Xu, Xu, Md, Md, Md, Md, Md, Md, Md, Hd, Hd, Hd, Hd, Hd^Edp, Hd, Hd, Rd, Hd, Dd, Dd, Dd, Hd, Chr, 2 Khr, Chr, Hd, Hd, Hd, Md, Md, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Xu, Xu, Xu, Uu^Uf, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Md, Md, Md, Md, Md, Md, Hd, Md, Hd, Md, Hd, Hd, Hd, Hd, Hd, Hd, Hd, Hd, Chr, Chr, Chr, Hd, Hd, Md, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Xu, Xu, Uu, Uu, Xu, Xu, Xu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Md, Md, Md, Md, Md, Md, Md, Md, Md, Md, Md, Md, Hd, Hd, Hd, Hd, Hd, Hd, Hd, Md, Md, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Md, Md, Md, Md, Md, Md, Md, Md, Md, Md, Md, Md, Md, Hd, Hd, Hd, Md, Md, Md, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu
+Xu, Xu, Re, Xu, Xu, Xu, Xos, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Md, Md, Md, Xu, Xu, Xu, Md, Md, Md, Md, Md, Md, Md, Md, Md, Md, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Wwg, Wo, Wo
+Xu, Xu, Re, Xu, Xos, Xos, Urb, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Md, Xu, Md, Xu, Md, Md, Md, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uh, Uu, Uh, Uu, Wo, Wo, Wo, Wo
+Xu, Xu, Xu, Uu, Uu, Urb, Urb, Urb, Uu, Xos, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Md, Md, Md, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uh, Wo, Wo, Wo, Wo, Wo, Wo, Xu, Xu
+Xu, Xu, Xu, Xos, Uu, Urb, Urb, Urb, Uu, Xos, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Xu, Xu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uh, Wo, Wo, Wo, Wo, Xu, Xu, Xu, Xu
+Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Xu, Xu, Xu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Wo, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Xu, Xos, Xu, Re, Uu, Xos, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Xu, Uu, Uu, Cud, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uh, Wo, Wo, Wo, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Xu, Uu, Uu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Cud, Kud, Cud, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Wo, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Xu, Xom, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Uu, Re, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Cud, Cud, Cud, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Wwg, Wo, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Xu, Iwr, Xom, Xom, Uu, Xu, Uu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Wwg, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Re, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Wwg, Uu, Wo, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Wo, Wwg, Uu, Xu, Xu, Xu, Xu, Xom, Iwr, Iwr, Iwr, Iwr, Iwr, Xom, Xu, Re, Re, Xu, Xu, Xu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uh, Uh, Wwg, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Re, Uu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Re, Xu, Xu, Xu, Xu, Xom, Iwr, Iwr, Iwr, Iwr, Iwr, Xom, Xom, Xu, Xu, Xu, Xu, Xos, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Re, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Ce, Uu, Uu, Xu, Xu, Xu, Uu, Uh, Ww, Ww, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Re, Xu, Xu, Xu, Xu, Xom, Iwr, Iwr, Iwr, Iwr, Iwr, Iwr, Xom, Xu, Xos, Re, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uh, Uu, 1 Ke, Ce, Uu, Uu, Uh, Uh, Xu, Uu, Wo, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Re, Xu, Xu, Xu, Xu, Xu, Xom, Iwr, Iwr, Iwr, Iwr, Iwr, Xos, Xu, Uu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uh, Uh, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Ce, Uu, Uu, Uu, Uu, Wwg, Uu, Wwg, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Iwr, Iwr, Iwr, Uu, Xos, Uu, Uu, Uu, Uu, Uu, Uu, Uu, Re, Xos, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Xu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Re, Uu, Uu, Uh, Uu, Wwg, Wwg, Wo, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Uu, Re, Xu, Xu, Xu, Xu, Xu, Xom, Xu, Xu, Xu, Uu, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Xos, Uu, Re, Re, Xu, Xu, Xu, Xu, Re, Uu, Uh, Uu, Uu, Re, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Re, Xu, Xu, Xu, Xu, Xu, Xu, Re, Uu, Uu, Uu, Uu, Uu, Uu, Wo, Wo, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Xu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Uu^Em, Xu, Uu, Xu, Uu, Uu, Xu, Xu, Xu, Xos, Uu, Uu, Uu, Uu, Chr, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Re, Uu, Uu^Em, Xu, Xu, Xu, Uu, Uu, Uu, Re, Uu, Uu, Wwg, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Xu, Re, Uu, Xu, Uu, Uu, Re^Edt, Uu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Re, Uu, Uu, Uu, Urb, Xos, Xos, Xu, Xu, Xu, Uh, Xu, Uu, Re, Uu^Uf, Uu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Uu, Uh, Uu, Uu, Xu, Uu, Uu, Uu, Xu, Xu, Uu, Wwg, Wwg, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Xu, Xu, Uu, Xu, Uu, Uu, Re, Uu^Edb, Uu, Uu^Es, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Chr, Xos, Uu, Uu, Uu, Uu, Xu, Re, Uh, Xu, Re, Xu, Re, Uu, Xu, Uu, Xu, Xu, Uu, Uu, Uu^Em, Re, Xu, Xu, Uu, Re, Re, Re, Uu, Xu, Xu, Xu, Uu, Wo, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Xu, Xu, Xu, Uu, Uu, Re^Edb, Re^Edb, Uu, Re^Edt, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xos, Xu, Uu, Uh, Uu, Xu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Xu, Uu, Uu, Uu, Uu, Uu, Re, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Wwg, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Xu, Xu, Xu, Xu, Xu, Re, Re, Re, Xu, Xu, Xu, Uu, Uu, Re, Re, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu^Em, Uu, Uu, Uu^Uf, Uu^Uf, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Wwg, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Re, Re, Uu, Uu, Xu, Uh, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Re, Uu, Uu^Uf, Uu^Uf, Uu^Uf, Uu^Uf, Uu^Uf, Xu, Xu, Xu, Wwg, Xu, Xu, Xu, Uu, Wwg, Wo, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uh, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uh, Uh, Re, Uu^Uf, Uu^Uf, Xu, Uu^Uf, Uu^Uf, Xu, Re, Uu^Uf, Wwg, Wo, Wo, Wo, Ww, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uh, Xu, Xu, Xu, Xu, Xu, Xu, Uu^Uf, Xu, Xu, Xu, Wo, Xu, Wo, Xu, Uu, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
index a5c1bc4102db..665a38ed4a54 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
@@ -731,12 +731,6 @@
             [/not]
         [/filter]
 
-        [terrain]
-            x=44
-            y=52
-            terrain=Wwg
-        [/terrain]
-
         #create confused ants
 
         [unit]
@@ -793,8 +787,8 @@
 
         [remove_shroud]
             side=1
-            x=37-44,36-41
-            y=46-53,50-54
+            x=37-46
+            y=46-53
         [/remove_shroud]
 
         [if]
@@ -875,12 +869,6 @@
             [/not]
         [/filter]
 
-        [terrain]
-            x=36,37
-            y=43,43
-            terrain=Wwg
-        [/terrain]
-
         [remove_shroud]
             side=1
             x=29-35,28-30
@@ -1263,12 +1251,6 @@
             terrain=Uu
         [/terrain]
 
-        [terrain]
-            x=8,8
-            y=48,49
-            terrain=Wwg
-        [/terrain]
-
         [redraw]
             clear_shroud=yes
         [/redraw]
@@ -1522,12 +1504,6 @@
             side=1
         [/filter]
 
-        [terrain]
-            x=8,8
-            y=48,49
-            terrain=Wwg
-        [/terrain]
-
         [remove_shroud]
             x=5-11,12-15
             y=46-51,46-49
@@ -1577,14 +1553,6 @@
             side=1
         [/remove_shroud]
 
-        #activate flooding of dining cavern
-
-        [terrain]
-            x=8,8
-            y=48,49
-            terrain=Wwg
-        [/terrain]
-
         [message]
             speaker=unit
             message= _ "This looks like a training hall. There are still a few old swords and spears lying in the corners. But otherwise it seems quite abandoned."
@@ -1832,14 +1800,6 @@
             side=1
         [/remove_shroud]
 
-        #activate flooding of dining cavern
-
-        [terrain]
-            x=8,8
-            y=48,49
-            terrain=Wwg
-        [/terrain]
-
         {CHECK_EXPLORER}
 
         [message]
@@ -2274,24 +2234,6 @@
                         terrain=Uu
                     [/terrain]
 
-                    [terrain]
-                        x=1
-                        y=33
-                        terrain=Wo
-                    [/terrain]
-
-                    [terrain]
-                        x=2,2,3
-                        y=33,34,35
-                        terrain=Wwg
-                    [/terrain]
-
-                    [remove_shroud]
-                        x=2-5
-                        y=33-36
-                        side=1
-                    [/remove_shroud]
-
                     [redraw]
                     [/redraw]
 
@@ -4175,6 +4117,18 @@
             id=do_flooding
         [/remove_event]
 
+        # flood the secret room
+        [terrain]
+            x=17-19,   16,   20,18,18
+            y=28-34,28-30,28-30,27,35
+            terrain=Wo
+        [/terrain]
+
+        [remove_item]
+            x=17-19,   16,   20,18,18
+            y=28-34,28-30,28-30,27,35
+        [/remove_item]
+
         # flood rest of side passage with deep water
         [terrain]
             x=12,12,12,12,13,14,15,16,17,18,19,20,21,22,23,23,24,25,25,26

From 92243fc73957177a233ef721e3df6236d2e2d99d Mon Sep 17 00:00:00 2001
From: DisherProject <pycchio@tiscali.it>
Date: Thu, 18 Apr 2019 23:31:50 +0200
Subject: [PATCH 09/16] UtBS S8: Make sure heroes are safe before teleporting
 them

---
 .../scenarios/08_Out_of_the_Frying_Pan.cfg    | 66 ++++++++++++++++++-
 1 file changed, 65 insertions(+), 1 deletion(-)

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
index 665a38ed4a54..57c0e5b6d7ed 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
@@ -2472,6 +2472,41 @@
                 message= _ "Look, daylight! I think we finally made it out of the caves!"
             [/message]
 
+            [find_path]
+                [traveler]
+                    id=Nym
+                [/traveler]
+                [destination]
+                    x=$explorer.x
+                    y=$explorer.y
+                [/destination]
+                allow_multiple_turns=yes
+                variable=nym_path
+            [/find_path]
+
+            [if]
+                [variable]
+                    name=unit.id
+                    not_equals=Nym
+                [/variable]
+                [and]
+                    [variable]
+                        name=nym_path.hexes
+                        numerical_equals=0
+                    [/variable]
+                [/and]
+                [then]
+                    # Nym is blocked by deep water
+
+                    [endlevel]
+                        result=defeat
+                    [/endlevel]
+
+                    [return]
+                    [/return]
+                [/then]
+            [/if]
+
             [message]
                 speaker=$explorer.id
                 message= _ "What’s this? Someone has built an outpost at the end of the cave. Where are its occupants?"
@@ -2489,11 +2524,40 @@
                         message= _ "Kaleh, I think you should come up and see this."
                     [/message]
 
+                    [find_path]
+                        [traveler]
+                            id=Kaleh
+                        [/traveler]
+                        [destination]
+                            x=$explorer.x
+                            y=$explorer.y
+                        [/destination]
+                        allow_multiple_turns=yes
+                        variable=kaleh_path
+                    [/find_path]
+
+                    [if]
+                        [variable]
+                            name=kaleh_path.hexes
+                            numerical_equals=0
+                        [/variable]
+                        [then]
+                            # Kaleh is blocked by deep water
+
+                            [endlevel]
+                                result=defeat
+                            [/endlevel]
+
+                            [return]
+                            [/return]
+                        [/then]
+                    [/if]
+
                     {MOVE_UNIT (id=Kaleh) $x1 $y1}
                 [/then]
             [/if]
 
-            {CLEAR_VARIABLE explorer}
+            {CLEAR_VARIABLE explorer,kaleh_path,nym_path}
 
             [message]
                 speaker=Kaleh

From a8e1fadd468be9deedc53894fcf4d59069f45caf Mon Sep 17 00:00:00 2001
From: DisherProject <pycchio@tiscali.it>
Date: Thu, 18 Apr 2019 23:46:25 +0200
Subject: [PATCH 10/16] UtBS S8: Buff gate guardians

They are much weaker than the serpents at the
end of the secret tunnel. Since the cursed gate
is a shortcut, it should be the hardest challenge
---
 .../maps/08_Out_of_the_Frying_Pan.map         |  4 +-
 .../scenarios/08_Out_of_the_Frying_Pan.cfg    | 50 +++++++++++++++++--
 2 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/data/campaigns/Under_the_Burning_Suns/maps/08_Out_of_the_Frying_Pan.map b/data/campaigns/Under_the_Burning_Suns/maps/08_Out_of_the_Frying_Pan.map
index f971dbed13ba..aa93fc42fdc8 100644
--- a/data/campaigns/Under_the_Burning_Suns/maps/08_Out_of_the_Frying_Pan.map
+++ b/data/campaigns/Under_the_Burning_Suns/maps/08_Out_of_the_Frying_Pan.map
@@ -43,9 +43,9 @@ Xu, Xu, Re, Xu, Xu, Xu, Xu, Xom, Iwr, Iwr, Iwr, Iwr, Iwr, Xom, Xom, Xu, Xu, Xu,
 Xu, Xu, Re, Xu, Xu, Xu, Xu, Xom, Iwr, Iwr, Iwr, Iwr, Iwr, Iwr, Xom, Xu, Xos, Re, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uh, Uu, 1 Ke, Ce, Uu, Uu, Uh, Uh, Xu, Uu, Wo, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
 Xu, Xu, Re, Xu, Xu, Xu, Xu, Xu, Xom, Iwr, Iwr, Iwr, Iwr, Iwr, Xos, Xu, Uu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uh, Uh, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Ce, Uu, Uu, Uu, Uu, Wwg, Uu, Wwg, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
 Xu, Xu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Iwr, Iwr, Iwr, Uu, Xos, Uu, Uu, Uu, Uu, Uu, Uu, Uu, Re, Xos, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Xu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Re, Uu, Uu, Uh, Uu, Wwg, Wwg, Wo, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Uu, Re, Xu, Xu, Xu, Xu, Xu, Xom, Xu, Xu, Xu, Uu, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Xos, Uu, Re, Re, Xu, Xu, Xu, Xu, Re, Uu, Uh, Uu, Uu, Re, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Re, Xu, Xu, Xu, Xu, Xu, Xu, Re, Uu, Uu, Uu, Uu, Uu, Uu, Wo, Wo, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Uu, Re, Xu, Xu, Xu, Xu, Xu, Xom, Xu, Xu, Xu, Uu, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Xos, Chr, Re, Re, Xu, Xu, Xu, Xu, Re, Uu, Uh, Uu, Uu, Re, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Re, Xu, Xu, Xu, Xu, Xu, Xu, Re, Uu, Uu, Uu, Uu, Uu, Uu, Wo, Wo, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
 Xu, Xu, Xu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Uu^Em, Xu, Uu, Xu, Uu, Uu, Xu, Xu, Xu, Xos, Uu, Uu, Uu, Uu, Chr, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Re, Uu, Uu^Em, Xu, Xu, Xu, Uu, Uu, Uu, Re, Uu, Uu, Wwg, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Xu, Re, Uu, Xu, Uu, Uu, Re^Edt, Uu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Re, Uu, Uu, Uu, Urb, Xos, Xos, Xu, Xu, Xu, Uh, Xu, Uu, Re, Uu^Uf, Uu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Uu, Uh, Uu, Uu, Xu, Uu, Uu, Uu, Xu, Xu, Uu, Wwg, Wwg, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Xu, Re, Uu, Xu, Uu, Uu, Re^Edt, Uu, Uu, Uu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Chr, Uu, Uu, Uu^Xo, Urb^Xo, Xos, Xos, Xu, Xu, Xu, Uh, Xu, Uu, Re, Uu^Uf, Uu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Uu, Uu, Uh, Uu, Uu, Xu, Uu, Uu, Uu, Xu, Xu, Uu, Wwg, Wwg, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
 Xu, Xu, Xu, Xu, Uu, Xu, Uu, Uu, Re, Uu^Edb, Uu, Uu^Es, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Chr, Xos, Uu, Uu, Uu, Uu, Xu, Re, Uh, Xu, Re, Xu, Re, Uu, Xu, Uu, Xu, Xu, Uu, Uu, Uu^Em, Re, Xu, Xu, Uu, Re, Re, Re, Uu, Xu, Xu, Xu, Uu, Wo, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
 Xu, Xu, Xu, Xu, Xu, Uu, Uu, Re^Edb, Re^Edb, Uu, Re^Edt, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xos, Xu, Uu, Uh, Uu, Xu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Xu, Uu, Uu, Uu, Uu, Uu, Re, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Wwg, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
 Xu, Xu, Xu, Xu, Xu, Xu, Xu, Re, Re, Re, Xu, Xu, Xu, Uu, Uu, Re, Re, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu^Em, Uu, Uu, Uu^Uf, Uu^Uf, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Wwg, Wo, Wo, Wo, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
index 57c0e5b6d7ed..0103eb1afff3 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
@@ -1270,8 +1270,7 @@
         name=moveto
 
         [filter]
-            x=19-24,21
-            y=45-47,48
+            x,y=23,48
             side=1
             [not]
                 type=Dust Devil
@@ -1308,6 +1307,13 @@
             x,y=23,48
         [/remove_item]
 
+        [terrain]
+            x=22,23
+            y=47,47
+            layer=overlay
+            terrain="^"
+        [/terrain]
+
         [object]
             [filter]
                 x=$x1
@@ -1342,8 +1348,46 @@
         {NAMED_UNIT 3 (Necrophage) 24 46 () ( _ "Gate Guard") (upkeep=free)}
 #endif
 
+        {NAMED_UNIT 3 (Skeleton) 19 47 () ( _ "Gate Guard") (upkeep=free)}
+        {NAMED_UNIT 3 (Revenant) 20 45 () ( _ "Gate Guard") (upkeep=free)}
+#ifdef HARD
+        {NAMED_UNIT 3 (Revenant) 22 45 () ( _ "Gate Guard") (upkeep=free)}
+#else
         {NAMED_UNIT 3 (Skeleton) 22 45 () ( _ "Gate Guard") (upkeep=free)}
-        {NAMED_UNIT 3 (Skeleton) 20 46 () ( _ "Gate Guard") (upkeep=free)}
+#endif
+
+        [store_unit]
+            [filter]
+                side=3
+                x=18-24
+                y=45-48
+            [/filter]
+
+            variable=guards
+        [/store_unit]
+
+        [foreach]
+            array=guards
+
+            [do]
+                [object]
+                    [filter]
+                        id=$this_item.id
+                    [/filter]
+                    silent=yes
+                    [effect]
+                        apply_to=movement_costs
+                        replace=yes
+                        [movement_costs]
+                            cave={UNREACHABLE}
+                            flat={UNREACHABLE}
+                        [/movement_costs]
+                    [/effect]
+                [/object]
+            [/do]
+        [/foreach]
+
+        {CLEAR_VARIABLE guards}
     [/event]
 
     # Event 6: Enter central cave

From b5760202f2f64f744b303b5502f806c18f8ecb9c Mon Sep 17 00:00:00 2001
From: DisherProject <pycchio@tiscali.it>
Date: Fri, 19 Apr 2019 13:54:18 +0200
Subject: [PATCH 11/16] UtBS: Add "Turns run out" objectives

Also make new objectives pop up when outlaw leader
is killed in S2
---
 .../scenarios/01_The_Morning_After.cfg                       | 2 ++
 .../scenarios/02_Across_the_Harsh_Sands.cfg                  | 5 +++++
 .../scenarios/04_Descending_into_Darkness.cfg                | 2 ++
 .../scenarios/05_A_Subterranean_Struggle.cfg                 | 1 +
 .../scenarios/06a_In_the_Tunnels_of_Trolls.cfg               | 2 ++
 .../scenarios/06b_In_the_Domain_of_Dwarves.cfg               | 2 ++
 .../scenarios/08_Out_of_the_Frying_Pan.cfg                   | 2 ++
 .../scenarios/09_Blood_is_Thicker_Than_Water.cfg             | 2 ++
 .../scenarios/11_Battle_for_Zocthanol_Isle.cfg               | 2 ++
 9 files changed, 20 insertions(+)

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
index a95fb75cf223..5c5b4b7cb7d9 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
@@ -163,6 +163,8 @@
                 [/show_if]
             [/objective]
 
+            {TURNS_RUN_OUT}
+
             [gold_carryover]
                 bonus=yes
                 carryover_percentage=40
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
index 4b0bc4ad783f..a9d71ada48fc 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
@@ -225,6 +225,8 @@
                 condition=lose
             [/objective]
 
+            {TURNS_RUN_OUT}
+
             [gold_carryover]
                 bonus=yes
                 carryover_percentage=40
@@ -1547,6 +1549,9 @@
             animate=no
             fire_event=no
         [/kill]
+
+        [show_objectives]
+        [/show_objectives]
     [/event]
 
     #if Kaleh moves to north edge of map but outlaw leader isn't defeated
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/04_Descending_into_Darkness.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/04_Descending_into_Darkness.cfg
index 91598c1d484c..fa1e13b8a236 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/04_Descending_into_Darkness.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/04_Descending_into_Darkness.cfg
@@ -213,6 +213,8 @@
                 condition=lose
             [/objective]
 
+            {TURNS_RUN_OUT}
+
             [gold_carryover]
                 bonus=yes
                 carryover_percentage=40
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
index b2f703cdfbd2..8ef8f5692a83 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
@@ -374,6 +374,7 @@
                 [/show_if]
             [/objective]
 
+            {TURNS_RUN_OUT}
 
             [gold_carryover]
                 bonus=yes
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
index 242a64ecd387..ede42da4770f 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
@@ -200,6 +200,8 @@ _ "These undead trolls fight again in death as they did in life, except this tim
                 condition=lose
             [/objective]
 
+            {TURNS_RUN_OUT}
+
             [gold_carryover]
                 bonus=yes
                 carryover_percentage=40
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
index f2974816aff5..fd17f39de0ef 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
@@ -241,6 +241,8 @@
                 condition=lose
             [/objective]
 
+            {TURNS_RUN_OUT}
+
             [gold_carryover]
                 bonus=yes
                 carryover_percentage=40
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
index 0103eb1afff3..6f40f87982a3 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
@@ -467,6 +467,8 @@
                 [/show_if]
             [/objective]
 
+            {TURNS_RUN_OUT}
+
             [note]
                 description= _  "The messenger is the leader of the special white colored units"
                 [show_if]
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
index ae876c7ce1e0..fdad520af3fe 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
@@ -358,6 +358,8 @@
                 condition=lose
             [/objective]
 
+            {TURNS_RUN_OUT}
+
             [gold_carryover]
                 bonus=yes
                 carryover_percentage=40
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg
index b6a864e851db..a2dadf2bbd68 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg
@@ -419,6 +419,8 @@
                 condition=lose
             [/objective]
 
+            {TURNS_RUN_OUT}
+
             [gold_carryover]
                 carryover_percentage=0
             [/gold_carryover]

From ce34428c87a2b6707087d922aa79728fde83779e Mon Sep 17 00:00:00 2001
From: DisherProject <pycchio@tiscali.it>
Date: Sat, 20 Apr 2019 18:40:13 +0200
Subject: [PATCH 12/16] UtBS S8: Delay flooding of the northern tunnel

---
 .../maps/08_Out_of_the_Frying_Pan.map              | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/data/campaigns/Under_the_Burning_Suns/maps/08_Out_of_the_Frying_Pan.map b/data/campaigns/Under_the_Burning_Suns/maps/08_Out_of_the_Frying_Pan.map
index aa93fc42fdc8..117b3b21c854 100644
--- a/data/campaigns/Under_the_Burning_Suns/maps/08_Out_of_the_Frying_Pan.map
+++ b/data/campaigns/Under_the_Burning_Suns/maps/08_Out_of_the_Frying_Pan.map
@@ -11,13 +11,13 @@ Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu,
 Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Md, Md, Hd, Hd, Dd, Dd, Dd, Dd, Dd, Dd, Rd, Dd, Dd, Hd, Hd, Hd, Hd, Hd, Md, Md, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md, Md, Hd, Md, Hd, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
 Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Md, Md, Md, Hd, Hd, Hd, Hd, Dd, Dd, Hd, Hd, Dd, Rd, Dd, Hd, Hd, Hd, Hd, Hd, Hd, Md, Md, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md, Md^Xm, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
 Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Mm^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Md, Md, Md, Hd, Hd, Hd, Hd, Dd, Dd, Hd, Hd, Hd, Rd, Dd, Hd, Hd, Hd, Hd, Hd, Hd, Md, Md, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Mm^Xm, Xu, Xu, Xu, Xu, Xu, Uu, Xu, Uu, Xu, Xu, Xu, Md, Md, Md, Hd, Hd, Hd, Hd, Dd, Hd, Hd, Hd, Hd, Hd, Dd, Hd, Hd, Dd, Hd, Hd, Hd, Md, Md, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Wo, Wwg, Xu, Re, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Mm^Xm, Mm^Xm, Uu, Uu, Uu, Xu, Uu, Xu, Uu, Xu, Xu, Xu, Md, Md, Md, Hd, Hd, Hd, Hd, Hd, Hd, Dd, Dd, Rd, Dd, Dd, Dd, Dd, Dd, Hd, Md, Md, Md, Md, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Wwg, Uh, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Mm^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Xu, Xu, Md, Md, Md, Hd, Hd, Hd, Dd, Dd, Dd, Hd, Hd, Rd, Hd, Hd, Dd, Dd, Hd, Hd, Md, Md, Md, Md, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Xu, Xu, Xu, Xu, Xu, Uu^Vud, Xu, Uu, Xu, Xu, Xu, Xu, Uu, Xu, Xu, Md, Md, Md, Hd, Hd, Hd, Dd, Dd, Hd, Hd, Dd, Rd, Rd, Hd, Hd, Hd, Hd, Md, Md, Md, Md, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Re, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Xu, Uu, Uu, Uu, Uu, Uu, Uu, Re, Xu, Xu, Xu, Xu, Uu, Uu, Xu, Md, Md, Dd, Hd, Dd, Dd, Dd, Dd, Hd, Hd, Hd, Dd, Dd, Rd, Dd, Hd^Edp, Hd, Hd, Hd, Hd, Md, Md, Md, Md^Xm, Md, Md, Md, Md^Xm, Md^Xm, Md^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Re, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Xu, Re, Re, Uu, Chr, Uu, Uu, Re, Re, Xu, Xu, Xu, Xu, Dd, Dd, Dd, Md, Dd, Hd, Hd, Hd, Hd, Hd, Hd, Hd, Dd, Dd, Rd, Rd, Dd, Dd, Hd, Hd, Hd, Md, Md, Md, Md, Md, Md, Md, Md, Md^Xm, Md^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
-Xu, Xu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Khr, Chr, Uu, Uu, Uu, Uu^Vud, Xu, Xu, Md, Md, Md, Md, Md, Hd, Hd, Hd, Dd^Vdt, Hd, Hd, Hd, Hd, Hd, Rd^Edp, Rd, Dd^Vdt, Rd, Rd, Dd^Edp, Hd, Hd, Hd, Hd, Hd, Md, Md, Md, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Uu, Xu, Uu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Mm^Xm, Xu, Xu, Xu, Xu, Xu, Uu, Xu, Uu, Xu, Xu, Xu, Md, Md, Md, Hd, Hd, Hd, Hd, Dd, Hd, Hd, Hd, Hd, Hd, Dd, Hd, Hd, Dd, Hd, Hd, Hd, Md, Md, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Wo, Wwg, Xu, Re, Xu, Xu, Uh, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Mm^Xm, Mm^Xm, Uu, Uu, Uu, Xu, Uu, Xu, Uu, Xu, Xu, Xu, Md, Md, Md, Hd, Hd, Hd, Hd, Hd, Hd, Dd, Dd, Rd, Dd, Dd, Dd, Dd, Dd, Hd, Md, Md, Md, Md, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Wwg, Uh, Uu, Xu, Xu, Xu, Uu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Uu, Mm^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Xu, Xu, Md, Md, Md, Hd, Hd, Hd, Dd, Dd, Dd, Hd, Hd, Rd, Hd, Hd, Dd, Dd, Hd, Hd, Md, Md, Md, Md, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Xu, Xu, Xu, Xu, Uu^Uf, Uu, Xu, Xu, Xu, Xu, Uu, Xu, Xu, Xu, Xu, Xu, Uu^Vud, Xu, Uu, Xu, Xu, Xu, Xu, Uu, Xu, Xu, Md, Md, Md, Hd, Hd, Hd, Dd, Dd, Hd, Hd, Dd, Rd, Rd, Hd, Hd, Hd, Hd, Md, Md, Md, Md, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Md^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Xu, Xu, Re, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Xu, Uu, Uu, Uu, Uu, Uu, Uu, Re, Xu, Xu, Xu, Xu, Uu, Uu, Xu, Md, Md, Dd, Hd, Dd, Dd, Dd, Dd, Hd, Hd, Hd, Dd, Dd, Rd, Dd, Hd^Edp, Hd, Hd, Hd, Hd, Md, Md, Md, Md^Xm, Md, Md, Md, Md^Xm, Md^Xm, Md^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Xu, Xu, Re, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Xu, Re, Re, Uu, Chr, Uu, Uu, Re, Re, Xu, Xu, Xu, Xu, Dd, Dd, Dd, Md, Dd, Hd, Hd, Hd, Hd, Hd, Hd, Hd, Dd, Dd, Rd, Rd, Dd, Dd, Hd, Hd, Hd, Md, Md, Md, Md, Md, Md, Md, Md, Md^Xm, Md^Xm, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
+Xu, Xu, Uh, Xu, Uu, Xu, Xu, Xu, Xu, Xu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Khr, Chr, Uu, Uu, Uu, Uu^Vud, Xu, Xu, Md, Md, Md, Md, Md, Hd, Hd, Hd, Dd^Vdt, Hd, Hd, Hd, Hd, Hd, Rd^Edp, Rd, Dd^Vdt, Rd, Rd, Dd^Edp, Hd, Hd, Hd, Hd, Hd, Md, Md, Md, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
 Xu, Xu, Uu^Uf, Uu^Uf, Uu, Xu, Xu, Xu, Xu, Uu, Uu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Chr, Re, Uu, Uu, Uu, Re, Xu, Md, Md, Md, Md, Hd, Hd, Hd, Hd, Hd, Hd, Hd, Hd, Dd, Dd, Rd, Gs^Edp, Wwt, Gs, Gs^Edp, Rd, Rd, Dd^Vdt, Rd, Hd, Hd, Hd, Hd, Md, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
 Xu, Xu, Uu^Uf, Xu, Uu, Xu, Xu, Xu, Uh, Uu, Uu, Uh, Uu, Xu, Xu, Xu, Xu, Uu, Uu, Uu, Uu^Vud, Re, Uu, Uu, Md, Md, Md, Md, Md, Md, Hd, Hd, Hd, Hd^Edp, Hd, Hd, Dd, Dd, Dd^Edp, Rd, Gs, Gs, Wwt, Wwt, Gs, Rd, Hd, Rd, Hd, Rd, Rd, Hd, Hd, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu
 Xu, Xu, Uu, Xu, Xu, Re, Xos, Xos, Xos, Uu, Uu, Uu, Re, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uu, Re, Md, Md, Hd, Hd, Hd, Hd, Dd^Vdt, Hd, Hd, Hd, Dd, Hd, Dd, Dd, Dd^Edp, Dd, Dd, Rd, Rd, Dd^Vdt, Gs, Wwt, Gs, Rd^Edp, Hd, Hd, Hd, Dd^Vdt, Rd, Hd, Hd, Md, Md, Md, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu

From af92c8587acc4be2377916ad10d0a6f85ba94f2e Mon Sep 17 00:00:00 2001
From: DisherProject <pycchio@tiscali.it>
Date: Sat, 20 Apr 2019 18:53:01 +0200
Subject: [PATCH 13/16] UtBS S5: Don't share vision with side 2

---
 .../scenarios/05_A_Subterranean_Struggle.cfg                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
index 8ef8f5692a83..2746af8d7ff0 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
@@ -41,7 +41,7 @@
         gold=0
         income=0
         controller=ai
-        shroud=yes
+        shroud=no
         fog=no
         hidden=yes
         team_name=trolls

From b45ff18968d7ffaf11154ba98f463abd0564d3e1 Mon Sep 17 00:00:00 2001
From: DisherProject <pycchio@tiscali.it>
Date: Sat, 20 Apr 2019 19:10:29 +0200
Subject: [PATCH 14/16] UtBS S6b: Fix locations where tentacles can appear

---
 .../scenarios/06b_In_the_Domain_of_Dwarves.cfg                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
index fd17f39de0ef..6b0d782c6346 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
@@ -1272,7 +1272,7 @@
         [/filter_condition]
 
         [store_locations]
-            x=28-31
+            x=27-30
             y=13-17
             terrain=Ww*, Wo*
             [filter]

From 5c8152d467498cd9c390efe85c7d9485976ba7a8 Mon Sep 17 00:00:00 2001
From: DisherProject <pycchio@tiscali.it>
Date: Sat, 20 Apr 2019 19:24:50 +0200
Subject: [PATCH 15/16] UtBS S6b: Make dwarves speak when the wall is destroyed

---
 .../scenarios/06b_In_the_Domain_of_Dwarves.cfg                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
index 6b0d782c6346..5f04e9eccea5 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
@@ -474,7 +474,7 @@
             {NAMED_NOTRAIT_UNIT 2 (Dwarvish Thunderer) 21 34 (Dwarf Guard) ( _ "Dwarf Guard")}
             {NAMED_NOTRAIT_UNIT 2 (Dwarvish Thunderer) 23 34 () ( _ "Dwarf Guard")}
 #else
-            {NAMED_NOTRAIT_UNIT 2 (Dwarvish Thunderguard) 21 34 () ( _ "Dwarf Guard")}
+            {NAMED_NOTRAIT_UNIT 2 (Dwarvish Thunderguard) 21 34 (Dwarf Guard) ( _ "Dwarf Guard")}
             {NAMED_NOTRAIT_UNIT 2 (Dwarvish Thunderguard) 23 34 () ( _ "Dwarf Guard")}
 #endif
 

From 057bbeca48d34839df1b52db9d2638270dd4ea9b Mon Sep 17 00:00:00 2001
From: DisherProject <pycchio@tiscali.it>
Date: Sat, 20 Apr 2019 19:33:13 +0200
Subject: [PATCH 16/16] UtBS S6b: Give Zurg no traits

---
 .../scenarios/06b_In_the_Domain_of_Dwarves.cfg     | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
index 5f04e9eccea5..6ed07fc55a3b 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
@@ -332,19 +332,7 @@
         [/unit]
 
         #Troll ally shaman, doesn't move
-        [unit]
-            type=Troll Shaman
-            id=Zurg
-            name= _ "Zurg"
-            x=33
-            y=30
-            side=3
-            ai_special=guardian
-            [modifications]
-                {TRAIT_STRONG}
-                {TRAIT_RESILIENT}
-            [/modifications]
-        [/unit]
+        {NAMED_NOTRAIT_UNIT 3 (Troll Shaman) 33 30 (Zurg) ( _ "Zurg")} {GUARDIAN}
 
         # Event 3: Tunnel cave-ins