fix

expansions/script/c12400117.lua

@@ -69,12 +69,15 @@ function s.xyzop(e,tp,chk)
 	if chk==0 then return Duel.GetFlagEffect(tp,id)==0 end
 	Duel.RegisterFlagEffect(tp,id,RESET_PHASE+PHASE_END,EFFECT_FLAG_OATH,1)
 end
+function s.ovfilter2(c,e)
+	return c:IsCanOverlay() and not (e and c:IsImmuneToEffect(e))
+end
 function s.ovfilter3(c)
 	return c:IsCanOverlay() and c:IsFaceupEx() and (c:IsSetCard(0xaf1b) or aux.IsCodeListed(c,12400119))
 end
 function s.ovtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsType(TYPE_XYZ) and 
-	Duel.IsExistingMatchingCard(Card.IsCanOverlay,tp,LOCATION_HAND+LOCATION_ONFIELD,LOCATION_ONFIELD,1,e:GetHandler()) end
+	Duel.IsExistingMatchingCard(s.ovfilter2,tp,LOCATION_HAND+LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil,e) end
 end
 function s.ovop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
@@ -92,15 +95,15 @@ function s.ovop(e,tp,eg,ep,ev,re,r,rp)
 		e2:SetCode(EFFECT_UPDATE_DEFENSE)
 		c:RegisterEffect(e2)
 	end
-	local g1=Duel.GetMatchingGroup(Card.IsCanOverlay,tp,LOCATION_HAND+LOCATION_ONFIELD,LOCATION_ONFIELD,1,c)
+	local g1=Duel.GetMatchingGroup(s.ovfilter2,tp,LOCATION_HAND+LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil,e)
 	if #g1>0 and c:IsRelateToEffect(e) then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_OPERATECARD)
-		local sg1=g1:Select(tp,1,1,c)
+		local sg1=g1:Select(tp,1,1,nil)
 		local g2=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.ovfilter3),tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
 		Duel.Overlay(c,sg1)
 		if #g2>0 and Duel.SelectYesNo(tp,aux.Stringid(id,2)) then 
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_OPERATECARD)
-			local sg2=g2:Select(tp,1,2,nil)
+			local sg2=g2:Select(tp,1,1,nil)
 			Duel.Overlay(c,sg2)
 		end
 	end

expansions/script/c13700047.lua

 --绝对公正之蜻蜓队长
-local s, id = GetID()
+local s,id=GetID()
 function s.initial_effect(c)
 	aux.AddXyzProcedure(c,nil,12,2,s.xyzfilter,aux.Stringid(id,0),2,s.altop)
 	if not s.global_check then
 		s.global_check=true
+		Summon_Count={0,0,0,0}	-- 改名更直观
 		local ge1=Effect.CreateEffect(c)
 		ge1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-		ge1:SetCode(EVENT_SPSUMMON_SUCCESS)
-		ge1:SetOperation(s.chk)
+		ge1:SetCode(EVENT_SPSUMMON_SUCCESS)	-- 改为特殊召唤事件
+		ge1:SetOperation(s.checkop)
 		Duel.RegisterEffect(ge1,0)
+		local ge2=Effect.CreateEffect(c)
+		ge2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+		ge2:SetCode(EVENT_TURN_END)
+		ge2:SetOperation(s.checkop2)
+		Duel.RegisterEffect(ge2,0)
 	end
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_SINGLE)
-	e3:SetCode(EFFECT_CANNOT_DISABLE_SPSUMMON)
-	e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
-	e3:SetCondition(s.spcon3)
-	c:RegisterEffect(e3)
-	local e4=Effect.CreateEffect(c)
-	e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e4:SetCode(EVENT_SPSUMMON_SUCCESS)
-	e4:SetCondition(s.spcon3)
-	e4:SetOperation(s.spop3)
-	c:RegisterEffect(e4)
-	local e6=Effect.CreateEffect(c)
-	e6:SetType(EFFECT_TYPE_FIELD)
-	e6:SetCode(EFFECT_CANNOT_INACTIVATE)
-	e6:SetRange(LOCATION_MZONE)
-	e6:SetValue(s.chainfilter)
-	e6:SetLabel(c:GetFieldID())
-	e6:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	c:RegisterEffect(e6)
+	--①：这张卡的超量召唤不能被无效化。
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetCode(EFFECT_CANNOT_DISABLE_SPSUMMON)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	e1:SetCondition(s.spcon)
+	c:RegisterEffect(e1)
+	--②：超量召唤成功时的效果
+	local e2=Effect.CreateEffect(c)
+	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
+	e2:SetCode(EVENT_SPSUMMON_SUCCESS)
+	e2:SetCondition(s.spcon)
+	e2:SetOperation(s.spop)
+	c:RegisterEffect(e2)
 end
-function s.xyzfilter(c,tp,mg)
-	if not c:IsType(TYPE_MONSTER) then return false end
-	local p=c:GetControler()
-	return Duel.GetFlagEffect(1-p,id)>4
+function s.xyzfilter(c)
+	return c:IsFaceup() and (Summon_Count[1] >= 5 or Summon_Count[2] >= 5)
 end
 function s.altop(e,tp,chk)
-	if chk==0 then return Duel.GetFlagEffect(1-tp,id)>4 end
+	if chk==0 then 
+		return Summon_Count[1-tp+3]>=5 or Summon_Count[1-tp+1]>=5
+	end
 	return true
 end
-function s.chk(e,tp,eg,ep,ev,re,r,rp)
+function s.checkop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=eg:GetFirst()
 	while tc do
-		Duel.RegisterFlagEffect(tc:GetSummonPlayer(),id,RESET_PHASE+PHASE_END,0,2)
+		local p=tc:GetSummonPlayer()
+		Summon_Count[p+3]=Summon_Count[p+3]+1
 		tc=eg:GetNext()
 	end
 end
-function s.chainfilter(e,ct)
-	local te=Duel.GetChainInfo(ct,CHAININFO_TRIGGERING_EFFECT)
-	if not te or not te:GetHandler() then return false end
-	local label=e:GetLabel()
-	if not label then return false end
-	return te:GetHandler():GetFlagEffectLabel(id)~=label
+function s.checkop2(e,tp,eg,ep,ev,re,r,rp)
+	Summon_Count[1]=Summon_Count[3]
+	Summon_Count[2]=Summon_Count[4]
+	Summon_Count[3]=0
+	Summon_Count[4]=0
 end
-function s.spcon3(e,tp,eg,ep,ev,re,r,rp)
+function s.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
 end
-function s.spop3(e,tp,eg,ep,ev,re,r,rp,c)
+function s.spop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if not c:IsSummonType(SUMMON_TYPE_XYZ) then return end
+
 	--跳过战斗阶段
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD)
@@ -68,6 +69,7 @@ function s.spop3(e,tp,eg,ep,ev,re,r,rp,c)
 	e1:SetTargetRange(1,0)
 	e1:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e1,tp)
+
 	--无效化场上的卡的效果
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
@@ -75,68 +77,58 @@ function s.spop3(e,tp,eg,ep,ev,re,r,rp,c)
 	e2:SetTargetRange(LOCATION_ONFIELD,LOCATION_ONFIELD)
 	e2:SetTarget(s.disable)
 	e2:SetReset(RESET_PHASE+PHASE_END)
-	e2:SetLabel(c:GetFieldID())
 	Duel.RegisterEffect(e2,tp)
+
 	--不会被无效化
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
 	e3:SetCode(EFFECT_CANNOT_INACTIVATE)
+	e3:SetValue(1)
 	e3:SetReset(RESET_PHASE+PHASE_END)
-	e3:SetValue(s.efilter)
 	Duel.RegisterEffect(e3,tp)
 	local e4=e3:Clone()
 	e4:SetCode(EFFECT_CANNOT_DISEFFECT)
 	Duel.RegisterEffect(e4,tp)
-	--不会被破坏，不能成为效果对象，不能除外，不受其他效果影响
+
+	--保护效果
 	local e5=Effect.CreateEffect(c)
 	e5:SetType(EFFECT_TYPE_FIELD)
 	e5:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
-	e5:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
 	e5:SetTargetRange(LOCATION_ONFIELD,LOCATION_ONFIELD)
-	e5:SetTarget(aux.TargetBoolFunction(Card.IsControler,tp))
 	e5:SetValue(1)
 	e5:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e5,tp)
-	
 	local e6=e5:Clone()
 	e6:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
 	Duel.RegisterEffect(e6,tp)
-	
 	local e7=e5:Clone()
 	e7:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
 	e7:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
-	e7:SetValue(aux.tgoval)
 	Duel.RegisterEffect(e7,tp)
-	
 	local e8=e5:Clone()
 	e8:SetCode(EFFECT_CANNOT_REMOVE)
 	Duel.RegisterEffect(e8,tp)
-	
-	local e11=e5:Clone()
-	e11:SetCode(EFFECT_IMMUNE_EFFECT)
-	e11:SetValue(s.efilter2)
-	Duel.RegisterEffect(e11,tp)
+	local e9=e5:Clone()
+	e9:SetCode(EFFECT_IMMUNE_EFFECT)
+	e9:SetValue(s.efilter)
+	Duel.RegisterEffect(e9,tp)
 
 	--伤害变成0
-	local e9=Effect.CreateEffect(c)
-	e9:SetType(EFFECT_TYPE_FIELD)
-	e9:SetCode(EFFECT_CHANGE_DAMAGE)
-	e9:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
-	e9:SetTargetRange(1,1)
-	e9:SetValue(0)
-	e9:SetReset(RESET_PHASE+PHASE_END)
-	Duel.RegisterEffect(e9,tp)
-	local e10=e9:Clone()
-	e10:SetCode(EFFECT_NO_EFFECT_DAMAGE)
+	local e10=Effect.CreateEffect(c)
+	e10:SetType(EFFECT_TYPE_FIELD)
+	e10:SetCode(EFFECT_CHANGE_DAMAGE)
+	e10:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
+	e10:SetTargetRange(1,1)
+	e10:SetValue(0)
+	e10:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e10,tp)
-	c:RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1,c:GetFieldID())
-end
-function s.efilter(e,ct)
-	return true
-end
-function s.efilter2(e,re)
-	return e:GetOwnerPlayer()~=re:GetOwnerPlayer() and re:IsActivated()
+	local e11=e10:Clone()
+	e11:SetCode(EFFECT_NO_EFFECT_DAMAGE)
+	Duel.RegisterEffect(e11,tp)
 end
 function s.disable(e,c)
-	return c:GetFlagEffectLabel(id)~=e:GetLabel() and (not c:IsType(TYPE_MONSTER) or (c:IsType(TYPE_EFFECT) or bit.band(c:GetOriginalType(),TYPE_EFFECT)==TYPE_EFFECT))
+	return c~=e:GetHandler()
+end
+function s.efilter(e,te)
+	return te:GetOwnerPlayer()~=e:GetHandlerPlayer()
 end
\ No newline at end of file

expansions/script/c5012633.lua

@@ -4,6 +4,14 @@ local s,id,o=GetID()
 s.MoJin=true
 function cm.initial_effect(c)
 	aux.AddCodeList(c,5012604)
+	--不能特招
+	local e10=Effect.CreateEffect(c)
+	e10:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	e10:SetType(EFFECT_TYPE_SINGLE)
+	e10:SetCode(EFFECT_SPSUMMON_CONDITION)
+	e10:SetValue(aux.FALSE)
+	c:RegisterEffect(e10)
+	--disable spsummon
 	--爱丽丝漫游仙境--
 	 local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
@@ -13,9 +21,6 @@ function cm.initial_effect(c)
 	e2:SetTargetRange(1,1)
 	e2:SetTarget(s.sp)
 	c:RegisterEffect(e2)
-	local e0=e2:Clone()
-	e0:SetCode(EFFECT_CANNOT_SUMMON)
-	c:RegisterEffect(e0)
 
 	local e3=Effect.CreateEffect(c)
 	e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)	

expansions/script/c52798050.lua

@@ -25,7 +25,7 @@ function s.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_GRAVE)
 	e2:SetCountLimit(1,id+1)
-	e2:SetCondition(s.qcon1)
+	e2:SetCondition(s.qcon3)
 	e2:SetCost(s.spcost2)
 	e2:SetTarget(s.sptg2)
 	e2:SetOperation(s.spop3)
@@ -44,10 +44,10 @@ function s.qfilter2(c)
 	return c:IsSetCard(0x9528) and c:IsFaceup()
 end
 function s.qcon1(e,tp,eg,ep,ev,re,r,rp)
-	return not Duel.IsExistingMatchingCard(s.qfilter,tp,LOCATION_MZONE,0,1,nil)
+	return not Duel.IsExistingMatchingCard(s.qfilter1,tp,LOCATION_MZONE,0,1,nil)
 end
 function s.qcon2(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.IsExistingMatchingCard(s.qfilter,tp,LOCATION_MZONE,0,1,nil)
+	return Duel.IsExistingMatchingCard(s.qfilter1,tp,LOCATION_MZONE,0,1,nil)
 end
 function s.spcost1(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()

expansions/script/c53718013.lua

@@ -15,7 +15,6 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e1)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(m,1))
-	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetCode(EVENT_CHAINING)
 	e2:SetRange(LOCATION_GRAVE)

expansions/script/c53718014.lua

@@ -15,7 +15,6 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e1)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(m,1))
-	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetCode(EVENT_CHAINING)
 	e2:SetRange(LOCATION_GRAVE)

expansions/script/c53718015.lua

@@ -15,7 +15,6 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e1)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(m,1))
-	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetCode(EVENT_CHAINING)
 	e2:SetRange(LOCATION_GRAVE)

expansions/script/c53718016.lua

@@ -14,7 +14,6 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e1)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(m,1))
-	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetCode(EVENT_CHAINING)
 	e2:SetRange(LOCATION_GRAVE)

expansions/script/c60000156.lua

@@ -199,7 +199,7 @@ function cm.eqop5(e,tp,eg,ep,ev,re,r,rp)
 			if Duel.Equip(tp,ec,c,true) then
 				local e1=Effect.CreateEffect(ec)
 				e1:SetType(EFFECT_TYPE_SINGLE)
-				e1:SetProperty(EFFECT_FLAG_COPY_INHERIT+EFFECT_FLAG_OWNER_RELATE+EFFECT_FLAG_CANNOT_DISABLE)
+				e1:SetProperty(EFFECT_FLAG_OWNER_RELATE+EFFECT_FLAG_CANNOT_DISABLE)
 				e1:SetCode(EFFECT_EQUIP_LIMIT)
 				e1:SetLabelObject(c)
 				e1:SetValue(cm.teqlimit)

expansions/script/c79250065.lua

@@ -4,8 +4,9 @@ s.setcard="Abnormality"
 function s.initial_effect(c)
 	-- 盖放效果
 	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_IGNITION)
+	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_INACTIVATE)
+	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetCountLimit(1,id)
 	e1:SetRange(LOCATION_DECK)
 	e1:SetCondition(s.setcon)
@@ -43,6 +44,7 @@ end
 
 function s.setcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetTurnPlayer()==tp 
+		and Duel.IsMainPhase()
 		and Duel.IsExistingMatchingCard(s.setfilter,tp,LOCATION_MZONE,0,1,nil)
 		and Duel.GetLocationCount(tp,LOCATION_SZONE)>0
 end

expansions/script/c81902092.lua

@@ -80,15 +80,14 @@ function cm.posop(e,tp,eg,ep,ev,re,r,rp)
 	if #g>0 then
 		Duel.Hint(HINTMSG_SELECT,tp,HINTMSG_OPERATECARD)
 		local tc=g:Select(tp,1,1,nil):GetFirst()
+		if not tc:IsImmuneToEffect(e) then
 			local mg=tc:GetOverlayGroup()
 			if mg:GetCount()>0 then Duel.Overlay(c,mg,false) end
 			Duel.Overlay(c,Group.FromCards(tc))
 		end
+	end  
 end
 --overlay
-function cm.matfilter(c,tc)
-	return c:IsCanOverlay() and c:IsCanBeXyzMaterial(tc) and c:IsType(TYPE_MONSTER)
-end
 function cm.exfilter(c)
 	return c:IsAbleToExtraAsCost() and c:IsType(TYPE_XYZ)
 end
@@ -111,12 +110,14 @@ function cm.ovop(e,tp,eg,ep,ev,re,r,rp)
 	if #g>0 then
 		Duel.Hint(HINTMSG_SELECT,tp,HINTMSG_OPERATECARD)
 		local tc=g:Select(tp,1,1,nil):GetFirst()
+		if not tc:IsImmuneToEffect(e) then
 			local og=tc:GetOverlayGroup()
 			if og:GetCount()>0 then
 				Duel.SendtoGrave(og,REASON_RULE)
 			end
 			Duel.Overlay(c,Group.FromCards(tc))
 		end
+	end  
 end
 
 

expansions/script/c81902607.lua

@@ -193,16 +193,16 @@ function cm.ffilter(c,e,tp)
 	return c:IsType(TYPE_XYZ) and c:IsSetCard(0xc851) and Duel.IsExistingMatchingCard(cm.spfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp,no)
 end
 function cm.spfilter(c,e,tp,no)
-	return c.TC_number and c.TC_number==no and c:IsSetCard(0x851) and not (c:IsSetCard(0x3851,0x6851,0xa851,0xc851)) and c:IsType(TYPE_XYZ) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,true,false) and Duel.GetLocationCountFromEx(tp)>0
+	return c.TC_number and c.TC_number==no and c:IsSetCard(0x851) and not (c:IsSetCard(0x3851,0x6851,0xa851,0xc851)) and c:IsType(TYPE_XYZ) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,true,false) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetLocationCountFromEx(tp,LOCATION_MZONE)>0
+	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and Duel.IsExistingMatchingCard(cm.ffilter,tp,LOCATION_EXTRA,0,1,nil,e,tp) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if Duel.GetLocationCountFromEx(tp)<=0 then return end
+	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM)
 	local tc=Duel.SelectMatchingCard(tp,cm.ffilter,tp,LOCATION_EXTRA,0,1,1,nil,e,tp):GetFirst()
 	if tc then

expansions/script/c81907127.lua

@@ -25,8 +25,8 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 --fusion
-function cm.filter0(c)
-	return c:IsOnField() and c:IsAbleToRemove()
+function cm.filter0(c,e)
+	return c:IsOnField() and c:IsAbleToRemove() and not c:IsImmuneToEffect(e)
 end
 function cm.filter1(c,e)
 	return c:IsOnField() and c:IsAbleToRemove() and not c:IsImmuneToEffect(e)
@@ -41,8 +41,8 @@ end
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then
 		local chkf=tp
-		local mg=Duel.GetFusionMaterial(1-tp):Filter(cm.filter0,nil)
-		local mg1=Duel.GetFusionMaterial(tp):Filter(cm.filter0,nil)
+		local mg=Duel.GetFusionMaterial(1-tp):Filter(cm.filter0,nil,e)
+		local mg1=Duel.GetFusionMaterial(tp):Filter(cm.filter0,nil,e)
 		mg1:Merge(mg)
 		local mg2=Duel.GetMatchingGroup(cm.filter3,tp,LOCATION_GRAVE,LOCATION_GRAVE,nil)
 		mg1:Merge(mg2)