Commit 9188a561 authored by salix5's avatar salix5

Effect.IsActivated()

parent 29a40c4d
......@@ -530,7 +530,7 @@ int32 scriptlib::effect_is_activated(lua_State * L) {
check_param_count(L, 1);
check_param(L, PARAM_TYPE_EFFECT, 1);
effect* peffect = *(effect**) lua_touserdata(L, 1);
lua_pushboolean(L, (peffect->status & EFFECT_STATUS_ACTIVATED));
lua_pushboolean(L, (peffect->status & EFFECT_STATUS_ACTIVATED) || (peffect->flag & EFFECT_FLAG_OWNER_RELATE));
return 1;
}
......
......@@ -1252,8 +1252,7 @@ function Auxiliary.damcon1(e,tp,eg,ep,ev,re,r,rp)
end
--filter for the immune effetc of qli monsters
function Auxiliary.qlifilter(e,te)
if te:IsActiveType(TYPE_MONSTER)
and (te:IsActivated() or te:IsHasProperty(EFFECT_FLAG_OWNER_RELATE)) then
if te:IsActiveType(TYPE_MONSTER) and te:IsActivated() then
local lv=e:GetHandler():GetLevel()
local ec=te:GetOwner()
if ec:IsType(TYPE_XYZ) then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment