ybb

expansions/script/c20000060.lua

@@ -5,7 +5,7 @@ function c20000060.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetTarget(function(e,tp,eg,ep,ev,re,r,rp,chk)
-		if chk==0 then return Duel.IsExistingMatchingCard(c20000060.tgf1,tp,0,LOCATION_DECK,1,nil) end
+		if chk==0 then return Duel.IsExistingMatchingCard(c20000060.tgf1,tp,0,LOCATION_DECK,1,nil,e,tp) end
 		Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,0,tp,0)
 		Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK)
 	end)

expansions/script/c30553302.lua

@@ -88,11 +88,11 @@ function cm.tgf2(c)
 	return c:IsSetCard(0x308) and c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsSSetable()
 end
 function cm.tg2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_DECK,0,1,nil) end
+	if chk==0 then return Duel.IsExistingMatchingCard(cm.tgf2,tp,LOCATION_DECK,0,1,nil) end
 end
 function cm.op2(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET)
-	local g=Duel.SelectMatchingCard(tp,cm.filter,tp,LOCATION_DECK,0,1,1,nil)
+	local g=Duel.SelectMatchingCard(tp,cm.tgf2,tp,LOCATION_DECK,0,1,1,nil)
 	if g:GetCount()>0 then
 		Duel.SSet(tp,g:GetFirst())
 	end

expansions/script/c67200038.lua

@@ -37,12 +37,12 @@ end
 function c67200038.atktg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	local mg=e:GetHandler():GetMaterial()
 	if mg:GetCount()<1 then return false end
+	local gh=Duel.GetMatchingGroup(aux.TRUE,tp,0,LOCATION_ONFIELD,nil)
 	if chkc then return mg:IsContains(chkc) and c67200038.atkfilter(chkc,e) end
-	if chk==0 then return mg:IsExists(c67200038.atkfilter,1,nil,e) end
+	if chk==0 then return mg:IsExists(c67200038.atkfilter,1,nil,e) and gh:GetCount()>0 end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
 	local g=mg:FilterSelect(tp,c67200038.atkfilter,1,1,nil,e)
 	Duel.SetTargetCard(g)
-	local gh=Duel.GetMatchingGroup(aux.TRUE,tp,0,LOCATION_ONFIELD,nil)
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,gh,1,0,0)
 	Duel.SetChainLimit(c67200038.chainlm)
 end