eme

expansions/script/c30553258.lua

@@ -81,6 +81,7 @@ function cm.initial_effect(c)
 					Duel.Overlay(c,mg)
 					mg:DeleteGroup()
 				end
+				Duel.ShuffleHand(tp)
 			end)
 	e1:SetValue(SUMMON_TYPE_XYZ)
 	c:RegisterEffect(e1)
@@ -198,7 +199,7 @@ function cm.spzfilter(g,tp)
 end
 function cm.XyzLevelFreeFilter(c,xyzc,f)
 	if c:IsLocation(LOCATION_HAND) and not c:IsSetCard(0x301) then return false end
-	return c:IsCanBeXyzMaterial(xyzc) and c:IsXyzLevel(xyzc,3) and (not f or f(c,xyzc))
+	return c:IsCanBeXyzMaterial(xyzc) and c:IsXyzLevel(xyzc,3) and (not f or f(c,xyzc)) and (c:IsFaceup() or not c:IsLocation(LOCATION_MZONE)) 
 end
 --e3
 function cm.tf3(c,e,tp,m,f,chkf)

expansions/script/c34501310.lua

@@ -17,6 +17,7 @@ function cm.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e2:SetCode(EVENT_TO_HAND)
 	e2:SetRange(LOCATION_PZONE)
+	e2:SetCountLimit(1)
 	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e2:SetCondition(cm.ddcon)
 	e2:SetTarget(cm.ddtg)
@@ -83,7 +84,7 @@ end
 function cm.ddtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local rg=eg:Filter(cm.ddfilter,nil,tp)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and cm.posfilter(chkc) and rg:GetCount()~=0 end
-	if chk==0 then return Duel.IsExistingTarget(cm.posfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
+	if chk==0 then return Duel.IsExistingTarget(cm.posfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) and rg:GetCount()~=0 end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_POSCHANGE)
 	local g=Duel.SelectTarget(tp,cm.posfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
 	Duel.SetOperationInfo(0,CATEGORY_POSITION,g,1,0,0)