summaryrefslogtreecommitdiff
path: root/world/map/npc/magic/level2-magic-knuckles.txt
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/magic/level2-magic-knuckles.txt')
-rw-r--r--world/map/npc/magic/level2-magic-knuckles.txt8
1 files changed, 3 insertions, 5 deletions
diff --git a/world/map/npc/magic/level2-magic-knuckles.txt b/world/map/npc/magic/level2-magic-knuckles.txt
index 76ff3215..a91feeb2 100644
--- a/world/map/npc/magic/level2-magic-knuckles.txt
+++ b/world/map/npc/magic/level2-magic-knuckles.txt
@@ -1,6 +1,6 @@
-|script|magic-knuckles|32767
{
- callfunc "magic_checks"; if(@failed) end; // << I wish we had functions that could return >>
+ if(call("magic_checks")) end; // << I wish we had functions that could return >>
if (Sp < 20) end;
if (getskilllv(SKILL_MAGIC) < .level) end;
set .@level, getskilllv(.school);
@@ -17,15 +17,13 @@
end;
OnAttack:
- if (target(BL_ID, @target_id, 22) != 22) end; // 0x10 | 0x02 | 0x04
- setarray @melee_dmg[0], 30, ((@upmaru_str*2) + 5);
- callfunc "melee_damage";
+ void call("melee_damage", @spellpower, @target_id, (30 + rand((@upmaru_str*2) + 5)));
end;
OnInit:
set .school, SKILL_MAGIC_WAR;
set .invocation$, chr(MAGIC_SYMBOL) + "upmaru"; // used in npcs that refer to this spell
- callfunc "magic_register";
+ void call("magic_register");
set .level, 2;
set .exp_gain, 1;
end;