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

c74289646.lua

@@ -11,6 +11,7 @@ function c74289646.initial_effect(c)
 	e1:SetOperation(c74289646.operation)
 	c:RegisterEffect(e1)
 end
+c74289646.toss_dice=true
 function c74289646.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	local cl=Duel.GetCurrentChain()
 	if chk==0 then return true end

c90711610.lua

@@ -39,15 +39,15 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
 	if g:GetCount()>0 then
 		Duel.SendtoHand(g,nil,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,g)
+		if Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_HAND,0,1,nil,e,tp)
+			and Duel.CheckRemoveOverlayCard(tp,1,1,1,REASON_EFFECT)
+			and Duel.SelectEffectYesNo(tp,e:GetHandler(),aux.Stringid(id,2)) then
 			Duel.BreakEffect()
-		if Duel.CheckRemoveOverlayCard(tp,1,1,1,REASON_EFFECT) and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_HAND,0,1,nil,e,tp) then
-			if Duel.SelectEffectYesNo(tp,e:GetHandler(),aux.Stringid(id,2)) then
 			Duel.RemoveOverlayCard(tp,1,1,1,1,REASON_EFFECT)
 			local sg=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_HAND,0,1,1,nil,e,tp)
 			Duel.SpecialSummon(sg,0,tp,tp,false,false,POS_FACEUP)
 		end
 	end
-	end
 end
 function s.dtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.CheckRemoveOverlayCard(tp,1,1,1,REASON_EFFECT) end

c99529628.lua

@@ -92,7 +92,7 @@ function s.rmop(e,tp,eg,ep,ev,re,r,rp)
 	local res1,tg1=Duel.GetOperationInfo(0,CATEGORY_REMOVE)
 	local res2,tg2=Duel.GetOperationInfo(0,CATEGORY_SPECIAL_SUMMON)
 	local c,rc,sc=e:GetHandler(),tg1:GetFirst(),tg2:GetFirst()
-	if rc:IsRelateToEffect(e) and rc:IsType(TYPE_MONSTER) and c:IsOnField()
+	if rc:IsRelateToEffect(e) and rc:IsControler(1-tp) and rc:IsType(TYPE_MONSTER) and c:IsOnField()
 		and Duel.Remove(c,POS_FACEUP,REASON_EFFECT)*Duel.Remove(tg1,POS_FACEUP,REASON_EFFECT)>0 then
 		if sc:IsRelateToEffect(e) and sc:IsRace(RACE_FISH) then
 			Duel.SpecialSummon(sc,0,tp,tp,false,false,POS_FACEUP)