From 66b36e79ce5ee8f8e461b52a5247e3cad5a16b94 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Wed, 1 Jul 2020 00:35:29 -0300 Subject: Remove direct calls to mlearn() --- npc/027-2/colin.txt | 52 ++++------------------------------------------------ 1 file changed, 4 insertions(+), 48 deletions(-) (limited to 'npc/027-2') diff --git a/npc/027-2/colin.txt b/npc/027-2/colin.txt index 62a59126a..8ab524dbb 100644 --- a/npc/027-2/colin.txt +++ b/npc/027-2/colin.txt @@ -25,15 +25,6 @@ mesc l("Frost Nova - Freeze everything in a range"); mesc l("Note: You can exchange 1 @@ for 3 @@", getitemlink(GemPowder), getitemlink(Quill)), 1; menuint - l("Fireball"), MG_FIREBALL, - l("Holy Light"), AL_HOLYLIGHT, - l("Magic Strike"), MG_SOULSTRIKE, - l("Napalm Beat"), MG_NAPALMBEAT, - l("Frost Diver"), MG_FROSTDIVER, - l("Fire Walk"), SO_FIREWALK, - l("Frost Nova"), WZ_FROSTNOVA, - rif(getskilllv(MG_SOULSTRIKE), l("Lightining Bolt")), MG_LIGHTNINGBOLT, - //l("Nilfheim"), TMW2_NILFHEIM, rif(countitem(GemPowder), l("Exchange Gempowder for Quill")), -1, l("Cancel"), 0; mes ""; @@ -44,47 +35,12 @@ delitem GemPowder, 1; getitem Quill, 3; break; - case MG_FIREBALL: - if (!mlearn(MG_FIREBALL, 5, 1, Quill, 1)) - mesc l("You do not meet all requisites for this skill."), 1; - break; - case AL_HOLYLIGHT: - if (!mlearn(AL_HOLYLIGHT, 1, 1, Quill, 1)) - mesc l("You do not meet all requisites for this skill."), 1; - break; - case MG_SOULSTRIKE: - if (!mlearn(MG_SOULSTRIKE, 10, 1, Quill, 1)) - mesc l("You do not meet all requisites for this skill."), 1; - break; - case MG_NAPALMBEAT: - if (!mlearn(MG_NAPALMBEAT, 5, 2, Quill, 1)) - mesc l("You do not meet all requisites for this skill."), 1; - break; - case MG_FROSTDIVER: - if (!mlearn(MG_FROSTDIVER, 7, 2, Quill, 1)) - mesc l("You do not meet all requisites for this skill."), 1; - break; - case SO_FIREWALK: - if (!mlearn(SO_FIREWALK, 2, 2, Lockpicks, 1)) - mesc l("You do not meet all requisites for this skill."), 1; - break; - case WZ_FROSTNOVA: - if (!mlearn(WZ_FROSTNOVA, 4, 3, Quill, 1)) - mesc l("You do not meet all requisites for this skill."), 1; - break; - case MG_LIGHTNINGBOLT: - if (!mlearn(MG_LIGHTNINGBOLT, 4, 1, Quill, 1)) - mesc l("You do not meet all requisites for this skill."), 1; - break; - case TMW2_NILFHEIM: - if (!mlearn(TMW2_NILFHEIM, 1, 5, Quill, 1)) - mesc l("You do not meet all requisites for this skill."), 1; + case 0: + closeclientdialog; break; default: - if (@menuret) - Exception("ERROR skill not implemented", RB_DEFAULT|RB_SPEECH); - else - closeclientdialog; + if (!learn_magic(@menuret)) + mesc l("You do not meet all requisites for this skill."), 1; break; } } while (@menuret); -- cgit v1.2.3-60-g2f50