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

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

[Wesnoth-cvs-commits] wesnoth/data maps/Heir_To_The_Throne/Home_Clan ...


From: James Spencer
Subject: [Wesnoth-cvs-commits] wesnoth/data maps/Heir_To_The_Throne/Home_Clan ...
Date: Fri, 03 Dec 2004 20:04:32 -0500

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

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

Log message:
        Changes to make 'A Test of the Clan' sane. Will update the changelog.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/maps/Heir_To_The_Throne/Home_Clan.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/maps/Heir_To_The_Throne/Return_to_Wesnoth.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Return_to_Wesnoth.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: wesnoth/data/maps/Heir_To_The_Throne/Home_Clan
diff -u wesnoth/data/maps/Heir_To_The_Throne/Home_Clan:1.2 
wesnoth/data/maps/Heir_To_The_Throne/Home_Clan:1.3
--- wesnoth/data/maps/Heir_To_The_Throne/Home_Clan:1.2  Tue Jun 15 22:32:38 2004
+++ wesnoth/data/maps/Heir_To_The_Throne/Home_Clan      Sat Dec  4 00:58:20 2004
@@ -1,7 +1,7 @@
 
gggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg
 
gggggggggggggggggggggvgggggggggggvgggggggggggggggggggggvgggggggggggggggggggggggggggggg
-gggggggggggggggggggggggggggggggggggggggggvgggggggggggdddddddgggggggggggggggggggggggggg
-gggggggggggggggggggggggCCCgggggggggggggggggggggggggddcccccccddgggggggggggggggggggggggg
+gggvgggggggggggggggggggggggggggggggggggggvgggggggggggdddddddgggggggggggggggggggggggggg
+gggggggggggggggggggggggCCCgggggggggggggggggggggggggddcccccccddggggggggggggggggggggvggg
 
gggggggggggggggvgggggggC2Cgggggggggggggggggggggggggdcccssssccdgggggggggggggggggggggggg
 
gggggghhhgggggggggggggggCgggggggggggggggggggggggggdccsssssssccdggggggggvgggggggggggggg
 
ggggghhhhggggggggggggggggggggggggggggggggggggvggggdcssssssssscdggggggggggggggggggggggg
@@ -12,45 +12,45 @@
 
gggggggggggggvddddddddddggggghhhhgggggggggggggggggdccsssssssccdvgggdddddddgggggggggggg
 
ggggggggggggdddddddddddddgggghhhhhggggggggggggggggdcsssssscccddgggggdddddggggggggggggg
 
gggggggggggggdddddddddggvggggghhhgggggggggvgggggggdcccccccccdggggggggggggggggggggggggg
-ggggggggggggggddddddggggggggggggggggggggggggggggggdcdddddddddggggggggggggggggggggggggg
+ggggggggggggggddddddgggggggggggggggggggggggggggggccccddddddddggggggggggggggggggggggggg
 
gggggggggggggggggggggggggggggggggggggggggggggggggccggggggggggggggggggggggggggggggggggg
 
ggggggggggggggggggggggggggggggggggggggggggggggggcggggvgggggggggggggggggggggvgggngggggg
 
ggggggggggggggggvggggggggggggggggggggggggggggggccgggggggggggggggggggggggggggggn1nggggg
 
ggggggggggggggggggggggggggggggggggggggggggggggcgggggggggggggghhhhgggggggggggggnnnggggg
-gggggggggggggggggggggggggggggggggvgggggggggggccggggggggggggghhhhhhgvggggggggggggggggvg
-ggvggggggggggggggggggggggggggggggggggggggggggcgggggggggggggghhhhhggggggggggggggggggggg
-gggggggggCgggggggggggggggggggggggggggggggggggcggggggggggggggghhhhggggggggggggvgggggggg
-ggggggggC4Cggggggggghhhhgggggggggggggggggggvgcggggggggggggggghhhgggggggggggggggggggggg
-ggggggggCCCgggggggvhhhhhgggggggggggggggggggccggggggggggggggggggggggggggggggggggggggggg
-ggggggggggggggggggggghhhhggggggggggggggggcccgggggggggggggggggggggggggggggggggggggggggg
-gggggggggggggggggggggggggggggggvgggggggcccggggggggggggggvggggggggggggggggggggggggggggg
-gggggggggggggggggggggggggggggggggggggggcgggggggggggggggggggggggggggggggggggggggggggggg
-gggggggggggggggggggggggggggggggggggggggcgggggggggggggggggggggggggggggggggggvgggggggggg
-ggggggggggggggggggggggggggggggggggggggcgggggggggggggggddddddgggggggggggggggggggggggggg
-gggggggggggggggggggggggggggggggggggggccgggggggggggggdddddddggggggggggggggggggggggggggg
-gggggggggggggggggggggggggggggggvggg\cgggggggggggggggvdddddddggggghhhhhgggggggggggvgggg
-gggggggggggggggggggggggggggggggggccggggggggggggggggggddddddggggghhhhhggggggggggggggggg
-ggggggggggghhhggggggggggggggggggcggggggggggggggggggddddddgggggggghhhhhgggggggggggggggg
-gggggggggghhhhggggggggggggggggggcggggggggvgggggggggggggggggggggggghhhhgggggggggggggggg
-ggggggggggghhhhgggggvgggggggggggcggggggggggggggggggggggggggggggggggggggggggggggggggggg
-gggggvgggggggggggggggggggggggggccggggggggggggggggggggggggggggggggggggggggggggggggggggg
-gggggggggggggggggggggggggggggggcggggggggggggggggggggggggggggggggggggvggggggggggggggggg
-gggggggggggggggggggggggggggggggcvggggggggggggggggvgggggggggggggggggggggggggggggggggggg
-gggggggggggggggggggggggggggggggcgggggggggggggggggggggggggggggggggggggggggggggggvgggggg
-gggggggggggvggggggggggggggggggggccgggggggggggggggggggggggggggggggggggggggggggggggggggg
-gggggggggggggggggggggggggggggggggg/cggggggggggddddddgggggggggggggggggggggggCgggggggggg
-gggvggggggggggggggggggggggggggggggggccggggggggddddddddgggggggggvggggggggggC3Cggggggggg
-gggggggggggggggggggggggggvggggggggggggccggggggdddddddgggggggggggggggggggggCCCggggggggg
-ggggggggggggggggggggggggggggggggggggggggccccgggddddddggggggggggggggggggggggggggggggggg
-gggggggggggggggghhhhggggggggggggggggggggggggccgggdddddgggggggggggggggggggggggggggggggg
-gggggggggggggggghhhhhggggggggggggggggggggvgggcgggggggggggggggggggggggggggggggvgggggggg
-ggggggggggggggghhhhhggggggggggggggggggggggggg/gggggggggggggggggggggggggggggggggggggggg
-gggggggggvgggggggggggggggggggdddddddggggggggggccggggggggggggggggghhhhhhggggggggggggggg
-ggggggggggggggggggggggggggggdddddddgggggggggggggccgggggggggggggghhhhhhhggggggggggggggg
-ggggggggggggggggggggggggggggddddddddgggggggggggggcggggggvggggggghhhhhhgggggggggggggggg
-gggvgggggggggggggggggggggggggddddddggggggggggggggcggggggggggggggghhhhgggggggggggggggdd
-ggggggggggggggggggggggggggggvggddddddggggggggggggcggggggggggggggghhhgggggggggggggggddd
-gggggggCggggggggggggggggggggggggddddggggggggggggcggggggggggggggggggggvggggggggggggdddd
+gggggggggggggggggggggggggggggggggvgggggggggggccggggggggggggghhhhhhgvgggggggggggrggggvg
+ggvgggggggggggggggggggggggggggggggggggggggggg\gggggggggggggghhhhhgggggggggggggggrggggg
+gggggggggCgggggggggggggggggggggggggggggggggggcggggggggggggggghhhhggggggggggggvggrrgggr
+ggggggggC4Cggggggggghhhhgggggggggggggggggggvgcggggggggggggggghhhgggggggggggggggggrrrrg
+ggggggggCCCgggggggvhhhhhgggggggggggggggggggccggggggggggggggggggggggggggggggggggrrggggg
+ggggggggggggggggggggghhhhggggggggggggggggccwgggggggggggggggggggggggggggggggggrrggggggg
+gggggggggggggggggggggggggggggggvgggggggccwggggggggggggggvgggggggggggggggggggrggggggggg
+gggggggggggggggggggggggggggggggggggggggcgggggggggggggggggggggggggggggggggggrrggggggggg
+gggggggggggggggggggggggggggggggggggggggcgggggggggggggggggggggggggggggggggrrvgggggggggg
+ggggggggggggggggggggggggggggggggggggggcgggggggggggggggddddddgggggrrrrrrrrggggggggggggg
+gggggggggggggggggggggggggggggggggggggccgggggggggggggdddddddggggrrggggggggggggggggggggg
+gggggggggggggggggggggggggggggggvgggccgggggggggggggggvdddddddgrrgghhhhhgggggggggggvgggg
+gggggggggggggggggggggggggggggggggccggggggggggggggggggddddddggrgghhhhhggggggggggggggggg
+ggggggggggghhhggggggggggggggggggcggggggggggggggggggddddddggggrggghhhhhgggggggggggggggg
+gggggggggghhhhggggggggggggggggggcggggggggvgggggggggggggggggrrggggghhhhgggggggggggggggg
+ggggggggggghhhhgggggvgggggggggggcggggggggggggggggggggggggrrggggggggggggggggggggggggggg
+gggggvgggggggggggggggggggggggggccggggggggggggggggggggggrrggggggggggggggggggggggggggggg
+gggggggggggggggggggggggggggggggcgggggggggggrrrrrrrrrrrrgggggggggggggvggggggggggggggggg
+gggggggggggggggggggggggggggggggcvggggggrrrrggggggvgggggggggggggggggggggggggggggggggggg
+gggggggggggggggggggggggggggggggcgggggrrggggggggggggggggggggggggggggggggggggggggvgggggg
+gggggggggggvggggggggggggggggggggccgrrggggggggggggggggggggggggggggggggggggggggggggggggg
+gggggggggggggggggggggggggggggggggr/cggggggggggddddddgggggggggggggggggggggggCgggggggggg
+gggvgggggggggggggggggggggggggggrrgggccggggggggddddddddgggggggggvggggggggggC3Cggggggggg
+gggggggggggggggggggggggggvgggrrgggggggccggggggdddddddgggggggggggggggggggggCCCggggggggg
+gggggggggggggggggggggggggggrrgggggggggggccccgggddddddggggggggggggggggggggggggggggggggg
+gggggggggggggggghhhhgggggrrgggggggggggggggggccgggdddddgggggggggggggggggggggggggggggggg
+gggggggggggggggghhhhhgggrggggggggggggggggvgggcgggggggggggggggggggggggggggggggvgggggggg
+ggggggggggggggghhhhhggggrggggggggggggggggggggcgggggggggggggggggggggggggggggggggggggggg
+gggggggggvggggggggggggggrggggdddddddggggggggggccggggggggggggggggghhhhhhggggggggggggggg
+rrrrgggggggggggggggggggrrgggdddddddgggggggggggwgccgggggggggggggghhhhhhhggggggggggggggg
+ggggrrgggggggggggggggrrgggggddddddddgggggggggggggcggggggvggggggghhhhhhgggggggggggggggg
+gggvggrrgggrgrgrgrgrrggggggggddddddggggggggggggggcggggggggggggggghhhhgggggggggggggggdd
+ggggggggrrrgrgrgrgrgggggggggvggddddddggggggggggggcggggggggggggggghhhgggggggggggggggddd
+gggggggCrgggggggggggggggggggggggddddggggggggggggcggggggggggggggggggggvggggggggggggdddd
 
ggggggC5Cgggggggggggggggggggggggggggggggggggggggccggggggggggggggggggggggggggggggggdddd
 
ggggggCCCggggggggggggggggggggggggggggggggggggggggcgggggggggggggggggggggggggggddggddddd
 
gggggggggggggggggvgghhhgggggggggggggggggggggvgggggccggggggggggggggggggggggggddddggvddd
Index: wesnoth/data/maps/Heir_To_The_Throne/Return_to_Wesnoth
diff -u wesnoth/data/maps/Heir_To_The_Throne/Return_to_Wesnoth:1.2 
wesnoth/data/maps/Heir_To_The_Throne/Return_to_Wesnoth:1.3
--- wesnoth/data/maps/Heir_To_The_Throne/Return_to_Wesnoth:1.2  Tue Jun 15 
22:32:39 2004
+++ wesnoth/data/maps/Heir_To_The_Throne/Return_to_Wesnoth      Sat Dec  4 
00:58:20 2004
@@ -1,12 +1,12 @@
-ccddggggggggggggggggffgggggggggggggggggggggrg
-cccdggggggggggggggffffgfgfgggggggggggggnnngrg
+ccddggggggggggggggggffggggggggggggggggggggggr
+cccdggggggggggggggffffgfgfgggggggggggggnnngrr
 ddccdggggvggggggggggfffffffgggffgggggggn1nrgg
 ggdcddgggggggggggffffffffffffffffgggggggnrrgg
-ggdccdggggggggggffffffffffffffffgggggggrrgggg
+ggdccdggggggggggfffffffffffffftggggggggrrgggg
 ggddcdgggggggggffffffffffffgffffgggggrrgggggg
 gggdccdgggggggggffgffffffffffffffggrrgggggggg
 ggggdcddgggvgggfffffffffffffffffgrrgggggggggg
-ggggdccdggggggggfffffffgfffffffgrgggggggggggg
+ggggdccdggggggggfffffffgfffffffgrggggggggvggg
 ggggddccddgggggffgffffffffffgggrrgggggggggggg
 gggggdcccdggggggggffffffffffgrrgggggggggggggg
 ggggggddccddddgggffggffffggggrvgggggggggggggg
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg:1.15 
wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg:1.16
--- wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg:1.15        Mon Nov 
 1 19:43:05 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg     Sat Dec  4 
00:58:21 2004
@@ -1,7 +1,7 @@
 [scenario]
        id=trial_clans
        textdomain=wesnoth-httt
-       name= _ "Test of the Clans"
+       name= _ "Test of the Clan"
        map_data="{maps/Heir_To_The_Throne/Home_Clan}"
        music=wesnoth-1.ogg
 
@@ -12,12 +12,15 @@
        {FIRST_WATCH}
        {SECOND_WATCH}
 
-       turns=64
+       turns=50
        next_scenario=battle_for_wesnoth
+       victory_when_enemies_defeated=no
+       bonus=no
 
        objectives= _ "
 Victory:
address@hidden the Clan Leader, Bayar
address@hidden 25 Units and at Least One Clan Leader (Bonus)
address@hidden All Clan Leaders
 Defeat:
 #Death of Konrad
 #Death of Delfador
@@ -28,242 +31,559 @@
        {BIGMAP_TEST_OF_THE_CLANS}
 
        [side]
-       team_name=elves
-       type=Commander
-       description=Konrad
-       unrenamable=1
-       side=1
-       canrecruit=1
-       controller=human
+               team_name=elves
+               type=Commander
+               description=Konrad
+               unrenamable=1
+               side=1
+               canrecruit=1
+               controller=human
        [/side]
 
        [side]
-       team_name=clan
-       type=Grand Knight
-       description=Alric
-       side=2
-       canrecruit=1
-       recruit=Horseman,Knight,Bowman,Lancer
+               team_name=clan
+               type=Grand Knight
+               description=Sir Alric
+               side=2
+               canrecruit=1
+               recruit=Horseman,Knight,Bowman,Lancer
                [ai]
-               recruitment_pattern=fighter,fighter,archer
+                       recruitment_pattern=fighter,fighter,archer
+               [/ai]
+               [ai] 
+                       time_of_day=morning,afternoon
+                       grouping=offensive
+                       aggression=0.6
+               [/ai] 
+               [ai] 
+                       time_of_day=first_watch,second_watch 
+                       aggression=0.4
+                       grouping=defensive
                [/ai]
-       {GOLD 100 150 250}
-       {INCOME 5 10 15}
+               {GOLD 130 150 190}
+               {INCOME 2 4 8}
        [/side]
        
        [side]
-       team_name=clan
-       type=Grand Knight
-       description=Ruga
-       side=3
-       canrecruit=1
-       recruit=Horseman,Knight,Bowman,Lancer
+               team_name=clan
+               type=Grand Knight
+               description=Sir Ruga
+               side=3
+               canrecruit=1
+               recruit=Horseman,Knight,Bowman,Lancer
                [ai]
-               recruitment_pattern=fighter,fighter,archer
+                       recruitment_pattern=fighter,fighter,archer
+               [/ai]
+               [ai] 
+                       time_of_day=morning,afternoon
+                       grouping=offensive
+                       aggression=0.6
+               [/ai] 
+               [ai] 
+                       time_of_day=first_watch,second_watch 
+                       aggression=0.4
+                       grouping=defensive
                [/ai]
-       {GOLD 100 140 200}
-       {INCOME 5 10 15}
+               {GOLD 130 150 190}
+               {INCOME 2 4 8}
        [/side]
 
        [side]
-       team_name=clan
-       type=Grand Knight
-       description=Daryn
-       side=4
-       canrecruit=1
-       recruit=Horseman,Knight,Bowman,Lancer
+               team_name=clan
+               type=Grand Knight
+               description=Sir Daryn
+               side=4
+               canrecruit=1
+               recruit=Horseman,Knight,Bowman,Lancer
                [ai]
-               recruitment_pattern=fighter,fighter,archer
+                       recruitment_pattern=fighter,fighter,archer
                [/ai]
-       {GOLD 50 100 200}
-       {INCOME 5 10 15}
+               [ai] 
+                       time_of_day=morning,afternoon
+                       grouping=offensive
+                       aggression=0.6
+               [/ai] 
+               [ai] 
+                       time_of_day=first_watch,second_watch 
+                       aggression=0.4
+                       grouping=defensive
+               [/ai]
+               {GOLD 130 150 190}
+               {INCOME 2 4 8}
        [/side]
 
        [side]
-       team_name=clan
-       type=Grand Knight
-       description=Bayar
-       side=5
-       canrecruit=1
-       recruit=Knight,Longbowman
+               team_name=clan
+               type=Grand Knight
+               description=Lord Bayar
+               side=5
+               canrecruit=1
+               recruit=Knight,Longbowman
                [ai]
-               recruitment_pattern=fighter,fighter,archer
+                       recruitment_pattern=fighter,fighter,archer
+               [/ai]
+               [ai] 
+                       time_of_day=morning,afternoon
+                       grouping=offensive
+                       aggression=0.6
+               [/ai] 
+               [ai] 
+                       time_of_day=first_watch,second_watch 
+                       aggression=0.4
+                       grouping=defensive
                [/ai]
-       {GOLD 120 160 300}
-       {INCOME 15 20 30}
+               {GOLD 150 170 210}
+               {INCOME 4 8 12}
        [/side]
+
+#define KNIGHT SIDE X Y
+               [unit]
+                       type=Knight
+                       description=A Knight
+                       side={SIDE}
+                       x={X}
+                       y={Y}
+               [/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]
        
-#define KNIGHT
-[unit]
-type=Knight
-side=5
-x=83
-y=56
-[/unit]
+                       [print]
+                               text= _ "{NUM_KILLS}"
+                               size=18
+                               red,green,blue=0,255,0
+                       [/print]
+               [/then]
+       [/if]
+#enddef
+
+#define SPEECH
+       [message]
+               description=Kalenz
+               message= _ "Delfador, don't you think it is time we settled 
this?"
+       [/message]
+       [message]
+               description=Delfador
+               message= _ "Yes, it is time. It is time for the truth to be 
told. I had hoped to take this secret to my grave, but it isn't to be. You 
Elves live too long, and though I have tried hard to understand, your wisdom is 
foreign to me."
+       [/message]
+       [message]
+               description=Konrad
+               message= _ "Secret? What secret Delfador? What are you talking 
about?"
+       [/message]
+       [message]
+               description=Delfador
+               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]
+#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]
+               [/then]
+               [else]
+                       {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]
+               [/else]
+       [/if]
+       [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]
+               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]
+
+               [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."
+       [/message]
+#enddef
+
+#define NOBONUS_SPEECH
+       [message]
+               description=Delfador
+               message= _ "Despite their bluster we have prevailed on the 
field of battle this day. However by defeating the leaders of the Clan we shall 
have nobody to guard our flanks. This is unfortunate as it complicates our 
march to confront the queen."
+       [/message]
+       [message]
+               description=Konrad
+               message= _ "It is unfortunate. They would have been of great 
assistance in helping ensure a new King is given a chance to ascend the throne 
of Wesnoth."
+       [/message]
+       [message]
+               description=Li'sar
+               message= _ "I think you are mistaken! You mean they would have 
helped a new Queen claim the throne of Wesnoth!"
+       [/message]
+#enddef
+
+#define BONUS_VICTORY
+       {BONUS_SPEECH}
+       {SPEECH}
+       
+       [endlevel]
+               result=victory
+               bonus=yes
+               {CLEAR_VARIABLE units_slain}
+       [/endlevel]
 #enddef
 
        [event]
-       name=start
+       name=prestart
+
+               [set_variable]
+                       name=units_slain
+                       value=0
+               [/set_variable]
+
                [recall]
-               description=Delfador
+                       description=Delfador
                [/recall]
                [recall]
-               description=Kalenz
+                       description=Kalenz
                [/recall]
                [recall]
-               description=Li'sar
+                       description=Li'sar
                [/recall]
+       [/event]
+
+       [event]
+       name=start
                [message]
-               description=Konrad
-               message= _ "Greetings, men of the plains."
+                       description=Konrad
+                       message= _ "Greetings, men of the plains."
                [/message]
                [message]
-               description=Daryn
-               message= _ "What do these intruders want? We did not invite 
them here, that is certain."
+                       description=Sir Daryn
+                       message= _ "What do these intruders want? We did not 
invite them here, that is certain."
                [/message]
                [message]
-               description=Delfador
-               message= _ "We come in peace! We wish for you to aid us in our 
struggle against Asheviere, the evil Queen Mother."
+                       description=Delfador
+                       message= _ "We come in peace! We wish for you to aid us 
in our struggle against Asheviere, the evil Queen Mother."
                [/message]
                [message]
-               description=Alric
-               message= _ "We will not join you. You who are led by these 
youths and this old man."
+                       description=Sir Alric
+                       message= _ "We will not join you. You who are led by 
these youths and this old man."
                [/message]
                [message]
-               description=Delfador
-               message= _ "You are for us or against us. If you do not join us 
to overthrow the evil Queen, we will strip you of your power, once the throne 
is rightfully reclaimed."
+                       description=Delfador
+                       message= _ "You are for us or against us. If you do not 
join us to overthrow the evil Queen, we will strip you of your power, once the 
throne is rightfully reclaimed."
                [/message]
                [message]
-               description=Bayar
-               message= _ "Hah! You think you can sieze the throne? Defeat us 
in battle and we will join you, or leave now and never return!"
+                       description=Lord Bayar
+                       message= _ "Hah! You think you can seize the throne? 
Defeat us in battle and we will join you, or leave now and never return!"
                [/message]
                [message]
-               description=Kalenz
-               message= _ "Very well. We will fight you."
+                       description=Kalenz
+                       message= _ "Very well. We will fight you."
                [/message]
                [message]
-               description=Bayar
-               message= _ "Fools! We will run you down like dogs!"
+                       description=Lord Bayar
+                       message= _ "Fools! We will run you down like dogs!"
                [/message]
                [message]
-               description=Alric
-               message= _ "There is no turning back for you now. This is a 
fight to the death!"
+                       description=Sir Alric
+                       message= _ "There is no turning back for you now. This 
is a fight to the death!"
                [/message]
        [/event]
 
-       #event- die bayar
+       #event- die Lord Bayar
        [event]
        name=die
                [filter]
-               description=Bayar
+                       description=Lord Bayar
                [/filter]
-               [message]
-               description=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]
-               [message]
-               description=Konrad
-               message= _ "So you admit defeat! You will serve me in fighting 
the evil queen?"
-               [/message]
-               [message]
-               description=Bayar
-               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]
-               [message]
-               description=Bayar
-               message= _ "Who then is your leader? Who do we serve?"
-               [/message]
-               [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."
-               [/message]
-               [message]
-               description=Kalenz
-               message= _ "Delfador, don't you think it is time we settled 
this?"
-               [/message]
-               [message]
-               description=Delfador
-               message= _ "Yes, it is time. It is time for the truth to be 
told. I had hoped to take this secret to my grave, but it isn't to be. You 
Elves live too long, and though I have tried hard to understand, your wisdom is 
foreign to me."
-               [/message]
-               [message]
-               description=Konrad
-               message= _ "Secret? What secret Delfador? What are you talking 
about?"
-               [/message]
-               [message]
-               description=Delfador
-               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]
-               [endlevel]
-               result=victory
-               bonus=yes
-               [/endlevel]
+
+               [if]
+                       [variable]
+                               name=units_slain
+                               greater_than_equal_to=25
+                       [/variable]
+
+                       [then]
+                               {BONUS_VICTORY}
+                       [/then]
+                       [else]
+                               [message]
+                                       description=Bayar
+                                       message= _ "I cannot believe this! You 
have defeated me! But the Clan shall fight on!"
+                               [/message]
+                               [message]
+                                       description=Delfador
+                                       message= _ "Their leader has fallen but 
still they fight!"
+                               [/message]
+
+                               {KNIGHT 5 1 47}
+                               {KNIGHT 5 1 48}
+#ifdef HARD
+                               {KNIGHT 5 2 47}
+#endif
+                       [/else]
+               [/if]
        [/event]
 
-       #event- die daryn
+       #event- die Sir Daryn
        [event]
        name=die
                [filter]
-               description=Daryn
+                       description=Sir Daryn
                [/filter]
-               [message]
-               description=Daryn
-               message= _ "You can defeat me, but more will take my place!"
-               [/message]
-               {KNIGHT}
-               {KNIGHT}
+
+               [if]
+                       [variable]
+                               name=units_slain
+                               greater_than_equal_to=25
+                       [/variable]
+
+                       [then]
+                               {BONUS_VICTORY}
+                       [/then]
+                       [else]
+                               [message]
+                                       description=Sir Daryn
+                                       message= _ "You can defeat me, but more 
will take my place!"
+                               [/message]
+
+                               {KNIGHT 4 1 17}
+                               {KNIGHT 4 1 18}
 #ifdef HARD
-               {KNIGHT}
+                               {KNIGHT 4 2 12}
 #endif
-               [message]
-               description=Bayar
-               message= _ "See, you cannot defeat me. There are too many in my 
clan."
-               [/message]
+                               [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]
+                       [/else]
+               [/if]
        [/event]
 
-       #event- die ruga
+       #event- die Sir Ruga
        [event]
        name=die
                [filter]
-               description=Ruga
+                       description=Sir Ruga
                [/filter]
-               [message]
-               description=Ruga
-               message= _ "Argh! This is how I die? Well, it was for the glory 
of the Clan."
-               [/message]
-               {KNIGHT}
+
+               [if]
+                       [variable]
+                               name=units_slain
+                               greater_than_equal_to=25
+                       [/variable]
+
+                       [then]
+                               {BONUS_VICTORY}
+                       [/then]
+                       [else]
+                               [message]
+                                       description=Sir Ruga
+                                       message= _ "Argh! This is how I die? 
Well, it was for the glory of the Clan."
+                               [/message]
+
+                               {KNIGHT 3 86 47}
+                               {KNIGHT 3 86 48}
 #ifdef HARD
-               {KNIGHT}
+                               {KNIGHT 3 85 48}
 #endif
-               [message]
-               description=Bayar
-               message= _ "The clan rises. The more of us you kill, the 
stronger we get!"
-               [/message]
+
+                               [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]
+                       [/else]
+               [/if]
        [/event]
 
-       #event- die alric
+       #event- die Sir Alric
        [event]
        name=die
                [filter]
-               description=Alric
+                       description=Sir Alric
                [/filter]
-               [message]
-               description=Alric
-               message= _ "Although I die, it is for the Clan. You shall be 
defeated, and I will be right in saying you are no match for the Clan's might."
-               [/message]
-               {KNIGHT}
-               {KNIGHT}
+               
+               [if]
+                       [variable]
+                               name=units_slain
+                               greater_than_equal_to=25
+                       [/variable]
+
+                       [then]
+                               {BONUS_VICTORY}
+                       [/then]
+                       [else]
+                               [message]
+                                       description=Sir Alric
+                                       message= _ "Although I die, it is for 
the Clan. You shall be defeated, and I will be right in saying you are no match 
for the Clan's might."
+                               [/message]
+
+                               {KNIGHT 2 13 1}
+                               {KNIGHT 2 15 1}
 #ifdef HARD
-               {KNIGHT}
+                               {KNIGHT 2 14 1}
 #endif
-               [message]
-               description=Bayar
-               message= _ "Well said, brother. The warriors of the Clan hear 
you, and are come to fight with us!"
-               [/message]
+                               [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]
+                       [/else]
+               [/if]
+       [/event]
+
+       [event]
+       name=die
+       first_time_only=no
+               [filter]
+                       side=2,3,4,5
+               [/filter]
+
+               {VARIABLE_OP units_slain add 1}
+
+               {KILLS $units_slain}
+
+               [if]
+                       [variable]
+                               name=units_slain
+                               numerical_equals=25
+                       [/variable]
+
+                       [then]
+                               [message]
+                                       description=Delfador
+                                       message= _ "We are routing their 
forces! Let's see if the Clan has had enough. Their help in guarding our flanks 
would be invaluable. Let's take this fight to their leaders!"
+                               [/message]
+                       [/then]
+               [/if]
+       [/event]
+
+       [event]
+       name=enemies defeated
+
+               {NOBONUS_SPEECH}
+               {SPEECH}
+
+               [endlevel]
+                       result=victory
+                       bonus=no
+                       {CLEAR_VARIABLE units_slain}
+               [/endlevel]
        [/event]
 
        {scenarios/Heir_To_The_Throne/deaths.cfg}
+
 [/scenario]
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Return_to_Wesnoth.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Return_to_Wesnoth.cfg:1.12 
wesnoth/data/scenarios/Heir_To_The_Throne/Return_to_Wesnoth.cfg:1.13
--- wesnoth/data/scenarios/Heir_To_The_Throne/Return_to_Wesnoth.cfg:1.12        
Mon Nov  1 19:43:05 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Return_to_Wesnoth.cfg     Sat Dec 
 4 00:58:21 2004
@@ -3,8 +3,9 @@
        textdomain=wesnoth-httt
        name= _ "Return to Wesnoth"
        map_data="{maps/Heir_To_The_Throne/Return_to_Wesnoth}"
-       turns=24
+       turns=28
        next_scenario=trial_clans
+       bonus=yes
 
        {DAWN}
        {MORNING}
@@ -37,7 +38,7 @@
        controller=human
        team_name=good
        [/side]
-       
+
        [side]
        type=General
        description=Josephus
@@ -135,7 +136,8 @@
                x=34
                y=37
                [/unit]
-       #a little attempt at comic relief
+
+               #a little attempt at comic relief
                [message]
                description=Dacayan
                message= _ "The Queen has sent us to aid you in capturing these 
rebels."
@@ -145,4 +147,13 @@
                message= _ "We have changed the plan. Now we are killing them."
                [/message]
        [/event]
+       
+       [event]
+       name=turn 18
+               [message]
+                       description=Delfador
+                       message= _ "We must make haste! Far greater challenges 
lay before us, by tarring here were diminish our resources."
+               [/message]
+       [/event]
+
 [/scenario]




reply via email to

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