mail[Wesnoth-commits] r28591 - in /trunk/data/campaigns/The_Hammer_of_Thursagan: scenarios/12_The_Underlevels.cfg utils/macros.cfg


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

Header


Content

Posted by esr on August 15, 2008 - 18:15:
Author: esr
Date: Thu Aug 14 20:54:43 2008
New Revision: 28591

URL: http://svn.gna.org/viewcvs/wesnoth?rev=28591&view=rev
Log:
Try to address bug #11857 by ensuring that liches will activate even if the
user takes the sneak path before passing through the magically sealed doors.  
If this doesn't fix the problem we've got a bug in the interpretation of 
[enable_recruit].


Modified:
    
trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg
    trunk/data/campaigns/The_Hammer_of_Thursagan/utils/macros.cfg

Modified: 
trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg?rev=28591&r1=28590&r2=28591&view=diff
==============================================================================
--- 
trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg 
(original)
+++ 
trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg 
Thu Aug 14 20:54:43 2008
@@ -39,7 +39,7 @@
         name=_"Karrag"
         profile=portraits/karrag.png
         canrecruit="1"
-        side="2"
+        side="2"       # ACTIVATE_LICHES macro depends on this value
         colour=black
         controller="ai"
         team_name="evil"
@@ -122,7 +122,7 @@
         id="Fleleen"
         name=_"Fleleen"
         canrecruit="1"
-        side="6"
+        side="6"       # ACTIVATE_LICHES macro depends on this value
         controller="ai"
         team_name="evil"
         user_team_name=_"Evil"
@@ -136,7 +136,7 @@
         id="Lannex"
         name=_"Lannex"
         canrecruit="1"
-        side="7"
+        side="7"       # ACTIVATE_LICHES macro depends on this value
         controller="ai"
         team_name="evil"
         user_team_name=_"Evil"
@@ -448,22 +448,28 @@
                     value=yes
                 [/set_variable]
 
-                [allow_recruit]
-                    side=2
-                    type="Blood Bat,Ghost,Wraith,Shadow,Skeleton,Skeleton 
Archer,Ghoul,Necrophage,Revenant,Deathblade,Bone Shooter"
-                [/allow_recruit]
-
-                [allow_recruit]
-                    side=6
-                    type="Blood Bat,Ghost,Wraith,Shadow,Skeleton,Skeleton 
Archer,Ghoul,Necrophage,Revenant,Deathblade,Bone Shooter"
-                [/allow_recruit]
-
-                [allow_recruit]
-                    side=7
-                    type="Blood Bat,Ghost,Wraith,Shadow,Skeleton,Skeleton 
Archer,Ghoul,Necrophage,Revenant,Deathblade,Bone Shooter"
-                [/allow_recruit]
+                {ACTIVATE_LICHES}
             [/then]
         [/if]
+    [/event]
+
+    # This event is in case the player gets a unit through the sneak tunnel
+    # before opening the sealed doors.
+    [event]
+        name=moveto
+
+        [filter]
+            side=1
+            x=53
+            y=31
+        [/filter]
+
+        [message]
+            speaker=unit
+            message= _ "I think I hear noises, ahead of us..."
+        [/message]
+
+        {ACTIVATE_LICHES}
     [/event]
 
     [event]

Modified: trunk/data/campaigns/The_Hammer_of_Thursagan/utils/macros.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Hammer_of_Thursagan/utils/macros.cfg?rev=28591&r1=28590&r2=28591&view=diff
==============================================================================
--- trunk/data/campaigns/The_Hammer_of_Thursagan/utils/macros.cfg (original)
+++ trunk/data/campaigns/The_Hammer_of_Thursagan/utils/macros.cfg Thu Aug 14 
20:54:43 2008
@@ -311,3 +311,25 @@
     [/message]
 
 #enddef
+
+#define ACTIVATE_LICHES
+    [message]
+        speaker="Angarthing"
+        message=_"I sense wrongness.  Some greater evil awakens before us."
+    [/message]
+
+    [allow_recruit]
+        side=2
+        type="Blood Bat,Ghost,Wraith,Shadow,Skeleton,Skeleton 
Archer,Ghoul,Necrophage,Revenant,Deathblade,Bone Shooter"
+    [/allow_recruit]
+
+    [allow_recruit]
+        side=6
+        type="Blood Bat,Ghost,Wraith,Shadow,Skeleton,Skeleton 
Archer,Ghoul,Necrophage,Revenant,Deathblade,Bone Shooter"
+    [/allow_recruit]
+
+    [allow_recruit]
+        side=7
+        type="Blood Bat,Ghost,Wraith,Shadow,Skeleton,Skeleton 
Archer,Ghoul,Necrophage,Revenant,Deathblade,Bone Shooter"
+    [/allow_recruit]
+#enddef




Related Messages


Powered by MHonArc, Updated Fri Aug 15 19:01:20 2008