update fusion type

c10817524.lua

@@ -3,7 +3,7 @@ function c10817524.initial_effect(c)
 	c:SetUniqueOnField(1,0,10817524)
 	--fusion material
 	c:EnableReviveLimit()
-	aux.AddFusionProcFunRep(c,aux.FilterBoolFunction(Card.IsType,TYPE_NORMAL),2,false)
+	aux.AddFusionProcFunRep(c,aux.FilterBoolFunction(Card.IsFusionType,TYPE_NORMAL),2,false)
 	--spsummon condition
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)

c14017402.lua

@@ -42,7 +42,7 @@ function c14017402.refcon(e,re,val,r,rp,rc)
 	return bit.band(r,REASON_EFFECT)~=0 and rp~=e:GetHandler():GetControler()  and e:GetHandler():IsAttackPos()
 end
 function c14017402.ffilter(c)
-	return c:IsRace(RACE_DRAGON) and c:IsType(TYPE_SYNCHRO)
+	return c:IsRace(RACE_DRAGON) and c:IsFusionType(TYPE_SYNCHRO)
 end
 function c14017402.cpfilter(c)
 	return c:IsRace(RACE_DRAGON) and c:IsType(TYPE_SYNCHRO) and c:IsAbleToRemove()

c17412721.lua

@@ -23,7 +23,7 @@ function c17412721.initial_effect(c)
 end
 c17412721.miracle_synchro_fusion=true
 function c17412721.ffilter(c)
-	return c:IsType(TYPE_XYZ+TYPE_SYNCHRO)
+	return c:IsFusionType(TYPE_XYZ+TYPE_SYNCHRO)
 end
 function c17412721.filter(c,e,tp)
 	return c:IsLevelBelow(4) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

c21113684.lua

@@ -60,7 +60,7 @@ function c21113684.splimit(e,se,sp,st)
 	return true
 end
 function c21113684.ffilter(c)
-	return c:IsType(TYPE_SYNCHRO) and c:IsRace(RACE_SPELLCASTER)
+	return c:IsFusionType(TYPE_SYNCHRO) and c:IsRace(RACE_SPELLCASTER)
 end
 function c21113684.attackup(e,c)
 	return c:GetCounter(0x1)*1000

c30757127.lua

@@ -21,7 +21,7 @@ function c30757127.initial_effect(c)
 end
 c30757127.material_setcode=0x8
 function c30757127.ffilter(c)
-	return c:IsFusionAttribute(ATTRIBUTE_DARK) and c:IsType(TYPE_EFFECT)
+	return c:IsFusionAttribute(ATTRIBUTE_DARK) and c:IsFusionType(TYPE_EFFECT)
 end
 function c30757127.atkcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetCurrentPhase()~=PHASE_DAMAGE or not Duel.IsDamageCalculated()

c40101111.lua

@@ -42,7 +42,7 @@ function c40101111.splimit(e,se,sp,st)
 	return true
 end
 function c40101111.ffilter(c)
-	return c:IsType(TYPE_SYNCHRO) and c:IsRace(RACE_PSYCHO)
+	return c:IsFusionType(TYPE_SYNCHRO) and c:IsRace(RACE_PSYCHO)
 end
 function c40101111.recon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

c45349196.lua

@@ -29,10 +29,10 @@ function c45349196.initial_effect(c)
 end
 c45349196.material_setcode=0x3b
 function c45349196.mfilter1(c)
-	return c:IsFusionSetCard(0x45) and c:IsType(TYPE_NORMAL) and c:GetLevel()==6
+	return c:IsFusionSetCard(0x45) and c:IsFusionType(TYPE_NORMAL) and c:GetLevel()==6
 end
 function c45349196.mfilter2(c)
-	return c:IsFusionSetCard(0x3b) and c:IsType(TYPE_NORMAL)
+	return c:IsFusionSetCard(0x3b) and c:IsFusionType(TYPE_NORMAL)
 end
 function c45349196.accon(e)
 	return Duel.GetAttacker()==e:GetHandler() or Duel.GetAttackTarget()==e:GetHandler()

c4688231.lua

@@ -33,13 +33,8 @@ end
 function c4688231.filter1(c)
 	return c:IsFusionSetCard(0xe1) and not c:IsHasEffect(6205579)
 end
---additional condition for 77693536 effect
 function c4688231.filter2(c)
-	if c:IsLocation(LOCATION_MZONE) then
-		return c:IsType(TYPE_PENDULUM) and not c:IsHasEffect(6205579)
-	else
-		return bit.band(c:GetOriginalType(),TYPE_PENDULUM)~=0 and not c:IsHasEffect(6205579)
-	end
+	return c:IsFusionType(TYPE_PENDULUM) and not c:IsHasEffect(6205579)
 end
 function c4688231.fscon(e,g,gc,chkfnf)
 	if g==nil then return true end

c53262004.lua

@@ -2,7 +2,7 @@
 function c53262004.initial_effect(c)
 	--fusion material
 	c:EnableReviveLimit()
-	aux.AddFusionProcFun2(c,aux.FilterBoolFunction(Card.IsFusionSetCard,0x99),aux.FilterBoolFunction(Card.IsType,TYPE_PENDULUM),false)
+	aux.AddFusionProcFun2(c,aux.FilterBoolFunction(Card.IsFusionSetCard,0x99),aux.FilterBoolFunction(Card.IsFusionType,TYPE_PENDULUM),false)
 	--tohand
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_TOHAND)

c58601383.lua

@@ -22,7 +22,7 @@ function c58601383.initial_effect(c)
 end
 c58601383.miracle_synchro_fusion=true
 function c58601383.ffilter(c)
-	return c:IsType(TYPE_SYNCHRO) and not c:IsType(TYPE_EFFECT)
+	return c:IsFusionType(TYPE_SYNCHRO) and not c:IsFusionType(TYPE_EFFECT)
 end
 function c58601383.efilter1(e,re,rp)
 	return re:IsActiveType(TYPE_EFFECT)

c59255742.lua

@@ -43,7 +43,7 @@ function c59255742.initial_effect(c)
 end
 c59255742.miracle_synchro_fusion=true
 function c59255742.ffilter(c)
-	return c:IsFusionAttribute(ATTRIBUTE_EARTH) and c:IsRace(RACE_WARRIOR) and c:IsType(TYPE_SYNCHRO)
+	return c:IsFusionAttribute(ATTRIBUTE_EARTH) and c:IsRace(RACE_WARRIOR) and c:IsFusionType(TYPE_SYNCHRO)
 end
 function c59255742.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

c64463828.lua

@@ -2,7 +2,7 @@
 function c64463828.initial_effect(c)
 	--fusion material
 	c:EnableReviveLimit()
-	aux.AddFusionProcFunRep(c,aux.FilterBoolFunction(Card.IsType,TYPE_DUAL),2,false)
+	aux.AddFusionProcFunRep(c,aux.FilterBoolFunction(Card.IsFusionType,TYPE_DUAL),2,false)
 	--duel status
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD)

c69946549.lua

@@ -2,7 +2,7 @@
 function c69946549.initial_effect(c)
 	--fusion material
 	c:EnableReviveLimit()
-	aux.AddFusionProcFun2(c,aux.FilterBoolFunction(Card.IsType,TYPE_FUSION),aux.FilterBoolFunction(Card.IsFusionAttribute,ATTRIBUTE_DARK),true)
+	aux.AddFusionProcFun2(c,aux.FilterBoolFunction(Card.IsFusionType,TYPE_FUSION),aux.FilterBoolFunction(Card.IsFusionAttribute,ATTRIBUTE_DARK),true)
 	--add counter
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(69946549,0))

c77693536.lua

@@ -41,13 +41,8 @@ end
 function c77693536.filter1(c)
 	return c:IsFusionSetCard(0xe1) and not c:IsHasEffect(6205579)
 end
---additional condition for 77693536 effect
 function c77693536.filter2(c)
-	if c:IsLocation(LOCATION_MZONE) then
-		return c:IsType(TYPE_NORMAL) and not c:IsHasEffect(6205579)
-	else
-		return bit.band(c:GetOriginalType(),TYPE_NORMAL)~=0 and not c:IsHasEffect(6205579)
-	end
+	return c:IsFusionType(TYPE_NORMAL) and not c:IsHasEffect(6205579)
 end
 function c77693536.fscon(e,g,gc,chkfnf)
 	if g==nil then return true end

c80532587.lua

@@ -3,7 +3,7 @@ function c80532587.initial_effect(c)
 	c:SetSPSummonOnce(80532587)
 	--fusion material
 	c:EnableReviveLimit()
-	aux.AddFusionProcFun2(c,aux.FilterBoolFunction(Card.IsType,TYPE_SYNCHRO),aux.FilterBoolFunction(Card.IsType,TYPE_XYZ),false)
+	aux.AddFusionProcFun2(c,aux.FilterBoolFunction(Card.IsFusionType,TYPE_SYNCHRO),aux.FilterBoolFunction(Card.IsFusionType,TYPE_XYZ),false)
 	--spsummon condition
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)

c80889750.lua

@@ -31,7 +31,7 @@ function c80889750.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function c80889750.mfilter1(c)
-	return c:IsFusionSetCard(0xad) and c:IsType(TYPE_FUSION)
+	return c:IsFusionSetCard(0xad) and c:IsFusionType(TYPE_FUSION)
 end
 function c80889750.mfilter2(c)
 	return c:IsFusionSetCard(0xa9) or c:IsFusionSetCard(0xc3)

c90555947.lua

@@ -19,7 +19,7 @@ function c90555947.initial_effect(c)
 end
 c90555947.miracle_synchro_fusion=true
 function c90555947.ffilter(c)
-	return c:IsFusionAttribute(ATTRIBUTE_EARTH) and c:IsType(TYPE_SYNCHRO)
+	return c:IsFusionAttribute(ATTRIBUTE_EARTH) and c:IsFusionType(TYPE_SYNCHRO)
 end
 function c90555947.discon(e,tp,eg,ep,ev,re,r,rp)
 	if e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED) then return false end