summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2021-12-29 08:15:37 -0300
committerJesusaves <cpntb1@ymail.com>2021-12-29 08:15:37 -0300
commitef41fb9e4cc7a601aff2ff5abcdb63f83e840ed1 (patch)
tree940641a589e220c078f16f5af984b14937eb5392
parenta442c7213c1ca41ead1c6eb21faded46ea2831d7 (diff)
downloadserverdata-ef41fb9e4cc7a601aff2ff5abcdb63f83e840ed1.tar.gz
serverdata-ef41fb9e4cc7a601aff2ff5abcdb63f83e840ed1.tar.bz2
serverdata-ef41fb9e4cc7a601aff2ff5abcdb63f83e840ed1.tar.xz
serverdata-ef41fb9e4cc7a601aff2ff5abcdb63f83e840ed1.zip
areaharm() and rectharm() can declare the damage source - so use it
-rw-r--r--npc/023-2/mk.txt2
-rw-r--r--npc/config/magic.txt8
2 files changed, 5 insertions, 5 deletions
diff --git a/npc/023-2/mk.txt b/npc/023-2/mk.txt
index 1fc1a5458..b4c763dce 100644
--- a/npc/023-2/mk.txt
+++ b/npc/023-2/mk.txt
@@ -128,7 +128,7 @@ OnTimer3000:
// Andrei Sakar's Fake Chant
if (.wcycle % 15 < 3) {
unittalk(.sakar, sprintf("Come %s %s, and %s %s!", any("great", "magnificent"), any("light", "oath", "sacrament"), any("devastate", "annihilate", "obliterate", "liquidate", "eviscerate"), "nearby"));
- harm(.mk, 100, HARM_MISC, Ele_Holy);
+ harm(.mk, 100, HARM_MISC, Ele_Holy, .sakar);
}
end;
diff --git a/npc/config/magic.txt b/npc/config/magic.txt
index afc422793..aaa69ff8a 100644
--- a/npc/config/magic.txt
+++ b/npc/config/magic.txt
@@ -150,7 +150,7 @@ function script SummonMagic {
return;
}
-// areaharm(target, range, DMG, {type, element, filter, bl})
+// areaharm(caster, range, DMG, {type, element, filter, bl})
// Defaults to HARM_MISC, Ele_Neutral, filter filter_hostile and all BLs
// Valid BL: BL_MOB | BL_PC | BL_HOM | BL_MER
// Do not use: NPC, PET, ELEM
@@ -171,7 +171,7 @@ function script areaharm {
// Filtering
if (!callfunc(.@f$, .@mbs[.@i]))
continue;
- harm(.@mbs[.@i], .@d, .@h, .@e);
+ harm(.@mbs[.@i], .@d, .@h, .@e, .@t);
specialeffect(FX_ATTACK, AREA, .@mbs[.@i]);
// TODO: Handle MobPt to don't overload timer system?
}
@@ -179,7 +179,7 @@ function script areaharm {
}
-// rectharm(target, x, y, DMG, {type, element, filter, bl})
+// rectharm(caster, x, y, DMG, {type, element, filter, bl})
// Same as areaharm() but causes a rectangle in (x,y) size, instead of a square
function script rectharm {
.@t=getarg(0);
@@ -198,7 +198,7 @@ function script rectharm {
// Filtering
if (!callfunc(.@f$, .@mbs[.@i]))
continue;
- harm(.@mbs[.@i], .@d, .@h, .@e);
+ harm(.@mbs[.@i], .@d, .@h, .@e, .@t);
specialeffect(FX_ATTACK, AREA, .@mbs[.@i]);
// TODO: Handle MobPt to don't overload timer system?
}