Commit ad2289ac authored by mercury233's avatar mercury233

fix

parent 35e84d29
...@@ -63,7 +63,7 @@ function c100343031.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -63,7 +63,7 @@ function c100343031.spop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c100343031.thfilter(c) function c100343031.thfilter(c)
return (c:IsCode(68468459) or aux.IsCodeListed(c,68468459) and c:IsType(TYPE_MONSTER)) and c:IsAbleToHand() return (c:IsCode(68468459) or aux.IsCodeListed(c,68468459) and c:IsType(TYPE_MONSTER)) and c:IsFaceup() and c:IsAbleToHand()
end end
function c100343031.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c100343031.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_REMOVED) and chkc:IsControler(tp) and c100343031.thfilter(chkc) end if chkc then return chkc:IsLocation(LOCATION_REMOVED) and chkc:IsControler(tp) and c100343031.thfilter(chkc) end
......
...@@ -35,7 +35,8 @@ function c100426021.eftg(e,c) ...@@ -35,7 +35,8 @@ function c100426021.eftg(e,c)
return c:IsFaceup() and c:IsAttribute(ATTRIBUTE_WATER) return c:IsFaceup() and c:IsAttribute(ATTRIBUTE_WATER)
end end
function c100426021.efilter(e,re,rp) function c100426021.efilter(e,re,rp)
return re:IsActiveType(TYPE_MONSTER) and not re:GetHandler():IsAttribute(ATTRIBUTE_WATER) local rc=re:GetHandler()
return re:IsActiveType(TYPE_MONSTER) and rc:IsControler(1-e:GetHandlerPlayer()) and not rc:IsAttribute(ATTRIBUTE_WATER)
end end
function c100426021.spfilter(c,e,tp) function c100426021.spfilter(c,e,tp)
return (aux.IsCodeListed(c,22702055) or (c:IsType(TYPE_NORMAL) and c:IsAttribute(ATTRIBUTE_WATER))) return (aux.IsCodeListed(c,22702055) or (c:IsType(TYPE_NORMAL) and c:IsAttribute(ATTRIBUTE_WATER)))
......
...@@ -112,7 +112,7 @@ function c100426033.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -112,7 +112,7 @@ function c100426033.spop(e,tp,eg,ep,ev,re,r,rp)
aux.GCheckAdditional=c100426033.gcheck aux.GCheckAdditional=c100426033.gcheck
local sg=g:SelectSubGroup(tp,c100426033.fselect,false,1,ft) local sg=g:SelectSubGroup(tp,c100426033.fselect,false,1,ft)
aux.GCheckAdditional=nil aux.GCheckAdditional=nil
if sg:GetCount()>0 then if sg then
Duel.SpecialSummon(sg,0,tp,tp,false,false,POS_FACEUP) Duel.SpecialSummon(sg,0,tp,tp,false,false,POS_FACEUP)
end end
end 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