From 4df3fdd86e26090675d009640b753f926f4e8bec Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Mon, 22 Jul 2019 09:55:44 -0300 Subject: Scholarship Badge (ID 911) - Grants you a free skill learning and is used first. --- npc/functions/util.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'npc/functions') diff --git a/npc/functions/util.txt b/npc/functions/util.txt index f41c343fc..835eae988 100644 --- a/npc/functions/util.txt +++ b/npc/functions/util.txt @@ -639,12 +639,15 @@ function script mlearn { next; if (askyesno() == ASK_NO) return true; - if (countitem(.@it) < .@am) + if (countitem(.@it) < .@am && !(countitem(ScholarshipBadge))) return false; if (!sk_canlvup(.@ap)) return false; - delitem .@it, .@am; + if (countitem(ScholarshipBadge)) + delitem ScholarshipBadge, 1; + else + delitem .@it, .@am; sk_lvup(.@sk, .@ap); return true; } -- cgit v1.2.3-70-g09d2 From e1d443ae550dfdab64470c1a336b66b5c74efa81 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Mon, 22 Jul 2019 09:58:42 -0300 Subject: Trickmaster class is now Open For All. You now start with 1 MSP. You can start with the following skills: Freecast, Backsliding, Fire Wall or Throttle. We advise Fire Wall, of course... --- npc/003-0/trickmaster.txt | 2 +- npc/functions/util.txt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'npc/functions') diff --git a/npc/003-0/trickmaster.txt b/npc/003-0/trickmaster.txt index 8a51c2c58..19c590955 100644 --- a/npc/003-0/trickmaster.txt +++ b/npc/003-0/trickmaster.txt @@ -5,7 +5,7 @@ // Trickmaster of Tricksters Class 003-0,40,30,0 script Trickmaster NPC_SITTED_NINJA,{ - if (!MAGIC_LVL) goto L_NoMagic; + //if (!MAGIC_LVL) goto L_NoMagic; mes l(".:: Trickster Class ::."); mesc l("Specialized in miscellaneous skills."); next; diff --git a/npc/functions/util.txt b/npc/functions/util.txt index 835eae988..fcec7a462 100644 --- a/npc/functions/util.txt +++ b/npc/functions/util.txt @@ -592,6 +592,8 @@ function script sk_maxpoints { .@val+=(MAGIC_LVL/2); // Excluding first 15, 1 point every 10 job levels .@val+=((JobLevel-15)/10); + // 1 point per being a player + .@val+=1; // 1 point per skill permit level .@val+=getskilllv(TMW2_SKILLPERMIT); return .@val; -- cgit v1.2.3-70-g09d2 From 4cdf3cbcb896acc17a35aeebab61afd772ce70a6 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Mon, 22 Jul 2019 10:00:07 -0300 Subject: I think this should be trimmed. --- npc/functions/util.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'npc/functions') diff --git a/npc/functions/util.txt b/npc/functions/util.txt index fcec7a462..6a8c20ca2 100644 --- a/npc/functions/util.txt +++ b/npc/functions/util.txt @@ -590,8 +590,8 @@ function script sk_maxpoints { .@val=(MAGIC_LVL)*2; // 1 point every twice magic level .@val+=(MAGIC_LVL/2); - // Excluding first 15, 1 point every 10 job levels - .@val+=((JobLevel-15)/10); + // Excluding first 15, 1 point every 12 job levels + .@val+=((JobLevel-15)/12); // 1 point per being a player .@val+=1; // 1 point per skill permit level -- cgit v1.2.3-70-g09d2 From 615922386c56d473981dad70dce9158fdd135c87 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Mon, 22 Jul 2019 10:00:39 -0300 Subject: And capped. --- npc/functions/util.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'npc/functions') diff --git a/npc/functions/util.txt b/npc/functions/util.txt index 6a8c20ca2..82b107138 100644 --- a/npc/functions/util.txt +++ b/npc/functions/util.txt @@ -590,8 +590,8 @@ function script sk_maxpoints { .@val=(MAGIC_LVL)*2; // 1 point every twice magic level .@val+=(MAGIC_LVL/2); - // Excluding first 15, 1 point every 12 job levels - .@val+=((JobLevel-15)/12); + // Excluding first 15, 1 point every 12 job levels (Up to JL 75) + .@val+=min(5, ((JobLevel-15)/12)); // 1 point per being a player .@val+=1; // 1 point per skill permit level -- cgit v1.2.3-70-g09d2 From fb9eef59bb30774b0d8c1d1f18fae91aa74c0ae6 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Mon, 22 Jul 2019 10:23:32 -0300 Subject: Make Scholarship Badge used last --- npc/functions/util.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'npc/functions') diff --git a/npc/functions/util.txt b/npc/functions/util.txt index 82b107138..d774cd9d2 100644 --- a/npc/functions/util.txt +++ b/npc/functions/util.txt @@ -646,7 +646,7 @@ function script mlearn { if (!sk_canlvup(.@ap)) return false; - if (countitem(ScholarshipBadge)) + if (countitem(.@it) < .@am) delitem ScholarshipBadge, 1; else delitem .@it, .@am; -- cgit v1.2.3-70-g09d2 From bb80326d58849bc55e4f6cf87631587bfc122f41 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Mon, 22 Jul 2019 20:54:11 -0300 Subject: Improving an already learned skill now always cost 1 AP. Text will also change accordingly. --- npc/functions/util.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'npc/functions') diff --git a/npc/functions/util.txt b/npc/functions/util.txt index d774cd9d2..0e50e2d30 100644 --- a/npc/functions/util.txt +++ b/npc/functions/util.txt @@ -632,11 +632,16 @@ function script mlearn { .@ap=getarg(2); .@it=getarg(3); .@am=getarg(4); + .@learn$=l("learn"); if (getskilllv(.@sk) >= .@ff) { mesc l("You've reached the maximum level for this skill."), 1; return true; } - mesc l("To learn @@ you'll need @@/@@ point(s).", .@sk, .@ap, sk_points()); + if (getskilllv(.@sk)) { + .@ap=1; + .@learn$=l("upgrade"); + } + mesc l("To @@ @@ you'll need @@/@@ point(s).", .@learn$, .@sk, .@ap, sk_points()); mesc l("You'll also need to pay a fee of @@x @@", .@am, getitemlink(.@it)); next; if (askyesno() == ASK_NO) -- cgit v1.2.3-70-g09d2