Clear (most) new warnings

1 files changed, 2 insertions, 245 deletions

diff --git a/world/map/npc/010-2/chef.txt b/world/map/npc/010-2/chef.txt
index a128b094..1ea64fef 100644
--- a/world/map/npc/010-2/chef.txt
+++ b/world/map/npc/010-2/chef.txt
@@ -1,23 +1,5 @@
 010-2.gat,33,25,0|script|Chef#dimond|148,
 {
-// lines belong to Easter 2011:
-// set @month, 4;
-// set @start_day, 15;
-// set @end_day, 30;
-
-// if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 7) goto L_JellyBean;
-// if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 8) goto L_MakeJellyBean;
-// if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 9) goto L_SeeBunny;
-
-// lines belong to Easter 2012:
-//    if (!(gettime(6) == 3 && gettime(5) >= $@easter2012_start_day) && !(gettime(6) == 4 && gettime(5) <= $@easter2012_reward_end_day)) goto L_Begin;
-//    if (QUEST_Easter12 == 6) goto L_Easter2012_Begin;
-//    if (QUEST_Easter12 == 7) goto L_Easter2012_Wait;
-//    if (QUEST_Easter12 == 8) goto L_Easter2012Foolplayers;
-//    if (QUEST_Easter12 == 9) goto OnEaster2012Out;
-    goto L_Begin;
-
-L_Begin:
     mes "[Chef]";
     mes "";
     mes "\"I'm too busy right now to talk.\"";
@@ -138,233 +120,8 @@ L_bringit:
     mes "";
     mes "\"Bring it here when you do.\"";
     next;
-    goto L_End;
+    goto L_end;
 
-L_End:
-    close;
-
-L_JellyBean:
-    mes "[Chef]";
-    mes "";
-    mes "\"I can't talk right now... I'm too busy.\"";
-    next;
-    mes "\"Oh, wait. I see you are the adventurer who was speaking with the Easter Bunny. He has a really bad memory, you know? Every year he forgets who he needs to ask to get Jelly Beans, and every year an adventurer comes to my kitchen asking if I can help the Easter Bunny get some.\"";
-    next;
-    mes "\"Even though I am really busy this time of year, I will help you make some Jelly Beans to put in the basket if you wish. Just to keep the tradition alive...\"";
-    menu
-        "I would really appreciate that!", L_Next4,
-        "Nah, I decided not to do that stupid quest.", L_End;
-
-L_Next4:
-    set QUEST_Easter11, 8;
-    goto L_MakeJellyBean;
-
-L_MakeJellyBean:
-    mes "[Chef]";
-    mes "";
-    mes "\"I will need you to bring me some candies.\"";
-    mes "\"I think 15 should be enough.\"";
-    mes "\"Sea slimes seem to have those, so try them.\"";
-    mes "\"And because it's the holidays, I'll add in the other ingredient for free.\"";
-    menu
-        "I have some candies!", L_Next5,
-        "Ok, I will be back soon.", L_End,
-        "I changed my mind, forget about it.", L_End;
-
-L_Next5:
-    if(countitem("Candy") < 15)
-        goto L_EasterNotEnough;
-    if(countitem("Candy") >= 15)
-        goto L_EasterEnough;
-    close;
-
-L_EasterNotEnough:
-    mes "[Chef]";
-    mes "";
-    mes "\"You do not have enough candies for me to work with yet.\"";
-    mes "\"Please go get more.\"";
-    close;
-
-L_EasterEnough:
-    getinventorylist;
-    if (@inventorylist_count == 100 && countitem("Candy") > 15)
-        goto L_EasterTooMany;
-    if(countitem("Candy") < 15)
-        goto L_EasterNotEnough;
-    delitem "Candy", 15;
-    getitem "JellyBeans", 1;
-    set QUEST_Easter11, 9;
-    mes "[Chef]";
-    mes "";
-    mes "\"You have gathered enough candies for me to make the Jelly Beans.\"";
-    mes "He puts the candies into a pot and starts melting them.";
-    mes "He adds in some gooey stuff, then lets the solution cool for a moment before forming the Jelly Beans.";
-    mes "\"Here are your Jelly Beans.\"";
-    close;
-
-L_TooMany:
-    mes "[Chef]";
-    mes "";
-    mes "\"You don't have enough room for the Jelly Beans. Come back later.\"";
-    close;
-
-L_SeeBunny:
-    mes "[Chef]";
-    mes "";
-    mes "\"Oh yeah, you need to return to the Easter Bunny now.\"";
-    next;
-    goto L_Begin;
-
-// Lines below here belong to Easter 2012:
-
-L_Easter2012_Begin:
-    mes "[Chef]";
-    mes "\"Ahh, " + strcharinfo(0) + "! I really need to talk to you. Did the Easter Bunny give you a very thick and heavy pan?\"";
-    menu
-        "Yes, he did. Why?", L_Next12;
-
-L_Next12:
-    mes "[Chef]";
-    mes "\"Good to know! I am asking because now you are my only hope. I have invented the ultimate culinary wonder, a recipe for the most incredibly tasty food you can imagine!\"";
-    next;
-    mes "\"But here is the problem, to complete this recipe I need a very resistant pan, because in the process I need to use a very strong acid solution based on yeti saliva!\"";
-    next;
-    mes "\"Can you believe I ruined ALL of my pans and 17 infantry helmets while trying to cook it? That is why I am asking for this favor. Could you lend me your pan? I promise I will give you a jar of the final product.\"";
-    next;
-    mes "\"Oh, and I will need to keep it with me for a while, as the ingredients need to rest in the acid solution for a long time, but you can always come here to see how it is going.\"";
-    menu
-        "Ok, but I want my pan back when it is done!", L_Accept_Cooking,
-        "No way, I won't let you fill my hat with corrosive yeti saliva!", L_Next6;
-
-L_Next6:
-    mes "[Chef]";
-    mes "\"Ahh, don't say that! Please, think about it and come back if you change your mind.\"";
-    close;
-
-L_Accept_Cooking:
-    mes "[Chef]";
-    mes "\"Great! But I can't promise anything regarding your hat. What I can promise is: IF it works, you will eat the most spectacular food of all time! I won't say what it is, but it is going to be great! What do you say, are you sure?\"";
-    menu
-        "Ahh, just take the pan and do your thing.", L_Next7,
-        "No way!", L_Close;
-
-L_Next7:
-    if (countitem("PanHat") < 1)
-        goto L_No_PanHat;
-    delitem "PanHat", 1;
-    set QUEST_Easter12, 7;
-    mes "\"Very good! Now I just need to put the basic ingredients inside a metal pan filled with water, yeti saliva, a little bit of salt and finally... The secret ingredient!\"";
-    next;
-    mes "The chef turns his back to you so he can hide what he is using. But you can clearly distinguish a smell of coal...";
-    mes "\"Hahahah! And now we wait!\"";
-    close;
-
-L_Easter2012_Wait:
-    if ((gettime(6) == 4 && gettime(5) >= $@easter2012_reward_start_day))
-        goto L_Easter2012_Result;
-    mes "[Chef]";
-    mes "\"Be patient... The basic ingredients are not ready yet.\"";
-    close;
-
-L_Easter2012_Result:
-    set @temp, rand(99);
-    mes "[Chef]";
-    mes "\"Hey! I have some good news and some bad news... Which one do you want to hear first?\"";
-    menu
-        "The good one.", L_Next8,
-        "The bad one.", L_Next8,
-        "Oh no, I don't even want to hear!", L_Close;
-
-L_Next8:
-    if (@temp < 15) goto L_Easter2012_Lucky;
-    goto L_Easter2012_Unlucky;
-    close;
-
-L_Easter2012_Lucky:
-    mes "[Chef]";
-    mes "\"Wait! Did I mention bad news? I must be crazy... There is no bad news my friend! The ultimate pickled beets is now ready AND your pan is intact!\"";
-    next;
-    mes "\"Here! Take your pan back and a jar of the best pickled beets of the mana world!\"";
-    set QUEST_Easter12, 10;
-    getitem "PickledBeets", 1;
-    getitem "PanHat", 1;
-    close;
-
-L_Easter2012_Unlucky:
-    mes "[Chef]";
-    mes "\"Ahh, actually, it doesn't matter! The important thing is that the recipe was a success! I just can't believe how something can be so tasty!\"";
-    next;
-    menu
-        "Nice! Now, what about my hat?", L_Next9;
-
-L_Next9:
-    mes "\"Oh, that... Ehh, unfortunately, the pan is not anymore. It was completely destroyed by the time the pickled beets were ready! But don't worry, I will keep my promise and give you a jar of this culinary masterpiece!\"";
-    next;
-    menu
-        "Wait, wait... Are you saying I lost my hat?", L_Next10;
-
-L_Next10:
-    mes "[Chef]";
-    mes "\"Hmm, yes. But I must say I really appreciate your effort to help me! You sacrificed your cool hat in the name of the culinary arts, only a great person would do that!\"";
-    next;
-    menu
-        "But... I... My hat...", L_Next11;
-
-L_Next11:
-    mes "[Chef]";
-    mes "\"Here, take your pickled beets!\"";
-    getitem "PickledBeets", 1;
-    set QUEST_Easter12, 8;
-    close;
-
-OnEaster2012Out:
-    if (QUEST_Easter12 == 8)
-        set QUEST_Easter12, 9;
-    mes "[Chef]";
-    mes "\"Hey, I couldn't help but notice your sadness... You really like these silly hats, don't you? Well, since your hat is completely destroyed, just like all my pans, I can give you one of these nice cooking hats. But only if you give my jar of pickled beets back. What do you say?\"";
-    menu
-        "A chef hat for a jar of pickled beets? Of course I want!", L_GetChefhat,
-        "Ahh, keep you silly hat! The pickled beets are way better!", L_KeepBeets;
-
-L_GetChefhat:
-    if (countitem("PickledBeets") < 1)
-        goto L_No_Pickledbeets;
-    mes "[Chef]";
-    mes "\"Really? Well, if you are sure about that... Here is your hat!\"";
-    delitem "PickledBeets", 1;
-    getitem "ChefHat", 1;
-    set QUEST_Easter12, 10;
-    close;
-
-L_KeepBeets:
-    mes "[Chef]";
-    mes "\"Hmm, I see that at least you are a wise person. See you later!\"";
-    set QUEST_Easter12, 10;
-    close;
-
-L_No_PanHat:
-    mes "[Chef]";
-    mes "\"So? You said you have the pan, where is it?\"";
-    close;
-
-L_No_Pickledbeets:
-    mes "[Chef]";
-    mes "\"Hey, no pickled beets means no chef hat.\"";
-    close;
-
-L_Easter2012Foolplayers:
-    mes "The chef can't hear you. He keeps looking and feeling the scent of his new recipe.";
-    close;
-
-L_Close:
+L_end:
     close;
 }
-
-//010-2.gat,28,31,0|script|#chefproposition|32767,0,0
-//{
-//OnTouch:
-//    if (gettime(7) != $@easter2012_year || QUEST_Easter12 != 8 || !((gettime(6) == 4 && gettime(5) >= $@easter2012_reward_start_day) && (gettime(6) == 4 && gettime(5) <= $@easter2012_reward_end_day)))
-//        end;
-//    doevent "Chef::OnEaster2012Out";
-//    end;
-//}