Author: esr
Date: Sun May 10 17:50:46 2009
New Revision: 35544
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35544&view=rev
Log:
Simplify side-hacking machinery and arrange for the elf regall list from Get
The Gold to be available in Showdown. Addresses the undone bit of bug #13502.
Modified:
trunk/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
trunk/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
Modified: trunk/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg?rev=35544&r1=35543&r2=35544&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
(original)
+++ trunk/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg Sun
May 10 17:50:46 2009
@@ -147,6 +147,7 @@
{GOLD4 400 300 250 200}
team_name=knalgans
user_team_name=_"Alliance"
+ save_id=Elves
[/side]
# Enemy AI - set to be agressive
[side]
@@ -540,7 +541,7 @@
[/message]
[/event]
- # Victory - if Sisal is alive place her on side 1 recall list for showdown.
+ # Victory
[event]
name=victory
@@ -553,32 +554,12 @@
id=Sisal
[/have_unit]
[then]
- [store_unit]
- [filter]
- id=Sisal
- [/filter]
- variable=recall_sisal
- [/store_unit]
- {VARIABLE recall_sisal.side 9}
- {VARIABLE recall_sisal.canrecruit no}
- [unstore_unit]
- variable=recall_sisal
- [/unstore_unit]
- {CLEAR_VARIABLE reall_sisal}
+ {MODIFY_UNIT id=Sisal canrecruit no}
[/then]
[/if]
- [store_unit]
- [filter]
- id=Eryssa
- [/filter]
- kill=no
- variable=eryssa_hack
- [/store_unit]
- {VARIABLE eryssa_hack.side 1}
- [unstore_unit]
- variable=eryssa_hack
- [/unstore_unit]
- {CLEAR_VARIABLE eryssa_hack}
+ # Make veteran elves (including Sisal if still alive) available for
+ # the Elf side in Showdown.
+ {MODIFY_UNIT (side=2) side 9}
[/event]
# Load death events
{campaigns/Northern_Rebirth/utils/herodeaths.cfg}
Modified: trunk/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg?rev=35544&r1=35543&r2=35544&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg (original)
+++ trunk/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg Sun May 10
17:50:46 2009
@@ -274,6 +274,7 @@
recruit=Elvish Fighter,Elvish Archer,Elvish Shaman,Elvish Scout,Elvish
Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Rider,Elvish
Druid,Elvish Sorceress
team_name=knalgans
user_team_name=_"Alliance"
+ save_id=Elves
controller=human
no_leader=yes
[/side]
@@ -332,9 +333,9 @@
y=$side_seven_starts_at.y
[/hide_unit]
- # Check if Eryssa is alive. If yes place her at the helm of side 9,
- # if no younger lich assumes command. Note, this method does
- # not carry over veterans from the previous scenario,
+ # Check if Eryssa is alive. If yes place her at the helm of side 9;
+ # if not, younger lich assumes command and elvers are scrubbed from
+ # the side's recall list.
[recall]
id=Eryssa
[/recall]
@@ -367,6 +368,9 @@
{CLEAR_VARIABLE place_eryssa_at}
[/then]
[else]
+ [kill]
+ race=Elves
+ [/kill]
[store_unit]
[filter]
id="Ro'Sothian"
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
