From b4546bf9b6f60d6b8bd22360155d8dd3c5fe4883 Mon Sep 17 00:00:00 2001 From: Lupus Date: Mon, 20 Mar 2006 12:16:38 +0000 Subject: Fixed endless warping loops git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5679 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 1 + npc/warps/cities/lutie.txt | 9 ++++----- npc/warps/dungeons/lutie_dun.txt | 6 +++--- npc/warps/fields/glastheim.txt | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'npc') diff --git a/npc/Changelog.txt b/npc/Changelog.txt index e1393ef50..72a6d8e9f 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -28,6 +28,7 @@ Nexon Date Added ====== 03/20 + * Fixed endless warping loops, thanks to Manipulator [Lupus] * Fixed possible Castle Economy investment overflow with Emsolute Develop learnt [Lupus] * Removed Berserk Potions from all shops, but Comodo [Lupus] 03/19 diff --git a/npc/warps/cities/lutie.txt b/npc/warps/cities/lutie.txt index ee485e24e..f582a217d 100644 --- a/npc/warps/cities/lutie.txt +++ b/npc/warps/cities/lutie.txt @@ -1,16 +1,15 @@ //===== Athena Script ======================================== //= Lutie Warp Script //===== By: ================================================== -//= Athena (1.0) -//= Nana (1.1) +//= Athena (1.0) Nana (1.1) //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= Any Athena Version; RO Episode 2+ //===== Description: ========================================= //= Warp Points for Lutie //===== Additional Comments: ================================= -//= No Comment! +//= 1.2 Fixed endless warping loop //============================================================ //= Lutie Town =============================================== @@ -19,7 +18,7 @@ xmas.gat,120,131,0 warp xmas3 3,3,xmas_in.gat,44,33 xmas.gat,120,161,0 warp xmas4 3,3,xmas_in.gat,36,91 xmas.gat,142,240,0 warp xmas8 3,3,xmas_in.gat,95,85 xmas.gat,142,256,0 warp xmas11 3,3,xmas_in.gat,95,115 -xmas.gat,143,313,0 warp xmas14 3,3,xmas_dun01.gat,205,15 +xmas.gat,143,313,0 warp xmas14 3,3,xmas_dun01.gat,205,17 xmas.gat,149,240,0 warp xmas9 3,3,xmas_in.gat,105,85 xmas.gat,149,256,0 warp xmas10 3,3,xmas_in.gat,105,115 xmas.gat,150,41,0 warp xmas2-1 3,3,xmas_fild01.gat,80,249 diff --git a/npc/warps/dungeons/lutie_dun.txt b/npc/warps/dungeons/lutie_dun.txt index 4b8dadd24..0e6223c74 100644 --- a/npc/warps/dungeons/lutie_dun.txt +++ b/npc/warps/dungeons/lutie_dun.txt @@ -3,16 +3,16 @@ //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= Any Athena Version; RO Episode 2+ //===== Description: ========================================= //= Warp Points for Lutie Dungeon (Toy Factory) //===== Additional Comments: ================================= -//= No Comment! +//= 1.1 Fixed endless warping loop //============================================================ //= Toy Factory ============================================== xmas_dun01.gat,128,131,0 warp xmas15 3,3,xmas_dun02.gat,129,133 -xmas_dun01.gat,205,13,0 warp xmas14-1 3,3,xmas.gat,143,311 +xmas_dun01.gat,205,13,0 warp xmas14-1 3,3,xmas.gat,143,308 xmas_dun02.gat,129,129,0 warp xmas15-1 3,3,xmas_dun01.gat,128,129 \ No newline at end of file diff --git a/npc/warps/fields/glastheim.txt b/npc/warps/fields/glastheim.txt index ce3f29a72..9f8a0dc3f 100644 --- a/npc/warps/fields/glastheim.txt +++ b/npc/warps/fields/glastheim.txt @@ -3,18 +3,18 @@ //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== 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] +//= optimized random warp [Lupus] fixed looped warps //============================================================ //Glastheim -gef_fild06.gat,20,304,0 warp gef027 3,3,glast_01.gat,375,304 +gef_fild06.gat,20,304,0 warp gef027 3,3,glast_01.gat,370,304 gl_cas01.gat,135,40,0 warp gl01 1,1,gl_cas01.gat,144,314 gl_cas01.gat,149,314,0 warp gl02 1,1,gl_prison.gat,14,70 gl_cas01.gat,167,191,0 warp gl03 1,1,gl_prison.gat,14,70 @@ -79,6 +79,6 @@ glast_01.gat,200,137,0 warp gl9 1,1,gl_church.gat,156,7 glast_01.gat,200,297,0 warp gl7 1,1,gl_cas01.gat,199,29 glast_01.gat,220,360,0 warp gl5 1,1,gl_in01.gat,110,125 glast_01.gat,237,330,0 warp gl6 1,1,gl_in01.gat,122,59 -glast_01.gat,377,304,0 warp glst001 3,3,gef_fild06.gat,22,304 +glast_01.gat,377,304,0 warp glst001 3,3,gef_fild06.gat,27,304 glast_01.gat,51,108,0 warp gl1 1,1,gl_step.gat,12,7 glast_01.gat,77,193,0 warp gl2 1,1,gl_knt01.gat,150,15 \ No newline at end of file -- cgit v1.2.3-70-g09d2