From 3dc0e0423bb17cd1a13830afc15e13521912d10c Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Mon, 21 Oct 2019 14:50:26 -0300
Subject: Kalwurf used a cooldown based on abizit; Now it uses the new magic
 system

---
 db/re/skill_db.conf   | 29 +++++++++++++++++++++++++++++
 npc/functions/hub.txt |  5 ++++-
 npc/magic/kalwulf.txt | 44 ++------------------------------------------
 3 files changed, 35 insertions(+), 43 deletions(-)

diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index c822c00de..bbb07a4e5 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -38864,6 +38864,35 @@ skill_db: (
 	SkillInfo: {
 		Quest: true
 	}
+	CoolDown: {
+		Lv1: 45000
+		Lv2: 44000
+		Lv3: 43000
+		Lv4: 42000
+		Lv5: 41000
+		Lv6: 40000
+		Lv7: 38000
+		Lv8: 37000
+		Lv9: 36000
+		Lv10: 35000
+	}
+	Requirements: {
+		SPCost: {
+			Lv1: 45
+			Lv2: 50
+			Lv3: 55
+			Lv4: 60
+			Lv5: 65
+			Lv6: 70
+			Lv7: 75
+			Lv8: 80
+			Lv9: 85
+			Lv10: 90
+		}
+		Items: {
+			WhiteFur: 5
+		}
+	}
 },
 {
 	Id: 20038
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index d6b597a42..027c04887 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -213,7 +213,10 @@ function	script	HUB_SkillInvoke	{
             {
                 .@mobId=MountainSnake;        
             }
-            SK_summon(.@mobId, 2, 4, any(3,4));
+            SK_summon(.@mobId, 4, any(3,4));
+            break;
+        case TMW2_KALWURF:
+            SK_summon(Wolvern, 4, any(3,4));
             break;
     }
 
diff --git a/npc/magic/kalwulf.txt b/npc/magic/kalwulf.txt
index dc5b3e0f8..b3eae31fb 100644
--- a/npc/magic/kalwulf.txt
+++ b/npc/magic/kalwulf.txt
@@ -9,48 +9,8 @@
     end;
 
 OnCall:
-    // Other requeriments: 5x White Fur
-    if (countitem(WhiteFur) < 5) {
-        dispbottom l("You need 5x @@ to cast this skill.", getitemlink(WhiteFur));
-        end;
-    }
-
-    // Check cooldown
-    if (@kalwurf_at > gettimetick(2)) {
-        dispbottom l("Skill is in cooldown for @@.", FuzzyTime(@kalwurf_at));
-        end;
-    }
-
-    // Setup
-    @sk=TMW2_KALWURF;
-    @mp=45;
-    @amp=5;
-
-    // Check if you have mana to cast
-    // MagicCheck(SkillID, Mana{, MP per level})
-    if (!MagicCheck(@sk, @mp, @amp))
-        end;
-
-    // Destroy reagents
-    delitem WhiteFur, 5;
-
-    // set cooldown
-    @kalwurf_at=gettimetick(2);
-    @kalwurf_at=@kalwurf_at+47-abizit();
-
-    // As usual, magic profeciency affects success ratio
-    if (rand(1,6) < abizit()+1) {
-        .@mobId=Wolvern;
-        // Summon Magic
-        // SummonMagic(SkillID, MobID{, SkillLevelPerMob=2{, Level Override}})
-        SummonMagic(@sk, .@mobId, 4, MAGIC_LVL+getskilllv(@sk)-1);
-    } else {
-        dispbottom l("The spell fails!");
-    }
-
-    // Get 3~4 mana experience point (this is NOT used by Mana Stone)
-    GetManaExp(@sk, rand(3,4));
-
+    // Deprecated
+    dispbottom l("The usage of @sk-commands was deprecated");
     end;
 
 OnInit:
-- 
cgit v1.2.3-60-g2f50