Merge remote-tracking branch 'upstream/master' into master

c11458071.lua

@@ -30,13 +30,13 @@ function c11458071.initial_effect(c)
 	e3:SetOperation(c11458071.rmop)
 	c:RegisterEffect(e3)
 end
-c11458071.spchecks={c11458071.spfilter1,c11458071.spfilter1,c11458071.spfilter1,c11458071.spfilter2}
 function c11458071.spfilter1(c)
 	return c:IsRace(RACE_FAIRY) and c:IsAttribute(ATTRIBUTE_LIGHT)
 end
 function c11458071.spfilter2(c)
 	return c:IsRace(RACE_FIEND) and c:IsAttribute(ATTRIBUTE_DARK)
 end
+c11458071.spchecks={c11458071.spfilter1,c11458071.spfilter1,c11458071.spfilter1,c11458071.spfilter2}
 function c11458071.spfilter(c)
 	return ((c:IsRace(RACE_FAIRY) and c:IsAttribute(ATTRIBUTE_LIGHT)) or (c:IsRace(RACE_FIEND) and c:IsAttribute(ATTRIBUTE_DARK)))
 		and c:IsAbleToRemoveAsCost()

c22056710.lua

@@ -38,7 +38,7 @@ function c22056710.hspcon(e,c)
 	return Duel.IsExistingMatchingCard(c22056710.hspfilter,tp,LOCATION_MZONE,0,1,nil,tp)
 end
 function c22056710.hsptg(e,tp,eg,ep,ev,re,r,rp,chk,c)
-	local g=Duel.GetMatchingGroup(c22056710.spfilter,tp,LOCATION_MZONE,0,nil,tp)
+	local g=Duel.GetMatchingGroup(c22056710.hspfilter,tp,LOCATION_MZONE,0,nil,tp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 	local tc=g:SelectUnselect(nil,tp,false,true,1,1)
 	if tc then

c48453776.lua

@@ -29,13 +29,13 @@ function c48453776.initial_effect(c)
 	e3:SetOperation(c48453776.sgop)
 	c:RegisterEffect(e3)
 end
-c48453776.spchecks={c48453776.spfilter1,c48453776.spfilter2,c48453776.spfilter2,c48453776.spfilter2}
 function c48453776.spfilter1(c)
 	return c:IsAttribute(ATTRIBUTE_LIGHT) and c:IsRace(RACE_FAIRY)
 end
 function c48453776.spfilter2(c)
 	return c:IsAttribute(ATTRIBUTE_DARK) and c:IsRace(RACE_FIEND)
 end
+c48453776.spchecks={c48453776.spfilter1,c48453776.spfilter2,c48453776.spfilter2,c48453776.spfilter2}
 function c48453776.spfilter(c)
 	return ((c:IsRace(RACE_FAIRY) and c:IsAttribute(ATTRIBUTE_LIGHT)) or (c:IsRace(RACE_FIEND) and c:IsAttribute(ATTRIBUTE_DARK)))
 		and c:IsAbleToRemoveAsCost()

c7165085.lua

@@ -34,7 +34,9 @@ function c7165085.activate(e,tp,eg,ep,ev,re,r,rp)
 		local tep=tc:GetControler()
 		if not te then
 			Duel.ChangePosition(tc,POS_FACEUP)
-			Duel.Destroy(tc,REASON_EFFECT)
+			if Duel.Destroy(tc,REASON_EFFECT)==0 then
+				Duel.SendtoGrave(tc,REASON_RULE)
+			end
 		else
 			local condition=te:GetCondition()
 			local cost=te:GetCost()
@@ -68,7 +70,9 @@ function c7165085.activate(e,tp,eg,ep,ev,re,r,rp)
 					tg=g:GetNext()
 				end
 			else
-				Duel.Destroy(tc,REASON_EFFECT)
+				if Duel.Destroy(tc,REASON_EFFECT)==0 then
+					Duel.SendtoGrave(tc,REASON_RULE)
+				end
 			end
 		end
 	end

c96914272.lua

@@ -41,9 +41,9 @@ function c96914272.sptg(e,tp,eg,ep,ev,re,r,rp,chk,c)
 	else return false end
 end
 function c96914272.spop(e,tp,eg,ep,ev,re,r,rp,c)
-	local g=e:GetLabelObject()
-	Duel.SendtoGrave(g,REASON_SPSUMMON)
-	e:SetLabel(g:GetFirst():GetLevel())
+	local tc=e:GetLabelObject()
+	Duel.SendtoGrave(tc,REASON_SPSUMMON)
+	e:SetLabel(tc:GetLevel())
 end
 function c96914272.lvcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SPECIAL+SUMMON_VALUE_SELF

procedure.lua

@@ -180,7 +180,7 @@ function Auxiliary.SynMixCondition(f1,f2,f3,f4,minct,maxct,gc)
 				local mg
 				local mgchk=false
 				if mg1 then
-					mg=mg1
+					mg=mg1:Filter(Card.IsCanBeSynchroMaterial,nil,c)
 					mgchk=true
 				else
 					mg=Auxiliary.GetSynMaterials(tp,c)
@@ -206,7 +206,7 @@ function Auxiliary.SynMixTarget(f1,f2,f3,f4,minct,maxct,gc)
 				local mg
 				local mgchk=false
 				if mg1 then
-					mg=mg1
+					mg=mg1:Filter(Card.IsCanBeSynchroMaterial,nil,c)
 					mgchk=true
 				else
 					mg=Auxiliary.GetSynMaterials(tp,c)