Merge pull request #4022 from DisherProject/wesnoth-UtBS

UtBS: few more fixes after refactor
wesnoth · Apr 21, 2019 · 0a0cbb5 · 0a0cbb5
2 parents 266b8a9 + 057bbec
commit 0a0cbb5
Show file tree

Hide file tree

Showing 16 changed files with 675 additions and 844 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
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
@@ -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
@@ -155,6 +163,8 @@
                 [/show_if]
             [/objective]
 
+            {TURNS_RUN_OUT}
+
             [gold_carryover]
                 bonus=yes
                 carryover_percentage=40
@@ -1126,54 +1136,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
@@ -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
@@ -217,6 +225,8 @@
                 condition=lose
             [/objective]
 
+            {TURNS_RUN_OUT}
+
             [gold_carryover]
                 bonus=yes
                 carryover_percentage=40
@@ -1153,21 +1163,14 @@
         [if]
             [have_unit]
                 side=1
-                x=28-40
+                x=28-39
                 y=22-33
                 [filter_location]
                     [not]
                         time_of_day=lawful
                     [/not]
                 [/filter_location]
             [/have_unit]
-            [or]
-                [have_unit]
-                    x=27-37
-                    y=30-33
-                    side=1
-                [/have_unit]
-            [/or]
 
             #!***Do wraith event***
             [then]
@@ -1354,40 +1357,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 +1377,9 @@
             {INCOME 9 11 13}
             {GOLD 100 125 150}
         [/modify_side]
+
+        [show_objectives]
+        [/show_objectives]
     [/event]
 
     #Encounter 7 Mirage
@@ -1418,12 +1390,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
@@ -1580,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
@@ -1778,15 +1750,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}