Author: esr
Date: Sat Apr 18 22:37:30 2009
New Revision: 35026
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35026&view=rev
Log:
First hack at new ending for scenario 20.
Modified:
trunk/data/campaigns/Delfadors_Memoirs/scenarios/20_showdown_in_the_northern_swamp.cfg
trunk/data/campaigns/Delfadors_Memoirs/utils/sides.cfg
Modified:
trunk/data/campaigns/Delfadors_Memoirs/scenarios/20_showdown_in_the_northern_swamp.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/scenarios/20_showdown_in_the_northern_swamp.cfg?rev=35026&r1=35025&r2=35026&view=diff
==============================================================================
---
trunk/data/campaigns/Delfadors_Memoirs/scenarios/20_showdown_in_the_northern_swamp.cfg
(original)
+++
trunk/data/campaigns/Delfadors_Memoirs/scenarios/20_showdown_in_the_northern_swamp.cfg
Sat Apr 18 22:37:30 2009
@@ -44,6 +44,7 @@
[event]
name=start
{KALENZ_REJOINS_DELFADOR 26 22}
+ {UNDEAD_REJOIN_DELFADOR}
[/event]
##### /Delfador's side #####
@@ -171,28 +172,165 @@
name=start
[message]
- id=Iliah-Malal
+ speaker=Iliah-Malal
message= _ "So we meet again, Delfador. You were a fool to turn
down my offer. None of your allies will save you now."
[/message]
[message]
- id=Delfador
+ speaker=Delfador
message= _ "You have ravaged your own soul with your corrupt arts,
and your words are empty wind; I fear them not."
[/message]
[message]
- id=Iliah-Malal
+ speaker=Iliah-Malal
message= _ "Is he not amusing, my creatures? He puffs himself up
as though he were Delfador the Mighty, Delfador the Powerful, Delfador the
Great...rather than a jumped-up hedge wizard I shall shortly crush beneath my
heel."
[/message]
[message]
- id=Delfador
+ speaker=Delfador
message= _ "Delfador the Great, eh? And so it comes to pass as the
four Oracles foretold. I accept your name-gift, Iliah-Malal."
[/message]
[message]
- id=Iliah-Malal
+ speaker=Iliah-Malal
message= _ "Oracles? What nonsense you babble...after you die, I
will raise your corpse and compel you to tell me how to reopen my portal!"
[/message]
[message]
- id=Delfador
+ speaker=Delfador
message= _ "One of us will find a final death here. I do not think
it will be me."
+ [/message]
+ [if]
+ [filter]
+ side=1
+ race=undead
+ [/filter]
+ [then]
+ [set_variable]
+ name=undead_veterans
+ name=true
+ [/set_variable]
+ [message]
+ speaker=narrator
+ message= _ "In this scenario only, you may recall your
veterans from the Land of the Dead."
+ image=wesnoth-icon.png
+ [/message]
+ # An undead can kill him
+ [event]
+ name=last breath
+ [filter]
+ id=Iliah-Malal
+ [/filter]
+ [filter_second]
+ race=undead
+ [/filter_second]
+
+ [message]
+ speaker=Delfador
+ message= _ "Now your days are ended!"
+ [/message]
+ [message]
+ speaker="Iliah-Malal"
+ message=_ "The power of death is mine! When you strike
me down I arise stronger than before!"
+ [/message]
+ [message]
+ speaker=Delfador
+ message= _ "Not this time. For I have gazed upon the
dark heart of necromancy in the Book of Crelanu, and found rthwere your final
doom at the hands of the dead themselves."
+ [/message]
+ {DELFADOR_LIGHTNING}
+
+ # We're counting on the lich-scream as Ihiah-Malal
+ # dies to end the scene.
+ [/event]
+
+ # But nobody else can.
+ [event]
+ name=last breath
+ first_time_only=no
+ [filter]
+ id=Iliah-Malal
+ [/filter]
+ [filter_second]
+ [not]
+ race=undead
+ [/not]
+ [/filter_second]
+
+ [message]
+ speaker="Iliah-Malal"
+ message=_ "The power of death is mine! When you strike
me down I arise stronger than before!"
+ [/message]
+
+ # He gets the standard +3 hitpoints and full heal.
+ {ADVANCE_UNIT (id="Iliah-Malal") ()}
+ [/event]
+ [/then]
+ [else]
+ [set_variable]
+ name=undead_veterans
+ name=false
+ [/set_variable]
+ # Delfador can kill him
+ [event]
+ name=last breath
+ [filter]
+ id=Iliah-Malal
+ [/filter]
+ [filter_second]
+ id=Delfador
+ [/filter_second]
+
+ [message]
+ speaker=Delfador
+ message= _ "Now your days are ended!"
+ [/message]
+ [message]
+ speaker="Iliah-Malal"
+ message=_ "The power of death is mine! When you strike
me down I arise stronger than before!"
+ [/message]
+ [message]
+ speaker=Delfador
+ message= _ "Not this time. For I have gazed upon the
dark heart of necromancy in the Book of Crelanu, AND I REMAIN OF THE LIGHT!"
+ [/message]
+ {DELFADOR_LIGHTNING}
+
+ # We're counting on the lich-scream as Ihiah-Malal
+ # dies to end the scene.
+ [/event]
+
+ # But nobody else can.
+ [event]
+ name=last breath
+ first_time_only=no
+ [filter]
+ id=Iliah-Malal
+ [/filter]
+ [filter_second]
+ [not]
+ id=Delfador
+ [/not]
+ [/filter_second]
+
+ [message]
+ speaker="Iliah-Malal"
+ message=_ "The power of death is mine! When you strike
me down I arise stronger than before!"
+ [/message]
+
+ # He gets the standard +3 hitpoints and full heal.
+ {ADVANCE_UNIT (id="Iliah-Malal") ()}
+ [/event]
+ [/else]
+ [/if]
+ [/event]
+
+ [event]
+ name=recall
+ [filter]
+ race=undead
+ [/filter]
+
+ [message]
+ speaker=Lionel
+ message= _ "Delfador...you summon undead?!?"
+ [/message]
+ [message]
+ speaker=Delfador
+ message= _ "Some fought beside me in the Land of the Dead. I did
not summon them; I but offered them the way, and they return of their own will.
Tonight they fight for the living."
[/message]
[/event]
@@ -244,77 +382,40 @@
[/message]
[message]
speaker=Delfador
- message= _ "Your mindless minions will be no match for the sprit
and fire of the living."
- [/message]
-
- [message]
- id=Lionel
+ message= _ "Your mindless minions will be no match for the spirit
and fire of the living."
+ [/message]
+
+ [message]
+ speaker=Lionel
message= _ "Delfador, as the King ordered I place all troops under
your command. They will follow you to death, if necessary, and so will I!"
[/message]
[message]
- id=Delfador
+ speaker=Delfador
message= _ "Lionel, it is an honor to go into battle beside you.
Now let us fight for life over death!"
[/message]
- [message]
- id=Delfador
+ [if]
+ [variable]
+ name=undead_veterans
+ equals=true
+ [/variable]
#wmllint: local spelling un-life
- message= _ "Remember that I must strike the final blow, for
Iliah-Malal's un-life must be ended by a spell I have specially crafted to the
task."
- [/message]
-
+ [then]
+ [message]
+ speaker=Delfador
+ message= _ "Remember one of our undead must strike the
final blow, for Iliah-Malal's un-life can only be ended by the touch of
un-life."
+ [/message]
+ [/then]
+ [else]
+ [message]
+ speaker=Delfador
+ message= _ "Remember that I must strike the final blow,
for Iliah-Malal's un-life must be ended by a spell I have specially crafted to
the task."
+ [/message]
+ [/else]
+ [/if]
{SUBSUME_SIDE_AND_VILLAGES 2}
[/event]
-
- # Delfador can kill him
- [event]
- name=last breath
- [filter]
- id=Iliah-Malal
- [/filter]
- [filter_second]
- id=Delfador
- [/filter_second]
-
- [message]
- id=Delfador
- message= _ "Now your days are ended!"
- [/message]
- [message]
- speaker="Iliah-Malal"
- message=_ "The power of death is mine! When you strike me down I
arise stronger than before!"
- [/message]
- [message]
- id=Delfador
- message= _ "Not this time. For I have gazed upon the dark heart of
necromancy in the Book of Crelanu, AND I REMAIN OF THE LIGHT!"
- [/message]
- {DELFADOR_LIGHTNING}
- # We're counting on the lich-scream as Ihiah-Malal dies to end the
- # scene.
- [/event]
-
- # But nobody else can.
- [event]
- name=last breath
- first_time_only=no
- [filter]
- id=Iliah-Malal
- [/filter]
- [filter_second]
- [not]
- id=Delfador
- [/not]
- [/filter_second]
-
- [message]
- speaker="Iliah-Malal"
- message=_ "The power of death is mine! When you strike me down I
arise stronger than before!"
- [/message]
-
- # He gets the standard +3 hitpoints and full heal.
- {ADVANCE_UNIT (id="Iliah-Malal") ()}
- [/event]
-
# wmllint: recognize Kalenz
[event]
@@ -345,14 +446,32 @@
[/message]
[/else]
[/if]
+ [if]
+ [have_unit]
+ side=1
+ race=undead
+ [/have_unit]
+ [then]
+ [message]
+ speaker=Delfador
+ message= _ "You who fought beside me in the Land of the
Dead and chose the side of the living on this day, return now to your peace and
rest."
+ [/message]
+ [/then]
+ [kill]
+ side=1
+ race=undead
+ [/kill]
+ [/if]
[message]
speaker=Lionel
message=_"And the portal, it is sealed for good?"
[/message]
[message]
speaker=Delfador
- message=_"Yes, it is. But it was too great a work of magic to be
entirely undone; there is a flaw still remaining, a trace of Iliah-Malal's way
between worlds. Summoning undead will be a little easier in the future than it
has been before. Those who come after us will have to be vigilant against the
corruption of the dark arts, and show themselves worthy of the land they live
in."
- [/message]
+ message=_"Yes, it is. But it was too great a work of magic to be
entirely undone; there is a flaw still remaining, a trace of Iliah-Malal's way
between worlds. Raising undead will be a little easier in the future than it
has been before. Those who come after us will have to be vigilant against the
corruption of the dark arts, and show themselves worthy of the land they live
in."
+ [/message]
+
+ {CLEAR_VARIABLE undead_veterans}
# This is set-up for the next scenario, where Kalenz leads side 1 again
{DELFADOR_DEPARTS_AGAIN}
Modified: trunk/data/campaigns/Delfadors_Memoirs/utils/sides.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/utils/sides.cfg?rev=35026&r1=35025&r2=35026&view=diff
==============================================================================
--- trunk/data/campaigns/Delfadors_Memoirs/utils/sides.cfg (original)
+++ trunk/data/campaigns/Delfadors_Memoirs/utils/sides.cfg Sat Apr 18 22:37:30
2009
@@ -195,6 +195,9 @@
x={X}
y={Y}
[/unstore_unit]
+
+ # Force the fog to clear
+ [redraw][/redraw]
# He's making a dramatic entrance.
[scroll_to]
@@ -426,14 +429,9 @@
id=Delfador
[/filter]
[/store_unit]
- {VARIABLE kalenz_store.canrecruit yes}
- [unstore_unit]
- variable=kalenz_store
- find_vacant=yes
- x=3
- y=2
- [/unstore_unit]
- # It would be nice to let Delfador keep his veterans, but that
+ # Delfador dismissed his undead veterans
+ {CLEAR_VARIABLE undead_recall}
+ # It would be nice to let Delfador keep his other veterans, but that
# would stretch the storyline a bit far. Human veterans will get
# old; dwarves have longer lifespans, but letting Delfador have
# them back would imply that dwarves had been following him around
@@ -445,6 +443,8 @@
[disallow_recruit]
type={DWARVES}
[/disallow_recruit]
+ # Kalenz will lead in next scenario
+ {MODIFY_UNIT id=Kalenz canrecruit yes}
#enddef
# At the beginning of Prince of Wesnoth (21) Kalenz is running
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits