update

c16114248.lua

@@ -6,8 +6,8 @@ function c16114248.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e1:SetCode(EFFECT_FUSION_MATERIAL)
-	e1:SetCondition(c16114248.fscondition)
-	e1:SetOperation(c16114248.fsoperation)
+	e1:SetCondition(c16114248.fscon)
+	e1:SetOperation(c16114248.fsop)
 	c:RegisterEffect(e1)
 	--direct attack
 	local e2=Effect.CreateEffect(c)
@@ -15,22 +15,32 @@ function c16114248.initial_effect(c)
 	e2:SetCode(EFFECT_DIRECT_ATTACK)
 	c:RegisterEffect(e2)
 end
+function c16114248.filter(c,fc)
+	return c:IsRace(RACE_MACHINE) and c:IsCanBeFusionMaterial(fc)
+end
 function c16114248.spfilter(c,mg)
-	return c:IsRace(RACE_MACHINE) and mg:IsExists(c16114248.spfilter2,1,c,c:GetCode())
+	return mg:IsExists(c16114248.spfilter2,1,c,c)
 end
-function c16114248.spfilter2(c,code)
-	return c:IsRace(RACE_MACHINE) and c:IsCode(code)
+function c16114248.spfilter2(c,mc)
+	return c:IsFusionCode(mc:GetFusionCode())
 end
-function c16114248.fscondition(e,mg,gc)
-	if mg==nil then return true end
-	if gc then return false end
+function c16114248.fscon(e,g,gc)
+	if g==nil then return true end
+	local mg=g:Filter(c16114248.filter,gc,e:GetHandler())
+	if gc then return c16114248.filter(gc,e:GetHandler()) and c16114248.spfilter(gc,mg) end
 	return mg:IsExists(c16114248.spfilter,1,nil,mg)
 end
-function c16114248.fsoperation(e,tp,eg,ep,ev,re,r,rp,gc)
+function c16114248.fsop(e,tp,eg,ep,ev,re,r,rp,gc)
+	local mg=eg:Filter(c16114248.filter,gc,e:GetHandler())
+	local g1=nil
+	local mc=gc
+	if not gc then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL)
-	local g1=eg:FilterSelect(tp,c16114248.spfilter,1,1,nil,eg)
+		g1=mg:FilterSelect(tp,c16114248.spfilter,1,1,nil,mg)
+		mc=g1:GetFirst()
+	end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL)
-	local g2=eg:FilterSelect(tp,c16114248.spfilter2,1,1,g1:GetFirst(),g1:GetFirst():GetCode())
-	g1:Merge(g2)
-	Duel.SetFusionMaterial(g1)
+	local g2=mg:FilterSelect(tp,c16114248.spfilter2,1,1,mc,mc)
+	if g1 then g2:Merge(g1) end
+	Duel.SetFusionMaterial(g2)
 end