watele

expansions/script/c65020096.lua

@@ -73,11 +73,11 @@ function c65020096.thop(e,tp,eg,ep,ev,re,r,rp)
 		m=1
 	end
 	if m==0 then
-		 local g1=Duel.SelectMatchingCard(tp,c65020080.thfil,tp,LOCATION_DECK,0,1,1,nil)
+		 local g1=Duel.SelectMatchingCard(tp,c65020096.thfil,tp,LOCATION_DECK,0,1,1,nil)
 		Duel.SendtoHand(g1,tp,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,g1)
 	elseif m==1 then
-		local g2=Duel.SelectMatchingCard(tp,c65020084.thfil,tp,LOCATION_DECK,0,1,1,nil,e,tp)
+		local g2=Duel.SelectMatchingCard(tp,c65020096.thfil,tp,LOCATION_DECK,0,1,1,nil,e,tp)
 		Duel.SpecialSummon(g2,0,tp,tp,false,false,POS_FACEUP)
 	end
 	e:Reset()

expansions/script/c81058006.lua

@@ -53,10 +53,11 @@ function cm.efilter(e,te)
 	return te:IsActiveType(TYPE_SPELL+TYPE_TRAP)
 end
 function cm.cfilter(c)
-	return c:IsFacedown() or not (c:IsRace(RACE_FAIRY) and c:IsAttribute(ATTRIBUTE_DARK))
+	return c:IsRace(RACE_FAIRY) and c:IsAttribute(ATTRIBUTE_DARK)
 end
 function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
-	return not Duel.IsExistingMatchingCard(cm.cfilter,tp,LOCATION_MZONE,0,1,nil)
+	local g=Duel.GetFieldGroup(tp,LOCATION_MZONE,0)
+	return g:GetCount()>0 and g:FilterCount(cm.cfilter,nil)==g:GetCount()
 end
 function cm.spfilter(c,e,tp)
 	return c:IsCode(81058000) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0