fix

expansions/script/c12866775.lua

@@ -53,30 +53,27 @@ end
 function s.matfilter2(c)
 	return c:IsAttribute(ATTRIBUTE_LIGHT) or c:IsAttribute(ATTRIBUTE_DARK)
 end
-function s.eqfilter1(c,tp)
+function s.eqfilter1(c,e,tp)
 	return (c:IsRace(RACE_WARRIOR) or c:IsRace(RACE_FIEND)) and 
-	c:CheckUniqueOnField(tp) and not c:IsForbidden()
+	c:CheckUniqueOnField(tp) and not c:IsForbidden() and c:IsCanBeEffectTarget(e)
 end
-function s.eqfilter2(c,tp)
-	return aux.IsCodeListed(c,12866755) and c:IsType(TYPE_FUSION) and
-	c:CheckUniqueOnField(tp) and (c:IsRace(RACE_WARRIOR) or c:IsRace(RACE_FIEND)) and not c:IsForbidden()
+function s.eqfilter2(c)
+	return aux.IsCodeListed(c,12866755) and c:IsType(TYPE_FUSION)
+end
+function s.check(g)
+	return g:IsExists(s.eqfilter2,1,nil)
 end
 function s.eqtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	local c=e:GetHandler()
-	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and s.eqfilter2(chkc,tp) and 
-	chkc:IsControler(tp) end
+	local g=Duel.GetMatchingGroup(s.eqfilter1,tp,LOCATION_GRAVE,0,nil,e,tp)
+	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and s.eqfilter1(chkc,e,tp) and chkc:IsControler(tp) end
 	local ft=Duel.GetLocationCount(tp,LOCATION_SZONE)
-	if chk==0 then return ft>0
-	and Duel.IsExistingTarget(s.eqfilter2,tp,LOCATION_GRAVE,0,1,nil,tp) end
+	if chk==0 then return ft>0 and #g>0 end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_EQUIP)
 	local ct=math.min(ft,2)
-	local g1=Duel.SelectTarget(tp,s.eqfilter2,tp,LOCATION_GRAVE,0,1,1,nil,tp)
-	if ct>1 and Duel.SelectYesNo(tp,aux.Stringid(id,2)) then
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_EQUIP)
-		local g2=Duel.SelectTarget(tp,s.eqfilter1,tp,LOCATION_GRAVE,0,1,1,g1,tp)
-		g1:Merge(g2)
-	end
-	Duel.SetOperationInfo(0,CATEGORY_LEAVE_GRAVE,g1,g1:GetCount(),0,0)
+	local sg=g:SelectSubGroup(tp,s.check,false,1,ct)
+	Duel.SetTargetCard(sg)
+	Duel.SetOperationInfo(0,CATEGORY_LEAVE_GRAVE,sg,#sg,0,0)
 end
 function s.eqop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c12866785.lua

@@ -30,6 +30,7 @@ function s.initial_effect(c)
 	e2:SetCategory(CATEGORY_DESTROY)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_MZONE)
+	e2:SetCondition(s.descon1)
 	e2:SetCost(s.descost)
 	e2:SetTarget(s.destg)
 	e2:SetOperation(s.desop)
@@ -38,7 +39,7 @@ function s.initial_effect(c)
 	e5:SetType(EFFECT_TYPE_QUICK_O)
 	e5:SetCode(EVENT_FREE_CHAIN)
 	e5:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_END_PHASE)
-	e5:SetCondition(s.descon)
+	e5:SetCondition(s.descon2)
 	c:RegisterEffect(e5)
 	local e4=Effect.CreateEffect(c)
 	e4:SetType(EFFECT_TYPE_SINGLE)
@@ -133,7 +134,10 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Destroy(g,REASON_EFFECT)
 	end
 end
-function s.descon(e,tp,eg,ep,ev,re,r,rp)
+function s.descon1(e,tp,eg,ep,ev,re,r,rp)
+	return not e:GetLabel()==1
+end
+function s.descon2(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetLabel()==1
 end
 function s.valcheck(e,c)

expansions/script/c28322413.lua

@@ -138,12 +138,17 @@ function c28322413.tdcon(e,tp,eg,ep,ev,re,r,rp)
 end
 function c28322413.tdcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.CheckRemoveOverlayCard(tp,1,0,1,REASON_COST) end
-	Duel.RemoveOverlayCard(tp,1,0,1,1,REASON_COST)
+	if e:GetHandler():GetOverlayCount()>1 then
+		Duel.RemoveOverlayCard(tp,1,0,1,1,REASON_COST)
+	else
+		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DEATTACHFROM)
+		local tc=Duel.SelectMatchingCard(tp,Card.CheckRemoveOverlayCard,tp,LOCATION_MZONE,0,1,1,e:GetHandler(),tp,1,REASON_COST):GetFirst()
+		tc:RemoveOverlayCard(tp,1,1,REASON_COST)
+	end
 end
 function c28322413.tdtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_ONFIELD+LOCATION_GRAVE) and chkc:IsAbleToDeck() end
-	local ct=e:GetHandler():GetOverlayGroup():GetCount()
-	if chk==0 then return ct>1 and Duel.IsExistingTarget(Card.IsAbleToDeck,tp,LOCATION_ONFIELD+LOCATION_GRAVE,LOCATION_ONFIELD+LOCATION_GRAVE,1,nil) end
+	if chk==0 then return e:GetHandler():GetOverlayCount()>=1 and Duel.IsExistingTarget(Card.IsAbleToDeck,tp,LOCATION_ONFIELD+LOCATION_GRAVE,LOCATION_ONFIELD+LOCATION_GRAVE,1,nil) end
 	local g=Duel.SelectTarget(tp,Card.IsAbleToDeck,tp,LOCATION_ONFIELD+LOCATION_GRAVE,LOCATION_ONFIELD+LOCATION_GRAVE,1,ct,nil)
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,g,#g,0,0)
 end