Author: esr
Date: Fri Apr 17 13:59:52 2009
New Revision: 34977
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34977&view=rev
Log:
Fix a reference to King Garard's portrait.
Make Deglfador's undead veterans available for scenario 20
Modified:
trunk/data/campaigns/Delfadors_Memoirs/scenarios/05_council_in_weldyn.cfg
trunk/data/campaigns/Delfadors_Memoirs/utils/sides.cfg
Modified:
trunk/data/campaigns/Delfadors_Memoirs/scenarios/05_council_in_weldyn.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/scenarios/05_council_in_weldyn.cfg?rev=34977&r1=34976&r2=34977&view=diff
==============================================================================
--- trunk/data/campaigns/Delfadors_Memoirs/scenarios/05_council_in_weldyn.cfg
(original)
+++ trunk/data/campaigns/Delfadors_Memoirs/scenarios/05_council_in_weldyn.cfg
Fri Apr 17 13:59:52 2009
@@ -29,7 +29,7 @@
type=King of Wesnoth
id=Garard
name=_ "Garard"
- portrait=portraits/garard.png
+ profile=portraits/garard.png
side=2
recruit=Royal Guard
team_name=goodies
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=34977&r1=34976&r2=34977&view=diff
==============================================================================
--- trunk/data/campaigns/Delfadors_Memoirs/utils/sides.cfg (original)
+++ trunk/data/campaigns/Delfadors_Memoirs/utils/sides.cfg Fri Apr 17 13:59:52
2009
@@ -88,13 +88,14 @@
{MEMOIRS_STORE_UNITS delfador_lionels_guard}
#enddef
-# At the beginning of Wasteland (11) Delf loses his undead veterans and gets
-# to recruit elves. Note: this macro needs to be called from a start or
prestart
-# event, before recruiting can occur.
+# At the beginning of Wasteland (11), Delf loses his undead veterans
+# and gets to recruit elves. The undead will get one more chance to
+# shine in Showdown in the Northern Swamp (20). Note: this macro needs
+# to be called from a start or prestart event, before recruiting can
+# occur.
#define DISCARD_UNDEAD_VETERANS
{MEMOIRS_STORE_UNITS dead_recall}
- {CLEAR_VARIABLE dead_recall}
#enddef
# At the end of Wasteland (11), Chantal's side 3 gets absorbed into Delfador's
@@ -209,9 +210,9 @@
# This sequence of declarations happens to put the units where we want
# them - Shock Troopers and Royal Guard nortb of Delfador, towards the
# enemy, and the White Mages behind him - but this is an accident of the
- # vacancy finding algorithm. Ideally we want to use formula syntaz to'
+ # vacancy-finding algorithm. Ideally we want to use formula syntax to
# say things like x,y=$({X}-1),$({Y}+1) below, but that doesn't work
- # reliably yet (units randomly fail to appear when it's tried).
+ # reliably yet in 1.7.0 (units randomly fail to appear when it's tried).
[unit]
id=Clogrin
name=_ "Clogrin"
@@ -399,6 +400,15 @@
y={Y}
[/unstore_unit]
# FIXME: Maybe Delf should regain the ability to recruit L1 elves?
+#enddef
+
+# Also at the beginning of Showdown in the Northern Swamp (20),
+# any undead veterans Delfador has left from the Houses of the Dead
+# and The Gate Between Worlds scenarios return to fight for the living.
+# They get finally dispelled at the end of the scenario.
+
+#define UNDEAD_REJOIN_DELFADOR
+ {MEMOIRS_UNSTORE_UNITS dead_recall}
#enddef
# Shortly afterwards, Lionel puts his troops under Delfador's command.
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
