TSG: handle the case Hylas / Gerrick died

[ci skip]
wesnoth · Oct 12, 2019 · 1d22a9a · 1d22a9a
1 parent e99cd5a
commit 1d22a9a
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 4 deletions.
diff --git a/data/campaigns/The_South_Guard/scenarios/06a_Into_the_Depths.cfg b/data/campaigns/The_South_Guard/scenarios/06a_Into_the_Depths.cfg
@@ -729,8 +729,31 @@
             name=magic-dark-big.ogg
         [/sound]
 
-        [message]
-            speaker=Minister Hylas
+        # Hylas may not be alive anymore
+        [role]
+            role=smartcombatant
+            id=Minister Hylas
+            [else]
+                [role]
+                    role=smartcombatant
+                    search_recall_list=no
+                    type=Elvish Sylph,Elvish Enchantress,Elvish Sorceress,Elvish Shyde,Elvish Druid,Elvish Shaman
+                    [not]
+                        id=Ethiliel
+                    [/not]
+                    [else]
+                        [role]
+                            role=smartcombatant
+                            search_recall_list=no
+                            side=1
+                        [/role]
+                    [/else]
+                [/role]
+             [/else]
+        [/role]
+
+        [message]
+            role=smartcombatant
             message= _ "I feel the touch of dark magic. This is quite a powerful spell — the very air feels thick and heavy."
         [/message]
         [message]
@@ -761,8 +784,24 @@
             name=magic-dark-big.ogg
         [/sound]
 
+        # Gerrick may be dead
+        [role]
+            role=soldier
+            id=Sir Gerrick
+            [else]
+                [role]
+                    role=soldier
+                    search_recall_list=no
+                    side=1
+                    [not]
+                        type_adv_tree=Elvish Shaman
+                    [/not]
+                [/role]
+            [/else]
+        [/role]
+
         [message]
-            speaker=Sir Gerrick
+            role=soldier
             message= _ "I feel so weary... I can hardly grasp my weapon anymore..."
         [/message]
     [/event]

diff --git a/data/campaigns/The_South_Guard/scenarios/08a_Vengeance.cfg b/data/campaigns/The_South_Guard/scenarios/08a_Vengeance.cfg
@@ -219,8 +219,25 @@
             green=0
             blue=0
         [/color_adjust]
+        # Gerrick may be dead
+        [role]
+            role=observant
+            id=Sir Gerrick
+            [else]
+                [role]
+                    role=observant
+                    id=Minister Hylas
+                    [else]
+                        [role]
+                            role=observant
+                            id=Deoran
+                        [/role]
+                    [/else]
+                [/role]
+            [/else]
+        [/role]
         [message]
-            speaker=Sir Gerrick
+            role=observant
             message= _ "He just killed that innocent farmer! We must stop him!"
         [/message]
         [message]