add max count parameter for aux.AddSynchroProcedure

06b6d943 · DailyShana · beeabe75 · 06b6d943 · 06b6d943 · 06b6d943
Commit 06b6d943 authored Sep 28, 2017 by DailyShana
23 changed files
--- a/c13574687.lua
+++ b/c13574687.lua
 --ワンショット・キャノン
 function c13574687.initial_effect(c)
 	--synchro summon
-	aux.AddSynchroProcedure2(c,aux.FilterBoolFunction(Card.IsCode,6142213),aux.NonTuner(nil))
+	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsCode,6142213),aux.NonTuner(nil),1,1)
 	c:EnableReviveLimit()
 	--destroy & damage
 	local e1=Effect.CreateEffect(c)

--- a/c17994645.lua
+++ b/c17994645.lua
 --A BF－雨隠れのサヨ
 function c17994645.initial_effect(c)
 	--synchro summon
-	aux.AddSynchroProcedure2(c,nil,aux.NonTuner(nil))
+	aux.AddSynchroProcedure(c,nil,aux.NonTuner(nil),1,1)
 	c:EnableReviveLimit()
 	--add type
 	local e1=Effect.CreateEffect(c)

--- a/c21435914.lua
+++ b/c21435914.lua
 --冥界濁龍 ドラゴキュートス
 function c21435914.initial_effect(c)
 	--synchro summon
-	aux.AddSynchroProcedure2(c,aux.FilterBoolFunction(Card.IsAttribute,ATTRIBUTE_DARK),aux.NonTuner(Card.IsRace,RACE_DRAGON))
+	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsAttribute,ATTRIBUTE_DARK),aux.NonTuner(Card.IsRace,RACE_DRAGON),1,1)
 	c:EnableReviveLimit()
 	--battle indestructable
 	local e1=Effect.CreateEffect(c)

--- a/c22858242.lua
+++ b/c22858242.lua
 --猿魔王ゼーマン
 function c22858242.initial_effect(c)
 	--synchro summon
-	aux.AddSynchroProcedure2(c,aux.FilterBoolFunction(Card.IsAttribute,ATTRIBUTE_DARK),aux.NonTuner(Card.IsRace,RACE_BEAST))
+	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsAttribute,ATTRIBUTE_DARK),aux.NonTuner(Card.IsRace,RACE_BEAST),1,1)
 	c:EnableReviveLimit()
 	--actlimit
 	local e1=Effect.CreateEffect(c)

--- a/c24696097.lua
+++ b/c24696097.lua
 --シューティング・スター・ドラゴン
 function c24696097.initial_effect(c)
 	--synchro summon
-	aux.AddSynchroProcedure2(c,aux.FilterBoolFunction(Card.IsSynchroType,TYPE_SYNCHRO),aux.FilterBoolFunction(Card.IsCode,44508094))
+	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsSynchroType,TYPE_SYNCHRO),aux.FilterBoolFunction(Card.IsCode,44508094),1,1)
 	c:EnableReviveLimit()
 	--multi attack
 	local e1=Effect.CreateEffect(c)

--- a/c25165047.lua
+++ b/c25165047.lua
 --ライフ・ストリーム・ドラゴン
 function c25165047.initial_effect(c)
 	--synchro summon
-	aux.AddSynchroProcedure2(c,nil,aux.FilterBoolFunction(Card.IsCode,2403771))
+	aux.AddSynchroProcedure(c,nil,aux.FilterBoolFunction(Card.IsCode,2403771),1,1)
 	c:EnableReviveLimit()
 	--change lp
 	local e1=Effect.CreateEffect(c)

--- a/c25472513.lua
+++ b/c25472513.lua
 --天輪の双星道士
 function c25472513.initial_effect(c)
 	--synchro summon
-	aux.AddSynchroProcedure2(c,nil,aux.NonTuner(nil))
+	aux.AddSynchroProcedure(c,nil,aux.NonTuner(nil),1,1)
 	c:EnableReviveLimit()
 	--special summon
 	local e1=Effect.CreateEffect(c)

--- a/c31919988.lua
+++ b/c31919988.lua
 --漆黒のズムウォルト
 function c31919988.initial_effect(c)
 	--synchro summon
-	aux.AddSynchroProcedure2(c,aux.FilterBoolFunction(Card.IsAttribute,ATTRIBUTE_DARK),aux.NonTuner(Card.IsRace,RACE_INSECT))
+	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsAttribute,ATTRIBUTE_DARK),aux.NonTuner(Card.IsRace,RACE_INSECT),1,1)
 	c:EnableReviveLimit()
 	--indes
 	local e1=Effect.CreateEffect(c)

--- a/c33541430.lua
+++ b/c33541430.lua
 --花札衛－月花見－
 function c33541430.initial_effect(c)
-	c:EnableReviveLimit()
 	--synchro summon
-	local e1=Effect.CreateEffect(c)
+	aux.AddSynchroProcedure(c,nil,aux.NonTuner(nil),2,2)
-	e1:SetType(EFFECT_TYPE_FIELD)
+	c:EnableReviveLimit()
-	e1:SetCode(EFFECT_SPSUMMON_PROC)
-	e1:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_IGNORE_IMMUNE)
-	e1:SetRange(LOCATION_EXTRA)
-	e1:SetCondition(aux.SynCondition(nil,aux.NonTuner(nil),2,2))
-	e1:SetTarget(aux.SynTarget(nil,aux.NonTuner(nil),2,2))
-	e1:SetOperation(aux.SynOperation(nil,aux.NonTuner(nil),2,2))
-	e1:SetValue(SUMMON_TYPE_SYNCHRO)
-	c:RegisterEffect(e1)
 	--draw
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(33541430,0))

--- a/c36857073.lua
+++ b/c36857073.lua
 --琰魔竜 レッド・デーモン・ベリアル
 function c36857073.initial_effect(c)
 	--synchro summon
-	aux.AddSynchroProcedure2(c,nil,aux.NonTuner(c36857073.sfilter))
+	aux.AddSynchroProcedure(c,nil,aux.NonTuner(c36857073.sfilter),1,1)
 	c:EnableReviveLimit()
 	--spsummon
 	local e1=Effect.CreateEffect(c)

--- a/c37038993.lua
+++ b/c37038993.lua
 --焔紫竜ピュラリス
 function c37038993.initial_effect(c)
 	--synchro summon
-	aux.AddSynchroProcedure2(c,nil,aux.NonTuner(nil))
+	aux.AddSynchroProcedure(c,nil,aux.NonTuner(nil),1,1)
 	c:EnableReviveLimit()
 	--synchro summon success
 	local e1=Effect.CreateEffect(c)

--- a/c3966653.lua
+++ b/c3966653.lua
 --花札衛－猪鹿蝶－
 function c3966653.initial_effect(c)
-	c:EnableReviveLimit()
 	--synchro summon
-	local e1=Effect.CreateEffect(c)
+	aux.AddSynchroProcedure(c,nil,aux.NonTuner(nil),2,2)
-	e1:SetType(EFFECT_TYPE_FIELD)
+	c:EnableReviveLimit()
-	e1:SetCode(EFFECT_SPSUMMON_PROC)
-	e1:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_IGNORE_IMMUNE)
-	e1:SetRange(LOCATION_EXTRA)
-	e1:SetCondition(aux.SynCondition(nil,aux.NonTuner(nil),2,2))
-	e1:SetTarget(aux.SynTarget(nil,aux.NonTuner(nil),2,2))
-	e1:SetOperation(aux.SynOperation(nil,aux.NonTuner(nil),2,2))
-	e1:SetValue(SUMMON_TYPE_SYNCHRO)
-	c:RegisterEffect(e1)
 	--pierce
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)

--- a/c42291297.lua
+++ b/c42291297.lua
 --花札衛－雨四光－
 function c42291297.initial_effect(c)
-	c:EnableReviveLimit()
 	--synchro summon
-	local e1=Effect.CreateEffect(c)
+	aux.AddSynchroProcedure(c,nil,aux.NonTuner(nil),3,3)
-	e1:SetType(EFFECT_TYPE_FIELD)
+	c:EnableReviveLimit()
-	e1:SetCode(EFFECT_SPSUMMON_PROC)
-	e1:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_IGNORE_IMMUNE)
-	e1:SetRange(LOCATION_EXTRA)
-	e1:SetCondition(aux.SynCondition(nil,aux.NonTuner(nil),3,3))
-	e1:SetTarget(aux.SynTarget(nil,aux.NonTuner(nil),3,3))
-	e1:SetOperation(aux.SynOperation(nil,aux.NonTuner(nil),3,3))
-	e1:SetValue(SUMMON_TYPE_SYNCHRO)
-	c:RegisterEffect(e1)
 	--indes
 	local e2=Effect.CreateEffect(c)
 	e2:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)

--- a/c50091196.lua
+++ b/c50091196.lua
 --フォーミュラ・シンクロン
 function c50091196.initial_effect(c)
 	--synchro summon
-	aux.AddSynchroProcedure2(c,nil,aux.NonTuner(nil))
+	aux.AddSynchroProcedure(c,nil,aux.NonTuner(nil),1,1)
 	c:EnableReviveLimit()
 	--synchro summon success
 	local e1=Effect.CreateEffect(c)

--- a/c58074177.lua
+++ b/c58074177.lua
@@ -2,7 +2,7 @@
 function c58074177.initial_effect(c)
 	c:EnableReviveLimit()
 	aux.EnablePendulumAttribute(c,false)
-	aux.AddSynchroProcedure2(c,aux.FilterBoolFunction(Card.IsAttribute,ATTRIBUTE_DARK),aux.NonTuner(Card.IsSetCard,0xff))
+	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsAttribute,ATTRIBUTE_DARK),aux.NonTuner(Card.IsSetCard,0xff),1,1)
 	--atk
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(58074177,0))

--- a/c62560742.lua
+++ b/c62560742.lua
 --TG レシプロ・ドラゴン・フライ
 function c62560742.initial_effect(c)
 	--synchro summon
-	aux.AddSynchroProcedure2(c,nil,aux.NonTuner(nil))
+	aux.AddSynchroProcedure(c,nil,aux.NonTuner(nil),1,1)
 	c:EnableReviveLimit()
 	--special summon
 	local e1=Effect.CreateEffect(c)

--- a/c63465535.lua
+++ b/c63465535.lua
 --地底のアラクネー
 function c63465535.initial_effect(c)
 	--synchro summon
-	aux.AddSynchroProcedure2(c,aux.FilterBoolFunction(Card.IsAttribute,ATTRIBUTE_DARK),aux.NonTuner(Card.IsRace,RACE_INSECT))
+	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsAttribute,ATTRIBUTE_DARK),aux.NonTuner(Card.IsRace,RACE_INSECT),1,1)
 	c:EnableReviveLimit()
 	--actlimit
 	local e1=Effect.CreateEffect(c)

--- a/c76891401.lua
+++ b/c76891401.lua
 --神海竜ギシルノドン
 function c76891401.initial_effect(c)
 	--synchro summon
-	aux.AddSynchroProcedure2(c,nil,aux.NonTuner(c76891401.synfilter))
+	aux.AddSynchroProcedure(c,nil,aux.NonTuner(c76891401.synfilter),1,1)
 	c:EnableReviveLimit()
 	--atk change
 	local e1=Effect.CreateEffect(c)

--- a/c8310162.lua
+++ b/c8310162.lua
 --Sin パラドクス・ドラゴン
 function c8310162.initial_effect(c)
 	--synchro summon
-	aux.AddSynchroProcedure2(c,aux.FilterBoolFunction(Card.IsCode,74509280),aux.NonTuner(Card.IsSetCard,0x23))
+	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsCode,74509280),aux.NonTuner(Card.IsSetCard,0x23),1,1)
 	c:EnableReviveLimit()
 	c:SetUniqueOnField(1,1,8310162)
 	--special summon

--- a/c87460579.lua
+++ b/c87460579.lua
 --花札衛－五光－
 function c87460579.initial_effect(c)
-	c:EnableReviveLimit()
 	--synchro summon
-	local e1=Effect.CreateEffect(c)
+	aux.AddSynchroProcedure(c,nil,aux.NonTuner(nil),4,4)
-	e1:SetType(EFFECT_TYPE_FIELD)
+	c:EnableReviveLimit()
-	e1:SetCode(EFFECT_SPSUMMON_PROC)
-	e1:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_IGNORE_IMMUNE)
-	e1:SetRange(LOCATION_EXTRA)
-	e1:SetCondition(aux.SynCondition(nil,aux.NonTuner(nil),4,4))
-	e1:SetTarget(aux.SynTarget(nil,aux.NonTuner(nil),4,4))
-	e1:SetOperation(aux.SynOperation(nil,aux.NonTuner(nil),4,4))
-	e1:SetValue(SUMMON_TYPE_SYNCHRO)
-	c:RegisterEffect(e1)
 	--negate
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(87460579,0))

--- a/c94515289.lua
+++ b/c94515289.lua
 --氷結のフィッツジェラルド
 function c94515289.initial_effect(c)
 	--synchro summon
-	aux.AddSynchroProcedure2(c,aux.FilterBoolFunction(Card.IsAttribute,ATTRIBUTE_DARK),aux.NonTuner(Card.IsRace,RACE_BEAST))
+	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsAttribute,ATTRIBUTE_DARK),aux.NonTuner(Card.IsRace,RACE_BEAST),1,1)
 	c:EnableReviveLimit()
 	--actlimit
 	local e1=Effect.CreateEffect(c)

--- a/c9753964.lua
+++ b/c9753964.lua
 --琰魔竜 レッド・デーモン・アビス
 function c9753964.initial_effect(c)
 	--synchro summon
-	aux.AddSynchroProcedure2(c,nil,aux.NonTuner(c9753964.sfilter))
+	aux.AddSynchroProcedure(c,nil,aux.NonTuner(c9753964.sfilter),1,1)
 	c:EnableReviveLimit()
 	--negate
 	local e1=Effect.CreateEffect(c)

--- a/utility.lua
+++ b/utility.lua
@@ -186,16 +186,17 @@ function Auxiliary.NonTuner(f,a,b,c)
 				return target:IsNotTuner() and (not f or f(target,a,b,c))
 			end
 end
--Synchro monster, 1 tuner + n or more monsters
+--Synchro monster, 1 tuner + min to max monsters
-function Auxiliary.AddSynchroProcedure(c,f1,f2,ct)
+function Auxiliary.AddSynchroProcedure(c,f1,f2,minc,maxc)
+	if maxc==nil then maxc=99 end
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetCode(EFFECT_SPSUMMON_PROC)
 	e1:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_IGNORE_IMMUNE)
 	e1:SetRange(LOCATION_EXTRA)
-	e1:SetCondition(Auxiliary.SynCondition(f1,f2,ct,99))
+	e1:SetCondition(Auxiliary.SynCondition(f1,f2,minc,maxc))
-	e1:SetTarget(Auxiliary.SynTarget(f1,f2,ct,99))
+	e1:SetTarget(Auxiliary.SynTarget(f1,f2,minc,maxc))
-	e1:SetOperation(Auxiliary.SynOperation(f1,f2,ct,99))
+	e1:SetOperation(Auxiliary.SynOperation(f1,f2,minc,maxc))
 	e1:SetValue(SUMMON_TYPE_SYNCHRO)
 	c:RegisterEffect(e1)
 end
@@ -232,17 +233,9 @@ function Auxiliary.SynOperation(f1,f2,minct,maxc)
 			end
 end
 --Synchro monster, 1 tuner + 1 monster
+--backward compatibility
 function Auxiliary.AddSynchroProcedure2(c,f1,f2)
-	local e1=Effect.CreateEffect(c)
+	Auxiliary.AddSynchroProcedure(c,f1,f2,1,1)
-	e1:SetType(EFFECT_TYPE_FIELD)
-	e1:SetCode(EFFECT_SPSUMMON_PROC)
-	e1:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_IGNORE_IMMUNE)
-	e1:SetRange(LOCATION_EXTRA)
-	e1:SetCondition(Auxiliary.SynCondition(f1,f2,1,1))
-	e1:SetTarget(Auxiliary.SynTarget(f1,f2,1,1))
-	e1:SetOperation(Auxiliary.SynOperation(f1,f2,1,1))
-	e1:SetValue(SUMMON_TYPE_SYNCHRO)
-	c:RegisterEffect(e1)
 end
 function Auxiliary.XyzAlterFilter(c,alterf,xyzc,e,tp,op)
 	return alterf(c) and c:IsCanBeXyzMaterial(xyzc) and Duel.GetLocationCountFromEx(tp,tp,Group.FromCards(c),xyzc)>0 and (not op or op(e,tp,0,c))