Merge branch 'master' into develop

expansions/script/c37564006.lua

@@ -19,7 +19,7 @@ function cm.initial_effect(c)
 	Duel.AddCustomActivityCounter(m,ACTIVITY_SPSUMMON,cm.counterfilter)
 end
 function cm.counterfilter(c)
-	return Senya.check_set_elem(c) or c:GetSummonLocation()~=LOCATION_EXTRA
+	return Senya.check_set_elem(c) or not c:IsType(TYPE_XYZ) or c:GetSummonLocation()~=LOCATION_EXTRA
 end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetCustomActivityCount(m,tp,ACTIVITY_SPSUMMON)==0 and
@@ -35,7 +35,7 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_COST+REASON_DISCARD)
 end
 function cm.splimit(e,c,sump,sumtype,sumpos,targetp,se)
-	return not Senya.check_set_elem(c) and c:IsLocation(LOCATION_EXTRA)
+	return not Senya.check_set_elem(c) and c:IsLocation(LOCATION_EXTRA) and not c:IsType(TYPE_XYZ)
 end
 function cm.filter1(c,e,tp)
 	return c:GetRank()==4 and Senya.check_set_elem(c) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,false,false) and Duel.GetLocationCountFromEx(tp,tp,Group.FromCards(e:GetHandler()),c)>0

expansions/script/c37564017.lua

@@ -17,7 +17,7 @@ function cm.initial_effect(c)
 	Duel.AddCustomActivityCounter(m,ACTIVITY_SPSUMMON,cm.counterfilter)
 end
 function cm.counterfilter(c)
-	return Senya.check_set_elem(c) or c:GetSummonLocation()~=LOCATION_EXTRA
+	return Senya.check_set_elem(c) or not c:IsType(TYPE_XYZ) or c:GetSummonLocation()~=LOCATION_EXTRA
 end
 function cm.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetFieldGroupCount(tp,LOCATION_MZONE,0)==0
@@ -36,7 +36,7 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.RegisterEffect(e1,tp)
 end
 function cm.splimit(e,c,sump,sumtype,sumpos,targetp,se)
-	return not Senya.check_set_elem(c) and c:IsLocation(LOCATION_EXTRA)
+	return not Senya.check_set_elem(c) and c:IsLocation(LOCATION_EXTRA) and not c:IsType(TYPE_XYZ)
 end
 function cm.filter(c,e,tp)
 	return Senya.check_set_elem(c) and c:GetRank()==4 and c:IsCanBeSpecialSummoned(e,0,tp,false,false)