add Auxiliary.AddMaterialCodeList (#1621)

c11913700.lua

@@ -35,10 +35,10 @@ function c11913700.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function c11913700.eqlimit(e,c)
-	return aux.IsMaterialListCode(c,89943723)
+	return c:IsType(TYPE_FUSION) and aux.IsMaterialListCode(c,89943723)
 end
 function c11913700.filter(c)
-	return c:IsFaceup() and aux.IsMaterialListCode(c,89943723)
+	return c:IsFaceup() and c:IsType(TYPE_FUSION) and aux.IsMaterialListCode(c,89943723)
 end
 function c11913700.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and c11913700.filter(chkc) end

c13574687.lua

 --ワンショット・キャノン
 function c13574687.initial_effect(c)
+	aux.AddMaterialCodeList(c,6142213)
 	--synchro summon
 	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsCode,6142213),aux.NonTuner(nil),1,1)
 	c:EnableReviveLimit()

c14088859.lua

@@ -82,7 +82,7 @@ function c14088859.repop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Remove(e:GetHandler(),POS_FACEUP,REASON_EFFECT)
 end
 function c14088859.repfilter2(c,tp,re)
-	return c:IsControler(tp) and c:IsLocation(LOCATION_MZONE) and aux.IsMaterialListCode(c,89943723) and c:IsType(TYPE_MONSTER)
+	return c:IsControler(tp) and c:IsLocation(LOCATION_MZONE) and aux.IsMaterialListCode(c,89943723) and c:IsType(TYPE_FUSION)
 		and c:GetDestination()==LOCATION_DECK and re:GetOwner()==c
 end
 function c14088859.reptg2(e,tp,eg,ep,ev,re,r,rp,chk)
@@ -96,5 +96,5 @@ function c14088859.repop2(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Remove(e:GetHandler(),POS_FACEUP,REASON_EFFECT)
 end
 function c14088859.repval2(e,c)
-	return c:IsControler(e:GetHandlerPlayer()) and c:IsLocation(LOCATION_MZONE) and aux.IsMaterialListCode(c,89943723) and c:IsType(TYPE_MONSTER)
+	return c:IsControler(e:GetHandlerPlayer()) and c:IsLocation(LOCATION_MZONE) and aux.IsMaterialListCode(c,89943723) and c:IsType(TYPE_FUSION)
 end

c15155568.lua

@@ -22,7 +22,7 @@ function c15155568.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c15155568.cfilter(c)
-	return c:IsFaceup() and aux.IsMaterialListCode(c,78193831)
+	return c:IsFaceup() and c:IsType(TYPE_FUSION) and aux.IsMaterialListCode(c,78193831)
 end
 function c15155568.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(c15155568.cfilter,tp,LOCATION_MZONE,0,1,nil)

c17194258.lua

@@ -11,7 +11,7 @@ function c17194258.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c17194258.filter1(c,tp)
-	return Duel.IsExistingMatchingCard(c17194258.filter2,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil,c)
+	return c:IsType(TYPE_FUSION) and Duel.IsExistingMatchingCard(c17194258.filter2,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil,c)
 end
 function c17194258.filter2(c,fc)
 	return aux.IsMaterialListCode(fc,c:GetCode()) and c:IsAbleToHand()

c17760003.lua

 --A・ジェネクス・トライアーム
 function c17760003.initial_effect(c)
+	aux.AddMaterialCodeList(c,68505803)
 	--synchro summon
 	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsCode,68505803),aux.NonTuner(nil),1)
 	c:EnableReviveLimit()

c1784686.lua

@@ -24,8 +24,8 @@ function c1784686.tgfilter(c,e,tp)
 		and Duel.IsExistingMatchingCard(c1784686.spfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp,c)
 end
 function c1784686.spfilter(c,e,tp,tc)
-	return aux.IsMaterialListCode(c,tc:GetCode()) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false)
-		and Duel.GetLocationCountFromEx(tp,tp,tc,c)>0
+	return c:IsType(TYPE_FUSION) and aux.IsMaterialListCode(c,tc:GetCode())
+		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and Duel.GetLocationCountFromEx(tp,tp,tc,c)>0
 end
 function c1784686.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc==0 then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c1784686.tgfilter(chkc,e,tp) end

c18013090.lua

 --ニトロ・ウォリアー
 function c18013090.initial_effect(c)
+	aux.AddMaterialCodeList(c,96182448)
 	--synchro summon
 	aux.AddSynchroProcedure(c,c18013090.tfilter,aux.NonTuner(nil),1)
 	c:EnableReviveLimit()

c2322421.lua

 --ロード・ウォリアー
 function c2322421.initial_effect(c)
+	aux.AddMaterialCodeList(c,71971554)
 	--synchro summon
 	aux.AddSynchroProcedure(c,c2322421.tfilter,aux.NonTuner(nil),2)
 	c:EnableReviveLimit()

c24696097.lua

 --シューティング・スター・ドラゴン
 function c24696097.initial_effect(c)
-	aux.AddCodeList(c,44508094)
+	aux.AddMaterialCodeList(c,44508094)
 	--synchro summon
 	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsSynchroType,TYPE_SYNCHRO),aux.FilterBoolFunction(Card.IsCode,44508094),1,1)
 	c:EnableReviveLimit()

c25165047.lua

 --ライフ・ストリーム・ドラゴン
 function c25165047.initial_effect(c)
+	aux.AddMaterialCodeList(c,2403771)
 	--synchro summon
 	aux.AddSynchroProcedure(c,nil,aux.FilterBoolFunction(Card.IsCode,2403771),1,1)
 	c:EnableReviveLimit()

c286392.lua

 --ジェット・ウォリアー
 function c286392.initial_effect(c)
+	aux.AddMaterialCodeList(c,9742784)
 	--synchro summon
 	aux.AddSynchroProcedure(c,c286392.tfilter,aux.NonTuner(nil),1)
 	c:EnableReviveLimit()

c33972299.lua

 --ジオ・ジェネクス
 function c33972299.initial_effect(c)
+	aux.AddMaterialCodeList(c,68505803)
 	--synchro summon
 	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsCode,68505803),aux.NonTuner(Card.IsAttribute,ATTRIBUTE_EARTH),1)
 	c:EnableReviveLimit()

c3429238.lua

 --ドリル・ウォリアー
 function c3429238.initial_effect(c)
+	aux.AddMaterialCodeList(c,56286179)
 	--synchro summon
 	aux.AddSynchroProcedure(c,c3429238.tfilter,aux.NonTuner(nil),1)
 	c:EnableReviveLimit()

c35255456.lua

@@ -14,7 +14,7 @@ function c35255456.filter1(c,e)
 	return c:IsAbleToDeck() and not c:IsImmuneToEffect(e)
 end
 function c35255456.filter2(c,e,tp,m,chkf)
-	return c:IsSetCard(0x3008) and aux.IsMaterialListCode(c,89943723)
+	return c:IsSetCard(0x3008) and c:IsType(TYPE_FUSION) and aux.IsMaterialListCode(c,89943723)
 		and c:IsCanBeSpecialSummoned(e,0,tp,true,false) and c:CheckFusionMaterial(m,nil,chkf,true)
 end
 function c35255456.target(e,tp,eg,ep,ev,re,r,rp,chk)

c37993923.lua

 --ジャンク・ガードナー
 function c37993923.initial_effect(c)
+	aux.AddMaterialCodeList(c,63977008)
 	--synchro summon
 	aux.AddSynchroProcedure(c,c37993923.tfilter,aux.NonTuner(nil),1)
 	c:EnableReviveLimit()

c39823987.lua

 --太陽龍インティ
 function c39823987.initial_effect(c)
+	aux.AddMaterialCodeList(c,78275321)
 	--synchro summon
 	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsCode,78275321),aux.NonTuner(nil),1)
 	c:EnableReviveLimit()

c41933425.lua

@@ -74,7 +74,7 @@ function c41933425.splimit(e,c,sump,sumtype,sumpos,targetp,se)
 	return not c:IsType(TYPE_FUSION) and c:IsLocation(LOCATION_EXTRA)
 end
 function c41933425.confilter(c,tp)
-	return aux.IsMaterialListCode(c,89943723) and c:IsPreviousLocation(LOCATION_MZONE)
+	return c:IsType(TYPE_FUSION) and aux.IsMaterialListCode(c,89943723) and c:IsPreviousLocation(LOCATION_MZONE)
 		and c:IsPreviousPosition(POS_FACEUP) and c:IsPreviousControler(tp) and c:IsLocation(LOCATION_EXTRA)
 end
 function c41933425.spcon(e,tp,eg,ep,ev,re,r,rp)

c42015635.lua

@@ -24,5 +24,5 @@ function c42015635.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function c42015635.atktg(e,c)
-	return c:IsCode(89943723) or aux.IsMaterialListCode(c,89943723)
+	return c:IsCode(89943723) or c:IsType(TYPE_FUSION) and aux.IsMaterialListCode(c,89943723)
 end

c42810973.lua

 --ジャンク・アーチャー
 function c42810973.initial_effect(c)
+	aux.AddMaterialCodeList(c,63977008)
 	--synchro summon
 	aux.AddSynchroProcedure(c,c42810973.tfilter,aux.NonTuner(nil),1)
 	c:EnableReviveLimit()

c43925870.lua

 --ウィンドファーム・ジェネクス
 function c43925870.initial_effect(c)
+	aux.AddMaterialCodeList(c,68505803)
 	--synchro summon
 	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsCode,68505803),aux.NonTuner(Card.IsAttribute,ATTRIBUTE_WIND),1)
 	c:EnableReviveLimit()

c45037489.lua

 --フルール・ド・シュヴァリエ
 function c45037489.initial_effect(c)
+	aux.AddMaterialCodeList(c,19642774)
 	--synchro summon
 	aux.AddSynchroProcedure(c,c45037489.tfilter,aux.NonTuner(nil),1)
 	c:EnableReviveLimit()

c46195773.lua

 --ターボ・ウォリアー
 function c46195773.initial_effect(c)
+	aux.AddMaterialCodeList(c,67270095)
 	--synchro summon
 	aux.AddSynchroProcedure(c,c46195773.tfilter,aux.NonTuner(nil),1)
 	c:EnableReviveLimit()

c46724542.lua

 --サイバー・ドラゴン・ズィーガー
 function c46724542.initial_effect(c)
+	aux.AddMaterialCodeList(c,70095154)
 	--link summon
 	c:EnableReviveLimit()
 	aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsLinkRace,RACE_MACHINE),2,2,c46724542.lcheck)

c47421985.lua

 --ハイドロ・ジェネクス
 function c47421985.initial_effect(c)
+	aux.AddMaterialCodeList(c,68505803)
 	--synchro summon
 	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsCode,68505803),aux.NonTuner(Card.IsAttribute,ATTRIBUTE_WATER),1)
 	c:EnableReviveLimit()

c48048590.lua

@@ -67,7 +67,7 @@ function c48048590.thop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c48048590.filter1(c,e,tp)
-	return Duel.IsExistingMatchingCard(c48048590.filter2,tp,LOCATION_GRAVE,0,1,nil,e,tp,c)
+	return c:IsType(TYPE_FUSION) and Duel.IsExistingMatchingCard(c48048590.filter2,tp,LOCATION_GRAVE,0,1,nil,e,tp,c)
 end
 function c48048590.filter2(c,e,tp,fc)
 	return c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEDOWN_DEFENSE) and aux.IsMaterialListCode(fc,c:GetCode())

c49469105.lua

@@ -18,7 +18,7 @@ function c49469105.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.DiscardHand(tp,c49469105.cfilter,1,1,REASON_COST+REASON_DISCARD)
 end
 function c49469105.filter1(c,g)
-	return g:IsExists(c49469105.filter2,1,nil,c)
+	return c:IsType(TYPE_FUSION) and g:IsExists(c49469105.filter2,1,nil,c)
 end
 function c49469105.filter2(c,fc)
 	return aux.IsMaterialListCode(fc,c:GetCode())

c5309481.lua

 --蘇りし魔王 ハ・デス
 function c5309481.initial_effect(c)
+	aux.AddMaterialCodeList(c,33420078)
 	--synchro summon
 	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsCode,33420078),aux.NonTuner(Card.IsRace,RACE_ZOMBIE),1)
 	c:EnableReviveLimit()

c59771339.lua

 --ジャンク・バーサーカー
 function c59771339.initial_effect(c)
+	aux.AddMaterialCodeList(c,63977008)
 	--synchro summon
 	aux.AddSynchroProcedure(c,c59771339.tfilter,aux.NonTuner(nil),1)
 	c:EnableReviveLimit()

c59969392.lua

 --アンデット・スカル・デーモン
 function c59969392.initial_effect(c)
+	aux.AddMaterialCodeList(c,33420078)
 	--synchro summon
 	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsCode,33420078),aux.NonTuner(Card.IsRace,RACE_ZOMBIE),2)
 	c:EnableReviveLimit()

c6021033.lua

 --デスカイザー・ドラゴン
 function c6021033.initial_effect(c)
+	aux.AddMaterialCodeList(c,33420078)
 	--synchro summon
 	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsCode,33420078),aux.NonTuner(Card.IsRace,RACE_ZOMBIE),1)
 	c:EnableReviveLimit()

c60800381.lua

 --ジャンク・ウォリアー
 function c60800381.initial_effect(c)
+	aux.AddMaterialCodeList(c,63977008)
 	--synchro summon
 	aux.AddSynchroProcedure(c,c60800381.tfilter,aux.NonTuner(nil),1)
 	c:EnableReviveLimit()

c6588580.lua

 --サーマル・ジェネクス
 function c6588580.initial_effect(c)
+	aux.AddMaterialCodeList(c,68505803)
 	--synchro summon
 	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsCode,68505803),aux.NonTuner(Card.IsAttribute,ATTRIBUTE_FIRE),1)
 	c:EnableReviveLimit()

c66127916.lua

@@ -11,7 +11,7 @@ function c66127916.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c66127916.filter1(c,tp)
-	return Duel.IsExistingMatchingCard(c66127916.filter2,tp,LOCATION_DECK,0,1,nil,c)
+	return c:IsType(TYPE_FUSION) and Duel.IsExistingMatchingCard(c66127916.filter2,tp,LOCATION_DECK,0,1,nil,c)
 end
 function c66127916.filter2(c,fc)
 	return aux.IsMaterialListCode(fc,c:GetCode()) and c:IsAbleToHand()

c66818682.lua

 --月影龍クイラ
 function c66818682.initial_effect(c)
+	aux.AddMaterialCodeList(c,78552773)
 	--synchro summon
 	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsCode,78552773),aux.NonTuner(nil),1)
 	c:EnableReviveLimit()

c67030233.lua

 --セイヴァー・デモン・ドラゴン
 function c67030233.initial_effect(c)
+	aux.AddMaterialCodeList(c,21159309,70902743)
 	--synchro summon
 	aux.AddSynchroMixProcedure(c,c67030233.mfilter1,c67030233.mfilter2,nil,aux.NonTuner(nil),1,1)
 	c:EnableReviveLimit()

c67159705.lua

@@ -33,11 +33,11 @@ function c67159705.initial_effect(c)
 	c:RegisterEffect(e5)
 end
 function c67159705.eqlimit(e,c)
-	return c:IsCode(70095154) or aux.IsMaterialListCode(c,70095154) or e:GetHandler():GetEquipTarget()==c
+	return c:IsCode(70095154) or c:IsType(TYPE_FUSION) and aux.IsMaterialListCode(c,70095154) or e:GetHandler():GetEquipTarget()==c
 end
 function c67159705.filter(c)
 	local ct1,ct2=c:GetUnionCount()
-	return c:IsFaceup() and (c:IsCode(70095154) or aux.IsMaterialListCode(c,70095154)) and ct2==0
+	return c:IsFaceup() and (c:IsCode(70095154) or c:IsType(TYPE_FUSION) and aux.IsMaterialListCode(c,70095154)) and ct2==0
 end
 function c67159705.eqtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c67159705.filter(chkc) end

c68319538.lua

 --宇宙砦ゴルガー
 function c68319538.initial_effect(c)
+	aux.AddMaterialCodeList(c,652362)
 	--synchro summon
 	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsCode,652362),aux.NonTuner(Card.IsSetCard,0xc),1)
 	c:EnableReviveLimit()

c74860293.lua

 --ジャンク・デストロイヤー
 function c74860293.initial_effect(c)
+	aux.AddMaterialCodeList(c,63977008)
 	--synchro summon
 	aux.AddSynchroProcedure(c,c74860293.tfilter,aux.NonTuner(nil),1)
 	c:EnableReviveLimit()

c7841112.lua

 --セイヴァー・スター・ドラゴン
 function c7841112.initial_effect(c)
-	aux.AddCodeList(c,44508094)
+	aux.AddMaterialCodeList(c,21159309,44508094)
 	--synchro summon
 	aux.AddSynchroMixProcedure(c,c7841112.mfilter1,c7841112.mfilter2,nil,aux.NonTuner(nil),1,1)
 	c:EnableReviveLimit()

c8310162.lua

 --Sin パラドクス・ドラゴン
 function c8310162.initial_effect(c)
+	aux.AddMaterialCodeList(c,74509280)
 	--synchro summon
 	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsCode,74509280),aux.NonTuner(Card.IsSetCard,0x23),1,1)
 	c:EnableReviveLimit()

c89312388.lua

@@ -14,7 +14,7 @@ function c89312388.filter2(c,fc)
 	return aux.IsMaterialListCode(fc,c:GetCode()) and c:IsAbleToGraveAsCost()
 end
 function c89312388.filter1(c,tp)
-	return Duel.IsExistingMatchingCard(c89312388.filter2,tp,LOCATION_DECK,0,1,nil,c)
+	return c:IsType(TYPE_FUSION) and Duel.IsExistingMatchingCard(c89312388.filter2,tp,LOCATION_DECK,0,1,nil,c)
 end
 function c89312388.coscost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c89312388.filter1,tp,LOCATION_EXTRA,0,1,nil,tp) end

c92773018.lua

@@ -23,7 +23,8 @@ function c92773018.condition(e,tp,eg,ep,ev,re,r,rp)
 	return tp~=Duel.GetTurnPlayer()
 end
 function c92773018.cfilter(c)
-	return c:IsFaceup() and (c:IsCode(70095154) or aux.IsMaterialListCode(c,70095154)) and c:IsAbleToGraveAsCost()
+	return c:IsFaceup() and (c:IsCode(70095154) or c:IsType(TYPE_FUSION) and aux.IsMaterialListCode(c,70095154))
+		and c:IsAbleToGraveAsCost()
 end
 function c92773018.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c92773018.cfilter,tp,LOCATION_MZONE,0,1,nil) end

c97489701.lua

 --スカーレッド・ノヴァ・ドラゴン
 function c97489701.initial_effect(c)
+	aux.AddMaterialCodeList(c,70902743)
 	--synchro summon
 	aux.AddSynchroMixProcedure(c,aux.Tuner(nil),aux.Tuner(nil),nil,aux.FilterBoolFunction(Card.IsCode,70902743),1,1)
 	c:EnableReviveLimit()

utility.lua

@@ -2056,6 +2056,21 @@ function Auxiliary.ExtraDeckSummonCountLimitReset()
 	Auxiliary.ExtraDeckSummonCountLimit[0]=1
 	Auxiliary.ExtraDeckSummonCountLimit[1]=1
 end
+--Fusion Monster is unnecessary to use this
+function Auxiliary.AddMaterialCodeList(c,...)
+	if c:IsStatus(STATUS_COPYING_EFFECT) then return end
+	local mat={}
+	for _,code in ipairs{...} do
+		mat[code]=true
+	end
+	if c.material==nil then
+		local mt=getmetatable(c)
+		mt.material=mat
+	end
+	for index,_ in pairs(mat) do
+		Auxiliary.AddCodeList(c,index)
+	end
+end
 function Auxiliary.IsMaterialListCode(c,code)
 	return c.material and c.material[code]
 end