summaryrefslogtreecommitdiff
path: root/world/map/npc/024-1/tinris.txt
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2014-04-02 11:06:32 -0700
committerBen Longbons <b.r.longbons@gmail.com>2014-04-02 22:21:29 -0700
commitc0ba38cd4b68491e28e467889804ebc09c9c002e (patch)
treeaf2890e6fe20990d2a9b7c94b991be58f25a5d52 /world/map/npc/024-1/tinris.txt
parent514a2f05cb335c1e9210fea58bc9a9a58478283f (diff)
downloadserverdata-c0ba38cd4b68491e28e467889804ebc09c9c002e.tar.gz
serverdata-c0ba38cd4b68491e28e467889804ebc09c9c002e.tar.bz2
serverdata-c0ba38cd4b68491e28e467889804ebc09c9c002e.tar.xz
serverdata-c0ba38cd4b68491e28e467889804ebc09c9c002e.zip
Clean up main scripts
Diffstat (limited to 'world/map/npc/024-1/tinris.txt')
-rw-r--r--world/map/npc/024-1/tinris.txt28
1 files changed, 22 insertions, 6 deletions
diff --git a/world/map/npc/024-1/tinris.txt b/world/map/npc/024-1/tinris.txt
index 1dcb3ccd..857ca64c 100644
--- a/world/map/npc/024-1/tinris.txt
+++ b/world/map/npc/024-1/tinris.txt
@@ -49,7 +49,9 @@
if (@state != 1)
goto L_Close;
menu
- "The farmer Anwar sent me to ask for exactly that! Can you give me something for his field?",-;
+ "The farmer Anwar sent me to ask for exactly that! Can you give me something for his field?",L_Next;
+
+L_Next:
mes "[Tinris]";
mes "\"Well... in principle yes. I can try to prepare something for him. But...\"";
next;
@@ -65,8 +67,10 @@ L_Annual: // @state == 2
mes "[Tinris]";
mes "\"Hello, did you get the Chocolate Cake for my girlfriend? After that I can focus on creating some magic fertilizer for you.\"";
menu
- "Fresh from the bakery!",-,
+ "Fresh from the bakery!",L_FreshFrom,
"I didn't get it yet.",L_Close;
+
+L_FreshFrom:
if (countitem("ChocolateCake") < 1)
goto L_NoItem;
delitem "ChocolateCake", 1;
@@ -77,13 +81,17 @@ L_Annual: // @state == 2
mes "\"Oh, thank you! You saved me!";
mes "All right, now we can start with the magic fertilizer.\"";
next;
+ goto L_FirstTry;
+
L_FirstTry: // @state == 3
mes "[Tinris]";
mes "\"You need to bring me some ingredients.";
mes "The ingredients are " + @slime_amount1 + " Maggot Slimes, " + @bugleg_amount1 + " Bug Legs, " + @stinger_amount1 + " Scorpion Stingers and " + @ash_amount1 + " Piles of Ash.\"";
menu
- "I have it.",-,
+ "I have it.",L_Continue,
"Ok, I'll go and get it.",L_Close;
+
+L_Continue:
if ((countitem("MaggotSlime") < @slime_amount1) || (countitem("BugLeg") < @bugleg_amount1) || (countitem("ScorpionStinger") < @stinger_amount1) || (countitem("PileOfAsh") < @ash_amount1))
goto L_NoItem;
delitem "MaggotSlime", @slime_amount1;
@@ -107,16 +115,22 @@ L_FirstTryDone: // @state >= 4 but below 6
if (@state != 5)
goto L_Close;
menu
- "I did, the plants went brown and shriveled.",-;
+ "I did, the plants went brown and shriveled.",L_More;
+
+L_More:
set @state, 6;
callsub S_Update_Mask;
+ goto L_SecondTry;
+
L_SecondTry: // @state == 6
mes "[Tinris]";
mes "\"Oh no! All right, we need to do another try.";
mes "Bring me " + @slime_amount2 + " Maggot Slimes, " + @bugleg_amount2 + " Bug Legs, " + @stinger_amount2 + " Scorpion Stingers, " + @ash_amount2 + " Piles of Ash and " + @cactusp_amount + " Cactus Potion.\"";
menu
- "Here it is.",-,
+ "Here it is.",L_HereItIs,
"Ok, I'll go and get it.",L_Close;
+
+L_HereItIs:
if ((countitem("MaggotSlime") < @slime_amount2) || (countitem("BugLeg") < @bugleg_amount2) || (countitem("ScorpionStinger") < @stinger_amount2) || (countitem("PileOfAsh") < @ash_amount2) || (countitem("CactusPotion") < @cactusp_amount))
goto L_NoItem;
delitem "MaggotSlime", @slime_amount2;
@@ -153,8 +167,10 @@ L_GiveGift: // @state == 11
mes "[Tinris]";
mes "\"Ah, did Anwar try the new fertilizer?\"";
menu
- "Yes, it works great and he asked me to give you this Green V-Neck Sweater he made.",-,
+ "Yes, it works great and he asked me to give you this Green V-Neck Sweater he made.",L_ItWorksGreat,
"Not yet.",L_Close;
+
+L_ItWorksGreat:
if (countitem("GreenVNeckSweater") < 1)
goto L_NoItem;
delitem "GreenVNeckSweater", 1;