Fix Joyplim, add the missing skills as (currently unobtainable) scrolls

6 files changed, 100 insertions, 4 deletions

diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index a5cd0e9b..e2cc50e5 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -13533,6 +13533,81 @@ item_db: (
 	">
 },
 {
+	Id: 5267
+	AegisName: "AlizarinScroll"
+	Name: "Alizarin Scroll"
+	Type: "IT_USABLE"
+	Buy: 5000
+	Sell: 1000
+	Weight: 7
+	Script: <"
+		callfunc "learnskill", SKILL_MODRIPHOO;
+		@skillId = SKILL_MODRIPHOO;
+		@skillLv = 1;
+		callfunc "SK_GrowPlants", false;
+	">
+},
+{
+	Id: 5268
+	AegisName: "CobaltScroll"
+	Name: "Cobalt Scroll"
+	Type: "IT_USABLE"
+	Buy: 5000
+	Sell: 1000
+	Weight: 7
+	Script: <"
+		callfunc "learnskill", SKILL_MODRISUMP;
+		@skillId = SKILL_MODRISUMP;
+		@skillLv = 1;
+		callfunc "SK_GrowPlants", false;
+	">
+},
+{
+	Id: 5269
+	AegisName: "GambogeScroll"
+	Name: "Gamboge Scroll"
+	Type: "IT_USABLE"
+	Buy: 5000
+	Sell: 1000
+	Weight: 7
+	Script: <"
+		callfunc "learnskill", SKILL_MODRIYIKAM;
+		@skillId = SKILL_MODRIYIKAM;
+		@skillLv = 1;
+		callfunc "SK_GrowPlants", false;
+	">
+},
+{
+	Id: 5270
+	AegisName: "MauveScroll"
+	Name: "Mauve Scroll"
+	Type: "IT_USABLE"
+	Buy: 5000
+	Sell: 1000
+	Weight: 7
+	Script: <"
+		callfunc "learnskill", SKILL_MODRILAX;
+		@skillId = SKILL_MODRILAX;
+		@skillLv = 1;
+		callfunc "SK_GrowPlants", false;
+	">
+},
+{
+	Id: 5271
+	AegisName: "JoyplimScroll"
+	Name: "Joyplim Scroll"
+	Type: "IT_USABLE"
+	Buy: 5000
+	Sell: 1000
+	Weight: 7
+	Script: <"
+		callfunc "learnskill", SKILL_JOYPLIM;
+		@skillId = SKILL_JOYPLIM;
+		@skillLv = 10;
+		callfunc "SK_Joyplim", false;
+	">
+},
+{
 	Id: 586
 	AegisName: "CottonShorts"
 	Name: "CottonShorts"
diff --git a/db/pre-re/skill_tree.conf b/db/pre-re/skill_tree.conf
index 2435f7d7..e88fdbba 100644
--- a/db/pre-re/skill_tree.conf
+++ b/db/pre-re/skill_tree.conf
@@ -81,6 +81,7 @@ Talpan: {
 
 		// Level 2
 		SKILL_INMA: 9
+		SKILL_JOYPLIM: 9
 		SKILL_CHIPCHIP: 9
 		SKILL_KALAKARENK: 9
 		SKILL_KALBOO: 9
diff --git a/npc/018-1/mike.txt b/npc/018-1/mike.txt
index 5f0681af..8903936e 100644
--- a/npc/018-1/mike.txt
+++ b/npc/018-1/mike.txt
@@ -17,3 +17,17 @@
     mes "\"Hopefully I'll have enough soon.\"";
     close;
 }
+
+// Buy en masse miner set aten by slimes and pays market price without bonus?
+/*
+
+Cronos - Boss Point Validation & Exchanger? Possibly in Keshlam Swamps?
+Reapercry + Evil Obelisk (Maybe you can enable the obelisk warp from Swamps)
+Scrolls on client data; Create item DB entries, add to drop
+    5267 Alizarin
+    5268 Cobalt
+    5269 Gamboge
+    5270 Mauve
+    5271 Joyplim
+*/
+
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