From f2e43001d52b2afe4a308848c15b5e27737f82b1 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Fri, 23 Sep 2011 14:47:49 +0200 Subject: Client-data: some warp fixes on several maps. Converter ran. Submodule pointer updated. --- client-data | 2 +- world/map/npc/005-1/_warps.txt | 4 ++-- world/map/npc/005-3/_warps.txt | 4 ++-- world/map/npc/006-1/_warps.txt | 38 +++++++++++++++++++------------------- world/map/npc/006-3/_warps.txt | 38 +++++++++++++++++++------------------- world/map/npc/012-1/_warps.txt | 2 +- world/map/npc/012-3/_warps.txt | 2 +- 7 files changed, 45 insertions(+), 45 deletions(-) diff --git a/client-data b/client-data index 17210b99..1d774aa9 160000 --- a/client-data +++ b/client-data @@ -1 +1 @@ -Subproject commit 17210b9940dc24fbe07f3a9ef3ebe97e208db990 +Subproject commit 1d774aa9b0684c5ab88db797e17362684ae057b0 diff --git a/world/map/npc/005-1/_warps.txt b/world/map/npc/005-1/_warps.txt index 85c8e4ff..774178c7 100644 --- a/world/map/npc/005-1/_warps.txt +++ b/world/map/npc/005-1/_warps.txt @@ -2,8 +2,8 @@ // Snake Desert warps 005-1.gat,19,41|warp|To Sandstorm Desert|-1,2,002-1.gat,107,79 -005-1.gat,89,23|warp|To Snake Pit|-1,-1,005-3.gat,52,34 -005-1.gat,71,75|warp|To Snake Pit|-1,-1,005-3.gat,33,83 +005-1.gat,89,23|warp|To Snake Pit|-1,-1,005-3.gat,52,35 +005-1.gat,71,75|warp|To Snake Pit|-1,-1,005-3.gat,33,84 005-1.gat,167,108|warp|To Desert Mountains|-1,-1,006-1.gat,25,26 005-1.gat,168,107|warp|To Desert Mountains|-1,-1,006-1.gat,25,26 005-1.gat,169,106|warp|To Desert Mountains|-1,-1,006-1.gat,25,26 diff --git a/world/map/npc/005-3/_warps.txt b/world/map/npc/005-3/_warps.txt index 4455a32b..2f757add 100644 --- a/world/map/npc/005-3/_warps.txt +++ b/world/map/npc/005-3/_warps.txt @@ -1,5 +1,5 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Snake Pit warps -005-3.gat,52,33|warp|To Outside|-1,-1,005-1.gat,89,24 -005-3.gat,33,82|warp|To Outside|-1,-1,005-1.gat,71,76 +005-3.gat,52,33|warp|To Outside|-1,-1,005-1.gat,89,25 +005-3.gat,33,82|warp|To Outside|-1,-1,005-1.gat,71,77 diff --git a/world/map/npc/006-1/_warps.txt b/world/map/npc/006-1/_warps.txt index 95cac41f..a5af3729 100644 --- a/world/map/npc/006-1/_warps.txt +++ b/world/map/npc/006-1/_warps.txt @@ -2,25 +2,25 @@ // Desert Mountains warps 006-1.gat,18,31|warp|To Snake Desert|-1,-1,005-1.gat,172,101 -006-1.gat,40,26|warp|To Desert Mountains Cave|-1,-1,006-3.gat,41,27 -006-1.gat,60,58|warp|To Desert Mountains Cave|-1,-1,006-3.gat,61,69 -006-1.gat,62,30|warp|To Desert Mountains Cave|-1,-1,006-3.gat,63,31 -006-1.gat,55,27|warp|To Desert Mountains Cave|-1,-1,006-3.gat,56,28 -006-1.gat,77,44|warp|To Desert Mountains Cave|-1,-1,006-3.gat,78,45 -006-1.gat,86,24|warp|To Desert Mountains Cave|-1,-1,006-3.gat,87,25 -006-1.gat,91,24|warp|To Desert Mountains Cave|-1,-1,006-3.gat,92,25 -006-1.gat,104,44|warp|To Desert Mountains Cave|-1,-1,006-3.gat,105,45 -006-1.gat,122,24|warp|To Desert Mountains Cave|-1,-1,006-3.gat,123,25 -006-1.gat,114,49|warp|To Desert Mountains Cave|-1,-1,006-3.gat,115,50 -006-1.gat,110,56|warp|To Desert Mountains Cave|-1,-1,006-3.gat,111,57 -006-1.gat,125,59|warp|To Desert Mountains Cave|-1,-1,006-3.gat,126,60 -006-1.gat,92,63|warp|To Desert Mountains Cave|-1,-1,006-3.gat,93,64 -006-1.gat,112,74|warp|To Desert Mountains Cave|-1,-1,006-3.gat,113,75 -006-1.gat,121,110|warp|To Desert Mountains Cave|-1,-1,006-3.gat,122,111 -006-1.gat,79,120|warp|To Desert Mountains Cave|-1,-1,006-3.gat,80,121 -006-1.gat,38,121|warp|To Desert Mountains Cave|-1,-1,006-3.gat,39,122 -006-1.gat,74,90|warp|To Desert Mountains Cave|-1,-1,006-3.gat,75,91 -006-1.gat,51,90|warp|To Desert Mountains Cave|-1,-1,006-3.gat,52,91 +006-1.gat,40,26|warp|To Desert Mountains Cave|-1,-1,006-3.gat,40,28 +006-1.gat,60,58|warp|To Desert Mountains Cave|-1,-1,006-3.gat,60,70 +006-1.gat,62,30|warp|To Desert Mountains Cave|-1,-1,006-3.gat,62,32 +006-1.gat,55,27|warp|To Desert Mountains Cave|-1,-1,006-3.gat,55,29 +006-1.gat,77,44|warp|To Desert Mountains Cave|-1,-1,006-3.gat,77,46 +006-1.gat,86,24|warp|To Desert Mountains Cave|-1,-1,006-3.gat,86,26 +006-1.gat,91,24|warp|To Desert Mountains Cave|-1,-1,006-3.gat,91,26 +006-1.gat,104,44|warp|To Desert Mountains Cave|-1,-1,006-3.gat,104,46 +006-1.gat,122,24|warp|To Desert Mountains Cave|-1,-1,006-3.gat,122,26 +006-1.gat,114,49|warp|To Desert Mountains Cave|-1,-1,006-3.gat,114,51 +006-1.gat,110,56|warp|To Desert Mountains Cave|-1,-1,006-3.gat,110,58 +006-1.gat,125,59|warp|To Desert Mountains Cave|-1,-1,006-3.gat,125,61 +006-1.gat,92,63|warp|To Desert Mountains Cave|-1,-1,006-3.gat,92,65 +006-1.gat,112,74|warp|To Desert Mountains Cave|-1,-1,006-3.gat,112,76 +006-1.gat,121,110|warp|To Desert Mountains Cave|-1,-1,006-3.gat,121,112 +006-1.gat,79,120|warp|To Desert Mountains Cave|-1,-1,006-3.gat,79,122 +006-1.gat,38,121|warp|To Desert Mountains Cave|-1,-1,006-3.gat,38,123 +006-1.gat,74,90|warp|To Desert Mountains Cave|-1,-1,006-3.gat,74,92 +006-1.gat,51,90|warp|To Desert Mountains Cave|-1,-1,006-3.gat,51,92 006-1.gat,30,123|warp|To Outback Cave|-1,-1,032-3.gat,128,32 006-1.gat,19,30|warp|To Snake Desert|-1,-1,005-1.gat,172,101 006-1.gat,20,29|warp|To Snake Desert|-1,-1,005-1.gat,172,101 diff --git a/world/map/npc/006-3/_warps.txt b/world/map/npc/006-3/_warps.txt index 06e84dbe..c0744946 100644 --- a/world/map/npc/006-3/_warps.txt +++ b/world/map/npc/006-3/_warps.txt @@ -1,22 +1,22 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Desert Mountain Cave warps -006-3.gat,40,26|warp|To Desert Mountains|-1,-1,006-1.gat,39,27 -006-3.gat,55,27|warp|To Desert Mountains|-1,-1,006-1.gat,56,28 -006-3.gat,62,30|warp|To Desert Mountains|-1,-1,006-1.gat,61,31 -006-3.gat,86,24|warp|To Desert Mountains|-1,-1,006-1.gat,85,25 -006-3.gat,91,24|warp|To Desert Mountains|-1,-1,006-1.gat,92,25 -006-3.gat,122,24|warp|To Desert Mountains|-1,-1,006-1.gat,123,25 -006-3.gat,114,49|warp|To Desert Mountains|-1,-1,006-1.gat,115,50 -006-3.gat,104,44|warp|To Desert Mountains|-1,-1,006-1.gat,105,45 -006-3.gat,77,44|warp|To Desert Mountains|-1,-1,006-1.gat,78,45 -006-3.gat,60,68|warp|To Desert Mountains|-1,-1,006-1.gat,61,59 -006-3.gat,92,63|warp|To Desert Mountains|-1,-1,006-1.gat,93,64 -006-3.gat,112,74|warp|To Desert Mountains|-1,-1,006-1.gat,111,75 -006-3.gat,110,56|warp|To Desert Mountains|-1,-1,006-1.gat,111,57 -006-3.gat,125,59|warp|To Desert Mountains|-1,-1,006-1.gat,126,60 -006-3.gat,74,90|warp|To Desert Mountains|-1,-1,006-1.gat,75,91 -006-3.gat,51,90|warp|To Desert Mountains|-1,-1,006-1.gat,52,91 -006-3.gat,38,121|warp|To Desert Mountains|-1,-1,006-1.gat,39,122 -006-3.gat,79,120|warp|To Desert Mountains|-1,-1,006-1.gat,80,121 -006-3.gat,121,110|warp|To Desert Mountains|-1,-1,006-1.gat,122,111 +006-3.gat,40,26|warp|To Desert Mountains|-1,-1,006-1.gat,40,28 +006-3.gat,55,27|warp|To Desert Mountains|-1,-1,006-1.gat,55,29 +006-3.gat,62,30|warp|To Desert Mountains|-1,-1,006-1.gat,62,32 +006-3.gat,86,24|warp|To Desert Mountains|-1,-1,006-1.gat,86,26 +006-3.gat,91,24|warp|To Desert Mountains|-1,-1,006-1.gat,91,26 +006-3.gat,122,24|warp|To Desert Mountains|-1,-1,006-1.gat,122,26 +006-3.gat,114,49|warp|To Desert Mountains|-1,-1,006-1.gat,114,51 +006-3.gat,104,44|warp|To Desert Mountains|-1,-1,006-1.gat,104,46 +006-3.gat,77,44|warp|To Desert Mountains|-1,-1,006-1.gat,77,46 +006-3.gat,60,68|warp|To Desert Mountains|-1,-1,006-1.gat,60,60 +006-3.gat,92,63|warp|To Desert Mountains|-1,-1,006-1.gat,92,65 +006-3.gat,112,74|warp|To Desert Mountains|-1,-1,006-1.gat,112,76 +006-3.gat,110,56|warp|To Desert Mountains|-1,-1,006-1.gat,110,58 +006-3.gat,125,59|warp|To Desert Mountains|-1,-1,006-1.gat,125,61 +006-3.gat,74,90|warp|To Desert Mountains|-1,-1,006-1.gat,74,92 +006-3.gat,51,90|warp|To Desert Mountains|-1,-1,006-1.gat,51,92 +006-3.gat,38,121|warp|To Desert Mountains|-1,-1,006-1.gat,38,123 +006-3.gat,79,120|warp|To Desert Mountains|-1,-1,006-1.gat,79,122 +006-3.gat,121,110|warp|To Desert Mountains|-1,-1,006-1.gat,121,112 diff --git a/world/map/npc/012-1/_warps.txt b/world/map/npc/012-1/_warps.txt index 2cd4a55e..cf81ba5b 100644 --- a/world/map/npc/012-1/_warps.txt +++ b/world/map/npc/012-1/_warps.txt @@ -11,4 +11,4 @@ 012-1.gat,123,90|warp|To Mana Seed Cave|-1,-1,012-3.gat,38,156 012-1.gat,150,61|warp|To Woodland Hills|-1,2,013-1.gat,21,75 012-1.gat,132,176|warp|To Woodland|0,-1,011-1.gat,73,10 -012-1.gat,65,126|warp|To Moggun Cave|-1,-1,012-3.gat,177,139 +012-1.gat,65,126|warp|To Moggun Cave|-1,-1,012-3.gat,176,140 diff --git a/world/map/npc/012-3/_warps.txt b/world/map/npc/012-3/_warps.txt index 809a2281..8a10f1e3 100644 --- a/world/map/npc/012-3/_warps.txt +++ b/world/map/npc/012-3/_warps.txt @@ -5,7 +5,7 @@ 012-3.gat,80,74|warp|To Woodland Hills|-1,-1,012-1.gat,109,93 012-3.gat,38,157|warp|To Woodland Hills|-1,-1,012-1.gat,123,91 012-3.gat,270,112|warp|To Woodland Hills|-1,-1,012-1.gat,92,105 -012-3.gat,176,138|warp|To Blossom Land|-1,-1,012-1.gat,66,127 +012-3.gat,176,138|warp|To Blossom Land|-1,-1,012-1.gat,65,128 012-3.gat,355,188|warp|To Blossom Land|-1,-1,012-1.gat,44,89 012-3.gat,370,44|warp|To Small Lost Land|-1,-1,012-1.gat,51,40 012-3.gat,353,79|warp|To Lost Land|-1,-1,012-1.gat,41,49 -- cgit v1.2.3-60-g2f50