Author: esr
Date: Sun Apr 19 21:13:01 2009
New Revision: 35065
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35065&view=rev
Log:
Make Delfador return with the correct class in Clash at the Manor.
Modified:
trunk/data/campaigns/Delfadors_Memoirs/scenarios/20_prince_of_wesnoth.cfg
trunk/data/campaigns/Delfadors_Memoirs/utils/sides.cfg
Modified:
trunk/data/campaigns/Delfadors_Memoirs/scenarios/20_prince_of_wesnoth.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/scenarios/20_prince_of_wesnoth.cfg?rev=35065&r1=35064&r2=35065&view=diff
==============================================================================
--- trunk/data/campaigns/Delfadors_Memoirs/scenarios/20_prince_of_wesnoth.cfg
(original)
+++ trunk/data/campaigns/Delfadors_Memoirs/scenarios/20_prince_of_wesnoth.cfg
Sun Apr 19 21:13:01 2009
@@ -49,6 +49,8 @@
{GOLD 130 100 100}
[/side]
#wmllint: validate-on
+
+ {STARTING_VILLAGES_ALL 1}
[event]
name=prestart
@@ -139,10 +141,13 @@
[/event]
[event]
- name=die
+ name=last breath
[filter]
id=Eldred
[/filter]
+
+ # Keep his unit on the board
+ {FULL_HEAL id=Eldred}
[move_unit_fake]
type=$delfador_store.type
@@ -152,30 +157,11 @@
# wmllint: recognize Delfador
{DELFADOR_ARRIVES 24 16}
- #the flash of Delfador's lightning bolt
[scroll_to_unit]
id=Delfador
[/scroll_to_unit]
- [sound]
- name=lightning.ogg
- [/sound]
-
- [colour_adjust]
- red=100
- green=100
- blue=100
- [/colour_adjust]
-
- [delay]
- time=10
- [/delay]
-
- [colour_adjust]
- red=0
- green=0
- blue=0
- [/colour_adjust]
+ {DELFADOR_LIGHTNING}
[message]
id=Delfador
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=35065&r1=35064&r2=35065&view=diff
==============================================================================
--- trunk/data/campaigns/Delfadors_Memoirs/utils/sides.cfg (original)
+++ trunk/data/campaigns/Delfadors_Memoirs/utils/sides.cfg Sun Apr 19 21:13:01
2009
@@ -358,10 +358,10 @@
# consequences are delayed because 16 is talk-only.
#
# At the beginning of A New Ally (17), Delfador gets back the
-# Wesnothians (his original recruit list), plus the human survivors from
-# Terror at the Ford of Parthyn (12). However we don't bring back
-# Lionel, the cutscene in 16 has him commanding the defenses of
-# Weldyn.
+# Wesnothians (his original recruit list), plus the human survivors
+# from Terror at the Ford of Parthyn (12). However we don't bring back
+# Lionel, the cutscene in Dark Skies over Weldyn (16) has him
+# commanding the defenses of Weldyn.
#
#define RESTORE_WESNOTHIAN_VETERANS
@@ -490,16 +490,16 @@
# At the end of Prince of Wesnoth (20), Delfador intervenes.
#define DELFADOR_ARRIVES X Y
- [set_variable]
- name=delfador_store.hitpoints
- value=delfador_store.max_hitpoints
- [/set_variable]
[unstore_unit]
variable=delfador_store
find_vacant=yes
x,y={X},{Y}
[/unstore_unit]
{CLEAR_VARIABLE delfador_store}
+ {FULL_HEAL id=Delfador}
+ [redraw]
+ side=1
+ [/redraw]
#enddef
# At the end of Prince of Wesnoth (20), Delfador gets control of side 1 again.
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
