NR S5a: improved the sequence upon entering Malifor's study by the main doors

This commit is contained in:
Charles Dang 2015-03-21 05:53:02 +11:00
parent ddbd55191c
commit 045bd31733
3 changed files with 49 additions and 21 deletions

View file

@ -7,8 +7,8 @@ Xu, Xu, Xu, Xu, Xu, Cud, Xu, Xu, Xu, Xu, Re, Rd^Edb, Re^Edb, Chr, Ch, Chr, Re^Ed
Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Cud, Xu, Re, Chr^Eb, Re, Re, Re, Rd^Edb, Re, Chr^Eb, Re, Xu, Xu, Xu, Xuc, Cud^Eb, Urb, Urb, Urb, Urb, Urb, Urb, Rr, Rr, Urb, Cud^Ebn, Urb, Cud, Xuc, Xuc, Wwg, Wog, Xos, Xu
Xu, Xu, Xu, Xu, Qxu, Xu, Xu, Xu, Rd, Uu, Uu, Re^Edb, Xu, Rd, Re^Es, Re^Es, Xu, Re, Xu, Xu, Xu, Xu, Xu, Xu, Urb, Urb, Urb, Urb, Rr, Rr, Urb, Urb, Urb, Urb, Urb, Urb, Xu, Xu, Wwg, Wog, Xos, Xos
Xu, Xu, Qxu, Qxu, Uh^Vu, Uh, Re, Rd, Uu, Urb, Xu, Cud, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xos, Xos, Urb, Urb, Rr, Rr, Urb, Urb, Urb, Urb, Urb, Urb, Xu, Cud, Xu, Xu, Wwg^Xo, Wwg, Xos, Xos
Xu, Xu, Qxu, Qxu, Re^Es, Uh, Uu, Uu, Re, Uh^Uf, Xu, Xu, Xu, Xu, Xos, Xos, Xu, Xu, Xu, Xu, Xol, Xol, Urb, Xos, Xos, Rr, Urb, Urb, Urb, Urb, Cud, Urb, Urb, Xu, Re^Ii, Xu, Xu, Xu, Wwg, Xos, Xos, Xos
Xu, Xu, Uh^Uf, Rd, 7 Kud, Cud, Uu, Uu^Vu, Uu, Uh, Xu, Xu, Xos, Xos, Urb, Urb^Xo, Xos, Xu, Xu, Xos, Cud, Urb, Rr, Rr, Urb, Xos, Xos, Xos, Xos, Xu, Xu, Xu, Xu, Xu, Re^Ii, Urb^Ii, Uu, Wwf, Chw, Xos, Xos, Xos
Xu, Xu, Qxu, Qxu, Re^Es, Uh, Uu, Uu, Re, Uh^Uf, Xu, Xu, Xu, Xu, Xos, Xos, Xu, Xu, Xu, Xu, Xol, Xol, Urb, Urb^Xo, Rr^Xo, Rr, Urb, Urb, Urb, Urb, Cud, Urb, Urb, Xu, Re^Ii, Xu, Xu, Xu, Wwg, Xos, Xos, Xos
Xu, Xu, Uh^Uf, Rd, 7 Kud, Cud, Uu, Uu^Vu, Uu, Uh, Xu, Xu, Xos, Xos, Urb, Urb^Xo, Xos, Xu, Xu, Xos, Cud, Urb, Rr, Rr, Urb, Urb^Xo, Xos, Xos, Xos, Xu, Xu, Xu, Xu, Xu, Re^Ii, Urb^Ii, Uu, Wwf, Chw, Xos, Xos, Xos
Xu, Xu, Uh^Uf, Uu^Uf, Cud, Cud, Uu, Re, Re, Urb, Urb, Xol, Xol, Urb, Xol, Xos, Urb^Xo, Xu, Xu, Xos, Urb, Rr, Urb, Urb, Xol, Xos, Xos, Xos, Xu, Xu, Xu, Xu, Xu, Urb, Uu, Re^Es, Wwf, Chw, Kh, Wog, Wog^Xo, Xos
Xu, Xu, Uu^Uf, Uh, Uu, Uu, Uu, Uu, Uu, Uu, Xos, Cud, Rr, Urb, Urb, Xol, Urb, Xos, Xos, Xos, Cud, Rr, Rr, Urb, Urb, Xol, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Wwf^Vm, Chw, Wwf, Wog, Wog^Xo, Wog
Xu, Xu, Xu, Re, Uu, Uu, Uu^Vud, Xu, Uu, Xu, Xos, Xos, Urb, Rr, Rr, Urb, Urb, Xos, Xos, Xos, Xos, Urb, Urb, Rr, Rr, Urb, Cud, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Wwf, Wwf^Em, Xu, Xu, Xu, Wog

View file

@ -216,7 +216,6 @@
# Whole lot of doors
{PLACE_IMAGE scenery/dwarven-doors-closed.png 22 4}
{PLACE_IMAGE scenery/dwarven-doors-closed.png 24 9}
{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}
@ -224,6 +223,11 @@
{PLACE_IMAGE scenery/dwarven-doors-closed.png 9 4}
{PLACE_IMAGE scenery/dwarven-doors-closed.png 34 28}
# Gates to Malifor's study
{PLACE_IMAGE scenery/gate-rusty-sw.png 23 9}
{PLACE_IMAGE scenery/gate-rusty-sw.png 24 9}
{PLACE_IMAGE scenery/gate-rusty-sw.png 25 10}
# Prisoners
#define PLACE_PRISONER_IMAGE IMAGE X Y
{PLACE_IMAGE "{IMAGE}~RC(magenta>red)~BLIT(items/cage.png)" {X} {Y}}
@ -2179,22 +2183,22 @@
[option]
message= _ "Get those doors open!"
[command]
[message]
speaker=narrator
image=none
message= _ "With a grating sound, the false wall slides away to reveal Malifors study."
[/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=Cud
terrain="^" # Intentional, to remove the overlay
layer=overlay
[/terrain]
[redraw]
side=1
[/redraw]
[message]
speaker=unit
message= _ "Lets go!"
@ -2396,6 +2400,21 @@
[/message]
[/event]
#define MALIFOR_GUARD TYPE X Y
[unit]
side=2
type={TYPE}
x,y={X},{Y}
generate_name=yes
random_traits=no
random_gender=yes
facing=sw
animate=yes
[/unit]
#enddef
# Opening the door will trigger the confrontation with Malifor
[event]
name=confront_malifor
@ -2407,22 +2426,30 @@
y=3-10
[/remove_shroud]
[delay]
time=500
[/delay]
[scroll_to_unit]
id=Malifor
[/scroll_to_unit]
[message]
speaker=Malifor
message= _ "You wretched vermin, I have had it with you! Guards!"
[/message]
# Give Malifor some guards and gold.
# TODO: maybe decrease this number
{NOTRAIT_UNIT 2 Deathblade 25 6} {FACING sw}
{NOTRAIT_UNIT 2 Deathblade 29 8} {FACING sw}
{NOTRAIT_UNIT 2 Lich 27 5} {FACING sw}
{NOTRAIT_UNIT 2 Lich 32 7} {FACING sw}
{MALIFOR_GUARD Deathblade 25 6}
{MALIFOR_GUARD Deathblade 29 8}
{MALIFOR_GUARD Lich 27 5}
{MALIFOR_GUARD Lich 32 7}
#ifndef EASY
{NOTRAIT_UNIT 2 Deathblade 31 4} {FACING sw}
{MALIFOR_GUARD Deathblade 31 4}
#ifndef NORMAL
{NOTRAIT_UNIT 2 Deathblade 29 7} {FACING sw}
{NOTRAIT_UNIT 2 Lich 35 6} {FACING sw}
{MALIFOR_GUARD Deathblade 29 7}
{MALIFOR_GUARD Lich 35 6}
#endif
#endif
@ -2850,3 +2877,4 @@
#undef MALIFORS_GUARD_RECRUITS
#undef MALIFORS_LAST_BREATH
#undef MALIFOR_RESPAWN
#undef MALIFOR_GUARD

Binary file not shown.