fix

expansions/script/c16400007.lua

@@ -90,11 +90,20 @@ function cm.tdcon(e,tp,eg,ep,ev,re,r,rp)
 		return false
 	end
 end
+function cm.sfilter(c,tp)
+	return c:IsLocation(LOCATION_DECK) and c:IsControler(tp)
+end
 function cm.tdop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=e:GetLabelObject()
 	if Duel.SendtoDeck(tc,nil,2,REASON_EFFECT)~=0 then
-		Duel.BreakEffect()
-		Duel.Draw(tp,1,REASON_EFFECT)
+		local g=Duel.GetOperatedGroup()
+		if g:IsExists(cm.sfilter,1,nil,tp) then Duel.ShuffleDeck(tp) end
+		if g:IsExists(cm.sfilter,1,nil,1-tp) then Duel.ShuffleDeck(1-tp) end
+		local ct=g:FilterCount(Card.IsLocation,nil,LOCATION_DECK)
+		if ct==1 then
+			Duel.BreakEffect()
+			Duel.Draw(tp,1,REASON_EFFECT)
+		end
 	end
 end
 function cm.atkval(e,c)

expansions/script/c16400015.lua

@@ -59,14 +59,15 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
 	local g=Duel.SelectMatchingCard(tp,cm.filter1,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
 	if g:GetCount()>0 then
-		local tc=g:GetFirst()
+			local tc=g:GetFirst()
+		Duel.HintSelection(tc)
 		 local e1=Effect.CreateEffect(c)
 		 e1:SetType(EFFECT_TYPE_SINGLE)
 		 e1:SetCode(EFFECT_UPDATE_ATTACK)
 		 e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
 		 e1:SetValue(500)
 		 tc:RegisterEffect(e1)
-		 local e2=Effect.CreateEffect(c)
+		 local e2=e1:Clone()
 		 e2:SetType(EFFECT_TYPE_SINGLE)
 		 e2:SetCode(EFFECT_UPDATE_DEFENSE)
 		 tc:RegisterEffect(e2)