byd

expansions/script/c12400057.lua

@@ -221,7 +221,7 @@ function s.cfilters(c)
 	return  c:IsLevel(6)
 end
 function s.drcon(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(s.cfilters,1,nil)
+	return eg:IsExists(s.cfilters,1,e:GetHandler())
 end
 function s.filter(c,e,tp)
 	return c:IsAttribute(ATTRIBUTE_DARK) and c:IsRace(RACE_FIEND,RACE_BEASTWARRIOR) and c:IsType(TYPE_MONSTER) and c:IsLevel(6) and c:GetAttack()==c:GetDefense()

expansions/script/c4271011.lua

@@ -29,9 +29,11 @@ function cm.initial_effect(c)
 			local g=Duel.SelectMatchingCard(tp,cm.tpfilter,tp,LOCATION_DECK,0,1,1,nil)
 			local tc=g:GetFirst()
 			if tc then
-				if Duel.MoveToField(tc,tp,tp,LOCATION_PZONE,POS_FACEUP,true)~=0 then
-					Duel.BreakEffect()
-					Duel.DiscardHand(tp,nil,1,1,REASON_EFFECT+REASON_DISCARD,nil)
+				if Duel.MoveToField(tc,tp,tp,LOCATION_PZONE,POS_FACEUP,true)~=0 and Duel.GetFieldGroupCount(tp,0,LOCATION_HAND)>0 then
+					if Duel.SelectYesNo(tp,aux.Stringid(m,1)) then
+						Duel.BreakEffect()
+						Duel.DiscardHand(tp,aux.TRUE,1,1,REASON_EFFECT+REASON_DISCARD,nil)
+					end
 				end
 			end
 		end)