Author: esr
Date: Tue Apr  7 20:51:47 2009
New Revision: 34613

URL: http://svn.gna.org/viewcvs/wesnoth?rev=34613&view=rev
Log:
Revert Chantal's death to no longer being a loss condition, but try to 
prevent it in a sneaky way.

Modified:
    trunk/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg
    trunk/data/campaigns/Heir_To_The_Throne/utils/deaths.cfg

Modified: 
trunk/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg?rev=34613&r1=34612&r2=34613&view=diff
==============================================================================
--- trunk/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg 
(original)
+++ trunk/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg 
Tue Apr  7 20:51:47 2009
@@ -11,6 +11,14 @@
     {SCENARIO_MUSIC "battle.ogg"}      # No story part
     {EXTRA_SCENARIO_MUSIC "elvish-theme.ogg"}
     {EXTRA_SCENARIO_MUSIC "the_king_is_dead.ogg"}
+
+    # Chantal can't be killed for storyline reasons.
+    # Prevent AIs from getting too close.
+#define AVOID_CHANTAL
+    [avoid]
+        x,y=2-4,22-24
+    [/avoid]
+#enddef
 
     [event]
         name=prestart
@@ -26,10 +34,6 @@
             [/objective]
             [objective]
                 description= _ "Death of Delfador"
-                condition=lose
-            [/objective]
-            [objective]
-                description= _ "Death of Chantal"
                 condition=lose
             [/objective]
             [objective]
@@ -153,6 +157,7 @@
         [ai]
             recruitment_pattern=scout,fighter,mixed fighter,archer
             {ATTACK_DEPTH 1 3 5}
+            {AVOID_CHANTAL}
 #ifdef HARD
             {HIGH_PRIORITY_TARGETS}
 #endif
@@ -175,6 +180,7 @@
         {GOLD 200 300 500}
         [ai]
             {ATTACK_DEPTH 1 3 5}
+            {AVOID_CHANTAL}
 #ifdef HARD
             {HIGH_PRIORITY_TARGETS}
 #endif
@@ -194,6 +200,7 @@
         {GOLD 200 300 500}
         [ai]
             {ATTACK_DEPTH 1 3 5}
+            {AVOID_CHANTAL}
 #ifdef HARD
             {HIGH_PRIORITY_TARGETS}
 #endif
@@ -224,6 +231,7 @@
         canrecruit=yes
         recruit=Elvish Shaman,Elvish Archer,Elvish Fighter
         [ai]
+            passive_leader="yes"
             recruitment_pattern=archer,archer,fighter,fighter,healer
         [/ai]
         gold=170

Modified: trunk/data/campaigns/Heir_To_The_Throne/utils/deaths.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/utils/deaths.cfg?rev=34613&r1=34612&r2=34613&view=diff
==============================================================================
--- trunk/data/campaigns/Heir_To_The_Throne/utils/deaths.cfg (original)
+++ trunk/data/campaigns/Heir_To_The_Throne/utils/deaths.cfg Tue Apr  7 
20:51:47 2009
@@ -58,20 +58,6 @@
 [event]
     name=die
     [filter]
-        id=Chantal
-    [/filter]
-    [message]
-        speaker=Delfador
-        message= _ "No! Chantal...! This will breaks our alliance with the 
elves!"
-    [/message]
-    [endlevel]
-        result=defeat
-    [/endlevel]
-[/event]
-
-[event]
-    name=die
-    [filter]
         id=Warven
     [/filter]
     [message]


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

Reply via email to