Merge branch 'master' of the testing branch

Conflicts:
	conf/magic.conf
	db/item_db.txt
	npc/013-3_Cave/barrier.txt

Eliminated conf/magic.conf.  Re-build this file using conf/build-magic.sh;
otherwise marriage will be disabled and spells won't work.

5 files changed, 140 insertions, 37 deletions

diff --git a/npc/010-2_Dimonds_Cove/_import.txt b/npc/010-2_Dimonds_Cove/_import.txt
index 1a75f84a..a6d6af90 100644
--- a/npc/010-2_Dimonds_Cove/_import.txt
+++ b/npc/010-2_Dimonds_Cove/_import.txt
@@ -1,6 +1,7 @@
 map: 010-2.gat
 npc: npc/010-2_Dimonds_Cove/_mobs.txt
 npc: npc/010-2_Dimonds_Cove/_warps.txt
+npc: npc/010-2_Dimonds_Cove/chef.txt
 npc: npc/010-2_Dimonds_Cove/dimonds.txt
 npc: npc/010-2_Dimonds_Cove/doug.txt
 npc: npc/010-2_Dimonds_Cove/loratay.txt
diff --git a/npc/010-2_Dimonds_Cove/chef.txt b/npc/010-2_Dimonds_Cove/chef.txt
new file mode 100644
index 00000000..03149485
--- /dev/null
+++ b/npc/010-2_Dimonds_Cove/chef.txt
@@ -0,0 +1,111 @@
+010-2.gat,33,25,0	script	Chef	148,{
+	mes "[Chef]";
+	mes "\"I'm too busy right now to talk.\"";
+
+	callfunc "KadiyaSubquestConsts";
+        if ((@Q_kadiya_status == @Q_STATUS_WANTS_CHOCOCAKE) && (countitem ("MopoxCurePotion") > 0))
+        	goto L_lace_chococake;
+
+        if ((@Q_kadiya_status == @Q_STATUS_WANTS_ORANGECUPCAKE) && (countitem ("MopoxCurePotion") > 0))
+        	goto L_lace_cupcake;
+        close;
+
+L_lace_chococake:
+        next;
+        menu
+		"Sorry.", L_end,
+                "I need your help with a sick young girl!", -;
+
+	mes "[Chef]";
+        mes "You explain Kadiya's situation to him.";
+        mes "\"Hmrmf.  I can't help you; I'm a chef, not a baker!\"";
+        close;
+
+L_lace_cupcake:
+        next;
+        menu
+		"Sorry.", L_end,
+                "I need your help with a sick young girl!", -;
+
+	mes "[Chef]";
+        mes "You explain Kadiya's situation to him.";
+        mes "\"Hmrmf.  I was about to make another batch of orange cupcakes.  Do you have that potion with you?\"";
+        next;
+
+        menu
+		"No, sorry.", L_bringit,
+                "Yes, here you are.", -;
+
+        if (countitem ("MopoxCurePotion") < 1)
+        	goto L_bringit;
+
+	mes "[Chef]";
+        mes "He shudders as he smells the bottle.";
+        mes "\"That is disgusting!  How do you expect me to mask this?\"";
+        mes "He ponders his own question for a moment.";
+        next;
+
+        mes "[Chef]";
+        mes "\"Ah yes.  We need to bind the smell in gingerbread.  Bring me three pieces of gingerbread, one orange, and 500 GP for the other ingredients, and I will make you your cupcake.\"";
+        next;
+
+        menu
+                "I'll go and get it.", L_end,
+		"Here you are!", -,
+		"Not now.", L_end;
+
+	if (countitem ("GingerBreadMan") < 3) goto L_no_gingerbread;
+	if (countitem ("Orange") < 1) goto L_no_orange;
+	if (countitem ("MopoxCurePotion") < 1) goto L_no_potion;
+	if (zeny < 500) goto L_no_zeny;
+
+        set zeny, zeny - 500;
+        delitem "GingerBreadMan", 3;
+        delitem "Orange", 1;
+        delitem "MopoxCurePotion", 1;
+
+        getitem "LacedOrangeCupcake", 1;
+
+        mes "[Chef]";
+        mes "\"Good, good.  This should work.\"";
+        mes "He crumbles the gingerbread, mixes it with the potion and some spices, and finally adds some cupcake batter and the orange pieces.";
+        next;
+
+        mes "[Chef]";
+        mes "\"Take a seat.\"";
+        mes "He fills the mixture into a cupcake form and puts it into the oven.  You watch the cupcake grow for a while.";
+        mes "Finally, he removes the form and carefully extracts the cupcake.";
+        next;
+
+        mes "[Chef]";
+        mes "\"Here you are.  It's a bit bigger than a regular cupcake and will taste a bit like ginger, I think, but otherwise it should be fine.\"";
+        close;
+
+L_no_gingerbread:
+        mes "[Chef]";
+        mes "\"I will need three pieces of gingerbread.\"";
+        close;
+
+L_no_orange:
+        mes "[Chef]";
+        mes "\"Please bring me an orange for these cupcakes.\"";
+        close;
+
+L_no_zeny:
+        mes "[Chef]";
+        mes "\"No.  I need extra ingredients worth 500 GP, and I expect you to pay for those.\"";
+        close;
+
+L_no_potion:
+        mes "[Chef]";
+        mes "\"Where did your Mopox potion go?\"";
+        close;
+
+L_bringit:
+	mes "[Chef]";
+        mes "\"Bring it here when you do.\"";
+        next;
+
+L_end:
+	close;
+}
diff --git a/npc/010-2_Dimonds_Cove/dimonds.txt b/npc/010-2_Dimonds_Cove/dimonds.txt
index 8f82fc97..d44a5303 100644
--- a/npc/010-2_Dimonds_Cove/dimonds.txt
+++ b/npc/010-2_Dimonds_Cove/dimonds.txt
@@ -123,8 +123,3 @@
 	callfunc "Inn";
 }
 
-010-2.gat,33,25,0	script	Chef	148,{
-	mes "[Chef]";
-	mes "I'm too busy right now to talk.";
-	close;
-}
diff --git a/npc/010-2_Dimonds_Cove/doug.txt b/npc/010-2_Dimonds_Cove/doug.txt
index 505c7a54..adac3f97 100644
--- a/npc/010-2_Dimonds_Cove/doug.txt
+++ b/npc/010-2_Dimonds_Cove/doug.txt
@@ -3,7 +3,7 @@
 010-2.gat,68,87,0	script	Doug	113,{
 	if(CaveSnakeLamp == 1) goto L_State2;
 	if(CaveSnakeLamp == 2) goto L_Done;
-	set @TEMP,rand(4);
+	set @TEMP, rand(4);
 	if(@TEMP == 0) goto L_0;
 	if(@TEMP == 1) goto L_1;
 	if(@TEMP == 2) goto L_2;
@@ -40,7 +40,7 @@ L_Question:
 
 L_Sure:
 	set CaveSnakeLamp, 1;
-	set @TEMP,rand(4);
+	set @TEMP, rand(4);
 	if(@TEMP == 0) goto J_0;
 	if(@TEMP == 1) goto J_1;
 	if(@TEMP == 2) goto J_2;
@@ -76,13 +76,13 @@ L_Go:
 	close;
 
 L_State2:
-	if(countitem(612) >= 40) goto L_Have;
+	if(countitem("CaveSnakeLamp") >= 40) goto L_Have;
 	mes "[Doug]";
 	mes "\"Please help me collect 40 [Cave Snake Lamp]s!\"";
 	close;
 
 L_Have:
-	delitem 612, 40;
+	delitem "CaveSnakeLamp", 40;
 	mes "[Doug]";
 	mes "\"Cool! Now I can make this light!\"";
 	next;
diff --git a/npc/010-2_Dimonds_Cove/loratay.txt b/npc/010-2_Dimonds_Cove/loratay.txt
index 77336fb6..f2350a4c 100644
--- a/npc/010-2_Dimonds_Cove/loratay.txt
+++ b/npc/010-2_Dimonds_Cove/loratay.txt
@@ -1,9 +1,5 @@
 010-2.gat,85,85,0	script	Lora Tay	151,{
 
-        set @COTTON, 660;
-        set @SILK_COCOON, 718;
-
-        set @SILK_ROBE, 720;
         set @ROBE_COCOONS_NR, 150; // must be multiple of ten
         set @ROBE_ZENY, 10000;
 
@@ -244,7 +240,7 @@ L_main_menu:
 L_desert_hat:
         mes "[Lora Tay the Seamstress]";
         mes "The seamstress sighs.";
-        mes "\"One of these days it would be nice to have an actual challenge... yes, of course I can make a desert hat.  A cotton headband, three pieces of cotton cloth.  Hmm.  And let's add 300 GP to that.\"";
+        mes "\"One of these days it would be nice to have an actual challenge... yes, of course I can make a desert hat.  A [Cotton headband], three pieces of [cotton cloth].  Hmm.  And let's add 300 GP to that.\"";
         next;
 
         set @default_choice$, "Never mind.";
@@ -262,13 +258,13 @@ L_desert_hat:
 
         if (countitem(@item) < 1)
         	goto L_desert_hat_noheadband;
-        if (countitem(@COTTON) < 3)
+        if (countitem("CottonCloth") < 3)
         	goto L_desert_hat_nocotton;
         if (zeny < 300)
         	goto L_desert_hat_nogp;
 
         delitem @item, 1;
-        delitem @COTTON, 3;
+        delitem "CottonCloth", 3;
         set zeny, zeny - 300;
         getitem @genitem, 1;
         mes "[Lora Tay the Seamstress]";
@@ -350,7 +346,7 @@ L_trim_nozeny:
 
 L_lengthen:
         mes "[Lora Tay the Seamstress]";
-        mes "\"Naturally, I will need a piece of cotton to sew onto it; I must also charge you some... hmm... does 500 GP sound reasonable?  Yes, I think I shall charge that.\"";
+        mes "\"Naturally, I will need a piece of [cotton cloth] to sew onto it; I must also charge you some... hmm... does 500 GP sound reasonable?  Yes, I think I shall charge that.\"";
         mes "\"Now, let me see.  What is it that you want lengthened?\"";
         next;
 
@@ -372,10 +368,10 @@ L_lengthen:
 
         if (@genitem == 0) goto L_lengthen_impossible;
         if (zeny < 500) goto L_lengthen_nozeny;
-        if (countitem (@COTTON) < 1) goto L_lengthen_nocotton;
+        if (countitem ("CottonCloth") < 1) goto L_lengthen_nocotton;
 
         delitem @delitem, 1;
-        delitem @COTTON, 1;
+        delitem "CottonCloth", 1;
         getitem @genitem, 1;
         set zeny, zeny - 500;
         mes "[Lora Tay the Seamstress]";
@@ -422,18 +418,18 @@ L_tanktop:
 
 L_tanktop_menu:
         menu "I think I would like something else.", L_main_menu,
-             "A tank top, please (6 cotton)", L_tanktop_long,
-             "A short tank top, please (5 cotton)", L_tanktop_short,
+             "A tank top, please (6 [cotton cloth])", L_tanktop_long,
+             "A short tank top, please (5 [cotton cloth])", L_tanktop_short,
              "Goodbye for now.", L_end;
 
 L_tanktop_short:
-        if (countitem (@COTTON) < 5) goto L_tanktop_insufficient_cloth;
+        if (countitem ("CottonCloth") < 5) goto L_tanktop_insufficient_cloth;
         if (zeny < 1000) goto L_tanktop_insufficient_zeny;
 	getinventorylist;
-	if (@inventorylist_count == 100 && countitem(@COTTON) > 5) goto L_TooMany;
+	if (@inventorylist_count == 100 && countitem("CottonCloth") > 5) goto L_TooMany;
         set zeny, zeny - 1000;
-        delitem @COTTON, 5;
-        getitem 689, 1;
+        delitem "CottonCloth", 5;
+        getitem "WhiteShortTankTop", 1;
         mes "[Lora Tay the Seamstress]";
         mes "You watch as Lora sews the pieces of cloth together, then flattens the seams and ends with some odd liquid.";
         mes "Amazingly, the result looks like a single piece of cloth.";
@@ -443,13 +439,13 @@ L_tanktop_short:
         goto L_tanktop_menu;
 
 L_tanktop_long:
-        if (countitem (@COTTON) < 6) goto L_tanktop_insufficient_cloth;
+        if (countitem ("CottonCloth") < 6) goto L_tanktop_insufficient_cloth;
         if (zeny < 1000) goto L_tanktop_insufficient_zeny;
 	getinventorylist;
-	if (@inventorylist_count == 100 && countitem(@COTTON) > 6) goto L_TooMany;
+	if (@inventorylist_count == 100 && countitem("CottonCloth") > 6) goto L_TooMany;
         set zeny, zeny - 1000;
-        delitem @COTTON, 6;
-        getitem 688, 1;
+        delitem "CottonCloth", 6;
+        getitem "WhiteTankTop", 1;
         mes "[Lora Tay the Seamstress]";
         mes "After combining your pieces of cloth into one-- miraculously making the seams and stitches vanish-- the seamstress cuts out all that doesn't belong into a tank top, then folds and stabilises the edges with additional seam lines.";
         mes "\"There you are.  Don't worry, I have trimmed it to match your size perfectly.\"";
@@ -458,7 +454,7 @@ L_tanktop_long:
 
 L_tanktop_insufficient_cloth:
         mes "[Lora Tay the Seamstress]";
-        mes "\"No, no, no, count again-- how much cloth did I say I needed?  That's not enough.\"";
+        mes "\"No, no, no, count again-- how much [cotton cloth] did I say I needed?  That's not enough.\"";
         next;
         goto L_tanktop_menu;
 
@@ -482,7 +478,7 @@ L_robe:
         mes "\"A robe?  Well, as long as you're not asking me to make it out of cotton...\"";
         next;
 
-        if (countitem(@SILK_COCOON) == 0)
+        if (countitem("SilkCocoon") == 0)
         	goto L_robe_nosilk;
 
 L_robe_menu:
@@ -494,7 +490,7 @@ L_robe_menu:
 
         mes "[Lora Tay the Seamstress]";
         mes "The seamstress stares at you as if you had gone out of your mind.";
-        mes "\"And what precisely do you expect me to do with silk cocoons?  String them together in some baubly chain?  Somehow remove the thread and spin and weave it so that some random person can have their robe?\"";
+        mes "\"And what precisely do you expect me to do with [silk cocoons]?  String them together in some baubly chain?  Somehow remove the thread and spin and weave it so that some random person can have their robe?\"";
         next;
 
         menu "Will you trade cocoons for sheets?", -,
@@ -517,18 +513,18 @@ L_robe_menu:
         menu "I'm not interested.", L_main_menu,
              "Very well then, here you are.", -;
 
-        if (countitem(@SILK_COCOON) < @ROBE_COCOONS_NR)
+        if (countitem("SilkCocoon") < @ROBE_COCOONS_NR)
 		goto L_robe_missing_cocoons;
 
         if (zeny < @ROBE_ZENY)
 		goto L_robe_missing_zeny;
 
 	getinventorylist;
-	if (@inventorylist_count == 100 && countitem(@SILK_COCOON) > @ROBE_COCOONS_NR) goto L_TooMany;
+	if (@inventorylist_count == 100 && countitem("SilkCocoon") > @ROBE_COCOONS_NR) goto L_TooMany;
 
         set zeny, zeny - @ROBE_ZENY;
-        delitem @SILK_COCOON, @ROBE_COCOONS_NR;
-        getitem @SILK_ROBE, 1;
+        delitem "SilkCocoon", @ROBE_COCOONS_NR;
+        getitem "SilkRobe", 1;
         mes "[Lora Tay the Seamstress]";
         mes "The seamstress puts your cocoons and GP away, takes your measurements and pulls out several silk sheets.  She asks you to stretch out your arms, then pins the silk sheets in place all over your body.";
         next;
@@ -551,7 +547,7 @@ L_robe_menu:
 
 L_robe_missing_cocoons:
         mes "[Lora Tay the Seamstress]";
-        mes "\"" + @ROBE_COCOONS_NR + " cocoons is what I said, not " + countitem(@SILK_COCOON) + ".";
+        mes "\"" + @ROBE_COCOONS_NR + " cocoons is what I said, not " + countitem("SilkCocoon") + ".";
         mes @ROBE_COCOONS_NR + " is " + (@ROBE_COCOONS_NR / 10) + " as many times as you have fingers, in case that helps.\"";
         next;
         goto L_main_menu;