From 5e79ad377e93967ce7ea4a54bdb8954033664f34 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Wed, 29 May 2019 10:11:09 -0300 Subject: Wizard class tested. Partly rewrite Sage class for new mlearn() standards --- npc/003-0/sage.txt | 88 ++++++++++++---------------------------------------- npc/003-0/wizard.txt | 2 +- 2 files changed, 20 insertions(+), 70 deletions(-) (limited to 'npc') diff --git a/npc/003-0/sage.txt b/npc/003-0/sage.txt index d74510b9d..0d84de4d7 100644 --- a/npc/003-0/sage.txt +++ b/npc/003-0/sage.txt @@ -72,87 +72,37 @@ L_Member: mesc l("Allows to move/attack while casting. (Melee attacks still interrupt casting!)"); mes ""; mesn; - mesq l("This useful skill will only require:"); - mesc l("@@/@@ @@", countitem(Tentacle), (getskilllv(SA_FREECAST)+1)*10, getitemlink(Tentacle)); - mesc l("@@/@@ @@", countitem(MushroomSpores), (getskilllv(SA_FREECAST)+1)*5, getitemlink(MushroomSpores)); - mesc l("@@/@@ @@", countitem(WolvernTooth), (getskilllv(SA_FREECAST)+1)*3, getitemlink(WolvernTooth)); - mesc l("@@/@@ @@", countitem(RedScorpionClaw), (getskilllv(SA_FREECAST)+1)*1, getitemlink(RedScorpionClaw)); - next; - if (askyesno() == ASK_YES) { - if ( - countitem(Tentacle) < (getskilllv(SA_FREECAST)+1)*10 || - countitem(MushroomSpores) < (getskilllv(SA_FREECAST)+1)*5 || - countitem(WolvernTooth) < (getskilllv(SA_FREECAST)+1)*3 || - countitem(RedScorpionClaw) < (getskilllv(SA_FREECAST)+1)*1) goto L_Missing; - - delitem Tentacle, (getskilllv(SA_FREECAST)+1)*10; - delitem MushroomSpores, (getskilllv(SA_FREECAST)+1)*5; - delitem WolvernTooth, (getskilllv(SA_FREECAST)+1)*3; - delitem RedScorpionClaw, (getskilllv(SA_FREECAST)+1)*1; - - sk_lvup(SA_FREECAST); - - next; - } + if (!mlearn(SA_FREECAST, + Tentacles, 10, + MushroomSpores, 5, + WolvernTooth, 3, + RedScorpionClaw, 1)) + goto L_Missing; break; case 2: mesc l("[Dragon Slayer]"); mesc l("Raises attack and resistance against dragons. Also raises int. Passive."); mes ""; mesn; - mesq l("This useful skill will only require:"); - mesc l("@@/@@ @@", countitem(Acorn), (getskilllv(SA_DRAGONOLOGY)+1)*70, getitemlink(Acorn)); - mesc l("@@/@@ @@", countitem(Root), (getskilllv(SA_DRAGONOLOGY)+1)*10, getitemlink(Root)); - mesc l("@@/@@ @@", countitem(FrozenYetiTear),(getskilllv(SA_DRAGONOLOGY)+1)*2, getitemlink(FrozenYetiTear)); - mesc l("@@/@@ @@", countitem(FluoPowder), (getskilllv(SA_DRAGONOLOGY)+1)*1, getitemlink(FluoPowder)); - next; - if (askyesno() == ASK_YES) { - if ( - countitem(Acorn) < (getskilllv(SA_DRAGONOLOGY)+1)*70 || - countitem(Root) < (getskilllv(SA_DRAGONOLOGY)+1)*10 || - countitem(FrozenYetiTear) < (getskilllv(SA_DRAGONOLOGY)+1)*2 || - countitem(FluoPowder) < (getskilllv(SA_DRAGONOLOGY)+1)*1) goto L_Missing; - - delitem Acorn, (getskilllv(SA_DRAGONOLOGY)+1)*70; - delitem Root, (getskilllv(SA_DRAGONOLOGY)+1)*10; - delitem FrozenYetiTear, (getskilllv(SA_DRAGONOLOGY)+1)*2; - delitem FluoPowder, (getskilllv(SA_DRAGONOLOGY)+1)*1; - - sk_lvup(SA_DRAGONOLOGY); - - next; - } + if (!mlearn(SA_DRAGONOLOGY, + Acorn, 70, + Root, 10, + FrozenYetiTear, 2, + FluoPowder, 1)) + goto L_Missing; break; case 3: mesc l("[Mana Wisdom]"); mesc l("Increase mana experience gain, when using mana skills."); mes ""; mesn; - mesq l("This useful skill will only require:"); - mesc l("@@/@@ @@", countitem(Acorn), (getskilllv(TMW2_SAGE)+1)*60, getitemlink(Acorn)); - mesc l("@@/@@ @@", countitem(Bread), (getskilllv(TMW2_SAGE)+1)*30, getitemlink(Bread)); - mesc l("@@/@@ @@", countitem(SmallMushroom), (getskilllv(TMW2_SAGE)+1)*20, getitemlink(SmallMushroom)); - mesc l("@@/@@ @@", countitem(PinkBlobime), (getskilllv(TMW2_SAGE)+1)*20, getitemlink(PinkBlobime)); - mesc l("@@/@@ @@", countitem(RedApple), (getskilllv(TMW2_SAGE)+1)*15, getitemlink(RedApple)); - next; - if (askyesno() == ASK_YES) { - if ( - countitem(Acorn) < (getskilllv(TMW2_SAGE)+1)*60 || - countitem(Bread) < (getskilllv(TMW2_SAGE)+1)*30 || - countitem(SmallMushroom) < (getskilllv(TMW2_SAGE)+1)*20 || - countitem(PinkBlobime) < (getskilllv(TMW2_SAGE)+1)*20 || - countitem(RedApple) < (getskilllv(TMW2_SAGE)+1)*15) goto L_Missing; - - delitem Acorn, (getskilllv(TMW2_SAGE)+1)*60; - delitem Bread, (getskilllv(TMW2_SAGE)+1)*30; - delitem SmallMushroom, (getskilllv(TMW2_SAGE)+1)*20; - delitem PinkBlobime, (getskilllv(TMW2_SAGE)+1)*20; - delitem RedApple, (getskilllv(TMW2_SAGE)+1)*15; - - sk_lvup(TMW2_SAGE); - - next; - } + if (!mlearn(TMW2_SAGE, + Acorn, 60, + Bread, 25, + PinkBlobime, 20, + SmallMushroom, 15, + RedApple, 12)) + goto L_Missing; break; // Weapon Enhance case 4: diff --git a/npc/003-0/wizard.txt b/npc/003-0/wizard.txt index a9a49b23f..d4ca14a52 100644 --- a/npc/003-0/wizard.txt +++ b/npc/003-0/wizard.txt @@ -18,7 +18,7 @@ L_SignUp: mesn; mesq l("Hey there! Do you want to join the Wizard Class?"); mesc l("Warning: If you join a subclass, you can't leave it later!"), 1; - mesc b(l("Warning: This class haven't been tested/balanced yet. Feedback is required!")), 1; + //mesc b(l("Warning: This class haven't been tested/balanced yet. Feedback is required!")), 1; next; if (askyesno() != ASK_YES) close; -- cgit v1.2.3-60-g2f50