Commit 3cb87a8e authored by Nemo Ma's avatar Nemo Ma

fix

parent 61c978a9
...@@ -121,6 +121,7 @@ function c111443942.sdop(e,tp,eg,ep,ev,re,r,rp) ...@@ -121,6 +121,7 @@ function c111443942.sdop(e,tp,eg,ep,ev,re,r,rp)
e2:SetTarget(c111443942.costtg) e2:SetTarget(c111443942.costtg)
e2:SetOperation(c111443942.costop) e2:SetOperation(c111443942.costop)
e2:SetReset(RESET_EVENT+0x1fe0000) e2:SetReset(RESET_EVENT+0x1fe0000)
e2:SetLabel(111443942)
tc:RegisterEffect(e2) tc:RegisterEffect(e2)
tc:RegisterFlagEffect(111443942,RESET_EVENT+0x1fe0000,0,1) tc:RegisterFlagEffect(111443942,RESET_EVENT+0x1fe0000,0,1)
end end
...@@ -137,11 +138,12 @@ function c111443942.sftg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -137,11 +138,12 @@ function c111443942.sftg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
local fcon=ae:GetCondition() local fcon=ae:GetCondition()
local fcos=ae:GetCost() local fcos=ae:GetCost()
local ftg=ae:GetTarget() local ftg=ae:GetTarget()
local c=e:GetHandler()
if chk==0 then if chk==0 then
return (not fcon or fcon(e,tp,eg,ep,ev,re,r,rp)) return (not fcon or fcon(e,tp,eg,ep,ev,re,r,rp))
and (not fcos or fcos(e,tp,eg,ep,ev,re,r,rp,0)) and (not fcos or fcos(e,tp,eg,ep,ev,re,r,rp,0))
and (not ftg or ftg(e,tp,eg,ep,ev,re,r,rp,0)) and (not ftg or ftg(e,tp,eg,ep,ev,re,r,rp,0))
and e:GetHandler():IsSetCard(0x9d) and e:GetHandler():IsType(TYPE_SPELL+TYPE_TRAP) and c:IsSetCard(0x9d) and c:IsType(TYPE_SPELL+TYPE_TRAP)
end end
if fcos then if fcos then
fcos(e,tp,eg,ep,ev,re,r,rp,1) fcos(e,tp,eg,ep,ev,re,r,rp,1)
...@@ -205,3 +207,13 @@ function c111443942.rsop(e,tp,eg,ep,ev,re,r,rp) ...@@ -205,3 +207,13 @@ function c111443942.rsop(e,tp,eg,ep,ev,re,r,rp)
rc:SetStatus(STATUS_ACTIVATE_DISABLED,true) rc:SetStatus(STATUS_ACTIVATE_DISABLED,true)
end end
end end
local re=Card.RegisterEffect
Card.RegisterEffect=function(c,e)
if c111443942.filter(c) and c:IsType(TYPE_CONTINUOUS+TYPE_EQUIP+TYPE_FIELD) and not e:IsHasType(EFFECT_TYPE_ACTIVATE) and e:GetLabel()~=111443942 then
local tg=e:GetTarget()
if not tg then tg=aux.TRUE end
e:SetTarget(function(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return tg(e,tp,eg,ep,ev,re,r,rp,0) and not c:IsStatus(STATUS_CHAINING) end tg(e,tp,eg,ep,ev,re,r,rp,1) end)
end
re(c,e)
end
...@@ -223,6 +223,7 @@ function c114064005.sdop(e,tp,eg,ep,ev,re,r,rp) ...@@ -223,6 +223,7 @@ function c114064005.sdop(e,tp,eg,ep,ev,re,r,rp)
e2:SetTarget(c114064005.costtg) e2:SetTarget(c114064005.costtg)
e2:SetOperation(c114064005.costop) e2:SetOperation(c114064005.costop)
e2:SetReset(RESET_EVENT+0x1fe0000) e2:SetReset(RESET_EVENT+0x1fe0000)
e2:SetLabel(114064005)
tc:RegisterEffect(e2) tc:RegisterEffect(e2)
tc:RegisterFlagEffect(114064005,RESET_EVENT+0x1fe0000,0,1) tc:RegisterFlagEffect(114064005,RESET_EVENT+0x1fe0000,0,1)
end end
...@@ -355,3 +356,13 @@ end ...@@ -355,3 +356,13 @@ end
function c114064005.sumlimit(e,c) function c114064005.sumlimit(e,c)
return c:IsCode(e:GetLabel()) return c:IsCode(e:GetLabel())
end end
local re=Card.RegisterEffect
Card.RegisterEffect=function(c,e)
if c114064005.kufilter(c) and c:IsType(TYPE_CONTINUOUS+TYPE_EQUIP+TYPE_FIELD) and not e:IsHasType(EFFECT_TYPE_ACTIVATE) and e:GetLabel()~=114064005 then
local tg=e:GetTarget()
if not tg then tg=aux.TRUE end
e:SetTarget(function(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return tg(e,tp,eg,ep,ev,re,r,rp,0) and not c:IsStatus(STATUS_CHAINING) end tg(e,tp,eg,ep,ev,re,r,rp,1) end)
end
re(c,e)
end
...@@ -432,6 +432,7 @@ function c4058.adop(e,tp,eg,ep,ev,re,r,rp) ...@@ -432,6 +432,7 @@ function c4058.adop(e,tp,eg,ep,ev,re,r,rp)
e2:SetTarget(c4058.actarget) e2:SetTarget(c4058.actarget)
e2:SetOperation(c4058.costop) e2:SetOperation(c4058.costop)
e2:SetReset(RESET_EVENT+0x1fe0000) e2:SetReset(RESET_EVENT+0x1fe0000)
e2:SetLabel(4058)
tc:RegisterEffect(e2) tc:RegisterEffect(e2)
tc:RegisterFlagEffect(4058,RESET_EVENT+0x1fe0000,0,1) tc:RegisterFlagEffect(4058,RESET_EVENT+0x1fe0000,0,1)
end end
...@@ -513,3 +514,13 @@ function c4058.regop(e,tp,eg,ep,ev,re,r,rp) ...@@ -513,3 +514,13 @@ function c4058.regop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
end end
local re=Card.RegisterEffect
Card.RegisterEffect=function(c,e)
if c:IsType(TYPE_TRAP) and c:IsCode(16067089,93217231,80678380,1683982) and c:IsType(TYPE_CONTINUOUS+TYPE_EQUIP+TYPE_FIELD) and not e:IsHasType(EFFECT_TYPE_ACTIVATE) and e:GetLabel()~=4058 then
local tg=e:GetTarget()
if not tg then tg=aux.TRUE end
e:SetTarget(function(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return tg(e,tp,eg,ep,ev,re,r,rp,0) and not c:IsStatus(STATUS_CHAINING) end tg(e,tp,eg,ep,ev,re,r,rp,1) end)
end
re(c,e)
end
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