Author: zookeeper
Date: Thu Apr 10 11:30:30 2008
New Revision: 25728
URL: http://svn.gna.org/viewcvs/wesnoth?rev=25728&view=rev
Log:
Removed duplication of the scenario end cutscene (thanks to patch #1043).
Modified:
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/15_New_Land.cfg
Modified: trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/15_New_Land.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/15_New_Land.cfg?rev=25728&r1=25727&r2=25728&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/15_New_Land.cfg
(original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/15_New_Land.cfg Thu Apr
10 11:30:30 2008
@@ -194,13 +194,13 @@
y=40
[/recall]
- # [teleport]
- # [filter]
- # id=Lord Typhon
- # [/filter]
- # x=3
- # y=3
- # [/teleport]
+ # [teleport]
+ # [filter]
+ # id=Lord Typhon
+ # [/filter]
+ # x=3
+ # y=3
+ # [/teleport]
[message]
speaker=Prince Haldric
@@ -224,160 +224,150 @@
[/message]
[/event]
-#define SAVED_BY_DIONLI
- [move_unit_fake]
- type=Elvish Shyde
- side=2
- x=31,30,29,28,28
- y=8.8.9.8,7
- [/move_unit_fake]
-
- {HERO (Elvish Shyde) (Lord Dionli) ( _ "Lord Dionli") 2 28 7
("portraits/dionli.png")}
- # wmllint: recognize Lord Dionli
-
- [message]
- speaker=Lord Dionli
- message= _ "What? What's going on here? Dwarves? Humans? Ships?
Glimir, tell me."
- [/message]
- [message]
- speaker=Glimir
- message= _ "The stories are true. There must be dwarven colonists in
the Brown Hills. We caught this band chopping wood near the bay. Then we saw
lots of ships. Not like before, with that fellow from Southbay and his lone
ship. It was always interesting when he stopped by."
- [/message]
- [message]
- speaker=Glimir
- message= _ "We thought we were being invaded. We, erm, put our
differences aside with the dwarves, for the moment, and decided to deal with
this first."
- [/message]
- [message]
- speaker=Lord Dionli
- message= _ "These are disturbing trends. Human, it is by luck alone
that I am here to spare you. For on this day the Council of Lords is meeting in
a forest not far from here."
- [/message]
- [message]
- speaker=Prince Haldric
- message= _ "I am Prince Haldric. We come in peace. May our peoples-"
- [/message]
- [message]
- speaker=Lady Jessica
- message= _ "Haldric."
- [/message]
- [message]
- speaker=Lord Dionli
- message= _ "As for you, dwarf, return to the Brown Hills. Then tell
your people to prepare to return to the north."
- [/message]
- [message]
- speaker=Dursil
- message= _ "I'll return to the hills, but I can't promise that my
people will go. Hmph!"
- [/message]
- [message]
- speaker=Lord Dionli
- message= _ "Haldric, is it? You are their leader? You and your
advisers are to come with me. It will be safe for your passengers to disembark
here."
- [/message]
-
- [move_unit_fake]
- type=Blood Bat
- side=4
- x=1,2,3
- y=15,15,15
- [/move_unit_fake]
-
- {UNDEAD_INTEL (Blood Bat) (Familiar) ( _ "Familiar")
"portraits/familiar.png" 4 3 15}
-
- [kill]
- id=Familiar
- [/kill]
-
- [move_unit_fake]
- type=Blood Bat
- side=4
- x=3,3,2,1
- y=15,14,13,13
- [/move_unit_fake]
-
- [message]
- speaker=Lady Jessica
- message= _ "(whispered) Maybe it'd be best if you didn't mention our
little friend following us..."
- [/message]
+ [event]
+ name=attack_end,time over
+
+ [move_unit_fake]
+ type=Elvish Shyde
+ side=2
+ x=31,30,29,28,28
+ y=8.8.9.8,7
+ [/move_unit_fake]
+
+ {HERO (Elvish Shyde) (Lord Dionli) ( _ "Lord Dionli") 2 28 7
("portraits/dionli.png")}
+ # wmllint: recognize Lord Dionli
+
+ [message]
+ speaker=Lord Dionli
+ message= _ "What? What's going on here? Dwarves? Humans? Ships?
Glimir, tell me."
+ [/message]
+ [message]
+ speaker=Glimir
+ message= _ "The stories are true. There must be dwarven colonists
in the Brown Hills. We caught this band chopping wood near the bay. Then we saw
lots of ships. Not like before, with that fellow from Southbay and his lone
ship. It was always interesting when he stopped by."
+ [/message]
+ [message]
+ speaker=Glimir
+ message= _ "We thought we were being invaded. We, erm, put our
differences aside with the dwarves, for the moment, and decided to deal with
this first."
+ [/message]
+ [message]
+ speaker=Lord Dionli
+ message= _ "These are disturbing trends. Human, it is by luck
alone that I am here to spare you. For on this day the Council of Lords is
meeting in a forest not far from here."
+ [/message]
+ [message]
+ speaker=Prince Haldric
+ message= _ "I am Prince Haldric. We come in peace. May our
peoples-"
+ [/message]
+ [message]
+ speaker=Lady Jessica
+ message= _ "Haldric."
+ [/message]
+ [message]
+ speaker=Lord Dionli
+ message= _ "As for you, dwarf, return to the Brown Hills. Then
tell your people to prepare to return to the north."
+ [/message]
+ [message]
+ speaker=Dursil
+ message= _ "I'll return to the hills, but I can't promise that my
people will go. Hmph!"
+ [/message]
+ [message]
+ speaker=Lord Dionli
+ message= _ "Haldric, is it? You are their leader? You and your
advisers are to come with me. It will be safe for your passengers to disembark
here."
+ [/message]
+
+ [move_unit_fake]
+ type=Blood Bat
+ side=4
+ x=1,2,3
+ y=15,15,15
+ [/move_unit_fake]
+
+ {UNDEAD_INTEL (Blood Bat) (Familiar) ( _ "Familiar")
"portraits/familiar.png" 4 3 15}
+
+ [kill]
+ id=Familiar
+ [/kill]
+
+ [move_unit_fake]
+ type=Blood Bat
+ side=4
+ x=3,3,2,1
+ y=15,14,13,13
+ [/move_unit_fake]
+
+ [message]
+ speaker=Lady Jessica
+ message= _ "(whispered) Maybe it'd be best if you didn't mention
our little friend following us..."
+ [/message]
#ifdef EASY
- [message]
- speaker=Lord Typhon
- message= _ "I must return to my people. You have kept your word, you
may avail of my services in the future. The services of my people will remain
at your disposal."
- [/message]
+ [message]
+ speaker=Lord Typhon
+ message= _ "I must return to my people. You have kept your word,
you may avail of my services in the future. The services of my people will
remain at your disposal."
+ [/message]
#else
- [disallow_recruit]
- side=1
- type=Merman Fighter
- [/disallow_recruit]
-
- [message]
- speaker=Lord Typhon
- message= _ "I must return to my people. My warriors that fought by
your side wish to remain with you. You have kept your word, and you may avail
of my services in the future."
- [/message]
+ [disallow_recruit]
+ side=1
+ type=Merman Fighter
+ [/disallow_recruit]
+
+ [message]
+ speaker=Lord Typhon
+ message= _ "I must return to my people. My warriors that fought by
your side wish to remain with you. You have kept your word, and you may avail
of my services in the future."
+ [/message]
#endif
- [kill]
- id=Lord Typhon
- [/kill]
-
- [message]
- speaker=Prince Haldric
- message= _ "May the currents carry you swiftly, my friend. (whispered)
Jessica, send word that a third of the fleet is to return to the Green Isle, to
look for more survivors. If they return tell them to keep returning until no
more survivors are found."
- [/message]
- [message]
- speaker=Prince Haldric
- message= _ "(whispered) Man the ships with skeleton crews, and give
them the remaining supplies. Pass the word to Lord Typhon. Make sure that no
more than a third of the fleet is sent. We must not provide the orcs with a
ready-made fleet. Make haste, return before it is time to meet with these, what
are they? Ahh, elves."
- [/message]
- [message]
- speaker=Prince Haldric
- message= _ "This is the second Eldaric I get to say goodbye to. At
least this time it is easier than the first."
- [/message]
-
- [set_variable]
- name=num_done
- value=0
- [/set_variable]
-
- [set_variable]
- name=a_beach
- value=0
- [/set_variable]
-
- [set_variable]
- name=cursed_isle
- value=0
- [/set_variable]
-
- [set_variable]
- name=the_dragon
- value=0
- [/set_variable]
-
- [set_variable]
- name=troll_hole
- value=0
- [/set_variable]
-
- [set_variable]
- name=last_done
- value="none"
- [/set_variable]
-
- [endlevel]
- #Bet I scared a few people there
- result=continue
- next_scenario=Elf_Lords
- [/endlevel]
-#enddef
-
- [event]
- name=attack
-
- {SAVED_BY_DIONLI}
- [/event]
-
- [event]
- name=time over
-
- {SAVED_BY_DIONLI}
+ [kill]
+ id=Lord Typhon
+ [/kill]
+
+ [message]
+ speaker=Prince Haldric
+ message= _ "May the currents carry you swiftly, my friend.
(whispered) Jessica, send word that a third of the fleet is to return to the
Green Isle, to look for more survivors. If they return tell them to keep
returning until no more survivors are found."
+ [/message]
+ [message]
+ speaker=Prince Haldric
+ message= _ "(whispered) Man the ships with skeleton crews, and
give them the remaining supplies. Pass the word to Lord Typhon. Make sure that
no more than a third of the fleet is sent. We must not provide the orcs with a
ready-made fleet. Make haste, return before it is time to meet with these, what
are they? Ahh, elves."
+ [/message]
+ [message]
+ speaker=Prince Haldric
+ message= _ "This is the second Eldaric I get to say goodbye to. At
least this time it is easier than the first."
+ [/message]
+
+ [set_variable]
+ name=num_done
+ value=0
+ [/set_variable]
+
+ [set_variable]
+ name=a_beach
+ value=0
+ [/set_variable]
+
+ [set_variable]
+ name=cursed_isle
+ value=0
+ [/set_variable]
+
+ [set_variable]
+ name=the_dragon
+ value=0
+ [/set_variable]
+
+ [set_variable]
+ name=troll_hole
+ value=0
+ [/set_variable]
+
+ [set_variable]
+ name=last_done
+ value="none"
+ [/set_variable]
+
+ [endlevel]
+ #Bet I scared a few people there
+ result=continue
+ next_scenario=Elf_Lords
+ [/endlevel]
[/event]
[event]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
