Tab replacement and formatting project: Maps 014-1 to 021-2 complete.

1 files changed, 192 insertions, 191 deletions

diff --git a/world/map/npc/021-2/bakery.txt b/world/map/npc/021-2/bakery.txt
index 1fa60134..76253c0f 100644
--- a/world/map/npc/021-2/bakery.txt
+++ b/world/map/npc/021-2/bakery.txt
@@ -1,234 +1,235 @@
 // The bakery
 
 // The chef
-021-2.gat,95,21,0	script	Riskim	148,{
+021-2.gat,95,21,0|script|Riskim|148,{
 
 // lines belong to easter 2011:
-//	set @month, 4;
-//	set @start_day, 15;
-//	set @end_day, 30;
+//    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 == 10) goto L_ChocMouboo;
-//	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 11) goto L_MakeChocMouboo;
-//	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 12) goto L_SeeBunny;
+//    if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 10) goto L_ChocMouboo;
+//    if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 11) goto L_MakeChocMouboo;
+//    if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 12) goto L_SeeBunny;
 
 L_Begin:
-	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;
+    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?", -,
-		"Goodbye!", L_end;
-
-	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!", -,
-		"Maybe later.", L_end;
-
-	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;
+    next;
+    menu
+        "Thanks!  Let me have a look around...", L_end,
+        "Can you put this potion into a Chocolate Cake?", -,
+        "Goodbye!", L_end;
+    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!", -,
+        "Maybe later.", L_end;
+    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;
+    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;
+    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?", -,
-		"Goodbye!", L_end;
-
-	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;
+    next;
+    menu
+        "Thanks!  Let me have a look around...", L_end,
+        "Can you put this potion into an Orange Cupcake?", -,
+        "Goodbye!", L_end;
+    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;
 
 L_End:
-	close;
+    close;
 
 L_ChocMouboo:
-	mes "[Riskim]";
-	mes "";
-	mes "\"Welcome to our bakery! Here you will find the best cakes in Tulimshar. And don't leave before you try one of our delicious Chocolate Pinkies!\"";
-	next;
-	menu
-		"Excuse me, sir? Did you say Chocolate Pinkies?", -;
-	mes "\"Yes! But there is no need to be alarmed, it is just plain chocolate molded in the shape of a small pinkie...\"";
-	next;
-	menu
-		"Do you have one in the shape of a mouboo? The Easter Bunny needs one.", -;
-	mes "\"The Easter Bunny? Interesting... I think I can help you make a Chocolate Mouboo.\"";
-	menu
-		"Nah, I decided not to do that stupid quest.", L_End,
-		"I would really appreciate that!", -;
-	set QUEST_Easter11, 11;
+    mes "[Riskim]";
+    mes "";
+    mes "\"Welcome to our bakery! Here you will find the best cakes in Tulimshar. And don't leave before you try one of our delicious Chocolate Pinkies!\"";
+    next;
+    menu
+        "Excuse me, sir? Did you say Chocolate Pinkies?", -;
+    mes "\"Yes! But there is no need to be alarmed, it is just plain chocolate molded in the shape of a small pinkie...\"";
+    next;
+    menu
+        "Do you have one in the shape of a mouboo? The Easter Bunny needs one.", -;
+    mes "\"The Easter Bunny? Interesting... I think I can help you make a Chocolate Mouboo.\"";
+    menu
+        "Nah, I decided not to do that stupid quest.", L_End,
+        "I would really appreciate that!", -;
+    set QUEST_Easter11, 11;
 
 L_MakeChocMouboo:
-	mes "[Riskim]";
-	mes "";
-	mes "\"I will need you to bring me some Chocolate Bars.\"";
-	mes "\"I think 5 bars should be enough.\"";
-	mes "\"Red slimes seem to have those, so try there.\"";
-	mes "\"I will also need a Mouboo Figurine to hollow out and use as a mold.\"";
-	mes "\"Any mage should be able to make you one out of a log, if you ask.\"";
-	menu
-		"I have everything you need.", -,
-		"Ok, I will be back soon.", L_End,
-		"I changed my mind, forget about it.", L_End;
-
-	if(countitem("ChocolateBar") < 5 || countitem("MoubooFigurine") < 1) goto L_EasterNotEnough;
+    mes "[Riskim]";
+    mes "";
+    mes "\"I will need you to bring me some Chocolate Bars.\"";
+    mes "\"I think 5 bars should be enough.\"";
+    mes "\"Red slimes seem to have those, so try there.\"";
+    mes "\"I will also need a Mouboo Figurine to hollow out and use as a mold.\"";
+    mes "\"Any mage should be able to make you one out of a log, if you ask.\"";
+    menu
+        "I have everything you need.", -,
+        "Ok, I will be back soon.", L_End,
+        "I changed my mind, forget about it.", L_End;
+
+    if(countitem("ChocolateBar") < 5
+        || countitem("MoubooFigurine") < 1)
+            goto L_EasterNotEnough;
 
 L_EasterEnough:
-	getinventorylist;
-	if (@inventorylist_count == 100 && countitem("ChocolateBar") > 5 && countitem("MoubooFigurine") > 1) goto L_EasterTooMany;
-	if(countitem("ChocolateBar") < 5 || countitem("MoubooFigurine") < 1) goto L_EasterNotEnough;
-	delitem "ChocolateBar", 5;
-	delitem "MoubooFigurine", 1;
-	getitem "ChocolateMouboo", 1;
-	set QUEST_Easter11, 12;
-	mes "[Riskim]";
-	mes "";
-	mes "\"Excellent.  You have brought me the chocolate and the mold.\"";
-	mes "He places the chocolate in a pan to melt.";
-	mes "Next, he pours the melted chocolate into the mold.";
-	mes "Finally, he dips the mold in cold water for a moment to solidify the chocolate before skillfully cracking it open and handing you the finished product.";
-	mes "\"Here is your Chocolate Mouboo.\"";
-	close;
+    getinventorylist;
+    if (@inventorylist_count == 100
+        && countitem("ChocolateBar") > 5
+        && countitem("MoubooFigurine") > 1)
+            goto L_EasterTooMany;
+    if (countitem("ChocolateBar") < 5
+        || countitem("MoubooFigurine") < 1)
+            goto L_EasterNotEnough;
+    delitem "ChocolateBar", 5;
+    delitem "MoubooFigurine", 1;
+    getitem "ChocolateMouboo", 1;
+    set QUEST_Easter11, 12;
+    mes "[Riskim]";
+    mes "";
+    mes "\"Excellent.  You have brought me the chocolate and the mold.\"";
+    mes "He places the chocolate in a pan to melt.";
+    mes "Next, he pours the melted chocolate into the mold.";
+    mes "Finally, he dips the mold in cold water for a moment to solidify the chocolate before skillfully cracking it open and handing you the finished product.";
+    mes "\"Here is your Chocolate Mouboo.\"";
+    close;
 
 L_EasterNotEnough:
-	mes "[Riskim]";
-	mes "";
-	if(countitem("ChocolateBar") < 5) mes "\"You do not have enough Chocolate Bars for me to work with yet.\"";
-	if(countitem("MoubooFigurine") < 1) mes "\"You do not have the Mouboo Figurine to use as a mold.\"";
-	mes "\"Please go get what I asked.\"";
-	close;
+    mes "[Riskim]";
+    mes "";
+    if(countitem("ChocolateBar") < 5)
+        mes "\"You do not have enough Chocolate Bars for me to work with yet.\"";
+    if(countitem("MoubooFigurine") < 1)
+        mes "\"You do not have the Mouboo Figurine to use as a mold.\"";
+    mes "\"Please go get what I asked.\"";
+    close;
 
 L_EasterTooMany:
-	mes "[Riskim]";
-	mes "";
-	mes "\"You don't have enough room for the Chocolate Mouboo. Come back later.\"";
-	close;
+    mes "[Riskim]";
+    mes "";
+    mes "\"You don't have enough room for the Chocolate Mouboo. Come back later.\"";
+    close;
 
 L_SeeBunny:
-	mes "[Riskim]";
-	mes "";
-	mes "\"You need to return to the Easter Bunny now.\"";
-	close;
+    mes "[Riskim]";
+    mes "";
+    mes "\"You need to return to the Easter Bunny now.\"";
+    close;
 }
 
 // Server?
-021-2.gat,82,23,0	script	Sara	108,{
-	mes "[Sara]";
-	mes "";
-	mes "\"Hello!\"";
-	close;
+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 :-1,ChocolateCake :-1,OrangeCake :-1,AppleCake :-1,Cake :-1,CherryCake :-1,OrangeCupcake :-3,Milk :-5,XmasCake :-1
+021-2.gat,89,21,0|shop|Drabur|112,WhiteCake :-1,ChocolateCake :-1,OrangeCake :-1,AppleCake :-1,Cake :-1,CherryCake :-1,OrangeCupcake :-3,Milk :-5,XmasCake :-1
 
 // Stockroom boy
-021-2.gat,133,21,0	script	Iormo	160,{
-	mes "[Iormo]";
-	mes "";
-	mes "\"This stock room can get messy.\"";
-	close;
+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,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;
-}
+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;
+}
\ No newline at end of file