Replace c52700718.lua

expansions/script/c52700718.lua

@@ -46,7 +46,11 @@ function s.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return Duel.IsExistingTarget(s.thfilter,tp,loc,loc,1,nil,tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SELECT)
 	local g=Duel.SelectTarget(tp,s.thfilter,tp,loc,loc,1,1,nil,tp)
-	--Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,1,0,0)
+	if not g:GetFirst():IsAbleToHand() then
+		Duel.SetOperationInfo(0,CATEGORY_TODECK,g,1,0,0)
+	elseif not g:GetFirst():IsAbleToDeck() then
+		Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,1,0,0)
+	end
 end
 function s.desop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
@@ -84,7 +88,7 @@ function s.ddcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetCurrentPhase()~=PHASE_DRAW
 end
 function s.ddfilter(c,tp)
-	return c:IsControler(1-tp) 
+	return c:IsControler(1-tp) and c:IsLocation(LOCATION_HAND)
 end
 function s.ddtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local g=eg:Filter(s.ddfilter,nil,tp)