diff options
| author | jesusalva <cpntb1@ymail.com> | 2018-02-12 22:06:20 -0200 |
|---|---|---|
| committer | jesusalva <cpntb1@ymail.com> | 2018-02-12 22:06:20 -0200 |
| commit | 8952a6bf1f83d1f5d62824e1a348779eed503795 (patch) | |
| tree | 5e3c3e8e120f4c04f3feac71b4a8ed5fad052f8d | |
| parent | 1508bda0f83cae103b65f02c4a6417e0e384596f (diff) | |
| download | serverdata-jesusalva/arnea.tar.gz serverdata-jesusalva/arnea.tar.bz2 serverdata-jesusalva/arnea.tar.xz serverdata-jesusalva/arnea.zip | |
Resetsjesusalva/arnea
| -rw-r--r-- | npc/003-13/arnea.txt | 9 | ||||
| -rw-r--r-- | npc/003-5/_import.txt | 1 | ||||
| -rw-r--r-- | npc/003-5/_warps.txt | 2 | ||||
| -rw-r--r-- | npc/003-5/arnea.txt | 6 | ||||
| -rw-r--r-- | npc/003-5/doors.txt | 22 |
5 files changed, 6 insertions, 34 deletions
diff --git a/npc/003-13/arnea.txt b/npc/003-13/arnea.txt index 4cf07ca14..804c9038e 100644 --- a/npc/003-13/arnea.txt +++ b/npc/003-13/arnea.txt @@ -46,11 +46,10 @@ L_Manage: //mes .@ArenaToFree; //next; $@ARENA_INSTANCES[.@ArenaToFree]=-1; - warp "003-5", 33, 40; - DESTROY_ME=1; - DESTROY_MY_ID=instance_id(); - //instance_detachmap("003-13"); - //instance_destroy(instance_id()); // TODO FIXME + //warp "003-5", 33, 40; + close2; + instance_destroy(instance_id()); // TODO FIXME + close; break; case 3: break; 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; -} - |