From 836f67d6033658db09ff15abca007ca6a14314a2 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Mon, 21 Oct 2019 14:43:31 -0300
Subject: Limerizer now uses new magic system

---
 npc/functions/hub.txt   |  3 +++
 npc/magic/limerizer.txt | 43 ++-----------------------------------------
 npc/magic/zarkor.txt    | 34 ----------------------------------
 3 files changed, 5 insertions(+), 75 deletions(-)

(limited to 'npc')

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