Push by Appveyor

expansions/script/c10113036.lua

@@ -21,7 +21,7 @@ function c10113036.initial_effect(c)
 	c:RegisterEffect(e2)	
 end
 function c10113036.con(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function c10113036.op(e,tp,eg,ep,ev,re,r,rp)
 	--Atk up

expansions/script/c10113039.lua

@@ -109,7 +109,7 @@ function c10113039.retop(e,tp,eg,ep,ev,re,r,rp)
 	e:Reset()
 end
 function c10113039.drcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_RITUAL
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_RITUAL)
 end
 function c10113039.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsPlayerCanDraw(tp,1) end

expansions/script/c10113087.lua

@@ -53,7 +53,7 @@ function c10113087.retg(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_RECOVER,nil,0,tp,e:GetLabel())
 end
 function c10113087.recon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SPECIAL+1
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SPECIAL)+1
 end
 --mdzz with some fuck card has 2 or more races (oh ,,,,,I have 2 card like this....XD)
 function c10113087.spcon(e,c)

expansions/script/c10119005.lua

@@ -82,7 +82,7 @@ function c10119005.spop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c10119005.sumfilter(c)
-	return c:GetSummonType()==SUMMON_TYPE_XYZ 
+	return c:IsSummonType(SUMMON_TYPE_XYZ) 
 end
 function c10119005.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then 

expansions/script/c10119008.lua

@@ -48,7 +48,7 @@ end
 
 function c10119008.sumfilter(c,tp)
 	local mg=c:GetMaterial()
-	return c:GetSummonType()==SUMMON_TYPE_XYZ and mg:GetCount()>0 and mg:IsExists(c10119008.effilter,1,nil,tp) 
+	return c:IsSummonType(SUMMON_TYPE_XYZ) and mg:GetCount()>0 and mg:IsExists(c10119008.effilter,1,nil,tp) 
 end
 
 function c10119008.desfilter(c)
@@ -72,7 +72,7 @@ end
 
 function c10119008.cdsstg(e,c)
 	local mg=c:GetMaterial()
-	return c:GetSummonType()==SUMMON_TYPE_XYZ and mg:GetCount()>0 and mg:IsExists(c10119008.effilter,1,nil,e:GetHandlerPlayer())
+	return c:IsSummonType(SUMMON_TYPE_XYZ) and mg:GetCount()>0 and mg:IsExists(c10119008.effilter,1,nil,e:GetHandlerPlayer())
 end
 
 function c10119008.effilter(c,tp)

expansions/script/c10123006.lua

@@ -57,14 +57,14 @@ function c10123006.chainlm(e,rp,tp)
 end
 function c10123006.sumfilter(c,tp)
 	local mg=c:GetMaterial()
-	return c:GetSummonType()==SUMMON_TYPE_SYNCHRO and mg:GetCount()>0 and mg:IsExists(c10123006.effilter,1,nil,tp) 
+	return c:IsSummonType(SUMMON_TYPE_SYNCHRO) and mg:GetCount()>0 and mg:IsExists(c10123006.effilter,1,nil,tp) 
 end
 function c10123006.sumsuc(e,tp,eg,ep,ev,re,r,rp)
 	Duel.SetChainLimitTillChainEnd(c10123006.chainlm)
 end
 function c10123006.cdsstg(e,c)
 	local mg=c:GetMaterial()
-	return c:GetSummonType()==SUMMON_TYPE_SYNCHRO and mg:GetCount()>0 and mg:IsExists(c10123006.effilter,1,nil,e:GetHandlerPlayer())
+	return c:IsSummonType(SUMMON_TYPE_SYNCHRO) and mg:GetCount()>0 and mg:IsExists(c10123006.effilter,1,nil,e:GetHandlerPlayer())
 end
 function c10123006.effilter(c,tp)
 	return c:IsSetCard(0x5334) and c:IsPreviousLocation(LOCATION_MZONE) and c:GetPreviousControler()==tp and c:IsReason(REASON_SYNCHRO)

expansions/script/c10123007.lua

@@ -26,7 +26,7 @@ function c10123007.thfilter(c,eg,e,tp)
 end
 function c10123007.thfilter2(c,mc,tp)
 	local mg=c:GetMaterial()
-	return c:GetSummonType()==SUMMON_TYPE_SYNCHRO and mc:GetReasonCard()==c and mg:GetCount()>0 and mg:IsExists(c10123007.thfilter3,1,nil,tp)
+	return c:IsSummonType(SUMMON_TYPE_SYNCHRO) and mc:GetReasonCard()==c and mg:GetCount()>0 and mg:IsExists(c10123007.thfilter3,1,nil,tp)
 end
 function c10123007.thfilter3(c,tp)
 	return c:GetPreviousControler()==tp and c:IsPreviousLocation(LOCATION_MZONE) and c:IsSetCard(0x5334)

expansions/script/c1110111.lua

@@ -50,7 +50,7 @@ function c1110111.vfilter3(c)
 end
 --
 function c1110111.con1(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_FUSION 
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION) 
 end
 --
 function c1110111.tg1(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c1110112.lua

@@ -54,7 +54,7 @@ function c1110112.filter1(c,e,tp)
 	return c:IsCode(1110111) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and c:IsFaceup() 
 end
 function c1110112.con1(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_FUSION 
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION) 
 end
 --
 function c1110112.tg1(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c1110151.lua

@@ -79,7 +79,7 @@ function c1110151.filterx(c)
 end
 --
 function c1110151.con3(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_RITUAL
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_RITUAL)
 end
 function c1110151.cost3(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetActivityCount(tp,ACTIVITY_BATTLE_PHASE)==0 end

expansions/script/c1111008.lua

@@ -19,7 +19,7 @@ function c1111008.IsLd(c)
 end
 --
 function c1111008.cfilter1(c)
-	return c:GetSummonType()==SUMMON_TYPE_FUSION and c:IsFaceup()
+	return c:IsSummonType(SUMMON_TYPE_FUSION) and c:IsFaceup()
 end
 function c1111008.cost1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
@@ -30,14 +30,14 @@ function c1111008.cost1(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 --
 function c1111008.cfilter1(c)
-	return c:IsFaceup() and c:GetLevel()<4 and c:GetSummonType()==SUMMON_TYPE_NORMAL 
+	return c:IsFaceup() and c:GetLevel()<4 and c:IsSummonType(SUMMON_TYPE_NORMAL) 
 end
 function c1111008.con1(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(c1111008.cfilter1,tp,LOCATION_ONFIELD,0,1,nil) and Duel.GetMatchingGroupCount(aux.TRUE,tp,LOCATION_MZONE,0,nil)==1
 end
 --
 function c1111008.tfilter0(c)
-	return c:GetSummonType()==SUMMON_TYPE_SPECIAL and c:IsFaceup()
+	return c:IsSummonType(SUMMON_TYPE_SPECIAL) and c:IsFaceup()
 end
 function c1111008.tfilter1(c)
 	return c1111008.IsLd(c) and c:IsAbleToHand()

expansions/script/c114000268.lua

@@ -38,7 +38,7 @@ function c114000268.ntop(e,tp,eg,ep,ev,re,r,rp,c)
 end
 
 function c114000268.condition(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_NORMAL+1
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_NORMAL)+1
 end
 function c114000268.filter(c)	
 	return c:IsType(TYPE_MONSTER) and ( c:IsSetCard(0x221) or c:IsCode(114000231) ) and c:IsAbleToGraveAsCost()

expansions/script/c114100154.lua

@@ -65,7 +65,7 @@ function c114100154.checkop(e,tp,eg,ep,ev,re,r,rp)
 end
 --
 function c114100154.regcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function c114100154.regop(e,tp,eg,ep,ev,re,r,rp)
 	local e1=Effect.CreateEffect(e:GetHandler())

expansions/script/c1150032.lua

@@ -26,7 +26,7 @@ function c1150032.initial_effect(c)
 end
 --
 function c1150032.cfilter1(c)
-	return c:IsFaceup() and c:IsRace(RACE_PLANT) and c:GetLevel()>7 and c:GetSummonType()==SUMMON_TYPE_ADVANCE 
+	return c:IsFaceup() and c:IsRace(RACE_PLANT) and c:GetLevel()>7 and c:IsSummonType(SUMMON_TYPE_ADVANCE) 
 end
 function c1150032.con1(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(c1150032.cfilter1,tp,LOCATION_ONFIELD,0,1,nil)

expansions/script/c1190101.lua

@@ -41,7 +41,7 @@ function c1190101.syfilter2(c)
 end
 --
 function c1190101.con1(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 --
 function c1190101.tg1(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c1190102.lua

@@ -42,7 +42,7 @@ function c1190102.syfilter2(c)
 end
 --
 function c1190102.con1(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 --
 function c1190102.filter1(c,e,tp)

expansions/script/c1190103.lua

@@ -48,7 +48,7 @@ function c1190103.syfilter2(c)
 end
 --
 function c1190103.con1(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function c1190103.cost1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.CheckLPCost(tp,2000) end

expansions/script/c1190104.lua

@@ -41,7 +41,7 @@ function c1190104.syfilter2(c)
 end
 --
 function c1190104.con1(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function c1190104.op1(e,tp,eg,ep,ev,re,r,rp)
 	Duel.SetLP(1-tp,Duel.GetLP(1-tp)/2) 

expansions/script/c1200045.lua

@@ -88,7 +88,7 @@ function c1200045.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	local mg=c:GetMaterial()
 	local ct=mg:GetCount()
-	if chk==0 then return c:GetSummonType()==SUMMON_TYPE_SYNCHRO
+	if chk==0 then return c:IsSummonType(SUMMON_TYPE_SYNCHRO)
 		and ct>0 and Duel.GetLocationCount(tp,LOCATION_MZONE)>=ct
 		and mg:FilterCount(c1200045.spfilter,nil,e,tp,c)==ct end
 	Duel.SetTargetCard(mg)

expansions/script/c1200050.lua

@@ -81,7 +81,7 @@ function c1200050.sprop(e,tp,eg,ep,ev,re,r,rp,c)
 	Duel.Release(g1,REASON_COST)
 end
 function c1200050.con(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_FUSION 
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION) 
 end
 function c1200050.spfilter4(c,e,tp)
 	return c:IsType(TYPE_MONSTER) and c:IsCode(1200011,1200012,1200013,1200014,1200015,1200016,1200041,1200042,1200043,1200050) and c:IsCanBeSpecialSummoned(e, 0, tp, false, false)

expansions/script/c1200051.lua

@@ -80,7 +80,7 @@ function c1200051.operation2(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c1200051.con(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO 
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) 
 end
 function c1200051.rfilter(c)
 	return c:IsType(TYPE_MONSTER) and c:IsSetCard(0xfba) and c:IsReleasable()

expansions/script/c12001021.lua

@@ -31,7 +31,7 @@ function c12001021.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function c12001021.descon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_LINK and e:GetLabel()==1
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK) and e:GetLabel()==1
 end
 function c12001021.valcheck(e,c)
 	local g=c:GetMaterial()

expansions/script/c12001023.lua

@@ -43,7 +43,7 @@ function c12001023.ntfilter(c)
 	return c:IsFaceup() and c:IsSetCard(0xfb0) and c:IsCanBeSynchroMaterial()
 end
 function c12001023.matfilter1(c,syncard)
-	return c:IsType(TYPE_PENDULUM) and c:GetSummonType()==SUMMON_TYPE_PENDULUM and c:IsNotTuner() and c:IsFaceup() and c:IsCanBeSynchroMaterial(syncard)
+	return c:IsType(TYPE_PENDULUM) and c:IsSummonType(SUMMON_TYPE_PENDULUM) and c:IsNotTuner() and c:IsFaceup() and c:IsCanBeSynchroMaterial(syncard)
 		and Duel.IsExistingMatchingCard(c12001023.matfilter2,0,LOCATION_MZONE,LOCATION_MZONE,1,c,syncard)
 end
 function c12001023.matfilter2(c,syncard)

expansions/script/c13580001.lua

@@ -47,7 +47,7 @@ function cm.sop(e,tp,eg,ep,ev,re,r,rp,c)
 end
 --Draw
 function cm.drcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_ADVANCE
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_ADVANCE)
 end
 function cm.drop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_CARD,0,m)

expansions/script/c13580002.lua

@@ -47,7 +47,7 @@ function cm.sop(e,tp,eg,ep,ev,re,r,rp,c)
 end
 --Draw
 function cm.drcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_ADVANCE
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_ADVANCE)
 end
 function cm.drop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_CARD,0,m)

expansions/script/c13580003.lua

@@ -47,7 +47,7 @@ function cm.sop(e,tp,eg,ep,ev,re,r,rp,c)
 end
 --Draw
 function cm.drcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_ADVANCE
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_ADVANCE)
 end
 function cm.drop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_CARD,0,m)

expansions/script/c13580004.lua

@@ -47,7 +47,7 @@ function cm.sop(e,tp,eg,ep,ev,re,r,rp,c)
 end
 --Draw
 function cm.drcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_ADVANCE
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_ADVANCE)
 end
 function cm.drop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_CARD,0,m)

expansions/script/c13580005.lua

@@ -47,7 +47,7 @@ function cm.sop(e,tp,eg,ep,ev,re,r,rp,c)
 end
 --Draw
 function cm.drcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_ADVANCE
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_ADVANCE)
 end
 function cm.drop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_CARD,0,m)

expansions/script/c13580006.lua

@@ -47,7 +47,7 @@ function cm.sop(e,tp,eg,ep,ev,re,r,rp,c)
 end
 --Draw
 function cm.drcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_ADVANCE
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_ADVANCE)
 end
 function cm.drop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_CARD,0,m)

expansions/script/c13580007.lua

@@ -47,7 +47,7 @@ function cm.sop(e,tp,eg,ep,ev,re,r,rp,c)
 end
 --Draw
 function cm.drcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_ADVANCE
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_ADVANCE)
 end
 function cm.drop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_CARD,0,m)

expansions/script/c14140006.lua

@@ -10,7 +10,7 @@ function cm.initial_effect(c)
 	e4:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e4:SetProperty(0x14000+EFFECT_FLAG_CARD_TARGET)
 	e4:SetCondition(function(e,tp,eg,ep,ev,re,r,rp)
-		return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+		return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 	end)
 	e4:SetTarget(cm.destg1)
 	e4:SetOperation(cm.desop1)

expansions/script/c14140014.lua

@@ -10,7 +10,7 @@ function cm.initial_effect(c)
 	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e1:SetProperty(0x14000)
 	e1:SetCondition(function(e)
-		return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+		return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 	end)
 	e1:SetCost(function(e)
 		e:SetLabel(1)

expansions/script/c14140016.lua

@@ -267,7 +267,7 @@ function cm.valcheck(e,c)
 	e:GetLabelObject():SetLabel(ct)
 end
 function cm.mtcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO and e:GetLabel()>0
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) and e:GetLabel()>0
 end
 function cm.mtop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c16063015.lua

@@ -24,7 +24,7 @@ function c16063015.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c16063015.descon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function c16063015.desfilter(c)
 	return c:IsType(TYPE_MONSTER) and c:IsPosition(POS_FACEUP_ATTACK) and c:IsDestructable()

expansions/script/c16063025.lua

@@ -25,7 +25,7 @@ function c16063025.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c16063025.spcon(e,tp,eg,ep,ev,re,r,rp,chk)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function c16063025.spfilter(c,e,tp)
 	return c:IsType(TYPE_TUNER) and c:IsSetCard(0x5c5) and c:IsCanBeSpecialSummoned(e,0,tp,false,true)

expansions/script/c16080031.lua

@@ -46,7 +46,7 @@ function c16080031.distarget(e,c)
 	return c:IsType(TYPE_SPELL+TYPE_TRAP)
 end
 function c16080031.spcon(e,tp,eg,ep,ev,re,r,rp,chk)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function c16080031.spfilter(c,e,tp)
 	return c:IsLevelBelow(4) and c:IsSetCard(0x5ca) and c:IsCanBeSpecialSummoned(e,0,tp,false,true)

expansions/script/c17060801.lua

@@ -43,7 +43,7 @@ function c17060801.IsMillion_Arthur(c)
 	return m and m.is_named_with_Million_Arthur
 end
 function c17060801.cfilter(c,tp)
-	return c:IsFaceup() and c17060801.IsMillion_Arthur(c) and c:IsControler(tp) and c:GetSummonType()==SUMMON_TYPE_PENDULUM
+	return c:IsFaceup() and c17060801.IsMillion_Arthur(c) and c:IsControler(tp) and c:IsSummonType(SUMMON_TYPE_PENDULUM)
 end
 function c17060801.atkcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(c17060801.cfilter,1,nil,tp)

expansions/script/c17060802.lua

@@ -69,7 +69,7 @@ function c17060802.pcop(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function c17060802.spcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_PENDULUM
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_PENDULUM)
 end
 function c17060802.filter(c,e,tp)
 	return c17060802.IsMillion_Arthur(c) and not c:IsCode(17060802) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

expansions/script/c17060805.lua

@@ -78,7 +78,7 @@ function c17060805.pcop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c17060805.tdcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ and e:GetLabel()==1
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ) and e:GetLabel()==1
 end
 function c17060805.filter(c)
 	return c:IsType(TYPE_MONSTER)

expansions/script/c17060806.lua

@@ -96,7 +96,7 @@ function c17060806.pcop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c17060806.rmcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_FUSION and e:GetLabel()==1
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION) and e:GetLabel()==1
 end
 function c17060806.rmfilter(c)
 	return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToRemove()

expansions/script/c17060807.lua

@@ -59,7 +59,7 @@ function c17060807.IsMillion_Arthur(c)
 	return m and m.is_named_with_Million_Arthur
 end
 function c17060807.sumcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO and e:GetLabel()==1
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) and e:GetLabel()==1
 end
 function c17060807.valcheck(e,c)
 	local g=c:GetMaterial()

expansions/script/c17060811.lua

@@ -89,6 +89,6 @@ function c17060811.penop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c17060811.tcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
-	or e:GetHandler():GetSummonType()==SUMMON_TYPE_PENDULUM
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
+	or e:GetHandler():IsSummonType(SUMMON_TYPE_PENDULUM)
 end
\ No newline at end of file

expansions/script/c17060832.lua

@@ -75,7 +75,7 @@ function c17060832.atkop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c17060832.spcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function c17060832.spfilter(c,e,tp)
 	return c17060832.IsMillion_Arthur(c) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
@@ -134,5 +134,5 @@ function c17060832.penop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c17060832.tcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
\ No newline at end of file

expansions/script/c17060843.lua

@@ -96,7 +96,7 @@ function c17060843.tgop(e,tp,eg,ep,ev,re,r,rp)
 end
 function c17060843.xyzcon(e,tp,eg,ep,ev,re,r,rp)
 	local tc=eg:GetFirst()
-	return tc:GetSummonType()==SUMMON_TYPE_XYZ and tc:IsControler(1-tp)
+	return tc:IsSummonType(SUMMON_TYPE_XYZ) and tc:IsControler(1-tp)
 end
 function c17060843.xyzcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()

expansions/script/c17060844.lua

@@ -90,7 +90,7 @@ function c17060844.ntfilter(c)
 	return c:IsFaceup() and c:IsType(TYPE_SYNCHRO) and c:IsRace(RACE_WARRIOR) and c:IsCanBeSynchroMaterial()
 end
 function c17060844.matfilter1(c,syncard)
-	return (c:IsType(TYPE_PENDULUM) and c17060844.IsMillion_Arthur(c)) and c:GetSummonType()==SUMMON_TYPE_PENDULUM and c:IsNotTuner() and c:IsFaceup() and c:IsCanBeSynchroMaterial(syncard)
+	return (c:IsType(TYPE_PENDULUM) and c17060844.IsMillion_Arthur(c)) and c:IsSummonType(SUMMON_TYPE_PENDULUM) and c:IsNotTuner() and c:IsFaceup() and c:IsCanBeSynchroMaterial(syncard)
 		and Duel.IsExistingMatchingCard(c17060844.matfilter2,0,LOCATION_MZONE,LOCATION_MZONE,1,c,syncard)
 end
 function c17060844.matfilter2(c,syncard)

expansions/script/c17060849.lua

@@ -73,7 +73,7 @@ function c17060849.rpop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c17060849.spcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_FUSION
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION)
 end
 function c17060849.filter(c,e,tp)
 	return c:IsType(TYPE_PENDULUM) and c:IsLevelBelow(4) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

expansions/script/c17060860.lua

@@ -45,7 +45,7 @@ function c17060860.thop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c17060860.pscon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_LINK
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK)
 end
 function c17060860.psfilter(c)
 	return c:IsFaceup() and c17060860.IsDark_Degenerate(c) and c:IsType(TYPE_PENDULUM) and not c:IsForbidden()

expansions/script/c17060864.lua

@@ -82,7 +82,7 @@ function c17060864.ntfilter(c)
 	return c:IsFaceup() and c17060864.IsMagic_Factions(c) and c:IsCanBeSynchroMaterial()
 end
 function c17060864.matfilter1(c,syncard)
-	return c:IsType(TYPE_PENDULUM) and c:GetSummonType()==SUMMON_TYPE_PENDULUM and c:IsNotTuner() and c:IsFaceup() and c:IsCanBeSynchroMaterial(syncard)
+	return c:IsType(TYPE_PENDULUM) and c:IsSummonType(SUMMON_TYPE_PENDULUM) and c:IsNotTuner() and c:IsFaceup() and c:IsCanBeSynchroMaterial(syncard)
 		and Duel.IsExistingMatchingCard(c17060864.matfilter2,0,LOCATION_MZONE,LOCATION_MZONE,1,c,syncard)
 end
 function c17060864.matfilter2(c,syncard)

expansions/script/c17060865.lua

@@ -87,7 +87,7 @@ function c17060865.spop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c17060865.tdcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_FUSION
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION)
 end
 function c17060865.tdfilter(c)
 	return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToDeck()

expansions/script/c17060882.lua

@@ -33,7 +33,7 @@ function c17060882.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function c17060882.descon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_LINK and e:GetLabel()==1
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK) and e:GetLabel()==1
 end
 function c17060882.valcheck(e,c)
 	local g=c:GetMaterial()

expansions/script/c17082101.lua

@@ -216,10 +216,10 @@ function c17082101.tgop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c17082101.tgcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO and e:GetLabel()==1
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) and e:GetLabel()==1
 end
 function c17082101.mfilter(c)
-	return c:IsType(TYPE_PENDULUM) and c:GetSummonType()==SUMMON_TYPE_PENDULUM
+	return c:IsType(TYPE_PENDULUM) and c:IsSummonType(SUMMON_TYPE_PENDULUM)
 		and (c:IsType(TYPE_TUNER) or c:GetFlagEffect(17082101)~=0)
 end
 function c17082101.valcheck(e,c)

expansions/script/c2110001.lua

@@ -37,7 +37,7 @@ function c2110001.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function c2110001.condition(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_RITUAL 
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_RITUAL) 
 end
 function c2110001.filter(c)
 	return c:IsRace(RACE_DRAGON) and c:IsLevelBelow(6) and c:IsAbleToHand()

expansions/script/c2117000.lua

@@ -39,7 +39,7 @@ function c2117000.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c2117000.remcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 end
 function c2117000.tgfilter(c)
 	return c:IsType(TYPE_MONSTER) and c:IsRace(RACE_FIEND) and c:IsAbleToGrave()

expansions/script/c2117010.lua

@@ -16,7 +16,7 @@ function c2117010.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c2117010.remcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_FUSION
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION)
 end
 function c2117010.ffilter(c)
 	return c:IsSetCard(0x21c) and c:IsType(TYPE_MONSTER)

expansions/script/c2130001.lua

@@ -24,7 +24,7 @@ function c2130001.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c2130001.thcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO 
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) 
 end
 function c2130001.tgop1(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c21401115.lua

@@ -34,7 +34,7 @@ function c21401115.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function c21401115.imcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function c21401115.imfilter(e,te)
 	return te:IsActiveType(TYPE_MONSTER) and te:GetHandler():GetRace(RACE_DRAGON)

expansions/script/c21401116.lua

@@ -39,7 +39,7 @@ function c21401116.initial_effect(c)
 	c:RegisterEffect(e3)
 end	
 function c21401116.imcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function c21401116.imfilter(e,re,r,rp)
 	return bit.band(r,REASON_BATTLE)~=0

expansions/script/c21401121.lua

@@ -46,7 +46,7 @@ function c21401121.initial_effect(c)
 	c:RegisterEffect(e5)
 end
 function c21401121.imcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function c21401121.imfilter(e,re,r,rp)
 	return bit.band(r,REASON_EFFECT)~=0

expansions/script/c21401122.lua

@@ -40,7 +40,7 @@ function c21401122.initial_effect(c)
 	c:RegisterEffect(e5)
 end
 function c21401122.imcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function c21401122.imfilter(e,te)
 	return (te:IsActiveType(TYPE_SPELL) or (te:IsActiveType(TYPE_MONSTER) and te:GetHandler():GetRace(RACE_SPELLCASTER)))

expansions/script/c22230161.lua

@@ -95,7 +95,7 @@ end
 function c22230161.spr(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if bit.band(r,0x41)~=0x41 or not c:IsPreviousLocation(LOCATION_ONFIELD) then return end
-	if c:GetSummonType()==SUMMON_TYPE_LINK then
+	if c:IsSummonType(SUMMON_TYPE_LINK) then
 		if Duel.GetCurrentPhase()==PHASE_STANDBY then
 			c:RegisterFlagEffect(22230161,RESET_EVENT+0x1ff0000+RESET_PHASE+PHASE_STANDBY,0,2)
 		else

expansions/script/c23330006.lua

@@ -36,7 +36,7 @@ function c23330006.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function c23330006.spcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function c23330006.spfilter(c,e,tp)
 	return c:GetLevel()==1 and c:IsType(TYPE_TUNER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

expansions/script/c23330007.lua

@@ -36,7 +36,7 @@ function c23330007.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function c23330007.spcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function c23330007.spfilter(c,e,tp)
 	return c:IsLevelBelow(2) and c:IsType(TYPE_TUNER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

expansions/script/c23330008.lua

@@ -36,7 +36,7 @@ function c23330008.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function c23330008.spcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function c23330008.spfilter(c,e,tp)
 	return c:IsLevelBelow(3) and c:IsType(TYPE_TUNER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

expansions/script/c23330009.lua

@@ -36,7 +36,7 @@ function c23330009.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function c23330009.spcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function c23330009.spfilter(c,e,tp)
 	return c:IsLevelBelow(4) and c:IsType(TYPE_TUNER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

expansions/script/c23330010.lua

@@ -36,7 +36,7 @@ function c23330010.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function c23330010.spcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function c23330010.spfilter(c,e,tp)
 	return c:IsType(TYPE_TUNER) and c:IsType(TYPE_SYNCHRO) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

expansions/script/c23330013.lua

@@ -46,7 +46,7 @@ function c23330013.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function c23330013.tdcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function c23330013.tdfilter(c)
 	return (c:IsType(TYPE_FUSION) or c:IsType(TYPE_XYZ)) and c:IsAbleToDeck()
@@ -61,7 +61,7 @@ function c23330013.tdop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.SendtoDeck(g,nil,2,REASON_EFFECT)
 end
 function c23330013.splimit(e,c,tp,sumtp,sumpos)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO and (bit.band(sumtp,SUMMON_TYPE_FUSION)==SUMMON_TYPE_FUSION or bit.band(sumtp,SUMMON_TYPE_XYZ)==SUMMON_TYPE_XYZ)
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) and (bit.band(sumtp,SUMMON_TYPE_FUSION)==SUMMON_TYPE_FUSION or bit.band(sumtp,SUMMON_TYPE_XYZ)==SUMMON_TYPE_XYZ)
 end
 function c23330013.matfilter1(c,syncard)
 	return c:IsType(TYPE_TUNER) and (c:IsLocation(LOCATION_HAND) or c:IsFaceup()) and c:IsCanBeSynchroMaterial(syncard)

expansions/script/c23330014.lua

@@ -51,5 +51,5 @@ function c23330014.rmop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.ConfirmCards(tp,cg)
 end
 function c23330014.splimit(e,c,tp,sumtp,sumpos)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO and (bit.band(sumtp,SUMMON_TYPE_FUSION)==SUMMON_TYPE_FUSION or bit.band(sumtp,SUMMON_TYPE_XYZ)==SUMMON_TYPE_XYZ)
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) and (bit.band(sumtp,SUMMON_TYPE_FUSION)==SUMMON_TYPE_FUSION or bit.band(sumtp,SUMMON_TYPE_XYZ)==SUMMON_TYPE_XYZ)
 end

expansions/script/c23330015.lua

@@ -50,14 +50,14 @@ function c23330015.initial_effect(c)
 	c:RegisterEffect(e5)
 end
 function c23330015.lpcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO and e:GetHandler():GetMaterial():GetCount()==5
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) and e:GetHandler():GetMaterial():GetCount()==5
 end
 function c23330015.lpop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.SetLP(1-tp,2000)
 	Duel.SetLP(tp,8000)
 end
 function c23330015.splimit(e,c,tp,sumtp,sumpos)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO and (bit.band(sumtp,SUMMON_TYPE_RITUAL)==SUMMON_TYPE_RITUAL or bit.band(sumtp,SUMMON_TYPE_FUSION)==SUMMON_TYPE_FUSION or bit.band(sumtp,SUMMON_TYPE_XYZ)==SUMMON_TYPE_XYZ or bit.band(sumtp,SUMMON_TYPE_PENDULUM)==SUMMON_TYPE_PENDULUM)
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) and (bit.band(sumtp,SUMMON_TYPE_RITUAL)==SUMMON_TYPE_RITUAL or bit.band(sumtp,SUMMON_TYPE_FUSION)==SUMMON_TYPE_FUSION or bit.band(sumtp,SUMMON_TYPE_XYZ)==SUMMON_TYPE_XYZ or bit.band(sumtp,SUMMON_TYPE_PENDULUM)==SUMMON_TYPE_PENDULUM)
 end
 function c23330015.matfilter1(c,syncard)
 	return c:IsType(TYPE_TUNER) and c:IsType(TYPE_SYNCHRO) and (c:IsLocation(LOCATION_HAND) or c:IsFaceup()) and c:IsCanBeSynchroMaterial(syncard)

expansions/script/c33700004.lua

@@ -176,7 +176,7 @@ function c33700004.descon(e)
 	return e:GetHandler():GetFlagEffect(33700004)~=0 and not Duel.IsExistingMatchingCard(c33700004.actfilter,e:GetHandlerPlayer(),LOCATION_MZONE,0,1,nil)
 end
 function c33700004.condition(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SPECIAL+1
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SPECIAL)+1
 end
 function c33700004.desop(e,tp,eg,ep,ev,re,r,rp)
 	e:GetHandler():RegisterFlagEffect(33700004,RESET_EVENT+0x1fe0000,0,1)

expansions/script/c33700005.lua

@@ -120,7 +120,7 @@ function c33700005.pencon2(e,tp,eg,ep,ev,re,r,rp)
 	return bit.band(r,REASON_EFFECT)~=0
 end
 function c33700005.condition(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SPECIAL+1
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SPECIAL)+1
 end
 function c33700005.operation(e,tp,eg,ep,ev,re,r,rp)
 	e:GetHandler():RegisterFlagEffect(33700005,RESET_EVENT+0x1fe0000,0,1)

expansions/script/c33700006.lua

@@ -135,7 +135,7 @@ function c33700006.descon(e)
 	return e:GetHandler():GetFlagEffect(33700006)~=0 and not Duel.IsExistingMatchingCard(c33700006.actfilter,e:GetHandlerPlayer(),LOCATION_MZONE,0,1,nil)
 end
 function c33700006.condition(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SPECIAL+1
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SPECIAL)+1
 end
 function c33700006.operation(e,tp,eg,ep,ev,re,r,rp)
 	e:GetHandler():RegisterFlagEffect(33700006,RESET_EVENT+0x1fe0000,0,1)

expansions/script/c33700028.lua

@@ -28,7 +28,7 @@ function c33700028.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c33700028.spcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function c33700028.spfilter(c,e,tp)
 	return c:IsType(TYPE_MONSTER) and c:IsFaceup() and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

expansions/script/c33700030.lua

@@ -115,7 +115,7 @@ function c33700030.ntop(e,tp,eg,ep,ev,re,r,rp,c)
 	c:RegisterEffect(e2)
 end
 function c33700030.valcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_NORMAL+1
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_NORMAL)+1
 end
 function c33700030.valop(e,tp,eg,ep,ev,re,r,rp)
 	local e1=Effect.CreateEffect(e:GetHandler())

expansions/script/c33700041.lua

@@ -22,7 +22,7 @@ function c33700041.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c33700041.cfilter(c,e,tp)
-	return  c:GetSummonPlayer()==tp and c:GetSummonType()==SUMMON_TYPE_PENDULUM
+	return  c:GetSummonPlayer()==tp and c:IsSummonType(SUMMON_TYPE_PENDULUM)
 		and (not e or c:IsRelateToEffect(e))
 end
 function c33700041.spcon(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c37564022.lua

@@ -32,7 +32,7 @@ function cm.ovfilter(c)
 	return c:IsType(TYPE_XYZ) and c:GetRank()==4
 end
 function cm.atkcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ and e:GetHandler():GetOverlayGroup():IsExists(cm.ovfilter,1,nil)
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ) and e:GetHandler():GetOverlayGroup():IsExists(cm.ovfilter,1,nil)
 end
 function cm.atkop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c37564037.lua

@@ -89,7 +89,7 @@ function cm.efop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function cm.drcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 end
 function cm.filter(c,tp)
 	return not c:IsType(TYPE_TOKEN) and (c:IsControler(tp) or c:IsAbleToChangeControler())

expansions/script/c37564046.lua

@@ -101,7 +101,7 @@ function cm.valcheck(e,c)
 	e:GetLabelObject():SetLabel(ct)
 end
 function cm.mtcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_FUSION and e:GetLabel()>0
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION) and e:GetLabel()>0
 end
 function cm.mtop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c37564055.lua

@@ -20,7 +20,7 @@ function cm.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e2:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e2:SetCondition(function(e,tp,eg,ep,ev,re,r,rp)
-		return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO and e:GetLabel()==1
+		return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) and e:GetLabel()==1
 	end)
 	e2:SetOperation(function(e,tp,eg,ep,ev,re,r,rp)
 		local c=e:GetHandler()

expansions/script/c37564312.lua

@@ -11,7 +11,7 @@ function cm.initial_effect(c)
 	e4:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e4:SetProperty(0x14000+EFFECT_FLAG_CARD_TARGET)
 	e4:SetCondition(function(e,tp,eg,ep,ev,re,r,rp)
-		return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+		return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 	end)
 	e4:SetTarget(cm.destg)
 	e4:SetOperation(cm.desop)

expansions/script/c37564324.lua

@@ -24,7 +24,7 @@ function cm.initial_effect(c)
 	e0:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e0:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e0:SetCondition(function(e,tp,eg,ep,ev,re,r,rp)
-		return e:GetHandler():GetSummonType()==SUMMON_TYPE_FUSION and cm.material
+		return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION) and cm.material
 	end)
 	e0:SetOperation(function(e,tp,eg,ep,ev,re,r,rp)
 		local code1=cm.material[1]

expansions/script/c37564400.lua

@@ -22,7 +22,7 @@ function cm.initial_effect(c)
 	e4:SetProperty(0x14000)
 	e4:SetCost(cm.rm)
 	e4:SetCondition(function(e,tp,eg,ep,ev,re,r,rp)
-		return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+		return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 	end)
 	e4:SetTarget(cm.drtg)
 	e4:SetOperation(cm.drop)

expansions/script/c37564416.lua

@@ -11,7 +11,7 @@ function cm.initial_effect(c)
 	e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e4:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e4:SetCondition(function(e,tp,eg,ep,ev,re,r,rp)
-		return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+		return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 	end)
 	e4:SetProperty(0x14000)
 	e4:SetCost(Senya.PrismRemoveExtraCost)

expansions/script/c37564417.lua

@@ -31,7 +31,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function cm.setcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 end
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsAbleToHand() end

expansions/script/c37564421.lua

@@ -64,7 +64,7 @@ function cm.efop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function cm.drcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 end
 function cm.filter(c)
 	return (Senya.check_set_elem(c) or Senya.check_set_prism(c)) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()

expansions/script/c37564424.lua

@@ -10,7 +10,7 @@ function cm.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e2:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e2:SetCondition(function(e,tp,eg,ep,ev,re,r,rp)
-		return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+		return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 	end)
 	e2:SetProperty(0x14000)
 	e2:SetCost(Senya.PrismRemoveExtraCost)

expansions/script/c37564601.lua

@@ -38,7 +38,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function cm.thcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function cm.distg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,0,LOCATION_ONFIELD,1,nil) end

expansions/script/c37564602.lua

@@ -40,7 +40,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function cm.sumcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function cm.sumsuc(e,tp,eg,ep,ev,re,r,rp)
 	local e1=Effect.CreateEffect(e:GetHandler())

expansions/script/c37564603.lua

@@ -55,7 +55,7 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	else e:SetLabel(0) end
 end
 function cm.thcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and chkc:IsDestructable() end

expansions/script/c37564605.lua

@@ -29,7 +29,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function cm.thcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function cm.filter(c)
 	return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToRemove()

expansions/script/c37564606.lua

@@ -55,7 +55,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function cm.thcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function cm.filter(c,e,tp,mg)
 	return mg and mg:IsContains(c) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

expansions/script/c37564607.lua

@@ -42,7 +42,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function cm.drcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function cm.drtarg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsPlayerCanDraw(tp,1) end

expansions/script/c37564616.lua

@@ -30,7 +30,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function cm.thcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function cm.distg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsPlayerCanDiscardDeck(tp,2) end

expansions/script/c37564701.lua

@@ -103,7 +103,7 @@ function cm.xyzop(e,tp,eg,ep,ev,re,r,rp,c,og,min,max)
 	Senya.OverlayGroup(c,g,false,true)
 end
 function cm.regcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 end
 function cm.thfilter1(c)
 	return c:IsType(TYPE_PENDULUM) and c:IsLevelBelow(4)

expansions/script/c37564802.lua

@@ -9,7 +9,7 @@ function cm.initial_effect(c)
 	e0:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e0:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e0:SetCondition(function(e,tp,eg,ep,ev,re,r,rp)
-		return e:GetHandler():GetSummonType()==SUMMON_TYPE_FUSION and Duel.IsPlayerCanDraw(tp,1) and Duel.GetFlagEffect(tp,m)==0
+		return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION) and Duel.IsPlayerCanDraw(tp,1) and Duel.GetFlagEffect(tp,m)==0
 	end)
 	e0:SetOperation(cm.skipop)
 	c:RegisterEffect(e0)

expansions/script/c37564804.lua

@@ -9,7 +9,7 @@ function cm.initial_effect(c)
 	e0:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e0:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e0:SetCondition(function(e,tp,eg,ep,ev,re,r,rp)
-		return e:GetHandler():GetSummonType()==SUMMON_TYPE_FUSION and Duel.IsExistingMatchingCard(cm.f,tp,0,LOCATION_ONFIELD,1,nil) and Duel.GetFlagEffect(tp,m)==0
+		return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION) and Duel.IsExistingMatchingCard(cm.f,tp,0,LOCATION_ONFIELD,1,nil) and Duel.GetFlagEffect(tp,m)==0
 	end)
 	e0:SetOperation(cm.tdop)
 	c:RegisterEffect(e0)

expansions/script/c37564805.lua

@@ -10,7 +10,7 @@ function cm.initial_effect(c)
 	e0:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e0:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e0:SetCondition(function(e,tp,eg,ep,ev,re,r,rp)
-		return e:GetHandler():GetSummonType()==SUMMON_TYPE_FUSION and Duel.IsExistingMatchingCard(cm.f,tp,0,LOCATION_MZONE,1,nil) and Duel.GetFlagEffect(tp,m)==0
+		return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION) and Duel.IsExistingMatchingCard(cm.f,tp,0,LOCATION_MZONE,1,nil) and Duel.GetFlagEffect(tp,m)==0
 	end)
 	e0:SetOperation(cm.tdop)
 	c:RegisterEffect(e0)

expansions/script/c37564808.lua

@@ -32,7 +32,7 @@ function cm.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e2:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e2:SetCondition(function(e,tp,eg,ep,ev,re,r,rp)
-		return e:GetHandler():GetSummonType()==SUMMON_TYPE_FUSION and e:GetLabel()==100
+		return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION) and e:GetLabel()==100
 	end)
 	e2:SetOperation(function(e,tp,eg,ep,ev,re,r,rp)
 		local c=e:GetHandler()

expansions/script/c46564001.lua

@@ -56,7 +56,7 @@ function cm.spcon(e,c)
 		and Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_MZONE,0,1,nil)
 end
 function cm.lmtcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_PENDULUM
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_PENDULUM)
 end
 function cm.lmtop(e,tp,eg,ep,ev,re,r,rp)
 	local e1=Effect.CreateEffect(e:GetHandler())

expansions/script/c46564026.lua

@@ -34,7 +34,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function cm.decon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 end
 function cm.detg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDestructable,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) end

expansions/script/c46564765.lua

@@ -23,7 +23,7 @@ function c46564765.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c46564765.ngcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO  
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)  
 end
 function c46564765.filter(c)
 	return c:IsFaceup() and not c:IsDisabled()

expansions/script/c46564888.lua

@@ -46,7 +46,7 @@ function c46564888.valcheck(e,c)
 	e:SetLabel(att)
 end
 function c46564888.recon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_FUSION
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION)
 end
 function c46564888.reop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
@@ -59,7 +59,7 @@ function c46564888.reop(e,tp,eg,ep,ev,re,r,rp)
 	c:RegisterEffect(e4)
 end
 function c46564888.regcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_FUSION and e:GetLabelObject():GetLabel()~=0
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION) and e:GetLabelObject():GetLabel()~=0
 end
 function c46564888.regop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c50000038.lua

@@ -26,7 +26,7 @@ end
 
 function c50000038.drcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:GetSummonType()==SUMMON_TYPE_SYNCHRO and c:GetMaterial():IsExists(c50000038.pmfilter,1,nil)
+	return c:IsSummonType(SUMMON_TYPE_SYNCHRO) and c:GetMaterial():IsExists(c50000038.pmfilter,1,nil)
 end
 function c50000038.pmfilter(c)
 	return c:IsSetCard(0x50a) and c:IsType(TYPE_MONSTER)

expansions/script/c50000157.lua

@@ -56,7 +56,7 @@ function c50000157.IsKensei(c)
 	return mt and mt.is_named_with_Kensei
 end
 function c50000157.descon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function c50000157.desfilter(c)
 	return c:IsFaceup() and c50000157.IsKensei(c)

expansions/script/c50000205.lua

@@ -51,7 +51,7 @@ function c50000205.IsRely(c)
 end
 --ritual effect
 function c50000205.tdcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_RITUAL 
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_RITUAL) 
 end
 function c50000205.filter(c)
 	return c:GetSummonLocation()==LOCATION_EXTRA and c:IsAbleToDeck()
@@ -70,7 +70,7 @@ end
 --tohand
 function c50000205.thcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsPreviousLocation(LOCATION_MZONE) and c:GetSummonType()==SUMMON_TYPE_RITUAL 
+	return c:IsPreviousLocation(LOCATION_MZONE) and c:IsSummonType(SUMMON_TYPE_RITUAL) 
 end
 function c50000205.thfilter(c)
 	 return c:IsType(TYPE_PENDULUM) and c:IsAttribute(ATTRIBUTE_WATER) and c:IsRace(RACE_SPELLCASTER) and c:IsAbleToHand()

expansions/script/c50000206.lua

@@ -51,7 +51,7 @@ function c50000206.IsRely(c)
 end
 --ritual effect
 function c50000206.thcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_RITUAL 
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_RITUAL) 
 end
 function c50000206.filter(c)
 	return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToHand()
@@ -69,7 +69,7 @@ end
 --tohand
 function c50000206.secon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsPreviousLocation(LOCATION_MZONE) and c:GetSummonType()==SUMMON_TYPE_RITUAL 
+	return c:IsPreviousLocation(LOCATION_MZONE) and c:IsSummonType(SUMMON_TYPE_RITUAL) 
 end
 function c50000206.sefilter(c)
 	 return c:IsType(TYPE_SPELL) and c50000206.IsRely(c) and c:IsAbleToHand()

expansions/script/c50000207.lua

@@ -65,10 +65,10 @@ function c50000207.IsRely(c)
 end
 --ritual effect
 function c50000207.tdcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_RITUAL 
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_RITUAL) 
 end
 function c50000207.filter(c)
-	return c:GetSummonType()==SUMMON_TYPE_SPECIAL and c:IsAbleToDeck()
+	return c:IsSummonType(SUMMON_TYPE_SPECIAL) and c:IsAbleToDeck()
 end
 function c50000207.tdtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c50000207.filter,tp,0,LOCATION_MZONE,1,nil) end
@@ -87,7 +87,7 @@ end
 --se or sp
 function c50000207.con(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsPreviousLocation(LOCATION_MZONE) and c:GetSummonType()==SUMMON_TYPE_RITUAL 
+	return c:IsPreviousLocation(LOCATION_MZONE) and c:IsSummonType(SUMMON_TYPE_RITUAL) 
 end
 function c50000207.filter(c,ft,e,tp)
 	return c:IsAttribute(ATTRIBUTE_WATER) and c:IsRace(RACE_SPELLCASTER)  and (c:IsAbleToHand() or (ft>0 and c:IsCanBeSpecialSummoned(e,0,tp,false,false)))

expansions/script/c50000505.lua

@@ -86,7 +86,7 @@ function c50000505.linkop(e,tp,eg,ep,ev,re,r,rp,c)
 end
 ---
 function c50000505.spcon(e,tp,eg,ep,ev,re,r,rp)
-    return e:GetHandler():GetSummonType()==SUMMON_TYPE_LINK 
+    return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK) 
 end
 function c50000505.thfilter(c)
     return c:IsSetCard(0x50e) and c:IsAbleToHand()

expansions/script/c5200012.lua

@@ -46,7 +46,7 @@ function c5200012.initial_effect(c)
 	c:RegisterEffect(e5)
 end
 function c5200012.descon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ and e:GetLabel()==1
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ) and e:GetLabel()==1
 end
 function c5200012.valcheck(e,c)
 	local g=c:GetMaterial()

expansions/script/c5200013.lua

@@ -37,7 +37,7 @@ function c5200013.matcheck(e,c)
 	e:SetLabel(ct)
 end
 function c5200013.tdcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function c5200013.tdtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsOnField() and chkc:IsAbleToDeck() end

expansions/script/c5200014.lua

@@ -38,7 +38,7 @@ function c5200014.initial_effect(c)
 	c:RegisterEffect(e3)	  
 end
 function c5200014.spcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function c5200014.spfilter(c,e,tp)
 	return c:IsSetCard(0x360) and c:IsLevelBelow(4) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

expansions/script/c5200015.lua

@@ -52,7 +52,7 @@ function c5200015.initial_effect(c)
 end
 
 function c5200015.sumcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 end
 function c5200015.filter(c)
 	return c:IsFaceup() and (c:IsLocation(LOCATION_SZONE) or c:IsType(TYPE_EFFECT)) and not c:IsDisabled()

expansions/script/c57320010.lua

@@ -10,7 +10,7 @@ function cm.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e2:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e2:SetCondition(function(e,tp,eg,ep,ev,re,r,rp)
-		return e:GetHandler():GetSummonType()==SUMMON_TYPE_FUSION
+		return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION)
 	end)
 	e2:SetOperation(function(e,tp,eg,ep,ev,re,r,rp)
 		local c=e:GetHandler()

expansions/script/c57330007.lua

@@ -12,7 +12,7 @@ function cm.initial_effect(c)
 	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
 	e1:SetCountLimit(1,m)
-	e1:SetCondition(function(e) return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO end)
+	e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) end)
 	e1:SetTarget(cm.target)
 	e1:SetOperation(cm.operation)
 	c:RegisterEffect(e1)

expansions/script/c60150501.lua

@@ -50,7 +50,7 @@ function c60150501.op(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c60150501.descon2(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SPECIAL+1
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SPECIAL)+1
 end
 function c60150501.desop2(e,tp,eg,ep,ev,re,r,rp)
 	local e1=Effect.CreateEffect(e:GetHandler())

expansions/script/c60150503.lua

@@ -26,7 +26,7 @@ function c60150503.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function c60150503.descon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SPECIAL+1
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SPECIAL)+1
 end
 function c60150503.desop(e,tp,eg,ep,ev,re,r,rp)
 	local e1=Effect.CreateEffect(e:GetHandler())

expansions/script/c60150520.lua

@@ -111,7 +111,7 @@ function c60150520.sumop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c60150520.atkcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 end
 function c60150520.tdtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

expansions/script/c60150535.lua

@@ -35,7 +35,7 @@ function c60150535.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c60150535.descon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ and e:GetHandler():GetOverlayGroup():IsExists(Card.IsType,1,nil,TYPE_XYZ)
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ) and e:GetHandler():GetOverlayGroup():IsExists(Card.IsType,1,nil,TYPE_XYZ)
 end
 function c60150535.filter(c)
 	return c:IsRace(RACE_FIEND) and c:IsAttribute(ATTRIBUTE_LIGHT) and c:IsAbleToHand()

expansions/script/c60150536.lua

@@ -51,7 +51,7 @@ function c60150536.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c60150536.descon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ and e:GetHandler():GetOverlayGroup():IsExists(Card.IsType,1,nil,TYPE_XYZ)
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ) and e:GetHandler():GetOverlayGroup():IsExists(Card.IsType,1,nil,TYPE_XYZ)
 end
 function c60150536.filter(c)
 	return c:IsRace(RACE_FIEND) and c:IsAttribute(ATTRIBUTE_LIGHT) and c:IsAbleToHand()

expansions/script/c60150537.lua

@@ -71,7 +71,7 @@ function c60150537.initial_effect(c)
     c:RegisterEffect(e7)
 end
 function c60150537.descon(e,tp,eg,ep,ev,re,r,rp)
-    return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ and e:GetHandler():GetOverlayGroup():IsExists(Card.IsType,1,nil,TYPE_XYZ)
+    return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ) and e:GetHandler():GetOverlayGroup():IsExists(Card.IsType,1,nil,TYPE_XYZ)
 end
 function c60150537.filter(c)
     return c:IsRace(RACE_FIEND) and c:IsAttribute(ATTRIBUTE_LIGHT) and c:IsAbleToHand()

expansions/script/c60150624.lua

@@ -60,7 +60,7 @@ function c60150624.sumsuc(e,tp,eg,ep,ev,re,r,rp)
 	Duel.ResetFlagEffect(tp,60150624)
 end
 --[[function c60150624.descon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function c60150624.tgfilter(c)
 	return c:IsRace(RACE_SPELLCASTER) and c:IsType(TYPE_MONSTER) and c:IsAbleToDeck()

expansions/script/c60150804.lua

@@ -65,7 +65,7 @@ function c60150804.efop(e,tp,eg,ep,ev,re,r,rp)
 end
 function c60150804.atkcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsAttribute(ATTRIBUTE_DARK) and c:IsSetCard(0x3b23) and e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+	return c:IsAttribute(ATTRIBUTE_DARK) and c:IsSetCard(0x3b23) and e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 end
 function c60150804.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,0xff,0xff,1,e:GetHandler()) end

expansions/script/c60150806.lua

@@ -26,7 +26,7 @@ function c60150806.ntcon(e,c,minc)
 	return minc==0 and c:GetLevel()>4 and Duel.GetLocationCount(c:GetControler(),LOCATION_MZONE)>0
 end
 function c60150806.spcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_NORMAL+1
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_NORMAL)+1
 end
 function c60150806.spfilter(c,e,tp)
 	return c:IsSetCard(0x3b23) and c:IsAttribute(ATTRIBUTE_DARK) 

expansions/script/c60150814.lua

@@ -99,7 +99,7 @@ function c60150814.sumsuc(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c60150814.negcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 end
 function c60150814.filter(c)
 	return c:IsFaceup() and (c:IsLocation(LOCATION_SZONE) or c:IsType(TYPE_EFFECT)) and not c:IsDisabled()

expansions/script/c60150815.lua

@@ -63,7 +63,7 @@ function c60150815.efop(e,tp,eg,ep,ev,re,r,rp)
 end
 function c60150815.atkcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsAttribute(ATTRIBUTE_DARK) and c:IsSetCard(0x3b23) and e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+	return c:IsAttribute(ATTRIBUTE_DARK) and c:IsSetCard(0x3b23) and e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 end
 function c60150815.filter2(c)
 	return c:IsFaceup() and c:IsType(TYPE_SPELL+TYPE_TRAP) 

expansions/script/c60150818.lua

@@ -100,7 +100,7 @@ function c60150818.initial_effect(c)
 	end
 end
 function c60150818.regcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 end
 function c60150818.regop(e,tp,eg,ep,ev,re,r,rp)
 	local e1=Effect.CreateEffect(e:GetHandler())

expansions/script/c60151011.lua

@@ -110,7 +110,7 @@ end
 function c60151011.remcon(e,tp,eg,ep,ev,re,r,rp)
     local ct1=Duel.GetFieldGroupCount(tp,LOCATION_HAND,0)
     local ct2=Duel.GetFieldGroupCount(tp,0,LOCATION_HAND)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ and ct1<ct2
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ) and ct1<ct2
 end
 function c60151011.target(e,tp,eg,ep,ev,re,r,rp,chk)
     if chk==0 then return Duel.IsPlayerCanDraw(tp,1) end

expansions/script/c60151012.lua

@@ -84,7 +84,7 @@ function c60151012.atkop(e,tp,eg,ep,ev,re,r,rp)
     end
 end
 function c60151012.remcon(e,tp,eg,ep,ev,re,r,rp)
-    return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+    return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 end
 function c60151012.pctg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
     if chk==0 then return Duel.IsExistingMatchingCard(c60151012.filter5,tp,0,LOCATION_MZONE,1,nil) end

expansions/script/c60151032.lua

@@ -92,7 +92,7 @@ function c60151032.operation(e,tp,eg,ep,ev,re,r,rp)
 end
 function c60151032.drcon(e,tp,eg,ep,ev,re,r,rp)
 	local tg=eg:GetFirst()
-	return eg:GetCount()==1 and tg~=e:GetHandler() and tg:GetSummonType()==SUMMON_TYPE_XYZ and tg:IsSetCard(0x5b23)
+	return eg:GetCount()==1 and tg~=e:GetHandler() and tg:IsSummonType(SUMMON_TYPE_XYZ) and tg:IsSetCard(0x5b23)
 end
 function c60151032.drfilter(c)
 	return c:IsAbleToGrave()

expansions/script/c60151033.lua

@@ -73,7 +73,7 @@ function c60151033.splimit(e,c,tp,sumtp,sumpos)
 	return c:IsLocation(LOCATION_EXTRA) and not (c:IsType(TYPE_FUSION) or c:IsType(TYPE_XYZ))
 end
 function c60151033.cfilter(c,tp)
-	return c:IsControler(1-tp) and (c:GetSummonType()==SUMMON_TYPE_XYZ or c:GetSummonType()==SUMMON_TYPE_FUSION)
+	return c:IsControler(1-tp) and (c:IsSummonType(SUMMON_TYPE_XYZ) or c:IsSummonType(SUMMON_TYPE_FUSION))
 end
 function c60151033.drcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(c60151033.cfilter,1,nil,tp)

expansions/script/c60151108.lua

@@ -82,7 +82,7 @@ function c60151108.spop(e,tp,eg,ep,ev,re,r,rp,c)
     end
 end
 function c60151108.sumsuccon(e,tp,eg,ep,ev,re,r,rp)
-    return e:GetHandler():GetSummonType()==SUMMON_TYPE_SPECIAL+1
+    return e:GetHandler():IsSummonType(SUMMON_TYPE_SPECIAL)+1
 end
 function c60151108.sumsuc(e,tp,eg,ep,ev,re,r,rp)
     local ct=e:GetHandler():GetFlagEffect(60151108)

expansions/script/c60151121.lua

@@ -29,7 +29,7 @@ function c60151121.xyzfilter(c)
 	return c:IsSetCard(0x9b23)
 end
 function c60151121.atkcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 end
 function c60151121.cointg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

expansions/script/c60151123.lua

@@ -31,7 +31,7 @@ function c60151123.tfilter(c)
 	return c:IsSetCard(0x9b23)
 end
 function c60151123.atkcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function c60151123.cointg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

expansions/script/c60151125.lua

@@ -20,7 +20,7 @@ function c60151125.xyzfilter(c)
 	return c:IsSetCard(0x9b23)
 end
 function c60151125.atkcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 end
 function c60151125.cointg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

expansions/script/c60151127.lua

@@ -31,7 +31,7 @@ function c60151127.tfilter(c)
 	return c:IsSetCard(0x9b23)
 end
 function c60151127.atkcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function c60151127.cointg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

expansions/script/c60151128.lua

@@ -37,7 +37,7 @@ function c60151128.xyzfilter(c)
 	return c:IsSetCard(0x9b23)
 end
 function c60151128.atkcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ and e:GetHandler():GetOverlayGroup():IsExists(Card.IsSetCard,1,nil,0x9b23)
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ) and e:GetHandler():GetOverlayGroup():IsExists(Card.IsSetCard,1,nil,0x9b23)
 end
 function c60151128.cointg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

expansions/script/c60151321.lua

@@ -45,7 +45,7 @@ function c60151321.initial_effect(c)
 	c:RegisterEffect(e5)
 end
 function c60151321.regcon(e,tp,eg,ep,ev,re,r,rp)
-    return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+    return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 end
 function c60151321.filter2(c,e,tp)
     return not c:IsType(TYPE_XYZ) and c:IsSetCard(0xcb23) and c:IsType(TYPE_MONSTER)

expansions/script/c60151322.lua

@@ -58,7 +58,7 @@ function c60151322.xyzop(e,tp,chk)
     Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_COST+REASON_DISCARD)
 end
 function c60151322.regcon(e,tp,eg,ep,ev,re,r,rp)
-    return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+    return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 end
 function c60151322.filter2(c,e,tp)
     return not c:IsType(TYPE_XYZ) and c:IsSetCard(0xcb23) and c:IsType(TYPE_MONSTER)

expansions/script/c60151323.lua

@@ -68,7 +68,7 @@ function c60151323.xyzop(e,tp,chk)
     Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_COST+REASON_DISCARD)
 end
 function c60151323.regcon(e,tp,eg,ep,ev,re,r,rp)
-    return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+    return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 end
 function c60151323.filter2(c,e,tp)
     return not c:IsType(TYPE_XYZ) and c:IsSetCard(0xcb23) and c:IsType(TYPE_MONSTER)

expansions/script/c60151324.lua

@@ -48,7 +48,7 @@ function c60151324.xyzop(e,tp,chk)
     Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_COST+REASON_DISCARD)
 end
 function c60151324.descon(e,tp,eg,ep,ev,re,r,rp)
-    return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+    return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 end
 function c60151324.destg(e,tp,eg,ep,ev,re,r,rp,chk)
     if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToGrave,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,e:GetHandler()) end

expansions/script/c60151329.lua

@@ -33,7 +33,7 @@ function c60151329.initial_effect(c)
     c:RegisterEffect(e3)
 end
 function c60151329.regcon(e,tp,eg,ep,ev,re,r,rp)
-    return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+    return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 end
 function c60151329.filter2(c,e,tp)
     return not c:IsType(TYPE_XYZ) and c:IsSetCard(0xcb23) and c:IsType(TYPE_MONSTER)

expansions/script/c60151601.lua

@@ -40,7 +40,7 @@ function c60151601.initial_effect(c)
     c:RegisterEffect(e4)
 end
 function c60151601.spcondition(e,tp,eg,ep,ev,re,r,rp)
-    return e:GetHandler():GetSummonType()==SUMMON_TYPE_PENDULUM
+    return e:GetHandler():IsSummonType(SUMMON_TYPE_PENDULUM)
 end
 function c60151601.filter(c)
     return c:IsFaceup() and c:IsSetCard(0xcb25) and c:IsType(TYPE_MONSTER)

expansions/script/c60151602.lua

@@ -40,7 +40,7 @@ function c60151602.initial_effect(c)
     c:RegisterEffect(e4)
 end
 function c60151602.spcondition(e,tp,eg,ep,ev,re,r,rp)
-    return e:GetHandler():GetSummonType()==SUMMON_TYPE_PENDULUM
+    return e:GetHandler():IsSummonType(SUMMON_TYPE_PENDULUM)
 end
 function c60151602.filter(c)
     return c:IsFaceup() and c:IsSetCard(0xcb25) and c:IsType(TYPE_MONSTER)

expansions/script/c60151603.lua

@@ -40,7 +40,7 @@ function c60151603.initial_effect(c)
     c:RegisterEffect(e4)
 end
 function c60151603.spcondition(e,tp,eg,ep,ev,re,r,rp)
-    return e:GetHandler():GetSummonType()==SUMMON_TYPE_PENDULUM
+    return e:GetHandler():IsSummonType(SUMMON_TYPE_PENDULUM)
 end
 function c60151603.filter(c)
     return c:IsFaceup() and c:IsSetCard(0xcb25) and c:IsType(TYPE_MONSTER)

expansions/script/c60151604.lua

@@ -40,7 +40,7 @@ function c60151604.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function c60151604.spcondition(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_PENDULUM
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_PENDULUM)
 end
 function c60151604.filter(c)
 	return c:IsFaceup() and c:IsSetCard(0xcb25) and c:IsType(TYPE_MONSTER)

expansions/script/c60151605.lua

@@ -40,7 +40,7 @@ function c60151605.initial_effect(c)
     c:RegisterEffect(e4)
 end
 function c60151605.spcondition(e,tp,eg,ep,ev,re,r,rp)
-    return e:GetHandler():GetSummonType()==SUMMON_TYPE_PENDULUM
+    return e:GetHandler():IsSummonType(SUMMON_TYPE_PENDULUM)
 end
 function c60151605.filter(c)
     return c:IsFaceup() and c:IsSetCard(0xcb25) and c:IsType(TYPE_MONSTER)

expansions/script/c60151606.lua

@@ -40,7 +40,7 @@ function c60151606.initial_effect(c)
     c:RegisterEffect(e4)
 end
 function c60151606.spcondition(e,tp,eg,ep,ev,re,r,rp)
-    return e:GetHandler():GetSummonType()==SUMMON_TYPE_PENDULUM
+    return e:GetHandler():IsSummonType(SUMMON_TYPE_PENDULUM)
 end
 function c60151606.filter(c)
     return c:IsFaceup() and c:IsSetCard(0xcb25) and c:IsType(TYPE_MONSTER)

expansions/script/c60151612.lua

@@ -61,7 +61,7 @@ function c60151612.filter(c)
 end
 function c60151612.disop(e,tp,eg,ep,ev,re,r,rp)
 	if not (re:IsActiveType(TYPE_MONSTER) and re:IsActivated()) then return end
-	if not e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO then return end
+	if not e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) then return end
 	Duel.Hint(HINT_CARD,0,60151612)
 	Duel.Recover(tp,300,REASON_EFFECT)
 	local g=Duel.GetMatchingGroup(c60151612.filter,tp,LOCATION_MZONE,0,nil)
@@ -84,7 +84,7 @@ function c60151612.dfilter(c)
 	return c:IsDestructable() and c:IsType(TYPE_SPELL+TYPE_TRAP)
 end
 function c60151612.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chk==0 then return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO 
+	if chk==0 then return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) 
 		and Duel.IsExistingTarget(c60151612.dfilter,tp,0,LOCATION_ONFIELD,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
 	local g=Duel.SelectTarget(tp,c60151612.dfilter,tp,0,LOCATION_ONFIELD,1,99,nil)
@@ -105,7 +105,7 @@ function c60151612.thop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c60151612.setcon3(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function c60151612.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsFaceup() and (Duel.CheckLocation(tp,LOCATION_SZONE,6) or Duel.CheckLocation(tp,LOCATION_SZONE,7))

expansions/script/c60151614.lua

@@ -56,7 +56,7 @@ function c60151614.filter(c)
 end
 function c60151614.disop(e,tp,eg,ep,ev,re,r,rp)
 	if not (re:IsActiveType(TYPE_MONSTER) and re:IsActivated()) then return end
-	if not e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO then return end
+	if not e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) then return end
 	Duel.Hint(HINT_CARD,0,60151614)
 	Duel.Recover(tp,600,REASON_EFFECT)
 	local g=Duel.GetMatchingGroup(c60151614.filter,tp,LOCATION_MZONE,0,nil)
@@ -80,7 +80,7 @@ function c60151614.lcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.PayLPCost(tp,math.floor(Duel.GetLP(tp)/2))
 end
 function c60151614.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chk==0 then return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO end
+	if chk==0 then return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) end
 end
 function c60151614.thop(e,tp,eg,ep,ev,re,r,rp)
 	--
@@ -108,7 +108,7 @@ function c60151614.disoperation(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c60151614.setcon3(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function c60151614.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsFaceup() and (Duel.CheckLocation(tp,LOCATION_SZONE,6) or Duel.CheckLocation(tp,LOCATION_SZONE,7))

expansions/script/c66619908.lua

@@ -81,7 +81,7 @@ function c66619908.thop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c66619908.regcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO 
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) 
 end
 function c66619908.filter3(c)
 	return c:IsFaceup() and c:IsAbleToHand() and c:IsCode(66619916)

expansions/script/c66619921.lua

@@ -238,7 +238,7 @@ function c66619921.desop(e,tp,eg,ep,ev,re,r,rp)
 	if tc:IsRelateToBattle() then Duel.Remove(tc,POS_FACEUP,REASON_EFFECT) end
 end
 function c66619921.regcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 end
 function c66619921.tfilter(c)
 	return c:GetOriginalCode()==66619919

expansions/script/c66678905.lua

@@ -80,7 +80,7 @@ function c66678905.activate(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c66678905.drcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 end
 function c66678905.filter(c)
 	return c:IsSetCard(0x665) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()

expansions/script/c66678906.lua

@@ -7,7 +7,7 @@ function c66678906.initial_effect(c)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY)
 	e1:SetCode(EVENT_SUMMON_SUCCESS)
 	e1:SetCondition(function(e,tp,eg,ep,ev,re,r,rp)
-		return e:GetHandler():GetSummonType()==SUMMON_TYPE_ADVANCE
+		return e:GetHandler():IsSummonType(SUMMON_TYPE_ADVANCE)
 	end)
 	e1:SetTarget(function(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 		if chkc then return chkc:IsControler(1-tp) and chkc:IsLocation(LOCATION_MZONE) and chkc:IsFaceup() end

expansions/script/c66678907.lua

@@ -7,7 +7,7 @@ function c66678907.initial_effect(c)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY)
 	e1:SetCode(EVENT_SUMMON_SUCCESS)
 	e1:SetCondition(function(e,tp,eg,ep,ev,re,r,rp)
-		return e:GetHandler():GetSummonType()==SUMMON_TYPE_ADVANCE
+		return e:GetHandler():IsSummonType(SUMMON_TYPE_ADVANCE)
 	end)
 	e1:SetTarget(function(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 		if chkc then return chkc:IsOnField() and chkc:IsAbleToGrave() end

expansions/script/c66678908.lua

@@ -60,7 +60,7 @@ function c66678908.spop(e,tp,eg,ep,ev,re,r,rp,c)
 	c:RegisterEffect(e1)
 end
 function c66678908.condition(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_ADVANCE
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_ADVANCE)
 end
 function c66678908.filter(c)
 	return c:IsFaceup() and c:IsAttribute(ATTRIBUTE_WATER)

expansions/script/c66678912.lua

@@ -10,7 +10,7 @@ function c66678912.initial_effect(c)
 	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetCondition(function(e,tp,eg,ep,ev,re,r,rp)
-		return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+		return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 	end)
 	e1:SetTarget(function(e,tp,eg,ep,ev,re,r,rp,chk)
 		if chk==0 then return Duel.IsPlayerCanDraw(tp,1)

expansions/script/c66678914.lua

@@ -11,7 +11,7 @@ function c66678914.initial_effect(c)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY)
 	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e1:SetCondition(function(e,tp,eg,ep,ev,re,r,rp)
-		return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+		return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 	end)
 	e1:SetTarget(function(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 		if chkc then return chkc:IsControler(1-tp) and chkc:IsLocation(LOCATION_MZONE) and chkc:IsFaceup() end

expansions/script/c710206.lua

@@ -31,7 +31,7 @@ function c710206.IsWindWheel(c)
 end
 
 function c710206.condition(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function c710206.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return false end

expansions/script/c710207.lua

@@ -40,7 +40,7 @@ function c710207.IsWindWheel(c)
 end
 
 function c710207.condition(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function c710207.setfilter(c,tp)
 	return c:IsType(TYPE_CONTINUOUS) and c:IsSSetable(true) and Duel.GetLocationCount(tp,LOCATION_SZONE)>0

expansions/script/c8209723.lua

@@ -64,7 +64,7 @@ function c8209723.efop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c8209723.atkcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 end
 function c8209723.atkop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c98600005.lua

@@ -90,14 +90,14 @@ function cm.indval(e,re,tp)
 	return tp~=e:GetHandlerPlayer()
 end
 function cm.acon(e)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_ADVANCE
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_ADVANCE)
 end
 function cm.regfilter(c,id)
 	return c:IsFaceup() and c:IsHasEffect(id) and c:GetFlagEffect(id)==0
 end
 function cm.regcon(e,tp,eg,ep,ev,re,r,rp)
 	local id=e:GetLabel()
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_ADVANCE and Duel.IsExistingMatchingCard(cm.regfilter,tp,LOCATION_MZONE,0,1,nil,id)
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_ADVANCE) and Duel.IsExistingMatchingCard(cm.regfilter,tp,LOCATION_MZONE,0,1,nil,id)
 end
 function cm.regop(e,tp,eg,ep,ev,re,r,rp)
 	local id=e:GetLabel()