From 3f365015111c0b05db63174e15d80ffc7db8df4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Severin=20Gl=C3=B6ckner?=
 <severin.gloeckner@stud.htwk-leipzig.de>
Date: Fri, 20 Jul 2018 02:41:18 +0200
Subject: [PATCH] TSG S2: fix issues with killing the bandit leader first
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- The peasants told Deoran to go for the already defeated bandit leader.
- The pesants were useless at that time - they are now instead spawned when
  defeating the bandit leader or when Deoran arrives, whatever happens first.
  They may still have a fight with remaining bandits – or provoke their attack.
- The dialogue when reaching the citadel after having defeated the bandits got a
  slight change, to better switch to the victory dance event.

(issue #1954)

[ci skip]

(cherry-picked from commit 0c5467c28a3ca2e6be2bd2cb72e5c9266d91a3d4)
---
 .../scenarios/02_Proven_by_the_Sword.cfg      | 67 ++++++++++++++-----
 1 file changed, 52 insertions(+), 15 deletions(-)

diff --git a/data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg b/data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
index 25041240a14a..f2d9a2f2a126 100644
--- a/data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
+++ b/data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
@@ -336,27 +336,28 @@
             speaker=Minister Hylas
             message= _ "Alas, Sir Loris will find no relief now. He is buried northwest of the city where he fell. For weeks we warned him of the new power of these bandits. And yet he would never lead his men against them until their strength had waxed and ours waned."
         [/message]
-        [message]
-            speaker=Deoran
-            image=portraits/deoran-sad.png
-            message= _ "It grieves me to learn of his death, foolish though he may have been! Now, though, there are more pressing matters. Rise, men of Wesnoth! We must drive these bandits from our city!"
-        [/message]
-
-        {NAMED_LOYAL_UNIT 1 Peasant 18 15 (Ufes) (_"Ufes")}
-        {NAMED_LOYAL_UNIT 1 Peasant 18 16 (Joran) (_"Joran")}
-        {NAMED_LOYAL_UNIT 1 Peasant 19 18 (Makees) (_"Makees")}
-        {NAMED_LOYAL_UNIT 1 Peasant 20 18 (Tyborg) (_"Tyborg")}
-
-        [message]
-            speaker=Ufes
-            message= _ "We will do our best to hold the city — you lead your men across the river and kill the bandit leader!"
-        [/message]
 
         [if]
             [have_unit]
                 id=Urza Nalmath
             [/have_unit]
             [then]
+                [message]
+                    speaker=Deoran
+                    image=portraits/deoran-sad.png
+                    message= _ "It grieves me to learn of his death, foolish though he may have been! Now, though, there are more pressing matters. Rise, men of Wesnoth! We must drive these bandits from our city!"
+                [/message]
+
+                {NAMED_LOYAL_UNIT 1 Peasant 18 15 (Ufes) (_"Ufes")}
+                {NAMED_LOYAL_UNIT 1 Peasant 18 16 (Joran) (_"Joran")}
+                {NAMED_LOYAL_UNIT 1 Peasant 19 18 (Makees) (_"Makees")}
+                {NAMED_LOYAL_UNIT 1 Peasant 20 18 (Tyborg) (_"Tyborg")}
+
+                [message]
+                    speaker=Ufes
+                    message= _ "We will do our best to hold the city — you lead your men across the river and kill the bandit leader!"
+                [/message]
+
                 [show_objectives][/show_objectives]
 
                 [set_recruit]
@@ -386,6 +387,12 @@
                 [/gold]
             [/then]
             [else]
+                [message]
+                    speaker=Deoran
+                    image=portraits/deoran-sad.png
+                    message= _ "It grieves me to learn of his death, foolish though he may have been! At least we managed to defeat some of these bandits here and now. What else happened?"
+                [/message]
+                # Peasants have already been spawned.
                 [fire_event]
                     name=victory dance
                 [/fire_event]
@@ -598,6 +605,35 @@
                     name=victory dance
                 [/fire_event]
             [/then]
+            [else]
+                {NAMED_LOYAL_UNIT 1 Peasant 18 15 (Ufes) (_"Ufes")}
+                {NAMED_LOYAL_UNIT 1 Peasant 18 16 (Joran) (_"Joran")}
+                {NAMED_LOYAL_UNIT 1 Peasant 19 18 (Makees) (_"Makees")}
+                {NAMED_LOYAL_UNIT 1 Peasant 20 18 (Tyborg) (_"Tyborg")}
+                [message]
+                    speaker=Ufes
+                    message= _ "The bandits are defeated!"
+                [/message]
+                [if]
+                    [have_unit]
+                        side=2
+                        count=0-2
+                    [/have_unit]
+                    [then]
+                        [message]
+                            speaker=Makees
+                            message= _ "Westin is safe again."
+                        [/message]
+                    [/then]
+                    [else]
+                        [message]
+                            speaker=Makees
+                            message= _ "Westin will soon be safe again."
+                        [/message]
+                    [/else]
+                [/if]
+                [show_objectives][/show_objectives]
+            [/else]
         [/if]
     [/event]
 
@@ -646,6 +682,7 @@
 
     [event]
         name=victory
+
         [disallow_recruit]
             type=Peasant
             side=1