summaryrefslogtreecommitdiff
path: root/world/map/npc/magic/level2-summon-pinkie.txt
diff options
context:
space:
mode:
authormekolat <mekolat@users.noreply.github.com>2016-05-02 16:17:50 -0400
committermekolat <mekolat@users.noreply.github.com>2016-05-02 16:17:50 -0400
commitf8924867ee3e1020cb9fc73df98c22218a52ad2f (patch)
tree22bde1b4723e9a653722afd898354c3ef422e034 /world/map/npc/magic/level2-summon-pinkie.txt
parent2f97a15b49bf8c43ff9761e058b1a19a13856067 (diff)
parent3ad45c53e32f0700f68c429fd818372d9892c6d8 (diff)
downloadserverdata-f8924867ee3e1020cb9fc73df98c22218a52ad2f.tar.gz
serverdata-f8924867ee3e1020cb9fc73df98c22218a52ad2f.tar.bz2
serverdata-f8924867ee3e1020cb9fc73df98c22218a52ad2f.tar.xz
serverdata-f8924867ee3e1020cb9fc73df98c22218a52ad2f.zip
Merge pull request #492 from mekolat/puppet-checks
Puppet checks
Diffstat (limited to 'world/map/npc/magic/level2-summon-pinkie.txt')
-rw-r--r--world/map/npc/magic/level2-summon-pinkie.txt3
1 files changed, 2 insertions, 1 deletions
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;