only require base magic skill for level 1 spells

12 files changed, 21 insertions, 21 deletions

diff --git a/world/map/npc/magic/level1-aggravate.txt b/world/map/npc/magic/level1-aggravate.txt
index 5b3d5674..05474a2a 100644
--- a/world/map/npc/magic/level1-aggravate.txt
+++ b/world/map/npc/magic/level1-aggravate.txt
@@ -1,8 +1,8 @@
 -|script|spell-aggravate|32767
 {
-    if(call("magic_checks")) end; 
+    if(call("magic_checks")) end;
     if (Sp < 3) end;
-    if (getskilllv(.school) < .level) end;
+    if (getskilllv(SKILL_MAGIC) < .level) end;
     set @_M_BLOCK, 1; // block casting, until the timer clears it
     addtimer 1000, "Magic Timer::OnClear"; // set the new debuff
     set @args$, ""; callfunc "adjust_spellpower"; // we reset @args$ because this spell should not have a target
diff --git a/world/map/npc/magic/level1-detect-magic.txt b/world/map/npc/magic/level1-detect-magic.txt
index e975e952..f0c01592 100644
--- a/world/map/npc/magic/level1-detect-magic.txt
+++ b/world/map/npc/magic/level1-detect-magic.txt
@@ -1,8 +1,8 @@
 -|script|detect-magic|32767
 {
-    if(call("magic_checks")) end; 
+    if(call("magic_checks")) end;
     if (Sp < 3) end;
-    if (getskilllv(.school) < .level) end;
+    if (getskilllv(SKILL_MAGIC) < .level) end;
     set @_M_BLOCK, 1; // block casting, until the timer clears it
     addtimer 6000, "Magic Timer::OnClear"; // set the new debuff
     callfunc "adjust_spellpower";
diff --git a/world/map/npc/magic/level1-flare-dart.txt b/world/map/npc/magic/level1-flare-dart.txt
index 29a4f3c1..2f17c499 100644
--- a/world/map/npc/magic/level1-flare-dart.txt
+++ b/world/map/npc/magic/level1-flare-dart.txt
@@ -3,7 +3,7 @@
     if(call("magic_checks")) end;
     if (Sp < 10) end;
     set @level, getskilllv(.school);
-    if (@level < .level) end;
+    if (getskilllv(SKILL_MAGIC) < .level) end;
     if (@level <= 2 && countitem("SulphurPowder") >= 1) delitem "SulphurPowder", 1;
     elif (@level <= 2) end;
     set @_M_BLOCK, 1; // block casting, until the timer clears it
diff --git a/world/map/npc/magic/level1-grow-alizarin.txt b/world/map/npc/magic/level1-grow-alizarin.txt
index bc88380d..601f32c2 100644
--- a/world/map/npc/magic/level1-grow-alizarin.txt
+++ b/world/map/npc/magic/level1-grow-alizarin.txt
@@ -1,8 +1,8 @@
 -|script|grow-alizarin|32767
 {
-    if(call("magic_checks")) end; 
+    if(call("magic_checks")) end;
     if (Sp < 4) end;
-    if (getskilllv(.school) < .level) end;
+    if (getskilllv(SKILL_MAGIC) < .level) end;
     if (countitem("AlizarinHerb") < 1 || countitem("Root") < 1) end;
     delitem "AlizarinHerb", 1;
     delitem "Root", 1;
diff --git a/world/map/npc/magic/level1-grow-cobalt.txt b/world/map/npc/magic/level1-grow-cobalt.txt
index cc7d1b33..78ab602a 100644
--- a/world/map/npc/magic/level1-grow-cobalt.txt
+++ b/world/map/npc/magic/level1-grow-cobalt.txt
@@ -1,8 +1,8 @@
 -|script|grow-cobalt|32767
 {
-    if(call("magic_checks")) end; 
+    if(call("magic_checks")) end;
     if (Sp < 4) end;
-    if (getskilllv(.school) < .level) end;
+    if (getskilllv(SKILL_MAGIC) < .level) end;
     if (countitem("CobaltHerb") < 1 || countitem("Root") < 1) end;
     delitem "CobaltHerb", 1;
     delitem "Root", 1;
diff --git a/world/map/npc/magic/level1-grow-gamboge.txt b/world/map/npc/magic/level1-grow-gamboge.txt
index 559c99e8..eda23f70 100644
--- a/world/map/npc/magic/level1-grow-gamboge.txt
+++ b/world/map/npc/magic/level1-grow-gamboge.txt
@@ -1,8 +1,8 @@
 -|script|grow-gamboge|32767
 {
-    if(call("magic_checks")) end; 
+    if(call("magic_checks")) end;
     if (Sp < 4) end;
-    if (getskilllv(.school) < .level) end;
+    if (getskilllv(SKILL_MAGIC) < .level) end;
     if (countitem("GambogeHerb") < 1 || countitem("Root") < 1) end;
     delitem "GambogeHerb", 1;
     delitem "Root", 1;
diff --git a/world/map/npc/magic/level1-grow-mauve.txt b/world/map/npc/magic/level1-grow-mauve.txt
index 5ae266e2..951b71f0 100644
--- a/world/map/npc/magic/level1-grow-mauve.txt
+++ b/world/map/npc/magic/level1-grow-mauve.txt
@@ -1,8 +1,8 @@
 -|script|grow-mauve|32767
 {
-    if(call("magic_checks")) end; 
+    if(call("magic_checks")) end;
     if (Sp < 4) end;
-    if (getskilllv(.school) < .level) end;
+    if (getskilllv(SKILL_MAGIC) < .level) end;
     if (countitem("MauveHerb") < 1 || countitem("Root") < 1) end;
     delitem "MauveHerb", 1;
     delitem "Root", 1;
diff --git a/world/map/npc/magic/level1-lesser-heal.txt b/world/map/npc/magic/level1-lesser-heal.txt
index 17f48b95..fcd9897a 100644
--- a/world/map/npc/magic/level1-lesser-heal.txt
+++ b/world/map/npc/magic/level1-lesser-heal.txt
@@ -2,7 +2,7 @@
 {
     if(call("magic_checks")) end;
     if (Sp < 6) end;
-    if (getskilllv(.school) < .level) end;
+    if (getskilllv(SKILL_MAGIC) < .level) end;
     set @target_id, getcharid(3, @args$);
     if (@target_id < 1 || !(isloggedin(@target_id))) set @target_id, BL_ID; // fallback to self
     if (@args$ == "Mouboo" || @args$ == "mouboo") set @target_id, getnpcid("Mouboo");
diff --git a/world/map/npc/magic/level1-magic-blade.txt b/world/map/npc/magic/level1-magic-blade.txt
index 954675fe..262a08a1 100644
--- a/world/map/npc/magic/level1-magic-blade.txt
+++ b/world/map/npc/magic/level1-magic-blade.txt
@@ -3,7 +3,7 @@
     if(call("magic_checks")) end;
     if (Sp < 9) end;
     set .@level, getskilllv(.school);
-    if (.@level < .level) end;
+    if (getskilllv(SKILL_MAGIC) < .level) end;
     set @chiza_component$, "";
     if   (.@level <= 2 && countitem("SharpKnife") >= 1) set @chiza_component$, "SharpKnife";
     elif (.@level <= 2 && countitem("Knife") >= 1)      set @chiza_component$, "Knife";
diff --git a/world/map/npc/magic/level1-make-sulphur.txt b/world/map/npc/magic/level1-make-sulphur.txt
index a181d057..4aab7e3b 100644
--- a/world/map/npc/magic/level1-make-sulphur.txt
+++ b/world/map/npc/magic/level1-make-sulphur.txt
@@ -1,8 +1,8 @@
 -|script|make-sulphur|32767
 {
-    if(call("magic_checks")) end; 
+    if(call("magic_checks")) end;
     if (Sp < 4) end;
-    if (getskilllv(.school) < .level) end;
+    if (getskilllv(SKILL_MAGIC) < .level) end;
     if (countitem("PileOfAsh") >= 1) delitem "PileOfAsh", 1; else end;
     set @_M_BLOCK, 1; // block casting, until the timer clears it
     addtimer 4000, "Magic Timer::OnClear"; // set the new debuff
diff --git a/world/map/npc/magic/level1-summon-maggots.txt b/world/map/npc/magic/level1-summon-maggots.txt
index 5daddd8a..aa4e646f 100644
--- a/world/map/npc/magic/level1-summon-maggots.txt
+++ b/world/map/npc/magic/level1-summon-maggots.txt
@@ -3,9 +3,9 @@
     end;
 
 OnCast:
-    if(call("magic_checks")) end; 
+    if(call("magic_checks")) end;
     if (Sp < 21) end;
-    if (getskilllv(.school) < .level) end;
+    if (getskilllv(SKILL_MAGIC) < .level) end;
     if (countitem("MaggotSlime") < 1 || countitem("Root") < 1) end;
     delitem "MaggotSlime", 1;
     delitem "Root", 1;
diff --git a/world/map/npc/magic/level1-transmute-wood.txt b/world/map/npc/magic/level1-transmute-wood.txt
index 935ed2fa..a7c86ecc 100644
--- a/world/map/npc/magic/level1-transmute-wood.txt
+++ b/world/map/npc/magic/level1-transmute-wood.txt
@@ -1,8 +1,8 @@
 -|script|spell-transmute-wood|32767
 {
-    if(call("magic_checks")) end; 
+    if(call("magic_checks")) end;
     if (Sp < 5) end;
-    if (getskilllv(.school) < .level) end;
+    if (getskilllv(SKILL_MAGIC) < .level) end;
     if (countitem("RawLog") >= 1) delitem "RawLog", 1; else end;
     set @_M_BLOCK, 1; // block casting, until the timer clears it
     addtimer 4000, "Magic Timer::OnClear"; // set the new debuff