NR5_1: Fixes to Malifor attack and secret door events (#3154)

NR S5a: bugfixes

* Fixes #3117 - Malifor damage event now occurs on defence as well on attack

* Fixes #3116: - Doors to the study can now be opened from inside

[ci skip]

(cherry-picked from commit 913b77d79d9ac0fb4d67ac1461811aeb691daa60)
This commit is contained in:
Thom Diment 2018-06-04 17:52:20 +01:00 committed by sevu
parent 77376ff378
commit 72775f4ebd

View File

@ -235,7 +235,6 @@
[/side]
# Whole lot of doors
{PLACE_IMAGE scenery/dwarven-doors-closed.png 22 4}
{PLACE_IMAGE scenery/dwarven-doors-closed.png 33 9}
{PLACE_IMAGE scenery/dwarven-doors-closed.png 19 3}
{PLACE_IMAGE scenery/dwarven-doors-closed.png 19 4}
@ -1761,6 +1760,8 @@
terrain=Uu
[/terrain]
{PLACE_IMAGE scenery/dwarven-doors-closed.png 22 4}
[redraw]
side=1
[/redraw]
@ -1774,6 +1775,42 @@
speaker=unit
message= _ "Great Chamber, my foot! This is a death chamber!"
[/message]
#You can enter from the study, but only if you've already triggered the spiders
[event]
name=moveto
first_time_only=no
[filter]
x,y=23,5
[/filter]
[filter_condition]
[variable]
name=spider_door_opened
boolean_equals=no
[/variable]
[/filter_condition]
[message]
speaker=unit
message= _ "Hmmm. The wall appears weak here. I think there might be something on the other side."
[/message]
[sound]
name=cave-in.ogg
[/sound]
[terrain]
x,y=22,4
terrain=Uu
[/terrain]
[message]
speaker=unit
message= _ "There we go."
[/message]
{VARIABLE spider_door_opened yes}
[/event]
[/event]
# ================================================================
@ -2272,6 +2309,45 @@
[/option]
[/message]
[/event]
#main gates from inside
[event]
name=moveto
[filter]
side=1
x=24,25,26
y=8,9,9
[/filter]
[filter_condition]
[variable]
name=main_door_opened
boolean_equals=no
[/variable]
[/filter_condition]
[message]
speaker=Tallin
0message= _ "Get those doors open!"
[/message]
[sound]
name=gate-fall.ogg
[/sound]
[remove_item]
x=23,24,25
y=9,9,10
[/remove_item]
[terrain]
x=23,24,25
y=9,9,10
terrain="^" # Intentional, to remove the overlay
layer=overlay
[/terrain]
{VARIABLE main_door_opened yes}
[/event]
# Spider chamber door
[event]
@ -2449,6 +2525,40 @@
[/option]
[/message]
[/event]
#flooded passage from inside
[event]
name=moveto
first_time_only=no
[filter]
side=1
x=32,32,33
y=9,8,8
[/filter]
[filter_condition]
[variable]
name=back_door_opened
boolean_equals=no
[/variable]
[/filter_condition]
[message]
speaker=unit
message= _ "Hey, check this out, it looks like some sort of lever."
[/message]
[sound]
name=cave-in.ogg
[/sound]
[terrain]
x,y=33,9
terrain=Uu
[/terrain]
{VARIABLE back_door_opened yes}
[/event]
#define MALIFOR_GUARD TYPE X Y
[unit]
@ -2618,10 +2728,10 @@
[event]
name=attack end
[filter]
id=Father Morvin,Sister Thera
id=Father Morvin,Sister Thera,Malifor
[/filter]
[filter_second]
id=Malifor
id=Malifor,Father Morvin,Sister Thera
[/filter_second]
[message]