Correct some bugs on cookiemaster and clean everything.

1 files changed, 23 insertions, 16 deletions

diff --git a/npc/000-1/cookiemaster.txt b/npc/000-1/cookiemaster.txt
index 8dd26b89..5838baab 100644
--- a/npc/000-1/cookiemaster.txt
+++ b/npc/000-1/cookiemaster.txt
@@ -6,6 +6,9 @@
 //    Cookie NPC, beware, if you don't take your cookie, she'll keep it!
 
 000-1.gat,97,50,0,1	script	Cookie Master	319;2,{
+    if (getq(General_Cookies) == 1)
+        goto l_GetCookie;
+
     mesn;
     mesq lg("Hey! Adventurer! Are you enjoying your life on Aemil?");
     next;
@@ -20,19 +23,16 @@
     mesq l("Don't tell me more, I know what you want... A cookie!");
     next;
 
-    if getq(General_Cookies == 1);
-        goto l_GetCookie;
-
 // Beta3 Contributors.
-    if (strcharinfo(0) == ("4144"))
+    if (strcharinfo(0) == "4144")
         goto l_Reward;
-    if (strcharinfo(0) == ("Alige"))
+    if (strcharinfo(0) == "Alige")
         goto l_Reward;
-    if (strcharinfo(0) == ("Hal9000"))
+    if (strcharinfo(0) == "Hal9000")
         goto l_Reward;
-    if (strcharinfo(0) == ("Reid"))
+    if (strcharinfo(0) == "Reid")
         goto l_Reward;
-    if (strcharinfo(0) == ("Socapex"))
+    if (strcharinfo(0) == "Socapex")
         goto l_Reward;
 
     mesq l("I'm sorry... But my cookies are restricted to a certain type of people...");
@@ -52,6 +52,7 @@
     mesq l("Cookies provide you strength, health and cuteness.");
     next;
     mesq l("Cookies are awesome, so am I.");
+    next;
 
     goto l_Bye;
 
@@ -81,6 +82,7 @@ l_TaskExpanation:
     mesq l("You'll first need to help my friends.");
     next;
     mesq l("It is them who tell me to whom I can give cookies.");
+    next;
 
     menu
         l("So you're under the control of dictators, that's... reassuring..."), -,
@@ -134,24 +136,30 @@ l_Presentation:
     mesq l("I get send here with a task, I can give you a perfect, wonderful, magnificent, superbly well shaped... Cookie!");
     next;
     mesq l("But...");
+    next;
 
     goto l_TaskExpanation;
 
 l_Reward:
-    mes "";
-    mesn;
     mesq l("Ah! Yes, @@ is written on my cookie list...", strcharinfo(0));
     next;
     mesq l("That's surprise me a little, you don't look very helpful...");
     next;
     mesq l("Anyway, here you have your cookie.");
 
+
+    callfunc "InventoryPlace", 517, 100000;
+
     setq General_Cookies, 1;
-    getitem "CreamyBiscuit", 1;
+    getitem "DeliciousCookie", 1;
     npctalk3 l("You receive a @@!", getitemlink("CreamyBiscuit"));
 
+
+
+
     next;
     mesq l("I'm sure that you'll enjoy the effect, but be prudent, these cookies are rare, and you'll need to help the community one more time before to get another one.");
+    next;
 
     goto l_Bye;
 
@@ -162,21 +170,19 @@ l_Control:
 
     menu
         l("Oh yes please, I'd really like to know!"), l_Friends,
-        l("Fine, tell me, who are these mysterious aliens?"), l_Bad,
+        l("Fine, tell me, who are these mysterious aliens?"), --,
         l("No, and I gotta go, see you."), l_Kick;
 
-    close;
-
-l_Bad:
     mes "";
     mesn;
     mesq l("Don't mock me, my work is admirable.");
+    next;
 
 l_Kick:
     closedialog;
 
     npctalk3 l("No cookie for you!");
-
+    warp "000-1.gat", 99, 52;
 
     close;
 
@@ -184,6 +190,7 @@ l_GetCookie:
     mesq l("How was the cookie? Awesome isn't it?");
     next;
     mesq l("If you still want another one, you know what to do!");
+    next;
 
 l_Bye:
     closedialog;