fix

expansions/script/c12847577.lua

@@ -74,6 +74,7 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then
 		local chkf=tp
 		local mg1=Group.CreateGroup()
+		local mg4=Group.CreateGroup()
 		local mg3=Duel.GetMatchingGroup(s.filter3,tp,LOCATION_HAND,0,c)
 		if #mg3>0 and Duel.GetFlagEffect(1-tp,id)>0 then 
 			mg1:Merge(mg3)
@@ -95,14 +96,19 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 			mg1:Merge(mg7)
 		end
 		local ge=c:IsHasEffect(EFFECT_TO_GRAVE_REDIRECT)
+		if ge and ge:GetValue()&LOCATION_DECK and c:IsCanBeFusionMaterial()
+		and c:IsAbleToGrave() and Duel.GetFlagEffect(1-tp,id+1)>0 then 
+			mg4:AddCard(c)
+		end
 		if not ge and c:IsCanBeFusionMaterial()
 		and c:IsAbleToRemove() and Duel.GetFlagEffect(1-tp,id+3)>0 then 
-			mg1:AddCard(c)
+			mg4:AddCard(c)
 		end
 		if ge and ge:GetValue()&LOCATION_REMOVED and c:IsCanBeFusionMaterial()
 		and c:IsAbleToDeck() and Duel.GetFlagEffect(1-tp,id+4)>0 then 
-			mg1:AddCard(c)
+			mg4:AddCard(c)
 		end
+		if #mg4>0 then mg1:Merge(mg4) end
 		Auxiliary.FCheckAdditional=s.fcheck
 		Auxiliary.GCheckAdditional=s.gcheck
 		local res=Duel.IsExistingMatchingCard(s.filter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg1,nil,chkf)

expansions/script/c28315947.lua

 	--闪耀的萤火 樋口円香
 function c28315947.initial_effect(c)
+	aux.AddCodeList(c,28316050)
 	--spsummon
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(28315947,0))

expansions/script/c28316556.lua

 --闪耀的萤火 市川雏菜
 function c28316556.initial_effect(c)
+	aux.AddCodeList(c,28316050)
 	--spsummon
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(28316556,0))
@@ -47,7 +48,7 @@ function c28316556.spop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c28316556.thfilter(c)
-	return c:IsSetCard(0x283) and (c:IsLocation(LOCATION_GRAVE) or c:IsFaceup()) and c:IsAbleToHand()
+	return c:IsSetCard(0x283) and c:IsFaceupEx() and c:IsAbleToHand()
 end
 function c28316556.dctg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c28316556.thfilter,tp,LOCATION_GRAVE+LOCATION_EXTRA,0,1,nil) end