Some official Odin and Hugel warps

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10341 54d463be-8e91-2dee-dedb-b68131a5f0ec

3 files changed, 55 insertions, 44 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 64e3d7e4d..9e5278334 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
 Date		Added
 ======
 2007/04/25
+	* Some official Odin and Hugel warps [Playtester]
 	* Official Hugel field warps [Playtester]
 	* Fixed exploit in The Sign quest [Playtester]
 	* Fixed rewards of Momotaro event [Playtester]
diff --git a/npc/warps/cities/hugel.txt b/npc/warps/cities/hugel.txt
index d3ca451b0..68ee6905a 100644
--- a/npc/warps/cities/hugel.txt
+++ b/npc/warps/cities/hugel.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Sara-chan (1.1)
 //===== Current Version: =====================================
-//= 1.5
+//= 1.6
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Episode 10+
 //===== Description: =========================================
@@ -16,59 +16,62 @@
 //= 1.3a Replaced all spaces with TABs [Lupus]
 //= 1.4 Fixed an back warp on hu_in01,15,70 (walk to the warp, then warps you back) [erKURITA]
 //= 1.5 Added Bingo warps [erKURITA]
+//= 1.6 Some official warps [Playtester]
 //============================================================
 
 //= Hugel City ================================================
 
 //Entrance
-hu_fild06,199,373,0	warp	hugel01	1,1,hugel,95,34
-hugel,95,32,0	warp	hugel02	1,1,hu_fild06,199,371
+hu_fild06,200,372,0	warp	hugel01	1,1,hugel,95,37
+hugel,95,33,0	warp	hugel02	1,1,hu_fild06,200,367
 
 //Church
 hugel,155,114,0	warp	hugel03	1,1,hu_in01,211,177
-hu_in01,211,173,0	warp	hugel04	1,1,hugel,159,113
-hu_in01,162,228,0	warp	hugel05	1,1,hu_in01,200,220
-hu_in01,194,219,0	warp	hugel06	1,1,hu_in01,159,228
-hu_in01,162,168,0	warp	hugel07	1,1,hu_in01,199,193
+hu_in01,211,173,0	warp	hugel04	1,1,hugel,159,114
+hu_in01,162,228,0	warp	hugel05	1,1,hu_in01,199,219
+hu_in01,195,219,0	warp	hugel06	1,1,hu_in01,159,228
+hu_in01,162,168,0	warp	hugel07	1,1,hu_in01,200,192
 hu_in01,195,192,0	warp	hugel08	1,1,hu_in01,158,168
 
 //House
 hugel,153,153,0	warp	hugel09	1,1,hu_in01,287,231
 hu_in01,287,227,0	warp	hugel10	1,1,hugel,153,149
-hu_in01,263,252,0	warp	hugel11	1,1,hu_in01,362,253
+hu_in01,263,252,0	warp	hugel11	1,1,hu_in01,360,253
 hu_in01,365,253,0	warp	hugel12	1,1,hu_in01,268,252
 
 //House
 hugel,92,167,0	warp	hugel13	1,1,hu_in01,246,363
-hu_in01,246,359,0	warp	hugel14	1,1,hugel,92,165
-hu_in01,244,315,0	warp	hugel15	1,1,hu_in01,245,389
+hu_in01,246,359,0	warp	hugel14	1,1,hugel,92,163
+hu_in01,244,315,0	warp	hugel15	1,1,hu_in01,243,388
 hu_in01,248,388,0	warp	hugel16	1,1,hu_in01,250,315
 hu_in01,229,313,0	warp	hugel17	1,1,hu_in01,164,315
-hu_in01,168,315,0	warp	hugel18	1,1,hu_in01,233,313
+hu_in01,168,315,0	warp	hugel18	1,1,hu_in01,234,313
 hu_in01,168,307,0	warp	hugel19	1,1,hu_in01,167,376
-hu_in01,168,379,0	warp	hugel20	1,1,hu_in01,168,312
+hu_in01,168,379,0	warp	hugel20	1,1,hu_in01,168,311
+
+//House (Unofficial)
 hugel,85,181,0	warp	hugel21	1,1,hu_in01,231,303
 hu_in01,231,301,0	warp	hugel22	1,1,hugel,83,181
 
-//House
+//Weapon Shop
 hugel,70,157,0	warp	hugel23	1,1,hu_in01,110,373
-hu_in01,110,369,0	warp	hugel24	1,1,hugel,73,153
+hu_in01,110,369,0	warp	hugel24	1,1,hugel,73,155
 hu_in01,108,390,0	warp	hugel25	1,1,hu_in01,107,322
-hu_in01,114,322,0	warp	hugel26	1,1,hu_in01,111,390
+hu_in01,114,322,0	warp	hugel26	1,1,hu_in01,113,389
 
 //House
 hugel,91,104,0	warp	hugel27	1,1,hu_in01,30,304
-hu_in01,30,299,0	warp	hugel28	1,1,hugel,94,103
-hu_in01,33,318,0	warp	hugel29	1,1,hu_in01,34,251
-hu_in01,34,246,0	warp	hugel30	1,1,hu_in01,33,314
+hu_in01,30,299,0	warp	hugel28	1,1,hugel,95,103
+hu_in01,34,318,0	warp	hugel29	1,1,hu_in01,34,251
+hu_in01,34,246,0	warp	hugel30	1,1,hu_in01,34,313
 
-//House
+//Inn
 hugel,104,79,0	warp	hugel31	1,1,hu_in01,235,107
-hu_in01,231,107,0	warp	hugel32	1,1,hugel,99,77
+hu_in01,231,107,0	warp	hugel32	1,1,hugel,101,77
 hu_in01,268,123,0	warp	hugel33	1,1,hu_in01,265,36
-hu_in01,265,42,0	warp	hugel34	1,1,hu_in01,265,123
+hu_in01,265,42,0	warp	hugel34	1,1,hu_in01,262,123
 
-//Library
+//Library (Unofficial)
 hugel,52,90,0	warp	hugel35	1,1,hu_in01,33,90
 hu_in01,37,90,0	warp	hugel36	1,1,hugel,54,96
 hu_in01,15,70,0	warp	hugel37	1,1,hu_in01,15,27
@@ -78,27 +81,33 @@ hu_in01,15,151,0	warp	hugel40	1,1,hu_in01,16,104
 
 //Hunter Guild
 hugel,206,228,0	warp	hugel41	1,1,hu_in01,381,368
-hu_in01,381,363,0	warp	hugel42	1,1,hugel,207,225
-hu_in01,380,319,0	warp	hugel43	1,1,hu_in01,384,388
+hu_in01,381,363,0	warp	hugel42	1,1,hugel,209,224
+hu_in01,380,319,0	warp	hugel43	1,1,hu_in01,382,388
 hu_in01,388,388,0	warp	hugel44	1,1,hu_in01,385,319
 
-//Other
+//Other (Unofficial)
 hu_in01,149,90,0	warp	hugel45	1,1,hu_in01,104,90
 hu_in01,106,90,0	warp	hugel46	1,1,hu_in01,151,90
 hu_in01,85,108,0	warp	hugel47	1,1,hu_in01,84,153
 hu_in01,84,151,0	warp	hugel48	1,1,hu_in01,85,106
 hu_in01,84,71,0	warp	hugel49	1,1,hu_in01,86,26
 hu_in01,85,28,0	warp	hugel50	1,1,hu_in01,84,73
-hugel,129,65,0	warp	hugel51	1,1,hu_in01,347,108
-hu_in01,345,108,0	warp	hugel52	1,1,hugel,127,65
-hu_in01,380,118,0	warp	hugel53	1,1,hu_in01,378,176
-hu_in01,378,178,0	warp	hugel54	1,1,hu_in01,378,118
-hu_in01,314,386,0	warp	hugel55	1,1,hu_in01,309,322
-hu_in01,307,322,0	warp	hugel56	1,1,hu_in01,312,386
-hugel,80,230,0	warp	hugel57	1,1,hu_in01,24,363
-hu_in01,24,361,0	warp	hugel58	1,1,hugel,82,230
-hugel,93,201,0	warp	hugel60	1,1,hu_in01,303,380
-hu_in01,301,380,0	warp	hugel59	1,1,hugel,93,199
+
+//Pub
+hugel,129,66,0	warp	hugel51	1,1,hu_in01,350,107
+hu_in01,345,107,0	warp	hugel52	1,1,hugel,126,64
+hu_in01,381,118,0	warp	hugel53	1,1,hu_in01,379,173
+hu_in01,379,178,0	warp	hugel54	1,1,hu_in01,376,118
+
+//House
+hugel,153,216,0	warp	hugel55	1,1,hu_in01,305,379
+hu_in01,301,379,0	warp	hugel56	1,1,hugel,147,216
+hu_in01,314,386,0	warp	hugel57	1,1,hu_in01,312,322
+hu_in01,307,322,0	warp	hugel58	1,1,hu_in01,310,386
+
+//House (Unofficial)
+hugel,80,230,0	warp	hugel59	1,1,hu_in01,24,363
+hu_in01,24,361,0	warp	hugel60	1,1,hugel,82,230
 
 //Bingo
 hugel,55,208,0	warp	hugelwarp1051	1,1,que_bingo,49,9
diff --git a/npc/warps/dungeons/odin.txt b/npc/warps/dungeons/odin.txt
index 592b8fb08..6328dbd14 100644
--- a/npc/warps/dungeons/odin.txt
+++ b/npc/warps/dungeons/odin.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= birkiczd  (1.0)
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
@@ -12,16 +12,17 @@
 //= 1.1 Move the Saylor from Hugel.txt here. [Poki#3]
 //=	Hako's Sprite, cords and price is official. The text is not.
 //= 1.2 Removed Duplicates [Silent]
+//= 1.3 Official warps [Playtester]
 //============================================================
 
-odin_tem01,378,181,0	warp	odin01	1,1,odin_tem02,22,181
-odin_tem02,20,181,0	warp	odin02	1,1,odin_tem01,376,181
-odin_tem01,384,334,0	warp	odin03	1,1,odin_tem02,23,334
-odin_tem02,20,334,0	warp	odin04	1,1,odin_tem01,381,334
-odin_tem02,152,350,0	warp	odin05	1,1,odin_tem03,121,51
-odin_tem03,122,48,0	warp	odin06	1,1,odin_tem02,153,347
-odin_tem02,259,374,0	warp	odin07	1,1,odin_tem03,249,35
-odin_tem03,249,33,0	warp	odin08	1,1,odin_tem02,262,371
+odin_tem01,378,182,0	warp	odin01	1,1,odin_tem02,28,180
+odin_tem02,21,180,0	warp	odin02	1,1,odin_tem01,373,182
+odin_tem01,383,334,0	warp	odin03	1,1,odin_tem02,27,334
+odin_tem02,21,334,0	warp	odin04	1,1,odin_tem01,379,334
+odin_tem02,153,349,0	warp	odin05	1,1,odin_tem03,120,54
+odin_tem03,121,49,0	warp	odin06	1,1,odin_tem02,154,345
+odin_tem02,261,377,0	warp	odin07	1,1,odin_tem03,247,40
+odin_tem03,247,34,0	warp	odin08	1,1,odin_tem02,263,372
 
 hugel,209,109,1	script	Sailor Hako#01	709,{
 	mes "[Sailor Hako]";