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

c17725109.lua

@@ -62,7 +62,7 @@ function s.filter2(c,e,tp,m,f,chkf)
 		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)
 end
 function s.fcheck(tp,sg,fc)
-	return sg:IsExists(Card.IsSetCard,1,nil,0xdd)
+	return sg:IsExists(Card.IsFusionSetCard,1,nil,0xdd)
 end
 function s.fsptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then

c34813545.lua

@@ -90,7 +90,7 @@ function c34813545.filter2(c,e,tp,m,f,chkf)
 		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)
 end
 function c34813545.fcheck(tp,sg,fc)
-	return sg:IsExists(Card.IsSetCard,1,nil,0x2a)
+	return sg:IsExists(Card.IsFusionSetCard,1,nil,0x2a)
 end
 function c34813545.fstg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then

c35098357.lua

@@ -29,7 +29,7 @@ function c35098357.filter2(c,e,tp,m,f,chkf)
 		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)
 end
 function c35098357.fcheck(tp,sg,fc)
-	return sg:IsExists(Card.IsSetCard,1,nil,0x128)
+	return sg:IsExists(Card.IsFusionSetCard,1,nil,0x128)
 end
 function c35098357.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then

c38044854.lua

@@ -36,6 +36,9 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
 	Duel.SetOperationInfo(0,CATEGORY_LEAVE_GRAVE,sg:Filter(Card.IsLocation,nil,LOCATION_GRAVE),1,0,0)
 end
+function s.ovfilter(c,e)
+	return c:IsCanOverlay() and not c:IsImmuneToEffect(e)
+end
 function s.activate(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tg=Duel.GetTargetsRelateToChain()
@@ -45,7 +48,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 	local sc=sg:GetFirst()
 	if sc and Duel.SpecialSummon(sc,SUMMON_TYPE_XYZ,tp,tp,false,false,POS_FACEUP)~=0 then
 		sc:CompleteProcedure()
-		local og=tg:Filter(Card.IsCanOverlay,nil)
+		local og=tg:Filter(s.ovfilter,nil,e)
 		for tc in aux.Next(og) do
 			local mg=tc:GetOverlayGroup()
 			if mg:GetCount()~=0 then

c48654323.lua

@@ -46,9 +46,9 @@ function c48654323.atktgfilter2(c)
 end
 function c48654323.atktg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return false end
-	if chk==0 then return Duel.IsExistingTarget(c48654323.atktgfilter1,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
+	if chk==0 then return Duel.IsExistingTarget(c48654323.atktgfilter1,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil,tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
-	local g=Duel.SelectTarget(tp,c48654323.atktgfilter1,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
+	local g=Duel.SelectTarget(tp,c48654323.atktgfilter1,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil,tp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
 	Duel.SelectTarget(tp,c48654323.atktgfilter2,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,g)
 end

c5908650.lua

@@ -9,6 +9,7 @@ function c5908650.initial_effect(c)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetCountLimit(1)
 	e1:SetCost(c5908650.thcost)
+	e1:SetCondition(c5908650.thcon)
 	e1:SetTarget(c5908650.thtg)
 	e1:SetOperation(c5908650.thop)
 	c:RegisterEffect(e1)
@@ -29,6 +30,9 @@ function c5908650.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	e1:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e1,tp)
 end
+function c5908650.thcon(e,tp,eg,ep,ev,re,r,rp)
+	return e:GetHandler():IsAttribute(ATTRIBUTE_LIGHT)
+end
 function c5908650.aclimit(e,re,tp)
 	return re:IsActiveType(TYPE_MONSTER) and re:GetHandler():IsNonAttribute(ATTRIBUTE_LIGHT)
 end

c62002838.lua

@@ -133,7 +133,8 @@ function s.atktg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc~=c and s.atkfilter(chkc) end
 	if chk==0 then return c:IsAttackAbove(500) and c:IsDefenseAbove(500) and Duel.IsExistingTarget(s.atkfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,c) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
-	Duel.SelectTarget(tp,s.atkfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,c)
+	local tc=Duel.SelectTarget(tp,s.atkfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,c)
+	Duel.SetOperationInfo(0,CATEGORY_DESTROY,tc,1,0,0)
 end
 function s.atkop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

c66518509.lua

@@ -69,9 +69,9 @@ function s.exfilter(c,tp)
 end
 function s.fcheck(tp,sg,fc)
 	if Duel.GetFlagEffect(tp,id)~=0 then
-		return sg:IsExists(Card.IsSetCard,1,nil,0x1a1)
+		return sg:IsExists(Card.IsFusionSetCard,1,nil,0x1a1)
 	else
-		return sg:IsExists(Card.IsSetCard,1,nil,0x1a1) and not sg:IsExists(s.exfilter,1,nil,tp)
+		return sg:IsExists(Card.IsFusionSetCard,1,nil,0x1a1) and not sg:IsExists(s.exfilter,1,nil,tp)
 	end
 end
 function s.target(e,tp,eg,ep,ev,re,r,rp,chk)

c82791472.lua

@@ -74,8 +74,7 @@ function c82791472.aclimit(e,re,tp)
 	return not re:GetHandler():IsSetCard(0x137) and re:IsActiveType(TYPE_MONSTER)
 end
 function c82791472.descon(e,tp,eg,ep,ev,re,r,rp)
-	local ph=Duel.GetCurrentPhase()
-	return ph==PHASE_MAIN1 or ph==PHASE_MAIN2
+	return Duel.IsMainPhase() and e:GetHandler():IsSetCard(0x137)
 end
 function c82791472.destg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsFaceup,tp,0,LOCATION_MZONE,1,nil) end

c87532344.lua

@@ -126,7 +126,7 @@ function s.filter3(c,e)
 	return c:IsOnField() and not c:IsImmuneToEffect(e)
 end
 function s.fcheck(tp,sg,fc)
-	return sg:IsExists(Card.IsSetCard,1,nil,0x1a5)
+	return sg:IsExists(Card.IsFusionSetCard,1,nil,0x1a5)
 end
 function s.futg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then