Commit 35f0ad7f authored by mercury233's avatar mercury233

fix 鋼鉄の襲撃者

parent 15c05d69
...@@ -64,9 +64,10 @@ function c3113667.cfilter(c) ...@@ -64,9 +64,10 @@ function c3113667.cfilter(c)
end end
function c3113667.spcon2(e,tp,eg,ep,ev,re,r,rp) function c3113667.spcon2(e,tp,eg,ep,ev,re,r,rp)
if not re then return false end if not re then return false end
local tgp,loc=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_CONTROLER,CHAININFO_TRIGGERING_LOCATION)
local rc=re:GetHandler() local rc=re:GetHandler()
return rc:IsControler(tp) and rc:GetOriginalAttribute()==ATTRIBUTE_DARK return tgp==tp and loc==LOCATION_MZONE
and rc:GetOriginalRace()==RACE_MACHINE and rc:GetOriginalAttribute()==ATTRIBUTE_DARK and rc:GetOriginalRace()==RACE_MACHINE
and eg:IsExists(c3113667.cfilter,1,nil) and eg:IsExists(c3113667.cfilter,1,nil)
end end
function c3113667.spfilter(c,e,tp) function c3113667.spfilter(c,e,tp)
......
...@@ -61,9 +61,10 @@ function c40634253.damfilter1(c,tp) ...@@ -61,9 +61,10 @@ function c40634253.damfilter1(c,tp)
end end
function c40634253.damcon2(e,tp,eg,ep,ev,re,r,rp) function c40634253.damcon2(e,tp,eg,ep,ev,re,r,rp)
if not re then return false end if not re then return false end
local tgp,loc=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_CONTROLER,CHAININFO_TRIGGERING_LOCATION)
local rc=re:GetHandler() local rc=re:GetHandler()
return rc:IsControler(tp) and rc:GetOriginalAttribute()==ATTRIBUTE_DARK return tgp==tp and loc==LOCATION_MZONE
and rc:GetOriginalRace()==RACE_MACHINE and rc:GetOriginalAttribute()==ATTRIBUTE_DARK and rc:GetOriginalRace()==RACE_MACHINE
and eg:IsExists(c40634253.damfilter1,1,nil,tp) and eg:IsExists(c40634253.damfilter1,1,nil,tp)
end end
function c40634253.damtg(e,tp,eg,ep,ev,re,r,rp,chk) function c40634253.damtg(e,tp,eg,ep,ev,re,r,rp,chk)
......
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