Merge remote-tracking branch 'wind/patch-exsummon' into develop

c40441990.lua

@@ -29,7 +29,8 @@ function c40441990.sumcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.DiscardHand(tp,c40441990.costfilter,1,1,REASON_COST+REASON_DISCARD)
 end
 function c40441990.sumtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsPlayerCanSummon(tp) end
+	if chk==0 then return Duel.IsPlayerCanSummon(tp) and Duel.IsPlayerCanAdditionalSummon(tp)
+		and Duel.GetFlagEffect(tp,40441990)==0 end
 end
 function c40441990.sumop(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetFlagEffect(tp,40441990)~=0 then return end

c42472002.lua

@@ -39,7 +39,6 @@ function c42472002.effop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
-	e1:SetCondition(c42472002.sumcon)
 	e1:SetTarget(c42472002.sumtg)
 	e1:SetOperation(c42472002.sumop)
 	e1:SetReset(RESET_EVENT+RESETS_STANDARD)
@@ -53,21 +52,22 @@ function c42472002.effop(e,tp,eg,ep,ev,re,r,rp)
 		rc:RegisterEffect(e2,true)
 	end
 end
-function c42472002.sumcon(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.GetFlagEffect(tp,42472002)==0 and Duel.GetTurnPlayer()==tp
-end
 function c42472002.sumtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsPlayerCanSummon(tp) and Duel.IsPlayerCanAdditionalSummon(tp) end
+	if chk==0 then return Duel.IsPlayerCanSummon(tp) and Duel.IsPlayerCanAdditionalSummon(tp)
+		and Duel.GetFlagEffect(tp,42472002)==0 and Duel.GetTurnPlayer()==tp end
 end
 function c42472002.sumop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	local e1=Effect.CreateEffect(c)
-	e1:SetDescription(aux.Stringid(42472002,1))
-	e1:SetType(EFFECT_TYPE_FIELD)
-	e1:SetCode(EFFECT_EXTRA_SUMMON_COUNT)
-	e1:SetTargetRange(LOCATION_HAND+LOCATION_MZONE,0)
-	e1:SetReset(RESET_PHASE+PHASE_END)
-	Duel.RegisterEffect(e1,tp)
+	if Duel.GetFlagEffect(tp,42472002)==0 then
+		local e1=Effect.CreateEffect(c)
+		e1:SetDescription(aux.Stringid(42472002,1))
+		e1:SetType(EFFECT_TYPE_FIELD)
+		e1:SetCode(EFFECT_EXTRA_SUMMON_COUNT)
+		e1:SetTargetRange(LOCATION_HAND+LOCATION_MZONE,0)
+		e1:SetReset(RESET_PHASE+PHASE_END)
+		Duel.RegisterEffect(e1,tp)
+		Duel.RegisterFlagEffect(tp,42472002,RESET_PHASE+PHASE_END,0,1)
+	end
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
@@ -76,7 +76,6 @@ function c42472002.sumop(e,tp,eg,ep,ev,re,r,rp)
 	e2:SetTarget(c42472002.splimit)
 	e2:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e2,tp)
-	Duel.RegisterFlagEffect(tp,42472002,RESET_PHASE+PHASE_END,0,1)
 end
 function c42472002.splimit(e,c)
 	return not c:IsSetCard(0x107a) and c:IsLocation(LOCATION_EXTRA)

c52112003.lua

@@ -9,7 +9,9 @@ function c52112003.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c52112003.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)>0 end
+	if chk==0 then return Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)>0
+		and Duel.IsPlayerCanSummon(tp) and Duel.IsPlayerCanAdditionalSummon(tp)
+		and Duel.GetFlagEffect(tp,52112003)==0 end
 end
 function c52112003.activate(e,tp,eg,ep,ev,re,r,rp)
 	local ct=math.min(5,Duel.GetFieldGroupCount(tp,LOCATION_DECK,0))

c5795882.lua

@@ -11,7 +11,6 @@ function c5795882.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_SZONE)
 	e2:SetCountLimit(1)
-	e2:SetCondition(c5795882.sumcon)
 	e2:SetCost(c5795882.sumcost)
 	e2:SetTarget(c5795882.sumtg)
 	e2:SetOperation(c5795882.sumop)
@@ -29,17 +28,16 @@ function c5795882.initial_effect(c)
 	e3:SetOperation(c5795882.recop)
 	c:RegisterEffect(e3)
 end
-function c5795882.sumcon(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.GetFlagEffect(tp,5795882)==0
-end
 function c5795882.sumcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.CheckLPCost(tp,500) end
 	Duel.PayLPCost(tp,500)
 end
 function c5795882.sumtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsPlayerCanSummon(tp) and Duel.IsPlayerCanAdditionalSummon(tp) end
+	if chk==0 then return Duel.IsPlayerCanSummon(tp) and Duel.IsPlayerCanAdditionalSummon(tp)
+		and Duel.GetFlagEffect(tp,5795882)==0 end
 end
 function c5795882.sumop(e,tp,eg,ep,ev,re,r,rp)
+	if Duel.GetFlagEffect(tp,5795882)~=0 then return end
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetDescription(aux.Stringid(5795882,2))
 	e1:SetType(EFFECT_TYPE_FIELD)

c61322713.lua

@@ -18,7 +18,6 @@ function c61322713.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_GRAVE)
 	e2:SetCountLimit(1,61322714)
-	e2:SetCondition(c61322713.sumcon)
 	e2:SetCost(c61322713.cost2)
 	e2:SetTarget(c61322713.sumtg)
 	e2:SetOperation(c61322713.sumop)
@@ -65,9 +64,6 @@ function c61322713.activate(e,tp,eg,ep,ev,re,r,rp)
 		end
 	end
 end
-function c61322713.sumcon(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.GetFlagEffect(tp,61322713)==0
-end
 function c61322713.cost2(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if chk==0 then return c61322713.cost1(e,tp,eg,ep,ev,re,r,rp,0) and c:IsAbleToRemove() end
@@ -75,9 +71,11 @@ function c61322713.cost2(e,tp,eg,ep,ev,re,r,rp,chk)
 	c61322713.cost1(e,tp,eg,ep,ev,re,r,rp,1)
 end
 function c61322713.sumtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsPlayerCanSummon(tp) and Duel.IsPlayerCanAdditionalSummon(tp) end
+	if chk==0 then return Duel.IsPlayerCanSummon(tp) and Duel.IsPlayerCanAdditionalSummon(tp)
+		and Duel.GetFlagEffect(tp,61322713)==0 end
 end
 function c61322713.sumop(e,tp,eg,ep,ev,re,r,rp)
+	if Duel.GetFlagEffect(tp,61322713)~=0 then return end
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetDescription(aux.Stringid(61322713,2))
 	e1:SetType(EFFECT_TYPE_FIELD)

c76290637.lua

@@ -37,7 +37,8 @@ function s.thfilter(c)
 	return c:IsType(TYPE_SPELL) and c:IsSetCard(0x95) and c:IsAbleToHand()
 end
 function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,nil) end
+	if chk==0 then return Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,nil)
+		and Duel.IsPlayerCanSummon(tp) and Duel.IsPlayerCanAdditionalSummon(tp) end
 	Duel.Hint(HINT_OPSELECTED,1-tp,e:GetDescription())
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
 end

c78665705.lua

@@ -25,7 +25,9 @@ function c78665705.filter(c)
 	return c:IsCode(10000010) and c:IsAbleToHand()
 end
 function c78665705.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(c78665705.filter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil) end
+	if chk==0 then return Duel.IsExistingMatchingCard(c78665705.filter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil)
+		and Duel.IsPlayerCanSummon(tp) and Duel.IsPlayerCanAdditionalSummon(tp)
+		and Duel.GetFlagEffect(tp,78665705)==0 end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK+LOCATION_GRAVE)
 end
 function c78665705.activate(e,tp,eg,ep,ev,re,r,rp)

c80529459.lua

@@ -27,7 +27,8 @@ function c80529459.initial_effect(c)
 end
 function c80529459.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) end
-	if chk==0 then return Duel.IsExistingTarget(nil,tp,LOCATION_MZONE,0,1,nil) end
+	if chk==0 then return Duel.IsExistingTarget(nil,tp,LOCATION_MZONE,0,1,nil)
+		and Duel.IsPlayerCanSummon(tp) and Duel.IsPlayerCanAdditionalSummon(tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
 	local g=Duel.SelectTarget(tp,nil,tp,LOCATION_MZONE,0,1,1,nil)
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0)

c8567955.lua

@@ -6,7 +6,6 @@ function c8567955.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCountLimit(1)
-	e1:SetCondition(c8567955.sumcon)
 	e1:SetCost(c8567955.sumcost)
 	e1:SetTarget(c8567955.sumtg)
 	e1:SetOperation(c8567955.sumop)
@@ -23,17 +22,16 @@ function c8567955.initial_effect(c)
 	e2:SetOperation(c8567955.spop)
 	c:RegisterEffect(e2)
 end
-function c8567955.sumcon(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.GetFlagEffect(tp,8567955)==0
-end
 function c8567955.sumcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.CheckLPCost(tp,1000) end
 	Duel.PayLPCost(tp,1000)
 end
 function c8567955.sumtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsPlayerCanSummon(tp) and Duel.IsPlayerCanAdditionalSummon(tp) end
+	if chk==0 then return Duel.IsPlayerCanSummon(tp) and Duel.IsPlayerCanAdditionalSummon(tp)
+		and Duel.GetFlagEffect(tp,8567955)==0 end
 end
 function c8567955.sumop(e,tp,eg,ep,ev,re,r,rp)
+	if Duel.GetFlagEffect(tp,8567955)~=0 then return end
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetDescription(aux.Stringid(8567955,2))
 	e1:SetType(EFFECT_TYPE_FIELD)

c99328137.lua

@@ -14,7 +14,6 @@ function c99328137.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCountLimit(1)
-	e2:SetCondition(c99328137.sumcon)
 	e2:SetTarget(c99328137.sumtg)
 	e2:SetOperation(c99328137.sumop)
 	c:RegisterEffect(e2)
@@ -25,22 +24,22 @@ end
 function c99328137.val(e,c)
 	return Duel.GetMatchingGroupCount(c99328137.cfilter,c:GetControler(),LOCATION_MZONE,0,nil)*400
 end
-function c99328137.sumcon(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.GetFlagEffect(tp,99328137)==0
-end
 function c99328137.sumtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsPlayerCanSummon(tp) and Duel.IsPlayerCanAdditionalSummon(tp) end
+	if chk==0 then return Duel.IsPlayerCanSummon(tp) and Duel.IsPlayerCanAdditionalSummon(tp)
+		and Duel.GetFlagEffect(tp,99328137)==0 end
 end
 function c99328137.sumop(e,tp,eg,ep,ev,re,r,rp)
-	local e1=Effect.CreateEffect(e:GetHandler())
-	e1:SetDescription(aux.Stringid(99328137,1))
-	e1:SetType(EFFECT_TYPE_FIELD)
-	e1:SetTargetRange(LOCATION_HAND+LOCATION_MZONE,0)
-	e1:SetCode(EFFECT_EXTRA_SUMMON_COUNT)
-	e1:SetTarget(c99328137.extrasumtg)
-	e1:SetReset(RESET_PHASE+PHASE_END)
-	Duel.RegisterEffect(e1,tp)
-	Duel.RegisterFlagEffect(tp,99328137,RESET_PHASE+PHASE_END,0,1)
+	if Duel.GetFlagEffect(tp,94076521)==0 then
+		local e1=Effect.CreateEffect(e:GetHandler())
+		e1:SetDescription(aux.Stringid(99328137,1))
+		e1:SetType(EFFECT_TYPE_FIELD)
+		e1:SetTargetRange(LOCATION_HAND+LOCATION_MZONE,0)
+		e1:SetCode(EFFECT_EXTRA_SUMMON_COUNT)
+		e1:SetTarget(c99328137.extrasumtg)
+		e1:SetReset(RESET_PHASE+PHASE_END)
+		Duel.RegisterEffect(e1,tp)
+		Duel.RegisterFlagEffect(tp,99328137,RESET_PHASE+PHASE_END,0,1)
+	end
 	local e2=Effect.CreateEffect(e:GetHandler())
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_CANNOT_SUMMON)