0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Counting the number of caged merfolk...

Browse source 
...makes the logic slightly simpler than counting the number that were freed
This commit is contained in:
Simon Forsyth 2012-07-07 23:14:23 +00:00
parent c15a77e489
commit 98ac6c8c02
1 changed files with 36 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
View file

@ -324,8 +324,8 @@
#initialize starting variables
[set_variable]
name=number_merfolk_freed
value=0
name=number_merfolk_caged
value=5
[/set_variable]
[set_variable]
name=number_merfolk_deaths
@ -990,7 +990,7 @@
#Macro (event 3): check if all merfolk have been freed
# if number_merfolk_freed = 5
# if number_merfolk_caged = 0
# have humans retreat, go to eloh event
# I need to put this before events 2 (rescuing of merfolk) because this
@ -998,13 +998,13 @@
#define CHECK_IF_FREED_ALL_MERFOLK
[set_variable]
name=number_merfolk_freed
add=1
name=number_merfolk_caged
sub=1
[/set_variable]
[if]
[variable]
name=number_merfolk_freed
numerical_equals=5
name=number_merfolk_caged
numerical_equals=0
[/variable]
[then]
[if]
@ -1201,8 +1201,8 @@
[/filter]
[if]
[variable]
name=number_merfolk_freed
less_than=5
name=number_merfolk_caged
greater_than=0
[/variable]
[then]
[remove_item]
@ -1224,8 +1224,8 @@
[/unit]
[if]
[variable]
name=number_merfolk_freed
numerical_equals=0
name=number_merfolk_caged
numerical_equals=5
[/variable]
[then]
[if]
@ -1288,8 +1288,8 @@
[/filter]
[if]
[variable]
name=number_merfolk_freed
less_than=5
name=number_merfolk_caged
greater_than=0
[/variable]
[then]
[remove_item]
@ -1311,8 +1311,8 @@
[/unit]
[if]
[variable]
name=number_merfolk_freed
numerical_equals=0
name=number_merfolk_caged
numerical_equals=5
[/variable]
[then]
[if]
@ -1376,8 +1376,8 @@
[/filter]
[if]
[variable]
name=number_merfolk_freed
less_than=5
name=number_merfolk_caged
greater_than=0
[/variable]
[then]
[remove_item]
@ -1399,8 +1399,8 @@
[/unit]
[if]
[variable]
name=number_merfolk_freed
numerical_equals=0
name=number_merfolk_caged
numerical_equals=5
[/variable]
[then]
[if]
@ -1460,8 +1460,8 @@
[/filter]
[if]
[variable]
name=number_merfolk_freed
less_than=5
name=number_merfolk_caged
greater_than=0
[/variable]
[then]
[remove_item]
@ -1483,8 +1483,8 @@
[/unit]
[if]
[variable]
name=number_merfolk_freed
numerical_equals=0
name=number_merfolk_caged
numerical_equals=5
[/variable]
[then]
[if]
@ -1571,8 +1571,8 @@
[/filter]
[if]
[variable]
name=number_merfolk_freed
less_than=5
name=number_merfolk_caged
greater_than=0
[/variable]
[then]
[remove_item]
@ -1643,8 +1643,8 @@
[then]
[if]
[variable]
name=number_merfolk_freed
equals=5
name=number_merfolk_caged
equals=0
[/variable]
[then]
# no merfolk left in cages
@ -1799,7 +1799,7 @@
# Event 4: Time runs out
# turn = 16 and number_merfolk_freed < 5
# turn = 16 and number_merfolk_caged > 0
# kill all captured merfolk
# (if all merfolk have been freed except hidden mermaid enchantress
# then change the message that gets displayed, because player will not
@ -1813,8 +1813,8 @@
[filter_condition]
[variable]
name=number_merfolk_freed
less_than=5
name=number_merfolk_caged
greater_than=0
[/variable]
[/filter_condition]
@ -1884,8 +1884,8 @@
[/variable]
[variable]
name=number_merfolk_freed
numerical_equals=4
name=number_merfolk_caged
numerical_equals=1
[/variable]
[then]
[if]
@ -1972,16 +1972,11 @@
[set_variable]
name=number_merfolk_deaths
add=5
add=$number_merfolk_caged
[/set_variable]
[set_variable]
name=number_merfolk_deaths
sub=$number_merfolk_freed
[/set_variable]
# consider all merfolk freed for purposes of other events
[set_variable]
name=number_merfolk_freed
value=5
name=number_merfolk_caged
value=0
[/set_variable]
# if player hasn't kept 3 merfolk alive then defeat
@ -3043,7 +3038,7 @@
y=14, 14, 15, 16, 17, 18, 19, 20, 21, 21, 22, 23, 23, 24, 24, 25
[/move_unit_fake]
{PLACE_IMAGE "units/transport/galleon.png~RC(magenta>red)" 9 25}
{CLEAR_VARIABLE number_merfolk_freed}
{CLEAR_VARIABLE number_merfolk_caged}
{CLEAR_VARIABLE number_merfolk_deaths}
{CLEAR_VARIABLE saw_mermaid_enchantress}
{CLEAR_VARIABLE test_counter}