From 124ab2a1cdb344f24170a4d91f7000ebabf39b40 Mon Sep 17 00:00:00 2001 From: Kisuka Date: Mon, 28 Oct 2013 00:42:23 -0700 Subject: Added ability to use constants instead of sprite IDs for NPCs. Converted all npcs to use this. --- npc/warps/cities/umbala.txt | 2 +- npc/warps/cities/yuno.txt | 26 ++++++++++---------- npc/warps/dungeons/alde_dun.txt | 8 +++---- npc/warps/dungeons/c_tower.txt | 20 ++++++++-------- npc/warps/dungeons/kh_dun.txt | 2 +- npc/warps/dungeons/lhz_dun.txt | 50 +++++++++++++++++++-------------------- npc/warps/dungeons/mosk_dun.txt | 26 ++++++++++---------- npc/warps/dungeons/pay_dun.txt | 2 +- npc/warps/dungeons/prt_maze.txt | 8 +++---- npc/warps/dungeons/ra_san.txt | 2 +- npc/warps/fields/abyss_warper.txt | 6 ++--- npc/warps/fields/glastheim.txt | 2 +- npc/warps/fields/jawaii.txt | 2 +- npc/warps/guildcastles.txt | 2 +- npc/warps/other/arena.txt | 2 +- 15 files changed, 80 insertions(+), 80 deletions(-) (limited to 'npc/warps') diff --git a/npc/warps/cities/umbala.txt b/npc/warps/cities/umbala.txt index 1d9058ffa..f86c90d2c 100644 --- a/npc/warps/cities/umbala.txt +++ b/npc/warps/cities/umbala.txt @@ -26,7 +26,7 @@ umbala,100,203,0 warp um_houseA2-1 1,1,um_in,163,69 um_in,166,69,0 warp um_houseA2-2 1,1,umbala,102,205 umbala,107,130,0 warp um_houseB1-1 1,1,um_in,99,66 um_in,99,63,0 warp um_houseB1-2 1,1,umbala,108,127 -umbala,220,189,0 script um_shaman1-1 45,1,1,{ +umbala,220,189,0 script um_shaman1-1 WARPNPC,1,1,{ OnTouch: if (event_umbala == 7) { warp "um_in",32,71; diff --git a/npc/warps/cities/yuno.txt b/npc/warps/cities/yuno.txt index 3b3e51fc8..4d6ebee86 100644 --- a/npc/warps/cities/yuno.txt +++ b/npc/warps/cities/yuno.txt @@ -88,7 +88,7 @@ yuno,245,147,0 warp yun65 1,1,yuno_in01,101,88 yuno_in01,101,85,0 warp yun66 1,1,yuno,245,144 // Yuno In05 (Entering Random Warps) ------------------------------------------- -yuno_in05,153,141,0 script #yun63 45,1,1,{ +yuno_in05,153,141,0 script #yun63 WARPNPC,1,1,{ if (rand(2)) warp "yuno_in05",192,102; else @@ -96,28 +96,28 @@ yuno_in05,153,141,0 script #yun63 45,1,1,{ end; } // Yuno In05 (Random Warps - Cross Shaped) ------------------------------------- -yuno_in05,196,102,0 script #yun64 45,1,1,{ +yuno_in05,196,102,0 script #yun64 WARPNPC,1,1,{ switch(rand(3)) { case 0: warp "yuno_in05",169,102; end; case 1: warp "yuno_in05",128,82; end; case 2: warp "yuno_in05",156,141; end; } } -yuno_in05,181,116,0 script #yun65 45,1,1,{ +yuno_in05,181,116,0 script #yun65 WARPNPC,1,1,{ switch(rand(3)) { case 0: warp "yuno_in05",181,94; end; case 1: warp "yuno_in05",176,13; end; case 2: warp "yuno_in05",136,75; end; } } -yuno_in05,165,102,0 script #yun66 45,1,1,{ +yuno_in05,165,102,0 script #yun66 WARPNPC,1,1,{ if (rand(2)) warp "yuno_in05",192,102; else warp "yuno_in05",145,82; end; } -yuno_in05,181,91,0 script #yun67 45,1,1,{ +yuno_in05,181,91,0 script #yun67 WARPNPC,1,1,{ if (rand(2)) warp "yuno_in05",181,112; else @@ -125,21 +125,21 @@ yuno_in05,181,91,0 script #yun67 45,1,1,{ end; } // Yuno In05 (Random Warps - T-Shaped) ----------------------------------------- -yuno_in05,148,82,0 script #yun68 45,1,1,{ +yuno_in05,148,82,0 script #yun68 WARPNPC,1,1,{ switch(rand(3)) { case 0: warp "yuno_in05",169,102; end; case 1: warp "yuno_in05",128,82; end; case 2: warp "yuno_in05",156,141; end; } } -yuno_in05,125,82,0 script #yun69 45,1,1,{ +yuno_in05,125,82,0 script #yun69 WARPNPC,1,1,{ if (rand(2)) warp "yuno_in05",192,102; else warp "yuno_in05",145,82; end; } -yuno_in05,136,71,0 script #yun70 45,1,1,{ +yuno_in05,136,71,0 script #yun70 WARPNPC,1,1,{ switch(rand(3)) { case 0: warp "yuno_in05",181,112; end; case 1: warp "yuno_in05",16,185; end; @@ -147,21 +147,21 @@ yuno_in05,136,71,0 script #yun70 45,1,1,{ } } // Yuno In05 (Random Warps - Other) -------------------------------------------- -yuno_in05,16,188,0 script #yun71 45,1,1,{ +yuno_in05,16,188,0 script #yun71 WARPNPC,1,1,{ switch(rand(3)) { case 0: warp "yuno_in05",181,94; end; case 1: warp "yuno_in05",176,13; end; case 2: warp "yuno_in05",136,75; end; } } -yuno_in05,176,9,0 script #yun72 45,1,1,{ +yuno_in05,176,9,0 script #yun72 WARPNPC,1,1,{ if (rand(2)) warp "yuno_in05",181,112; else warp "yuno_in05",176,48; end; } -yuno_in05,176,52,0 script #yun73 45,1,1,{ +yuno_in05,176,52,0 script #yun73 WARPNPC,1,1,{ switch(rand(3)) { case 0: warp "yuno_in05",181,94; end; case 1: warp "yuno_in05",176,13; end; @@ -169,14 +169,14 @@ yuno_in05,176,52,0 script #yun73 45,1,1,{ } } // Yuno In05 (Destination - Room) ---------------------------------------------- -yuno_in05,40,178,0 script #yun74 45,1,1,{ +yuno_in05,40,178,0 script #yun74 WARPNPC,1,1,{ switch(rand(3)) { case 0: warp "yuno_in05",181,94; end; case 1: warp "yuno_in05",176,13; end; case 2: warp "yuno_in05",136,75; end; } } -yuno_in05,47,186,0 script #yun75 45,1,1,{ +yuno_in05,47,186,0 script #yun75 WARPNPC,1,1,{ switch(rand(3)) { case 0: warp "yuno_in05",181,94; end; case 1: warp "yuno_in05",176,13; end; diff --git a/npc/warps/dungeons/alde_dun.txt b/npc/warps/dungeons/alde_dun.txt index 563f926a0..f74bf7c48 100644 --- a/npc/warps/dungeons/alde_dun.txt +++ b/npc/warps/dungeons/alde_dun.txt @@ -26,7 +26,7 @@ alde_dun02,122,169,0 warp ald006 2,2,c_tower3,47,41 alde_dun02,187,234,0 warp ald007 2,2,c_tower3,65,147 //============================================================ //= Random B2 ================================================ -alde_dun02,267,41,4 script ald008r 45,1,1,{ +alde_dun02,267,41,4 script ald008r WARPNPC,1,1,{ if (rand(2)) warp "c_tower3",168,252; else @@ -40,7 +40,7 @@ alde_dun03,276,48,0 warp ald012 2,2,c_tower1,235,223 //============================================================ //7(npc) //= Random B3-1 ================================================ -alde_dun03,130,125,4 script ald014r 45,1,1,{ +alde_dun03,130,125,4 script ald014r WARPNPC,1,1,{ switch(rand(3)) { case 0: warp "c_tower2",228,267; end; case 1: warp "alde_dun03",130,130; end; @@ -49,7 +49,7 @@ alde_dun03,130,125,4 script ald014r 45,1,1,{ } //============================================================ //= Random 3-2 =============================================== -alde_dun03,171,127,4 script ald015r 45,1,1,{ +alde_dun03,171,127,4 script ald015r WARPNPC,1,1,{ switch(rand(3)) { case 0: warp "c_tower2",13,282; end; case 1: warp "alde_dun03",175,131; end; @@ -62,7 +62,7 @@ alde_dun04,215,192,0 warp ald018 1,1,c_tower2,148,283 alde_dun04,32,74,0 warp aldd19 1,1,alde_dun02,187,239 alde_dun04,208,58,0 warp aldd20 2,2,alde_dun04,268,74 alde_dun04,272,74,0 warp aldd021 2,2,alde_dun04,204,62 -alde_dun04,80,34,4 script ald022r 45,1,1,{ +alde_dun04,80,34,4 script ald022r WARPNPC,1,1,{ switch(rand(4)) { case 0: warp "c_tower2",13,282; end; case 1: warp "alde_dun03",175,131; end; diff --git a/npc/warps/dungeons/c_tower.txt b/npc/warps/dungeons/c_tower.txt index 6523ceece..b7b46d16d 100644 --- a/npc/warps/dungeons/c_tower.txt +++ b/npc/warps/dungeons/c_tower.txt @@ -22,7 +22,7 @@ c_tower2,273,26,0 warp clt005 1,1,c_tower1,235,223 //============================================================ //= Level 2 ================================================== //= Random 2-1 =============================================== -c_tower2,13,288,4 script clt006r 45,1,1,{ +c_tower2,13,288,4 script clt006r WARPNPC,1,1,{ switch(rand(3)) { case 0: warp "c_tower2",13,282; end; case 1: warp "alde_dun03",175,131; end; @@ -31,7 +31,7 @@ c_tower2,13,288,4 script clt006r 45,1,1,{ } //============================================================ //= Random 2-2 =============================================== -c_tower2,223,267,4 script clt007r 45,1,1,{ +c_tower2,223,267,4 script clt007r WARPNPC,1,1,{ switch(rand(3)) { case 0: warp "c_tower2",288,267; end; case 1: warp "alde_dun03",130,130; end; @@ -47,7 +47,7 @@ c_tower3,42,41,0 warp clt012 1,1,alde_dun02,127,169 c_tower3,146,8,0 warp clt013 1,1,c_tower1,235,223 //============================================================ //= Random 3-1 =============================================== -c_tower3,163,252,4 script clt014r 45,1,1,{ +c_tower3,163,252,4 script clt014r WARPNPC,1,1,{ if (rand(2)) warp "c_tower3",168,252; else @@ -56,7 +56,7 @@ c_tower3,163,252,4 script clt014r 45,1,1,{ } //============================================================ //= Random 3-2 =============================================== -c_tower3,240,7,4 script clt015r 45,1,1,{ +c_tower3,240,7,4 script clt015r WARPNPC,1,1,{ switch(rand(3)) { case 0: warp "c_tower2",13,282; end; case 1: warp "alde_dun03",175,131; end; @@ -65,7 +65,7 @@ c_tower3,240,7,4 script clt015r 45,1,1,{ } //============================================================ //= Random 3-3 =============================================== -c_tower3,252,24,4 script clt016r 45,1,1,{ +c_tower3,252,24,4 script clt016r WARPNPC,1,1,{ switch(rand(3)) { case 0: warp "c_tower2",228,267; end; case 1: warp "alde_dun03",130,130; end; @@ -86,7 +86,7 @@ c_tower4,198,59,0 warp clt025 1,1,c_tower4,152,98 c_tower4,204,57,0 warp clt026 1,1,c_tower4,65,77 //============================================================ //= Random 4-1 =============================================== -c_tower4,75,156,4 script clt027r 45,0,0,{ +c_tower4,75,156,4 script clt027r WARPNPC,0,0,{ switch(rand(4)) { case 0: warp "c_tower3",168,252; end; case 1: warp "alde_dun02",262,41; end; @@ -96,7 +96,7 @@ c_tower4,75,156,4 script clt027r 45,0,0,{ } //============================================================ //= Random 4-2 =============================================== -c_tower4,68,79,4 script clt028r 45,0,0,{ +c_tower4,68,79,4 script clt028r WARPNPC,0,0,{ switch(rand(4)) { case 0: warp "c_tower2",13,282; end; case 1: warp "alde_dun03",175,131; end; @@ -106,7 +106,7 @@ c_tower4,68,79,4 script clt028r 45,0,0,{ } //============================================================ //= Random 4-3 =============================================== -c_tower4,142,151,4 script clt029r 45,0,0,{ +c_tower4,142,151,4 script clt029r WARPNPC,0,0,{ switch(rand(4)) { case 0: warp "c_tower3",168,252; end; case 1: warp "alde_dun02",262,41; end; @@ -116,7 +116,7 @@ c_tower4,142,151,4 script clt029r 45,0,0,{ } //============================================================ //= Random 4-4 =============================================== -c_tower4,151,96,4 script clt030r 45,0,0,{ +c_tower4,151,96,4 script clt030r WARPNPC,0,0,{ switch(rand(4)) { case 0: warp "c_tower2",228,267; end; case 1: warp "alde_dun03",130,130; end; @@ -126,7 +126,7 @@ c_tower4,151,96,4 script clt030r 45,0,0,{ } //============================================================ //= Random 4-5 =============================================== -c_tower4,189,40,4 script clt031r 45,2,2,{ +c_tower4,189,40,4 script clt031r WARPNPC,2,2,{ switch(rand(4)) { case 0: warp "c_tower2",228,267; end; case 1: warp "alde_dun03",130,130; end; diff --git a/npc/warps/dungeons/kh_dun.txt b/npc/warps/dungeons/kh_dun.txt index 7396ee91b..eaee1171a 100644 --- a/npc/warps/dungeons/kh_dun.txt +++ b/npc/warps/dungeons/kh_dun.txt @@ -24,7 +24,7 @@ kh_dun01,63,7,0 warp kh_dun_02 1,1,kh_dun01,227,176 kh_dun01,232,176,0 warp kh_dun_03 1,1,kh_dun01,63,12 //Second Floor -> First floor Random warp -kh_dun02,43,195,0 script kh_dun04 45,1,1,{ +kh_dun02,43,195,0 script kh_dun04 WARPNPC,1,1,{ OnTouch: if (rand(1,2) == 1) { warp "kh_dun01",41,206; diff --git a/npc/warps/dungeons/lhz_dun.txt b/npc/warps/dungeons/lhz_dun.txt index e95d2fe57..b0345b447 100644 --- a/npc/warps/dungeons/lhz_dun.txt +++ b/npc/warps/dungeons/lhz_dun.txt @@ -36,7 +36,7 @@ lhz_dun01,149,9,0 warp lhz_dun3-1 1,1,lhz_dun02,153,19 lhz_dun02,146,19,0 warp lhz_dun3-2 1,1,lhz_dun01,144,9 lhz_dun01,18,145,0 warp lhz_dun4-1 1,1,lhz_dun02,17,150 lhz_dun02,17,156,0 warp lhz_dun4-2 1,1,lhz_dun01,18,150 -lhz_dun02,149,149,4 script lhz_dun5-1 45,2,2,{ +lhz_dun02,149,149,4 script lhz_dun5-1 WARPNPC,2,2,{ OnTouch: if ((Upper != 1 && BaseLevel<95) || (Upper == 1 && BaseLevel<90)) { warp "lhz_dun02",145,149; @@ -50,7 +50,7 @@ lhz_dun03,139,137,0 warp lhz_dun5-2 1,1,lhz_dun02,149,142 //--------------------------Sewer Pipe-------------------------- -lighthalzen,313,301,0 script Sewer Pipe#lt 111,{ +lighthalzen,313,301,0 script Sewer Pipe#lt HIDDEN_NPC,{ if (MISC_QUEST&512) { mes "^3355FFYou found some sort"; mes "of large sewage pipe."; @@ -88,54 +88,54 @@ lhz_cube,177,96,0 warp lhzcube4 1,1,lighthalzen,310,302 // -3 are warps facing west. // -4 are warps facing north. //----------------- Room 66 74 ------------------------------- -lhz_cube,74,74,0 script cubew01-1 45,1,1,{ +lhz_cube,74,74,0 script cubew01-1 WARPNPC,1,1,{ callfunc "randomw"; end; } lhz_cube,66,67,0 warp cubew01-2 2,2,lhz_cube,10,18 -lhz_cube,59,74,0 script cubew01-3 45,1,1,{ +lhz_cube,59,74,0 script cubew01-3 WARPNPC,1,1,{ callfunc "randomw"; end; } -lhz_cube,66,82,0 script cubew01-4 45,1,1,{ +lhz_cube,66,82,0 script cubew01-4 WARPNPC,1,1,{ callfunc "randomw"; end; } //----------------- Room 66 136 ------------------------------ lhz_cube,74,136,0 warp cubew02-1 2,2,lhz_cube,10,193 -lhz_cube,66,129,0 script cubew02-2 45,1,1,{ +lhz_cube,66,129,0 script cubew02-2 WARPNPC,1,1,{ callfunc "randomw"; end; } -lhz_cube,59,136,0 script cubew02-3 45,1,1,{ +lhz_cube,59,136,0 script cubew02-3 WARPNPC,1,1,{ callfunc "randomw"; end; } -lhz_cube,66,144,0 script cubew02-4 45,1,1,{ +lhz_cube,66,144,0 script cubew02-4 WARPNPC,1,1,{ callfunc "randomw"; end; } //----------------- Room 67 193 ------------------------------ -lhz_cube,74,192,0 script cubew03-1 45,1,1,{ +lhz_cube,74,192,0 script cubew03-1 WARPNPC,1,1,{ callfunc "randomw"; end; } -lhz_cube,67,185,0 script cubew03-2 45,1,1,{ +lhz_cube,67,185,0 script cubew03-2 WARPNPC,1,1,{ callfunc "randomw"; end; } -lhz_cube,59,192,0 script cubew03-3 45,1,1,{ +lhz_cube,59,192,0 script cubew03-3 WARPNPC,1,1,{ callfunc "randomw"; end; } lhz_cube,67,200,0 warp cubew03-4 2,2,lhz_cube,10,136 //----------------- Room 66 18 ------------------------------- -lhz_cube,74,18,0 script cubew04-1 45,1,1,{ +lhz_cube,74,18,0 script cubew04-1 WARPNPC,1,1,{ callfunc "randomw"; end; } lhz_cube,66,11,0 warp cubew04-2 2,2,lhz_cube,10,18 -lhz_cube,59,18,0 script cubew04-3 45,1,1,{ +lhz_cube,59,18,0 script cubew04-3 WARPNPC,1,1,{ callfunc "randomw"; end; } @@ -143,61 +143,61 @@ lhz_cube,66,26,0 warp cubew04-4 2,2,lhz_cube,123,18 //----------------- Room 66 18 ------------------------------- lhz_cube,18,18,0 warp cubew05-1 2,2,lhz_cube,10,193 lhz_cube,10,11,0 warp cubew05-2 2,2,lhz_cube,123,18 -lhz_cube,3,18,0 script cubew05-3 45,1,1,{ +lhz_cube,3,18,0 script cubew05-3 WARPNPC,1,1,{ callfunc "randomw"; end; } -lhz_cube,10,26,0 script cubew05-4 45,1,1,{ +lhz_cube,10,26,0 script cubew05-4 WARPNPC,1,1,{ callfunc "randomw"; end; } //----------------- Room 10 74 ------------------------------- -lhz_cube,18,74,0 script cubew06-1 45,1,1,{ +lhz_cube,18,74,0 script cubew06-1 WARPNPC,1,1,{ callfunc "randomw"; end; } lhz_cube,10,67,0 warp cubew06-2 2,2,lhz_cube,123,18 lhz_cube,3,74,0 warp cubew06-3 2,2,lhz_cube,66,18 -lhz_cube,10,82,0 script cubew06-4 45,1,1,{ +lhz_cube,10,82,0 script cubew06-4 WARPNPC,1,1,{ callfunc "randomw"; end; } //----------------- Room 10 136 ------------------------------ lhz_cube,18,136,0 warp cubew07-1 2,2,lhz_cube,10,74 -lhz_cube,10,129,0 script cubew07-2 45,1,1,{ +lhz_cube,10,129,0 script cubew07-2 WARPNPC,1,1,{ callfunc "randomw"; end; } -lhz_cube,3,136,0 script cubew07-3 45,1,1,{ +lhz_cube,3,136,0 script cubew07-3 WARPNPC,1,1,{ callfunc "randomw"; end; } -lhz_cube,10,144,0 script cubew07-4 45,1,1,{ +lhz_cube,10,144,0 script cubew07-4 WARPNPC,1,1,{ callfunc "randomw"; end; } //----------------- Room 10 193 ------------------------------ -lhz_cube,18,192,0 script cubew08-1 45,1,1,{ +lhz_cube,18,192,0 script cubew08-1 WARPNPC,1,1,{ callfunc "randomw"; end; } -lhz_cube,10,185,0 script cubew08-2 45,1,1,{ +lhz_cube,10,185,0 script cubew08-2 WARPNPC,1,1,{ callfunc "randomw"; end; } lhz_cube,3,192,0 warp cubew08-3 2,2,lhz_cube,10,74 lhz_cube,10,200,0 warp cubew08-4 2,2,lhz_cube,66,18 //----------------- Room 123 18 ------------------------------ -lhz_cube,130,18,0 script cubew09-1 45,1,1,{ +lhz_cube,130,18,0 script cubew09-1 WARPNPC,1,1,{ callfunc "randomw"; end; } -lhz_cube,123,11,0 script cubew09-2 45,1,1,{ +lhz_cube,123,11,0 script cubew09-2 WARPNPC,1,1,{ callfunc "randomw"; end; } lhz_cube,115,18,0 warp cubew09-3 2,2,lhz_cube,248,184 -lhz_cube,123,26,0 script cubew09-4 45,1,1,{ +lhz_cube,123,26,0 script cubew09-4 WARPNPC,1,1,{ callfunc "randomw"; end; } diff --git a/npc/warps/dungeons/mosk_dun.txt b/npc/warps/dungeons/mosk_dun.txt index 451bdc62b..f9a195d06 100644 --- a/npc/warps/dungeons/mosk_dun.txt +++ b/npc/warps/dungeons/mosk_dun.txt @@ -17,7 +17,7 @@ mosk_fild02,190,257,0 warp moscoviawarp0401 1,1,mosk_dun01,189,45 mosk_dun01,189,42,0 warp moscoviawarp0501 1,1,mosk_fild02,190,254 mosk_in,215,36,0 warp babayagaout 1,1,mosk_dun02,53,217 -mosk_dun02,53,220,4 script #babayagain 45,1,1,{ +mosk_dun02,53,220,4 script #babayagain WARPNPC,1,1,{ end; OnTouch: if (mos_nowinter == 11) { @@ -115,7 +115,7 @@ OnTouch: } } -mosk_dun02,53,215,3 script Soldier1#mos 966,{ +mosk_dun02,53,215,3 script Soldier1#mos 4_M_RUSKNIGHT,{ mes "[Soldier]"; mes "We're the Csar's soldiers."; mes "We're called out for emergencies,"; @@ -131,7 +131,7 @@ OnEnable: end; } -mosk_dun02,50,217,3 script Soldier2#mos 966,{ +mosk_dun02,50,217,3 script Soldier2#mos 4_M_RUSKNIGHT,{ mes "[Soldier]"; mes "We're the Csar's soldiers."; mes "We're called out for emergencies,"; @@ -148,7 +148,7 @@ OnEnable: } -mosk_dun02,56,217,5 script Soldier3#mos 966,{ +mosk_dun02,56,217,5 script Soldier3#mos 4_M_RUSKNIGHT,{ mes "[Soldier]"; mes "We're the Csar's soldiers."; mes "We're called out for emergencies,"; @@ -164,14 +164,14 @@ OnEnable: end; } -mosk_dun01,170,164,3 script Milestone#1 111,{ +mosk_dun01,170,164,3 script Milestone#1 HIDDEN_NPC,{ mes "- There is writing on a big rock. -"; next; mes "^3131FF- Those who serve the Sun will die, Go to the North. -^000000"; close; } -mosk_dun01,207,276,3 script Milestone#1-2 111,{ +mosk_dun01,207,276,3 script Milestone#1-2 HIDDEN_NPC,{ mes "- There is writing on a big rock. -"; next; mes "^3131FF- Those who advance may get hurt but are courageous of heart and those who move back will remain safe."; @@ -187,7 +187,7 @@ mosk_dun01,207,276,3 script Milestone#1-2 111,{ close; } -mosk_dun01,264,191,3 script Milestone#1-3 111,{ +mosk_dun01,264,191,3 script Milestone#1-3 HIDDEN_NPC,{ mes "- There is writing on a big rock. -"; next; mes "^3131FF- Those who advance may get hurt but are brave of heart and those who move back will remain safe."; @@ -203,7 +203,7 @@ mosk_dun01,264,191,3 script Milestone#1-3 111,{ close; } -mosk_dun02,168,28,3 script Milestone#2-1 111,{ +mosk_dun02,168,28,3 script Milestone#2-1 HIDDEN_NPC,{ mes "- There is writing on a big rock. -"; next; mes "^3131FF- Those who advance may get hurt but are valorous of heart and those who move back will remain safe."; @@ -219,7 +219,7 @@ mosk_dun02,168,28,3 script Milestone#2-1 111,{ close; } -mosk_dun02,268,117,3 script Milestone#2-3 111,{ +mosk_dun02,268,117,3 script Milestone#2-3 HIDDEN_NPC,{ mes "- There is writing on a big rock. -"; next; mes "^3131FF- Those who step forward will gain honor but may die, those who step backward will have courage but may still get hurt."; @@ -235,7 +235,7 @@ mosk_dun02,268,117,3 script Milestone#2-3 111,{ close; } -mosk_dun03,27,131,3 script Milestone#3-2 111,{ +mosk_dun03,27,131,3 script Milestone#3-2 HIDDEN_NPC,{ mes "- There is writing on a big rock. -"; next; mes "^3131FF- Those who stay may die but will gain honor, those who go back may get hurt but will gain courage."; @@ -251,7 +251,7 @@ mosk_dun03,27,131,3 script Milestone#3-2 111,{ close; } -mosk_dun03,119,46,3 script Milestone#3-1 111,{ +mosk_dun03,119,46,3 script Milestone#3-1 HIDDEN_NPC,{ mes "There is writing on a big rock."; next; mes "^3131FF- Those who stay may die but will gain honor, those who go back may get hurt but will gain courage."; @@ -267,14 +267,14 @@ mosk_dun03,119,46,3 script Milestone#3-1 111,{ close; } -mosk_dun01,194,43,3 script Milestone#1-1 111,{ +mosk_dun01,194,43,3 script Milestone#1-1 HIDDEN_NPC,{ mes "- There is writing on a big rock. -"; next; mes "- If you want to protect your life, go back -"; close; } -mosk_fild02,198,53,3 script Ship#mos_dun 111,{ +mosk_fild02,198,53,3 script Ship#mos_dun HIDDEN_NPC,{ mes "- You find a ship at anchor. -"; next; if(select("Take the ship and go back to the village.:Explore more.") == 1) { diff --git a/npc/warps/dungeons/pay_dun.txt b/npc/warps/dungeons/pay_dun.txt index b34700446..e6c041188 100644 --- a/npc/warps/dungeons/pay_dun.txt +++ b/npc/warps/dungeons/pay_dun.txt @@ -18,7 +18,7 @@ pay_dun01,286,25,0 warp payd02 2,7,pay_dun02,19,63 pay_dun02,137,128,0 warp payd03 4,1,pay_dun03,155,159 pay_dun02,16,63,0 warp payd02-1 2,7,pay_dun01,283,28 pay_dun03,155,161,0 warp payd03-1 2,1,pay_dun02,137,126 -pay_dun03,127,62,4 script payd04r 45,2,2,{ +pay_dun03,127,62,4 script payd04r WARPNPC,2,2,{ switch(rand(4)) { case 0: warp "pay_dun04",201,204; end; case 1: warp "pay_dun04",189,43; end; diff --git a/npc/warps/dungeons/prt_maze.txt b/npc/warps/dungeons/prt_maze.txt index 7df4ac094..03ca59de5 100644 --- a/npc/warps/dungeons/prt_maze.txt +++ b/npc/warps/dungeons/prt_maze.txt @@ -106,7 +106,7 @@ prt_maze02,100,182,0 warp mazewarp5202 1,1,prt_maze03,182,88 /*To No.3-15*/ prt_maze03,22,194,0 warp mazewarp5301 1,1,prt_maze03,175,48 /*To No.3-20*/ prt_maze03,5,186,0 warp mazewarp5302 1,1,prt_maze03,151,134 /*To No.3-9*/ //3rd Floor No.02 -prt_maze03,58,194,0 script #mazewarp5303 45,1,1,{ +prt_maze03,58,194,0 script #mazewarp5303 WARPNPC,1,1,{ switch(rand(4)) { case 0: warp "prt_maze03",98,151; end; /*To No.3-8*/ case 1: warp "prt_maze03",137,128; end; /*To No.3-9*/ @@ -164,7 +164,7 @@ prt_maze03,14,74,0 warp mazewarp5336 1,1,prt_maze03,63,111 /*To No.3-12*/ prt_maze03,14,45,0 warp mazewarp5337 1,1,prt_maze03,88,174 /*To No.3-3*/ prt_maze03,5,58,0 warp mazewarp5338 1,1,prt_maze03,191,15 /*To No.3-25*/ // 3rd Floor No.17 -prt_maze03,74,74,0 script #mazewarp5339 45,1,1,{ +prt_maze03,74,74,0 script #mazewarp5339 WARPNPC,1,1,{ switch(rand(4)) { case 0: warp "prt_maze03",98,151; end; /*To No.3-8*/ case 1: warp "prt_maze03",137,128; end; /*To No.3-9*/ @@ -180,7 +180,7 @@ prt_maze03,114,56,0 warp mazewarp5343 1,1,prt_maze03,8,140 /*To No.3-6*/ prt_maze03,85,56,0 warp mazewarp5344 1,1,prt_maze03,176,31 /*To No.3-25*/ // 3rd Floor No.19 prt_maze03,137,74,0 warp mazewarp5345 1,1,prt_maze03,102,168 /*To No.3-3*/ -prt_maze03,139,45,0 script #mazewarp5346 45,1,1,{ +prt_maze03,139,45,0 script #mazewarp5346 WARPNPC,1,1,{ switch(rand(4)) { case 0: warp "prt_maze03",98,151; end; /*To No.3-8*/ case 1: warp "prt_maze03",137,128; end; /*To No.3-9*/ @@ -204,7 +204,7 @@ prt_maze03,99,34,0 warp mazewarp5355 1,1,prt_maze03,98,151 /*To No.3-8*/ prt_maze03,114,22,0 warp mazewarp5356 1,1,prt_maze03,104,71 /*To No.3-18*/ prt_maze03,85,13,0 warp mazewarp5357 1,1,prt_maze03,23,8 /*To No.3-21*/ // 3rd Floor No.24 -prt_maze03,154,22,0 script #mazewarp5358 45,1,1,{ +prt_maze03,154,22,0 script #mazewarp5358 WARPNPC,1,1,{ switch(rand(4)) { case 0: warp "prt_maze03",98,151; end; /*To No.3-8*/ case 1: warp "prt_maze03",137,128; end; /*To No.3-9*/ diff --git a/npc/warps/dungeons/ra_san.txt b/npc/warps/dungeons/ra_san.txt index 0a31d6e14..d6757cf6a 100644 --- a/npc/warps/dungeons/ra_san.txt +++ b/npc/warps/dungeons/ra_san.txt @@ -14,7 +14,7 @@ //= Added Dungeon exit back into temple. //============================================================ -ra_san01,139,13,0 script sanctuary01 45,1,1,{ +ra_san01,139,13,0 script sanctuary01 WARPNPC,1,1,{ if (ra_tem_q == 21) { warp "que_san04",119,110; end; } switch(rand(3)) { case 1: warp "ra_san02",213,275; break; diff --git a/npc/warps/fields/abyss_warper.txt b/npc/warps/fields/abyss_warper.txt index a210eb12b..3a5fa7754 100644 --- a/npc/warps/fields/abyss_warper.txt +++ b/npc/warps/fields/abyss_warper.txt @@ -15,7 +15,7 @@ //= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ -hu_fild05,168,304,0 script Column#abyss1 111,{ +hu_fild05,168,304,0 script Column#abyss1 HIDDEN_NPC,{ mes "^3355FFThere are 3 oddly"; mes "shaped grooves on"; @@ -84,7 +84,7 @@ hu_fild05,168,304,0 script Column#abyss1 111,{ close; } -hu_fild05,171,211,0 script Column#abyss2 111,1,1,{ +hu_fild05,171,211,0 script Column#abyss2 HIDDEN_NPC,1,1,{ mes "^3355FFThis column looks"; mes "very similar to the"; @@ -144,7 +144,7 @@ hu_fild05,171,211,0 script Column#abyss2 111,1,1,{ } } -hu_fild05,196,210,1 script AbyssWarp 45,2,2,{ +hu_fild05,196,210,1 script AbyssWarp WARPNPC,2,2,{ OnInit: disablenpc "AbyssWarp"; diff --git a/npc/warps/fields/glastheim.txt b/npc/warps/fields/glastheim.txt index b40cac0b5..1edc677e6 100644 --- a/npc/warps/fields/glastheim.txt +++ b/npc/warps/fields/glastheim.txt @@ -51,7 +51,7 @@ gl_knt02,10,138,0 warp gl14-1 1,1,gl_knt01,7,148 gl_knt02,157,292,0 warp gl16-1 1,1,gl_knt01,150,286 gl_knt02,289,138,0 warp gl17-1 1,1,gl_knt01,292,144 gl_prison,149,183,0 warp gl18-1 1,1,gl_prison1,150,14 -gl_prison,11,70,0 script gl18-2 45,1,1,{ +gl_prison,11,70,0 script gl18-2 WARPNPC,1,1,{ switch(rand(4)) { case 0: warp "gl_cas01",163,193; end; case 1: warp "gl_cas01",238,192; end; diff --git a/npc/warps/fields/jawaii.txt b/npc/warps/fields/jawaii.txt index d1945ffad..d59563853 100644 --- a/npc/warps/fields/jawaii.txt +++ b/npc/warps/fields/jawaii.txt @@ -19,6 +19,6 @@ jawaii_in,113,61,0 warp jawaiiwarp002 1,1,jawaii,138,202 jawaii_in,133,107,0 warp jawaiiwarp003 1,1,jawaii,111,199 jawaii_in,88,117,0 warp jawaiiwarp004 1,1,jawaii,109,186 jawaii,192,215,0 warp jawaiiwarp005 1,1,jawaii_in,28,94 -jawaii_in,27,91,4 script jawaiiwarp006 45,1,1,{ +jawaii_in,27,91,4 script jawaiiwarp006 WARPNPC,1,1,{ if (getpartnerid() > 0) warp "jawaii",192,218; else warp "jawaii_in",27,94; } diff --git a/npc/warps/guildcastles.txt b/npc/warps/guildcastles.txt index 0b8dc0548..a3d00cafb 100644 --- a/npc/warps/guildcastles.txt +++ b/npc/warps/guildcastles.txt @@ -366,7 +366,7 @@ aldeg_cas04,21,123,0 warp aldeg-4-11_aldeg-4-12 1,1,aldeg_cas04,125,168 aldeg_cas04,121,168,0 warp aldeg-4-12_aldeg-4-11 1,1,aldeg_cas04,25,123 aldeg_cas04,156,210,0 warp aldeg-4-13_aldeg-4-5 1,1,aldeg_cas04,169,97 aldeg_cas04,108,210,0 warp aldeg-4-14_aldeg-4-4 1,1,aldeg_cas04,186,92 -aldeg_cas04,132,231,0 script aldeg-4-15_aldeg-4- 45,1,1,{ +aldeg_cas04,132,231,0 script aldeg-4-15_aldeg-4- WARPNPC,1,1,{ OnTouch: switch (rand(1,5)) { diff --git a/npc/warps/other/arena.txt b/npc/warps/other/arena.txt index efc2e42da..5ab756c96 100644 --- a/npc/warps/other/arena.txt +++ b/npc/warps/other/arena.txt @@ -61,7 +61,7 @@ force_1-2,33,178,0 warp force_10_09 1,1,force_1-2,59,178 // GM Control Panel //============================================================ -sec_in02,79,180,3 script #arenacontrol 81,{ +sec_in02,79,180,3 script #arenacontrol 4_DOG01,{ set .@i, callfunc("F_GM_NPC",1357,0); if (.@i == -1) { mes "Error!"; -- cgit v1.2.3-60-g2f50