Merge pull request #492 from mekolat/puppet-checks

Puppet checks

9 files changed, 15 insertions, 6 deletions

diff --git a/world/map/npc/magic/level1-summon-maggots.txt b/world/map/npc/magic/level1-summon-maggots.txt
index aa4e646f..49022635 100644
--- a/world/map/npc/magic/level1-summon-maggots.txt
+++ b/world/map/npc/magic/level1-summon-maggots.txt
@@ -18,6 +18,7 @@ OnCast:
     callfunc "magic_exp";
     set .@puppet$, "#"+strnpcinfo(0)+"#"+BL_ID;
     set .@puppet, puppet(getmap(), POS_X, POS_Y, .@puppet$, 127);
+    if (.@puppet < 1) end;
     set .count, ((sqrt(@spellpower)+(@spellpower/15))/5)+1, .@puppet;
     set .master, BL_ID, .@puppet;
     set .lifetime, (@spellpower*50)+10000, .@puppet;
diff --git a/world/map/npc/magic/level2-arrow-hail.txt b/world/map/npc/magic/level2-arrow-hail.txt
index c7deb852..35cd584e 100644
--- a/world/map/npc/magic/level2-arrow-hail.txt
+++ b/world/map/npc/magic/level2-arrow-hail.txt
@@ -32,6 +32,7 @@ OnCast:
     callfunc "magic_exp";
     misceffect FX_MAGIC_BLACK, strcharinfo(0);
     set @spell_npc, puppet(getmap(), POS_X, POS_Y, @new_npc_name$, 127); // clone npc => get puppet id
+    if (@spell_npc < 1) end;
     set .max_hit, (@spellpower / 8), @spell_npc; // set .max_hit in the puppet
     set .caster, getcharid(3), @spell_npc; // tell the puppet who controls it
     set .damage, 125, @spell_npc;
diff --git a/world/map/npc/magic/level2-rain.txt b/world/map/npc/magic/level2-rain.txt
index 9a498c08..9e62782d 100644
--- a/world/map/npc/magic/level2-rain.txt
+++ b/world/map/npc/magic/level2-rain.txt
@@ -29,6 +29,7 @@ OnCast:
     callfunc "magic_exp";
     misceffect FX_MAGIC_GREEN, strcharinfo(0);
     set @spell_npc, puppet(getmap(), POS_X, POS_Y, @new_npc_name$, 127); // clone npc => get puppet id
+    if (@spell_npc < 1) end;
     set .caster, getcharid(3), @spell_npc; // tell the puppet who controls it
     set .radius, @krad, @spell_npc; // this is also used by ingrav, don't rename
     set .initial_x, POS_X, @spell_npc;
diff --git a/world/map/npc/magic/level2-summon-fluffies.txt b/world/map/npc/magic/level2-summon-fluffies.txt
index cd754e33..2ca630ed 100644
--- a/world/map/npc/magic/level2-summon-fluffies.txt
+++ b/world/map/npc/magic/level2-summon-fluffies.txt
@@ -3,7 +3,7 @@
     end;
 
 OnCast:
-    if(call("magic_checks")) end; 
+    if(call("magic_checks")) end;
     if (Sp < 39) end;
     if (getskilllv(SKILL_MAGIC) < .level) end;
     if (getskilllv(.school) < .level) end;
@@ -19,6 +19,7 @@ OnCast:
     callfunc "magic_exp";
     set .@puppet$, "#"+strnpcinfo(0)+"#"+BL_ID;
     set .@puppet, puppet(getmap(), POS_X, POS_Y, .@puppet$, 127);
+    if (.@puppet < 1) end;
     set .count, (@spellpower/170)+1+(@spellpower/430), .@puppet;
     set .master, BL_ID, .@puppet;
     set .lifetime, @spellpower*350, .@puppet;
diff --git a/world/map/npc/magic/level2-summon-mouboo.txt b/world/map/npc/magic/level2-summon-mouboo.txt
index 8eb074c6..f6a68fcf 100644
--- a/world/map/npc/magic/level2-summon-mouboo.txt
+++ b/world/map/npc/magic/level2-summon-mouboo.txt
@@ -3,7 +3,7 @@
     end;
 
 OnCast:
-    if(call("magic_checks")) end; 
+    if(call("magic_checks")) end;
     if (Sp < 35) end;
     if (getskilllv(SKILL_MAGIC) < .level) end;
     if (getskilllv(.school) < .level) end;
@@ -19,6 +19,7 @@ OnCast:
     callfunc "magic_exp";
     set .@puppet$, "#"+strnpcinfo(0)+"#"+BL_ID;
     set .@puppet, puppet(getmap(), POS_X, POS_Y, .@puppet$, 127);
+    if (.@puppet < 1) end;
     set .count, (@spellpower/270)+1, .@puppet;
     set .master, BL_ID, .@puppet;
     set .lifetime, @spellpower*100, .@puppet;
diff --git a/world/map/npc/magic/level2-summon-pinkie.txt b/world/map/npc/magic/level2-summon-pinkie.txt
index b91ec1d9..785c8364 100644
--- a/world/map/npc/magic/level2-summon-pinkie.txt
+++ b/world/map/npc/magic/level2-summon-pinkie.txt
@@ -3,7 +3,7 @@
     end;
 
 OnCast:
-    if(call("magic_checks")) end; 
+    if(call("magic_checks")) end;
     if (Sp < 35) end;
     if (getskilllv(SKILL_MAGIC) < .level) end;
     if (getskilllv(.school) < .level) end;
@@ -19,6 +19,7 @@ OnCast:
     callfunc "magic_exp";
     set .@puppet$, "#"+strnpcinfo(0)+"#"+BL_ID;
     set .@puppet, puppet(getmap(), POS_X, POS_Y, .@puppet$, 127);
+    if (.@puppet < 1) end;
     set .count, (@spellpower/120)+1, .@puppet;
     set .master, BL_ID, .@puppet;
     set .lifetime, @spellpower*150, .@puppet;
diff --git a/world/map/npc/magic/level2-summon-snakes.txt b/world/map/npc/magic/level2-summon-snakes.txt
index 7490c506..2c46f28b 100644
--- a/world/map/npc/magic/level2-summon-snakes.txt
+++ b/world/map/npc/magic/level2-summon-snakes.txt
@@ -3,7 +3,7 @@
     end;
 
 OnCast:
-    if(call("magic_checks")) end; 
+    if(call("magic_checks")) end;
     if (Sp < 40) end;
     if (getskilllv(SKILL_MAGIC) < .level) end;
     if (getskilllv(.school) < .level) end;
@@ -20,6 +20,7 @@ OnCast:
     callfunc "magic_exp";
     set .@puppet$, "#"+strnpcinfo(0)+"#"+BL_ID;
     set .@puppet, puppet(getmap(), POS_X, POS_Y, .@puppet$, 127);
+    if (.@puppet < 1) end;
     set .count, (@spellpower/300)+1, .@puppet;
     set .master, BL_ID, .@puppet;
     set .lifetime, @spellpower*80, .@puppet;
diff --git a/world/map/npc/magic/level2-summon-spiky-mushroom.txt b/world/map/npc/magic/level2-summon-spiky-mushroom.txt
index 39ad9ecd..5659fc32 100644
--- a/world/map/npc/magic/level2-summon-spiky-mushroom.txt
+++ b/world/map/npc/magic/level2-summon-spiky-mushroom.txt
@@ -3,7 +3,7 @@
     end;
 
 OnCast:
-    if(call("magic_checks")) end; 
+    if(call("magic_checks")) end;
     if (Sp < 33) end;
     if (getskilllv(SKILL_MAGIC) < .level) end;
     if (getskilllv(.school) < .level) end;
@@ -19,6 +19,7 @@ OnCast:
     callfunc "magic_exp";
     set .@puppet$, "#"+strnpcinfo(0)+"#"+BL_ID;
     set .@puppet, puppet(getmap(), POS_X, POS_Y, .@puppet$, 127);
+    if (.@puppet < 1) end;
     set .count, (@spellpower/120)+1, .@puppet;
     set .master, BL_ID, .@puppet;
     set .lifetime, @spellpower*400, .@puppet;
diff --git a/world/map/npc/magic/level2-summon-wickedmushroom.txt b/world/map/npc/magic/level2-summon-wickedmushroom.txt
index df17742f..02442c6b 100644
--- a/world/map/npc/magic/level2-summon-wickedmushroom.txt
+++ b/world/map/npc/magic/level2-summon-wickedmushroom.txt
@@ -3,7 +3,7 @@
     end;
 
 OnCast:
-    if(call("magic_checks")) end; 
+    if(call("magic_checks")) end;
     if (Sp < 35) end;
     if (getskilllv(SKILL_MAGIC) < .level) end;
     if (getskilllv(.school) < .level) end;
@@ -20,6 +20,7 @@ OnCast:
     callfunc "magic_exp";
     set .@puppet$, "#"+strnpcinfo(0)+"#"+BL_ID;
     set .@puppet, puppet(getmap(), POS_X, POS_Y, .@puppet$, 127);
+    if (.@puppet < 1) end;
     set .count, (@spellpower/250)+1, .@puppet;
     set .master, BL_ID, .@puppet;
     set .lifetime, @spellpower*80, .@puppet;