summaryrefslogtreecommitdiff
path: root/world/map/npc/013-2
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/013-2
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/013-2')
-rw-r--r--world/map/npc/013-2/apprentice.txt2
-rw-r--r--world/map/npc/013-2/wizard.txt9
2 files changed, 6 insertions, 5 deletions
diff --git a/world/map/npc/013-2/apprentice.txt b/world/map/npc/013-2/apprentice.txt
index 17fd2368..843c10fb 100644
--- a/world/map/npc/013-2/apprentice.txt
+++ b/world/map/npc/013-2/apprentice.txt
@@ -15,7 +15,7 @@ L_Yes:
menu
"A beer", L_Beer,
"A milk", L_Milk,
- "Nevermind", -;
+ "Nevermind", L_No;
L_No:
mes "[Fabius]";
diff --git a/world/map/npc/013-2/wizard.txt b/world/map/npc/013-2/wizard.txt
index 5f20d752..6f2fd8c7 100644
--- a/world/map/npc/013-2/wizard.txt
+++ b/world/map/npc/013-2/wizard.txt
@@ -10,7 +10,6 @@
"Thanks, that's very kind of you!", L_Thanks,
"Can you teach me magic?", L_TeachRude,
"Oh, shut up!", L_ShutUp;
- goto L_Close;
L_TeachRude:
mes "[Old Wizard]";
@@ -31,7 +30,7 @@ L_Thanks:
"Alright.", L_Agree,
"I am studying magic, can you help?", L_NewStudent,
"Your apprentice? ... No thanks.", L_Decline;
- if (!@has_magic)
+ //else
menu
"Alright.", L_Agree,
"Your apprentice? ... No thanks.", L_Decline;
@@ -51,7 +50,7 @@ L_NewStudent:
menu
"That would be very kind of you!", L_TeachSpell,
"No, but thank you!", L_Decline;
- if (getskilllv(SKILL_POOL))
+ //else
menu
"That would be very kind of you!", L_TeachSpell,
"Actually I am looking for someone teaching me some more magic skills.", L_AstralSoul,
@@ -84,8 +83,10 @@ L_AstralSoul:
next;
mes "\"To do so, I am in need of a pearl and about 100 acorns.\"";
menu
- "Here we go.", -,
+ "Here we go.", L_Next,
"Ok be right back. I'll get them", L_Decline;
+
+L_Next:
if (countitem("Pearl") < 1 || countitem("Acorn") < 100) goto L_NotEnough;
delitem "Pearl", 1;
delitem "Acorn", 100;