summaryrefslogtreecommitdiff
path: root/world/map/npc/021-2
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2014-04-04 18:02:08 -0700
committerBen Longbons <b.r.longbons@gmail.com>2014-04-04 18:02:08 -0700
commit6a85a72e083bc65d4a45f53aa6c6437ff6b11f7f (patch)
tree34649701476a045eba135bc59db91d94adc2ff56 /world/map/npc/021-2
parenta00579f57be4f02cd2a60ecd9468277ba6631e78 (diff)
downloadserverdata-6a85a72e083bc65d4a45f53aa6c6437ff6b11f7f.tar.gz
serverdata-6a85a72e083bc65d4a45f53aa6c6437ff6b11f7f.tar.bz2
serverdata-6a85a72e083bc65d4a45f53aa6c6437ff6b11f7f.tar.xz
serverdata-6a85a72e083bc65d4a45f53aa6c6437ff6b11f7f.zip
Clear (most) new warnings
Diffstat (limited to 'world/map/npc/021-2')
-rw-r--r--world/map/npc/021-2/bakery.txt99
-rw-r--r--world/map/npc/021-2/kylian.txt2
2 files changed, 3 insertions, 98 deletions
diff --git a/world/map/npc/021-2/bakery.txt b/world/map/npc/021-2/bakery.txt
index 89fbc38d..6415b498 100644
--- a/world/map/npc/021-2/bakery.txt
+++ b/world/map/npc/021-2/bakery.txt
@@ -3,14 +3,6 @@
// The chef
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;
-
-// 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;
goto L_Begin;
L_Begin:
@@ -124,96 +116,9 @@ L_More:
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;
+ goto L_end;
-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?", L_Next1;
-
-L_Next1:
- 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.", L_Next2;
-
-L_Next2:
- 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!", L_SetEasterBit;
-
-L_SetEasterBit:
- set QUEST_Easter11, 11;
- goto L_MakeChocMouboo;
-
-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.", L_HaveEverything,
- "Ok, I will be back soon.", L_End,
- "I changed my mind, forget about it.", L_End;
-
-L_HaveEverything:
- if(countitem("ChocolateBar") < 5
- || countitem("MoubooFigurine") < 1)
- goto L_EasterNotEnough;
- goto L_EasterEnough;
-
-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;
-
-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;
-
-L_EasterTooMany:
- 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.\"";
+L_end:
close;
}
diff --git a/world/map/npc/021-2/kylian.txt b/world/map/npc/021-2/kylian.txt
index 49d2d78b..15f0d36b 100644
--- a/world/map/npc/021-2/kylian.txt
+++ b/world/map/npc/021-2/kylian.txt
@@ -219,7 +219,7 @@ L_Casino: // @state == 6 and logged out sometime between getting to that state a
"Of course! The casino!",L_CasinoFound,
"Not really.",L_Close;
-L_CasineFound:
+L_CasinoFound:
set Zeny, Zeny + @casino_money;
getexp @casino_exp, 0;
set @state, 7;