oni

expansions/script/c33330100.lua

@@ -7,14 +7,14 @@ function cm.initial_effect(c)
 	local e3=rsef.QO(c,nil,{m,1},nil,"se,th,td,ga",nil,LOCATION_GRAVE,nil,aux.bfgcost,rsop.target(cm.thfilter,"th",LOCATION_DECK),cm.thop)
 end
 function cm.cfilter(c,e,tp)
-	local g=Duel.GetFieldGroup(tp,LOCATION_MZONE,0)
-	return #g==g:FilterCount(Card.IsAbleToGraveAsCost,nil)
+	local g=Duel.GetFieldGroup(tp,LOCATION_ONFIELD,0)
+	return #g==g:FilterCount(Card.IsAbleToGraveAsCost,e:GetHandler())
 end
 function cm.spop(e,tp)
 	if aux.ExceptThisCard(e) then
 		rsop.SelectSpecialSummon(tp,rscf.spfilter2(Card.IsSetCard,0x550),tp,LOCATION_EXTRA,0,1,1,nil,{},e,tp)
 	end
-	local e1=rsef.FV_LIMIT_PLAYER({e:GetHandler(),tp},"sp",nil,aux.TargetBoolFunction(Card.IsLocation,LOCATION_EXTRA),{1,0},nil,rsreset.pend)
+	local e1=rsef.FV_LIMIT_PLAYER({e:GetHandler(),tp},"sp",nil,aux.TargetBoolFunction(Card.IsType,TYPE_MONSTER),{1,0},nil,rsreset.pend)
 end
 function cm.thfilter(c)
 	return c:IsSetCard(0x550) and c:IsAbleToHand()