diff options
author | Jesusaves <cpntb1@ymail.com> | 2020-06-07 01:09:29 -0300 |
---|---|---|
committer | Jesusaves <cpntb1@ymail.com> | 2020-06-07 01:09:29 -0300 |
commit | 88e7ffb2ec3f992fd38a4a093f0d746714c4b51f (patch) | |
tree | 80d766746aff0664778545f4a290198787f28a30 /npc | |
parent | 3bb355fb545b6505451989afec7ca74cb49e5967 (diff) | |
download | serverdata-88e7ffb2ec3f992fd38a4a093f0d746714c4b51f.tar.gz serverdata-88e7ffb2ec3f992fd38a4a093f0d746714c4b51f.tar.bz2 serverdata-88e7ffb2ec3f992fd38a4a093f0d746714c4b51f.tar.xz serverdata-88e7ffb2ec3f992fd38a4a093f0d746714c4b51f.zip |
Update to now deprecated elements, and to harm new flag.
Diffstat (limited to 'npc')
-rw-r--r-- | npc/commands/kami.txt | 4 | ||||
-rw-r--r-- | npc/functions/hub.txt | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/npc/commands/kami.txt b/npc/commands/kami.txt index 531d09a9d..93ba4d7a4 100644 --- a/npc/commands/kami.txt +++ b/npc/commands/kami.txt @@ -68,13 +68,13 @@ OnPurify: end; OnHarm: - harm(getcharid(3), 500, 1); + harm(getcharid(3), 500, HARM_PHYS); end; OnHarm2: .@id=getcharid(3); detachrid(); - harm(.@id, 500, 1); + harm(.@id, 500, HARM_MISC, Ele_Holy); end; OnInit: diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt index b1e34f5b1..a2a01bebf 100644 --- a/npc/functions/hub.txt +++ b/npc/functions/hub.txt @@ -289,7 +289,11 @@ function script HUB_SkillInvoke { case TMW2_JUDGMENT: debugmes "Target: %d (%d,%d)", @skillTarget, @skillTargetX, @skillTargetY; areasc2(getmap(), @skillTargetX, @skillTargetY, 2, 10000, SC_BLOODING, BL_MOB|BL_PC); - harm(@skillTarget, 1000, 1); + .@type=any(HARM_PHYS, HARM_MAGI); + .@dmg=calcdmg(getcharid(3), @skillTarget, .@type); + // Adjusted power: 300 + .@dmg=.@dmg*300/100; + harm(@skillTarget, .@dmg, .@type, Ele_Holy); break; case TMW2_PARUM: SK_parum(); |