fix spell names for puppets

8 files changed, 9 insertions, 8 deletions

diff --git a/world/map/npc/magic/_procedures.txt b/world/map/npc/magic/_procedures.txt
index 5f1ea865..57a83fa9 100644
--- a/world/map/npc/magic/_procedures.txt
+++ b/world/map/npc/magic/_procedures.txt
@@ -12,7 +12,7 @@ function|script|magic_register
 function|script|magic_checks
 {
     set .@r, 0;
-    if(getpvpflag(1)) set .@r, 1;
+    if(getpvpflag(1)) set .@r, 1; // FIXME: make HIDDEN into a param
     if((gettimetick(2) - MAGIC_CAST_TICK) < 0) set .@r, 2; // check if last debuff ended
     if(Hp < 1) set .@r, 3; // can not cast when dead
     return .@r;
diff --git a/world/map/npc/magic/level1-experience.txt b/world/map/npc/magic/level1-experience.txt
index 323abc54..2c283eaa 100644
--- a/world/map/npc/magic/level1-experience.txt
+++ b/world/map/npc/magic/level1-experience.txt
@@ -8,6 +8,7 @@
     callfunc "adjust_spellpower";
     set Sp, Sp - 1;
     misceffect FX_MAGIC_GENERIC, strcharinfo(0);
+    callfunc "magic_exp";
     set @ratio, ((@last_exp*10) - rand(.MAX_MAGIC_EXP[@level]/30))/.MAX_MAGIC_EXP[@level];
 
                      set @mes$, "You feel completely overwhelmed by your magic.";
diff --git a/world/map/npc/magic/level2-barrier.txt b/world/map/npc/magic/level2-barrier.txt
index d692bee1..8d74414a 100644
--- a/world/map/npc/magic/level2-barrier.txt
+++ b/world/map/npc/magic/level2-barrier.txt
@@ -1,4 +1,4 @@
--|script|barrier|32767
+-|script|magic barrier|32767
 {
     if(call("magic_checks")) end; // << I wish we had functions that could return >>
     if (Sp < 15) end;
@@ -14,7 +14,7 @@
     if (attachrid(@target_id) != 1) end;
     set @target_hat, getequipid(equip_head), @asorm_caster;
     if (attachrid(@asorm_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 (@target_hat == 888) end; // FIXME: this whole 5 line block could be done with only one line if we modify getequipid OR make equip_ into params
 
     set MAGIC_CAST_TICK, gettimetick(2) + 1; // set the new debuff
     callfunc "adjust_spellpower";
diff --git a/world/map/npc/magic/level2-summon-fluffies.txt b/world/map/npc/magic/level2-summon-fluffies.txt
index 77f21fab..32fcd750 100644
--- a/world/map/npc/magic/level2-summon-fluffies.txt
+++ b/world/map/npc/magic/level2-summon-fluffies.txt
@@ -1,4 +1,4 @@
--|script|summon-fluffies|32767
+-|script|smfluffies|32767
 {
     end;
 
diff --git a/world/map/npc/magic/level2-summon-mouboo.txt b/world/map/npc/magic/level2-summon-mouboo.txt
index 13b51ae6..5055362f 100644
--- a/world/map/npc/magic/level2-summon-mouboo.txt
+++ b/world/map/npc/magic/level2-summon-mouboo.txt
@@ -1,4 +1,4 @@
--|script|summon-mouboo|32767
+-|script|smmouboo|32767
 {
     end;
 
diff --git a/world/map/npc/magic/level2-summon-pinkie.txt b/world/map/npc/magic/level2-summon-pinkie.txt
index a3949c78..f4716749 100644
--- a/world/map/npc/magic/level2-summon-pinkie.txt
+++ b/world/map/npc/magic/level2-summon-pinkie.txt
@@ -1,4 +1,4 @@
--|script|summon-pinkie|32767
+-|script|smpinkie|32767
 {
     end;
 
diff --git a/world/map/npc/magic/level2-summon-spiky-mushroom.txt b/world/map/npc/magic/level2-summon-spiky-mushroom.txt
index b39c53ad..97d916b0 100644
--- a/world/map/npc/magic/level2-summon-spiky-mushroom.txt
+++ b/world/map/npc/magic/level2-summon-spiky-mushroom.txt
@@ -1,4 +1,4 @@
--|script|summon-spiky-mushrooms|32767
+-|script|smsmushrooms|32767
 {
     end;
 
diff --git a/world/map/npc/magic/level2-summon-wickedmushroom.txt b/world/map/npc/magic/level2-summon-wickedmushroom.txt
index 46e608a6..3960437a 100644
--- a/world/map/npc/magic/level2-summon-wickedmushroom.txt
+++ b/world/map/npc/magic/level2-summon-wickedmushroom.txt
@@ -1,4 +1,4 @@
--|script|summon-wickedmushroom|32767
+-|script|smwmushroom|32767
 {
     end;