Author: esr
Date: Mon Apr 20 06:10:16 2009
New Revision: 35076

URL: http://svn.gna.org/viewcvs/wesnoth?rev=35076&view=rev
Log:
Ficx a logic bug and bring the walkthrough up to date.

Modified:
    trunk/data/campaigns/Delfadors_Memoirs/WALKTHROUGH
    trunk/data/campaigns/Delfadors_Memoirs/scenarios/11_wasteland.cfg
    
trunk/data/campaigns/Delfadors_Memoirs/scenarios/19_showdown_in_the_northern_swamp.cfg
    trunk/data/campaigns/Delfadors_Memoirs/scenarios/20_prince_of_wesnoth.cfg
    trunk/data/campaigns/Delfadors_Memoirs/scenarios/21_clash_at_the_manor.cfg
    trunk/data/campaigns/Delfadors_Memoirs/utils/sides.cfg

Modified: trunk/data/campaigns/Delfadors_Memoirs/WALKTHROUGH
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/WALKTHROUGH?rev=35076&r1=35075&r2=35076&view=diff
==============================================================================
--- trunk/data/campaigns/Delfadors_Memoirs/WALKTHROUGH (original)
+++ trunk/data/campaigns/Delfadors_Memoirs/WALKTHROUGH Mon Apr 20 06:10:16 2009
@@ -254,3 +254,15 @@
 
 Clash at the Manor
 ==================
+
+You need to have blocking forces between the keep and both signposts 
+to keep messengers from escaping. Keep a mobil reserve in the woods 
+between them to be committed when it becomes clear which gate the
+Queen's men will come out of.
+
+The Face Of The Enemy
+=====================
+
+As Kalenz says, use strong units to block chokepoints so you can't be flanked.
+Othrwise this is fairly straightforward.
+ 

Modified: trunk/data/campaigns/Delfadors_Memoirs/scenarios/11_wasteland.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/scenarios/11_wasteland.cfg?rev=35076&r1=35075&r2=35076&view=diff
==============================================================================
--- trunk/data/campaigns/Delfadors_Memoirs/scenarios/11_wasteland.cfg (original)
+++ trunk/data/campaigns/Delfadors_Memoirs/scenarios/11_wasteland.cfg Mon Apr 
20 06:10:16 2009
@@ -66,7 +66,7 @@
     #############################
     [event]
         name=prestart
-        {DISCARD_UNDEAD_VETERANS}
+        {SAVE_UNDEAD_VETERANS}
         {TELEPORT_UNIT id=Delfador 33 20}
     [/event]
 

Modified: 
trunk/data/campaigns/Delfadors_Memoirs/scenarios/19_showdown_in_the_northern_swamp.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/scenarios/19_showdown_in_the_northern_swamp.cfg?rev=35076&r1=35075&r2=35076&view=diff
==============================================================================
--- 
trunk/data/campaigns/Delfadors_Memoirs/scenarios/19_showdown_in_the_northern_swamp.cfg
 (original)
+++ 
trunk/data/campaigns/Delfadors_Memoirs/scenarios/19_showdown_in_the_northern_swamp.cfg
 Mon Apr 20 06:10:16 2009
@@ -196,10 +196,7 @@
             message= _ "One of us will find a final death here. I do not think 
it will be me."
         [/message]
         [if]
-            [filter]
-                side=1
-                race=undead
-            [/filter]
+            {HAVE_UNDEAD_VETERANS}
             [then]
                 [set_variable]
                     name=undead_veterans

Modified: 
trunk/data/campaigns/Delfadors_Memoirs/scenarios/20_prince_of_wesnoth.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/scenarios/20_prince_of_wesnoth.cfg?rev=35076&r1=35075&r2=35076&view=diff
==============================================================================
--- trunk/data/campaigns/Delfadors_Memoirs/scenarios/20_prince_of_wesnoth.cfg 
(original)
+++ trunk/data/campaigns/Delfadors_Memoirs/scenarios/20_prince_of_wesnoth.cfg 
Mon Apr 20 06:10:16 2009
@@ -18,6 +18,7 @@
         [/part]
         [part]
             # The "generation" is the 26 years between 470 YW and 496 YW.
+            # Delfador is 54 at this time.
             story= _ "Following the alliance's victory and the peace treaty 
came a period of calm that lasted a generation. The new King had learned to 
trust Delfador at the battle of Abez Ford, and it was no surprise that Delfador 
became Garard II's most valued advisor."
             delay=4000
         [/part]

Modified: 
trunk/data/campaigns/Delfadors_Memoirs/scenarios/21_clash_at_the_manor.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/scenarios/21_clash_at_the_manor.cfg?rev=35076&r1=35075&r2=35076&view=diff
==============================================================================
--- trunk/data/campaigns/Delfadors_Memoirs/scenarios/21_clash_at_the_manor.cfg 
(original)
+++ trunk/data/campaigns/Delfadors_Memoirs/scenarios/21_clash_at_the_manor.cfg 
Mon Apr 20 06:10:16 2009
@@ -27,19 +27,19 @@
         [part]
             # Asheviere was already having secret talks with
             # the orcs about the early HttT events and Lionel's mission
-            story=_ "Upon his return Delfador found out that the queen had 
left with a strong escort to visit her hometown and her ailing parents. Lionel, 
the King's most loyal general, had been sent at Asheviere's request on an 
errand to Knalga to retrieve the scepter of fire. That mission would cost 
Lionel his life; and neither Lionel nor Delfador knew that Lionel's mission had 
been compromised from the start."
-        [/part]
-        [part]
-            story= _ "Although the King did reprimand Eldred for his actions, 
Delfador could sense that the military commanders were solidly behind Eldred 
and his mother. Asheviere had flattered them and beguiled them with promises of 
glory and plunder in a coming war."
-            delay=4000
-        [/part]
-        [part]
-            story= _ "Delfador was granted an audience with the King and 
expressed his concerns about the Book, but the King suggested  that everything 
would be clear when Asheviere returned to Weldyn. And for once, Delfador knew 
he could not obey the King's order."
-            delay=4000
-        [/part]
-        [part]
             #po: "demesne" = the part of a feudal lord's lands reserved for 
             #po: personal use.
+            story=_ "Upon his return Delfador found out that the queen had 
left with a strong escort to visit her family's demesne and her ailing parents. 
Lionel, the King's most loyal general, had been sent at Asheviere's request on 
an errand to Knalga to retrieve the scepter of fire. That mission would cost 
Lionel his life; and neither Lionel nor Delfador knew that Lionel's mission had 
been compromised from the start."
+        [/part]
+        [part]
+            story= _ "Although the King did reprimand Eldred for his actions, 
Delfador could sense that the military commanders were solidly behind Eldred 
and his mother. Asheviere had flattered them and beguiled them with promises of 
glory and plunder in a coming war."
+            delay=4000
+        [/part]
+        [part]
+            story= _ "Delfador was granted an audience with the King and 
expressed his concerns about the Book, but the King suggested  that everything 
would be clear when Asheviere returned to Weldyn. And for once, Delfador knew 
he could not obey the King's order."
+            delay=4000
+        [/part]
+        [part]
             story= _ "Since he could not ask even his personal guard to go 
against the King's wishes, he turned to Kalenz and the elves. Traveling by 
night to remain unseen they reached Asheviere's demesne, only to find that 
Asheviere was in fact staying at her father's manor, outside her demesne, and 
had left on a trip north. The Book was within their grasp."
             delay=4000
         [/part]

Modified: trunk/data/campaigns/Delfadors_Memoirs/utils/sides.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/utils/sides.cfg?rev=35076&r1=35075&r2=35076&view=diff
==============================================================================
--- trunk/data/campaigns/Delfadors_Memoirs/utils/sides.cfg (original)
+++ trunk/data/campaigns/Delfadors_Memoirs/utils/sides.cfg Mon Apr 20 06:10:16 
2009
@@ -94,8 +94,16 @@
 # to be called from a start or prestart event, before recruiting can
 # occur.
 
-#define DISCARD_UNDEAD_VETERANS
+#define SAVE_UNDEAD_VETERANS
     {MEMOIRS_STORE_UNITS dead_recall}
+#enddef
+
+# We'll use this for a logic guard later on.
+#define HAVE_UNDEAD_VETERANS
+    [variable] 
+        name=dead_recall.length
+        greater_than=0
+    [/variable]
 #enddef
 
 # At the end of Wasteland (11), Chantal's side 3 gets absorbed into Delfador's
@@ -429,6 +437,10 @@
 # the scene: Kalenz will lead side 1 in the next scenario, 26 years
 # later.  This is preparation.
 #define DELFADOR_DEPARTS_AGAIN
+    # He's not going to be where he can recruit dwarves again.
+    [disallow_recruit]
+        type={DWARVES}
+    [/disallow_recruit]
     # Delfador goes away
     [store_unit]
         variable=delfador_store
@@ -447,10 +459,6 @@
     # have his elvish veterans for this battle.
     {MEMOIRS_STORE_UNITS wesnoth_victors}
     {CLEAR_VARIABLE wesnoth_victors}
-    # He's not going to be where he can recruit dwarves again.
-    [disallow_recruit]
-        type={DWARVES}
-    [/disallow_recruit]
     # Kalenz will lead in next scenario
     {MODIFY_UNIT id=Kalenz canrecruit yes}
 #enddef


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

Reply via email to