From 4c1c006f2a500fcc00e0c06408931464346fa1bc Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sun, 18 Apr 2021 03:48:03 -0300 Subject: Add SC_HALT_REGENERATION, update binaries and SC config Note for self: Remove binaries from tree when possible --- npc/magic/level1-lesser-heal.txt | 10 +++++----- npc/magic/level2-lay-on-hands.txt | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'npc') diff --git a/npc/magic/level1-lesser-heal.txt b/npc/magic/level1-lesser-heal.txt index 88cef70f..b65f9625 100644 --- a/npc/magic/level1-lesser-heal.txt +++ b/npc/magic/level1-lesser-heal.txt @@ -14,9 +14,9 @@ function script SK_Lum { if (isequipped(MagicGMTopHat)) .@ok=false; // Ailments cannot be bypassed nor healed until Lv 3 Life Magic - if (getstatus(SC_BLOODING)) - .@ok=false; - if (getstatus(SC_CURSE)) + if (getstatus(SC_BLOODING) || + getstatus(SC_HALT_REGENERATION) || + getstatus(SC_CURSE)) .@ok=false; if (getstatus(SC_POISON) && !getstatus(SC_SLOWPOISON)) .@ok=false; @@ -41,7 +41,7 @@ function script SK_Lum { delitem Lifestone, 1; // Real healing happens here - .@PW=90+(10*@skillLv); + .@PW=60+(10*@skillLv); .@dmg=AdjustSpellpower(.@PW); sc_start(SC_M_LIFEPOTION, 5000, 1+max(0, .@dmg/5), 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK|SCFLAG_FIXEDRATE, @skillTarget); @@ -51,7 +51,7 @@ function script SK_Lum { // Specifics if (getskilllv(SKILL_MAGIC_DARK) >= 1) - SC_Bonus(2, SC_BLOODING, 1); // FIXME SC_REBOUND? SC_MAGICMUSHROOM? + SC_Bonus(2, SC_HALT_REGENERATION, 1); // Gives EXP according to how much you healed if (@skillTarget != getcharid(3)) diff --git a/npc/magic/level2-lay-on-hands.txt b/npc/magic/level2-lay-on-hands.txt index 65c68523..1d515324 100644 --- a/npc/magic/level2-lay-on-hands.txt +++ b/npc/magic/level2-lay-on-hands.txt @@ -17,9 +17,9 @@ function script SK_Inma { if (isequipped(MagicGMTopHat)) .@ok=false; // Ailments which prevent inma from working - if (getstatus(SC_BLOODING)) - .@ok=false; - if (getstatus(SC_CURSE)) + if (getstatus(SC_BLOODING) || + getstatus(SC_HALT_REGENERATION) || + getstatus(SC_CURSE)) .@ok=false; if (getstatus(SC_POISON) && !getstatus(SC_SLOWPOISON)) .@ok=false; @@ -42,7 +42,7 @@ function script SK_Inma { if (isequipped(MagicGMTopHat)) return; // Kill the GM event if (.@limit <= 0) return; // No need for healing // Apply effects - .@PW=130+(20*@skillLv); + .@PW=60+(20*@skillLv); .@dmg=AdjustSpellpower(.@PW); // Capped to what you need or your own health - the smallest of them @@ -58,9 +58,9 @@ function script SK_Inma { // Specifics if (getskilllv(SKILL_MAGIC_DARK) >= 2) - SC_Bonus(10, SC_BLOODING, 1); // FIXME SC_REBOUND? SC_MAGICMUSHROOM? + SC_Bonus(10, SC_HALT_REGENERATION, 1); else - SC_Bonus(5, SC_BLOODING, 1); // FIXME SC_REBOUND? SC_MAGICMUSHROOM? + SC_Bonus(5, SC_HALT_REGENERATION, 1); // Gives EXP according to how much you healed setq2(MagicQuest_Healing, getq2(MagicQuest_Healing)+1); -- cgit v1.2.3-60-g2f50