Преглед изворни кода

Commited erKURITA's warp fixes.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6008 54d463be-8e91-2dee-dedb-b68131a5f0ec
MasterOfMuppets пре 19 година
родитељ
комит
6aef119368

+ 1 - 0
npc/Changelog.txt

@@ -28,6 +28,7 @@ Nexon
 Date		Added
 ======
 04/12
+	* Fixed a few warps warping you back (they've been there for long =X). [erKURITA]
 	* Corrected some errors in cities/hugel.txt and guides/guides_hu.txt
 	  [Foruken]
 04/11

+ 3 - 3
npc/warps/cities/amatsu.txt

@@ -4,13 +4,13 @@
 //= Athena (1.0)
 //= Nana (1.1)
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Episode 6+
 //===== Description: =========================================
 //= Warp Points for Amatsu
 //===== Additional Comments: =================================
-//= No Comments!
+//= 1.3 Fixed a warp-back [erKURITA]
 //============================================================
 
 //= Amatsu ===================================================
@@ -50,4 +50,4 @@ amatsu.gat,52,148,0	warp	warp1994	1,1,ama_in01.gat,88,97
 amatsu.gat,85,235,0	warp	warp1972	1,1,ama_in02.gat,224,45
 //removed
 //amatsu.gat,95,148,0	warp	warp1990	1,1,ama_in01.gat,88,97
-amatsu.gat,96,118,0	warp	warp1962	1,1,ama_in01.gat,31,23
+amatsu.gat,96,117,0	warp	warp1962	1,1,ama_in01.gat,29,23

+ 4 - 3
npc/warps/cities/ayothaya.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Muad_Dib, L0ne_W0lf (1.0)
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Episode 8+
 //===== Description: =========================================
@@ -12,6 +12,7 @@
 //= 1.1 Fixed Armory part by massdriller [Thanks to akusarujin]
 //= 1.2 Revised warps, due to official Ayothaya Town NPC [MasterOfMuppets]
 //= 1.3 Fixed swapped Inn Exits, thanks to Sir_Loon [Lupus]
+//= 1.4 Fixed a warp-back. [erKURITA]
 //============================================================
 
 
@@ -32,7 +33,7 @@ ayothaya.gat,130,75,0	warp	ayothayawarp013	2,2,ayo_in01.gat,17,155
 ayo_in01.gat,17,152,0	warp	ayothayawarp014	2,2,ayothaya.gat,132,73
 
 //Restaurant/Bar -- Facing North
-ayothaya.gat,229,70,0	warp	ayothayawarp015	2,2,ayo_in01.gat,137,192
+ayothaya.gat,229,70,0	warp	ayothayawarp015	2,2,ayo_in01.gat,137,191
 ayo_in01.gat,137,194,0	warp	ayothayawarp016	2,2,ayothaya.gat,232,75
 
 //Armory -- East door
@@ -77,7 +78,7 @@ ayo_in01.gat,11,94,0	warp	ayothayawarp038	2,2,ayothaya.gat,189,149
 ayothaya.gat,202,141,0	warp	ayothayawarp039	2,2,ayo_in01.gat,30,82
 ayo_in01.gat,30,79,0	warp	ayothayawarp040	2,2,ayothaya.gat,202,138
 //Inn -- East Door 
-ayothaya.gat,211,149,0	warp	ayothayawarp041	2,2,ayo_in01.gat,48,94
+ayothaya.gat,211,149,0	warp	ayothayawarp041	2,2,ayo_in01.gat,47,94
 ayo_in01.gat,50,94,0	warp	ayothayawarp042	2,2,ayothaya.gat,214,149 
 //Inn Room --Upper Right
 ayo_in01.gat,48,83,0	warp	ayothayawarp043	2,2,ayo_in01.gat,61,15

+ 5 - 3
npc/warps/cities/louyang.txt

@@ -12,6 +12,7 @@
 //= 1.1 Added 2 escapes from 2 mountains 018,019 [Lupus]
 //=     Some players used to stuck there after warps
 //= 1.2 Added a few missing warps [MasterOfMuppets]
+//= 1.3 Fixed a few warp-back [erKURITA]
 //============================================================
 
 //= Louyang Town ============================================
@@ -25,8 +26,9 @@ louyang.gat,129,121,0	warp	louwarp009a	3,3,lou_in02.gat,203,162
 louyang.gat,145,175,0	warp	louwarp010	3,3,lou_in02.gat,125,168
 louyang.gat,135,96,0	warp	louwarp011	3,3,lou_in02.gat,248,172
 louyang.gat,317,177,0	warp	louwarp014	3,3,lou_in02.gat,118,34
-louyang.gat,130,63,0	warp	louwarp015	3,3,lou_in02.gat,71,30
+louyang.gat,130,63,0	warp	louwarp015	3,3,lou_in02.gat,71,32
 louyang.gat,263,93,0	warp	louwarp018	3,3,lou_in02.gat,246,58
+louyang.gat,90,253,0	warp	louwarp019	3,3,louyang.gat,94,268
 lou_in01.gat,125,141,0	warp	louwarp016	3,3,lou_in01.gat,156,141
 lou_in01.gat,152,141,0	warp	louwarp016a	3,3,lou_in01.gat,120,141
 lou_in01.gat,78,141,0	warp	louwarp017	3,3,lou_in01.gat,47,141
@@ -40,7 +42,7 @@ lou_in02.gat,203,158,0	warp	louwarp009c	3,3,louyang.gat,129,117
 lou_in02.gat,125,164,0	warp	louwarp010a	3,3,louyang.gat,145,171
 lou_in02.gat,251,175,0	warp	louwarp011a	3,3,louyang.gat,140,101
 lou_in02.gat,242,59,0	warp	louwarp018a	3,3,louyang.gat,260,93
-lou_in02.gat,80,190,0	warp	louwarp012	3,3,lou_in02.gat,73,140
+lou_in02.gat,80,190,0	warp	louwarp012	3,3,lou_in02.gat,74,140
 lou_in02.gat,71,140,0	warp	louwarp012a	3,3,lou_in02.gat,77,190
 lou_in02.gat,35,190,0	warp	louwarp013	3,3,lou_in02.gat,37,138
 lou_in02.gat,43,138,0	warp	louwarp013a	3,3,lou_in02.gat,39,190
@@ -48,4 +50,4 @@ lou_in02.gat,121,32,0	warp	louwarp014a	3,3,louyang.gat,317,173
 lou_in02.gat,71,28,0	warp	louwarp015a	3,3,louyang.gat,130,57
 lou_in02.gat,189,74,0	warp	louwarp007a	3,3,louyang.gat,309,76
 lou_fild01.gat,232,357,0	warp	louwarp001a	3,3,louyang.gat,217,26
-louyang.gat,90,253,0	warp	louwarp019	3,3,louyang.gat,94,268
+

+ 2 - 1
npc/warps/dungeons/lhalzen_dun.txt

@@ -21,9 +21,10 @@
 //= 1.6 Updated entrances, added Cube room warps, thanx 2 Justin84
 //= 1.6a Disabled the "Entrance" to lhz_dun01 [Poki#3]
 //= 1.6b Updated Sewer Pipe [Vicious]
+//= 1.7 Fixed a warp-back
 //============================================================
 
-lhz_dun03.gat,140,139,0	warp	lhz003	1,1,lhz_dun02.gat,150,147
+lhz_dun03.gat,140,139,0	warp	lhz003	1,1,lhz_dun02.gat,150,145
 lhz_dun02.gat,18,150,0	warp	lhz004	1,1,lhz_dun01.gat,18,148
 lhz_dun01.gat,18,146,0	warp	lhz004a	1,1,lhz_dun02.gat,18,148
 lhz_dun02.gat,282,155,0	warp	lhz005	1,1,lhz_dun01.gat,281,152