wesnoth-cvs-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Wesnoth-cvs-commits] wesnoth/data/scenarios/Heir_To_The_Throne Home_...


From: James Spencer
Subject: [Wesnoth-cvs-commits] wesnoth/data/scenarios/Heir_To_The_Throne Home_...
Date: Sat, 04 Dec 2004 17:06:26 -0500

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     James Spencer <address@hidden>  04/12/04 22:00:12

Modified files:
        data/scenarios/Heir_To_The_Throne: Home_Clan.cfg 

Log message:
        Make it sane: Credit Invisible Philosophe

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg:1.16 
wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg:1.17
--- wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg:1.16        Sat Dec 
 4 00:58:21 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg     Sat Dec  4 
22:00:12 2004
@@ -15,7 +15,6 @@
        turns=50
        next_scenario=battle_for_wesnoth
        victory_when_enemies_defeated=no
-       bonus=no
 
        objectives= _ "
 Victory:
@@ -146,28 +145,6 @@
                [/unit]
 #enddef
 
-#define KILLS NUM_KILLS
-       [if]
-               [variable]
-                       name=units_slain
-                       less_than_equal_to=25
-               [/variable]
-               [then]
-                       [print]
-                               text= _ "                                       
      Clan Members Defeated"
-                               size=18
-                               red,green,blue=255,255,255
-                       [/print]
-       
-                       [print]
-                               text= _ "{NUM_KILLS}"
-                               size=18
-                               red,green,blue=0,255,0
-                       [/print]
-               [/then]
-       [/if]
-#enddef
-
 #define SPEECH
        [message]
                description=Kalenz
@@ -188,83 +165,54 @@
 #enddef
 
 #define FINDBOSS
-       [role]
-               type=Grand Knight
-               side=2,3,4,5
-               role=clanboss
-       [/role]
-#enddef
-
-#define BONUS_SPEECH
-
        [if]
                [have_unit]
                        description=Lord Bayar
                        side=5
                [/have_unit]
-
                [then]
-                       [message]
-                               description=Lord Bayar
-                               message= _ "Stop! I cannot believe this! You 
have defeated us! Indeed, you are worthy, worthy even to claim the throne. The 
clans will help you. We will fight with you against the Queen."
-                       [/message]
+                       [role]
+                               type=Grand Knight
+                               side=5
+                               role=clanboss
+                       [/role]
                [/then]
                [else]
-                       {FINDBOSS}
-                       [message]
+                       [role]
+                               type=Grand Knight
+                               side=5,4,3,2
                                role=clanboss
-                               message= _ "Stop! I cannot believe this! You 
have defeated us! Indeed, you are worthy, worthy even to claim the throne. The 
clans will help you. We will fight with you against the Queen."
-                       [/message]
+                       [/role]
                [/else]
        [/if]
+#enddef
+
+#define BONUS_SPEECH
+       {FINDBOSS}
+       [message]
+               role=clanboss
+               message= _ "Stop! I cannot believe this! You have defeated us! 
Indeed, you are worthy, worthy even to claim the throne. The clans will help 
you. We will fight with you against the Queen."
+       [/message]
        [message]
                description=Konrad
                message= _ "So you admit defeat! You will serve me in fighting 
the evil queen?"
        [/message]
-       [if]
-               [have_unit]
-                       description=Lord Bayar
-                       side=5
-               [/have_unit]
 
-               [then]
-                       [message]
-                               description=Lord Bayar
-                               message= _ "We will serve you, my lord. You 
will make a worthy king."
-                       [/message]
-               [/then]
-               [else]
-                       {FINDBOSS}
-                       [message]
-                               role=clanboss
-                               message= _ "We will serve you, my lord. You 
will make a worthy king."
-                       [/message]
-               [/else]
-       [/if]
+       [message]
+               role=clanboss
+               message= _ "We will serve you, my lord. You will make a worthy 
king."
+       [/message]
+
        [message]
                description=Li'sar
                message= _ "I think you are mistaken! You will help me be 
queen!"
        [/message]
-       [if]
-               [have_unit]
-                       description=Lord Bayar
-                       side=5
-               [/have_unit]
+       
+       [message]
+               role=clanboss
+               message= _ "Who then is your leader? Who do we serve?"
+       [/message]
 
-               [then]
-                       [message]
-                               description=Lord Bayar
-                               message= _ "Who then is your leader? Who do we 
serve?"
-                       [/message]
-               [/then]
-               [else]
-                       {FINDBOSS}
-                       [message]
-                               role=clanboss
-                               message= _ "Who then is your leader? Who do we 
serve?"
-                       [/message]
-               [/else]
-       [/if]
        [message]
                description=Delfador
                message= _ "You will serve us. You will protect our flanks 
while we make way straight for the queen. With you on either flank, we can 
surely overcome her."
@@ -418,26 +366,12 @@
 #ifdef HARD
                                {KNIGHT 4 2 12}
 #endif
-                               [if]
-                                       [have_unit]
-                                               description=Lord Bayar
-                                               side=5
-                                       [/have_unit]
-
-                                       [then]
-                                               [message]
-                                                       description=Lord Bayar
-                                                       message= _ "See, you 
cannot defeat me. There are too many in my clan."
-                                               [/message]
-                                       [/then]
-                                       [else]
-                                               {FINDBOSS}
-                                               [message]
-                                                       role=clanboss
-                                                       message= _ "See, you 
cannot defeat me. There are too many in my clan."
-                                               [/message]
-                                       [/else]
-                               [/if]
+
+                               {FINDBOSS}
+                               [message]
+                                       role=clanboss
+                                       message= _ "See, you cannot defeat me. 
There are too many in my clan."
+                               [/message]
                        [/else]
                [/if]
        [/event]
@@ -470,26 +404,11 @@
                                {KNIGHT 3 85 48}
 #endif
 
-                               [if]
-                                       [have_unit]
-                                               description=Lord Bayar
-                                               side=5
-                                       [/have_unit]
-
-                                       [then]
-                                               [message]
-                                                       description=Lord Bayar
-                                                       message= _ "The clan 
rises. The more of us you kill, the stronger we get!"
-                                               [/message]
-                                       [/then]
-                                       [else]
-                                               {FINDBOSS}
-                                               [message]
-                                                       role=clanboss
-                                                       message= _ "The clan 
rises. The more of us you kill, the stronger we get!"
-                                               [/message]
-                                       [/else]
-                               [/if]
+                               {FINDBOSS}
+                               [message]
+                                       role=clanboss
+                                       message= _ "The clan rises. The more of 
us you kill, the stronger we get!"
+                               [/message]
                        [/else]
                [/if]
        [/event]
@@ -521,26 +440,12 @@
 #ifdef HARD
                                {KNIGHT 2 14 1}
 #endif
-                               [if]
-                                       [have_unit]
-                                               description=Lord Bayar
-                                               side=5
-                                       [/have_unit]
-
-                                       [then]
-                                               [message]
-                                                       description=Lord Bayar
-                                                       message= _ "Well said, 
brother. The warriors of the Clan hear you, and are come to fight with us!"
-                                               [/message]
-                                       [/then]
-                                       [else]
-                                               {FINDBOSS}
-                                               [message]
-                                                       role=clanboss
-                                                       message= _ "Well said, 
brother. The warriors of the Clan hear you, and are come to fight with us!"
-                                               [/message]
-                                       [/else]
-                               [/if]
+
+                               {FINDBOSS}
+                               [message]
+                                       role=clanboss
+                                       message= _ "Well said, brother. The 
warriors of the Clan hear you, and are come to fight with us!"
+                               [/message]
                        [/else]
                [/if]
        [/event]
@@ -554,7 +459,18 @@
 
                {VARIABLE_OP units_slain add 1}
 
-               {KILLS $units_slain}
+               [set_variable] 
+                       name=temp_string 
+                       format= _ "|$units_slain| Clan Members Defeated" 
+               [/set_variable] 
+
+               [print] 
+                       text=$temp_string 
+                       size=18 
+                       red,green,blue=255,255,255 
+               [/print] 
+
+               {CLEAR_VARIABLE temp_string}
 
                [if]
                        [variable]




reply via email to

[Prev in Thread] Current Thread [Next in Thread]