Commit 5249c1de authored by salix5's avatar salix5

fix: disable

parent 1ce942e2
......@@ -23,7 +23,7 @@ function c2407234.initial_effect(c)
end
c2407234.xyz_number=69
function c2407234.filter(c)
return c:IsFaceup() and c:IsType(TYPE_XYZ)
return c:IsFaceup() and c:IsType(TYPE_XYZ) and not c:IsDisabled()
end
function c2407234.negop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
......
......@@ -20,6 +20,9 @@ function c48333324.filter2(c,e,tp,mc,rk,rc,code)
return c:GetRank()==rk and c:IsRace(rc) and c:IsSetCard(0x1048) and mc:IsCanBeXyzMaterial(c)
and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,false,false)
end
function c48333324.disfilter(c)
return (not c:IsDisabled() or c:IsType(TYPE_TRAPMONSTER)) and not (c:IsType(TYPE_NORMAL) and bit.band(c:GetOriginalType(),TYPE_NORMAL))
end
function c48333324.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_MZONE) and c48333324.filter1(chkc,e,tp) end
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>-1
......@@ -47,10 +50,10 @@ function c48333324.activate(e,tp,eg,ep,ev,re,r,rp)
sc:CompleteProcedure()
local g1=Duel.GetMatchingGroup(Card.IsFaceup,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,sc)
g1:RemoveCard(c)
if g1:GetFirst() then
if g1:GetCount()>0 then
Duel.BreakEffect()
end
local ng=g1:Filter(aux.disfilter1,nil)
local ng=g1:Filter(c48333324.disfilter,nil)
local nc=ng:GetFirst()
while nc do
local e1=Effect.CreateEffect(c)
......
......@@ -1106,7 +1106,7 @@ function Auxiliary.PendOperation()
Duel.HintSelection(Group.FromCards(rpz))
end
end
--card effect disable filter
--card effect disable filter(target)
function Auxiliary.disfilter1(c)
return c:IsFaceup() and not c:IsDisabled() and (not c:IsType(TYPE_NORMAL) or bit.band(c:GetOriginalType(),TYPE_EFFECT)~=0)
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