From a40a86aebb63872d3f2fa39e1594c1b292161104 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Mon, 5 Jul 2021 15:18:41 -0300
Subject: Fix Joyplim, add the missing skills as (currently unobtainable)
 scrolls

---
 npc/magic/final.txt              | 2 ++
 npc/magic/level1-grow-plants.txt | 8 +++++---
 npc/magic/level2-happy-curse.txt | 4 +++-
 3 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'npc/magic')

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
-- 
cgit v1.2.3-60-g2f50