Merge remote-tracking branch 'upstream/PHNI' into master

c13567610.lua

@@ -22,6 +22,7 @@ function s.initial_effect(c)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCountLimit(1)
 	e2:SetCondition(s.aucon)
+	e2:SetTarget(s.autarget)
 	e2:SetOperation(s.auop)
 	c:RegisterEffect(e2)
 	--to deck
@@ -51,6 +52,9 @@ end
 function s.aucon(e,tp,eg,ep,ev,re,r,rp)
 	return rp==1-tp and re:IsActiveType(TYPE_MONSTER)
 end
+function s.autarget(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return rp==1-tp end
+end
 function s.auop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then

c85698115.lua

@@ -27,7 +27,7 @@ function c85698115.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function s.spfilter(c,e,tp)
-	return c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP,1-tp)
 end
 function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(1-tp) and s.spfilter(chkc,e,tp) end