Author: soliton
Date: Thu Apr 30 16:46:11 2009
New Revision: 35348

URL: http://svn.gna.org/viewcvs/wesnoth?rev=35348&view=rev
Log:
* Made the number of enemies to defeat depend on the difficulty.

Modified:
    trunk/changelog
    trunk/data/campaigns/Heir_To_The_Throne/scenarios/23_Test_of_the_Clans.cfg
    trunk/players_changelog

Modified: trunk/changelog
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=35348&r1=35347&r2=35348&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Thu Apr 30 16:46:11 2009
@@ -18,6 +18,8 @@
      * The Scepter of Fire:
        * Enforce a 7-hex starting castle to prevent units from appearing inside
          a wall (bug #13377).
+     * Test of the Clans:
+       * Made the number of enemies to defeat depend on the difficulty.
    * Under the Burning Suns:
      * Kaleh advancement:
        * Gave the Hero variation more HP.

Modified: 
trunk/data/campaigns/Heir_To_The_Throne/scenarios/23_Test_of_the_Clans.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/23_Test_of_the_Clans.cfg?rev=35348&r1=35347&r2=35348&view=diff
==============================================================================
--- trunk/data/campaigns/Heir_To_The_Throne/scenarios/23_Test_of_the_Clans.cfg 
(original)
+++ trunk/data/campaigns/Heir_To_The_Throne/scenarios/23_Test_of_the_Clans.cfg 
Thu Apr 30 16:46:11 2009
@@ -15,10 +15,28 @@
     # wmllint: local spelling Bayer
     [event]
         name=prestart
+#ifdef EASY
+        {VARIABLE units_to_slay 25}
+#endif
+#ifdef NORMAL
+        {VARIABLE units_to_slay 35}
+#endif
+#ifdef HARD
+        {VARIABLE units_to_slay 50}
+#endif
+        [recall]
+            id=Delfador
+        [/recall]
+        [recall]
+            id=Kalenz
+        [/recall]
+        [recall]
+            id="Li'sar"
+        [/recall]
         [objectives]
             side=1
             [objective]
-                description= _ "Defeat 25 enemy units"
+                description= _ "Defeat $units_to_slay enemy units"
                 condition=win
             [/objective]
             [objective]
@@ -183,21 +201,6 @@
     [/side]
 
     {STARTING_VILLAGES 5 7}
-
-    [event]
-        name=prestart
-        {VARIABLE units_slain 0}
-        {VARIABLE temp_clan_member_text (_"Clan Member Defeated")}
-        [recall]
-            id=Delfador
-        [/recall]
-        [recall]
-            id=Kalenz
-        [/recall]
-        [recall]
-            id="Li'sar"
-        [/recall]
-    [/event]
 
     [event]
         name=start
@@ -431,8 +434,7 @@
         # wmllint: local spelling Elnar
         message= _ "We should not speak of it now. Instead come with me, 
Konrad and Li'sar, to the top of mount Elnar. To look at Weldyn. To make plans 
for the battle, and to talk."
     [/message]
-    {CLEAR_VARIABLE units_slain}
-    {CLEAR_VARIABLE temp_clan_member_text}
+    {CLEAR_VARIABLE units_to_slay}
     [endlevel]
         result=victory
         bonus=yes
@@ -447,26 +449,12 @@
             side=2,3,4,5
         [/filter]
 
-        {VARIABLE_OP units_slain add 1}
-        {VARIABLE_OP temp_string format ($units_slain + " " + 
$temp_clan_member_text)}
-
-        #
-        # After the first execution of this event, this changes the text to 
plural
-        #
-        {VARIABLE temp_clan_member_text (_ "Clan Members Defeated")}
-
-        [print]
-            text=$temp_string
-            size=18
-            red,green,blue=255,255,255
-        [/print]
-
-        {CLEAR_VARIABLE temp_string}
+        {VARIABLE_OP units_to_slay add -1}
 
         [if]
             [variable]
-                name=units_slain
-                numerical_equals=25
+                name=units_to_slay
+                numerical_equals=0
             [/variable]
 
             [then]
@@ -476,6 +464,13 @@
                 [/message]
                 {BONUS_VICTORY}
             [/then]
+            [else]
+                [print]
+                    text= _ "Still $units_to_slay clan members to defeat!"
+                    size=18
+                    red,green,blue=255,255,255
+                [/print]
+            [/else]
         [/if]
     [/event]
 

Modified: trunk/players_changelog
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/players_changelog?rev=35348&r1=35347&r2=35348&view=diff
==============================================================================
--- trunk/players_changelog (original)
+++ trunk/players_changelog Thu Apr 30 16:46:11 2009
@@ -10,6 +10,8 @@
       * The Scepter of Fire
         * Enforce a 7-hex starting castle to prevent units from appearing 
inside
           a wall (bug #13377).
+      * Test of the Clans:
+        * Made the number of enemies to defeat depend on the difficulty.
     * The Rise of Wesnoth:
       * In TROW, the Lady Jessica is now the Lady Jessene. This was the last
         major character in mainline (and probably the last named unit of any


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

Reply via email to