* Fixed Slotted Grand cross not enabling TU 3. (bugreport:1563)

* Fixed assassin robe set checking for the wrong item. (bugreport:1576)
* Fixed bug in eye of hellion quests (bugreport:1581)
* Fixed the position of one of the Splendid (spl) warps. (Bugreport:1585)


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

4 files changed, 13 insertions, 10 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 9cad8ee04..47ea2dbcd 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,8 @@
 Date		Added
 ======
 2008/05/31
+	* Rev. 12750 Fixed bug in eye of hellion quests (bugreport:1581) [L0ne_W0lf]
+	* Fixed the position of one of the Splendid (spl) warps. (Bugreport:1585)
 	* Rev. 12749 Small update to the novice grounds, by Kisuka. [L0ne_W0lf]
 	* Corrected some typos errors in Gunslinger Quest. (bugreport:1549) [Samuray22]
 	* Corrected some "mes" without the getitemname in Sage Quest. (bugreport:1564)
diff --git a/npc/quests/eye_of_hellion.txt b/npc/quests/eye_of_hellion.txt
index 7cb76b69c..49adbaaf0 100644
--- a/npc/quests/eye_of_hellion.txt
+++ b/npc/quests/eye_of_hellion.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= MasterOfMuppets
 //===== Current Version: =====================================
-//= 1.6
+//= 1.7
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -18,6 +18,7 @@
 //=	Tracking variable is not backwards compatable meaning
 //=     you can again repeat this quest from the start.
 //= 1.6 Fixed issue with #prt_key-1-1. [L0ne_W0lf]
+//= 1.7 Corrected reminants from aegis conversion. [L0en_w0lf]
 //============================================================
 
 morocc_in,116,101,3	script	Old Scholar Tyus#hellion	735,3,3,{
@@ -665,8 +666,7 @@ morocc_in,116,101,3	script	Old Scholar Tyus#hellion	735,3,3,{
 			mes "You still have the Hellion's Eye.";
 			mes "I can see the pain in your eyes.";
 			mes "Let me lighten your burden. It will be better this way.";
-			set eyes,v[Eye_Of_Hellion];
-			delitem 7337,eyes; //Eye_Of_Hellion
+			delitem 7337,countitem(7337); //Eye_Of_Hellion
 			next;
 			mes "[Sir Chilias'Tyus]";
 			mes "May God bless you.";
@@ -1143,7 +1143,7 @@ OnTouch:
 			mes "didn't get it:^4D4DFF 3847147298^000000.";
 			mes "Don't forget it, adventurer.";
 			next;
-			mes "["+ name +"]";
+			mes "["+ strcharinfo(0) +"]";
 			mes "Wait... What does";
 			mes "this all mean? Won't";
 			mes "you tell me more?";
@@ -1159,7 +1159,7 @@ OnTouch:
 			else if (HELLIONQ == 41)
 				set HELLIONQ,43;
 			next;
-			mes "["+ name +"]";
+			mes "["+ strcharinfo(0) +"]";
 			mes "Holy cow...";
 			mes "This is all";
 			mes "really cloak and";
diff --git a/npc/warps/fields/man_fild.txt b/npc/warps/fields/man_fild.txt
index 778dd2d27..f61c1d29c 100644
--- a/npc/warps/fields/man_fild.txt
+++ b/npc/warps/fields/man_fild.txt
@@ -1,5 +1,5 @@
 //===== eAthena Script =======================================
-//= Another World Warp Script
+//= Manuk Field Warp Script
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
-//= Warp Points for Another World
+//= Warp Points for Manuk Field
 //===== Additional Comments: =================================
 //= 1.0 First Version.
 //============================================================
diff --git a/npc/warps/fields/spl_fild.txt b/npc/warps/fields/spl_fild.txt
index 47f2fbc45..a11ed0016 100644
--- a/npc/warps/fields/spl_fild.txt
+++ b/npc/warps/fields/spl_fild.txt
@@ -1,5 +1,5 @@
 //===== eAthena Script =======================================
-//= Another World Warp Script
+//= Splendid Field Warp Script
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
@@ -7,16 +7,17 @@
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
-//= Warp Points for Another World
+//= Warp Points for Splendid
 //===== Additional Comments: =================================
 //= 1.0 First Version.
+//= 1.1 Fixed misplaced warp. [L0ne_W0lf]
 //============================================================
 
 mid_camp,12,142,0	warp	spl_fild02-1	1,1,spl_fild02,378,144
 spl_fild02,382,144,0	warp	spl_fild02-2	1,1,mid_camp,16,142
 mid_camp,9,216,0	warp	spl_fild02-3	1,1,spl_fild02,378,215
 spl_fild02,382,215,0	warp	spl_fild02-4	1,1,mid_camp,16,216
-spl_fild02,295,5,0	warp	spl_fild02-5	1,1,spl_fild03,205,375
+spl_fild02,295,5,0	warp	spl_fild02-5	1,1,spl_fild03,305,375
 spl_fild02,97,24,0	warp	spl_fild02-6	1,1,spl_fild03,105,369
 spl_fild03,305,379,0	warp	spl_fild03-1	1,1,spl_fild02,298,9
 spl_fild03,105,373,0	warp	spl_fild03-2	1,1,spl_fild02,97,29