From ba7728c7834e87206915cf30db9bb4509df8e5ab Mon Sep 17 00:00:00 2001
From: Thom Diment <mr.diment@gmail.com>
Date: Mon, 11 Jun 2018 13:40:47 +0100
Subject: [PATCH] DW 5 Tirigaz - Changes to orc leader death event

Fixes #3092 - Updates objectives if orc leader is killed first, and gives additional dialogue
Fixes #3903 - Gold event doesn't fire if ghosts kill the orc leader

[ci skip]
---
 .../Dead_Water/scenarios/05_Tirigaz.cfg       | 63 +++++++++++++------
 1 file changed, 43 insertions(+), 20 deletions(-)

diff --git a/data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg b/data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg
index 97281fe471c0..d85b393399ef 100644
--- a/data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg
+++ b/data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg
@@ -67,11 +67,16 @@
                 condition=win
             [/objective]
             [objective]
+                [show_if]
+                    [have_unit]
+                        side=2
+                        canrecruit=yes
+                    [/have_unit]
+                [/show_if]
                 {BONUS_OBJECTIVE_CAPTION}
                 description= _ "Also kill Marg-Tonz"+{EARLY_FINISH_BONUS_FOOTNOTE}+{OBJECTIVE_FOOTNOTE _"(you can destroy the undead first)"}
                 condition=win
             [/objective]
-
             [gold_carryover]
                 carryover_percentage=40
             [/gold_carryover]
@@ -696,38 +701,51 @@
         [filter]
             id=Marg-Tonz
         [/filter]
-
-        # The chest looks better when it's offset 10px to the north
-        [item]
-            x,y=$x1,$y1
-            image=misc/blank-hex.png~BLIT(items/chest-open.png~CROP(0,10,72,62),0,0)
-        [/item]
-
         [if]
             [have_unit]
                 x,y=$x2,$y2
-                race=bats
+                side=1
             [/have_unit]
 
             [then]
-                [message]
-                    speaker=second_unit
-                    message= _ "Neep, neep!"
-                [/message]
+                # The chest looks better when it's offset 10px to the north
+                [item]
+                    x,y=$x1,$y1
+                    image=misc/blank-hex.png~BLIT(items/chest-open.png~CROP(0,10,72,62),0,0)
+                [/item]
+        
+                [if]
+                    [have_unit]
+                        x,y=$x2,$y2
+                        race=bats
+                    [/have_unit]
 
-                [message]
-                    speaker=Kai Krellis
-                    message= _ "It seems that orc was rich! He has a chest here with over 100 pieces of gold!"
-                [/message]
+                    [then]
+                        [message]
+                            speaker=second_unit
+                            message= _ "Neep, neep!"
+                        [/message]
+
+                        [message]
+                            speaker=Kai Krellis
+                            message= _ "It seems that orc was rich! He has a chest here with over 100 pieces of gold!"
+                        [/message]
+                    [/then]
+                    [else]
+                        [message]
+                            speaker=second_unit
+                            message= _ "It seems that orc was rich! He has a chest here with over 100 pieces of gold!"
+                        [/message]
+                    [/else]
+                [/if]
             [/then]
             [else]
                 [message]
-                    speaker=second_unit
-                    message= _ "It seems that orc was rich! He has a chest here with over 100 pieces of gold!"
+                    speaker=Kai Krellis
+                    message= _ "Now we must defeat the undead."
                 [/message]
             [/else]
         [/if]
-
         [sound]
             name=gold.ogg
         [/sound]
@@ -748,6 +766,11 @@
                     {NEW_GOLD_CARRYOVER 40}
                 [/endlevel]
             [/then]
+
+            [else]
+                [show_objectives]
+                [/show_objectives]
+            [/else]
         [/if]
     [/event]