c35801101 c35801105

expansions/script/c35801101.lua

@@ -44,7 +44,7 @@ function cm.hspfilter1(c,g,ft)
 	return c:IsType(TYPE_TUNER) and g:IsExists(cm.nott,1,nil)
 end
 function cm.nott(c)
-	return not c:IsType(TYPE_TUNER) and c:IsType(TYPE_MONSTER)
+	return not c:IsType(TYPE_TUNER) and c:IsType(TYPE_MONSTER) and (c:IsFaceup() or c:IsLocation(LOCATION_HAND))
 end
 function cm.hspcon(e,c)
 	if c==nil then return true end
@@ -59,7 +59,9 @@ function cm.hspop(e,tp,eg,ep,ev,re,r,rp,c)
 	local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
 	local g=Duel.GetMatchingGroup(Card.IsOnField,tp,LOCATION_MZONE,0,nil)
 	local hg=Duel.GetMatchingGroup(Card.IsAbleToRemoveAsCost,tp,LOCATION_HAND,0,nil)
-	g:Merge(hg)
+	if hg:IsExists(cm.hspfilter1,1,nil,hg,ft) then
+		g:Merge(hg)
+	end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_OPERATECARD)
 	local g1=g:FilterSelect(tp,cm.hspfilter1,1,1,nil,g,ft)
 	if g1:GetFirst():IsLocation(LOCATION_HAND) then

expansions/script/c35801105.lua

@@ -17,12 +17,12 @@ function cm.initial_effect(c)
 	e1:SetTarget(cm.tg1)
 	e1:SetOperation(cm.op1)
 	c:RegisterEffect(e1)
-	if not aux.checkxyzfusionhack then
-		aux.checkxyzfusionhack=true
-		_hack_fusion_check=Card.CheckFusionMaterial
-		_hack_fusion_select=Duel.SelectFusionMaterial
+	if not aux.checkxyzfusionhack_ove then
+		aux.checkxyzfusionhack_ove=true
+		_hack_fusion_check_ove=Card.CheckFusionMaterial
+		_hack_fusion_select_ove=Duel.SelectFusionMaterial
 		function Card.CheckFusionMaterial(card,Group_fus,Card_g,int_chkf,not_mat)
-			local exc=Duel.GetMatchingGroup(cm.getexc,int_chkf,LOCATION_MZONE,0,nil)
+			local exc=Duel.GetMatchingGroup(cm.getexc,int_chkf,LOCATION_MZONE,LOCATION_MZONE,nil)
 			local exg=Group.CreateGroup()
 			if exc:GetCount()>0 then
 				for tc in aux.Next(exc) do
@@ -35,7 +35,7 @@ function cm.initial_effect(c)
 			if exg:GetCount()>0 then
 				Group_fus:Merge(exg)
 			end
-			return _hack_fusion_check(card,Group_fus,Card_g,int_chkf,not_mat)
+			return _hack_fusion_check_ove(card,Group_fus,Card_g,int_chkf,not_mat)
 		end
 		
 	end