From e3946aa12ffc3bc03b78e63ec82857b212ef82df Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sat, 18 Dec 2021 11:00:31 -0300
Subject: Add back Jande's Special Skill

---
 db/pre-re/skill_db.conf                | 19 +++++++++++++++++++
 db/pre-re/skill_tree.conf              |  1 +
 npc/082-3/poppet.txt                   | 10 +++++-----
 npc/functions/global_event_handler.txt |  1 +
 npc/magic/final.txt                    |  3 +++
 npc/magic/level1-summon-maggots.txt    | 11 +++++++++++
 6 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/db/pre-re/skill_db.conf b/db/pre-re/skill_db.conf
index 98f0ab73..a553cd9e 100644
--- a/db/pre-re/skill_db.conf
+++ b/db/pre-re/skill_db.conf
@@ -39366,5 +39366,24 @@ skill_db: (
 		Quest: true
 	}
 },
+{
+	Id: 20057
+	Name: "SKILL_JANDE"
+	Description: "Jande"
+	MaxLevel: 9
+	SkillType: {
+		Self: true
+	}
+	SkillInfo: {
+		Quest: true
+	}
+	CoolDown: 60000
+	Requirements: {
+		SPCost: 100
+		Items: {
+			TinyManaElixir: 0
+		}
+	}
+},
 )
 
diff --git a/db/pre-re/skill_tree.conf b/db/pre-re/skill_tree.conf
index 1a009ef3..ba2202ec 100644
--- a/db/pre-re/skill_tree.conf
+++ b/db/pre-re/skill_tree.conf
@@ -43,6 +43,7 @@ Talpan: {
 
 		//AC_SHOWER: 0
 		//MG_FIREWALL: 0
+		SKILL_JANDE: 5
 
 		// Base Class
 		SKILL_MAGIC: 0
diff --git a/npc/082-3/poppet.txt b/npc/082-3/poppet.txt
index 7f7c1d17..dabcabe2 100644
--- a/npc/082-3/poppet.txt
+++ b/npc/082-3/poppet.txt
@@ -133,12 +133,12 @@ OnTick:
     getitem XmasTicket, 1;
     end;
 
-OnTimer120000: // 2.0 min
-OnTimer240000: // 4.0 min
-OnTimer360000: // 6.0 min
-OnTimer450000: // 7.5 min
-OnTimer540000: // 9.0 min
 OnTimer600000: // 10.0 min (final)
+OnTimer540000: // 9.0 min
+OnTimer450000: // 7.5 min
+OnTimer360000: // 6.0 min
+OnTimer240000: // 4.0 min
+OnTimer120000: // 2.0 min
     maptimer("082-3", 10, "Poppet::OnTick");
 OnTimer1000:   // Initial wave
     /* Summon next wave */
diff --git a/npc/functions/global_event_handler.txt b/npc/functions/global_event_handler.txt
index f94e7fc8..ef02e017 100644
--- a/npc/functions/global_event_handler.txt
+++ b/npc/functions/global_event_handler.txt
@@ -9,6 +9,7 @@ OnPCLoginEvent:
     ClearVariables(); // removes / converts old variables
     DisplayMOTD(); // send the motd to the client, if enabled
     TMWBirthday();
+    skill SKILL_JANDE, 1, 0;
     // add more here
     vaultOnLogin();
     @login_event = 2;
diff --git a/npc/magic/final.txt b/npc/magic/final.txt
index ddd65f73..58f5e3bf 100644
--- a/npc/magic/final.txt
+++ b/npc/magic/final.txt
@@ -32,6 +32,9 @@ function	script	HUB_SkillInvoke	{
         case TMW2_FAKESKILL:
             charcommand("@refresh"); // Possibly broken on too up-to-date Herc
             break;
+        case SKILL_JANDE:
+            SK_Jande(); break;
+            break;
         // Level 0
         case SKILL_CONFRINGO:
             SK_Confringo(); break;
diff --git a/npc/magic/level1-summon-maggots.txt b/npc/magic/level1-summon-maggots.txt
index 7ca9f74d..b10505c9 100644
--- a/npc/magic/level1-summon-maggots.txt
+++ b/npc/magic/level1-summon-maggots.txt
@@ -13,3 +13,14 @@ function	script	SK_Kalmurk	{
     return;
 }
 
+function	script	SK_Jande	{
+    delitem TinyManaElixir, 1;
+    specialeffect(FX_MAGIC_MAGGOT_CAST, AREA, getcharid(3));
+    sleep2(cap_value(15400-AdjustSpellpower(100)-@skillLv*400, 10000, 15000));
+    .@lifetime=59+@skillLv;
+    .@lifetime = .@lifetime * (50 + abizit() * rand2(5,6)) / 100;
+    .@lifetime *= 1000;
+    summon("Summoned Monster", ManaGuard, .@lifetime);
+    return;
+}
+
-- 
cgit v1.2.3-60-g2f50