mail[Wesnoth-commits] r24651 - in /trunk/data/campaigns/Eastern_Invasion/scenarios: 18a.The_Duel.cfg 19_Epilog.cfg


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by esr on March 14, 2008 - 21:57:
Author: esr
Date: Fri Mar 14 21:57:36 2008
New Revision: 24651

URL: http://svn.gna.org/viewcvs/wesnoth?rev=24651&view=rev
Log:
Better fix for bug #11241.  TWeak Epilog dialog so it still flows if
Dacyn and Owaec or both are dead. (Yes, dfranke, you were right.)

Modified:
    trunk/data/campaigns/Eastern_Invasion/scenarios/18a.The_Duel.cfg
    trunk/data/campaigns/Eastern_Invasion/scenarios/19_Epilog.cfg

Modified: trunk/data/campaigns/Eastern_Invasion/scenarios/18a.The_Duel.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Eastern_Invasion/scenarios/18a.The_Duel.cfg?rev=24651&r1=24650&r2=24651&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/scenarios/18a.The_Duel.cfg 
(original)
+++ trunk/data/campaigns/Eastern_Invasion/scenarios/18a.The_Duel.cfg Fri Mar 
14 21:57:36 2008
@@ -50,20 +50,6 @@
 
     [event]
         name=start
-               # Fix 11242, remove Owaec and Dacyn from recall list for the 
duration of the duel
-               # wmllint: recognize Owaec
-               # wmllint: recognize Dacyn
-               [store_unit]
-                       [filter]
-                               id=Owaec
-                               [or]
-                                       id=Dacyn
-                               [/or]
-                       [/filter]
-                       kill=yes
-                       fire_event=no
-                       variable=hero_removed
-               [/store_unit]
                                
         [message]
             speaker=Mal-Ravanal
@@ -149,12 +135,6 @@
             profile=portraits/mal-ravanal.png
             message= _ "I... lose?..."
         [/message]
-               {FOREACH hero_removed i}
-                       [unstore_unit]
-                               variable=hero_removed[$i]
-                       [/unstore_unit]
-               {NEXT i}
-               {CLEAR_VARIABLE hero_removed}
         [endlevel]
             result=victory
         [/endlevel]

Modified: trunk/data/campaigns/Eastern_Invasion/scenarios/19_Epilog.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Eastern_Invasion/scenarios/19_Epilog.cfg?rev=24651&r1=24650&r2=24651&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/scenarios/19_Epilog.cfg (original)
+++ trunk/data/campaigns/Eastern_Invasion/scenarios/19_Epilog.cfg Fri Mar 14 
21:57:36 2008
@@ -87,91 +87,131 @@
             message= _ "So many months of fighting...I feel as though I am 
awakening from a long nightmare."
         [/message]
 
-        [message]
-            speaker=Dacyn
-            message= _ "Nor is our work yet complete. Mal-Ravanal's main 
host has been broken, but its outriders ravage the countryside in all 
directions."
-        [/message]
+        [if]
+            [have_unit]
+                id=Dacyn
+            [/have_unit]
+            [then]
+                [message]
+                    speaker=Dacyn
+                    message= _ "Nor is our work yet complete. Mal-Ravanal's 
main host has been broken, but its outriders ravage the countryside in all 
directions."
+                [/message]
+            [/then]
+        [/if]
 
         [message]
             speaker=Konrad II
             message= _ "We will be years...perhaps decades...recovering from 
the ill he has wrought."
         [/message]
 
-        [message]
-            speaker=Owaec
-            message= _ "Even now we should be sending our cavalry to harry 
and slay as many of the fleeing orcs as we can."
-        [/message]
+        [if]
+            [have_unit]
+                id=Owaec
+            [/have_unit]
+            [then]
+                [message]
+                    speaker=Owaec
+                    message= _ "Even now we should be sending our cavalry to 
harry and slay as many of the fleeing orcs as we can."
+                [/message]
+            [/then]
+            [else]
+                [message]
+                    speaker=Gweddry
+                    message= _ "Even now we should be sending our troops to 
harry and slay as many of the fleeing orcs as we can."
+                [/message]
+            [/else]
+        [/if]
 
         [message]
             speaker=Konrad II
             message= _ "It shall be so. But it is also to be thought that 
you three have served Us, and Our Kingdom, full well. We are minded to reward 
you."
         [/message]
 
-        [message]
-            speaker=Konrad II
-            message= _ "Dacyn. You will remain by Our side, here; as you 
counseled these two in war, you shall counsel Us in peace and the rebuilding 
of the Kingdom."
-        [/message]
-
-        {MOVE_UNIT id=Dacyn 8 8}       # Move Dacyn to vacant throne
+        [if]
+            [have_unit]
+                id=Dacyn
+            [/have_unit]
+            [then]
+                [message]
+                    speaker=Konrad II
+                    message= _ "Dacyn. You will remain by Our side, here; as 
you counseled these two in war, you shall counsel Us in peace and the 
rebuilding of the Kingdom."
+                [/message]
+
+                {MOVE_UNIT id=Dacyn 8 8}       # Move Dacyn to vacant throne
+            [/then]
+        [/if]
 
         [message]
             speaker=Gweddry
             message= _ "Sire, we but did our duty."
         [/message]
 
-        [message]
-            speaker=Konrad II
-            message= _ "Quite. Now do not interrupt while I am doing 
mine...kneel, Owaec."
-        [/message]
-
-        {MOVE_UNIT id=Owaec 10 8}
-
-        [message]
-            speaker=Konrad II
-            message= _ "Arise, Owaec, Knight Commander of the King's Horse. 
And take as Our first command to you your own wish; go from here, harry and 
destroy the enemy in their flight until the fields of Weldyn become a byword 
for fear at which the orcs will tremble for generations."
-        [/message]
-
-        [kill]
-            id=Owaec
-        [/kill]
-        [sound]
-            name=horse-canter.wav
-        [/sound]
-        [move_unit_fake]
-            type=Horse Lord
-            side=1
-            x=10,11
-            y=8,9
-        [/move_unit_fake]
-        [delay]
-            time=1000  # Enough time for Owaec's new outfit to register.
-        [/delay]
-        [sound]
-            name=horse-canter.wav
-        [/sound]
-        [move_unit_fake]
-            type=Horse Lord
-            side=1
-            x=11,10
-            y=9,20
-        [/move_unit_fake]
-        [delay]
-            time=500   # Force pause so unit move won't be optimized away
-        [/delay]
-        [sound]
-            name=horse-canter.wav
-        [/sound]
-        [move_unit_fake]
-            type=Horse Lord
-            side=1
-            x=10,10
-            y=20,23
-        [/move_unit_fake]
-
-        [message]
-            speaker=Konrad II
-            message= _ "Kneel, Gweddry."
-        [/message]
+        [if]
+            [have_unit]
+                id=Owaec
+            [/have_unit]
+            [then]
+                [message]
+                    speaker=Konrad II
+                    message= _ "Quite. Now do not interrupt while I am doing 
mine...kneel, Owaec."
+                [/message]
+
+                {MOVE_UNIT id=Owaec 10 8}
+
+                [message]
+                    speaker=Konrad II
+                    message= _ "Arise, Owaec, Knight Commander of the King's 
Horse. And take as Our first command to you your own wish; go from here, 
harry and destroy the enemy in their flight until the fields of Weldyn become 
a byword for fear at which the orcs will tremble for generations."
+                [/message]
+
+                [kill]
+                    id=Owaec
+                [/kill]
+                [sound]
+                    name=horse-canter.wav
+                [/sound]
+                [move_unit_fake]
+                    type=Horse Lord
+                    side=1
+                    x=10,11
+                    y=8,9
+                [/move_unit_fake]
+                [delay]
+                    time=1000  # Enough time for Owaec's new outfit to 
register.
+                [/delay]
+                [sound]
+                    name=horse-canter.wav
+                [/sound]
+                [move_unit_fake]
+                    type=Horse Lord
+                    side=1
+                    x=11,10
+                    y=9,20
+                [/move_unit_fake]
+                [delay]
+                    time=500   # Force pause so unit move won't be optimized 
away
+                [/delay]
+                [sound]
+                    name=horse-canter.wav
+                [/sound]
+                [move_unit_fake]
+                    type=Horse Lord
+                    side=1
+                    x=10,10
+                    y=20,23
+                [/move_unit_fake]
+
+                [message]
+                    speaker=Konrad II
+                    message= _ "Kneel, Gweddry."
+                [/message]
+            [/then]
+            [else]
+                [message]
+                    speaker=Konrad II
+                    message= _ "Quite. Now do not interrupt while I am doing 
mine...kneel, Gweddry."
+                [/message]
+            [/else]
+        [/if]
 
         {MOVE_UNIT id=Gweddry 10 8}
 




Related Messages


Powered by MHonArc, Updated Fri Mar 14 23:02:12 2008