Merge branch 'PHNI' into master

c13744068.lua

@@ -35,9 +35,9 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return false end
 	local rg=Duel.GetMatchingGroup(s.cfilter,tp,LOCATION_MZONE,0,nil,e)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) and rg:CheckSubGroup(s.fselect,2,2) end
+		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) and rg:CheckSubGroup(s.fselect,1,2) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
-	local sg=rg:SelectSubGroup(tp,s.fselect,false,2,2)
+	local sg=rg:SelectSubGroup(tp,s.fselect,false,1,2)
 	Duel.SetTargetCard(sg)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
 end
@@ -75,4 +75,4 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetValue(atk)
 		c:RegisterEffect(e1)
 	end
-end
\ No newline at end of file
+end

c88284599.lua

@@ -42,6 +42,14 @@ function s.sprop(e,tp,eg,ep,ev,re,r,rp,c)
 	local g=Duel.GetMatchingGroup(s.sprfilter,tp,LOCATION_GRAVE+LOCATION_HAND,0,nil)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
 	local sg=g:SelectSubGroup(tp,s.gcheck,false,2,2)
+	local hg=sg:Filter(Card.IsLocation,nil,LOCATION_HAND)
+	if #hg>0 then
+		Duel.ConfirmCards(1-tp,hg)
+	end
+	local gg=sg:Filter(Card.IsLocation,nil,LOCATION_GRAVE)
+	if #gg>0 then
+		Duel.HintSelection(gg)
+	end
 	Duel.SendtoDeck(sg,nil,2,REASON_COST)
 end
 function s.con(e,tp,eg,ep,ev,re,r,rp)
@@ -89,4 +97,4 @@ end
 function s.tdop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=e:GetLabelObject()
 	Duel.SendtoDeck(tc,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
-end
\ No newline at end of file
+end