apply some variable cleanup from UtBS:Eftboren

This commit is contained in:
Simon Forsyth 2012-04-04 22:54:41 +00:00
parent f706cea122
commit 818b7e64f1

View File

@ -135,20 +135,18 @@
description= _ "Death of Garak" description= _ "Death of Garak"
condition=lose condition=lose
[show_if] [show_if]
[variable] [have_unit]
name=found_garak id=Garak
boolean_equals=yes [/have_unit]
[/variable]
[/show_if] [/show_if]
[/objective] [/objective]
[objective] [objective]
description= _ "Death of Zhul" description= _ "Death of Zhul"
condition=lose condition=lose
[show_if] [show_if]
[variable] [have_unit]
name=found_zhul id=Zhul
boolean_equals=yes [/have_unit]
[/variable]
[/show_if] [/show_if]
[/objective] [/objective]
@ -564,12 +562,6 @@
[/else] [/else]
[/if] [/if]
# Record the fact that we have found Garak
[set_variable]
name=found_garak
value=yes
[/set_variable]
# Summon objectives dialog # Summon objectives dialog
[show_objectives] [show_objectives]
[/show_objectives] [/show_objectives]
@ -584,23 +576,11 @@
[/filter] [/filter]
[if] [if]
[variable] [not]
name=found_garak [have_unit]
boolean_equals=yes role="Rocky Horror"
[/variable] [/have_unit]
[and] [/not]
[not]
[have_unit]
role="Rocky Horror"
[/have_unit]
[/not]
[/and]
# [and]
# [variable]
# name=garak_speech_happened
# boolean_equals=no
# [/variable]
# [/and]
[then] [then]
[fire_event] [fire_event]
name=garak_speech name=garak_speech
@ -627,12 +607,6 @@
speaker=Garak speaker=Garak
message= _ "Thanks for the help. I am glad to see that so many have survived the night. But theres no time to talk, we must save the rest of our people and crush any other of these earthen abominations back into the earth." message= _ "Thanks for the help. I am glad to see that so many have survived the night. But theres no time to talk, we must save the rest of our people and crush any other of these earthen abominations back into the earth."
[/message] [/message]
# Record the fact that this event has happened
# [set_variable]
# name=garak_speech_happened
# value=yes
# [/set_variable]
[/event] [/event]
# The following three events are nested, because they are supposed to # The following three events are nested, because they are supposed to
@ -716,12 +690,6 @@
message= _ "All things of this world come to an end, but the power of Eloh endures. A new one shall grow in its place. Come now, let us see to the needs of our people." message= _ "All things of this world come to an end, but the power of Eloh endures. A new one shall grow in its place. Come now, let us see to the needs of our people."
[/message] [/message]
# Record the fact that we have found Zhul
[set_variable]
name=found_zhul
value=yes
[/set_variable]
# Summon objectives dialog # Summon objectives dialog
[show_objectives] [show_objectives]
[/show_objectives] [/show_objectives]
@ -916,7 +884,7 @@
# time. For example if the undead capture the village at 30,8 first, the # time. For example if the undead capture the village at 30,8 first, the
# following container would be set: # following container would be set:
# [village_at_30_8] # [village_at_30_8]
# captured_first_by=undead # captured_by=undead
# [/village_at_30_8] # [/village_at_30_8]
[event] [event]
@ -970,15 +938,13 @@
[if] [if]
[variable] [variable]
name=village_at_$x1|_$y1|.captured_first_by name=village_at_$x1|_$y1|.captured_by
not_equals=undead not_equals=undead
[/variable] [/variable]
# if this village wasn't captured by undead first, the # if this village wasn't captured by undead first, the
# player has a chance of finding a random elf # player has a chance of finding a random elf
[then] [then]
{VARIABLE village_at_$x1|_$y1|.captured_first_by elves}
{VARIABLE_OP fate rand "1..100"} {VARIABLE_OP fate rand "1..100"}
# And check if it's lower than a threshold of # And check if it's lower than a threshold of
# finding an unit that's dependent on diffficulty # finding an unit that's dependent on diffficulty
@ -1070,16 +1036,7 @@
[/filter_location] [/filter_location]
[/filter] [/filter]
[if] {VARIABLE village_at_$x1|_$y1|.captured_by undead}
[variable]
name=village_at_$x1|_$y1|.captured_first_by
not_equals=elves
[/variable]
[then]
{VARIABLE village_at_$x1|_$y1|.captured_first_by undead}
[/then]
[/if]
[/event] [/event]
[event] [event]
@ -1237,11 +1194,6 @@
[/have_unit] [/have_unit]
[/not] [/not]
[then] [then]
[modify_side]
side=3
gold=100
[/modify_side]
[fire_event] [fire_event]
name=xanthos_appearance name=xanthos_appearance
[/fire_event] [/fire_event]
@ -1481,14 +1433,6 @@
{CLEAR_VARIABLE seen_mudcrawler} {CLEAR_VARIABLE seen_mudcrawler}
{CLEAR_VARIABLE rescued_elves} {CLEAR_VARIABLE rescued_elves}
{CLEAR_VARIABLE seen_naru} {CLEAR_VARIABLE seen_naru}
[clear_variable]
name=found_garak
[/clear_variable]
[clear_variable]
name=found_zhul
[/clear_variable]
[/event] [/event]
[event] [event]