mirror of
https://github.com/wesnoth/wesnoth
synced 2025-05-20 13:38:17 +00:00
DiD S10: code cleanup, and made use of [filter_condition]
This commit is contained in:
Charles Dang
parent
c93d5500fe
commit
5a1cb9b044
@ -297,22 +297,27 @@
|
||||
role=advisor
|
||||
message=_ "Master, do you not see? He has merely been using you to get that book!"
|
||||
[/message]
|
||||
|
||||
[message]
|
||||
speaker=Malin Keshar
|
||||
message=_ "What do you mean?"
|
||||
[/message]
|
||||
|
||||
[message]
|
||||
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]
|
||||
|
||||
[message]
|
||||
speaker=Malin Keshar
|
||||
message=_ "Wait!"
|
||||
[/message]
|
||||
|
||||
[message]
|
||||
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]
|
||||
|
||||
[message]
|
||||
speaker=Darken Volk
|
||||
message=_ "You are even more of a fool than I thought."
|
||||
@ -327,6 +332,7 @@
|
||||
y=10-11,9
|
||||
terrain=Ce
|
||||
[/terrain]
|
||||
|
||||
[terrain]
|
||||
x,y=26,10
|
||||
terrain=Ke
|
||||
@ -343,36 +349,38 @@
|
||||
side=2
|
||||
[/filter_second]
|
||||
|
||||
[if]
|
||||
# Let's check for whether he's still alive, just in case the
|
||||
# paladins somehow killed him already
|
||||
# Let's check for whether he's still alive, just in case the
|
||||
# paladins somehow killed him already
|
||||
[filter_condition]
|
||||
[have_unit]
|
||||
id=Darken Volk
|
||||
[/have_unit]
|
||||
[/filter_condition]
|
||||
|
||||
[then]
|
||||
[message]
|
||||
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]
|
||||
[message]
|
||||
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]
|
||||
[message]
|
||||
speaker=Malin Keshar
|
||||
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=Malin Keshar
|
||||
message=_ "Perhaps, but I have nothing left to lose."
|
||||
[/message]
|
||||
[/then]
|
||||
[/if]
|
||||
[message]
|
||||
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]
|
||||
|
||||
[message]
|
||||
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]
|
||||
|
||||
[message]
|
||||
speaker=Malin Keshar
|
||||
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=Malin Keshar
|
||||
message=_ "Perhaps, but I have nothing left to lose."
|
||||
[/message]
|
||||
[/event]
|
||||
|
||||
# This helps prevent Darken from getting himself killed easily by preventing
|
||||
@ -419,6 +427,7 @@
|
||||
speaker=Malin Keshar
|
||||
message=_ "Now you shall pay for what you have done to me."
|
||||
[/message]
|
||||
|
||||
[message]
|
||||
speaker=Darken Volk
|
||||
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
|
||||
# light
|
||||
{INCIDENTAL_MUSIC loyalists.ogg}
|
||||
|
||||
[move_unit_fake]
|
||||
type=Paladin
|
||||
x=34,33
|
||||
y=27,26
|
||||
side=3
|
||||
[/move_unit_fake]
|
||||
|
||||
[unit]
|
||||
type=Paladin
|
||||
side=3
|
||||
@ -448,15 +459,18 @@
|
||||
canrecruit=yes
|
||||
animate=no
|
||||
[/unit]
|
||||
|
||||
{GENERIC_UNIT 3 (Paladin) 34 25}
|
||||
{GENERIC_UNIT 3 (Paladin) 33 27}
|
||||
{GENERIC_UNIT 3 (Mage of Light) 32 25}
|
||||
|
||||
# Make camp
|
||||
[terrain]
|
||||
x=32-34,33
|
||||
y=25-26,27
|
||||
terrain=Ce
|
||||
[/terrain]
|
||||
|
||||
[terrain]
|
||||
x,y=33,26
|
||||
terrain=Ke
|
||||
@ -472,10 +486,12 @@
|
||||
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]
|
||||
|
||||
[message]
|
||||
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]
|
||||
|
||||
[message]
|
||||
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."
|
||||
@ -540,6 +556,7 @@
|
||||
y=1,$possible_camp_locs[$camp_loc_i].y
|
||||
side=4
|
||||
[/move_unit_fake]
|
||||
|
||||
[unit]
|
||||
type=Frontier Baroness
|
||||
side=4
|
||||
@ -587,10 +604,12 @@
|
||||
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]
|
||||
|
||||
[message]
|
||||
speaker=Malin Keshar
|
||||
message=_ "You wrong me, sister. I have only tried to help. Have you not seen fewer orcs this past summer?"
|
||||
[/message]
|
||||
|
||||
[message]
|
||||
speaker=Dela Keshar
|
||||
message=_ "I will not listen to any more of your lies. Men, attack!"
|
||||
@ -607,6 +626,7 @@
|
||||
speaker=Darken Volk
|
||||
message=_ "With my dying breath I curse you, Malin the Damned!"
|
||||
[/message]
|
||||
|
||||
[message]
|
||||
speaker=Malin Keshar
|
||||
message=_ "Now I’ve just got to get that book out of the battleground!"
|
||||
@ -651,26 +671,25 @@
|
||||
name=moveto
|
||||
first_time_only=no
|
||||
[filter]
|
||||
x=$bookX
|
||||
y=$bookY
|
||||
x,y=$bookX,$bookY
|
||||
side=1
|
||||
[not]
|
||||
type=Ghost,Wraith,Spectre,Shadow,Nightgaunt,Vampire Bat,Blood Bat,Dread Bat
|
||||
[/not]
|
||||
[/filter]
|
||||
|
||||
[remove_item]
|
||||
x=$x1
|
||||
y=$y1
|
||||
x,y=$x1,$y1
|
||||
image="items/book5.png"
|
||||
[/remove_item]
|
||||
|
||||
[role]
|
||||
x=$x1
|
||||
y=$y1
|
||||
x,y=$x1,$y1
|
||||
role=book_carrier
|
||||
[/role]
|
||||
|
||||
[unit_overlay]
|
||||
x=$x1
|
||||
y=$y1
|
||||
x,y=$x1,$y1
|
||||
image="misc/book-icon.png"
|
||||
[/unit_overlay]
|
||||
|
||||
@ -700,8 +719,7 @@
|
||||
message=_ "I am sorry master, that is too heavy for me."
|
||||
[/message]
|
||||
|
||||
[allow_undo]
|
||||
[/allow_undo]
|
||||
[allow_undo][/allow_undo]
|
||||
[/event]
|
||||
|
||||
# Defeat Conditions
|
||||
@ -727,6 +745,7 @@
|
||||
[/and]
|
||||
[/filter_location]
|
||||
[/filter]
|
||||
|
||||
{MOVE_UNIT (id=Malin Keshar) 1 12}
|
||||
|
||||
[message]
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user