summaryrefslogtreecommitdiff
path: root/npc/magic
diff options
context:
space:
mode:
Diffstat (limited to 'npc/magic')
-rw-r--r--npc/magic/final.txt2
-rw-r--r--npc/magic/level1-grow-plants.txt8
-rw-r--r--npc/magic/level2-happy-curse.txt4
3 files changed, 10 insertions, 4 deletions
diff --git a/npc/magic/final.txt b/npc/magic/final.txt
index 87f0af99..d4f14413 100644
--- a/npc/magic/final.txt
+++ b/npc/magic/final.txt
@@ -59,6 +59,8 @@ function script HUB_SkillInvoke {
// Level 2
case SKILL_INMA:
SK_Inma(); break;
+ case SKILL_JOYPLIM:
+ SK_Joyplim(); break;
case SKILL_CHIPCHIP:
SK_Shear(); break;
case SKILL_KALAKARENK:
diff --git a/npc/magic/level1-grow-plants.txt b/npc/magic/level1-grow-plants.txt
index d15f1276..66e105b4 100644
--- a/npc/magic/level1-grow-plants.txt
+++ b/npc/magic/level1-grow-plants.txt
@@ -17,9 +17,11 @@ function script SK_GrowPlants {
.@it = MauveHerb; .@mobId = MauvePlant; break;
default: return;
}
- // Consume reagents
- delitem Root, 1;
- delitem .@it, 1;
+ if (getarg(0, true)) {
+ // Consume reagents
+ delitem Root, 1;
+ delitem .@it, 1;
+ }
// Continue but with a special flag
SK_summon(.@mobId, 2, 1, false);
return;
diff --git a/npc/magic/level2-happy-curse.txt b/npc/magic/level2-happy-curse.txt
index 08987293..1e1096a1 100644
--- a/npc/magic/level2-happy-curse.txt
+++ b/npc/magic/level2-happy-curse.txt
@@ -5,7 +5,9 @@
// School: General 2
function script SK_Joyplim {
- delitem GingerBreadMan, 1;
+ if (getarg(0, true))
+ delitem GingerBreadMan, 1;
+
.@b=(BL_PC | BL_PET | BL_MER | BL_HOM); // | BL_MOB
.@r=3+cap_value(getskilllv(SKILL_MAGIC)+(@skillLv/2), 1, 12); // Your radius
.@s=AdjustSpellpower(100); // Your magical stamina