summaryrefslogtreecommitdiff
path: root/world/map/npc/024-1
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/024-1')
-rw-r--r--world/map/npc/024-1/ched.txt6
-rw-r--r--world/map/npc/024-1/david.txt5
-rw-r--r--world/map/npc/024-1/eomie.txt33
-rw-r--r--world/map/npc/024-1/tinris.txt28
-rw-r--r--world/map/npc/024-1/tondar.txt12
5 files changed, 61 insertions, 23 deletions
diff --git a/world/map/npc/024-1/ched.txt b/world/map/npc/024-1/ched.txt
index 2628f99a..c414cce5 100644
--- a/world/map/npc/024-1/ched.txt
+++ b/world/map/npc/024-1/ched.txt
@@ -10,13 +10,15 @@
next;
menu
"Well, good luck with that!", L_Done,
- "What spell is that?", -;
+ "What spell is that?", L_Next;
+
+L_Next:
mes "[Ched]";
mes "\"Well, I don't know what it's called... I took it out of `Timbleweed's Advanced Transmutations.' It seems awfully hard to cast, somehow.\"";
next;
mes "[Ched]";
mes "\"Well, the invocation is `" + getspellinvocation("merge-concentration-potions") + "'. You're supposed to just hold up the potions and cast it, and then they're supposed to merge.\"";
- close;
+ next;
mes "[Ched]";
mes "\"Maybe I should go back to `detect magic' until I can cast that one properly.\"";
close;
diff --git a/world/map/npc/024-1/david.txt b/world/map/npc/024-1/david.txt
index 14b8d848..e4f78a38 100644
--- a/world/map/npc/024-1/david.txt
+++ b/world/map/npc/024-1/david.txt
@@ -21,7 +21,9 @@ L_Set:
mes "\"Yes, I do. I am her teacher. Actually, that reminds me about her final exam... she didn't hand in her potion yet. Time is running out.\"";
menu
"A potion? Oh, uhm... Strange kind of exam. Bye.", L_No,
- "Right, I have her potion in my pocket. She asked me to bring it to you. Here it is.", -;
+ "Right, I have her potion in my pocket. She asked me to bring it to you. Here it is.", L_Next;
+
+L_Next:
mes "[David]";
mes "\"Let me see.\"";
set Rossy_Quest, 8;
@@ -48,5 +50,4 @@ L_FinalEnd:
mes "[David]";
mes "Well done! Thanks for finding Julia!";
close;
-
}
diff --git a/world/map/npc/024-1/eomie.txt b/world/map/npc/024-1/eomie.txt
index 47a7783f..1f62cdb1 100644
--- a/world/map/npc/024-1/eomie.txt
+++ b/world/map/npc/024-1/eomie.txt
@@ -46,26 +46,33 @@
if (@state != 7)
goto L_Close;
menu
- "I have this magic fertilizer from Tinris and need a spell cast on it.",-;
+ "I have this magic fertilizer from Tinris and need a spell cast on it.",L_Next;
+
+L_Next:
mes "[Eomie]";
mes "\"Oh? I see, that's a difficult task.";
mes "I'd be glad to help you, but unfortunately I can't interrupt the magic I use to keep this spot of grass alive.\"";
next;
mes "\"It's unusually hot at the moment, even for this desert area. It might have something to do with the aftereffects of the earthquake.\"";
menu
- "Isn't there any possibility?",-;
+ "Isn't there any possibility?",L_Continue;
+
+L_Continue:
mes "She hesitates.";
set @state, 8;
callsub S_Update_Mask;
+ goto L_GetStuff;
+
L_GetStuff: // @state == 8
mes "[Eomie]";
mes "\"I could try to interrupt my spells to be able to cast the spell on the fertilizer, but then I need to prepare the grass for this.";
mes "Bring me " + @grass_amount + " Grass Seeds, " + @water_amount + " Bottles of Water and " + @ice_amount + " Ice Cubes.\"";
menu
- "I have it.",-,
+ "I have it.",L_More,
"Where can I get Grass Seeds?",L_Hurnscald,
"How can I get Ice Cubes? We're in the desert!",L_Mine,
"Ok, I'll go and get it.",L_Close;
+L_More:
if ((countitem("GrassSeed") < @grass_amount) || (countitem("BottleOfWater") < @water_amount) || (countitem("IceCube") < @ice_amount))
goto L_NoItem;
delitem "GrassSeed", @grass_amount;
@@ -107,8 +114,10 @@ L_CastedSpell: // @state >= 9 but below 14
if (@state != 13)
goto L_Close;
menu
- "It was and he created this Silk Headband as a present for you.",-,
+ "It was and he created this Silk Headband as a present for you.",L_Present,
"(Mumble something and leave)",L_Close;
+
+L_Present:
if (countitem("SilkHeadband") < 1)
goto L_NoItem;
delitem "SilkHeadband", 1;
@@ -148,16 +157,23 @@ L_Grass:
mes "\"I maintain this little spot of grass in the desert.\"";
next;
menu
- "It looks beautiful. I wish I could find a Grass Liner like this.", -;
+ "It looks beautiful. I wish I could find a Grass Liner like this.", L_LookGrass;
+
+L_LookGrass:
mes "\"A Grass Liner? Last year I helped the Easter Bunny with a Grass Liner for his basket... It was really easy... Is this liner for yourself?\"";
next;
menu
- "No. Actually, it is for the Easter Bunny again...", -;
+ "No. Actually, it is for the Easter Bunny again...", L_NoBunny;
+
+L_NoBunny:
mes "\"Why didn't you say so before? I can help you make the Grass Liner for the basket if you wish.\"";
menu
- "I would really appreciate that!", -,
+ "I would really appreciate that!", L_WouldNot,
"Nah, I decided not to do that stupid quest.", L_End;
+
+L_WouldNot:
set QUEST_Easter11, 5;
+ goto L_MakeGrass;
L_MakeGrass:
mes "[Eomie]";
@@ -166,10 +182,11 @@ L_MakeGrass:
mes "\"I think 5 seeds should be enough.\"";
mes "\"Squirrels tend to pick those up as they gather food.\"";
menu
- "I have some seeds...", -,
+ "I have some seeds...", L_SomeSeeds,
"Ok, I will be back soon.", L_End,
"I changed my mind, forget about it.", L_End;
+L_SomeSeeds:
if(countitem("GrassSeed") < 5)
goto L_EasterNotEnough;
if(countitem("GrassSeed") >= 5)
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;
diff --git a/world/map/npc/024-1/tondar.txt b/world/map/npc/024-1/tondar.txt
index 7252b476..21957807 100644
--- a/world/map/npc/024-1/tondar.txt
+++ b/world/map/npc/024-1/tondar.txt
@@ -6,7 +6,7 @@
mes "\"We're not accepting any new students right now.\"";
if (getskilllv(SKILL_MAGIC) > 0)
goto L_may_ask;
- close;
+ goto L_end;
L_may_ask:
next;
@@ -14,9 +14,8 @@ L_may_ask:
"Can you teach me a spell?", L_askspell,
"Do you have a magic library?", L_library,
"Are you sure? I can pay well...", L_nopay,
- "That's unfortunate.", -,
- "Goodbye, then.", -;
- close;
+ "That's unfortunate.", L_end,
+ "Goodbye, then.", L_end;
L_library:
mes "[Tondar]";
@@ -24,7 +23,9 @@ L_library:
next;
menu
"Thank you, and goodbye.", L_end,
- "Nobody else is allowed inside?", -;
+ "Nobody else is allowed inside?", L_Next;
+
+L_Next:
mes "[Tondar]";
mes "\"Well, it is possible to get a special permit from the headmaster. But he is currently on sabbatical.\"";
close;
@@ -48,6 +49,7 @@ L_nopay:
mes "[Tondar]";
mes "The wizard frowns angrily.";
mes "\"Do not tempt me to teach you a different kind of lesson, young one! Begone!\"";
+ goto L_end;
L_end:
close;
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-11 11:15:55 +0000