summaryrefslogtreecommitdiff
path: root/npc/003-5
diff options
context:
space:
mode:
Diffstat (limited to 'npc/003-5')
-rw-r--r--npc/003-5/_import.txt1
-rw-r--r--npc/003-5/_warps.txt2
-rw-r--r--npc/003-5/arnea.txt6
-rw-r--r--npc/003-5/doors.txt22
4 files changed, 2 insertions, 29 deletions
diff --git a/npc/003-5/_import.txt b/npc/003-5/_import.txt
index 3cc7e2b9e..df1250d0c 100644
--- a/npc/003-5/_import.txt
+++ b/npc/003-5/_import.txt
@@ -1,5 +1,4 @@
// Map 003-5: Tulimshar Jeweler
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/003-5/arnea.txt",
-"npc/003-5/doors.txt",
"npc/003-5/_warps.txt",
diff --git a/npc/003-5/_warps.txt b/npc/003-5/_warps.txt
index 1997c1c85..5e4345780 100644
--- a/npc/003-5/_warps.txt
+++ b/npc/003-5/_warps.txt
@@ -1,3 +1,3 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 003-5: Tulimshar Jeweler warps
-//003-5,38,41,0 warp #003-5_38_41 0,0,003-1,96,145
+003-5,38,41,0 warp #003-5_38_41 0,0,003-1,96,145
diff --git a/npc/003-5/arnea.txt b/npc/003-5/arnea.txt
index 73412b486..c9e87c384 100644
--- a/npc/003-5/arnea.txt
+++ b/npc/003-5/arnea.txt
@@ -6,10 +6,6 @@
// Arena for Duels and PVP (003-13,31,31)
003-5,33,37,0 script Arnea NPC_ELF_F,{
- if (DESTROY_ME) {
- DESTROY_ME=0;
- instance_destroy(DESTROY_MY_ID);
- }
mesn;
mesq l("Welcome to the Arena. Select your action");
menu
@@ -34,7 +30,7 @@ L_NewArena:
l("Give Up"), L_Quit;
mes (@menu-1);
- .@ARENA_INSTID = instance_create("003-13@arenax"+(@menu), 0, IOT_NONE);
+ .@ARENA_INSTID = instance_create("003-13@arenax"+(@menu), getcharid(3), IOT_CHAR);
if (.@ARENA_INSTID >= 0)
{
mes "new instance id: " + str(.@ARENA_INSTID);
diff --git a/npc/003-5/doors.txt b/npc/003-5/doors.txt
deleted file mode 100644
index 1b4492356..000000000
--- a/npc/003-5/doors.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-// TMW2 scripts.
-// Authors:
-// Jesusalva
-
-003-5,38,41,0 script LeaveArena NPC_HIDDEN,0,0,{
-
-OnTouch:
- if (DESTROY_ME) goto L_Warn;
-
- goto L_Warp;
-
-L_Warn:
- mesn "Narrator";
- mes col(l("You are not allowed to leave until you inform Arnea that you're done."), 1);
- close;
-
-L_Warp:
- warp "003-1", 96, 145;
- closedialog;
- close;
-}
-