fixed The Sign Quest

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9011 54d463be-8e91-2dee-dedb-b68131a5f0ec

npc/Changelog.txt

@@ -30,6 +30,7 @@ Playtester
 Date		Added
 ======
 10/18
+	* Llyr fixed The_Sign_Quest [Lupus]
 	* Official kRO 10.1 spawns for Glastheim [Playtester]
 	- Turtle Island
 	- Clock Tower

npc/kafras/functions_kafras.txt

@@ -4,7 +4,7 @@
 //= eAthena Dev Team
 //= Darlskies, Darkchild, Syrus22, Lupus, kobra_k88 (2.0)
 //===== Current Version: ===================================== 
-//= 5.4a
+//= 5.4b
 //===== Compatible With: ===================================== 
 //= eAthena 1.0
 //===== Description: =========================================
@@ -38,6 +38,7 @@
 //= 5.4 added -Guide option (Kafra shows you nearest Guide) Work in progress. 
 //=	Need all coords for all guides.. and somehow pass their coords to kafra.
 //=	Removed universal Kafra Pass, added 3 new Kafra Tickets [Lupus]
+//= 5.4b temporary moved "-Guide" from the 1st menu punct [Lupus]
 //============================================================ 
 
 
@@ -92,20 +93,20 @@ function	script	F_Kafra	{
 			break;
 		//Common w/o teleport
 		case 3: 
-			setarray @K_Menu0$[0],"-Guide","-Save","-Use Storage","-Rent a Cart","-Other Information Check","-Cancel";
+			setarray @K_Menu0$[0],"-Save","-Use Storage","-Rent a Cart","-Guide","-Other Information Check","-Cancel";
 			break;
 		//Case 4 is Einbroch no tele message.
 		//Common w/o save and teleport
 		case 5:
-			setarray @K_Menu0$[0],"-Guide","-Use Storage","-Rent a Cart","-Other Information Check","-Cancel";
+			setarray @K_Menu0$[0],"-Use Storage","-Rent a Cart","-Other Information Check","-Guide","-Cancel";
 			break;
 		//Only storage and other info check
 		case 6:
-			setarray @K_Menu0$[0],"-Guide","-Use Storage","-Other Information Check","-Cancel";
+			setarray @K_Menu0$[0],"-Use Storage","-Guide","-Other Information Check","-Cancel";
 			break;
 		//Common Kafra
 		default:
-			setarray @K_Menu0$[0],"-Guide","-Save","-Use Storage","-Use Teleport Service","-Rent a Cart","-Other Information Check","-Cancel";
+			setarray @K_Menu0$[0],"-Save","-Use Storage","-Use Teleport Service","-Rent a Cart","-Guide","-Other Information Check","-Cancel";
 			break;
 	}
 	if(getarg(0)==2) {

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: ===================================== 
-//= 1.3
+//= 1.4
 //===== Compatible With: ===================================== 
 //= eAthena SVN 3422+(Requires jA Script System)
 //===== Description: ========================================= 
@@ -18,6 +18,10 @@
 //= 1.2 Fixed a minor bug that prevented people from advancing [MasterOfMuppets]
 //= 	quest at one point.
 //= 1.3 Removed duplicates [Toms]
+//= 1.4 Fixed a bug in Dearles script where it was checking for the wrong items.
+//=     Fixed a major bug that was allowing players to continue before
+//=     getting all the Sobbing Starlight pieces.
+//=     Also moved the Alberta sign since another NPC was on top of it. [Llyr]
 //============================================================ 
 //===== Configuration : ======================================
 prontera.gat,1,1,1	script	TheSignConfig	-1,{
@@ -38,7 +42,7 @@ OnInit:
 }
 //============================================================
 
-alberta.gat,35,241,1	script	Sign::GeffeniaSigns	111,{
+alberta.gat,34,241,1	script	Sign::GeffeniaSigns	111,{
 
 	if($signbmps)
 {
@@ -3925,9 +3929,14 @@ L_Check:
 	if(countitem(741))set @dearles_check,@dearles_check+1;
 	if(countitem(742))set @dearles_check,@dearles_check+1;
 	if(countitem(743))set @dearles_check,@dearles_check+2;
-	if(countitem(744))set @dearles_check,@dearles_check+1;
+	// Was checking the wrong items here [Llyr]
-	if(countitem(745))set @dearles_check,@dearles_check+1;
+	// Script was checking for:
-	if(countitem(746))set @dearles_check,@dearles_check+1;
+	// Bouquet (ID: 744) instead of Red Frame (ID: 734)
+	// Wedding Bouquet (ID: 745) instead of Chung Jah (ID: 735)
+	// Glass Bead (ID: 746) instead of China (ID: 736)
+	if(countitem(734))set @dearles_check,@dearles_check+1;
+	if(countitem(735))set @dearles_check,@dearles_check+1;
+	if(countitem(736))set @dearles_check,@dearles_check+1;
 	if(countitem(747))set @dearles_check,@dearles_check+2;
 	if(countitem(750))set @dearles_check,@dearles_check+10;
 	if(countitem(751))set @dearles_check,@dearles_check+12;
@@ -5407,18 +5416,6 @@ L_Never:
 
 
 geffen_in.gat,159,48,5	script	Woman	711,{
-
-	if(!signquest)
-	{
-	mes "[Brenda Howard]";
-	mes "Hmm...";
-	mes "What should I make for";
-	mes "dinner today? Pickled cabbage?";
-	mes "I learned how to make it a while";
-	mes "ago, but I've never gotten the";
-	mes "chance to make it yet...";
-	close;
-	}
 	if(signquest > 22) goto L_Cherish;
 	if(signquest > 19) goto L_Done;
 	if(signquest == 19 && countitem(7278)) goto L_Letter;
@@ -5451,6 +5448,17 @@ geffen_in.gat,159,48,5	script	Woman	711,{
 	set @signbrenda,1;
 	close;
 }
+	// Script could get to this point if the variable "signquest" was non-zero
+	// It would then continue running at the label "L_Husband" [Llyr]
+
+	mes "[Brenda Howard]";
+	mes "Hmm...";
+	mes "What should I make for";
+	mes "dinner today? Pickled cabbage?";
+	mes "I learned how to make it a while";
+	mes "ago, but I've never gotten the";
+	mes "chance to make it yet...";
+	close;
 
 L_Husband:
 	mes "[Brenda Howard]";