From da0d13ab2564d438875048ed8f5465a37bc64cca Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sat, 9 Nov 2019 17:19:40 -0300 Subject: Status reset (all NPCs) and almost every crafter in LoF --- npc/017-4/pihro.txt | 6 ++++-- npc/017-4/pyndragon.txt | 4 +++- npc/017-5/nahrec.txt | 4 +++- npc/017-5/silversmith.txt | 4 +++- npc/functions/refine.txt | 3 ++- npc/functions/resetstatus.txt | 4 +++- 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/npc/017-4/pihro.txt b/npc/017-4/pihro.txt index b64ceb625..91103c61b 100644 --- a/npc/017-4/pihro.txt +++ b/npc/017-4/pihro.txt @@ -25,6 +25,8 @@ .@base3=getarg(5,0); .@amon3=getarg(6,0); + .@price=POL_AdjustPrice(.@price); + mesn; mesq l("Do you want to craft @@? For that I will need:", getitemlink(.@prize)); mesc l("@@/@@ @@", countitem(.@base1), .@amon1, getitemlink(.@base1)); @@ -52,8 +54,8 @@ delitem .@base2, .@amon2; if (.@base3 > 0) delitem .@base3, .@amon3; - Zeny = Zeny - .@price; - getitem .@prize, rand(100,220); + POL_PlayerMoney(.@price); + getitem .@prize, rand2(180,220); mes ""; mesn; diff --git a/npc/017-4/pyndragon.txt b/npc/017-4/pyndragon.txt index 2a896cf6c..efcaaf93e 100644 --- a/npc/017-4/pyndragon.txt +++ b/npc/017-4/pyndragon.txt @@ -16,6 +16,8 @@ .@prize=getarg(6); .@price=getarg(7); + .@price=POL_AdjustPrice(.@price); + mesn; mesq l("Do you want to craft @@? For that I will need:", getitemlink(.@prize)); mesc l("@@/@@ @@", countitem(.@base1), .@amon1, getitemlink(.@base1)); @@ -39,7 +41,7 @@ delitem .@base1, .@amon1; delitem .@base2, .@amon2; delitem .@base3, .@amon3; - Zeny = Zeny - .@price; + POL_PlayerMoney(.@price); //getitem .@prize, 1; CsysNpcCraft(.@prize, IOPT_CRITDMG, 30, IOPT_DOUBLEATTACK, rand2(0, 15)); diff --git a/npc/017-5/nahrec.txt b/npc/017-5/nahrec.txt index ddab8bd5d..84cb51334 100644 --- a/npc/017-5/nahrec.txt +++ b/npc/017-5/nahrec.txt @@ -128,6 +128,8 @@ function blacksmith_create { .@prize=getarg(4); .@price=getarg(5); + .@price=POL_AdjustPrice(.@price); + mesn; mesq l("Do you want to craft @@? For that I will need @@ @@, @@ @@ and @@ gp.", getitemlink(.@prize), .@amon1, getitemlink(.@base1), .@amon2, getitemlink(.@base2), .@price); @@ -145,7 +147,7 @@ function blacksmith_create { inventoryplace .@prize, 1; delitem .@base1, .@amon1; delitem .@base2, .@amon2; - Zeny = Zeny - .@price; + POL_PlayerMoney(.@price); getitem .@prize, 1; mes ""; diff --git a/npc/017-5/silversmith.txt b/npc/017-5/silversmith.txt index c4b12e6ac..6255ee666 100644 --- a/npc/017-5/silversmith.txt +++ b/npc/017-5/silversmith.txt @@ -18,6 +18,8 @@ .@prize=getarg(4); .@price=getarg(5); + .@price=POL_AdjustPrice(.@price); + mesn; mesq l("Do you want to craft @@? For that I will need:", getitemlink(.@prize)); mesc l("@@/@@ @@", countitem(.@base1), .@amon1, getitemlink(.@base1)); @@ -37,7 +39,7 @@ inventoryplace .@prize, 1; delitem .@base1, .@amon1; delitem .@base2, .@amon2; - Zeny = Zeny - .@price; + POL_PlayerMoney(.@price); getitem .@prize, 1; .@xp=getiteminfo(.@base1, ITEMINFO_SELLPRICE)*.@amon1+getiteminfo(.@base2, ITEMINFO_SELLPRICE)*.@amon2; .@xp=.@xp*2/3; diff --git a/npc/functions/refine.txt b/npc/functions/refine.txt index 55d39c497..1498e130c 100644 --- a/npc/functions/refine.txt +++ b/npc/functions/refine.txt @@ -69,6 +69,7 @@ function script refineMaster { .@rlv=getequiprefinerycnt(.@it); .@price=(.@rlv+1)*1000; + .@price=POL_AdjustPrice(.@price); .@amount=(.@rlv/2)+1; // required item switch (.@rlv) { @@ -137,7 +138,7 @@ function script refineMaster { mesq l("It's time to show this shiny @@ who is the boss! HAHAHAHAHAHAHAH!", getitemlink(.@item)); next; // If you cheat somewhere along the way, the script will explode - Zeny=Zeny-.@price; + POL_PlayerMoney(.@price); delitem .@rg, .@amount; // Cheater should be locked for eternity. if (getequiprefinerycnt(.@it) != .@rlv || getequipid(.@it) != .@item || getequipisequiped(.@it) == 0) { diff --git a/npc/functions/resetstatus.txt b/npc/functions/resetstatus.txt index 6075749c8..343774dca 100644 --- a/npc/functions/resetstatus.txt +++ b/npc/functions/resetstatus.txt @@ -51,6 +51,8 @@ function script ConfirmStatusReset { if (getarg(0,-1) >= 0) .@plush_count=getarg(0,-1); + .@plush_count=POL_AdjustPrice(.@plush_count); + mesc l("WARNING: Permanent boosts will return to their fruit form."), 1; switch (select(lg("Yes, I am sure."), @@ -85,7 +87,7 @@ function script ConfirmStatusReset { l("It seems that you have no status points to reset!"), l("Come back when you will really need me."); } else { - Zeny-=.@plush_count; + POL_PlayerMoney(.@plush_count); speech S_LAST_NEXT, l("Let's see... @@ of your status points have just been reset!", StatusPoint - .@wasSP), l("Spend it wisely this time."), -- cgit v1.2.3-60-g2f50