Commit 4d30f2cd authored by POLYMER's avatar POLYMER

fix

parent fa607e2a
...@@ -138,22 +138,22 @@ function cm.adjustop(e,tp,eg,ep,ev,re,r,rp) ...@@ -138,22 +138,22 @@ function cm.adjustop(e,tp,eg,ep,ev,re,r,rp)
local eset2={tc:IsHasEffect(EFFECT_CANNOT_BE_EFFECT_TARGET)} local eset2={tc:IsHasEffect(EFFECT_CANNOT_BE_EFFECT_TARGET)}
for _,te in pairs(eset1) do for _,te in pairs(eset1) do
if te:IsHasType(EFFECT_TYPE_FIELD) then if te:IsHasType(EFFECT_TYPE_FIELD) then
local tg=te:GetTarget() local tg=te:GetTarget() or aux.TRUE
te:SetTarget(cm.chtg(tg,e)) te:SetTarget(cm.chtg(tg,e))
opt=1 opt=1
elseif te:IsHasType(EFFECT_TYPE_SINGLE) then else
local con=te:GetCondition() local con=te:GetCondition() or aux.TRUE
te:SetCondition(cm.chcon(con,e)) te:SetCondition(cm.chcon(con,e))
opt=1 opt=1
end end
end end
for _,te in pairs(eset2) do for _,te in pairs(eset2) do
if te:IsHasType(EFFECT_TYPE_FIELD) then if te:IsHasType(EFFECT_TYPE_FIELD) then
local tg=te:GetTarget() local tg=te:GetTarget() or aux.TRUE
te:SetTarget(cm.chtg(tg,e)) te:SetTarget(cm.chtg(tg,e))
opt=1 opt=1
elseif te:IsHasType(EFFECT_TYPE_SINGLE) then else
local con=te:GetCondition() local con=te:GetCondition() or aux.TRUE
te:SetCondition(cm.chcon(con,e)) te:SetCondition(cm.chcon(con,e))
opt=1 opt=1
end end
...@@ -164,12 +164,14 @@ end ...@@ -164,12 +164,14 @@ end
function cm.chtg(_tg,ce) function cm.chtg(_tg,ce)
return function(e,c,...) return function(e,c,...)
if c:GetColumnGroup():IsExists(cm.tkfilter,1,nil,1-c:GetControler()) and Duel.IsPlayerAffectedByEffect(c:GetControler(),m) and not c:IsImmuneToEffect(ce) then return false end if c:GetColumnGroup():IsExists(cm.tkfilter,1,nil,1-c:GetControler()) and Duel.IsPlayerAffectedByEffect(c:GetControler(),m) and not c:IsImmuneToEffect(ce) then return false end
_tg(e,c,...) return _tg(e,c,...)
end end
end end
function cm.chcon(_con,ce) function cm.chcon(_con,ce)
return function(e,...) return function(e,...)
if e:GetHandler():GetColumnGroup():IsExists(cm.tkfilter,1,nil,1-e:GetHandlerPlayer()) and Duel.IsPlayerAffectedByEffect(e:GetHandlerPlayer(),m) and not e:GetHandler():IsImmuneToEffect(ce) then return false end local tp=e:GetHandler():GetControler()
_con(e,...) if e:IsHasType(EFFECT_TYPE_EQUIP) then tp=e:GetHandler():GetEquipTarget():GetControler() end
if e:GetHandler():GetColumnGroup():IsExists(cm.tkfilter,1,nil,1-tp) and Duel.IsPlayerAffectedByEffect(tp,m) and not e:GetHandler():IsImmuneToEffect(ce) then return false end
return _con(e,...)
end end
end end
\ No newline at end of file
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