mail[Wesnoth-commits] r20559 - /trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Harsh_Sands.cfg


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

Header


Content

Posted by ravanrooke on September 18, 2007 - 20:54:
Author: rhuvaen
Date: Tue Sep 18 20:53:35 2007
New Revision: 20559

URL: http://svn.gna.org/viewcvs/wesnoth?rev=20559&view=rev
Log:
Fixed bug with Elyssa's thirst and ghost reappearance after being defeated 
(in Across the Harsh Sands).

Modified:
    trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Harsh_Sands.cfg

Modified: 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Harsh_Sands.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Harsh_Sands.cfg?rev=20559&r1=20558&r2=20559&view=diff
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Harsh_Sands.cfg 
(original)
+++ trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Harsh_Sands.cfg 
Tue Sep 18 20:53:35 2007
@@ -1083,11 +1083,16 @@
             x=$x_coord
             y=$y_coord
             side=1
-            [variables]
-              dehydration=0
-              full_hitpoints=34
-            [/variables]
         [/unit]
+        
+        [store_unit]
+          [filter]
+            description=Elyssa
+          [/filter]
+          variable=player_unit
+          kill=yes
+        [/store_unit]
+        {INIT_HYDRATION_FOR_PLAYER_UNIT}
 
         {ADD x_coord 7}
         {ADD y_coord -1}
@@ -1248,10 +1253,24 @@
 
         [if]
             [have_unit]
-                x=31-37
-                y=24-29
+                x=22-26
+                y=24-27
                 side=1
             [/have_unit]
+            [or]
+              [have_unit]
+                x=26-30
+                y=24-30
+                side=1
+              [/have_unit]            
+            [/or]
+            [or]
+              [have_unit]
+                x=30-37
+                y=24-33
+                side=1
+              [/have_unit]            
+            [/or]
             [variable]
                 name=turn_temp
                 greater_than=4
@@ -1519,7 +1538,6 @@
             type=Outlaw
             gender=female
             upkeep=loyal
-            ai_special=guardian
             [modifications]
                 {TRAIT_INTELLIGENT}
                 {TRAIT_STRONG}
@@ -1548,6 +1566,12 @@
             {INCOME 9 11 13}
             {GOLD 100 125 150}
             [ai]
+              [protect_location]
+                x=1-39
+                y=1-35
+                value=10
+              [/protect_location]
+              passive_leader=yes
 #ifdef EASY
                 recruitment_pattern=scout,fighter,archer,fighter
 #endif
@@ -1558,7 +1582,6 @@
 
 #ifdef HARD
                 recruitment_pattern=fighter,mixed fighter,archer,fighter
-                passive_leader=yes
 #endif
             [/ai]
         [/modify_side]
@@ -2308,25 +2331,27 @@
              [/if]
              {CLEAR_VARIABLE ghosts_per_turn}
              # deduct already spawned ghosts - whether still alive or not
-             {VARIABLE_OP max_ghosts add -$ghosts_already_spawned}
+             {VARIABLE ghost_limit $max_ghosts}
+             {VARIABLE_OP ghost_limit add -$ghosts_already_spawned}
              [if]
                [variable]
-                 name=max_ghosts
+                 name=ghost_limit
                  less_than=0
                [/variable]
                [then]
-                 {VARIABLE max_ghosts 0}
+                 {VARIABLE ghost_limit 0}
                [/then]
              [/if]
              [if]
                [variable]
                  name=ghosts
-                 greater_than=$max_ghosts
+                 greater_than=$ghost_limit
                [/variable]
                [then]
-                 {VARIABLE ghosts $max_ghosts}
+                 {VARIABLE ghosts $ghost_limit}
                [/then]
              [/if]
+             {CLEAR_VARIABLE ghost_limit}
 
              # store all possible spawn locations in range
              # pick one random ghost_spawn from which




Related Messages


Powered by MHonArc, Updated Tue Sep 18 22:00:48 2007