add anti-betsanc spell

3 files changed, 31 insertions, 2 deletions

diff --git a/world/map/npc/magic/_import.txt b/world/map/npc/magic/_import.txt
index e99d14dd..e5d40947 100644
--- a/world/map/npc/magic/_import.txt
+++ b/world/map/npc/magic/_import.txt
@@ -1,4 +1,5 @@
 npc: npc/magic/_procedures.txt
+npc: npc/magic/level0-antiprotect.txt
 npc: npc/magic/level0-discharge.txt
 npc: npc/magic/level0-wand.txt
 npc: npc/magic/level1-aggravate.txt
diff --git a/world/map/npc/magic/level0-antiprotect.txt b/world/map/npc/magic/level0-antiprotect.txt
new file mode 100644
index 00000000..8e9b700c
--- /dev/null
+++ b/world/map/npc/magic/level0-antiprotect.txt
@@ -0,0 +1,26 @@
+-|script|antiprotect|32767
+{
+    if(call("magic_checks")) end;
+    callfunc "magic_exp";
+
+    if (@antiprotect)
+        goto L_Disable;
+
+    sc_end SC_PHYS_SHIELD;
+    message strcharinfo(0), "Shield : You are now protected against betsanc until you cast detsanc again or logout.";
+    set @antiprotect, 1;
+    end;
+
+L_Disable:
+    message strcharinfo(0), "Shield : You are no longer protected against betsanc.";
+    set @antiprotect, 0;
+    end;
+
+OnInit:
+    set .school, SKILL_MAGIC_NATURE;
+    set .invocation$, chr(MAGIC_SYMBOL) + "detsanc"; // used in npcs that refer to this spell
+    void call("magic_register");
+    set .level, 0;
+    set .exp_gain, 0;
+    end;
+}
diff --git a/world/map/npc/magic/level2-protect.txt b/world/map/npc/magic/level2-protect.txt
index a3096ad7..db11105f 100644
--- a/world/map/npc/magic/level2-protect.txt
+++ b/world/map/npc/magic/level2-protect.txt
@@ -5,7 +5,7 @@
     set .@level, getskilllv(.school);
     if (.@level < .level) end;
     if (getskilllv(SKILL_MAGIC) < .level) end;
-    if (.@level <= 3 && countitem("HardSpike") >= 1) delitem "HardSpike", 1;
+    if (.@level <= 3 && countitem("HardSpike") < 1) end;
     elif (.@level <= 3) end;
     set @target_id, getcharid(3, @args$);
     if (@target_id < 1 || !(isloggedin(@target_id)) || get(INVISIBLE, @target_id))
@@ -17,6 +17,9 @@
     if (attachrid(@betsanc_caster) != 1) end;
     if (@target_hat == 888) end; // FIXME: this whole 5 line block could be done with only one line if we modify getequipid
 
+    if (distance(BL_ID, @target_id) >= (@spellpower/30)+2) set @target_id, BL_ID;
+    if (get(@antiprotect, @target_id) > 0) end;
+    delitem "HardSpike", 1;
     set @_M_BLOCK, 1; // block casting, until the timer clears it
     addtimer 1500, "Magic Timer::OnClear"; // set the new debuff
     callfunc "adjust_spellpower";
@@ -24,7 +27,6 @@
     misceffect FX_MAGIC_GREEN, strcharinfo(0);
     callfunc "magic_exp";
 
-    if (distance(BL_ID, @target_id) >= (@spellpower/30)+2) set @target_id, BL_ID;
     if (BL_ID == @target_id) set @args$, strcharinfo(0);
     misceffect FX_MAGIC_SHIELD, @args$;
     set .@time, (@spellpower*1000)+5000;