Adjust rest of world to Match new tutorial

1 files changed, 0 insertions, 158 deletions

diff --git a/world/map/npc/021-2/bakery.txt b/world/map/npc/021-2/bakery.txt
deleted file mode 100644
index acde18f2..00000000
--- a/world/map/npc/021-2/bakery.txt
+++ /dev/null
@@ -1,158 +0,0 @@
-// The bakery
-
-// The chef
-021-2.gat,95,21,0|script|Riskim|148
-{
-    mes "[Riskim]";
-    mes "";
-    mes "\"Welcome to our bakery!\"";
-
-    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;
-
-    mes "\"Would you mind bringing me 6 acorns please? I need them to make flour for the chocolate cakes. I will be so delicious!\"";
-    next;
-    mes "\"Um, I mean, the cakes will be delicious...\"";
-    emotion EMOTE_BLUSH;
-    next;
-
-    set @dq_level, 15;
-    set @dq_cost, 3;
-    set @dq_count, 6;
-    set @dq_name$, "Acorn";
-    set @dq_friendly_name$, "acorns";
-    set @dq_money, 250;
-    set @dq_exp, 50;
-
-    callfunc "DailyQuest";
-
-    next;
-    mes "\"And don't forget, our bakery is the best!\"";
-    close;
-
-L_lace_chococake:
-    next;
-    menu
-        "Thanks!  Let me have a look around...", L_End,
-        "Can you put this potion into a Chocolate Cake?", L_Next,
-        "Goodbye!", L_End;
-
-L_Next:
-    mes "[Riskim]";
-    mes "";
-    mes "As you show Riskim the potion, he leans back, away from it.";
-    mes "\"Ooooh, I remember that smell...\"";
-    mes "\"Elanore's Mopox potion, right?  She made me drink that, too...\"";
-    mes "He chuckles.";
-    mes "\"Yes, well, you do want to hide that somehow.\"";
-    next;
-    mes "[Riskim]";
-    mes "";
-    mes "\"We'll need extra chocolate for that one. If you can give me ten pieces of chocolate and that potion, plus 400 GP, I will bake you a special Chocolate Cake that hides the taste.\"";
-    next;
-    menu
-        "I will get them for you.", L_End,
-        "Here you are!", L_Continue,
-        "Maybe later.", L_End;
-
-L_Continue:
-    if (countitem("ChocolateBar") < 10)
-        goto L_lacking_ingredients;
-    if (countitem("MopoxCurePotion") < 1)
-        goto L_lacking_ingredients;
-    if (Zeny < 400)
-        goto L_lacking_Zeny;
-    delitem "MopoxCurePotion", 1;
-    delitem "ChocolateBar", 10;
-    getitem "LacedChocolateCake", 1;
-    set Zeny, Zeny - 400;
-
-    mes "[Riskim]";
-    mes "";
-    mes "\"Please have a seat!\"";
-    mes "You watch as Riskim melts the chocolate and stirs in the potion, then glazes a cake with the mixture.";
-    mes "\"It's a bit more chocolatey than your average chocolate cake, of course...\"";
-    next;
-    mes "[Riskim]";
-    mes "";
-    mes "Riskim hands you the cake.";
-    mes "\"Here you are. I hope that this works.\"";
-    close;
-
-L_lacking_Zeny:
-    mes "[Riskim]";
-    mes "";
-    mes "\"I'm sorry, but I have to charge 400 GP.\"";
-    close;
-
-L_lacking_ingredients:
-    mes "[Riskim]";
-    mes "";
-    mes "\"Sorry, but I need ten Chocolate Bars AND your cure potion for this. Please come back later when you have everything.\"";
-    close;
-
-L_lace_cupcake:
-    next;
-    menu
-        "Thanks!  Let me have a look around...", L_End,
-        "Can you put this potion into an Orange Cupcake?", L_More,
-        "Goodbye!", L_End;
-
-L_More:
-    mes "[Riskim]";
-    mes "";
-    mes "\"Orange Cupcakes?  Oh dear... I'm sorry, but I have a very bad orange allergy.\"";
-    next;
-    mes "[Riskim]";
-    mes "";
-    mes "\"Perhaps the Chef at Dimond's Cove can help you?  We get all our cupcakes from him.\"";
-    next;
-    goto L_End;
-
-L_End:
-    close;
-}
-
-// Server
-021-2.gat,82,23,0|script|Sara|108
-{
-    mes "[Sara]";
-    mes "";
-    mes "\"Hello!\"";
-    close;
-}
-
-// The cashier
-021-2.gat,89,21,0|shop|Drabur|112,WhiteCake:*500,ChocolateCake:*550,OrangeCake:*600,AppleCake:*600,Cake:*30,CherryCake:*100,OrangeCupcake:*270,Milk:*1500,XmasCake:*70
-
-// Stockroom boy
-021-2.gat,133,21,0|script|Iormo|160
-{
-    mes "[Iormo]";
-    mes "";
-    mes "\"This stock room can get messy.\"";
-    close;
-}
-
-// An old couple eating at the bakery
-021-2.gat,71,22,0|script|Rynoh|159
-{
-    mes "[Rynoh]";
-    mes "";
-    mes "\"The cakes may be expensive, but they sure are delicious!\"";
-    close;
-}
-
-021-2.gat,73,22,0|script|Ontas|154
-{
-    mes "[Ontas]";
-    mes "";
-    mes "\"We come here every week. This place has some of the best bread I've ever eaten!\"";
-    close;
-}