* Added all Hugel-related quests. Thanks to MasterOfMuppets for scripting most of them.

- Updated some Hugel, Lighthalzen, Einbroch and Airship NPCs regarding those new quests.
- Moved a lot of Hugel NPCs to proper quest file.
* Added Odin Temple Excavation quest.
- Updated Hugel warps and Odin Temple Sailor according to the quest.
* Added Heart Fragment quest.
* Updated Ayothaya's Ring quest to official. Credits to MasterOfMuppets.

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

2 files changed, 18 insertions, 62 deletions

diff --git a/npc/warps/cities/hugel.txt b/npc/warps/cities/hugel.txt
index 444acdd99..5ecca5c0d 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.6
+//= 1.7
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Episode 10+
 //===== Description: =========================================
@@ -17,6 +17,7 @@
 //= 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]
+//= 1.7 Updated warps regarding Odin Temple Excavation Quest. [SinSloth]
 //============================================================
 
 //= Hugel City ===============================================
@@ -71,13 +72,11 @@ 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,262,123
 
-//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
-hu_in01,15,29,0	warp	hugel38	1,1,hu_in01,16,74
-hu_in01,15,108,0	warp	hugel39	1,1,hu_in01,15,155
-hu_in01,15,151,0	warp	hugel40	1,1,hu_in01,16,104
+//Library
+hu_in01,37,90,0	warp	hugel36	1,1,hugel,52,95
+hu_in01,15,70,0	warp	hugel37	1,1,hu_in01,15,25
+hu_in01,15,29,0	warp	hugel38	1,1,hu_in01,15,74
+hu_in01,15,151,0	warp	hugel40	1,1,hu_in01,15,104
 
 //Hunter Guild
 hugel,206,228,0	warp	hugel41	1,1,hu_in01,381,368
@@ -85,13 +84,13 @@ 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 (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
+//Other
+hu_in01,177,90,0	warp	hugel45	1,1,hugel,52,95
+hu_in01,107,90,0	warp	hugel46	1,1,hugel,52,95
+hu_in01,85,108,0	warp	hugel47	1,1,hu_in01,85,155
+hu_in01,85,151,0	warp	hugel48	1,1,hu_in01,85,104
+hu_in01,85,70,0	warp	hugel49	1,1,hu_in01,85,25
+hu_in01,85,29,0	warp	hugel50	1,1,hu_in01,85,74
 
 //Pub
 hugel,129,66,0	warp	hugel51	1,1,hu_in01,350,107
diff --git a/npc/warps/dungeons/odin.txt b/npc/warps/dungeons/odin.txt
index 6f1df0022..478c3cad7 100644
--- a/npc/warps/dungeons/odin.txt
+++ b/npc/warps/dungeons/odin.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= birkiczd  (1.0)
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
@@ -13,6 +13,8 @@
 //=	Hako's Sprite, cords and price is official. The text is not.
 //= 1.2 Removed Duplicates [Silent]
 //= 1.3 Official warps [Playtester]
+//= 1.4 Moved Sailor to Hugel quest file since he's part of
+//= Odin's Excavation Quest. [SinSloth]
 //============================================================
 
 odin_tem01,378,182,0	warp	odin01	1,1,odin_tem02,28,180
@@ -22,49 +24,4 @@ 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]";
-	mes "Hello stranger. I'm the only person that offers a unique trip to the cursed Odin Islands.";
-	mes "One of the strongest monsters known to man live there, so no wonder. Ha, ha, ha~!";
-	next;
-	mes "[Sailor Hako]";
-	mes "Anyway I'm planing a trip right now. I'll let you tag along for a measly 800 zeny. You dig?";
-	next;
-	menu "Yeah, I dig.",-,"No, thanks.",L_No;
-	mes "[Sailor Hako]";
-	if (Zeny < 800) goto L_Zeny;
-	set Zeny, Zeny-800;
-	mes "All aboard!";
-	next;
-	warp "odin_tem01",100,145;
-	end;
-
-L_Zeny:
-	mes "Who are ya trying to kid? You're poor like a church mouse!";
-	mes "Come back whey you make some cash, and I'll let you hike along";
-	close;
-
-L_No:
-	mes "[Sailor Hako]";
-	mes "Suit yourself. Se ya!";
-	close;
-}
-
-odin_tem01,93,146,3	script	Sailor Hako#02	709,{
-	mes "[Sailor Hako]";
-	mes "So how is it? Not to hard for ya? Wanna to go back to Hugel?";
-	next;
-	menu "Yeah...",-,"Nope.",L_No;
-	mes "[Sailor Hako]";
-	mes "All aboard!";
-	next;
-	warp "hugel",205,108;
-	end;
-
-L_No:
-	mes "[Sailor Hako]";
-	mes "Suit yourself.";
-	close;
-}
+odin_tem03,247,34,0	warp	odin08	1,1,odin_tem02,263,372
\ No newline at end of file