fix

expansions/script/c11607017.lua

@@ -33,7 +33,7 @@ function c11607017.matfilter(c)
 end
 -- 1
 function c11607017.thfilter(c)
-	return c:IsRace(RACE_ROCK) and (c:IsLocation(LOCATION_GRAVE) or c:IsLocation(LOCATION_REMOVED))
+	return c:IsRace(RACE_ROCK) and (c:IsLocation(LOCATION_GRAVE) or c:IsLocation(LOCATION_REMOVED)) and c:IsFaceup()
 end
 function c11607017.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return Duel.IsExistingMatchingCard(c11607017.thfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil) end

expansions/script/c11607018.lua

@@ -50,28 +50,28 @@ function c11607018.initial_effect(c)
 end
 --special summon rule functions
 function c11607018.spfilter1(c,fc,tp)
-	return c:IsCode(11607001) and c:IsCanBeFusionMaterial(fc) and c:IsAbleToDeckOrExtraAsCost()
+	return c:IsCode(11607001) and c:IsCanBeFusionMaterial(fc) and c:IsAbleToDeckOrExtraAsCost() and c:IsFaceup()
 end
 function c11607018.spfilter2(c,fc,tp)
-	return c:IsCode(11607003) and c:IsCanBeFusionMaterial(fc) and c:IsAbleToDeckOrExtraAsCost()
+	return c:IsCode(11607003) and c:IsCanBeFusionMaterial(fc) and c:IsAbleToDeckOrExtraAsCost() and c:IsFaceup()
 end
 function c11607018.spfilter3(c,fc,tp)
-	return c:IsCode(11607005) and c:IsCanBeFusionMaterial(fc) and c:IsAbleToDeckOrExtraAsCost()
+	return c:IsCode(11607005) and c:IsCanBeFusionMaterial(fc) and c:IsAbleToDeckOrExtraAsCost() and c:IsFaceup()
 end
 function c11607018.spfilter4(c,fc,tp)
-	return c:IsCode(11607007) and c:IsCanBeFusionMaterial(fc) and c:IsAbleToDeckOrExtraAsCost()
+	return c:IsCode(11607007) and c:IsCanBeFusionMaterial(fc) and c:IsAbleToDeckOrExtraAsCost() and c:IsFaceup()
 end
 function c11607018.spfilter5(c,fc,tp)
-	return c:IsCode(11607009) and c:IsCanBeFusionMaterial(fc) and c:IsAbleToDeckOrExtraAsCost()
+	return c:IsCode(11607009) and c:IsCanBeFusionMaterial(fc) and c:IsAbleToDeckOrExtraAsCost() and c:IsFaceup()
 end
 function c11607018.spfilter6(c,fc,tp)
-	return c:IsCode(11607011) and c:IsCanBeFusionMaterial(fc) and c:IsAbleToDeckOrExtraAsCost()
+	return c:IsCode(11607011) and c:IsCanBeFusionMaterial(fc) and c:IsAbleToDeckOrExtraAsCost() and c:IsFaceup()
 end
 function c11607018.spfilter7(c,fc,tp)
-	return c:IsCode(11607013) and c:IsCanBeFusionMaterial(fc) and c:IsAbleToDeckOrExtraAsCost()
+	return c:IsCode(11607013) and c:IsCanBeFusionMaterial(fc) and c:IsAbleToDeckOrExtraAsCost() and c:IsFaceup()
 end
 function c11607018.spfilter_all(c,fc,tp)
-	return c:IsCode(11607001,11607003,11607005,11607007,11607009,11607011,11607013) and c:IsCanBeFusionMaterial(fc) and c:IsAbleToDeckOrExtraAsCost()
+	return c:IsCode(11607001,11607003,11607005,11607007,11607009,11607011,11607013) and c:IsCanBeFusionMaterial(fc) and c:IsAbleToDeckOrExtraAsCost() and c:IsFaceup()
 end
 function c11607018.fselect(g)
 	return g:GetClassCount(Card.GetCode)==g:GetCount()

expansions/script/c11607024.lua

@@ -45,6 +45,9 @@ function c11607024.activate(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 -- 2
+function c11607024.tdfilter(c)
+	return c:IsSetCard(0x6225) and c:IsAbleToDeck() and c:IsFaceup()
+end
 function c11607024.tdcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsAbleToDeckAsCost() end
 	Duel.SendtoDeck(e:GetHandler(),nil,0,REASON_COST)
@@ -52,20 +55,16 @@ function c11607024.tdcost(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c11607024.tdtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
-	local g1=Duel.GetMatchingGroup(Card.IsSetCard,tp,LOCATION_GRAVE,0,e:GetHandler(),0x6225)
-	local g2=Duel.GetMatchingGroup(Card.IsSetCard,tp,LOCATION_REMOVED,0,nil,0x6225)
-	g1:Merge(g2)
-	if #g1>0 then
-		Duel.SetOperationInfo(0,CATEGORY_TODECK,g1,1,0,0)
+	local g=Duel.GetMatchingGroup(c11607024.tdfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,e:GetHandler())
+	if #g>0 then
+		Duel.SetOperationInfo(0,CATEGORY_TODECK,g,1,0,0)
 	end
 end
 function c11607024.tdop(e,tp,eg,ep,ev,re,r,rp)
-	local g1=Duel.GetMatchingGroup(Card.IsSetCard,tp,LOCATION_GRAVE,0,nil,0x6225)
-	local g2=Duel.GetMatchingGroup(Card.IsSetCard,tp,LOCATION_REMOVED,0,nil,0x6225)
-	g1:Merge(g2)
-	if #g1==0 then return end
+	local g=Duel.GetMatchingGroup(c11607024.tdfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,e:GetHandler())
+	if #g==0 then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
-	local sg=g1:Select(tp,1,4,nil)
+	local sg=g:Select(tp,1,4,nil)
 	if sg:GetCount()>0 then
 		Duel.SendtoDeck(sg,nil,0,REASON_EFFECT)
 		Duel.ShuffleDeck(tp)