From 8832adba3ec9df0f7f890154f69f0993b8d1d8e5 Mon Sep 17 00:00:00 2001 From: daegaladh Date: Wed, 1 Aug 2012 04:29:56 +0000 Subject: Full npc folder reorganization. (I hope I didn't break anything D:) -Now common scripts goes to the main npc folder, and pre-re-only/re-only ones goes to their respective folders. -NPCs with practically the same script but little differences have been left in the main folder and uses the command checkre() for the differences. -For those NPCs with different coordinates but same script, the script has been left in the main folder but the NPCs splitted as duplicates. -All pre-renewal files has been reverted back to their pre-renewal behavior. TODO: -Correct pre-re quest rewards. -Check for pre-re/re differences in mapflags. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16545 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/pre-re/warps/fields/abyss_warper.txt | 168 ------------------------------ npc/pre-re/warps/fields/amatsu_fild.txt | 21 ---- npc/pre-re/warps/fields/com_fild.txt | 11 +- npc/pre-re/warps/fields/ein_fild.txt | 53 ---------- npc/pre-re/warps/fields/gefenia.txt | 29 ------ npc/pre-re/warps/fields/geffen_fild.txt | 23 ++-- npc/pre-re/warps/fields/glastheim.txt | 85 --------------- npc/pre-re/warps/fields/hugel_fild.txt | 40 +++---- npc/pre-re/warps/fields/jawaii.txt | 26 ----- npc/pre-re/warps/fields/lhalzen_fild.txt | 21 ---- npc/pre-re/warps/fields/lutie_fild.txt | 18 ---- npc/pre-re/warps/fields/morroc_fild.txt | 2 +- npc/pre-re/warps/fields/mtmjolnir.txt | 63 ----------- npc/pre-re/warps/fields/payon_fild.txt | 17 ++- npc/pre-re/warps/fields/prontera_fild.txt | 2 +- npc/pre-re/warps/fields/rachel_fild.txt | 33 +++--- npc/pre-re/warps/fields/spl_fild.txt | 28 ----- npc/pre-re/warps/fields/umbala_fild.txt | 31 ------ npc/pre-re/warps/fields/veins_fild.txt | 22 ++-- npc/pre-re/warps/fields/yuno_fild.txt | 47 ++++----- 20 files changed, 90 insertions(+), 650 deletions(-) delete mode 100644 npc/pre-re/warps/fields/abyss_warper.txt delete mode 100644 npc/pre-re/warps/fields/amatsu_fild.txt delete mode 100644 npc/pre-re/warps/fields/ein_fild.txt delete mode 100644 npc/pre-re/warps/fields/gefenia.txt delete mode 100644 npc/pre-re/warps/fields/glastheim.txt delete mode 100644 npc/pre-re/warps/fields/jawaii.txt delete mode 100644 npc/pre-re/warps/fields/lhalzen_fild.txt delete mode 100644 npc/pre-re/warps/fields/lutie_fild.txt delete mode 100644 npc/pre-re/warps/fields/mtmjolnir.txt delete mode 100644 npc/pre-re/warps/fields/spl_fild.txt delete mode 100644 npc/pre-re/warps/fields/umbala_fild.txt (limited to 'npc/pre-re/warps/fields') diff --git a/npc/pre-re/warps/fields/abyss_warper.txt b/npc/pre-re/warps/fields/abyss_warper.txt deleted file mode 100644 index 8c4ea1e1c..000000000 --- a/npc/pre-re/warps/fields/abyss_warper.txt +++ /dev/null @@ -1,168 +0,0 @@ -//===== rAthena Script ======================================= -//= Abyss Cave Warper -//===== By: ================================================== -//= erKURITA -//===== Current Version: ===================================== -//= 1.4 -//===== Compatible With: ===================================== -//= Any Athena Version -//===== Description: ========================================= -//= Warper to Abyss Cave. and warper out -//===== Additional Comments: ================================= -//= 1.0 Added by Nexon [Nexon] -//= 1.1 Removed Duplicates [Silent] -//= 1.2 Fixed tab - missing pillar's appeared [Lupus] -//= 1.3 Updated Abyss Lake entrance based on official [SinSloth] -//= 1.3a Removed .GATs [Lupus] -//= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] -//============================================================ - -hu_fild05,168,304,0 script Column#abyss1 111,{ - - mes "^3355FFThere are 3 oddly"; - mes "shaped grooves on"; - mes "the surface of this"; - mes "column. It seems that"; - mes "certain dragon body parts"; - mes "would fit perfectly into"; - mes "the column grooves.^000000"; - if((countitem(1035)) && (countitem(1036)) && (countitem(1037))) - { - next; - switch( select( "Insert Dragon Body Parts","Eat Dragon Body Parts" ) ) - { - case 1: - mes "^3355FFYou carefully place a"; - mes "Dragon Canine into one of"; - mes "the grooves, and then you"; - mes "hear a powerful rumbling"; - mes "from within the column.^000000"; - specialeffect EF_WINDHIT; - next; - mes "^3355FFYou slowly insert a"; - mes "Dragon Scale into another"; - mes "of the column's grooves,"; - mes "trigerring another small"; - mes "tremor from the column.^000000"; - specialeffect EF_WINDHIT; - next; - mes "^3355FFYou cautiously insert"; - mes "a Dragon Tail into the"; - mes "final groove. Lights shine"; - mes "forth from cracks in the"; - mes "column's surface...^000000"; - specialeffect EF_WINDHIT; - next; - mes "^3355FFThe ground beneath"; - mes "your feet begins to"; - mes "violently shake.^000000"; - specialeffect EF_BOWLINGBASH; - donpcevent "AbyssWarp::OnWarp"; - specialeffect2 EF_PORTAL; - delitem 1035,1; - delitem 1036,1; - delitem 1037,1; - close2; - warp "hu_fild05",184,204; - end; - - case 2: - mes "^3355FFYou gingerly place a"; - mes "Dragon's Canine, a Dragon"; - mes "Scale, and a Dragon Tail into"; - mes "your mouth and slowly begin"; - mes "to chew. Nothing happens"; - mes "and the taste of these items"; - mes "is surprisingly putrid.^000000"; - next; - emotion e_rice,1; - delitem 1035,1; - delitem 1036,1; - delitem 1037,1; - percentheal -10,0; - close; - } - } - close; -} - -hu_fild05,171,211,0 script Column#abyss2 111,1,1,{ - - mes "^3355FFThis column looks"; - mes "very similar to the"; - mes "one you've seen in"; - mes "the lake. There is"; - mes "a conspicious blue"; - mes "groove on its surface.^000000"; - next; - switch( select( "Touch the Groove","Remove Item from Groove" ) ) - { - case 1: - mes "^3355FF*Clatter Clatter*^000000"; - next; - mes "^3355FFThe light emanating from"; - mes "the groove distorts and"; - mes "the column starts to shake."; - mes "You hear a faint rumbling"; - mes "from inside the column.^000000"; - specialeffect EF_WINDHIT; - next; - mes "*Ggghhhhhzzzz!*"; - mes "*BAM!*"; - next; - mes "^3355FFThe light shining from"; - mes "the column's groove grows"; - mes "brighter as you feel the"; - mes "ground beneath your feet"; - mes "begin to slowly sink away...^000000"; - next; - specialeffect EF_BOWLINGBASH; - specialeffect2 EF_PORTAL; - close2; - warp "hu_fild05",169,305; - end; - - case 2: - mes "^3355FF*Ppppsssh!*"; - mes "You accidentally"; - mes "broke the item.^000000"; - specialeffect EF_WINDHIT; - next; - mes "^3355FF*Gggggggghhhhhhhhzzzzzzjjjjhh!*^000000"; - next; - mes "^3355FFThe light emanating from"; - mes "the groove distorts and"; - mes "the column starts to shake."; - mes "The tremors in the ground"; - mes "make it difficult to stand"; - mes "steadily, but suddently you"; - mes "are warped somewhere else...^000000"; - next; - specialeffect EF_BOWLINGBASH; - specialeffect2 EF_PORTAL; - close2; - warp "hu_fild05",157,284; - end; - } -} - -hu_fild05,196,210,1 script AbyssWarp 45,2,2,{ - -OnInit: - disablenpc "AbyssWarp"; - end; - -OnTouch: - warp "abyss_01",260,268; - end; - -OnWarp: - initnpctimer; - enablenpc "AbyssWarp"; - end; - -OnTimer30000: - stopnpctimer; - disablenpc "AbyssWarp"; - end; -} diff --git a/npc/pre-re/warps/fields/amatsu_fild.txt b/npc/pre-re/warps/fields/amatsu_fild.txt deleted file mode 100644 index 37e94c3b8..000000000 --- a/npc/pre-re/warps/fields/amatsu_fild.txt +++ /dev/null @@ -1,21 +0,0 @@ -//===== rAthena Script ======================================= -//= Amatsu Field Warp's -//===== By: ================================================== -//= Nana (1.0) -//===== Current Version: ===================================== -//= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version -//===== Description: ========================================= -//= [Aegis COnversion] -//= Warp Points for Amatsu Field -//===== Additional Comments: ================================= -//= 1.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] -//============================================================ - -amatsu,248,292,0 warp ama_fild1-1 1,1,ama_fild01,75,33 -ama_fild01,75,30,0 warp ama_fild1-2 1,1,amatsu,248,289 -ama_fild01,174,331,0 warp ama_shrine1-1 1,1,ama_in01,175,174 -ama_in01,175,171,0 warp ama_shrine1.2 1,1,ama_fild01,174,328 -ama_fild01,330,141,0 warp ama_craftsman1-1 1,1,ama_in01,174,124 -ama_in01,174,121,0 warp ama_craftsman1.2 1,1,ama_fild01,330,138 diff --git a/npc/pre-re/warps/fields/com_fild.txt b/npc/pre-re/warps/fields/com_fild.txt index 765874af1..a28eace85 100644 --- a/npc/pre-re/warps/fields/com_fild.txt +++ b/npc/pre-re/warps/fields/com_fild.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Nana //===== Current Version: ===================================== -//= 1.2 +//= 1.1 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= @@ -11,7 +11,6 @@ //= Warp Points for Comodo Fields //===== Additional Comments: ================================= //= 1.1 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf] -//= 1.2 Renewal warp adjustments. //============================================================ cmd_fild01,222,24,0 warp cmd_fild01-1 1,1,cmd_fild02,222,372 @@ -23,14 +22,14 @@ cmd_fild02,358,95,0 warp cmd_fild02-3 1,1,cmd_fild04,35,94 cmd_fild03,23,269,0 warp cmd_fild03-1 1,1,cmd_fild01,359,260 cmd_fild03,23,68,0 warp cmd_fild03-2 1,1,cmd_fild01,359,76 cmd_fild03,181,17,0 warp cmd_fild03-3 1,1,cmd_fild04,181,367 -//cmd_fild03,384,165,0 warp cmd_fild03-4 1,1,cmd_fild05,26,161 +cmd_fild03,384,165,0 warp cmd_fild03-4 1,1,cmd_fild05,26,161 cmd_fild04,21,275,0 warp cmd_fild04-1 1,1,cmd_fild02,378,264 cmd_fild04,31,92,0 warp cmd_fild04-2 1,1,cmd_fild02,351,92 cmd_fild04,376,287,0 warp cmd_fild04-3 1,1,cmd_fild06,26,288 cmd_fild04,180,372,0 warp cmd_fild04-4 1,1,cmd_fild03,183,23 -//cmd_fild05,21,163,0 warp cmd_fild05-1 1,1,cmd_fild03,377,167 -//cmd_fild05,148,19,0 warp cmd_fild05-2 1,1,cmd_fild06,150,374 -//cmd_fild06,150,380,0 warp cmd_fild06-3 1,1,cmd_fild05,146,27 +cmd_fild05,21,163,0 warp cmd_fild05-1 1,1,cmd_fild03,377,167 +cmd_fild05,148,19,0 warp cmd_fild05-2 1,1,cmd_fild06,150,374 +cmd_fild06,150,380,0 warp cmd_fild06-3 1,1,cmd_fild05,146,27 cmd_fild06,21,285,0 warp cmd_fild06-4 1,1,cmd_fild04,371,288 cmd_fild06,151,27,0 warp cmd_fild06-5 1,1,cmd_fild07,147,370 cmd_fild06,368,96,0 warp cmd_fild06-6 1,1,cmd_fild08,25,102 diff --git a/npc/pre-re/warps/fields/ein_fild.txt b/npc/pre-re/warps/fields/ein_fild.txt deleted file mode 100644 index c83a13b1e..000000000 --- a/npc/pre-re/warps/fields/ein_fild.txt +++ /dev/null @@ -1,53 +0,0 @@ -//===== rAthena Script ======================================= -//= Einbroch Field Warp Script -//===== By: ================================================== -//= Sara-chan (1.0), SSUNNY@YOUNG(1.2) -//===== Current Version: ===================================== -//= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 8+ -//===== Description: ========================================= -//= Warp Points for Lighthalzen Field -//===== Additional Comments: ================================= -// Field update - Einbroch and Lhztargen by Sara - Version 1.0 -// 1.1 moved field warps from town warps [Lupus] -// 1.2 Updated Warps, work done by SSUNNY@YOUNG in Korean eA site [Vicious] -//============================================================ - - -//Einbroch Field <-> Juno Field -yuno_fild04,251,21,0 warp ein001 1,1,ein_fild06,252,363 -ein_fild06,252,365,0 warp ein001a 1,1,yuno_fild04,251,23 -yuno_fild07,73,219,0 warp ein002 1,1,ein_fild06,338,170 -ein_fild06,340,170,0 warp ein002a 1,1,yuno_fild07,75,219 -yuno_fild07,56,76,0 warp ein003 1,1,ein_fild06,354,94 -ein_fild06,356,94,0 warp ein003a 1,1,yuno_fild07,58,76 -yuno_fild11,28,266,0 warp ein004 1,1,ein_fild07,380,263 -ein_fild07,382,263,0 warp ein004a 1,1,yuno_fild11,30,266 - -//Einbroch Field -ein_fild06,135,35,0 warp ein005 1,1,ein_fild07,147,360 -ein_fild07,145,362,0 warp ein005a 1,1,ein_fild06,135,37 -ein_fild07,191,42,0 warp ein006 1,1,ein_fild10,194,370 -ein_fild10,194,372,0 warp ein006a 1,1,ein_fild07,191,44 -ein_fild10,24,331,0 warp ein007 1,1,ein_fild09,327,346 -ein_fild09,329,346,0 warp ein007a 1,1,ein_fild10,26,331 -ein_fild09,34,132,0 warp ein008 1,1,ein_fild08,361,128 -ein_fild08,363,128,0 warp ein008a 1,1,ein_fild09,36,132 - -//Einbroch Field <-> Lighthalzen Field -einbech,62,29,0 warp ein_fd03 1,1,ein_fild09,74,350 -ein_fild09,71,352,0 warp ein_fd03a 1,1,einbech,62,32 - -ein_fild04,20,251,0 warp ein046 1,1,ein_fild03,361,257 -ein_fild03,363,257,0 warp ein046a 1,1,ein_fild04,22,251 -ein_fild04,14,215,0 warp ein047 1,1,ein_fild03,359,219 -ein_fild03,361,219,0 warp ein047a 1,1,ein_fild04,16,215 -ein_fild04,14,205,0 warp ein048 1,1,ein_fild03,359,204 -ein_fild03,361,204,0 warp ein048a 1,1,ein_fild04,16,205 -ein_fild03,142,32,0 warp ein049 1,1,lhz_fild02,166,365 -lhz_fild02,166,367,0 warp ein049a 1,1,ein_fild03,142,34 -lhz_fild02,164,37,0 warp ein050 1,1,lhz_fild03,158,347 -lhz_fild03,158,349,0 warp ein050a 1,1,lhz_fild02,164,39 -lhz_fild03,363,283,0 warp ein051 1,1,ein_fild08,25,275 -ein_fild08,23,275,0 warp ein051a 1,1,lhz_fild03,361,283 diff --git a/npc/pre-re/warps/fields/gefenia.txt b/npc/pre-re/warps/fields/gefenia.txt deleted file mode 100644 index 832bdea74..000000000 --- a/npc/pre-re/warps/fields/gefenia.txt +++ /dev/null @@ -1,29 +0,0 @@ -//===== rAthena Script ======================================= -//= Gefenia Warp Script -//===== By: ================================================== -//= Muad Dib (1.0) -//= Darkchild (1.1) -//= Nana (1.2) -//===== Current Version: ===================================== -//= 1.3 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 6+ -//===== Description: ========================================= -//= Warp Points for Gefenia -//===== Additional Comments: ================================= -//= 1.3 fixed gefenia03,28,26 -> gefenia03,58,26 -//============================================================ -gefenia01,37,103,0 warp gefeniawarp014 1,1,gefenia04,283,95 -gefenia01,199,269,0 warp gefeniawarp001 1,1,gefenia02,203,34 -gefenia01,220,256,0 warp gefeniawarp003 1,1,gefenia02,240,23 -gefenia02,17,175,0 warp gefeniawarp005 1,1,gefenia03,266,168 -gefenia02,19,237,0 warp gefeniawarp007 1,1,gefenia03,264,236 -gefenia02,203,31,0 warp gefeniawarp002 1,1,gefenia01,199,266 -gefenia02,240,20,0 warp gefeniawarp004 1,1,gefenia01,223,256 -gefenia03,58,26,0 warp gefeniawarp011 1,1,gefenia04,33,270 -gefenia03,145,27,0 warp gefeniawarp009 1,1,gefenia04,130,272 -gefenia03,267,236,0 warp gefeniawarp008 1,1,gefenia02,22,237 -gefenia03,269,168,0 warp gefeniawarp006 1,1,gefenia02,20,175 -gefenia04,130,275,0 warp gefeniawarp010 1,1,gefenia03,145,30 -gefenia04,33,273,0 warp gefeniawarp012 1,1,gefenia03,58,29 -gefenia04,287,95,0 warp gefeniawarp013 1,1,gefenia01,40,103 diff --git a/npc/pre-re/warps/fields/geffen_fild.txt b/npc/pre-re/warps/fields/geffen_fild.txt index 08b0e46e2..fd4350fe6 100644 --- a/npc/pre-re/warps/fields/geffen_fild.txt +++ b/npc/pre-re/warps/fields/geffen_fild.txt @@ -3,14 +3,13 @@ //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== -//= 1.1 +//= 1.0 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= //= Warp Points for Geffen Field's //===== Additional Comments: ================================= //= No comment! -//= 1.1 Renewal warp adjustments. //============================================================ //= Geffen Field Warps ======================================= @@ -46,7 +45,7 @@ gef_fild07,18,191,0 warp geff10 2,4,gef_fild08,357,187 gef_fild07,40,19,0 warp geff13 1,1,gef_fild13,41,369 gef_fild08,200,355,0 warp geff09-1 4,2,gef_fild06,218,20 gef_fild08,360,187,0 warp geff10-1 2,4,gef_fild07,21,191 -//gef_fild08,215,18,0 warp geff14 1,1,gef_fild12,221,369 +gef_fild08,215,18,0 warp geff14 1,1,gef_fild12,221,369 gef_fild09,23,56,0 warp geff18-1 1,1,gef_fild13,376,56 gef_fild09,225,25,0 warp geff11 3,2,gef_fild10,251,368 gef_fild09,368,95,0 warp geff01-1 4,2,gef_fild01,19,102 @@ -58,16 +57,16 @@ gef_fild10,138,284,0 warp gef019 1,1,in_orcs01,29,114 gef_fild10,215,51,0 warp gef020 1,1,in_orcs01,162,53 gef_fild10,223,205,0 warp gef021 1,1,in_orcs01,108,89 gef_fild10,63,337,0 warp gef022 1,1,in_orcs01,30,157 -//gef_fild10,27,219,0 warp geff19-1 1,1,gef_fild14,367,219 +gef_fild10,27,219,0 warp geff19-1 1,1,gef_fild14,367,219 gef_fild11,377,293,0 warp gef023 2,4,prt_fild11,20,281 gef_fild11,111,364,0 warp geff12-1 6,3,gef_fild10,104,24 -//gef_fild12,221,374,0 warp geff14-1 1,1,gef_fild08,215,25 -//gef_fild12,368,180,0 warp geff15 1,1,gef_fild13,29,202 -//gef_fild12,372,50,0 warp geff16 1,1,gef_fild13,29,59 -//gef_fild13,200,25,0 warp geff17 1,1,gef_fild14,180,357 -//gef_fild13,25,202,0 warp geff15-1 1,1,gef_fild12,364,180 -//gef_fild13,26,59,0 warp geff16-1 1,1,gef_fild12,370,50 +gef_fild12,221,374,0 warp geff14-1 1,1,gef_fild08,215,25 +gef_fild12,368,180,0 warp geff15 1,1,gef_fild13,29,202 +gef_fild12,372,50,0 warp geff16 1,1,gef_fild13,29,59 +gef_fild13,200,25,0 warp geff17 1,1,gef_fild14,180,357 +gef_fild13,25,202,0 warp geff15-1 1,1,gef_fild12,364,180 +gef_fild13,26,59,0 warp geff16-1 1,1,gef_fild12,370,50 gef_fild13,380,56,0 warp geff18 1,1,gef_fild09,27,56 gef_fild13,41,373,0 warp geff13-1 1,1,gef_fild07,40,23 -//gef_fild14,180,360,0 warp geff17-1 1,1,gef_fild13,200,29 -//gef_fild14,371,219,0 warp geff19 1,1,gef_fild10,31,219 +gef_fild14,180,360,0 warp geff17-1 1,1,gef_fild13,200,29 +gef_fild14,371,219,0 warp geff19 1,1,gef_fild10,31,219 diff --git a/npc/pre-re/warps/fields/glastheim.txt b/npc/pre-re/warps/fields/glastheim.txt deleted file mode 100644 index e5d2d359b..000000000 --- a/npc/pre-re/warps/fields/glastheim.txt +++ /dev/null @@ -1,85 +0,0 @@ -//===== rAthena Script ======================================= -//= Glastheim Warp Script -//===== By: ================================================== -//= Athena (1.0) -//===== Current Version: ===================================== -//= 1.4 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 2.x -//===== Description: ========================================= -//= Warp Points for Glastheim -//===== Additional Comments: ================================= -//= Split off npc_warp.txt, 1.1 added gl18-2 [Lupus] -//= optimized random warp [Lupus] fixed looped warps -//= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] -//============================================================ - -//Glastheim -gef_fild06,20,304,0 warp gef027 3,3,glast_01,370,304 -gl_cas01,135,40,0 warp gl01 1,1,gl_cas01,144,314 -gl_cas01,149,314,0 warp gl02 1,1,gl_prison,14,70 -gl_cas01,167,191,0 warp gl03 1,1,gl_prison,14,70 -gl_cas01,185,236,0 warp gl06 1,1,gl_cas01,163,191 -gl_cas01,200,165,0 warp gl10a 1,1,gl_cas02,104,25 -gl_cas01,200,18,0 warp gl7-1 2,2,glast_01,200,294 -gl_cas01,215,236,0 warp gl07 1,1,gl_cas01,238,192 -gl_cas01,234,192,0 warp gl04 1,1,gl_prison,14,70 -gl_cas01,371,301,0 warp gl05 1,1,gl_prison,14,70 -gl_cas01,372,39,0 warp gl08 1,1,gl_cas01,367,301 -gl_cas02,104,15,0 warp gl10-1 1,1,gl_cas01,200,160 -gl_cas02,104,193,0 warp gl8-1 1,1,glast_01,199,325 -gl_church,156,4,0 warp gl9-1 1,1,glast_01,200,134 -gl_church,16,299,0 warp gl11a 1,1,gl_chyard,147,284 -gl_church,301,46,0 warp gl12 1,1,gl_chyard,147,15 -gl_chyard,12,149,0 warp gl22 1,1,gl_sew02,29,270 -gl_chyard,147,12,0 warp gl12-1 1,1,gl_church,295,46 -gl_chyard,147,287,0 warp gl11-1 1,1,gl_church,16,295 -gl_dun01,133,277,0 warp gl25-1 1,1,gl_sew04,101,78 -gl_dun01,225,18,0 warp gl13 1,1,gl_dun02,224,274 -gl_dun02,224,277,0 warp gl13-1 1,1,gl_dun01,225,22 -gl_in01,106,125,0 warp gl5-1 1,1,glast_01,219,357 -gl_in01,118,59,0 warp gl6-1 1,1,glast_01,234,330 -gl_in01,81,68,0 warp gl3-1 1,1,glast_01,165,330 -gl_in01,83,174,0 warp gl4-1 1,1,glast_01,181,357 -gl_knt01,104,204,0 warp gl15 1,1,gl_knt01,123,292 -gl_knt01,12,148,0 warp gl14 1,1,gl_knt02,15,140 -gl_knt01,128,292,0 warp gl15-1 1,1,gl_knt01,104,199 -gl_knt01,150,291,0 warp gl16 1,1,gl_knt02,157,287 -gl_knt01,150,6,0 warp gl2-1 2,2,glast_01,74,193 -gl_knt01,231,197,0 warp gl24-1 1,1,gl_sew02,296,22 -gl_knt01,287,144,0 warp gl17 1,1,gl_knt02,283,140 -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,10,70,4 script gl18-2 45,1,1,{ -if(rand(2)==1) goto w2; - warp "gl_cas01",236,192; end; -w2: warp "gl_cas01",164,191; end; -} -gl_prison1,150,10,0 warp gl18 1,1,gl_prison,149,178 -gl_prison1,62,187,0 warp gl10 1,1,gl_sew01,258,255 -gl_sew01,19,21,0 warp gl19 1,1,gl_sew02,108,291 -gl_sew01,258,258,0 warp gl09 1,1,gl_prison1,61,183 -gl_sew02,109,294,0 warp gl19-1 1,1,gl_sew01,19,24 -gl_sew02,16,26,0 warp gl11 1,1,gl_prison1,61,183 -gl_sew02,290,156,0 warp gl23 1,1,gl_step,117,124 -gl_sew02,296,18,0 warp gl24 1,1,gl_knt01,231,192 -gl_sew02,299,294,0 warp gl20 1,1,gl_sew03,171,283 -gl_sew02,30,273,0 warp gl22-1 1,1,gl_chyard,15,149 -gl_sew03,171,286,0 warp gl20-1 1,1,gl_sew02,295,294 -gl_sew03,64,10,0 warp gl21 1,1,gl_sew04,68,277 -gl_sew04,104,78,0 warp gl25 1,1,gl_dun01,133,271 -gl_sew04,68,280,0 warp gl21-1 1,1,gl_sew03,64,13 -gl_step,120,124,0 warp gl23-1 1,1,gl_sew02,285,158 -gl_step,8,7,0 warp gl1-1 1,1,glast_01,54,108 -glast_01,162,330,0 warp gl3 1,1,gl_in01,77,68 -glast_01,179,360,0 warp gl4 1,1,gl_in01,80,174 -glast_01,199,322,0 warp gl8 1,1,gl_cas02,104,189 -glast_01,200,137,0 warp gl9 1,1,gl_church,156,7 -glast_01,200,297,0 warp gl7 1,1,gl_cas01,199,29 -glast_01,220,360,0 warp gl5 1,1,gl_in01,110,125 -glast_01,237,330,0 warp gl6 1,1,gl_in01,122,59 -glast_01,377,304,0 warp glst001 3,3,gef_fild06,27,304 -glast_01,51,108,0 warp gl1 1,1,gl_step,12,7 -glast_01,77,193,0 warp gl2 1,1,gl_knt01,150,15 diff --git a/npc/pre-re/warps/fields/hugel_fild.txt b/npc/pre-re/warps/fields/hugel_fild.txt index 8b5de97b2..c86980a98 100644 --- a/npc/pre-re/warps/fields/hugel_fild.txt +++ b/npc/pre-re/warps/fields/hugel_fild.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Sara-chan (1.0) //===== Current Version: ===================================== -//= 1.3 +//= 1.2 //===== Compatible With: ===================================== //= Any Athena Version; RO Episode 10+ //===== Description: ========================================= @@ -12,7 +12,6 @@ //= Initial Release //= 1.1 Official warps [Playtester] //= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] -//= 1.3 Renewal warp adjustments. //============================================================ //= Hugel Field ============================================== @@ -20,34 +19,29 @@ ein_fild04,343,293,0 warp hugel001 1,1,ein_fild05,80,294 ein_fild05,76,294,0 warp hugel001a 1,1,ein_fild04,336,292 ein_fild05,376,183,0 warp hugel002 1,1,ein_fild06,47,166 ein_fild06,42,171,0 warp hugel002a 1,1,ein_fild05,371,183 -//ein_fild02,357,251,0 warp hugel003-1 1,1,yuno_fild04,38,280 -//yuno_fild04,33,279,0 warp hugel003a-1 1,1,ein_fild02,350,250 -//ein_fild01,349,369,0 warp hugel003 1,1,yuno_fild05,43,346 -//yuno_fild05,41,350,0 warp hugel003a 1,1,ein_fild01,345,367 -//ein_fild01,106,34,0 warp hugel004 1,1,ein_fild02,109,358 -//ein_fild02,108,364,0 warp hugel004a 1,1,ein_fild01,106,40 -//ein_fild01,234,34,0 warp hugel005 1,1,ein_fild02,258,343 -//ein_fild02,257,350,0 warp hugel005a 1,1,ein_fild01,231,40 -//ein_fild02,170,29,0 warp hugel006 1,1,ein_fild05,172,366 -//ein_fild05,172,371,0 warp hugel006a 1,1,ein_fild02,170,37 +ein_fild02,357,251,0 warp hugel003-1 1,1,yuno_fild04,38,280 +yuno_fild04,33,279,0 warp hugel003a-1 1,1,ein_fild02,350,250 +ein_fild01,349,369,0 warp hugel003 1,1,yuno_fild05,43,346 +yuno_fild05,41,350,0 warp hugel003a 1,1,ein_fild01,345,367 +ein_fild01,106,34,0 warp hugel004 1,1,ein_fild02,109,358 +ein_fild02,108,364,0 warp hugel004a 1,1,ein_fild01,106,40 +ein_fild01,234,34,0 warp hugel005 1,1,ein_fild02,258,343 +ein_fild02,257,350,0 warp hugel005a 1,1,ein_fild01,231,40 +ein_fild02,170,29,0 warp hugel006 1,1,ein_fild05,172,366 +ein_fild05,172,371,0 warp hugel006a 1,1,ein_fild02,170,37 hu_fild01,366,185,0 warp hugel007 1,1,hu_fild02,22,168 hu_fild02,17,168,0 warp hugel007a 1,1,hu_fild01,361,189 hu_fild04,47,372,0 warp hugel008 1,1,hu_fild02,40,27 hu_fild02,40,22,0 warp hugel008a 1,1,hu_fild04,48,368 hu_fild04,294,379,0 warp hugel009 1,1,hu_fild02,280,31 hu_fild02,283,28,0 warp hugel009a 1,1,hu_fild04,289,376 -//hu_fild05,284,356,0 warp hugel010 1,1,hu_fild03,288,26 -//hu_fild03,288,19,0 warp hugel010a 1,1,hu_fild05,276,346 +hu_fild05,284,356,0 warp hugel010 1,1,hu_fild03,288,26 +hu_fild03,288,19,0 warp hugel010a 1,1,hu_fild05,276,346 hu_fild05,353,126,0 warp hugel011 1,1,hu_fild06,34,119 hu_fild06,28,119,0 warp hugel011a 1,1,hu_fild05,347,130 hu_fild02,374,339,0 warp hugel012 1,1,hu_fild03,24,337 -//hu_fild03,20,338,0 warp hugel012a 1,1,hu_fild02,370,339 +hu_fild03,20,338,0 warp hugel012a 1,1,hu_fild02,370,339 hu_fild02,378,162,0 warp hugel013 1,1,hu_fild03,30,163 -//hu_fild03,25,163,0 warp hugel013a 1,1,hu_fild02,373,160 -//yuno_fild09,377,184,0 warp hugel014 1,1,yuno_fild10,44,183 -//yuno_fild10,39,183,0 warp hugel014a 1,1,yuno_fild09,371,184 - -// RE Addon -ein_fild01,106,34,0 warp EinF01Dn01_EinF05Up01 1,1,ein_fild05,172,366 -ein_fild01,234,34,0 warp EinF01Dn02_EinF05Up02 1,1,ein_fild05,172,366 -ein_fild05,172,371,0 warp EinF05Up01_EinF01Dn01 1,1,ein_fild01,106,40 +hu_fild03,25,163,0 warp hugel013a 1,1,hu_fild02,373,160 +yuno_fild09,377,184,0 warp hugel014 1,1,yuno_fild10,44,183 +yuno_fild10,39,183,0 warp hugel014a 1,1,yuno_fild09,371,184 diff --git a/npc/pre-re/warps/fields/jawaii.txt b/npc/pre-re/warps/fields/jawaii.txt deleted file mode 100644 index 024f97c1f..000000000 --- a/npc/pre-re/warps/fields/jawaii.txt +++ /dev/null @@ -1,26 +0,0 @@ -//===== rAthena Script ======================================= -//= Jawaii Warp Script -//===== By: ================================================== -//= Muad Dib (1.0) -//= Darkchild (1.1) -//= MasterOfMuppets (1.2) -//===== Current Version: ===================================== -//= 1.2b -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 6+ -//===== Description: ========================================= -//= Warp Points for Jawaii -//===== Additional Comments: ================================= -//= Split off npc_warp.txt -//= 1.2a Added a missing warp, thanks to Zoc [MasterOfMuppets] -//= 1.2b Added a missing warp [Komurka] -//============================================================ - -jawaii_in,90,78,0 warp jawaiiwarp001 1,1,jawaii,115,172 -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,{ -if (getpartnerid() > 0) warp "jawaii",192,218; else warp "jawaii_in",27,94; -} diff --git a/npc/pre-re/warps/fields/lhalzen_fild.txt b/npc/pre-re/warps/fields/lhalzen_fild.txt deleted file mode 100644 index 10a5b5d7e..000000000 --- a/npc/pre-re/warps/fields/lhalzen_fild.txt +++ /dev/null @@ -1,21 +0,0 @@ -//===== rAthena Script ======================================= -//= Lighthalzen Field Warp Script -//===== By: ================================================== -//= Sara-chan (1.0) -//===== Current Version: ===================================== -//= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 8+ -//===== Description: ========================================= -//= Warp Points for Lighthalzen Field -//===== Additional Comments: ================================= -//= 1.1 Applied Poki#3's fix for lhz001 & lhz001a [DracoRPG] -//= 1.2 Updated the warp, according to korean eA site [Vicious] -//= 1.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] -//============================================================ - -lhz_fild01,210,18,0 warp lhz043-1 1,1,lighthalzen,214,324 -lighthalzen,214,329,0 warp lhz043a-1 1,1,lhz_fild01,210,23 - -lhz_fild01,367,222,0 warp lhz044-1 1,1,lhz_fild02,36,221 -lhz_fild02,29,219,0 warp lhz044a-1 1,1,lhz_fild01,361,222 diff --git a/npc/pre-re/warps/fields/lutie_fild.txt b/npc/pre-re/warps/fields/lutie_fild.txt deleted file mode 100644 index 8e944bd81..000000000 --- a/npc/pre-re/warps/fields/lutie_fild.txt +++ /dev/null @@ -1,18 +0,0 @@ -//===== rAthena Script ======================================= -//= Lutie Field Warp Script -//===== By: ================================================== -//= Nana (1.0) -//===== Current Version: ===================================== -//= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 2+ -//===== Description: ========================================= -//= [Aegis Conversion] -//= Warp Points for Lutie Field -//===== Additional Comments: ================================= -//= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] -//============================================================ - -xmas_fild01,69,252,0 warp xmas_fild1-1 10,2,xmas,149,44 -xmas_fild01,90,252,0 warp xmax_fild1-2 10,2,xmas,149,44 -xmas_fild01,84,48,0 warp xmas_fild2 10,2,aldebaran,140,234 diff --git a/npc/pre-re/warps/fields/morroc_fild.txt b/npc/pre-re/warps/fields/morroc_fild.txt index 6cd6c64b5..cce5d0b3d 100644 --- a/npc/pre-re/warps/fields/morroc_fild.txt +++ b/npc/pre-re/warps/fields/morroc_fild.txt @@ -35,7 +35,7 @@ moc_fild02,67,342,0 warp mocf02-3 11,3,moc_fild01,315,25 moc_fild02,71,18,0 warp mocf05 4,2,moc_fild13,146,365 moc_fild02,92,342,0 warp mocf02-4 11,3,moc_fild01,315,25 moc_fild03,17,37,0 warp mocf06 2,4,moc_fild13,305,49 -//moc_fild03,179,16,0 warp mocf013 4,2,pay_fild11,38,327 +moc_fild03,179,16,0 warp mocf013 4,2,pay_fild11,38,327 moc_fild03,303,170,0 warp mocf014 2,7,pay_fild01,17,152 moc_fild03,70,341,0 warp mocf04-1 5,2,moc_fild02,332,23 //moc_fild04,14,122,0 warp mocf07-1 1,11,moc_fild05,378,119 diff --git a/npc/pre-re/warps/fields/mtmjolnir.txt b/npc/pre-re/warps/fields/mtmjolnir.txt deleted file mode 100644 index 1c49ddc96..000000000 --- a/npc/pre-re/warps/fields/mtmjolnir.txt +++ /dev/null @@ -1,63 +0,0 @@ -//===== rAthena Script ======================================= -//= Mt. Mjolnir Warp Script -//===== By: ================================================== -//= Nana (1.0) -//===== Current Version: ===================================== -//= 1.2a -//===== Compatible With: ===================================== -//= Any Athena Version -//===== Description: ========================================= -//= Warp Points for Mt. Mjolnir -//===== Additional Comments: ================================= -//= 1.1 updating according to jA [Lupus] -//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] -//= 1.2a Corrected a broken warp point. (bugreport:497) [Samuray22] -//============================================================ - -//= Mt. Mjolnir ============================================== -mjolnir_01,284,18,0 warp mjol001 4,2,gef_fild04,261,359 -mjolnir_01,378,256,0 warp mjol01 2,2,mjolnir_02,31,258 -mjolnir_02,28,258,0 warp mjol01-1 2,2,mjolnir_01,374,256 -mjolnir_02,326,289,0 warp mjol02 1,1,mjolnir_03,24,258 -mjolnir_02,361,18,0 warp mjol03 4,2,mjolnir_06,366,380 -mjolnir_02,79,365,0 warp mjol013 2,1,mjo_dun01,52,17 -mjolnir_03,21,258,0 warp mjol02-1 2,2,mjolnir_02,323,289 -mjolnir_03,212,17,0 warp mjol04 4,2,mjolnir_07,214,380 -mjolnir_03,242,204,0 warp mjol05 1,1,mjolnir_04,125,208 -mjolnir_04,122,208,0 warp mjol05-1 1,1,mjolnir_03,239,204 -mjolnir_04,160,46,0 warp mjol06 4,2,mjolnir_08,159,370 -mjolnir_04,387,174,0 warp mjol07 2,2,mjolnir_05,19,171 -mjolnir_05,16,171,0 warp mjol07-1 2,2,mjolnir_04,384,174 -mjolnir_05,220,382,0 warp mjol08 4,2,mjolnir_12,220,29 -mjolnir_05,235,16,0 warp mjol09 4,2,mjolnir_10,235,378 -mjolnir_06,18,331,0 warp mjol002 2,4,gef_fild04,359,322 -mjolnir_06,265,29,0 warp mjol003 2,2,gef_fild00,267,379 -mjolnir_06,366,383,0 warp mjol03-1 4,2,mjolnir_02,361,21 -mjolnir_06,382,377,0 warp mjol10 2,4,mjolnir_07,19,377 -mjolnir_06,383,74,0 warp mjol11 2,4,mjolnir_07,20,77 -mjolnir_07,156,16,0 warp mjol004 4,2,prt_fild00,159,380 -mjolnir_07,16,377,0 warp mjol10-1 2,4,mjolnir_06,379,377 -mjolnir_07,17,77,0 warp mjol11-1 2,4,mjolnir_06,380,74 -mjolnir_07,214,383,0 warp mjol04-1 4,2,mjolnir_03,212,20 -mjolnir_07,383,233,0 warp mjol12 2,4,mjolnir_08,33,234 -mjolnir_07,383,362,0 warp mjol13 2,4,mjolnir_08,32,346 -mjolnir_08,159,373,0 warp mjol06a 1,1,mjolnir_04,160,49 -mjolnir_08,185,28,0 warp mjol14 17,2,mjolnir_09,196,364 -mjolnir_08,29,346,0 warp mjol13-1 2,4,mjolnir_07,380,362 -mjolnir_08,30,234,0 warp mjol12-1 2,4,mjolnir_07,380,233 -mjolnir_08,369,257,0 warp mjol15 2,4,mjolnir_10,18,258 -mjolnir_09,106,28,0 warp mjol005 4,2,prt_fild05,105,378 -mjolnir_09,194,367,0 warp mjol14-1 8,2,mjolnir_08,185,31 -mjolnir_09,30,249,0 warp mjol006 2,4,prt_fild00,380,249 -mjolnir_09,300,28,0 warp mjol007 4,2,prt_fild05,292,382 -mjolnir_09,373,288,0 warp mjol011 2,2,prt_fild01,23,292 -mjolnir_10,15,258,0 warp mjol15-1 2,4,mjolnir_08,366,257 -mjolnir_10,235,381,0 warp mjol09-1 4,2,mjolnir_05,235,19 -mjolnir_10,265,13,0 warp mjol008 3,2,prt_fild01,261,370 -mjolnir_10,384,220,0 warp mjol16 2,4,mjolnir_11,23,220 -mjolnir_10,66,15,0 warp mjol009 4,2,prt_fild01,66,370 -mjolnir_11,174,20,0 warp mjol010 4,2,prt_fild02,173,379 -mjolnir_11,20,220,0 warp mjol16-1 2,4,mjolnir_10,381,220 -mjolnir_12,199,378,0 warp mjol012 2,2,aldebaran,138,37 -mjolnir_12,220,26,0 warp mjol08-1 3,2,mjolnir_05,220,379 -mjolnir_12,44,17,0 warp mjol17 1,1,prt_maze01,17,111 diff --git a/npc/pre-re/warps/fields/payon_fild.txt b/npc/pre-re/warps/fields/payon_fild.txt index d991f2280..07c7bcd4f 100644 --- a/npc/pre-re/warps/fields/payon_fild.txt +++ b/npc/pre-re/warps/fields/payon_fild.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== -//= 1.3 +//= 1.2 //===== Compatible With: ===================================== //= Any rAthena Mod //===== Description: ========================================= @@ -11,7 +11,6 @@ //===== Additional Comments: ================================= //= 1.1 Refixed payon field08 -> payon warp //= 1.2 Changed trigger area of pay_fild08 -> payon warp. [L0ne_W0lf] -//= 1.3 Renewal warp adjustments. //============================================================ //= Payon Field's ============================================ @@ -19,8 +18,8 @@ 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,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 @@ -30,9 +29,9 @@ 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_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 @@ -46,5 +45,5 @@ pay_fild09,16,91,0 warp payf13-1 2,4,pay_fild08,259,91 pay_fild10,112,382,0 warp pay14-1 3,2,pay_fild09,112,19 pay_fild10,16,290,0 warp payf12-1 2,5,pay_fild07,379,290 pay_fild10,99,13,0 warp w1034 1,1,pay_fild10,148,252 -//pay_fild11,297,135,0 warp payf06-1 2,4,pay_fild02,19,175 -//pay_fild11,38,330,0 warp payf004 4,2,moc_fild03,179,19 +pay_fild11,297,135,0 warp payf06-1 2,4,pay_fild02,19,175 +pay_fild11,38,330,0 warp payf004 4,2,moc_fild03,179,19 diff --git a/npc/pre-re/warps/fields/prontera_fild.txt b/npc/pre-re/warps/fields/prontera_fild.txt index e3461bb2a..677da8c5f 100644 --- a/npc/pre-re/warps/fields/prontera_fild.txt +++ b/npc/pre-re/warps/fields/prontera_fild.txt @@ -1,4 +1,4 @@ -//===== rAthena Script ======================================= +//===== eAthena Script ======================================= //= Prontera Field Warp Script //===== By: ================================================== //= Nana (1.0) diff --git a/npc/pre-re/warps/fields/rachel_fild.txt b/npc/pre-re/warps/fields/rachel_fild.txt index 475557200..78a24465e 100644 --- a/npc/pre-re/warps/fields/rachel_fild.txt +++ b/npc/pre-re/warps/fields/rachel_fild.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Playtester //===== Current Version: ===================================== -//= 1.3 +//= 1.2 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= @@ -12,7 +12,6 @@ //= 1.0 Initial version [Playtester] //= 1.1 Official warps [Playtester] //= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] -//= 1.3 Renewal warp adjustments. //============================================================ ra_fild01,233,333,0 warp ra000 1,1,ice_dun01,157,15 @@ -20,12 +19,12 @@ ra_fild01,306,38,0 warp ra001 1,1,ra_fild04,322,371 ra_fild04,322,378,0 warp ra002 1,1,ra_fild01,306,43 ra_fild04,362,351,0 warp ra003 1,1,ra_fild05,39,353 ra_fild05,33,353,0 warp ra004 1,1,ra_fild04,356,351 -//ra_fild05,27,13,0 warp ra005 1,1,ra_fild09,30,337 -//ra_fild09,29,343,0 warp ra006 1,1,ra_fild05,31,17 +ra_fild05,27,13,0 warp ra005 1,1,ra_fild09,30,337 +ra_fild09,29,343,0 warp ra006 1,1,ra_fild05,31,17 ra_fild04,263,54,0 warp ra007 1,1,ra_fild08,287,365 ra_fild08,287,370,0 warp ra008 1,1,ra_fild04,263,60 -//ra_fild09,27,238,0 warp ra009 1,1,ra_fild08,360,234 -//ra_fild08,368,234,0 warp ra010 1,1,ra_fild09,35,238 +ra_fild09,27,238,0 warp ra009 1,1,ra_fild08,360,234 +ra_fild08,368,234,0 warp ra010 1,1,ra_fild09,35,238 ra_fild04,23,176,0 warp ra011 1,1,ra_fild03,370,172 ra_fild03,374,168,0 warp ra012 1,1,ra_fild04,29,176 ra_fild05,348,274,0 warp ra013 1,1,ra_fild06,24,277 @@ -35,14 +34,14 @@ lhz_fild01,296,382,0 warp ra016 1,1,ra_fild06,298,25 ra_fild12,36,225,0 warp ra017 1,1,rachel,270,125 ra_fild08,165,29,0 warp ra018 1,1,ra_fild12,149,369 ra_fild12,149,374,0 warp ra019 1,1,ra_fild08,165,36 -//ra_fild12,303,27,0 warp ra020 1,1,ra_fild13,295,341 -//ra_fild13,295,346,0 warp ra021 1,1,ra_fild12,303,33 -//ra_fild11,360,226,0 warp ra022 1,1,rachel,30,125 -//ra_fild11,21,290,0 warp ra023 1,1,ra_fild10,379,283 -//ra_fild10,384,287,0 warp ra024 1,1,ra_fild11,28,290 -//ra_fild11,202,335,0 warp ra025a 1,1,ra_fild07,215,32 -//ra_fild07,215,27,0 warp ra025b 1,1,ra_fild11,201,329 -//ra_fild07,168,353,0 warp ra026 1,1,ra_fild02,171,45 -//ra_fild02,168,36,0 warp ra027 1,1,ra_fild07,168,349 -//ra_fild02,373,275,0 warp ra028 1,1,ra_fild03,28,294 -//ra_fild03,23,294,0 warp ra029 1,1,ra_fild02,367,270 +ra_fild12,303,27,0 warp ra020 1,1,ra_fild13,295,341 +ra_fild13,295,346,0 warp ra021 1,1,ra_fild12,303,33 +ra_fild11,360,226,0 warp ra022 1,1,rachel,30,125 +ra_fild11,21,290,0 warp ra023 1,1,ra_fild10,379,283 +ra_fild10,384,287,0 warp ra024 1,1,ra_fild11,28,290 +ra_fild11,202,335,0 warp ra025a 1,1,ra_fild07,215,32 +ra_fild07,215,27,0 warp ra025b 1,1,ra_fild11,201,329 +ra_fild07,168,353,0 warp ra026 1,1,ra_fild02,171,45 +ra_fild02,168,36,0 warp ra027 1,1,ra_fild07,168,349 +ra_fild02,373,275,0 warp ra028 1,1,ra_fild03,28,294 +ra_fild03,23,294,0 warp ra029 1,1,ra_fild02,367,270 diff --git a/npc/pre-re/warps/fields/spl_fild.txt b/npc/pre-re/warps/fields/spl_fild.txt deleted file mode 100644 index 1860636ff..000000000 --- a/npc/pre-re/warps/fields/spl_fild.txt +++ /dev/null @@ -1,28 +0,0 @@ -//===== rAthena Script ======================================= -//= Splendid Field Warp Script -//===== By: ================================================== -//= L0ne_W0lf -//===== Current Version: ===================================== -//= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version -//===== Description: ========================================= -//= [Aegis Conversion] -//= Warp Points for Splendide -//===== Additional Comments: ================================= -//= 1.0 First Version. -//= 1.1 Fixed misplaced warp. [L0ne_W0lf] -//= 1.2 Updated warps positions. [L0ne_W0lf] -//============================================================ - -spl_fild02,382,143,0 warp spl_fild02-2 1,1,mid_camp,16,143 -spl_fild02,383,216,0 warp spl_fild02-4 1,1,mid_camp,12,215 -spl_fild02,310,10,0 warp spl_fild02-5 1,1,spl_fild03,306,376 -spl_fild03,99,373,0 warp spl_fild02-6 1,1,spl_fild02,102,32 -spl_fild03,306,379,0 warp spl_fild03-1 1,1,spl_fild02,311,12 -spl_fild02,103,30,0 warp spl_fild03-2 1,1,spl_fild03,99,370 - -spl_fild01,289,28,0 warp spl_fild01-1 1,1,spl_fild02,292,377 -spl_fild02,6,241,0 warp spl_fild02-7 1,1,splendide,386,251 -splendide,388,252,0 warp spl_fild02-8 1,1,spl_fild02,8,241 -spl_fild02,293,379,0 warp spl_fild02-9 1,1,spl_fild01,289,30 diff --git a/npc/pre-re/warps/fields/umbala_fild.txt b/npc/pre-re/warps/fields/umbala_fild.txt deleted file mode 100644 index 1282257e4..000000000 --- a/npc/pre-re/warps/fields/umbala_fild.txt +++ /dev/null @@ -1,31 +0,0 @@ -//===== rAthena Script ======================================= -//= Umbala Field Warp Script -//===== By: ================================================== -//= Nana (1.0) -//===== Current Version: ===================================== -//= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 6+ -//===== Description: ========================================= -//= [Aegis Conversion] -//= Warp Points for Umbala Field -//===== Additional Comments: ================================= -//= 1.1 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf] -//============================================================ - -cmd_fild01,77,366,0 warp um_fild1-1 1,1,um_fild03,114,53 -cmd_fild01,178,370,0 warp um_fild1-2 1,1,um_fild03,243,29 -um_fild01,31,274,0 warp um_fild1-3 1,1,beach_dun2,254,244 -beach_dun2,258,244,0 warp um_fild1-4 1,1,um_fild01,35,276 -um_fild01,369,277,0 warp um_fild1-5 1,1,um_fild02,25,272 -um_fild02,22,272,0 warp um_fild2-1 1,1,um_fild01,366,277 -um_fild02,188,374,0 warp um_fild2-2 1,1,um_fild04,182,16 -um_fild02,373,329,0 warp um_fild2-3 1,1,um_fild03,23,334 -um_fild02,373,148,0 warp um_fild2-4 1,1,um_fild03,36,145 -um_fild03,19,334,0 warp um_fild3-1 1,1,um_fild02,370,329 -um_fild03,32,145,0 warp um_fild3-2 1,1,um_fild02,370,148 -um_fild03,114,50,0 warp um_fild3-3 1,1,cmd_fild01,74,363 -um_fild03,243,26,0 warp um_fild3-4 1,1,cmd_fild01,176,367 -um_fild04,182,13,0 warp um_fild4-1 1,1,um_fild02,190,371 -um_fild04,215,339,0 warp um_fild4-2 1,1,umbala,130,82 -umbala,130,79,0 warp um_fild4-3 1,1,um_fild04,215,336 diff --git a/npc/pre-re/warps/fields/veins_fild.txt b/npc/pre-re/warps/fields/veins_fild.txt index ac05163ff..9664f1707 100644 --- a/npc/pre-re/warps/fields/veins_fild.txt +++ b/npc/pre-re/warps/fields/veins_fild.txt @@ -3,35 +3,33 @@ //===== By: ================================================== //= $ephiroth //===== Current Version: ===================================== -//= 1.5 +//= 1.4 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= //= Warp Points for Veins Field //===== Additional Comments: ================================= //= 1.4 Rescripted to Aegis 11.2 Standards. [L0ne_W0lf] -//= 1.5 Renewal warp adjustments. //============================================================ ve_fild01,366,267,0 warp ve_fild1-1 1,1,ve_fild02,36,263 ve_fild01,184,20,0 warp ve_fild1-2 1,1,ve_fild04,174,334 -//ra_fild11,233,27,0 warp ve_fild1-3 1,1,ve_fild01,243,363 -//ve_fild01,243,368,0 warp ve_fild1-4 1,1,ra_fild11,232,32 +ra_fild11,233,27,0 warp ve_fild1-3 1,1,ve_fild01,243,363 +ve_fild01,243,368,0 warp ve_fild1-4 1,1,ra_fild11,232,32 ve_fild01,350,92,0 warp ve_fild1-5 1,1,ve_fild02,78,133 -//ra_fild13,29,308,0 warp ve_fild2-1 1,1,ve_fild02,380,308 -//ve_fild02,385,308,0 warp ve_fild2-2 1,1,ra_fild13,34,308 +ra_fild13,29,308,0 warp ve_fild2-1 1,1,ve_fild02,380,308 +ve_fild02,385,308,0 warp ve_fild2-2 1,1,ra_fild13,34,308 ve_fild02,195,382,0 warp ve_fild2-3 1,1,rachel,130,25 ve_fild02,31,263,0 warp ve_fild2-4 1,1,ve_fild01,361,267 ve_fild02,73,133,0 warp ve_fild2-5 1,1,ve_fild01,345,92 ve_fild03,355,223,0 warp ve_fild3-1 1,1,ve_fild04,49,249 -//ve_fild03,222,43,0 warp ve_fild3-2 1,1,ve_fild05,200,325 +ve_fild03,222,43,0 warp ve_fild3-2 1,1,ve_fild05,200,325 ve_fild04,174,339,0 warp ve_fild4-1 1,1,ve_fild01,184,25 ve_fild04,44,249,0 warp ve_fild4-2 1,1,ve_fild03,350,220 ve_fild04,115,50,0 warp ve_fild4-3 1,1,ve_fild06,80,183 -//ve_fild05,200,330,0 warp ve_fild5-1 1,1,ve_fild03,222,48 -//ve_fild05,359,192,0 warp ve_fild5-2 1,1,ve_fild06,80,183 +ve_fild05,200,330,0 warp ve_fild5-1 1,1,ve_fild03,222,48 +ve_fild05,359,192,0 warp ve_fild5-2 1,1,ve_fild06,80,183 ve_fild06,153,220,0 warp ve_fild6-1 1,1,veins,218,355 -/* ve_fild06,81,177,0 script ve_fild6-2 45,1,1,{ if (rand(2)) warp "ve_fild04",115,55; @@ -39,12 +37,8 @@ ve_fild06,81,177,0 script ve_fild6-2 45,1,1,{ warp "ve_fild05",354,191; end; } -*/ ve_fild07,147,371,0 warp ve_fild7-1 1,1,veins,146,28 -// Renewal Addon -ve_fild06,81,177,0 warp VeF06S_VeF04S 1,1,ve_fild04,115,55 - //============================================================ // Old changelog //============================================================ diff --git a/npc/pre-re/warps/fields/yuno_fild.txt b/npc/pre-re/warps/fields/yuno_fild.txt index 32d1924f5..e78fbb3dc 100644 --- a/npc/pre-re/warps/fields/yuno_fild.txt +++ b/npc/pre-re/warps/fields/yuno_fild.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Nana (1.0), Sara //===== Current Version: ===================================== -//= 1.3 +//= 1.2 //===== Compatible With: ===================================== //= Any Athena Version; RO Episode 5+ //===== Description: ========================================= @@ -11,7 +11,6 @@ //===== Additional Comments: ================================= //= 1.1 - Updated for the new Yuno Fields //= 1.2 New field update - Hugel Field by Sara - Version 1 -//= 1.3 Renewal warp adjustments. //============================================================ //= Yuno Field =============================================== @@ -58,8 +57,8 @@ yuno_fild08,74,376,0 warp newjun12 1,1,yuno_fild02,70,25 yuno_fild02,70,23,0 warp newjun12a 1,1,yuno_fild08,74,374 yuno_fild08,286,386,0 warp newjun13 1,1,yuno_fild02,294,26 yuno_fild02,294,24,0 warp newjun13a 1,1,yuno_fild08,286,384 -//yuno_fild04,42,369,0 warp newjun14 1,1,yuno_fild05,59,30 -//yuno_fild05,59,28,0 warp newjun14a 1,1,yuno_fild04,42,367 +yuno_fild04,42,369,0 warp newjun14 1,1,yuno_fild05,59,30 +yuno_fild05,59,28,0 warp newjun14a 1,1,yuno_fild04,42,367 //= Al de Baran <-> Yuno Connection ========================== @@ -68,23 +67,23 @@ yuno_fild01,208,17,0 warp yunfild-alde 1,1,aldebaran,140,242 //= Hugel Field //= Version 1 -//yuno_fild05,370,321,0 warp hu001 1,1,yuno_fild06,48,322 -//yuno_fild06,41,319,0 warp hu001a 1,1,yuno_fild05,366,319 -yuno_fild06,214,27,0 warp hu002 1,1,yuno_fild03,215,375 -yuno_fild03,215,382,0 warp hu002a 1,1,yuno_fild06,218,33 -yuno_fild06,369,132,0 warp hu003 1,1,hu_fild04,34,126 -hu_fild04,27,126,0 warp hu003a 1,1,yuno_fild06,362,132 -hu_fild04,122,27,0 warp hu004 1,1,yuno_fild02,114,370 -yuno_fild02,117,375,0 warp hu004a 1,1,hu_fild04,122,35 -yuno_fild06,151,370,0 warp hu005 1,1,hu_fild01,135,42 -hu_fild01,141,36,0 warp hu005a 1,1,yuno_fild06,156,368 -hu_fild04,380,183,0 warp hu006 1,1,hu_fild05,39,206 -hu_fild05,33,198,0 warp hu006a 1,1,hu_fild04,373,181 -//hu_fild05,89,43,0 warp hu007 1,1,hu_fild07,80,365 -//hu_fild07,81,370,0 warp hu007a 1,1,hu_fild05,89,50 -//hu_fild07,36,352,0 warp hu008 1,1,yuno_fild02,378,336 -//yuno_fild02,383,339,0 warp hu008a 1,1,hu_fild07,42,351 -//hu_fild07,57,37,0 warp hu009 1,1,yuno_fild09,48,370 -//yuno_fild09,48,376,0 warp hu009a 1,1,hu_fild07,58,42 -//hu_fild07,226,38,0 warp hu010 1,1,yuno_fild09,220,368 -//yuno_fild09,220,373,0 warp hu010a 1,1,hu_fild07,224,43 +yuno_fild05,372,325,0 warp hu001 1,1,yuno_fild06,42,319 +yuno_fild06,40,319,0 warp hu001a 1,1,yuno_fild05,370,325 +yuno_fild06,217,27,0 warp hu002 1,1,yuno_fild03,214,381 +yuno_fild03,214,383,0 warp hu002a 1,1,yuno_fild06,217,29 +yuno_fild06,369,136,0 warp hu003 1,1,hu_fild04,28,126 +hu_fild04,26,126,0 warp hu003a 1,1,yuno_fild06,367,136 +hu_fild04,121,26,0 warp hu004 1,1,yuno_fild02,118,374 +yuno_fild02,118,376,0 warp hu004a 1,1,hu_fild04,121,28 +yuno_fild06,149,369,0 warp hu005 1,1,hu_fild01,139,37 +hu_fild01,139,35,0 warp hu005a 1,1,yuno_fild06,151,369 +hu_fild04,381,187,0 warp hu006 1,1,hu_fild05,34,202 +hu_fild05,32,202,0 warp hu006a 1,1,hu_fild04,379,187 +hu_fild05,91,42,0 warp hu007 1,1,hu_fild07,80,369 +hu_fild07,80,371,0 warp hu007a 1,1,hu_fild05,91,44 +hu_fild07,35,351,0 warp hu008 1,1,yuno_fild02,384,338 +yuno_fild02,384,340,0 warp hu008a 1,1,hu_fild07,37,351 +hu_fild07,56,36,0 warp hu009 1,1,yuno_fild09,47,375 +yuno_fild09,47,377,0 warp hu009a 1,1,hu_fild07,56,38 +hu_fild07,226,36,0 warp hu010 1,1,yuno_fild09,220,372 +yuno_fild09,220,374,0 warp hu010a 1,1,hu_fild07,226,38 -- cgit v1.2.3-70-g09d2