Implemented fixes for The Sign quest until my rewrite is finished. (bugreport:2269)

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

2 files changed, 15 insertions, 8 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 75456f26e..1328400a5 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
 Date		Added
 ======
 2008/09/27
+	* Rev. 13242 Implemented fixes for The Sign quest until my rewrite is finished. (bugreport:2269) [L0ne_W0lf]
 	* Continues replacing of specialeffect/2 numerics with constants. [Samuray22]
 	* Corrected an If to continue the President's Quest. (bugreport:2276)
 2008/09/25
diff --git a/npc/quests/The_Sign_Quest.txt b/npc/quests/The_Sign_Quest.txt
index af2768646..ce6cae38f 100644
--- a/npc/quests/The_Sign_Quest.txt
+++ b/npc/quests/The_Sign_Quest.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= SinSloth(Most of the NPCs), MasterOfMuppets(Some of the NPCs + bug fixes) & Kargha(The quiz NPCs)
 //===== Current Version: ===================================== 
-//= 2.7
+//= 2.8
 //===== Compatible With: ===================================== 
 //= eAthena SVN 3422+(Requires jA Script System)
 //===== Description: ========================================= 
@@ -41,6 +41,7 @@
 //= 2.5a Corrected a Typo error ";;". [Samuray22]
 //= 2.6 Fixed Engel giving back 7 Sobbing Starlight on failing to refine it, bugreport:1473 [Brainstorm]
 //= 2.7 Replaced effect numerics with constants. [Samuray22]
+//= 2.8 Fixed some bugs with itemids and leftover questitems [Fish0r]
 //============================================================ 
 //===== Configuration : ======================================
 prontera,1,1,1	script	TheSignConfig	-1,{
@@ -627,7 +628,7 @@ L_Where:
         close2;
         cutin "",255;
         end;
-    } else if ( (signquest > 54 && signquest < 59) || (signquest == 59 && !countitem(2644))) {
+    } else if ( (signquest > 54 && signquest < 59) || (signquest == 59 && !countitem(7314))) {
         mes "[Metz]";
         mes "I think you're";
         mes "almost there. All";
@@ -636,7 +637,7 @@ L_Where:
         close2;
         cutin "",255;
         end;
-    } else if (signquest == 59 && countitem(2644)) {
+    } else if (signquest == 59 && countitem(7314)) {
         mes "[Metz]";
         mes "This is it...!";
         mes "You've brought me,";
@@ -644,7 +645,7 @@ L_Where:
         mes "proven its existence!";
         mes "Please let me handle";
         mes "this and come back later~";
-        delitem 2644,1;
+        delitem 7314,1;
         set @metzhour,gettime(3);
         set @metzmin,gettime(2);
         if (@metzmin > 29) set @metzhour,@metzhour +1;
@@ -679,7 +680,7 @@ L_Where:
             mes "may be even other applications";
             mes "using the power of this item...";
             next;
-            getitem 2644,1;
+            getitem 7314,1;
             set signquest,61;
             mes "[Metz]";
             mes "I can only think of";
@@ -5132,7 +5133,7 @@ mjo_dun02,88,295,3	script	Flaming Spirit Man	85,{
 
     if (signquest > 62) goto L_Improve;
     if (signquest > 61) goto L_Hour;
-    if (signquest > 60 && countitem(2644)) goto L_Sign;
+    if (signquest > 60 && countitem(7314)) goto L_Sign;
     if (signquest > 22) goto L_Done;
     if (signquest == 21) goto L_Refine;
     if (signquest == 18 || signquest == 22) goto L_Check;
@@ -5461,7 +5462,7 @@ L_Sign:
     mes "Unfortunately, I can't even";
     mes "give you a time estimate...";
     mes "But I'll do my best for you.";
-    delitem 2644,1;
+    delitem 7314,1;
     set @engelhour,gettime(3);
     set @engelmin,gettime(2);
     if (@engelmin > 29) set @engelhour,@engelhour +1;
@@ -6122,7 +6123,7 @@ L_Done:
 	mes "" + strcharinfo(0) + ". Verily,";
 	mes "you are an honorable";
 	mes "hero worthy of praise!";
-	getitem 2644,1;
+	getitem 7314,1;
 	set signquest,59;
 	close;
 }
@@ -7384,6 +7385,7 @@ L_SignWitch:
 	if(signquest > 41) goto L_Think;
 	if(signquest > 40) goto L_Tragic;
 	if(signquest > 39) goto L_Crow;
+	if(signspellbook) goto L_SpellBook;
 	if(signquest > 37 || !countitem(7304)) end;
 	mes "[Kirkena]";
 	mes "W-what's this?";
@@ -7399,7 +7401,9 @@ L_SignWitch:
 	mes "without my permission. Still, it's";
 	mes "a relief to have my spells back.";
 	delitem 7304,1;
+	set signspellbook,1;
 	next;
+L_SpellBook:
 	mes "[Kirkena]";
 	mes "So mortal...";
 	mes "You must be here for";
@@ -7424,6 +7428,7 @@ L_Child:
 	mes "a living human back to one";
 	mes "of the towns in your realm.";
 	set signquest,38;
+	set signspellbook,0;
 	getitem 7309,1;
 	close;
 
@@ -8736,6 +8741,7 @@ L_Work:
 	mes "humans know it, may actually be";
 	mes "different than the truth.";
 	getitem 7025,1;
+	if (countitem(2642)) delitem 2642,1;
 	set signquest,66;
 	next;
 	mes "[Lady Hell]";