Author: esr
Date: Mon Aug 18 03:52:17 2008
New Revision: 28692
URL: http://svn.gna.org/viewcvs/wesnoth?rev=28692&view=rev
Log:
Address bug #11973 (Vengeance: Dead Ethiliel suggests to talk to
Ithelden) by merging two death events into an if/then/else.
Modified:
trunk/data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg
Modified: trunk/data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg?rev=28692&r1=28691&r2=28692&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg (original)
+++ trunk/data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg Mon Aug 18
03:52:17 2008
@@ -291,56 +291,60 @@
[filter]
side=1
[/filter]
- [message]
- speaker=Ethiliel
- message= _ "We won't be able to hold them off for long. I should
go reason with them!"
- [/message]
- [message]
- speaker=Deoran
- message= _ "Are you sure that the elves will greet you any more
kindly than they have met us? After all, you did lead us into the forests..."
- [/message]
- [message]
- speaker=Ethiliel
- message= _ "Perhaps not, but it is your only hope. I must reach
Ithelden!"
- [/message]
-
- {SET_LABEL 6 15 _"Ithelden's base"}
- {HIGHLIGHT_IMAGE 6 15 items/gohere.png ()}
-
- [objectives]
- side=1
- [objective]
- description= _ "Send Ethiliel to the Great Tree and parlay
with Ithelden"
- condition=win
- [/objective]
- [objective]
- description= _ "Death of Deoran"
- condition=lose
- [/objective]
- [objective]
- description= _ "Death of Ethiliel"
- condition=lose
- [/objective]
- [/objectives]
- [/event]
-
- [event]
- name=die
- [filter]
- id=Ethiliel
- [/filter]
- [message]
- speaker=Minister Hylas
- message= _ "Ithelden's elves have killed Ethiliel! Now we have no
chance to come to an agreement with them. A war with the Elves is imminent."
- [/message]
- [message]
- speaker=Deoran
- message= _ "We are far away from Weldyn. We'll surely all be
killed long before any reinforcements arrive."
- [/message]
-
- [endlevel]
- result=defeat
- [/endlevel]
+ [if]
+ [variable]
+ name=unit.id
+ equals=Etheliel
+ [/variable]
+
+ [then]
+ [message]
+ speaker=Minister Hylas
+ message= _ "Ithelden's elves have killed Ethiliel! Now we
have no chance to come to an agreement with them. A war with the Elves is
imminent."
+ [/message]
+ [message]
+ speaker=Deoran
+ message= _ "We are far away from Weldyn. We'll surely all
be killed long before any reinforcements arrive."
+ [/message]
+
+ [endlevel]
+ result=defeat
+ [/endlevel]
+ [/then]
+ [else]
+ [message]
+ speaker=Ethiliel
+ message= _ "We won't be able to hold them off for long. I
should go reason with them!"
+ [/message]
+ [message]
+ speaker=Deoran
+ message= _ "Are you sure that the elves will greet you any
more kindly than they have met us? After all, you did lead us into the
forests..."
+ [/message]
+ [message]
+ speaker=Ethiliel
+ message= _ "Perhaps not, but it is your only hope. I must
reach Ithelden!"
+ [/message]
+
+ {SET_LABEL 6 15 _"Ithelden's base"}
+ {HIGHLIGHT_IMAGE 6 15 items/gohere.png ()}
+
+ [objectives]
+ side=1
+ [objective]
+ description= _ "Send Ethiliel to the Great Tree and
parlay with Ithelden"
+ condition=win
+ [/objective]
+ [objective]
+ description= _ "Death of Deoran"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Death of Ethiliel"
+ condition=lose
+ [/objective]
+ [/objectives]
+ [/else]
+ [/if]
[/event]
[event]
_______________________________________________
Wesnoth-commits mailing list
Wesnoth-commits@gna.org
https://mail.gna.org/listinfo/wesnoth-commits
