From f377bbc7cbce73b49ec708d951780d4efc0ac6f7 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Mon, 16 Jul 2018 11:34:01 -0300
Subject: Remove magic check from SummonMagic

---
 npc/magic/kalmurk.txt | 14 ++++++++++++--
 npc/magic/zarkor.txt  | 16 +++++++++++++---
 2 files changed, 25 insertions(+), 5 deletions(-)

(limited to 'npc/magic')

diff --git a/npc/magic/kalmurk.txt b/npc/magic/kalmurk.txt
index 11d1859df..8bd9f7f45 100644
--- a/npc/magic/kalmurk.txt
+++ b/npc/magic/kalmurk.txt
@@ -30,9 +30,19 @@ OnCall:
         end;
     }
 
+    // Setup
+    .@sk=TMW2_KALMURK;
+    .@mp=200;
+    .@amp=50;
+
+    // Check if you have mana to cast
+    // MagicCheck(SkillID, Mana{, MP per level})
+    if (!MagicCheck(.@sk, .@mp, .@amp))
+        end;
+
     // Summon Magic
-    // SummonMagic( SkillID, Mana, MobID{, MP per level, MobPerSkillLevel=2},{Lvl Override} )
-    SummonMagic(TMW2_KALMURK, 200, Maggot, 50, 2, (MAGIC_LVL-1));
+    SummonMagic(.@sk, CaveMaggot, 2);
+
     delitem MaggotSlime, 2;
 
     // Get a single mana experience point (this is NOT used by Soul Menhir)
diff --git a/npc/magic/zarkor.txt b/npc/magic/zarkor.txt
index 18718c811..301e74565 100644
--- a/npc/magic/zarkor.txt
+++ b/npc/magic/zarkor.txt
@@ -31,11 +31,21 @@ OnCall:
         end;
     }
 
+    // Setup
+    .@sk=TMW2_ZARKOR;
+    .@mp=400;
+    .@amp=75;
+
+    // Check if you have mana to cast
+    // MagicCheck(SkillID, Mana{, MP per level})
+    if (!MagicCheck(.@sk, .@mp, .@amp))
+        end;
+
     // Summon Magic
-    SummonMagic(TMW2_ZARKOR, 400, CaveMaggot, 75, 2);
+    SummonMagic(.@sk, CaveMaggot, 2);
 
-    // Get a single mana experience point (this is NOT used by Soul Menhir)
-    GetManaExp(TMW2_ZARKOR, 1);
+    // Get a single mana experience point (this is NOT used by Mana Stone)
+    GetManaExp(.@sk, 1);
 
     /*
     // set cooldown
-- 
cgit v1.2.3-60-g2f50