diff options
| author | gumi <git@gumi.ca> | 2018-02-15 10:53:32 -0500 |
|---|---|---|
| committer | gumi <git@gumi.ca> | 2018-03-20 21:22:00 -0400 |
| commit | 3605ca68d55461cb1da9b01f41f5d2c0ff514503 (patch) | |
| tree | 8c21604bef095c4a5fc5c6b3bd4f2dcc1bc4ac27 /npc/001-1 | |
| parent | 99f4e1606e8e4bd5c476d81758803da82476c5f4 (diff) | |
| download | serverdata-3605ca68d55461cb1da9b01f41f5d2c0ff514503.tar.gz serverdata-3605ca68d55461cb1da9b01f41f5d2c0ff514503.tar.bz2 serverdata-3605ca68d55461cb1da9b01f41f5d2c0ff514503.tar.xz serverdata-3605ca68d55461cb1da9b01f41f5d2c0ff514503.zip | |
yeah... this got very messy (my bad!). let's not use custom terminators after all
Diffstat (limited to 'npc/001-1')
| -rw-r--r-- | npc/001-1/manhole.txt | 16 | ||||
| -rw-r--r-- | npc/001-1/xilaxa.txt | 28 |
2 files changed, 12 insertions, 32 deletions
diff --git a/npc/001-1/manhole.txt b/npc/001-1/manhole.txt index f2bae5f0..77616cf1 100644 --- a/npc/001-1/manhole.txt +++ b/npc/001-1/manhole.txt @@ -20,11 +20,9 @@ l("..."), l("Do you want to enter in sewer?")); - if (askyesno() == 1) { - cwarp("001-3-0", 152, 56); - } - - bye; + closeclientdialog(); + if (askyesno() == 1) slide_or_warp("001-3-0", 152, 56); + close; OnInit: .sex = G_OTHER; @@ -43,11 +41,9 @@ OnInit: l("..."), l("Do you want to enter in sewer?")); - if (askyesno() == 1) { - cwarp("001-3-0", 196, 36); - } - - bye; + closeclientdialog(); + if (askyesno() == 1) slide_or_warp("001-3-0", 196, 36); + close; OnInit: .sex = G_OTHER; diff --git a/npc/001-1/xilaxa.txt b/npc/001-1/xilaxa.txt index 5b7ec398..f6f1189c 100644 --- a/npc/001-1/xilaxa.txt +++ b/npc/001-1/xilaxa.txt @@ -6,28 +6,12 @@ 001-1,52,44,0 script Xilaxa#001-1 NPC_UKAR_MALE_LEGION_ARTIS,{ - function face_to_PC { - getmapxy(.@map$, .@cx, .@cy, 0); - @Devis_old_dir = .dir; - npc_turntoxy(.@cx, .@cy); - - return; - } - - function local_close { - if (@Devis_old_dir != .dir) - { - .dir = @Devis_old_dir; - } - npc_resumemove; - - close; - } - - npc_pausemove; - face_to_PC; - npctalkonce goodbye_msg(); - local_close; + npc_pausemove(); + getmapxy(.@map$, .@cx, .@cy, 0); + npc_turntoxy(.@cx, .@cy); + npctalkonce("Hello."); + npc_resumemove(); + close; OnTimer1000: dographmovestep; |