upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-20 18:41:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

DiD S10: code cleanup, and made use of [filter_condition]

Browse Source
This commit is contained in:
Charles Dang 2014-12-18 22:31:57 +11:00
parent c93d5500fe
commit 5a1cb9b044
1 changed files with 55 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
View File

@ -297,22 +297,27 @@
role=advisor role=advisor
message=_ "Master, do you not see? He has merely been using you to get that book!" message=_ "Master, do you not see? He has merely been using you to get that book!"
[/message] [/message]
[message] [message]
speaker=Malin Keshar speaker=Malin Keshar
message=_ "What do you mean?" message=_ "What do you mean?"
[/message] [/message]
[message] [message]
role=advisor role=advisor
message=_ "He cares not about your noble quest to push back the orcs. He needed your help to fight the mages! The book is rightfully yours!" message=_ "He cares not about your noble quest to push back the orcs. He needed your help to fight the mages! The book is rightfully yours!"
[/message] [/message]
[message] [message]
speaker=Malin Keshar speaker=Malin Keshar
message=_ "Wait!" message=_ "Wait!"
[/message] [/message]
[message] [message]
speaker=Malin Keshar speaker=Malin Keshar
message=_ "All of the training you gave me, that was just so I would help you get that book! Return it to me now, or I will take it by force." message=_ "All of the training you gave me, that was just so I would help you get that book! Return it to me now, or I will take it by force."
[/message] [/message]
[message] [message]
speaker=Darken Volk speaker=Darken Volk
message=_ "You are even more of a fool than I thought." message=_ "You are even more of a fool than I thought."
@ -327,6 +332,7 @@
y=10-11,9 y=10-11,9
terrain=Ce terrain=Ce
[/terrain] [/terrain]
[terrain] [terrain]
x,y=26,10 x,y=26,10
terrain=Ke terrain=Ke
@ -343,36 +349,38 @@
side=2 side=2
[/filter_second] [/filter_second]
[if] # Let's check for whether he's still alive, just in case the
# Let's check for whether he's still alive, just in case the # paladins somehow killed him already
# paladins somehow killed him already [filter_condition]
[have_unit] [have_unit]
id=Darken Volk id=Darken Volk
[/have_unit] [/have_unit]
[/filter_condition]
[then] [message]
[message] speaker=Malin Keshar
speaker=Malin Keshar message=_ "You let me believe Parthyn would accept me back so when they didn’t I would be willing to attack my own countrymen!"
message=_ "You let me believe Parthyn would accept me back so when they didn’t I would be willing to attack my own countrymen!" [/message]
[/message]
[message] [message]
speaker=Darken Volk speaker=Darken Volk
message=_ "What you let yourself believe is no fault of mine. Cease your foolish prattle. I gave you more power than you could have possibly dreamed. Use it to fight the orcs that annoy you so, not me." message=_ "What you let yourself believe is no fault of mine. Cease your foolish prattle. I gave you more power than you could have possibly dreamed. Use it to fight the orcs that annoy you so, not me."
[/message] [/message]
[message]
speaker=Malin Keshar [message]
message=_ "So it is true! You took my home away from me. You took Drogan away. Now that all of that is gone, I will at least keep the fruits of my labors." speaker=Malin Keshar
[/message] message=_ "So it is true! You took my home away from me. You took Drogan away. Now that all of that is gone, I will at least keep the fruits of my labors."
[message] [/message]
speaker=Darken Volk
message=_ "Hardly. I will crush you easily." [message]
[/message] speaker=Darken Volk
[message] message=_ "Hardly. I will crush you easily."
speaker=Malin Keshar [/message]
message=_ "Perhaps, but I have nothing left to lose."
[/message] [message]
[/then] speaker=Malin Keshar
[/if] message=_ "Perhaps, but I have nothing left to lose."
[/message]
[/event] [/event]
# This helps prevent Darken from getting himself killed easily by preventing # This helps prevent Darken from getting himself killed easily by preventing
@ -419,6 +427,7 @@
speaker=Malin Keshar speaker=Malin Keshar
message=_ "Now you shall pay for what you have done to me." message=_ "Now you shall pay for what you have done to me."
[/message] [/message]
[message] [message]
speaker=Darken Volk speaker=Darken Volk
message=_ "Done? I have done nothing but give you an opportunity. You have chosen your own path. Now leave me alone!" message=_ "Done? I have done nothing but give you an opportunity. You have chosen your own path. Now leave me alone!"
@ -433,12 +442,14 @@
# dialog, and give him another paladin and a mage of # dialog, and give him another paladin and a mage of
# light # light
{INCIDENTAL_MUSIC loyalists.ogg} {INCIDENTAL_MUSIC loyalists.ogg}
[move_unit_fake] [move_unit_fake]
type=Paladin type=Paladin
x=34,33 x=34,33
y=27,26 y=27,26
side=3 side=3
[/move_unit_fake] [/move_unit_fake]
[unit] [unit]
type=Paladin type=Paladin
side=3 side=3
@ -448,15 +459,18 @@
canrecruit=yes canrecruit=yes
animate=no animate=no
[/unit] [/unit]
{GENERIC_UNIT 3 (Paladin) 34 25} {GENERIC_UNIT 3 (Paladin) 34 25}
{GENERIC_UNIT 3 (Paladin) 33 27} {GENERIC_UNIT 3 (Paladin) 33 27}
{GENERIC_UNIT 3 (Mage of Light) 32 25} {GENERIC_UNIT 3 (Mage of Light) 32 25}
# Make camp # Make camp
[terrain] [terrain]
x=32-34,33 x=32-34,33
y=25-26,27 y=25-26,27
terrain=Ce terrain=Ce
[/terrain] [/terrain]
[terrain] [terrain]
x,y=33,26 x,y=33,26
terrain=Ke terrain=Ke
@ -472,10 +486,12 @@
speaker=Sir Cadaeus speaker=Sir Cadaeus
message=_ "Your travels in this region have not gone unnoticed, foul necromancers! We have been tracking you for weeks, with our purpose renewed this morning upon hearing of the disaster you wreaked upon the goodly city of Tath." message=_ "Your travels in this region have not gone unnoticed, foul necromancers! We have been tracking you for weeks, with our purpose renewed this morning upon hearing of the disaster you wreaked upon the goodly city of Tath."
[/message] [/message]
[message] [message]
speaker=Sir Cadaeus speaker=Sir Cadaeus
message=_ "Do not even think of running away — my horsemen can easily catch you. Yes, on this day you shall have to answer for your innumerable crimes." message=_ "Do not even think of running away — my horsemen can easily catch you. Yes, on this day you shall have to answer for your innumerable crimes."
[/message] [/message]
[message] [message]
speaker=Darken Volk speaker=Darken Volk
message=_ "We’ll see how well your pompous words protect you from the blades of the undead once I have finished this upstart." message=_ "We’ll see how well your pompous words protect you from the blades of the undead once I have finished this upstart."
@ -540,6 +556,7 @@
y=1,$possible_camp_locs[$camp_loc_i].y y=1,$possible_camp_locs[$camp_loc_i].y
side=4 side=4
[/move_unit_fake] [/move_unit_fake]
[unit] [unit]
type=Frontier Baroness type=Frontier Baroness
side=4 side=4
@ -587,10 +604,12 @@
speaker=Dela Keshar speaker=Dela Keshar
message=_ "I told you, Malin, that I would find you again, and I have kept my word. I will not suffer you to bring any further harm to my people, and so you will not live to see another sunset." message=_ "I told you, Malin, that I would find you again, and I have kept my word. I will not suffer you to bring any further harm to my people, and so you will not live to see another sunset."
[/message] [/message]
[message] [message]
speaker=Malin Keshar speaker=Malin Keshar
message=_ "You wrong me, sister. I have only tried to help. Have you not seen fewer orcs this past summer?" message=_ "You wrong me, sister. I have only tried to help. Have you not seen fewer orcs this past summer?"
[/message] [/message]
[message] [message]
speaker=Dela Keshar speaker=Dela Keshar
message=_ "I will not listen to any more of your lies. Men, attack!" message=_ "I will not listen to any more of your lies. Men, attack!"
@ -607,6 +626,7 @@
speaker=Darken Volk speaker=Darken Volk
message=_ "With my dying breath I curse you, Malin the Damned!" message=_ "With my dying breath I curse you, Malin the Damned!"
[/message] [/message]
[message] [message]
speaker=Malin Keshar speaker=Malin Keshar
message=_ "Now I’ve just got to get that book out of the battleground!" message=_ "Now I’ve just got to get that book out of the battleground!"
@ -651,26 +671,25 @@
name=moveto name=moveto
first_time_only=no first_time_only=no
[filter] [filter]
x=$bookX x,y=$bookX,$bookY
y=$bookY
side=1 side=1
[not] [not]
type=Ghost,Wraith,Spectre,Shadow,Nightgaunt,Vampire Bat,Blood Bat,Dread Bat type=Ghost,Wraith,Spectre,Shadow,Nightgaunt,Vampire Bat,Blood Bat,Dread Bat
[/not] [/not]
[/filter] [/filter]
[remove_item] [remove_item]
x=$x1 x,y=$x1,$y1
y=$y1
image="items/book5.png" image="items/book5.png"
[/remove_item] [/remove_item]
[role] [role]
x=$x1 x,y=$x1,$y1
y=$y1
role=book_carrier role=book_carrier
[/role] [/role]
[unit_overlay] [unit_overlay]
x=$x1 x,y=$x1,$y1
y=$y1
image="misc/book-icon.png" image="misc/book-icon.png"
[/unit_overlay] [/unit_overlay]
@ -700,8 +719,7 @@
message=_ "I am sorry master, that is too heavy for me." message=_ "I am sorry master, that is too heavy for me."
[/message] [/message]
[allow_undo] [allow_undo][/allow_undo]
[/allow_undo]
[/event] [/event]
# Defeat Conditions # Defeat Conditions
@ -727,6 +745,7 @@
[/and] [/and]
[/filter_location] [/filter_location]
[/filter] [/filter]
{MOVE_UNIT (id=Malin Keshar) 1 12} {MOVE_UNIT (id=Malin Keshar) 1 12}
[message] [message]