Limerizer now uses new magic system

4 files changed, 35 insertions, 76 deletions

diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index d55eb0980..d188cb139 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -38671,7 +38671,7 @@ skill_db: (
 	Description: "Increased Mana Exp Gain"
 	MaxLevel: 10
 	SkillType: {
-		Self: true
+		Passive: true
 	}
 	SkillInfo: {
 		Quest: true
@@ -38724,6 +38724,35 @@ skill_db: (
 	SkillInfo: {
 		Quest: true
 	}
+	CoolDown: {
+		Lv1: 54000
+		Lv2: 53000
+		Lv3: 52000
+		Lv4: 51000
+		Lv5: 50000
+		Lv6: 49000
+		Lv7: 48000
+		Lv8: 47000
+		Lv9: 46000
+		Lv10: 45000
+	}
+	Requirements: {
+		SPCost: {
+			Lv1: 30
+			Lv2: 33
+			Lv3: 36
+			Lv4: 39
+			Lv5: 42
+			Lv6: 45
+			Lv7: 48
+			Lv8: 51
+			Lv9: 54
+			Lv10: 57
+		}
+		Items: {
+			MaggotSlime: 20
+		}
+	}
 },
 // Debug: 20031~20035
 {
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index 283bbb044..50f22b33c 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -202,6 +202,9 @@ function	script	HUB_SkillInvoke	{
         case TMW2_KALMURK:
             SK_summon(Maggot, 2, abizit()+1);
             break;
+        case TMW2_LIMERIZER:
+            SK_summon(any(GreenSlime,AzulSlime,RedSlime,AngryYellowSlime), 2, any(3,4));
+            break;
     }
 
     // Debug
diff --git a/npc/magic/limerizer.txt b/npc/magic/limerizer.txt
index cbf961387..03560d92b 100644
--- a/npc/magic/limerizer.txt
+++ b/npc/magic/limerizer.txt
@@ -9,47 +9,8 @@
     end;
 
 OnCall:
-    // Other requeriments: 20x Maggot Slime
-    if (countitem(MaggotSlime) < 20) {
-        dispbottom l("You need 20x @@ to cast this skill.", getitemlink(MaggotSlime));
-        end;
-    }
-
-    // Check cooldown
-    if (@limerizer_at > gettimetick(2)) {
-        dispbottom l("Skill is in cooldown for @@.", FuzzyTime(@limerizer_at));
-        end;
-    }
-
-    // Setup
-    @sk=TMW2_LIMERIZER;
-    @mp=30;
-    @amp=3;
-
-    // Check if you have mana to cast
-    // MagicCheck(SkillID, Mana{, MP per level})
-    if (!MagicCheck(@sk, @mp, @amp))
-        end;
-
-    // Destroy reagents
-    delitem MaggotSlime, 20;
-
-    // set cooldown
-    @limerizer_at=gettimetick(2);
-    @limerizer_at=@limerizer_at+54;
-
-    // As usual, magic profeciency affects
-    if (rand(1,6) < abizit()+1) {
-        // Summon Magic
-        // SummonMagic(SkillID, MobID{, SkillLevelPerMob=2{, Level Override}})
-        SummonMagic(@sk, any(GreenSlime,AzulSlime,RedSlime,AngryYellowSlime), 2, 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:
diff --git a/npc/magic/zarkor.txt b/npc/magic/zarkor.txt
index 9763189bb..4f63cace4 100644
--- a/npc/magic/zarkor.txt
+++ b/npc/magic/zarkor.txt
@@ -32,40 +32,6 @@ OnCall:
     dispbottom l("The usage of @sk-commands was deprecated");
     end;
 
-    // Other requeriments
-    if (countitem(ZarkorScroll) < 1) {
-        dispbottom l("You need @@ to cast this skill.", getitemlink(ZarkorScroll));
-        end;
-    }
-
-    // Check cooldown
-    // This will vanish upon logout =/
-    if (@zark_at > gettimetick(2)) {
-        dispbottom l("Skill is in cooldown for @@.", FuzzyTime(@zark_at));
-        end;
-    }
-
-    // Setup
-    @sk=TMW2_ZARKOR;
-    @mp=40;
-    @amp=7;
-
-    // Check if you have mana to cast
-    // MagicCheck(SkillID, Mana{, MP per level})
-    if (!MagicCheck(@sk, @mp, @amp))
-        end;
-
-    // Summon Magic
-    SummonMagic(@sk, CaveMaggot, 2);
-
-    // Get a single mana experience point (this is NOT used by Mana Stone)
-    GetManaExp(@sk, 1);
-
-    // set cooldown
-    @zark_at=gettimetick(2);
-    @zark_at=@zark_at+80;
-    end;
-
 OnInit:
     bindatcmd "sk-zarkor", "sk#zarkor::OnCall", 0, 100, 0;
     end;