summaryrefslogtreecommitdiff
path: root/world/map/npc/005-1
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/005-1')
-rw-r--r--world/map/npc/005-1/spirit.txt34
-rw-r--r--world/map/npc/005-1/tree.txt15
2 files changed, 31 insertions, 18 deletions
diff --git a/world/map/npc/005-1/spirit.txt b/world/map/npc/005-1/spirit.txt
index fa4e61a8..02e4e3b1 100644
--- a/world/map/npc/005-1/spirit.txt
+++ b/world/map/npc/005-1/spirit.txt
@@ -35,16 +35,20 @@ L_message:
mes "That strange voice seems to be coming from inside your head!";
next;
menu
- "Who, me?", -,
+ "Who, me?", L_Next,
"Leave me alone!", L_Close,
"Aaah! I'm hearing voices!", L_silly_close;
+
+L_Next:
mes "[Well]";
mes "\"I'm in here, in the well, talking to you! If I'm not very mistaken, you are a powerful wizard-to-be, except that nobody has showed you how to properly do magic yet!\"";
next;
menu
- "Who are you?", -,
+ "Who are you?", L_Next1,
"Aaaah! The voices are after me!", L_silly_close,
"Whatever it is, I'm not interested.", L_Close;
+
+L_Next1:
mes "[Earth Spirit]";
mes "\"I'm an earth spirit; my name isn't important... all that matters is that I like you, and that I will help you become a powerful wizard if you help me. Just a fair deal, no more than that...\"";
next;
@@ -57,14 +61,14 @@ L_wb:
mes "[Earth Spirit]";
mes "\"It's excellent to see you again!\"";
next;
+ goto L_main;
L_main:
menu
"How did you get trapped?", L_Q_trapped,
"Can you teach me magic and spells?", L_Q_magic,
"What do you know about...", L_Q,
- "Goodbye!", -;
- goto L_Close;
+ "Goodbye!", L_Close;
L_Q_trapped:
mes "[Earth Spirit]";
@@ -93,14 +97,18 @@ L_Q_magic:
menu
"No way.", L_silly_close,
"Sure.", L_Q_tree_ok,
- "Why that particular tree?", -;
+ "Why that particular tree?", L_Next2;
+
+L_Next2:
mes "[Earth Spirit]";
mes "\"Oh, you and your questions! Well, that tree was a druid once, so the branches contain a bit of its lifeforce. And that's useful.\"";
next;
menu
"Yuck.", L_silly_close,
"Sure, whatever.", L_Q_tree_ok,
- "Isn't that like cutting off someone's arm?", -;
+ "Isn't that like cutting off someone's arm?", L_Next3;
+
+L_Next3:
mes "[Earth Spirit]";
mes "\"Oooh... now come on! Don't be so sentimental. He turned himself into a tree, he can hardly expect everyone to leave him alone.\"";
next;
@@ -125,12 +133,13 @@ L_Q_magic_1:
mes "\"Yes, yes, if you bring me the branch and the money, then I will!\"";
next;
menu
- "Here are the branch and the money.", -,
+ "Here are the branch and the money.", L_Next4,
"How much money did you want again?", L_Q_tree_howmuch,
"How can I cut it?", L_Q_tree_how,
"Where was the tree again?", L_Q_tree_where,
"What is that tree?", L_Q_tree_what;
+L_Next4:
if (countitem("DruidTreeBranch") < 1) goto L_Q_tree_none;
if (!(MAGIC_FLAGS & MFLAG_DID_CUTTREE)) goto L_Q_tree_dry;
if (Zeny < 100000) goto L_Q_tree_nomoney;
@@ -163,9 +172,10 @@ L_Q_magic_2:
mes "\"Yes, of course! For just 20,000 GP I will teach you your first spell!\"";
next;
menu
- "Here you are.", -,
+ "Here you are.", L_Next5,
"No.", L_main;
+L_Next5:
if (Zeny < 20000) goto L_no20k;
set Zeny, Zeny - 20000;
@@ -181,9 +191,10 @@ L_Q_magic_3:
mes "\"But yes, yes! Only 20,000 GP, once again, and I will teach you a far more useful spell!\"";
next;
menu
- "Here you are.", -,
+ "Here you are.", L_Next6,
"No.", L_main;
+L_Next6:
if (Zeny < 20000) goto L_no20k;
set Zeny, Zeny - 20000;
mes "[Earth Spirit]";
@@ -252,7 +263,8 @@ L_silly_close:
mes "[Earth Spirit]";
if (!(MAGIC_FLAGS & MFLAG_KNOWS_IMP))
mes "[Well]";
- mes "\"Silly " + @s$ + ".\"";
+ mes "\"Silly " + @s$ + ".\"";
+ goto L_Close;
L_Close:
set @Q_MASK, 0;
@@ -279,9 +291,11 @@ S_update_var:
005-1.gat,118,70,0|script|#EarthImp0#_M|400,
{
callfunc "EarthImpTouch";
+ end;
}
005-1.gat,119,70,0|script|#EarthImp1#_M|400,
{
callfunc "EarthImpTouch";
+ end;
}
diff --git a/world/map/npc/005-1/tree.txt b/world/map/npc/005-1/tree.txt
index 2b63f8cb..626164b9 100644
--- a/world/map/npc/005-1/tree.txt
+++ b/world/map/npc/005-1/tree.txt
@@ -10,6 +10,7 @@ function|script|QuestTreeTrigger|,
if (@Q_status & @flag) goto L_Close; // already did that
if (@flag == 2) goto L_hug;
+ goto L_cont;
L_cont:
set @Q_status, @Q_status | @flag;
@@ -73,8 +74,7 @@ L_cut:
next;
menu
"Cut off a branch", L_do_cut,
- "Leave it alone", -;
- goto L_Close;
+ "Leave it alone", L_Close;
L_water:
mes "[Dying Tree]";
@@ -83,8 +83,7 @@ L_water:
menu
"Water the tree", L_givewater,
"Kiss tree", L_kiss,
- "Leave it alone", -;
- goto L_Close;
+ "Leave it alone", L_Close;
L_both:
mes "[Dying Tree]";
@@ -94,8 +93,7 @@ L_both:
"Water the tree", L_givewater,
"Kiss tree", L_kiss,
"Cut off a branch", L_do_cut,
- "Leave it alone", -;
- goto L_Close;
+ "Leave it alone", L_Close;
L_givewater:
if (countitem("BottleOfWater") < 1) goto L_no_water;
@@ -128,9 +126,8 @@ L_do_cut:
mes "Do you want to continue cutting?";
next;
menu
- "Nah... better not.", -,
+ "Nah... better not.", L_Close,
"Yes, let's cut!", L_really_cut;
- goto L_Close;
L_really_cut:
set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_DID_CUTTREE;
@@ -161,9 +158,11 @@ L_Close:
005-1.gat,79,41,0|script|#DruidTree0#_M|400,
{
callfunc "QuestTreeTouch";
+ end;
}
005-1.gat,80,41,0|script|#DruidTree1#_M|400,
{
callfunc "QuestTreeTouch";
+ end;
}