From 112b74ac697da01f0abcefe9a16628d247cfb616 Mon Sep 17 00:00:00 2001 From: brianluau Date: Mon, 31 Oct 2011 23:19:36 +0000 Subject: - Removed .gat from map names. - Removed trailing tabs in some warp portal files. - Removed `loginlog` table from convert_engine SQL scripts, because it's in the log database. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14987 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/other/arena/arena_aco.txt | 28 ++--- npc/warps/dungeons/juperos.txt | 2 +- npc/warps/dungeons/prt_maze.txt | 2 +- npc/warps/fields/payon_fild.txt | 44 +++---- npc/warps/guild/guildcastles.txt | 252 +++++++++++++++++++-------------------- npc/warps/other/arena.txt | 18 +-- npc/warps/other/god.txt | 10 +- 7 files changed, 178 insertions(+), 178 deletions(-) (limited to 'npc') diff --git a/npc/other/arena/arena_aco.txt b/npc/other/arena/arena_aco.txt index 588143d32..8d56b9a59 100644 --- a/npc/other/arena/arena_aco.txt +++ b/npc/other/arena/arena_aco.txt @@ -130,49 +130,49 @@ OnTimer4000: end; OnTimer60000: - if (getmapusers("force_5-1.gat") == 0) { + if (getmapusers("force_5-1") == 0) { donpcevent "Trocco#aco1::Onfailclearstage"; } mapannounce "force_5-1","Time left: 7 Minutes",bc_map|bc_npc; end; OnTimer120000: - if (getmapusers("force_5-1.gat") == 0) { + if (getmapusers("force_5-1") == 0) { donpcevent "Trocco#aco1::Onfailclearstage"; } mapannounce "force_5-1","Time left: 6 Minutes",bc_map|bc_npc; end; OnTimer180000: - if (getmapusers("force_5-1.gat") == 0) { + if (getmapusers("force_5-1") == 0) { donpcevent "Trocco#aco1::Onfailclearstage"; } mapannounce "force_5-1","Time left: 5 Minutes",bc_map|bc_npc; end; OnTimer240000: - if (getmapusers("force_5-1.gat") == 0) { + if (getmapusers("force_5-1") == 0) { donpcevent "Trocco#aco1::Onfailclearstage"; } mapannounce "force_5-1","Time left: 4 Minutes",bc_map|bc_npc; end; OnTimer300000: - if (getmapusers("force_5-1.gat") == 0) { + if (getmapusers("force_5-1") == 0) { donpcevent "Trocco#aco1::Onfailclearstage"; } mapannounce "force_5-1","Time left: 3 Minutes",bc_map|bc_npc; end; OnTimer360000: - if (getmapusers("force_5-1.gat") == 0) { + if (getmapusers("force_5-1") == 0) { donpcevent "Trocco#aco1::Onfailclearstage"; } mapannounce "force_5-1","Time left: 2 Minutes",bc_map|bc_npc; end; OnTimer420000: - if (getmapusers("force_5-1.gat") == 0) { + if (getmapusers("force_5-1") == 0) { donpcevent "Trocco#aco1::Onfailclearstage"; } mapannounce "force_5-1","Time left: 1 Minute",bc_map|bc_npc; @@ -558,49 +558,49 @@ OnTimer4000: end; OnTimer60000: - if (getmapusers("force_5-1.gat") == 0) { + if (getmapusers("force_5-1") == 0) { donpcevent "Trocco#aco2::Onfailclearstage"; } mapannounce "force_5-1","Time left: 7 Minutes",bc_map|bc_npc; end; OnTimer120000: - if (getmapusers("force_5-1.gat") == 0) { + if (getmapusers("force_5-1") == 0) { donpcevent "Trocco#aco2::Onfailclearstage"; } mapannounce "force_5-1","Time left: 6 Minutes",bc_map|bc_npc; end; OnTimer180000: - if (getmapusers("force_5-1.gat") == 0) { + if (getmapusers("force_5-1") == 0) { donpcevent "Trocco#aco2::Onfailclearstage"; } mapannounce "force_5-1","Time left: 5 Minutes",bc_map|bc_npc; end; OnTimer240000: - if (getmapusers("force_5-1.gat") == 0) { + if (getmapusers("force_5-1") == 0) { donpcevent "Trocco#aco2::Onfailclearstage"; } mapannounce "force_5-1","Time left: 4 Minutes",bc_map|bc_npc; end; OnTimer300000: - if (getmapusers("force_5-1.gat") == 0) { + if (getmapusers("force_5-1") == 0) { donpcevent "Trocco#aco2::Onfailclearstage"; } mapannounce "force_5-1","Time left: 3 Minutes",bc_map|bc_npc; end; OnTimer360000: - if (getmapusers("force_5-1.gat") == 0) { + if (getmapusers("force_5-1") == 0) { donpcevent "Trocco#aco2::Onfailclearstage"; } mapannounce "force_5-1","Time left: 2 Minutes",bc_map|bc_npc; end; OnTimer420000: - if (getmapusers("force_5-1.gat") == 0) { + if (getmapusers("force_5-1") == 0) { donpcevent "Trocco#aco2::Onfailclearstage"; } mapannounce "force_5-1","Time left: 1 Minute",bc_map|bc_npc; diff --git a/npc/warps/dungeons/juperos.txt b/npc/warps/dungeons/juperos.txt index e2a8c10c7..5a835d577 100644 --- a/npc/warps/dungeons/juperos.txt +++ b/npc/warps/dungeons/juperos.txt @@ -20,7 +20,7 @@ //= 1.6a COrrected new warps [L0ne_W0lf] //= 1.7 Removed duplicated quest warp portal [Brainstorm] //============================================================ - + yuno_fild07,207,175,0 warp jupwrp01 1,1,jupe_cave,143,52 jupe_cave,148,52,0 warp jupwrp02 1,1,yuno_fild07,212,175 jupe_cave,26,52,0 warp jupwrp03 1,1,juperos_01,53,247 diff --git a/npc/warps/dungeons/prt_maze.txt b/npc/warps/dungeons/prt_maze.txt index fc038d31a..558e8718e 100644 --- a/npc/warps/dungeons/prt_maze.txt +++ b/npc/warps/dungeons/prt_maze.txt @@ -227,7 +227,7 @@ prt_maze03,176,34,0 warp mazewarp5359 1,1,prt_maze03,88,56 /*To No.3-18*/ prt_maze03,176,5,0 warp mazewarp5360 1,1,prt_maze03,111,95 /*To No.3-13*/ prt_maze03,194,15,0 warp mazewarp5361 1,1,prt_maze03,8,58 /*To No.3-16*/ prt_maze03,165,22,0 warp mazewarp5362 1,1,prt_maze03,111,145 /*To No.3-8*/ - + //= Prontera Sewers ============================================== prt_sewb1,135,248,0 warp prts001 2,2,prt_fild05,274,208 prt_sewb1,188,247,0 warp prts01 1,3,prt_sewb2,19,19 diff --git a/npc/warps/fields/payon_fild.txt b/npc/warps/fields/payon_fild.txt index 255b57a56..40b8ce372 100644 --- a/npc/warps/fields/payon_fild.txt +++ b/npc/warps/fields/payon_fild.txt @@ -14,28 +14,28 @@ //============================================================ //= Payon Field's ============================================ -pay_fild01,13,152,0 warp payf001 2,7,moc_fild03,299,170 -pay_fild01,278,14,0 warp payf01 13,2,pay_fild02,83,382 -pay_fild01,353,14,0 warp payf02 20,3,pay_fild02,160,381 -pay_fild01,379,201,0 warp payf03 2,6,pay_fild07,23,207 -pay_fild02,134,16,0 warp payf04 5,2,pay_fild05,127,375 -pay_fild02,16,175,0 warp payf06 2,4,pay_fild11,294,135 -pay_fild02,167,390,0 warp payf02-1 20,3,pay_fild01,354,18 -pay_fild02,284,108,0 warp payf07 2,7,pay_fild03,20,110 -pay_fild02,83,386,0 warp payf01-1 13,2,pay_fild01,278,18 -pay_fild03,15,110,0 warp payf07-1 2,10,pay_fild02,280,108 -pay_fild03,172,281,0 warp payf08 5,2,pay_fild07,167,20 -pay_fild03,313,16,0 warp payf09 4,2,pay_fild06,305,372 -pay_fild03,392,63,0 warp payf005 2,7,alberta,19,233 -pay_fild04,17,165,0 warp payf002 2,8,moc_fild01,376,162 -pay_fild04,194,17,0 warp payf003 7,2,moc_fild02,350,336 -pay_fild05,127,378,0 warp payf04-1 4,2,pay_fild02,134,19 -pay_fild05,271,284,0 warp payf10 2,4,pay_fild06,31,288 -pay_fild06,28,288,0 warp payf10-1 2,2,pay_fild05,268,284 -pay_fild06,305,375,0 warp payf09-1 6,2,pay_fild03,313,19 -pay_fild07,16,200,0 warp payf03-1 3,3,pay_fild01,371,205 -pay_fild07,163,17,0 warp payf08-1 5,2,pay_fild03,177,275 -pay_fild07,280,382,0 warp payf11 4,2,pay_fild08,160,19 +pay_fild01,13,152,0 warp payf001 2,7,moc_fild03,299,170 +pay_fild01,278,14,0 warp payf01 13,2,pay_fild02,83,382 +pay_fild01,353,14,0 warp payf02 20,3,pay_fild02,160,381 +pay_fild01,379,201,0 warp payf03 2,6,pay_fild07,23,207 +pay_fild02,134,16,0 warp payf04 5,2,pay_fild05,127,375 +pay_fild02,16,175,0 warp payf06 2,4,pay_fild11,294,135 +pay_fild02,167,390,0 warp payf02-1 20,3,pay_fild01,354,18 +pay_fild02,284,108,0 warp payf07 2,7,pay_fild03,20,110 +pay_fild02,83,386,0 warp payf01-1 13,2,pay_fild01,278,18 +pay_fild03,15,110,0 warp payf07-1 2,10,pay_fild02,280,108 +pay_fild03,172,281,0 warp payf08 5,2,pay_fild07,167,20 +pay_fild03,313,16,0 warp payf09 4,2,pay_fild06,305,372 +pay_fild03,392,63,0 warp payf005 2,7,alberta,19,233 +pay_fild04,17,165,0 warp payf002 2,8,moc_fild01,376,162 +pay_fild04,194,17,0 warp payf003 7,2,moc_fild02,350,336 +pay_fild05,127,378,0 warp payf04-1 4,2,pay_fild02,134,19 +pay_fild05,271,284,0 warp payf10 2,4,pay_fild06,31,288 +pay_fild06,28,288,0 warp payf10-1 2,2,pay_fild05,268,284 +pay_fild06,305,375,0 warp payf09-1 6,2,pay_fild03,313,19 +pay_fild07,16,200,0 warp payf03-1 3,3,pay_fild01,371,205 +pay_fild07,163,17,0 warp payf08-1 5,2,pay_fild03,177,275 +pay_fild07,280,382,0 warp payf11 4,2,pay_fild08,160,19 pay_fild07,382,290,0 warp payf12 2,5,pay_fild10,19,290 pay_fild08,160,16,0 warp payf11-1 4,2,pay_fild07,280,379 pay_fild08,17,75,0 warp payf006 1,1,payon,265,92 diff --git a/npc/warps/guild/guildcastles.txt b/npc/warps/guild/guildcastles.txt index 89c9d0d61..5283340af 100644 --- a/npc/warps/guild/guildcastles.txt +++ b/npc/warps/guild/guildcastles.txt @@ -128,119 +128,119 @@ aldeg_cas05,166,194,0 warp aldg506-1 1,1,aldeg_cas05,13,179 aldeg_cas05,156,231,0 warp aldg507 1,1,aldeg_cas05,18,88 aldeg_cas05,14,88,0 warp aldg507-1 1,1,aldeg_cas05,156,227 -// Geffen Castles Map -gef_fild13,112,269,0 warp gefg05 1,1,gefg_cas03,100,280 -gef_fild13,139,240,0 warp gefg06 1,1,gefg_cas03,125,250 -gef_fild13,150,54,0 warp gefg01 1,1,gefg_cas01,34,140 -gef_fild13,196,281,0 warp gefg08 1,1,gefg_cas04,24,149 -gef_fild13,210,75,0 warp gefg02 1,1,gefg_cas01,95,178 -gef_fild13,256,57,0 warp gefg09 1,1,gefg_cas05,11,134 -gef_fild13,305,83,0 warp gefg09-1 1,1,gefg_cas05,99,200 -gef_fild13,308,244,0 warp gefg03 1,1,gefg_cas02,70,143 -gef_fild13,77,284,0 warp gefg04 1,1,gefg_cas03,60,286 -gef_fild13,83,185,0 warp gefg07 1,1,gefg_cas03,89,159 +// Geffen Castles Map +gef_fild13,112,269,0 warp gefg05 1,1,gefg_cas03,100,280 +gef_fild13,139,240,0 warp gefg06 1,1,gefg_cas03,125,250 +gef_fild13,150,54,0 warp gefg01 1,1,gefg_cas01,34,140 +gef_fild13,196,281,0 warp gefg08 1,1,gefg_cas04,24,149 +gef_fild13,210,75,0 warp gefg02 1,1,gefg_cas01,95,178 +gef_fild13,256,57,0 warp gefg09 1,1,gefg_cas05,11,134 +gef_fild13,305,83,0 warp gefg09-1 1,1,gefg_cas05,99,200 +gef_fild13,308,244,0 warp gefg03 1,1,gefg_cas02,70,143 +gef_fild13,77,284,0 warp gefg04 1,1,gefg_cas03,60,286 +gef_fild13,83,185,0 warp gefg07 1,1,gefg_cas03,89,159 //Geffen Guild Castles -gefg_cas01,170,14,0 warp gefg106-1 1,1,gefg_cas01,50,84 -gefg_cas01,170,34,0 warp gefg105-1 1,1,gefg_cas01,30,167 -gefg_cas01,181,52,0 warp gefg107 1,1,gefg_cas01,198,160 -gefg_cas01,202,160,0 warp gefg107-1 1,1,gefg_cas01,185,52 -gefg_cas01,209,34,0 warp gefg103-1 1,1,gefg_cas01,56,170 -gefg_cas01,31,185,0 warp gefg104 1,1,gefg_cas01,33,47 -gefg_cas01,33,51,0 warp gefg104-1 1,1,gefg_cas01,35,185 -gefg_cas01,34,136,0 warp gefg01-1 1,1,gef_fild13,150,50 -gefg_cas01,34,167,0 warp gefg105 1,1,gefg_cas01,174,34 -gefg_cas01,39,196,0 warp gefg101 1,1,gefg_cas01,62,13 -gefg_cas01,54,84,0 warp gefg106 1,1,gefg_cas01,174,14 -gefg_cas01,58,185,0 warp gefg102 1,1,gefg_cas01,90,47 -gefg_cas01,59,170,0 warp gefg103 1,1,gefg_cas01,205,34 -gefg_cas01,62,9,0 warp gefg101-1 1,1,gefg_cas01,39,192 -gefg_cas01,90,51,0 warp gefg102-1 1,1,gefg_cas01,54,185 -gefg_cas01,99,178,0 warp gefg02-1 1,1,gef_fild13,214,75 -gefg_cas02,148,18,0 warp gefg205-1 1,1,gefg_cas02,35,150 -gefg_cas02,150,36,0 warp gefg208 1,1,gefg_cas02,152,186 -gefg_cas02,152,190,0 warp gefg208-1 1,1,gefg_cas02,150,41 -gefg_cas02,174,11,0 warp gefg207-1 1,1,gefg_cas02,21,13 -gefg_cas02,184,36,0 warp gefg204-1 1,1,gefg_cas02,48,155 -gefg_cas02,185,18,0 warp gefg206-1 1,1,gefg_cas02,53,136 -gefg_cas02,22,160,0 warp gefg203 1,1,gefg_cas02,34,17 -gefg_cas02,25,13,0 warp gefg207 1,1,gefg_cas02,170,11 -gefg_cas02,34,13,0 warp gefg203-1 1,1,gefg_cas02,22,156 -gefg_cas02,34,152,0 warp gefg205 1,1,gefg_cas02,153,18 -gefg_cas02,34,68,0 warp gefg202-1 1,1,gefg_cas02,50,175 -gefg_cas02,35,173,0 warp gefg201 1,1,gefg_cas02,76,42 -gefg_cas02,46,175,0 warp gefg202 1,1,gefg_cas02,34,64 -gefg_cas02,48,159,0 warp gefg204 1,1,gefg_cas02,184,41 -gefg_cas02,57,136,0 warp gefg206 1,1,gefg_cas02,180,18 -gefg_cas02,70,147,0 warp gefg03-1 1,1,gef_fild13,308,240 -gefg_cas02,80,42,0 warp gefg201-1 1,1,gefg_cas02,39,173 -gefg_cas03,103,283,0 warp gefg05-1 1,1,gef_fild13,117,273 -gefg_cas03,106,217,0 warp gefg307 1,1,gefg_cas03,131,15 -gefg_cas03,115,210,0 warp gefg308 1,1,gefg_cas03,92,215 -gefg_cas03,130,250,0 warp gefg06-1 1,1,gef_fild13,143,240 -gefg_cas03,135,15,0 warp gefg307-1 1,1,gefg_cas03,110,217 -gefg_cas03,135,92,0 warp gefg302-1 1,1,gefg_cas03,34,282 -gefg_cas03,152,92,0 warp gefg304-1 1,1,gefg_cas03,59,255 -gefg_cas03,154,16,0 warp gefg314 1,1,gefg_cas03,252,11 -gefg_cas03,17,206,0 warp gefg306-1 1,1,gefg_cas03,29,219 -gefg_cas03,212,46,0 warp gefg315 1,1,gefg_cas03,225,158 -gefg_cas03,225,154,0 warp gefg315-1 1,1,gefg_cas03,212,42 -gefg_cas03,237,74,0 warp gefg312-1 1,1,gefg_cas03,62,213 -gefg_cas03,256,11,0 warp gefg314-1 1,1,gefg_cas03,159,16 -gefg_cas03,266,47,0 warp gefg309-1 1,1,gefg_cas03,45,175 -gefg_cas03,27,215,0 warp gefg306-2 1,1,gefg_cas03,17,202 -gefg_cas03,34,286,0 warp gefg302 1,1,gefg_cas03,131,92 -gefg_cas03,38,243,0 warp gefg306 1,1,gefg_cas03,29,219 -gefg_cas03,38,259,0 warp gefg303-1 1,1,gefg_cas03,43,271 -gefg_cas03,42,175,0 warp gefg309 1,1,gefg_cas03,266,43 -gefg_cas03,43,191,0 warp gefg310-1 1,1,gefg_cas03,70,185 -gefg_cas03,47,271,0 warp gefg303 1,1,gefg_cas03,38,255 -gefg_cas03,50,248,0 warp gefg305 1,1,gefg_cas03,54,229 -gefg_cas03,58,232,0 warp gefg305-1 1,1,gefg_cas03,62,213 -gefg_cas03,63,255,0 warp gefg304 1,1,gefg_cas03,156,92 -gefg_cas03,65,215,0 warp gefg312 1,1,gefg_cas03,233,74 -gefg_cas03,66,223,0 warp gefg301 1,1,gefg_cas03,96,53 -gefg_cas03,68,290,0 warp gefg04-1 1,1,gef_fild13,74,287 -gefg_cas03,70,182,0 warp gefg310 1,1,gefg_cas03,39,191 -gefg_cas03,79,244,0 warp gefg313-1 1,1,gefg_cas03,91,250 -gefg_cas03,88,248,0 warp gefg311-1 1,1,gefg_cas03,76,242 -gefg_cas03,90,218,0 warp gefg308-1 1,1,gefg_cas03,111,210 -gefg_cas03,92,53,0 warp gefg301-1 1,1,gefg_cas03,62,223 -gefg_cas03,93,159,0 warp gefg07-1 1,1,gef_fild13,83,181 -gefg_cas03,93,209,0 warp gefg311 1,1,gefg_cas03,92,250 -gefg_cas03,95,251,0 warp gefg313 1,1,gefg_cas03,91,209 -gefg_cas04,140,168,0 warp gefg407-1 1,1,gefg_cas04,178,61 -gefg_cas04,142,33,0 warp gefg406-1 1,1,gefg_cas04,52,21 -gefg_cas04,142,55,0 warp gefg404-1 1,1,gefg_cas04,32,180 -gefg_cas04,174,36,0 warp gefg403-1 1,1,gefg_cas04,53,192 -gefg_cas04,178,57,0 warp gefg407 1,1,gefg_cas04,143,166 -gefg_cas04,18,82,0 warp gefg401-1 1,1,gefg_cas04,34,215 -gefg_cas04,18,9,0 warp gefg402-1 1,1,gefg_cas04,57,220 -gefg_cas04,24,145,0 warp gefg08-1 1,1,gef_fild13,193,278 -gefg_cas04,27,180,0 warp gefg404 1,1,gefg_cas04,142,59 -gefg_cas04,34,211,0 warp gefg401 1,1,gefg_cas04,18,78 -gefg_cas04,42,81,0 warp gefg405 1,1,gefg_cas04,42,13 -gefg_cas04,42,9,0 warp gefg405-1 1,1,gefg_cas04,42,77 -gefg_cas04,52,25,0 warp gefg406 1,1,gefg_cas04,142,37 -gefg_cas04,53,196,0 warp gefg403 1,1,gefg_cas04,170,36 -gefg_cas04,57,224,0 warp gefg402 1,1,gefg_cas04,18,13 -gefg_cas05,149,44,0 warp gefg506-1 1,1,gefg_cas05,37,20 -gefg_cas05,178,72,0 warp gefg501-1 1,1,gefg_cas05,46,165 -gefg_cas05,190,20,0 warp gefg508 1,1,gefg_cas05,194,151 -gefg_cas05,194,147,0 warp gefg508-1 1,1,gefg_cas05,190,16 -gefg_cas05,206,44,0 warp gefg507-1 1,1,gefg_cas05,93,20 -gefg_cas05,37,16,0 warp gefg506 1,1,gefg_cas05,153,44 -gefg_cas05,43,62,0 warp gefg505-1 1,1,gefg_cas05,78,138 -gefg_cas05,44,143,0 warp gefg503 1,1,gefg_cas05,70,155 -gefg_cas05,50,165,0 warp gefg501 1,1,gefg_cas05,178,68 -gefg_cas05,66,76,0 warp gefg504-1 1,1,gefg_cas05,80,155 -gefg_cas05,68,150,0 warp gefg503-1 1,1,gefg_cas05,44,147 -gefg_cas05,7,134,0 warp gefg10 1,1,gef_fild13,252,57 -gefg_cas05,74,138,0 warp gefg505 1,1,gefg_cas05,47,62 -gefg_cas05,83,152,0 warp gefg504 1,1,gefg_cas05,66,72 -gefg_cas05,87,165,0 warp gefg502 1,1,gefg_cas05,84,62 -gefg_cas05,88,62,0 warp gefg502-1 1,1,gefg_cas05,83,165 -gefg_cas05,93,16,0 warp gefg507 1,1,gefg_cas05,202,44 +gefg_cas01,170,14,0 warp gefg106-1 1,1,gefg_cas01,50,84 +gefg_cas01,170,34,0 warp gefg105-1 1,1,gefg_cas01,30,167 +gefg_cas01,181,52,0 warp gefg107 1,1,gefg_cas01,198,160 +gefg_cas01,202,160,0 warp gefg107-1 1,1,gefg_cas01,185,52 +gefg_cas01,209,34,0 warp gefg103-1 1,1,gefg_cas01,56,170 +gefg_cas01,31,185,0 warp gefg104 1,1,gefg_cas01,33,47 +gefg_cas01,33,51,0 warp gefg104-1 1,1,gefg_cas01,35,185 +gefg_cas01,34,136,0 warp gefg01-1 1,1,gef_fild13,150,50 +gefg_cas01,34,167,0 warp gefg105 1,1,gefg_cas01,174,34 +gefg_cas01,39,196,0 warp gefg101 1,1,gefg_cas01,62,13 +gefg_cas01,54,84,0 warp gefg106 1,1,gefg_cas01,174,14 +gefg_cas01,58,185,0 warp gefg102 1,1,gefg_cas01,90,47 +gefg_cas01,59,170,0 warp gefg103 1,1,gefg_cas01,205,34 +gefg_cas01,62,9,0 warp gefg101-1 1,1,gefg_cas01,39,192 +gefg_cas01,90,51,0 warp gefg102-1 1,1,gefg_cas01,54,185 +gefg_cas01,99,178,0 warp gefg02-1 1,1,gef_fild13,214,75 +gefg_cas02,148,18,0 warp gefg205-1 1,1,gefg_cas02,35,150 +gefg_cas02,150,36,0 warp gefg208 1,1,gefg_cas02,152,186 +gefg_cas02,152,190,0 warp gefg208-1 1,1,gefg_cas02,150,41 +gefg_cas02,174,11,0 warp gefg207-1 1,1,gefg_cas02,21,13 +gefg_cas02,184,36,0 warp gefg204-1 1,1,gefg_cas02,48,155 +gefg_cas02,185,18,0 warp gefg206-1 1,1,gefg_cas02,53,136 +gefg_cas02,22,160,0 warp gefg203 1,1,gefg_cas02,34,17 +gefg_cas02,25,13,0 warp gefg207 1,1,gefg_cas02,170,11 +gefg_cas02,34,13,0 warp gefg203-1 1,1,gefg_cas02,22,156 +gefg_cas02,34,152,0 warp gefg205 1,1,gefg_cas02,153,18 +gefg_cas02,34,68,0 warp gefg202-1 1,1,gefg_cas02,50,175 +gefg_cas02,35,173,0 warp gefg201 1,1,gefg_cas02,76,42 +gefg_cas02,46,175,0 warp gefg202 1,1,gefg_cas02,34,64 +gefg_cas02,48,159,0 warp gefg204 1,1,gefg_cas02,184,41 +gefg_cas02,57,136,0 warp gefg206 1,1,gefg_cas02,180,18 +gefg_cas02,70,147,0 warp gefg03-1 1,1,gef_fild13,308,240 +gefg_cas02,80,42,0 warp gefg201-1 1,1,gefg_cas02,39,173 +gefg_cas03,103,283,0 warp gefg05-1 1,1,gef_fild13,117,273 +gefg_cas03,106,217,0 warp gefg307 1,1,gefg_cas03,131,15 +gefg_cas03,115,210,0 warp gefg308 1,1,gefg_cas03,92,215 +gefg_cas03,130,250,0 warp gefg06-1 1,1,gef_fild13,143,240 +gefg_cas03,135,15,0 warp gefg307-1 1,1,gefg_cas03,110,217 +gefg_cas03,135,92,0 warp gefg302-1 1,1,gefg_cas03,34,282 +gefg_cas03,152,92,0 warp gefg304-1 1,1,gefg_cas03,59,255 +gefg_cas03,154,16,0 warp gefg314 1,1,gefg_cas03,252,11 +gefg_cas03,17,206,0 warp gefg306-1 1,1,gefg_cas03,29,219 +gefg_cas03,212,46,0 warp gefg315 1,1,gefg_cas03,225,158 +gefg_cas03,225,154,0 warp gefg315-1 1,1,gefg_cas03,212,42 +gefg_cas03,237,74,0 warp gefg312-1 1,1,gefg_cas03,62,213 +gefg_cas03,256,11,0 warp gefg314-1 1,1,gefg_cas03,159,16 +gefg_cas03,266,47,0 warp gefg309-1 1,1,gefg_cas03,45,175 +gefg_cas03,27,215,0 warp gefg306-2 1,1,gefg_cas03,17,202 +gefg_cas03,34,286,0 warp gefg302 1,1,gefg_cas03,131,92 +gefg_cas03,38,243,0 warp gefg306 1,1,gefg_cas03,29,219 +gefg_cas03,38,259,0 warp gefg303-1 1,1,gefg_cas03,43,271 +gefg_cas03,42,175,0 warp gefg309 1,1,gefg_cas03,266,43 +gefg_cas03,43,191,0 warp gefg310-1 1,1,gefg_cas03,70,185 +gefg_cas03,47,271,0 warp gefg303 1,1,gefg_cas03,38,255 +gefg_cas03,50,248,0 warp gefg305 1,1,gefg_cas03,54,229 +gefg_cas03,58,232,0 warp gefg305-1 1,1,gefg_cas03,62,213 +gefg_cas03,63,255,0 warp gefg304 1,1,gefg_cas03,156,92 +gefg_cas03,65,215,0 warp gefg312 1,1,gefg_cas03,233,74 +gefg_cas03,66,223,0 warp gefg301 1,1,gefg_cas03,96,53 +gefg_cas03,68,290,0 warp gefg04-1 1,1,gef_fild13,74,287 +gefg_cas03,70,182,0 warp gefg310 1,1,gefg_cas03,39,191 +gefg_cas03,79,244,0 warp gefg313-1 1,1,gefg_cas03,91,250 +gefg_cas03,88,248,0 warp gefg311-1 1,1,gefg_cas03,76,242 +gefg_cas03,90,218,0 warp gefg308-1 1,1,gefg_cas03,111,210 +gefg_cas03,92,53,0 warp gefg301-1 1,1,gefg_cas03,62,223 +gefg_cas03,93,159,0 warp gefg07-1 1,1,gef_fild13,83,181 +gefg_cas03,93,209,0 warp gefg311 1,1,gefg_cas03,92,250 +gefg_cas03,95,251,0 warp gefg313 1,1,gefg_cas03,91,209 +gefg_cas04,140,168,0 warp gefg407-1 1,1,gefg_cas04,178,61 +gefg_cas04,142,33,0 warp gefg406-1 1,1,gefg_cas04,52,21 +gefg_cas04,142,55,0 warp gefg404-1 1,1,gefg_cas04,32,180 +gefg_cas04,174,36,0 warp gefg403-1 1,1,gefg_cas04,53,192 +gefg_cas04,178,57,0 warp gefg407 1,1,gefg_cas04,143,166 +gefg_cas04,18,82,0 warp gefg401-1 1,1,gefg_cas04,34,215 +gefg_cas04,18,9,0 warp gefg402-1 1,1,gefg_cas04,57,220 +gefg_cas04,24,145,0 warp gefg08-1 1,1,gef_fild13,193,278 +gefg_cas04,27,180,0 warp gefg404 1,1,gefg_cas04,142,59 +gefg_cas04,34,211,0 warp gefg401 1,1,gefg_cas04,18,78 +gefg_cas04,42,81,0 warp gefg405 1,1,gefg_cas04,42,13 +gefg_cas04,42,9,0 warp gefg405-1 1,1,gefg_cas04,42,77 +gefg_cas04,52,25,0 warp gefg406 1,1,gefg_cas04,142,37 +gefg_cas04,53,196,0 warp gefg403 1,1,gefg_cas04,170,36 +gefg_cas04,57,224,0 warp gefg402 1,1,gefg_cas04,18,13 +gefg_cas05,149,44,0 warp gefg506-1 1,1,gefg_cas05,37,20 +gefg_cas05,178,72,0 warp gefg501-1 1,1,gefg_cas05,46,165 +gefg_cas05,190,20,0 warp gefg508 1,1,gefg_cas05,194,151 +gefg_cas05,194,147,0 warp gefg508-1 1,1,gefg_cas05,190,16 +gefg_cas05,206,44,0 warp gefg507-1 1,1,gefg_cas05,93,20 +gefg_cas05,37,16,0 warp gefg506 1,1,gefg_cas05,153,44 +gefg_cas05,43,62,0 warp gefg505-1 1,1,gefg_cas05,78,138 +gefg_cas05,44,143,0 warp gefg503 1,1,gefg_cas05,70,155 +gefg_cas05,50,165,0 warp gefg501 1,1,gefg_cas05,178,68 +gefg_cas05,66,76,0 warp gefg504-1 1,1,gefg_cas05,80,155 +gefg_cas05,68,150,0 warp gefg503-1 1,1,gefg_cas05,44,147 +gefg_cas05,7,134,0 warp gefg10 1,1,gef_fild13,252,57 +gefg_cas05,74,138,0 warp gefg505 1,1,gefg_cas05,47,62 +gefg_cas05,83,152,0 warp gefg504 1,1,gefg_cas05,66,72 +gefg_cas05,87,165,0 warp gefg502 1,1,gefg_cas05,84,62 +gefg_cas05,88,62,0 warp gefg502-1 1,1,gefg_cas05,83,165 +gefg_cas05,93,16,0 warp gefg507 1,1,gefg_cas05,202,44 gefg_cas05,99,204,0 warp gefg10-1 1,1,gef_fild13,305,87 //Payon Guild Castles Map Connection @@ -469,25 +469,25 @@ nguild_alde,46,197,0 warp naldg107-1 1,1,nguild_alde,232,182 nguild_alde,171,175,0 warp naldg108 1,1,nguild_alde,35,197 nguild_alde,31,197,0 warp naldg108-1 1,1,nguild_alde,175,175 -//Novices Guild: Geffen Castles Map +//Novices Guild: Geffen Castles Map n_castle,183,183,0 warp ngefg01 1,1,nguild_gef,34,140 nguild_gef,34,136,0 warp ngefg01-1 1,1,n_castle,183,180 nguild_gef,99,178,0 warp ngefg02-1 1,1,n_castle,183,180 -nguild_gef,170,14,0 warp ngefg106-1 1,1,nguild_gef,50,84 -nguild_gef,170,34,0 warp ngefg105-1 1,1,nguild_gef,30,167 -nguild_gef,181,52,0 warp ngefg107 1,1,nguild_gef,198,160 -nguild_gef,202,160,0 warp ngefg107-1 1,1,nguild_gef,185,52 -nguild_gef,209,34,0 warp ngefg103-1 1,1,nguild_gef,56,170 -nguild_gef,31,185,0 warp ngefg104 1,1,nguild_gef,33,47 -nguild_gef,33,51,0 warp ngefg104-1 1,1,nguild_gef,35,185 -nguild_gef,34,167,0 warp ngefg105 1,1,nguild_gef,174,34 -nguild_gef,39,196,0 warp ngefg101 1,1,nguild_gef,62,13 -nguild_gef,54,84,0 warp ngefg106 1,1,nguild_gef,174,14 -nguild_gef,58,185,0 warp ngefg102 1,1,nguild_gef,90,47 -nguild_gef,59,170,0 warp ngefg103 1,1,nguild_gef,205,34 -nguild_gef,62,9,0 warp ngefg101-1 1,1,nguild_gef,39,192 -nguild_gef,90,51,0 warp ngefg102-1 1,1,nguild_gef,54,185 +nguild_gef,170,14,0 warp ngefg106-1 1,1,nguild_gef,50,84 +nguild_gef,170,34,0 warp ngefg105-1 1,1,nguild_gef,30,167 +nguild_gef,181,52,0 warp ngefg107 1,1,nguild_gef,198,160 +nguild_gef,202,160,0 warp ngefg107-1 1,1,nguild_gef,185,52 +nguild_gef,209,34,0 warp ngefg103-1 1,1,nguild_gef,56,170 +nguild_gef,31,185,0 warp ngefg104 1,1,nguild_gef,33,47 +nguild_gef,33,51,0 warp ngefg104-1 1,1,nguild_gef,35,185 +nguild_gef,34,167,0 warp ngefg105 1,1,nguild_gef,174,34 +nguild_gef,39,196,0 warp ngefg101 1,1,nguild_gef,62,13 +nguild_gef,54,84,0 warp ngefg106 1,1,nguild_gef,174,14 +nguild_gef,58,185,0 warp ngefg102 1,1,nguild_gef,90,47 +nguild_gef,59,170,0 warp ngefg103 1,1,nguild_gef,205,34 +nguild_gef,62,9,0 warp ngefg101-1 1,1,nguild_gef,39,192 +nguild_gef,90,51,0 warp ngefg102-1 1,1,nguild_gef,54,185 //Novices Guild: Payon Guild Castles Map n_castle,18,181,0 warp npayg01 1,1,nguild_pay,214,48 diff --git a/npc/warps/other/arena.txt b/npc/warps/other/arena.txt index 9770a8537..2ccaf6dcd 100644 --- a/npc/warps/other/arena.txt +++ b/npc/warps/other/arena.txt @@ -40,24 +40,24 @@ DLGTEMP: } else if (@input_arena == 1357) { - mes "Opening Control Panel"; - mes "' A - R - E - N - A '"; + mes "Opening Control Panel"; + mes "' A - R - E - N - A '"; next; - mes "Please select a"; - mes "state for the arena."; + mes "Please select a"; + mes "state for the arena."; next; switch( select( "Open.","Closed.") ) { case 1: - mes "Currently"; - mes "opening arena."; + mes "Currently"; + mes "opening arena."; misceffect EF_ENHANCE; //CHECK enablenpc "welcome_arena"; next; break; case 2: - mes "Currently"; - mes "closing arena."; + mes "Currently"; + mes "closing arena."; misceffect EF_EXIT; //CHECK disablenpc "welcome_arena"; next; @@ -66,7 +66,7 @@ DLGTEMP: } else { - mes "Closing control panel."; + mes "Closing control panel."; close; } } \ No newline at end of file diff --git a/npc/warps/other/god.txt b/npc/warps/other/god.txt index 08168c836..6ff9e65e8 100644 --- a/npc/warps/other/god.txt +++ b/npc/warps/other/god.txt @@ -14,8 +14,8 @@ yuno,218,180,0 warp yuno_god01 1,1,que_god01,99,84 que_god01,99,81,0 warp god01_yuno 1,1,yuno,218,177 -que_god01,63,88,0 warp god_sl_w0-1 1,1,que_god01,87,92 -que_god01,62,116,0 warp god_sl_w1-1 1,1,que_god01,46,94 -que_god01,12,116,0 warp god_sl_w2-1 1,1,que_god01,16,94 -que_god01,12,55,0 warp god_sl_w3-1 1,1,que_god01,17,83 -que_god01,50,55,0 warp god_sl_w4-1 1,1,que_god01,47,83 +que_god01,63,88,0 warp god_sl_w0-1 1,1,que_god01,87,92 +que_god01,62,116,0 warp god_sl_w1-1 1,1,que_god01,46,94 +que_god01,12,116,0 warp god_sl_w2-1 1,1,que_god01,16,94 +que_god01,12,55,0 warp god_sl_w3-1 1,1,que_god01,17,83 +que_god01,50,55,0 warp god_sl_w4-1 1,1,que_god01,47,83 -- cgit v1.2.3-70-g09d2