summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/017-10/airship.txt4
-rw-r--r--npc/025-2-1/_import.txt2
-rw-r--r--npc/025-2/_import.txt2
-rw-r--r--npc/025-2/main.txt4
4 files changed, 9 insertions, 3 deletions
diff --git a/npc/017-10/airship.txt b/npc/017-10/airship.txt
index cebfa62ee..751be8cea 100644
--- a/npc/017-10/airship.txt
+++ b/npc/017-10/airship.txt
@@ -36,7 +36,7 @@ OnTouch:
addtimer 70000, "#ToFortress::OnWarper";
addtimer 60000, "#ToFortress::OnNotif";
}
- end;
+ close;
OnNotif:
specialeffect FX_MAGIC, SELF, getcharid(3);
@@ -56,6 +56,8 @@ OnWarper:
017-10,63,28,0 script #ToFortressAbort NPC_NO_SPRITE,5,0,{
end;
OnTouch:
+ removespecialeffect(FX_CIRCLE, SELF, getcharid(3));
+ atcommand("@refresh"); // FIXME :(
deltimer "#ToFortress::OnWarper";
deltimer "#ToFortress::OnNotif";
end;
diff --git a/npc/025-2-1/_import.txt b/npc/025-2-1/_import.txt
index 98b41ac94..362abe0b0 100644
--- a/npc/025-2-1/_import.txt
+++ b/npc/025-2-1/_import.txt
@@ -1,2 +1,4 @@
// Map 025-2-1: Fortress Island Cave
// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/025-2-1/_mobs.txt",
+"npc/025-2-1/_warps.txt",
diff --git a/npc/025-2/_import.txt b/npc/025-2/_import.txt
index 6d385567b..60bad3648 100644
--- a/npc/025-2/_import.txt
+++ b/npc/025-2/_import.txt
@@ -1,3 +1,5 @@
// Map 025-2: Fortress Island - South
// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/025-2/_mobs.txt",
+"npc/025-2/_warps.txt",
"npc/025-2/main.txt",
diff --git a/npc/025-2/main.txt b/npc/025-2/main.txt
index 2450eb867..1006e042c 100644
--- a/npc/025-2/main.txt
+++ b/npc/025-2/main.txt
@@ -4,7 +4,7 @@
// Notes:
// Fortress Island South (Lv 70~150 Area)
-025-2 mapflag mask 3
+025-2 mapflag mask 5
025-2,97,122,0 script Airship NPC_AIRSHIP,{
mesc l(".:: Fortress Island ::."), 1;
@@ -13,11 +13,11 @@
next;
if (askyesno() == ASK_YES) {
specialeffect FX_CIRCLE, SELF, getcharid(3);
+ closeclientdialog;
sleep2(5000);
removespecialeffect(FX_CIRCLE, SELF, getcharid(3));
if (ispcdead()) end;
warp "017-10", 64, 25;
- closeclientdialog;
}
close;