Allow undoing moves when moving to a location...

...where an unrescued merfolk was after they were killed
This commit is contained in:
Simon Forsyth 2012-07-08 22:44:33 +00:00
parent b3fef72362
commit 45361183a6

View File

@ -1179,17 +1179,13 @@
[event]
name=moveto
id=rescue_urruga
[filter]
x,y=25, 36
side=1
[/filter]
[if]
[variable]
name=number_merfolk_caged
greater_than=0
[/variable]
[then]
[remove_item]
x,y=25, 36
[/remove_item]
@ -1259,24 +1255,18 @@
[/else]
[/if]
{CHECK_IF_FREED_ALL_MERFOLK}
[/then]
[/if]
[/event]
# Merman Warrior Nuvassa (1st NE island)
[event]
name=moveto
id=rescue_nuvassa
[filter]
x,y=34, 31
side=1
[/filter]
[if]
[variable]
name=number_merfolk_caged
greater_than=0
[/variable]
[then]
[remove_item]
x,y=34, 31
[/remove_item]
@ -1347,24 +1337,18 @@
[/else]
[/if]
{CHECK_IF_FREED_ALL_MERFOLK}
[/then]
[/if]
[/event]
# Merman Spearman Yantili (2nd NW sandy island)
[event]
name=moveto
id=rescue_yantili
[filter]
x,y=18, 32
side=1
[/filter]
[if]
[variable]
name=number_merfolk_caged
greater_than=0
[/variable]
[then]
[remove_item]
x,y=18, 32
[/remove_item]
@ -1431,24 +1415,18 @@
[/else]
[/if]
{CHECK_IF_FREED_ALL_MERFOLK}
[/then]
[/if]
[/event]
# Mermaid Priestess Il-tian (2nd NE grass island)
[event]
name=moveto
id=rescue_iltian
[filter]
x,y=31, 25
side=1
[/filter]
[if]
[variable]
name=number_merfolk_caged
greater_than=0
[/variable]
[then]
[remove_item]
x,y=31, 25
[/remove_item]
@ -1514,8 +1492,6 @@
[/else]
[/if]
{CHECK_IF_FREED_ALL_MERFOLK}
[/then]
[/if]
[/event]
# We-jial Mermaid Enchantress, trapped in cave
@ -1550,16 +1526,12 @@
[event]
name=moveto
id=rescue_wejial
[filter]
x,y=27, 19
side=1
[/filter]
[if]
[variable]
name=number_merfolk_caged
greater_than=0
[/variable]
[then]
[remove_item]
x,y=27, 19
[/remove_item]
@ -1596,8 +1568,6 @@
[/message]
{CLEAR_VARIABLE explorer}
{CHECK_IF_FREED_ALL_MERFOLK}
[/then]
[/if]
[/event]
# Event 2.1: Merfolk death counter
@ -1803,6 +1773,28 @@
[/variable]
[/filter_condition]
# Remove any remaining rescue events
[event]
id=rescue_urruga
remove=true
[/event]
[event]
id=rescue_nuvassa
remove=true
[/event]
[event]
id=rescue_yantili
remove=true
[/event]
[event]
id=rescue_iltian
remove=true
[/event]
[event]
id=rescue_wejial
remove=true
[/event]
# To do: add dialogue when merfolk die
# remove shroud around human leader