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

c13556444.lua

@@ -20,6 +20,7 @@ function c13556444.spcon(e,tp,eg,ep,ev,re,r,rp)
 end
 function c13556444.spfilter(c,e,tp,tid)
 	return c:GetTurnID()==tid and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+		and c:IsReason(REASON_DESTROY)
 		and (c:IsReason(REASON_BATTLE) or c:IsReason(REASON_EFFECT) and c:GetReasonPlayer()==1-tp)
 end
 function c13556444.sptg(e,tp,eg,ep,ev,re,r,rp,chk)

c26857786.lua

@@ -18,7 +18,7 @@ function s.initial_effect(c)
 	e2:SetCategory(CATEGORY_ATKCHANGE)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e2:SetCode(EVENT_SPSUMMON_SUCCESS)
-	e2:SetProperty(EFFECT_FLAG_DELAY)
+	e2:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_CARD_TARGET)
 	e2:SetCountLimit(1,id+o)
 	e2:SetTarget(s.atktg)
 	e2:SetOperation(s.atkop)

c28642461.lua

@@ -63,6 +63,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
 	local fg=g:Filter(Card.IsRelateToChain,nil)
 	if Duel.IsPlayerAffectedByEffect(tp,59822133) then return end
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<2 then return end
+	if not c:IsCanBeSpecialSummoned(e,0,tp,false,false) or not sc:IsCanBeSpecialSummoned(e,0,tp,false,false) then return end
 	if fg:GetCount()~=2 then return end
 	if Duel.SpecialSummon(fg,0,tp,tp,false,false,POS_FACEUP)~=0 then
 		for tc in aux.Next(fg) do

c56818742.lua

@@ -23,6 +23,7 @@ function s.initial_effect(c)
 	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 	e2:SetCondition(s.drcon)
 	e2:SetOperation(s.regop)
+	c:RegisterEffect(e2)
 	local e3=e2:Clone()
 	e3:SetCode(EVENT_TO_GRAVE)
 	e3:SetCondition(s.regcon)

c67694706.lua

@@ -95,10 +95,12 @@ function s.scop(e,tp,eg,ep,ev,re,r,rp)
 	else
 		local mg=Duel.GetMatchingGroup(Card.IsFaceup,tp,LOCATION_MZONE,0,nil)
 		local exg=Duel.GetMatchingGroup(s.exgfilter,tp,LOCATION_EXTRA,0,nil,mg,c)
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-		local sc=exg:Select(tp,1,1,nil):GetFirst()
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_XMATERIAL)
-		local msg=mg:SelectSubGroup(tp,s.exgselect,false,1,#mg,sc,c)
-		Duel.XyzSummon(tp,sc,msg,#msg,#msg)
+		if exg:GetCount()>0 then
+			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
+			local sc=exg:Select(tp,1,1,nil):GetFirst()
+			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_XMATERIAL)
+			local msg=mg:SelectSubGroup(tp,s.exgselect,false,1,#mg,sc,c)
+			Duel.XyzSummon(tp,sc,msg,#msg,#msg)
+		end
 	end
 end

c90303227.lua

@@ -62,6 +62,7 @@ function s.rmop(e,tp,eg,ep,ev,re,r,rp)
 		local g1=Duel.GetMatchingGroup(Card.IsAbleToRemove,tp,0,LOCATION_ONFIELD,nil)
 		local g2=Duel.GetMatchingGroup(aux.NecroValleyFilter(Card.IsAbleToRemove),tp,0,LOCATION_GRAVE,nil)
 		g1:Merge(g2)
+		if g1:GetCount()==0 then return end
 		aux.GCheckAdditional=s.gcheck
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 		local sg=g1:SelectSubGroup(tp,aux.TRUE,false,1,2)

c91025875.lua

@@ -81,6 +81,7 @@ function s.xyzop(e,tp,eg,ep,ev,re,r,rp)
 	if c:IsControler(1-tp) or not c:IsRelateToEffect(e) or c:IsFacedown() then return end
 	local mg=Duel.GetMatchingGroup(Card.IsFaceup,tp,LOCATION_MZONE,0,nil)
 	local exg=Duel.GetMatchingGroup(s.exgfilter,tp,LOCATION_EXTRA,0,nil,mg,c)
+	if #exg==0 then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	local sc=exg:Select(tp,1,1,nil):GetFirst()
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_XMATERIAL)