many quests variables are shrinked in 1 variable bits. UPDATE ALL YOUR OLD scripts!

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

4 files changed, 38 insertions, 32 deletions

diff --git a/npc/quests/bunnyband.txt b/npc/quests/bunnyband.txt
index e3635ce62..3f9cbd3bf 100644
--- a/npc/quests/bunnyband.txt
+++ b/npc/quests/bunnyband.txt
@@ -3,22 +3,23 @@
 //===== By: ================================================== 

 //= eAthena Dev Team

 //===== Current Version: ===================================== 

-//= v1.3

+//= v1.4

 //===== Compatible With: ===================================== 

 //= eAthena 7.15 +

 //===== Description: ========================================= 

 //=

 //===== Additional Comments: ================================= 

-//= v1.1 using duplicate command

+//= 1.1 using duplicate command

 //= 1.2 Fixed NPC location, removed NPC dupes [Lupus]

 //= 1.3 RE-Fixed exploit V_V, also cleared used VAR [Lupus]

+//= 1.4 replaced BUNYBND with @BUNYBND [Lupus]

 //============================================================ 

 

 

 // Alberta ------------------------------------------------------------------------------------------------------------------------------------------

 alberta.gat,23,232,1	script	Kafra Corp. Rep.#1::KCRep	83,{

 	mes "[Kafra Corp. Rep.]";

-	if (BUNYBND) goto L_Check;

+	if (@BUNYBND) goto L_Check;

 	mes "^529DFFSpecial Event, ^FF0000Bunny Band ^529DFFQuest!!^000000";

 	next;

 	menu "Information",-, "Join",M_Join, "Cancel",M_End;

@@ -50,7 +51,7 @@ alberta.gat,23,232,1	script	Kafra Corp. Rep.#1::KCRep	83,{
 

 		mes "[Kafra Corp. Rep.]";

 		mes "Thank you for participating in the event. Please come back when you have gathered all of the items.";

-		set BUNYBND, 1;

+		set @BUNYBND, 1;

 		close;

 

 	M_End:

@@ -70,7 +71,7 @@ alberta.gat,23,232,1	script	Kafra Corp. Rep.#1::KCRep	83,{
 		mes "[Kafra Corp. Rep.]";

 		mes "Tah dah!!! Here is your ^FF0000Bunny Band^000000... Please take it!";

 		getitem 2214,1;

-		set BUNYBND,0;

+		set @BUNYBND,0;

 		next;

 		mes "[Kafra Corp. Rep.]";

 		mes "We appreciate your participation in this special event. Thank you and enjoy your Bunny Band!";

diff --git a/npc/quests/counteragent_mixture.txt b/npc/quests/counteragent_mixture.txt
index d24bb0f04..1e82c7859 100644
--- a/npc/quests/counteragent_mixture.txt
+++ b/npc/quests/counteragent_mixture.txt
@@ -4,7 +4,7 @@
 //= kobra_k88

 //= added some dialogs for Morgenstein by Komurka

 //===== Current Version: ===================================== 

-//= 1.8

+//= 1.9

 //===== Compatible With: ===================================== 

 //= eAthena 7.15 +

 //===== Description: ========================================= 

@@ -19,6 +19,7 @@
 //= 1.6 Fixed some bugs, also related to Alch Job quest [Lupus]

 //= 1,7 Fixed exploit [Lupus]

 //= 1.8 Got rid of 'al_morgen' var [Lupus]

+//= 1.9 now uses (MISC_QUEST & 4) bit

 //============================================================ 

 

 

@@ -53,7 +54,7 @@ M_Menu2:
 		goto M_Menu;

 

 	M_Solut:

-		if(MORGEN==0)set MORGEN,1;

+		if((MISC_QUEST & 4)==0 && MORGEN==0)set MORGEN,1;

 		mes "[Merchant Louitz]";

 		mes "Apparently that scientist uses those solutions to make other agents and mixtures.";

 		mes "You should speak with ^0000ddAure Dupon^000000 in Geffen to find out more about it. ";

@@ -77,7 +78,7 @@ geffen.gat,181,114,4	script	Aure Dupon	55,{
 	mes "[Aure Dupon]";

 	mes "So... why did you stop me??";

 	emotion e_hmm;

-	if(MORGEN >= 1) goto M_Menu2;

+	if((MISC_QUEST & 4) || MORGEN) goto M_Menu2;

 M_Menu:

 	next;

 	menu "Talk",M_Talk,"Cancel",M_Cancel;

@@ -94,7 +95,7 @@ M_Menu2:
 		next;

 		mes "[Aure Dupon]";

 		mes "Would you be able to give up everything else in your life to achieve that goal? Even if it meant risking insanity??";

-		if(MORGEN>=1) goto M_Menu2;

+		if((MISC_QUEST & 4) || MORGEN) goto M_Menu2;

 		goto M_Menu;

 

 	M_Morgen:

@@ -115,8 +116,8 @@ M_Menu2:
 

 // Chemist Morgenstein -----------------------------------------------------------

 geffen_in.gat,141,140,2	script	Morgenstein	121,{

-	if(MORGEN == 2) goto L_0;

-	if(MORGEN == 3) goto L_1;

+	if(MORGEN >= 2) goto L_0;

+	if(MISC_QUEST & 4) goto L_1;

 

 	mes "[Chemist Morgenstein]";

 	mes "Heheheheheh... Sniff Sniff... I can smell something appetizing here.";

@@ -163,7 +164,8 @@ M_Menu:
 		mes "[Chemist Morgenstein]";

 		mes "I can make one for you right now,if you want?? Ahhh... Talking about my experiments and research makes me.... 'excited'.......";

 		mes "You too can feel my 'excitement' if you wish..... Ahhhhh.... I can make you feel...";

-		set MORGEN,3;

+		set MISC_QUEST,MISC_QUEST | 4;

+		set MORGEN,0;

 		close;

 

 L_1:

diff --git a/npc/quests/juice_maker.txt b/npc/quests/juice_maker.txt
index 93fd97968..3661408d4 100644
--- a/npc/quests/juice_maker.txt
+++ b/npc/quests/juice_maker.txt
@@ -3,13 +3,14 @@
 //===== By: ==================================================

 //= kobra_k88

 //===== Current Version: =====================================

-//= 1.7

+//= 1.8

 //===== Compatible With: =====================================

 //= eAthena 7.15 +

 //===== Description: =========================================

 //= 

 //===== Additional Comments: =================================

-//= Fully working

+//= Condition if done: (MISC_QUEST & 1)

+//= 

 //= 1.1 fixed input number check [Lupus]

 //= 1.2 fixed misplaced Grape<->Carrot juices [Lupus]

 //= 1.3 added a loopless menu 'as many as possible' [Lupus]

@@ -17,15 +18,17 @@
 //= subfunc.  Changed fruit amount needed to 1.[kobra_k88]

 //= Fixed exploits [Lupus]

 //= 1.6 fixed typo (where did @ipnut came from?) [Lance]

-//= 1.7 got rid of 2 vars: 'MEAT',"MARIANNE" [Lupus]

+//= 1.8 got rid of vars: 'MEAT',"MARIANNE","MORRISON"

+//= 	From now, all common quests start using bits of the

+//=	same variable MISC_QUEST [Lupus]

 //============================================================

 

 

 // Morrison ------------------------------------------------

 prt_in.gat,47,173,2	script	Morrison	97,{

 	mes "[Little Morrison]";

-	if(MORRISON > 10) goto L_GoAway;

-	if(MORRISON == 10) goto L_Candy;

+	if(MISC_QUEST&1 || @MORRISON > 10) goto L_GoAway;

+	if(@MORRISON == 10) goto L_Candy;

 

 	mes "Wahhhhh!!! Wahh... NO more! NO more!";

 	mes "I won't... eat anymore stupid ^0000ffFruit^000000 things!!";

@@ -66,7 +69,7 @@ prt_in.gat,47,173,2	script	Morrison	97,{
 		sM_Give:

 			if(countitem(517) == 0) goto L_GoAway; //Meat

 			delitem 517,1;	//Meat

-			set MORRISON,MORRISON+1;

+			set @MORRISON,@MORRISON+1;

 			mes "[Little Morrison]";

 			mes "Whoah~!!! It's real Meat, Meat!";

 			mes "Mmmm! It makes my mouth water.";

@@ -75,7 +78,7 @@ prt_in.gat,47,173,2	script	Morrison	97,{
 			close;

 

 		sM_Ignore:

-			set MORRISON,11;

+			set @MORRISON,11;

 			mes "[Little Morrison]";

 			mes "Boo...";

 			mes "Boo... Fine... Alright, Alright~!!! Selfish meanie!";

@@ -103,7 +106,7 @@ L_Candy:
 	next;

 	getitem 529,3;

 	getitem 530,1;

-	set MORRISON,0;

+	set @MORRISON,0;

 	mes "[Little Morrison]";

 	mes "It is from my secret stash of Candy that I hide from my Mom.  Since";

 	mes "you gave me some Meat, I will give you some candy." ;

@@ -114,8 +117,8 @@ L_Candy:
 // Housewife Marianne ---------------------------------------------------

 prt_in.gat,49,172,2	script	Housewife Marianne	53,{

 	mes "[Housewife Marianne]";

-	if(MORRISON > 10) goto L_Juice;

-	if(MORRISON) goto L_GaveMeat;

+	if(MISC_QUEST&1 || @MORRISON > 10) goto L_Juice;

+	if(@MORRISON) goto L_GaveMeat;

 

 	mes "Morrison!! Please eat some fruit will ya? Fruit~!";

 	mes "*Sob*~!! Like father like son...";

@@ -146,7 +149,7 @@ prt_in.gat,49,172,2	script	Housewife Marianne	53,{
 		close;

 	

 L_GaveMeat:

-	set MORRISON,0;

+	set @MORRISON,0;

 	mes "Oh MY GOD!!... Oh lord...";

 	emotion e_omg;

 	next;

@@ -159,7 +162,6 @@ L_GaveMeat:
 	close;

 

 L_Juice:

-	set MORRISON,20;

 	mes "Thank you for not giving my son any meat.  I'm trying to feed him";

 	mes "^0000ffFruits^000000 and vegetables, but this child doesn't want to eat";

 	mes "anything except Meat...";

@@ -177,15 +179,15 @@ L_Juice:
 	mes "[Housewife Marianne]";

 	mes "... Was is it...^ff0000Payon^000000...or ^ff0000Morroc^000000...?";

 	emotion e_hmm;

-	next;

+	set @MORRISON,0;

+	set MISC_QUEST,MISC_QUEST | 1;

 	close;

-

 }

 

 // Juicer Marx Hansen ---------------------------------------------------------

 payon_in03.gat,188,146,5	script	Juicer Marx Hansen	86,{

 	mes "[Juicer Marx Hansen]";

-	if(MORRISON == 20) goto L_Juice;

+	if(MISC_QUEST&1) goto L_Juice;

 	mes "Welcome to my shop. What brings you here?";

 	next;

 	menu "Conversation",-,"I am just looking around",M_End;

diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt
index 86ed34041..19482a93a 100644
--- a/npc/quests/quests_alberta.txt
+++ b/npc/quests/quests_alberta.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= kobra_k88

 //===== Current Version: ===================================== 

-//= 1.5

+//= 1.6

 //===== Compatible With: ===================================== 

 //= eAthena 1.0

 //===== Description: ========================================= 

@@ -14,10 +14,11 @@
 //= Hat of Sun God, Sunday Hat, Mage Hat, Magician Hat Quests

 //===== Additional Comments: ================================= 

 //= Fully working

-//= 1.1 Fixed Spore Doll exploit [Lupus], 1.2 Gramp's Tiger skin label bug

+//= 1.1 Fixed Spore Doll exploit, Gramp's Tiger skin label bug

 //= 1.3 Fixed item ID 7031 -> 7013

 //= 1.4 Fixed a bug, Fixed Exploits, Optimized [Lupus]

-//= 1.5 Turned TEMPESTRA -> @TEMPESTRA, fixed a typo [Lupus]

+//= 1.6 TEMPESTRA quest uses common quests variable MISC_QUEST 

+//=	Condition if done: (MISC_QUEST & 2) [Lupus]

 //============================================================ 

 

 

@@ -504,7 +505,7 @@ alberta.gat,135,79,3	script	Tempestra	71,{
 	mes "[Tempestra]";

 	mes "Ah...... Such a cool breeze.  It's good to be next to the sea.  I think it was the right choice for me to take a break from my business and come here.";

 	emotion e_ho;

-	if(@TEMPESTRA) goto sM_Menu;

+	if(MISC_QUEST & 2) goto sM_Menu;

 	next;

 	mes "[Tempestra]";

 	mes "Oh the sun is so bright today.  I'm glad I brought my hat.  If my skin is exposed to the sun like this everyday, I'm sure to get a sunburn.";

@@ -516,7 +517,7 @@ alberta.gat,135,79,3	script	Tempestra	71,{
 

 		if(countitem(503) < 1) goto L_NoPot;

 		delitem 503, 1;

-		set @TEMPESTRA, 1;

+		set MISC_QUEST,MISC_QUEST | 2;

 		mes "[Tempestra]";

 		mes "Oooh! Thank you so much.  I'm so glad to meet such a friendly person here....";

 		emotion e_thx;