Author: zookeeper
Date: Mon Sep 22 10:46:03 2008
New Revision: 29636

URL: http://svn.gna.org/viewcvs/wesnoth?rev=29636&view=rev
Log:
A couple of WML cleanups and a typo fix.

Modified:
    trunk/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
    
trunk/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
    trunk/data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg?rev=29636&r1=29635&r2=29636&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg 
(original)
+++ trunk/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg 
Mon Sep 22 10:46:03 2008
@@ -467,6 +467,13 @@
                 condition=win
                 description=_ "Bring the book back to Malin's castle"
             [/objective]
+            [objective]
+                condition=lose
+                description=_ "Death of Malin Keshar"
+            [/objective]
+
+            note= _ "No early finish bonus." + "
+20%" + _" of finishing gold carried over to the next scenario."
         [/objectives]
 
         [message]

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg?rev=29636&r1=29635&r2=29636&view=diff
==============================================================================
--- 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
 (original)
+++ 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
 Mon Sep 22 10:46:03 2008
@@ -120,17 +120,6 @@
         shroud=yes
     [/side]
 
-    [side]
-        # mirror
-        side=6
-        colour=black
-        controller=ai
-        no_leader=yes
-        ai_algorithm=idle_ai
-        fog=yes
-        shroud=yes
-    [/side]
-
     [event]
         name=prestart
 
@@ -343,6 +332,8 @@
             animate=yes
         [/kill]
 
+        {PUT_TO_RECALL_LIST (role=advisor)}
+
         {FADE_TO_BLACK}
 
         [redraw]
@@ -527,7 +518,7 @@
 
         [message]
             speaker=Mal Keshar
-            message=_ " Yes, this will do until I can take my new home."
+            message=_ "Yes, this will do until I can take my new home."
         [/message]
 
         [objectives]
@@ -546,8 +537,8 @@
         [/objectives]
 
         # Turns are measured from here
-        {VARIABLE_OP totalTurns to_variable turn_number}
-        {VARIABLE_OP totalTurns add 50}
+        {VARIABLE totalTurns 50}
+        {VARIABLE_OP totalTurns add $turn_number}
         [modify_turns]
             value=$totalTurns
         [/modify_turns]
@@ -585,15 +576,10 @@
                 equals=5
             [/variable]
 
-            [not]
-                [have_unit]
-                    id=Dumdumbadoom
-
-                    [filter_vision]
-                        viewing_side=1
-                    [/filter_vision]
-                [/have_unit]
-            [/not]
+            [variable]
+                name=wose_awakened
+                not_equals=yes
+            [/variable]
 
             [then]
                 {MODIFY_UNIT id=Dumdumbadoom moves 0}
@@ -618,6 +604,8 @@
             speaker=Dumdumbadoom
             message=_ "Who has awoken me from my slumber? Undead? I shall not 
suffer the existence of such foul creatures."
         [/message]
+
+        {VARIABLE wose_awakened yes}
     [/event]
 
     [event]

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg?rev=29636&r1=29635&r2=29636&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg 
(original)
+++ trunk/data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg 
Mon Sep 22 10:46:03 2008
@@ -364,7 +364,7 @@
                 [/message]
                 [message]
                     speaker=Foolish Hero
-                    message=_ "Nothing will stop me from taking revenge for my 
father who died at your hand and for the rest of my people you and your minions 
have killed, Lich. Orcs, attack! The one who brings me his scull gets a bag of 
gold."
+                    message=_ "Nothing will stop me from taking revenge for my 
father who died at your hand and for the rest of my people you and your minions 
have killed, Lich. Orcs, attack! The one who brings me his skull gets a bag of 
gold."
                 [/message]
             [/then]
         [/if]


_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits

Reply via email to