fix #1220

c12219047.lua

@@ -31,7 +31,7 @@ function c12219047.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
 end
 function c12219047.filter(c)
-	return c:IsFaceup() and not (c:IsAttack(0) and c:IsDisabled())
+	return c:IsFaceup() and (c:IsAttackAbove(1) or aux.disfilter1(c))
 end
 function c12219047.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and c12219047.filter(chkc) end

c47387961.lua

@@ -17,7 +17,7 @@ function c47387961.initial_effect(c)
 end
 c47387961.xyz_number=8
 function c47387961.filter(c)
-	return c:IsFaceup() and c:IsType(TYPE_XYZ)
+	return c:IsFaceup() and c:IsType(TYPE_XYZ) and (c:IsAttackAbove(1) or aux.disfilter1(c))
 end
 function c47387961.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsControler(1-tp) and chkc:IsLocation(LOCATION_MZONE) and c47387961.filter(chkc) end

c51570882.lua

@@ -39,7 +39,7 @@ function c51570882.splimit(e,se,sp,st)
 	return not e:GetHandler():IsLocation(LOCATION_EXTRA) or aux.fuslimit(e,se,sp,st)
 end
 function c51570882.disfilter(c)
-	return c:IsFaceup() and not (c:IsAttack(0) and c:IsDisabled())
+	return c:IsFaceup() and (c:IsAttackAbove(1) or aux.disfilter1(c))
 end
 function c51570882.distg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and c51570882.disfilter(chkc) end

c75130221.lua

@@ -38,7 +38,7 @@ function c75130221.discon(e,tp,eg,ep,ev,re,r,rp)
 	return c:IsLocation(LOCATION_GRAVE) and c:IsPreviousLocation(LOCATION_ONFIELD+LOCATION_HAND) and r==REASON_LINK and c:GetReasonCard():IsSetCard(0x101)
 end
 function c75130221.disfilter(c)
-	return c:IsFaceup() and not (c:IsAttack(0) and c:IsDisabled())
+	return c:IsFaceup() and (c:IsAttackAbove(1) or aux.disfilter1(c))
 end
 function c75130221.distg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and c75130221.disfilter(chkc) end

c90036274.lua

@@ -71,7 +71,7 @@ function c90036274.discon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetCurrentPhase()~=PHASE_DAMAGE or not Duel.IsDamageCalculated()
 end
 function c90036274.disfilter(c)
-	return c:GetSummonLocation()==LOCATION_EXTRA and not (c:IsAttack(0) and c:IsDisabled())
+	return c:IsFaceup() and c:GetSummonLocation()==LOCATION_EXTRA and (c:IsAttackAbove(1) or aux.disfilter1(c))
 end
 function c90036274.distg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and c90036274.disfilter(chkc) end

c93356623.lua

@@ -21,7 +21,7 @@ function c93356623.condition(e,tp,eg,ep,ev,re,r,rp)
 		and (Duel.GetCurrentPhase()~=PHASE_DAMAGE or not Duel.IsDamageCalculated())
 end
 function c93356623.filter(c)
-	return c:IsFaceup() and not (c:IsAttack(0) and c:IsDefense(0) and c:IsDisabled())
+	return c:IsFaceup() and (c:IsAttackAbove(1) or c:IsDefenseAbove(1) or aux.disfilter1(c))
 end
 function c93356623.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and c93356623.filter(chkc) end

c99185129.lua

@@ -58,7 +58,7 @@ function c99185129.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetCurrentPhase()~=PHASE_DAMAGE or not Duel.IsDamageCalculated()
 end
 function c99185129.filter(c)
-	return c:GetSummonLocation()==LOCATION_EXTRA and not (c:IsAttack(0) and c:IsDisabled())
+	return c:IsFaceup() and c:GetSummonLocation()==LOCATION_EXTRA and (c:IsAttackAbove(1) or aux.disfilter1(c))
 end
 function c99185129.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and c99185129.filter(chkc) end