Merge pull request #306 from nekrozar/patch-1

update Toon Dark Magician Girl and so on

c20065322.lua

@@ -10,9 +10,7 @@ function c20065322.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c20065322.filter(c,ft,e,tp)
-	local code=c:GetCode()
-	return (code==40640057 or code==57116033)
-		and (c:IsAbleToHand() or (ft>0 and c:IsCanBeSpecialSummoned(e,0,tp,false,false)))
+	return c:IsCode(40640057,57116033) and (c:IsAbleToHand() or (ft>0 and c:IsCanBeSpecialSummoned(e,0,tp,false,false)))
 end
 function c20065322.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then

c21414674.lua

@@ -10,7 +10,7 @@ function c21414674.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c21414674.filter(c)
-	return c:IsFaceup() and (c:IsCode(22530212) or c:IsCode(68535320) or c:IsCode(95929069))
+	return c:IsFaceup() and c:IsCode(22530212,68535320,95929069)
 end
 function c21414674.spcon(e,c)
 	if c==nil then return true end

c22339232.lua

@@ -36,8 +36,7 @@ function c22339232.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SendtoGrave(e:GetHandler(),REASON_COST+REASON_DISCARD)
 end
 function c22339232.tgfilter(c)
-	local code=c:GetCode()
-	return c:IsFaceup() and (code==32274490 or code==22339232)
+	return c:IsFaceup() and c:IsCode(32274490,22339232)
 end
 function c22339232.tgtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_REMOVED) and chkc:IsControler(tp) and c22339232.tgfilter(chkc) end
@@ -53,8 +52,7 @@ function c22339232.tgop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c22339232.spfilter(c,e,tp)
-	local code=c:GetCode()
-	return c:IsFaceup() and (code==36021814 or code==40991587) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsFaceup() and c:IsCode(36021814,40991587) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c22339232.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_REMOVED) and chkc:IsControler(tp) and c22339232.spfilter(chkc,e,tp) end

c23701465.lua

@@ -12,8 +12,7 @@ function c23701465.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c23701465.cfilter(c)
-	local code=c:GetCode()
-	return c:IsFaceup() and (code==72989439 or code==82301904)
+	return c:IsFaceup() and c:IsCode(72989439,82301904)
 end
 function c23701465.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(c23701465.cfilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)

c36021814.lua

@@ -20,20 +20,15 @@ function c36021814.initial_effect(c)
 	e2:SetOperation(c36021814.operation)
 	c:RegisterEffect(e2)
 end
-function c36021814.filter(c)
-	local code=c:GetCode()
-	return code==32274490 or code==36021814
-end
 function c36021814.atkval(e,c)
-	return Duel.GetMatchingGroupCount(c36021814.filter,c:GetControler(),LOCATION_GRAVE,0,nil)*1000
+	return Duel.GetMatchingGroupCount(Card.IsCode,c:GetControler(),LOCATION_GRAVE,0,nil,32274490,36021814)*1000
 end
 function c36021814.condition(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsLocation(LOCATION_GRAVE)
 		and bit.band(e:GetHandler():GetReason(),REASON_BATTLE)~=0
 end
 function c36021814.costfilter(c)
-	local code=c:GetCode()
-	return (code==32274490 or code==36021814) and c:IsAbleToRemoveAsCost()
+	return c:IsCode(32274490,36021814) and c:IsAbleToRemoveAsCost()
 end
 function c36021814.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c36021814.costfilter,tp,LOCATION_GRAVE,0,1,e:GetHandler()) end

c42280216.lua

@@ -30,8 +30,7 @@ function c42280216.shcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsPreviousLocation(LOCATION_ONFIELD) and e:GetHandler():IsReason(REASON_DESTROY)
 end
 function c42280216.filter(c)
-	local code=c:GetCode()
-	return (code==78275321 or code==78552773) and c:IsAbleToHand()
+	return c:IsCode(78275321,78552773) and c:IsAbleToHand()
 end
 function c42280216.shtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c42280216.filter,tp,LOCATION_DECK,0,1,nil) end

c45045866.lua

@@ -16,8 +16,7 @@ function c45045866.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c45045866.filter(c)
-	local code=c:GetCode()
-	return (code==81434470 or code==18828179) and c:IsAbleToHand()
+	return c:IsCode(81434470,18828179) and c:IsAbleToHand()
 end
 function c45045866.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

c45133463.lua

@@ -18,8 +18,7 @@ function c45133463.condition(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(c45133463.cfiltetr,1,nil,tp)
 end
 function c45133463.filter(c,e,tp)
-	local code=c:GetCode()
-	return (code==78552773 or code==78275321) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsCode(78552773,78275321) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c45133463.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c45133463.filter(chkc,e,tp) end

c4796100.lua

@@ -15,8 +15,7 @@ function c4796100.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c4796100.spfilter(c,e,tp)
-	local code=c:GetCode()
-	return (code==5818798 or code==77207191) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsCode(5818798,77207191) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c4796100.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c4796100.spfilter(chkc,e,tp) end

c48680970.lua

@@ -43,7 +43,7 @@ function c48680970.filter1(c,e,tp)
 	return c:IsCode(46986414) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c48680970.filter2(c)
-	return (c:IsCode(2314238) or c:IsCode(63391643)) and c:IsAbleToHand()
+	return c:IsCode(2314238,63391643) and c:IsAbleToHand()
 end
 function c48680970.target1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

c48948935.lua

@@ -22,20 +22,16 @@ function c48948935.initial_effect(c)
 	e2:SetOperation(c48948935.eqop)
 	c:RegisterEffect(e2)
 end
-function c48948935.spfilter(c)
-	local code=c:GetCode()
-	return code==13676474 or code==86569121
-end
 function c48948935.spcon(e,c)
 	if c==nil then return true end
 	local g=Duel.GetReleaseGroup(c:GetControler())
 	return Duel.GetLocationCount(c:GetControler(),LOCATION_MZONE)>-2
-		and g:GetCount()>1 and g:IsExists(c48948935.spfilter,1,nil)
+		and g:GetCount()>1 and g:IsExists(Card.IsCode,1,nil,13676474,86569121)
 end
 function c48948935.spop(e,tp,eg,ep,ev,re,r,rp,c)
 	local g=Duel.GetReleaseGroup(tp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RELEASE)
-	local sg1=g:FilterSelect(tp,c48948935.spfilter,1,1,nil)
+	local sg1=g:FilterSelect(tp,Card.IsCode,1,1,nil,13676474,86569121)
 	g:RemoveCard(sg1:GetFirst())
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RELEASE)
 	local sg2=g:Select(tp,1,1,nil)

c49328340.lua

@@ -25,8 +25,7 @@ function c49328340.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function c49328340.pietg(e,c)
-	local code=c:GetCode()
-	return code==6368038 or code==16589042 or code==66889139
+	return c:IsCode(6368038,16589042,66889139)
 end
 function c49328340.condition(e,tp,eg,ep,ev,re,r,rp)
 	local tc=eg:GetFirst()

c49389523.lua

@@ -19,8 +19,7 @@ function c49389523.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return rp~=tp and e:GetHandler():GetPreviousControler()==tp
 end
 function c49389523.filter(c,e,tp)
-	local code=c:GetCode()
-	return (code==77506119 or code==13995824) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsCode(77506119,13995824) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c49389523.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c49389523.filter(chkc,e,tp) end

c53569894.lua

@@ -14,8 +14,7 @@ function c53569894.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c53569894.filter(c)
-	local code=c:GetCode()
-	return c:IsFaceup() and (code==15013468 or code==51402177) and c:IsDestructable()
+	return c:IsFaceup() and c:IsCode(15013468,51402177) and c:IsDestructable()
 end
 function c53569894.leave(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

c60728397.lua

@@ -12,8 +12,7 @@ function c60728397.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c60728397.cfilter(c)
-	local code=c:GetCode()
-	return c:IsFaceup() and (code==72677437 or code==8062132 or c:IsSetCard(0x50))
+	return c:IsFaceup() and (c:IsCode(72677437,8062132) or c:IsSetCard(0x50))
 end
 function c60728397.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(c60728397.cfilter,tp,LOCATION_MZONE,0,1,nil)

c63224564.lua

@@ -24,12 +24,10 @@ function c63224564.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function c63224564.eqlimit(e,c)
-	local code=c:GetCode()
-	return code==76812113 or code==12206212
+	return c:IsCode(76812113,12206212)
 end
 function c63224564.filter(c)
-	local code=c:GetCode()
-	return c:IsFaceup() and (code==76812113 or code==12206212)
+	return c:IsFaceup() and c:IsCode(76812113,12206212)
 end
 function c63224564.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and c63224564.filter(chkc) end

c64500000.lua

@@ -57,12 +57,10 @@ function c64500000.repval(e,re,r,rp)
 	return bit.band(r,REASON_BATTLE)~=0
 end
 function c64500000.eqlimit(e,c)
-	local code=c:GetCode()
-	return code==62651957 or code==65622692
+	return c:IsCode(62651957,65622692)
 end
 function c64500000.filter(c)
-	local code=c:GetCode()
-	return c:IsFaceup() and (code==62651957 or code==65622692) and c:GetUnionCount()==0
+	return c:IsFaceup() and c:IsCode(62651957,65622692) and c:GetUnionCount()==0
 end
 function c64500000.eqtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c64500000.filter(chkc) end

c67227834.lua

@@ -36,12 +36,10 @@ function c67227834.initial_effect(c)
 end
 c67227834.dark_magician_list=true
 function c67227834.eqlimit(e,c)
-	local code=c:GetCode()
-	return code==46986414 or code==38033121
+	return c:IsCode(46986414,38033121)
 end
 function c67227834.filter(c)
-	local code=c:GetCode()
-	return c:IsFaceup() and (code==46986414 or code==38033121)
+	return c:IsFaceup() and c:IsCode(46986414,38033121)
 end
 function c67227834.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and c67227834.filter(chkc) end

c68334074.lua

@@ -18,8 +18,7 @@ function c68334074.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.RemoveCounter(tp,1,0,0x3001,2,REASON_COST)
 end
 function c68334074.filter(c,e,tp)
-	local code=c:GetCode()
-	return (code==46986414 or code==78193831) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsCode(46986414,78193831) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c68334074.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c68334074.filter(chkc,e,tp) end

c72709014.lua

@@ -42,12 +42,10 @@ function c72709014.initial_effect(c)
 	c:RegisterEffect(e5)
 end
 function c72709014.eqlimit(e,c)
-	local code=c:GetCode()
-	return code==81383947 or code==46128076
+	return c:IsCode(81383947,46128076)
 end
 function c72709014.filter(c)
-	local code=c:GetCode()
-	return c:IsFaceup() and (code==81383947 or code==46128076)
+	return c:IsFaceup() and c:IsCode(81383947,46128076)
 end
 function c72709014.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and c72709014.filter(chkc) end

c75782277.lua

@@ -43,8 +43,7 @@ function c75782277.check(e,tp,eg,ep,ev,re,r,rp)
 	local tc=eg:GetFirst()
 	local tp1=false local tp2=false
 	while tc do
-		local code=tc:GetCode()
-		if tc:IsFaceup() and (code==76812113 or code==12206212) then
+		if tc:IsFaceup() and tc:IsCode(76812113,12206212) then
 			if tc:IsControler(tp) then tp1=true else tp2=true end
 		end
 		tc=eg:GetNext()

c79234734.lua

@@ -49,7 +49,7 @@ function c79234734.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.Remove(e:GetHandler(),POS_FACEUP,REASON_COST)
 end
 function c79234734.thfilter(c)
-	return (c:IsCode(6628343) or c:IsCode(32013448)) and c:IsAbleToHand()
+	return c:IsCode(6628343,32013448) and c:IsAbleToHand()
 end
 function c79234734.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c79234734.thfilter,tp,LOCATION_DECK,0,1,nil) end

c82452993.lua

@@ -10,8 +10,7 @@ function c82452993.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c82452993.filter(c)
-	local code=c:GetCode()
-	return c:IsFaceup() and (code==8508055 or code==3810071 or code==49814180)
+	return c:IsFaceup() and c:IsCode(8508055,3810071,49814180)
 end
 function c82452993.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return false end

c86308219.lua

@@ -17,7 +17,7 @@ function c86308219.counterfilter(c)
 	return bit.band(c:GetSummonLocation(),LOCATION_DECK+LOCATION_EXTRA)==0
 end
 function c86308219.cfilter(c)
-	return c:IsFaceup() and (c:IsCode(76812113) or c:IsCode(12206212))
+	return c:IsFaceup() and c:IsCode(76812113,12206212)
 end
 function c86308219.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(c86308219.cfilter,tp,LOCATION_ONFIELD,0,3,nil)

c90219263.lua

@@ -17,8 +17,7 @@ function c90219263.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(c90219263.cfilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)
 end
 function c90219263.filter(c,e,tp)
-	local code=c:GetCode()
-	return (code==76812113 or code==12206212) and c:IsCanBeSpecialSummoned(e,0,tp,true,false)
+	return c:IsCode(76812113,12206212) and c:IsCanBeSpecialSummoned(e,0,tp,true,false)
 end
 function c90219263.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0

c90960358.lua

@@ -93,9 +93,5 @@ function c90960358.atklimit(e,tp,eg,ep,ev,re,r,rp)
 	e:GetHandler():RegisterEffect(e1)
 end
 function c90960358.val(e,c)
-	return Duel.GetMatchingGroupCount(c90960358.filter,c:GetControler(),LOCATION_GRAVE,LOCATION_GRAVE,nil)*300
-end
-function c90960358.filter(c)
-	local code=c:GetCode()
-	return code==46986414 or code==30208479
+	return Duel.GetMatchingGroupCount(Card.IsCode,c:GetControler(),LOCATION_GRAVE,LOCATION_GRAVE,nil,46986414,30208479)*300
 end

c93224848.lua

@@ -12,8 +12,7 @@ function c93224848.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c93224848.filter(c)
-	local code=c:GetCode()
-	return c:IsFaceup() and (code==6007213 or code==32491822)
+	return c:IsFaceup() and c:IsCode(6007213,32491822)
 end
 function c93224848.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetFieldGroupCount(tp,LOCATION_HAND,0)>=2

c96458440.lua

@@ -30,12 +30,10 @@ function c96458440.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function c96458440.eqlimit(e,c)
-	local code=c:GetCode()
-	return code==8508055 or code==3810071 or code==49814180
+	return c:IsCode(8508055,3810071,49814180)
 end
 function c96458440.filter(c)
-	local code=c:GetCode()
-	return c:IsFaceup() and (code==8508055 or code==3810071 or code==49814180)
+	return c:IsFaceup() and c:IsCode(8508055,3810071,49814180)
 end
 function c96458440.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c96458440.filter(chkc) end

c97570038.lua

@@ -9,8 +9,7 @@ function c97570038.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c97570038.filter(c)
-	local code=c:GetCode()
-	return c:IsFaceup() and (code==8508055 or code==3810071 or code==49814180)
+	return c:IsFaceup() and c:IsCode(8508055,3810071,49814180)
 end
 function c97570038.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(c97570038.filter,tp,LOCATION_MZONE,0,1,nil)
@@ -25,8 +24,7 @@ function c97570038.operation(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e1,tp)
 end
 function c97570038.cfilter(c)
-	local code=c:GetCode()
-	return code==8508055 or code==3810071 or code==49814180
+	return c:IsCode(8508055,3810071,49814180)
 end
 function c97570038.desop(e,tp,eg,ep,ev,re,r,rp)
 	local a=Duel.GetAttacker()