fix Raidraptor - Ultimate Falcon and HEROs and so on (#2035)

c22061412.lua

@@ -32,7 +32,7 @@ function c22061412.initial_effect(c)
 end
 c22061412.material_setcode=0x8
 function c22061412.atkfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3008)
+	return c:IsFaceup() and c:IsSetCard(0x3008) and c:IsType(TYPE_MONSTER)
 end
 function c22061412.atkup(e,c)
 	return Duel.GetMatchingGroupCount(c22061412.atkfilter,c:GetControler(),LOCATION_REMOVED,0,nil)*300

c26964762.lua

@@ -32,8 +32,11 @@ function c26964762.initial_effect(c)
 	e3:SetOperation(c26964762.deckop)
 	c:RegisterEffect(e3)
 end
+function c26964762.spcfilter(c)
+	return c:IsSetCard(0xc008) and c:IsType(TYPE_MONSTER)
+end
 function c26964762.spcon(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.IsExistingMatchingCard(Card.IsSetCard,tp,LOCATION_GRAVE,0,3,nil,0xc008)
+	return Duel.IsExistingMatchingCard(c26964762.spcfilter,tp,LOCATION_GRAVE,0,3,nil)
 end
 function c26964762.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsDiscardable() end
@@ -68,7 +71,7 @@ function c26964762.deckcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetTurnPlayer()==tp
 end
 function c26964762.cfilter(c)
-	return c:IsSetCard(0xc008) and c:IsAbleToRemoveAsCost()
+	return c:IsSetCard(0xc008) and c:IsType(TYPE_MONSTER) and c:IsAbleToRemoveAsCost()
 end
 function c26964762.deckcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()

c33574806.lua

@@ -20,6 +20,9 @@ function c33574806.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 c33574806.material_setcode=0x8
+function c33574806.atkfilter(c)
+	return c:IsSetCard(0x3008) and c:IsType(TYPE_MONSTER)
+end
 function c33574806.atkup(e,c)
-	return Duel.GetMatchingGroupCount(Card.IsSetCard,c:GetControler(),LOCATION_GRAVE,0,nil,0x3008)*100
+	return Duel.GetMatchingGroupCount(c33574806.atkfilter,c:GetControler(),LOCATION_GRAVE,0,nil)*100
 end

c58147549.lua

@@ -17,6 +17,9 @@ function c58147549.initial_effect(c)
 	e2:SetValue(c58147549.atkup)
 	c:RegisterEffect(e2)
 end
+function c58147549.atkfilter(c)
+	return c:IsSetCard(0x8) and c:IsType(TYPE_MONSTER)
+end
 function c58147549.atkup(e,c)
-	return Duel.GetMatchingGroupCount(Card.IsSetCard,c:GetControler(),LOCATION_GRAVE,0,nil,0x8)*100
+	return Duel.GetMatchingGroupCount(c58147549.atkfilter,c:GetControler(),LOCATION_GRAVE,0,nil)*100
 end

c63060238.lua

@@ -41,7 +41,7 @@ function c63060238.thop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c63060238.tgfilter(c)
-	return c:IsSetCard(0x3008) and not c:IsCode(63060238) and c:IsAbleToGrave()
+	return c:IsSetCard(0x3008) and c:IsType(TYPE_MONSTER) and not c:IsCode(63060238) and c:IsAbleToGrave()
 end
 function c63060238.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c63060238.tgfilter,tp,LOCATION_DECK,0,1,nil) end

c69572169.lua

@@ -17,7 +17,7 @@ function c69572169.condition(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsLocation(LOCATION_GRAVE) and e:GetHandler():IsReason(REASON_BATTLE)
 end
 function c69572169.rfilter(c)
-	return c:IsSetCard(0x3008) and c:IsAbleToRemoveAsCost()
+	return c:IsSetCard(0x3008) and c:IsType(TYPE_MONSTER) and c:IsAbleToRemoveAsCost()
 end
 function c69572169.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local rg=Duel.GetMatchingGroup(c69572169.rfilter,tp,LOCATION_GRAVE,0,e:GetHandler())

c86221741.lua

@@ -56,8 +56,11 @@ function c86221741.operation(e,tp,eg,ep,ev,re,r,rp)
 	e2:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e2,tp)
 end
+function c86221741.cfilter(c)
+	return c:IsSetCard(0xba) and c:IsType(TYPE_MONSTER)
+end
 function c86221741.atkcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetOverlayGroup():IsExists(Card.IsSetCard,1,nil,0xba)
+	return e:GetHandler():GetOverlayGroup():IsExists(c86221741.cfilter,1,nil)
 end
 function c86221741.atktg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

c9201964.lua

@@ -13,7 +13,7 @@ function c9201964.condition(e,tp,eg,ep,ev,re,r,rp)
 	return tp~=Duel.GetTurnPlayer() and Duel.GetAttackTarget()==nil
 end
 function c9201964.cfilter(c)
-	return c:IsSetCard(0xc008) and c:IsAbleToRemoveAsCost()
+	return c:IsSetCard(0xc008) and c:IsType(TYPE_MONSTER) and c:IsAbleToRemoveAsCost()
 end
 function c9201964.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c9201964.cfilter,tp,LOCATION_GRAVE,0,1,nil) end