得得得得得

expansions/script/c17032790.lua

@@ -37,7 +37,7 @@ function c17032790.cfilter(c,e,tp)
 	local g=e:GetHandler():GetOverlayGroup():Filter(c17032790.spfilter,nil,e,tp)
 	local b1=Duel.IsExistingMatchingCard(c17032790.tgfilter,tp,LOCATION_DECK,0,1,nil,c) and c:IsAbleToGrave()
 	local b2=Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-	return b1 or (b2 and #g>0 and c~=e:GetHandler())
+	return b1 or (b2 and #g>0 and c~=e:GetHandler() and c:IsCanOverlay())
 end
 function c17032790.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and c17032790.cfilter(chkc,e,tp) end
@@ -60,7 +60,7 @@ function c17032790.operation(e,tp,eg,ep,ev,re,r,rp)
 		opval[off-1]=1
 		off=off+1
 	end
-	if b2 and #g>0 and tc~=c then
+	if b2 and #g>0 and tc~=c and tc:IsCanOverlay() then
 		ops[off]=aux.Stringid(17032790,3)
 		opval[off-1]=2
 		off=off+1

expansions/script/c33400711.lua

@@ -41,18 +41,22 @@ function cm.setop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.SelectMatchingCard(tp,cm.filter,tp,LOCATION_DECK,0,1,1,nil)
 	Duel.SSet(tp,tc)
 	if Duel.IsExistingMatchingCard(cm.ckfilter,tp,0,LOCATION_ONFIELD,1,nil) then
-	local e1=Effect.CreateEffect(e:GetHandler())
+			 if tc:IsType(TYPE_TRAP) then 
+				local e1=Effect.CreateEffect(e:GetHandler())
 				e1:SetType(EFFECT_TYPE_SINGLE)
 				e1:SetCode(EFFECT_TRAP_ACT_IN_SET_TURN)
 				e1:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
 				e1:SetReset(RESET_EVENT+RESETS_STANDARD)
 				tc:RegisterEffect(e1)
+			end
+			if tc:IsType(TYPE_QUICKPLAY) then 
 				local e2=Effect.CreateEffect(e:GetHandler())
 				e2:SetType(EFFECT_TYPE_SINGLE)
 				e2:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
 				e2:SetCode(EFFECT_QP_ACT_IN_SET_TURN)
 				e2:SetReset(RESET_EVENT+RESETS_STANDARD)
 				tc:RegisterEffect(e2)
+			end
 	end
 end