Author: fendrin
Date: Sat Oct 24 17:07:17 2009
New Revision: 39429
URL: http://svn.gna.org/viewcvs/wesnoth?rev=39429&view=rev
Log:
UtbS 09: Nested the event that drive Kromph mad after Eloh's death in the event
where he switches sides.
It's still unclear if a surviving Kromph doesn't break the campaign's later
scenarios.
This is an untested fix for bug #14425.
Modified:
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
Modified:
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg?rev=39429&r1=39428&r2=39429&view=diff
==============================================================================
---
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
(original)
+++
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
Sat Oct 24 17:07:17 2009
@@ -2524,21 +2524,28 @@
speaker=Eloh
message= _ "No, I don't think you shall pester me
any more. You shall be as a statue, forced to watch events unfold and helpless
to interfere. Yes, I think this will be an appropriate punishment. Then perhaps
you will learn not to question my divine will."
[/message]
- [store_unit]
- [filter]
- id=Zhul
- [/filter]
- kill=yes
- variable=Zhul_statue
- # wmllint: recognize Zhul_statue
- [/store_unit]
-
- {VARIABLE Zhul_statue.id "Zhul_statue"}
- {VARIABLE Zhul_statue.status.petrified "on"}
-
- [unstore_unit]
- variable=Zhul_statue
- [/unstore_unit]
+
+ [petrify]
+ id=Zhul
+ [/petrify]
+
+ {MODIFY_UNIT id=Zhul status.petrified yes}
+
+ # [store_unit]
+ # [filter]
+ # id=Zhul
+ # [/filter]
+ # kill=yes
+ # variable=Zhul_statue
+ # # wmllint: recognize
Zhul_statue
+ # [/store_unit]
+
+ # {VARIABLE Zhul_statue.id
"Zhul_statue"}
+ # {VARIABLE
Zhul_statue.status.petrified "on"}
+
+ # [unstore_unit]
+ # variable=Zhul_statue
+ # [/unstore_unit]
[/then]
[/if]
@@ -2584,20 +2591,57 @@
speaker=Kromph
message= _ "Pretty lady say elves bad. Kill elves.
Kill!"
[/message]
- [store_unit]
+
+ {MODIFY_UNIT id=Kromph side 3}
+
+
+ # [store_unit]
+ # [filter]
+ # id=Kromph
+ # [/filter]
+ # kill=yes
+ # variable=unitstats
+ # [/store_unit]
+ # [set_variable]
+ # name=unitstats.side
+ # value=3
+ # [/set_variable]
+ # [unstore_unit]
+ # variable=unitstats
+ # [/unstore_unit]
+
+ [event]
+ name=die
[filter]
- id=Kromph
+ id=Eloh
[/filter]
- kill=yes
- variable=unitstats
- [/store_unit]
- [set_variable]
- name=unitstats.side
- value=3
- [/set_variable]
- [unstore_unit]
- variable=unitstats
- [/unstore_unit]
+
+ # Eloh's death causes Kromph to go nuts and attack
elves
+ [if]
+ [have_unit]
+ id=Kromph
+ [/have_unit]
+ [then]
+ [message]
+ speaker=Kromph
+ message= _ "Mistress gone, must follow
commands, but Nym master too, Nym say must protect elves, but mistress say must
kill elves, but must protect, must kill, protect, kill, protect, kill,
aauuggghhhhh!!!"
+ [/message]
+ [kill]
+ id=Kromph
+ fire_event=no
+ animate=yes
+ [/kill]
+ [message]
+ speaker=Kaleh
+ message= _ "He just collapsed, the
conflicting orders must have been too much for him."
+ [/message]
+ [message]
+ speaker=Nym
+ message= _ "Poor Kromph, at least he's
finally at rest."
+ [/message]
+ [/then]
+ [/if]
+ [/event]
[/then]
[/if]
[/then]
@@ -3199,44 +3243,21 @@
message= _ "That was just an apparition, but if we meet again I
will make her pay for all that she has done."
[/message]
- # Eloh's death causes Kromph to go nuts and attack elves
- [if]
- [have_unit]
- id=Kromph
- [/have_unit]
- [then]
- [message]
- speaker=Kromph
- message= _ "Mistress gone, must follow commands, but Nym
master too, Nym say must protect elves, but mistress say must kill elves, but
must protect, must kill, protect, kill, protect, kill, aauuggghhhhh!!!"
- [/message]
- [kill]
- id=Kromph
- fire_event=no
- animate=yes
- [/kill]
- [message]
- speaker=Kaleh
- message= _ "He just collapsed, the conflicting orders must
have been too much for him."
- [/message]
- [message]
- speaker=Nym
- message= _ "Poor Kromph, at least he's finally at rest."
- [/message]
- [/then]
- [/if]
- [store_unit]
- variable=zhul_statue
- kill=yes
- [filter]
- id=Zhul_statue
- [/filter]
- [/store_unit]
- {VARIABLE zhul_statue.status.petrified "off"}
- {VARIABLE zhul_statue.id "Zhul"}
- {VARIABLE zhul_statue.name _"Zhul"}
- [unstore_unit]
- variable=zhul_statue
- [/unstore_unit]
+ [/event]
+
+ [event]
+ name=die
+ [filter]
+ id=Eloh
+ [/filter]
+ #TODO old and ugly code for releasing the petrification
+ [scroll_to_unit]
+ id=Zhul
+ [/scroll_to_unit]
+ [unpetrify]
+ id=Zhul
+ [/unpetrify]
+
[message]
speaker=Zhul
message= _ "I'm sorry, Kaleh. My faith clouded my reason. But I
wanted so very much to believe."
@@ -3281,6 +3302,7 @@
[/then]
[/if]
[/event]
+
# Event 9: Meeting and Death of Tanstafaal
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
