watele

expansions/script/c66915075.lua

@@ -5,13 +5,13 @@ function cm.initial_effect(c)
 	--fusion material
 	c:EnableReviveLimit()
 	aux.AddFusionProcFunRep(c,cm.fsilter,2,true)
-	--splimit
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
-	e1:SetCode(EFFECT_SPSUMMON_CONDITION)
-	e1:SetValue(cm.splimit)
-	c:RegisterEffect(e1)   
+	--material limit
+	local e0=Effect.CreateEffect(c)
+	e0:SetType(EFFECT_TYPE_SINGLE)
+	e0:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	e0:SetCode(EFFECT_MATERIAL_LIMIT)
+	e0:SetValue(cm.matlimit)
+	c:RegisterEffect(e0)
 	--code
 	aux.EnableChangeCode(c,m-5,LOCATION_MZONE+LOCATION_GRAVE) 
 	local e1=Effect.CreateEffect(c)
@@ -38,9 +38,13 @@ function cm.initial_effect(c)
 	e2:SetOperation(cm.desop)
 	c:RegisterEffect(e2)
 end
-function cm.splimit(e,se,sp,st)
-	if not StarLight_from_K then return true end
-	return not StarLight_from_K.Brightstarlight_Effect[se]
+function cm.matlimit(e,c,fc,st)
+	if st~=SUMMON_TYPE_FUSION then return true end
+	if c:IsType(TYPE_TRAP+TYPE_SPELL) then
+		return c:IsControler(fc:GetControler()) and c:IsLocation(LOCATION_ONFIELD)
+	else
+		return true
+	end
 end
 function cm.ffilter(c)
 	return c:IsFusionType(TYPE_FUSION) and c:IsRace(RACE_FAIRY)
@@ -49,7 +53,7 @@ function cm.ffilter2(c)
 	return c:IsOriginalCodeRule(66915070) and c:IsFusionType(TYPE_FUSION)
 end
 function cm.ffilter3(c)
-	return c:IsFusionType(TYPE_NORMAL)
+	return c:IsFusionType(TYPE_TRAP+TYPE_SPELL) 
 end
 function cm.fsilter(c,fc,sub,mg,sg)
 	if not sg then