upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-08 07:26:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove some redundant conditions

Browse Source
This commit is contained in:
Simon Forsyth 2012-07-09 00:04:47 +00:00
parent 65025e1f4f
commit d9a6cc94ed
1 changed files with 44 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg
View File

@ -1103,17 +1103,22 @@
[/if] [/if]
[/event] [/event]
# Macro: defeat both leaders, now have to take keys back to citadel door # Defeat both leaders, now have to take keys back to citadel door
[event]
name=found_both_keys_and_door
#define ELOH_MACRO [filter_condition]
[variable]
name=num_keys_found
numerical_equals=2
[/variable]
[if]
[variable] [variable]
name=found_door name=found_door
boolean_equals=yes boolean_equals=yes
[/variable] [/variable]
[/filter_condition]
[then]
[message] [message]
speaker=Kaleh speaker=Kaleh
message= _ "We’ve found both keys. Now we just have to take them and open the door to the black citadel. I tire of all this bloodshed. Wherever Yechnagoth hides, we will find her and make her pay for all she has done." message= _ "We’ve found both keys. Now we just have to take them and open the door to the black citadel. I tire of all this bloodshed. Wherever Yechnagoth hides, we will find her and make her pay for all she has done."
@ -1140,10 +1145,7 @@
note={NO_GOLD_CARRYOVER_NOTE} note={NO_GOLD_CARRYOVER_NOTE}
[/objectives] [/objectives]
[/then] [/event]
[/if]
#enddef
# Event 9: Defeat the undead leader # Event 9: Defeat the undead leader
@ -1188,21 +1190,9 @@
{VARIABLE_OP num_keys_found add 1} {VARIABLE_OP num_keys_found add 1}
[if] [fire_event]
[variable] name=found_both_keys_and_door
name=num_keys_found [/fire_event]
numerical_equals=2
[/variable]
[variable]
name=found_door
boolean_equals=yes
[/variable]
[then]
{ELOH_MACRO}
[/then]
[/if]
[/event] [/event]
# Event 10: Defeat the orc leader # Event 10: Defeat the orc leader
@ -1248,21 +1238,9 @@
{VARIABLE_OP num_keys_found add 1} {VARIABLE_OP num_keys_found add 1}
[if] [fire_event]
[variable] name=found_both_keys_and_door
name=num_keys_found [/fire_event]
numerical_equals=2
[/variable]
[variable]
name=found_door
boolean_equals=yes
[/variable]
[then]
{ELOH_MACRO}
[/then]
[/if]
[/event] [/event]
# Event 11: An elf goes to open the doors # Event 11: An elf goes to open the doors