From 643315a8205c32650e3f41b21a2d2492e99e880f Mon Sep 17 00:00:00 2001 From: mercury233 Date: Mon, 12 Jan 2026 09:25:09 +0800 Subject: [PATCH 1/2] rename c.mat_filter to c.ritual_mat_filter --- c11398951.lua | 4 ++-- c13386407.lua | 8 ++++---- c13408726.lua | 2 +- c16494704.lua | 4 ++-- c17888577.lua | 4 ++-- c20071842.lua | 4 ++-- c21105106.lua | 2 +- c22398665.lua | 8 ++++---- c2266498.lua | 8 ++++---- c24166324.lua | 8 ++++---- c25857246.lua | 2 +- c26674724.lua | 2 +- c28429121.lua | 4 ++-- c31002402.lua | 8 ++++---- c36350300.lua | 4 ++-- c36849933.lua | 4 ++-- c36982581.lua | 4 ++-- c38129297.lua | 4 ++-- c38784726.lua | 4 ++-- c39114494.lua | 4 ++-- c39468724.lua | 2 +- c42158279.lua | 4 ++-- c44293356.lua | 2 +- c46052429.lua | 8 ++++---- c50596425.lua | 4 ++-- c51124303.lua | 2 +- c51510279.lua | 4 ++-- c52068432.lua | 2 +- c52846880.lua | 2 +- c59514116.lua | 4 ++-- c63056220.lua | 4 ++-- c63679166.lua | 4 ++-- c69003792.lua | 8 ++++---- c74122412.lua | 2 +- c7986397.lua | 4 ++-- c81306186.lua | 2 +- c81560239.lua | 8 ++++---- c8428836.lua | 8 ++++---- c85327820.lua | 4 ++-- c8805651.lua | 4 ++-- c88240999.lua | 2 +- c90444325.lua | 4 ++-- c93754402.lua | 4 ++-- c99426088.lua | 4 ++-- procedure.lua | 8 ++++---- 45 files changed, 98 insertions(+), 98 deletions(-) diff --git a/c11398951.lua b/c11398951.lua index 51d24842da..9f1796a7cf 100644 --- a/c11398951.lua +++ b/c11398951.lua @@ -34,8 +34,8 @@ function c11398951.activate(e,tp,eg,ep,ev,re,r,rp) if tc then local mg=mg1:Filter(Card.IsCanBeRitualMaterial,tc,tc) mg:Merge(mg2) - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) else mg:RemoveCard(tc) end diff --git a/c13386407.lua b/c13386407.lua index 916cd080f0..0535cdcd3d 100644 --- a/c13386407.lua +++ b/c13386407.lua @@ -20,8 +20,8 @@ function c13386407.RitualUltimateFilter(c,filter,e,tp,m1,m2,level_function,great if m2 then mg:Merge(m2) end - if c.mat_filter then - mg=mg:Filter(c.mat_filter,c,tp) + if c.ritual_mat_filter then + mg=mg:Filter(c.ritual_mat_filter,c,tp) else mg:RemoveCard(c) end @@ -73,8 +73,8 @@ function c13386407.activate(e,tp,eg,ep,ev,re,r,rp) if tc then Duel.BreakEffect() mg=mg:Filter(Card.IsCanBeRitualMaterial,tc,tc) - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) else mg:RemoveCard(tc) end diff --git a/c13408726.lua b/c13408726.lua index 16a59e756b..0049d253e1 100644 --- a/c13408726.lua +++ b/c13408726.lua @@ -47,7 +47,7 @@ function s.initial_effect(c) e3:SetTarget(s.immtg) c:RegisterEffect(e3) end -function s.mat_filter(c) +function s.ritual_mat_filter(c) return not c:IsLevel(9) end function s.cfilter(c,tp) diff --git a/c16494704.lua b/c16494704.lua index 17f5c46488..8cef0d1060 100644 --- a/c16494704.lua +++ b/c16494704.lua @@ -42,8 +42,8 @@ function c16494704.operation(e,tp,eg,ep,ev,re,r,rp) if sg then mg:Merge(sg) end - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) else mg:RemoveCard(tc) end diff --git a/c17888577.lua b/c17888577.lua index bdd0b916ca..d87707ae4e 100644 --- a/c17888577.lua +++ b/c17888577.lua @@ -41,8 +41,8 @@ function c17888577.activate(e,tp,eg,ep,ev,re,r,rp) local tc=tg:GetFirst() if tc then mg=mg:Filter(Card.IsCanBeRitualMaterial,tc,tc) - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) else mg:RemoveCard(tc) end diff --git a/c20071842.lua b/c20071842.lua index 6d35372041..0deea54c2d 100644 --- a/c20071842.lua +++ b/c20071842.lua @@ -39,8 +39,8 @@ function c20071842.activate(e,tp,eg,ep,ev,re,r,rp) if tc then local mg=mg1:Filter(Card.IsCanBeRitualMaterial,tc,tc) mg:Merge(mg2) - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) else mg:RemoveCard(tc) end diff --git a/c21105106.lua b/c21105106.lua index 0da0c3af78..0fbeb045df 100644 --- a/c21105106.lua +++ b/c21105106.lua @@ -31,7 +31,7 @@ end function c21105106.splimit(e,se,sp,st) return e:GetHandler():IsLocation(LOCATION_HAND) and bit.band(st,SUMMON_TYPE_RITUAL)==SUMMON_TYPE_RITUAL end -function c21105106.mat_filter(c,tp) +function c21105106.ritual_mat_filter(c,tp) return c:IsLocation(LOCATION_MZONE) and c:IsControler(tp) end function c21105106.discon(e,tp,eg,ep,ev,re,r,rp) diff --git a/c22398665.lua b/c22398665.lua index b73669e5ac..0d0362f92d 100644 --- a/c22398665.lua +++ b/c22398665.lua @@ -62,8 +62,8 @@ function c22398665.operation(e,tp,eg,ep,ev,re,r,rp) local tc=tg:GetFirst() if tc then mg=mg:Filter(Card.IsCanBeRitualMaterial,tc,tc) - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) else mg:RemoveCard(tc) end @@ -114,8 +114,8 @@ function c22398665.RitualUltimateFilter(c,filter,e,tp,m1,m2,attack_function,grea if m2 then mg:Merge(m2) end - if c.mat_filter then - mg=mg:Filter(c.mat_filter,c,tp) + if c.ritual_mat_filter then + mg=mg:Filter(c.ritual_mat_filter,c,tp) else mg:RemoveCard(c) end diff --git a/c2266498.lua b/c2266498.lua index 712e1fa91f..501f1b0c2f 100644 --- a/c2266498.lua +++ b/c2266498.lua @@ -12,8 +12,8 @@ end function c2266498.cfilter(c,e,tp,m,ft) if bit.band(c:GetType(),0x81)~=0x81 or not c:IsSetCard(0x106) or c:IsPublic() or not c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_RITUAL,tp,false,true) then return false end - if c.mat_filter then - m=m:Filter(c.mat_filter,nil,tp) + if c.ritual_mat_filter then + m=m:Filter(c.ritual_mat_filter,nil,tp) end aux.GCheckAdditional=aux.RitualCheckAdditional(c,c:GetLevel(),"Equal") local res=m:CheckSubGroup(c2266498.fselect,1,math.min(c:GetLevel(),ft),c) @@ -47,8 +47,8 @@ function c2266498.activate(e,tp,eg,ep,ev,re,r,rp) if tg:GetCount()>0 then Duel.ConfirmCards(1-tp,tg) local tc=tg:GetFirst() - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,nil,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,nil,tp) end Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) aux.GCheckAdditional=aux.RitualCheckAdditional(tc,tc:GetLevel(),"Equal") diff --git a/c24166324.lua b/c24166324.lua index fed0930088..f2434cf004 100644 --- a/c24166324.lua +++ b/c24166324.lua @@ -93,8 +93,8 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) local tc=tg:GetFirst() if tc then mg=mg:Filter(Card.IsCanBeRitualMaterial,tc,tc) - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) else mg:RemoveCard(tc) end @@ -145,8 +145,8 @@ function s.RitualUltimateFilter(c,filter,e,tp,m1,m2,attack_function,greater_or_e if m2 then mg:Merge(m2) end - if c.mat_filter then - mg=mg:Filter(c.mat_filter,c,tp) + if c.ritual_mat_filter then + mg=mg:Filter(c.ritual_mat_filter,c,tp) else mg:RemoveCard(c) end diff --git a/c25857246.lua b/c25857246.lua index 301722f62c..00f9027f93 100644 --- a/c25857246.lua +++ b/c25857246.lua @@ -30,7 +30,7 @@ function c25857246.initial_effect(c) e3:SetOperation(c25857246.operation) c:RegisterEffect(e3) end -function c25857246.mat_filter(c) +function c25857246.ritual_mat_filter(c) return not c:IsLevel(8) end function c25857246.atkcon(e,tp,eg,ep,ev,re,r,rp) diff --git a/c26674724.lua b/c26674724.lua index ed2a84b38e..2c1120dc08 100644 --- a/c26674724.lua +++ b/c26674724.lua @@ -31,7 +31,7 @@ function c26674724.initial_effect(c) e3:SetOperation(c26674724.tdop) c:RegisterEffect(e3) end -function c26674724.mat_filter(c) +function c26674724.ritual_mat_filter(c) return not c:IsCode(26674724) end function c26674724.thcost(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/c28429121.lua b/c28429121.lua index e50f8929de..963c24c3c6 100644 --- a/c28429121.lua +++ b/c28429121.lua @@ -47,8 +47,8 @@ function c28429121.activate(e,tp,eg,ep,ev,re,r,rp) local tc=tg:GetFirst() if tc then local mg=mg1:Filter(Card.IsCanBeRitualMaterial,tc,tc) - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) else mg:RemoveCard(tc) end diff --git a/c31002402.lua b/c31002402.lua index 38d7f49256..163c32317e 100644 --- a/c31002402.lua +++ b/c31002402.lua @@ -21,8 +21,8 @@ function c31002402.rfilter2(c,e,tp,m1) if bit.band(c:GetType(),0x81)~=0x81 or not c:IsSetCard(0x145) or not c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_RITUAL,tp,false,true) then return false end local mg=m1:Filter(Card.IsCanBeRitualMaterial,c,c) - if c.mat_filter then - mg=mg:Filter(c.mat_filter,c,tp) + if c.ritual_mat_filter then + mg=mg:Filter(c.ritual_mat_filter,c,tp) end return mg:IsExists(Card.IsLevel,1,nil,c:GetLevel()) end @@ -47,8 +47,8 @@ function c31002402.activate(e,tp,eg,ep,ev,re,r,rp) local tc=g:Select(tp,1,1,nil):GetFirst() if tc then local mg=mg1:Filter(Card.IsCanBeRitualMaterial,tc,tc) - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) else mg:RemoveCard(tc) end diff --git a/c36350300.lua b/c36350300.lua index 9dfc2678e4..8a21f1df05 100644 --- a/c36350300.lua +++ b/c36350300.lua @@ -28,8 +28,8 @@ function c36350300.activate(e,tp,eg,ep,ev,re,r,rp) local tc=g:GetFirst() if tc then mg=mg:Filter(Card.IsCanBeRitualMaterial,tc,tc) - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) else mg:RemoveCard(tc) end diff --git a/c36849933.lua b/c36849933.lua index 28dfeecd29..6ae4b48e58 100644 --- a/c36849933.lua +++ b/c36849933.lua @@ -77,8 +77,8 @@ function c36849933.rsop(e,tp,eg,ep,ev,re,r,rp) local tc=tg:GetFirst() if tc then mg=mg:Filter(Card.IsCanBeRitualMaterial,tc,tc) - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) else mg:RemoveCard(tc) end diff --git a/c36982581.lua b/c36982581.lua index 8cb69423ab..118c8c61a4 100644 --- a/c36982581.lua +++ b/c36982581.lua @@ -53,8 +53,8 @@ function c36982581.activate(e,tp,eg,ep,ev,re,r,rp) local tc=g:Select(tp,1,1,nil):GetFirst() if tc then local mg=mg1:Filter(Card.IsCanBeRitualMaterial,tc,tc) - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) else mg:RemoveCard(tc) end diff --git a/c38129297.lua b/c38129297.lua index 6dcea5a2cd..96a09de480 100644 --- a/c38129297.lua +++ b/c38129297.lua @@ -117,8 +117,8 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) local tg=Duel.SelectMatchingCard(tp,aux.RitualUltimateFilter,tp,LOCATION_HAND,0,1,1,nil,aux.TRUE,e,tp,Group.CreateGroup(),mg,Card.GetLevel,"Greater") local tc=tg:GetFirst() if tc then - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) end local lv=tc:GetLevel() aux.GCheckAdditional=aux.RitualCheckAdditional(tc,tc:GetLevel(),"Greater") diff --git a/c38784726.lua b/c38784726.lua index 5121e17c35..338497b701 100644 --- a/c38784726.lua +++ b/c38784726.lua @@ -56,8 +56,8 @@ function c38784726.activate(e,tp,eg,ep,ev,re,r,rp) if mg2 then mg:Merge(mg2) end - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) else mg:RemoveCard(tc) end diff --git a/c39114494.lua b/c39114494.lua index cc4a45e05d..1bd1070f77 100644 --- a/c39114494.lua +++ b/c39114494.lua @@ -78,8 +78,8 @@ function c39114494.riop(e,tp,eg,ep,ev,re,r,rp) local tc=tg:GetFirst() if tc then mg=mg:Filter(Card.IsCanBeRitualMaterial,tc,tc) - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) else mg:RemoveCard(tc) end diff --git a/c39468724.lua b/c39468724.lua index 9827bab8f0..3d94158fea 100644 --- a/c39468724.lua +++ b/c39468724.lua @@ -34,7 +34,7 @@ function c39468724.initial_effect(c) e3:SetOperation(c39468724.negop) c:RegisterEffect(e3) end -function c39468724.mat_filter(c) +function c39468724.ritual_mat_filter(c) return not c:IsLevel(10) end function c39468724.tgcost(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/c42158279.lua b/c42158279.lua index d154d864b6..acb73ae4bb 100644 --- a/c42158279.lua +++ b/c42158279.lua @@ -45,8 +45,8 @@ function c42158279.activate(e,tp,eg,ep,ev,re,r,rp) local tc=g:GetFirst() if tc then mg=mg:Filter(Card.IsCanBeRitualMaterial,tc,tc) - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) else mg:RemoveCard(tc) end diff --git a/c44293356.lua b/c44293356.lua index 1d858957bc..bd16755748 100644 --- a/c44293356.lua +++ b/c44293356.lua @@ -32,7 +32,7 @@ function s.initial_effect(c) e2:SetOperation(s.negop) c:RegisterEffect(e2) end -function s.mat_filter(c) +function s.ritual_mat_filter(c) return c:IsAllTypes(TYPE_RITUAL+TYPE_MONSTER) end function s.prcost(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/c46052429.lua b/c46052429.lua index d96f75e320..4065ca9dc6 100644 --- a/c46052429.lua +++ b/c46052429.lua @@ -12,8 +12,8 @@ end function c46052429.filter(c,e,tp,m) if bit.band(c:GetType(),0x81)~=0x81 or not c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_RITUAL,tp,false,true) then return false end - if c.mat_filter then - m=m:Filter(c.mat_filter,nil,tp) + if c.ritual_mat_filter then + m=m:Filter(c.ritual_mat_filter,nil,tp) end return m:CheckWithSumEqual(Card.GetRitualLevel,c:GetLevel(),1,99,c) end @@ -36,8 +36,8 @@ function c46052429.activate(e,tp,eg,ep,ev,re,r,rp) local tg=Duel.SelectMatchingCard(tp,c46052429.filter,tp,LOCATION_HAND,0,1,1,nil,e,tp,mg) if tg:GetCount()>0 then local tc=tg:GetFirst() - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,nil,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,nil,tp) end local lv=tc:GetLevel() Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE) diff --git a/c50596425.lua b/c50596425.lua index a1c9b5acfc..b4dd14709b 100644 --- a/c50596425.lua +++ b/c50596425.lua @@ -54,8 +54,8 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) if tc then local mg=mg1:Filter(Card.IsCanBeRitualMaterial,tc,tc) mg:Merge(mg2) - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) else mg:RemoveCard(tc) end diff --git a/c51124303.lua b/c51124303.lua index 42342bb695..c0e2ac671e 100644 --- a/c51124303.lua +++ b/c51124303.lua @@ -22,7 +22,7 @@ function c51124303.initial_effect(c) end function c51124303.spfilter(c,e,tp,mc) local mg=Group.FromCards(mc) - return c:IsSetCard(0xb4) and bit.band(c:GetType(),0x81)==0x81 and (not c.mat_filter or c.mat_filter(mc,tp)) and (not c.mat_group_check or c.mat_group_check(mg,tp)) + return c:IsSetCard(0xb4) and bit.band(c:GetType(),0x81)==0x81 and (not c.ritual_mat_filter or c.ritual_mat_filter(mc,tp)) and (not c.mat_group_check or c.mat_group_check(mg,tp)) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_RITUAL,tp,false,true) and mc:IsCanBeRitualMaterial(c) end diff --git a/c51510279.lua b/c51510279.lua index 74bfe934cb..82c1829b3a 100644 --- a/c51510279.lua +++ b/c51510279.lua @@ -90,8 +90,8 @@ function c51510279.activate(e,tp,eg,ep,ev,re,r,rp) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) local tc=rsg:Select(tp,1,1,nil):GetFirst() local rmg=rmg1:Filter(Card.IsCanBeRitualMaterial,tc,tc) - if tc.mat_filter then - rmg=rmg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + rmg=rmg:Filter(tc.ritual_mat_filter,tc,tp) else rmg:RemoveCard(tc) end diff --git a/c52068432.lua b/c52068432.lua index f9a72e38ad..f0f1cf8cae 100644 --- a/c52068432.lua +++ b/c52068432.lua @@ -34,7 +34,7 @@ function c52068432.initial_effect(c) e3:SetOperation(c52068432.remop) c:RegisterEffect(e3) end -function c52068432.mat_filter(c) +function c52068432.ritual_mat_filter(c) return not c:IsLevel(9) end function c52068432.tfilter(c,tp) diff --git a/c52846880.lua b/c52846880.lua index 692cc9a668..717f31f1b9 100644 --- a/c52846880.lua +++ b/c52846880.lua @@ -32,7 +32,7 @@ function c52846880.initial_effect(c) e3:SetOperation(c52846880.operation) c:RegisterEffect(e3) end -function c52846880.mat_filter(c) +function c52846880.ritual_mat_filter(c) return not c:IsCode(52846880) end function c52846880.spcost(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/c59514116.lua b/c59514116.lua index 7ae64c4f52..470784b83e 100644 --- a/c59514116.lua +++ b/c59514116.lua @@ -113,8 +113,8 @@ function c59514116.activate(e,tp,eg,ep,ev,re,r,rp) local tc=tg:GetFirst() if tc then mg=mg:Filter(Card.IsCanBeRitualMaterial,tc,tc) - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) else mg:RemoveCard(tc) end diff --git a/c63056220.lua b/c63056220.lua index 3a78174026..4a95243351 100644 --- a/c63056220.lua +++ b/c63056220.lua @@ -68,8 +68,8 @@ function c63056220.rsop(e,tp,eg,ep,ev,re,r,rp) local tc=tg:GetFirst() if tc then mg=mg:Filter(Card.IsCanBeRitualMaterial,tc,tc) - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) else mg:RemoveCard(tc) end diff --git a/c63679166.lua b/c63679166.lua index 51d3149fe9..f15f16209c 100644 --- a/c63679166.lua +++ b/c63679166.lua @@ -41,8 +41,8 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local tc=tg:GetFirst() if tc then mg=mg:Filter(Card.IsCanBeRitualMaterial,tc,tc) - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) else mg:RemoveCard(tc) end diff --git a/c69003792.lua b/c69003792.lua index d1ba2b1c83..2e589bc367 100644 --- a/c69003792.lua +++ b/c69003792.lua @@ -51,8 +51,8 @@ function c69003792.RitualUltimateFilter(c,filter,e,tp,m1,m2,level_function,great if m2 then mg:Merge(m2) end - if c.mat_filter then - mg=mg:Filter(c.mat_filter,c,tp) + if c.ritual_mat_filter then + mg=mg:Filter(c.ritual_mat_filter,c,tp) else mg:RemoveCard(c) end @@ -78,8 +78,8 @@ function c69003792.spop(e,tp,eg,ep,ev,re,r,rp) local tc=tg:GetFirst() if tc then mg=mg:Filter(Card.IsCanBeRitualMaterial,tc,tc) - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) else mg:RemoveCard(tc) end diff --git a/c74122412.lua b/c74122412.lua index bccac7001b..76cef49f57 100644 --- a/c74122412.lua +++ b/c74122412.lua @@ -32,7 +32,7 @@ function c74122412.initial_effect(c) e3:SetOperation(c74122412.desop) c:RegisterEffect(e3) end -function c74122412.mat_filter(c) +function c74122412.ritual_mat_filter(c) return not c:IsLevel(7) end function c74122412.indcost(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/c7986397.lua b/c7986397.lua index a2e8e2db6c..082d0fe6e8 100644 --- a/c7986397.lua +++ b/c7986397.lua @@ -47,8 +47,8 @@ function c7986397.activate(e,tp,eg,ep,ev,re,r,rp) if tc then local mg=m:Filter(Card.IsCanBeRitualMaterial,tc,tc) mg:Merge(dg) - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) else mg:RemoveCard(tc) end diff --git a/c81306186.lua b/c81306186.lua index 843c0f973b..e350449011 100644 --- a/c81306186.lua +++ b/c81306186.lua @@ -75,7 +75,7 @@ function c81306186.target(e,tp,eg,ep,ev,re,r,rp,chk) end function c81306186.relfilter(c,e,tp,tc,ft) if not c:IsLevelAbove(tc:GetLevel()) then return false end - if tc.mat_filter and not tc.mat_filter(c,tp) then return false end + if tc.ritual_mat_filter and not tc.ritual_mat_filter(c,tp) then return false end if c:IsLocation(LOCATION_GRAVE) then return c:IsType(TYPE_RITUAL) and ft>0 and c:IsAbleToDeck() else diff --git a/c81560239.lua b/c81560239.lua index e53c13021b..9655fb1d93 100644 --- a/c81560239.lua +++ b/c81560239.lua @@ -67,8 +67,8 @@ function s.spop1(e,tp,eg,ep,ev,re,r,rp) local tc=g:GetFirst() if tc then local mg=mg1:Filter(Card.IsCanBeRitualMaterial,tc,tc) - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) else mg:RemoveCard(tc) end @@ -96,8 +96,8 @@ function s.spop2(e,tp,eg,ep,ev,re,r,rp) if tc then local mg=mg1:Filter(Card.IsCanBeRitualMaterial,tc,tc) mg:Merge(mg2) - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) else mg:RemoveCard(tc) end diff --git a/c8428836.lua b/c8428836.lua index 688a78a189..a549d9257e 100644 --- a/c8428836.lua +++ b/c8428836.lua @@ -31,8 +31,8 @@ function s.RitualUltimateFilter(c,filter,e,tp,m1,m2,level_function,greater_or_eq if m2 then mg:Merge(m2) end - if c.mat_filter then - mg=mg:Filter(c.mat_filter,c,tp) + if c.ritual_mat_filter then + mg=mg:Filter(c.ritual_mat_filter,c,tp) else mg:RemoveCard(c) end @@ -57,8 +57,8 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) local tc=g:GetFirst() if tc then local mg=mg1:Filter(Card.IsCanBeRitualMaterial,tc,tc) - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) else mg:RemoveCard(tc) end diff --git a/c85327820.lua b/c85327820.lua index 65c1a5a57c..8213e62d09 100644 --- a/c85327820.lua +++ b/c85327820.lua @@ -50,8 +50,8 @@ function c85327820.activate(e,tp,eg,ep,ev,re,r,rp) if mg2 then mg:Merge(mg2) end - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) else mg:RemoveCard(tc) end diff --git a/c8805651.lua b/c8805651.lua index 3c1e1769e7..85f075f364 100644 --- a/c8805651.lua +++ b/c8805651.lua @@ -81,8 +81,8 @@ function s.rsop(e,tp,eg,ep,ev,re,r,rp) local tc=tg:GetFirst() if tc then mg=mg:Filter(Card.IsCanBeRitualMaterial,tc,tc) - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) else mg:RemoveCard(tc) end diff --git a/c88240999.lua b/c88240999.lua index 258bfdf398..64f8849e42 100644 --- a/c88240999.lua +++ b/c88240999.lua @@ -35,7 +35,7 @@ function c88240999.initial_effect(c) e3:SetOperation(c88240999.desop) c:RegisterEffect(e3) end -function c88240999.mat_filter(c) +function c88240999.ritual_mat_filter(c) return not c:IsLevel(10) end function c88240999.adcost(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/c90444325.lua b/c90444325.lua index 1eb9f116df..06892fc22d 100644 --- a/c90444325.lua +++ b/c90444325.lua @@ -68,8 +68,8 @@ function c90444325.rsop(e,tp,eg,ep,ev,re,r,rp) local tc=tg:GetFirst() if tc then mg=mg:Filter(Card.IsCanBeRitualMaterial,tc,tc) - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) else mg:RemoveCard(tc) end diff --git a/c93754402.lua b/c93754402.lua index e621fd977b..0231f2ac70 100644 --- a/c93754402.lua +++ b/c93754402.lua @@ -32,8 +32,8 @@ function c93754402.activate(e,tp,eg,ep,ev,re,r,rp) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) local tc=g:Select(tp,1,1,nil):GetFirst() mg=mg:Filter(Card.IsCanBeRitualMaterial,tc,tc) - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) else mg:RemoveCard(tc) end diff --git a/c99426088.lua b/c99426088.lua index 815eef4983..b646899f3e 100644 --- a/c99426088.lua +++ b/c99426088.lua @@ -161,8 +161,8 @@ function c99426088.activate(e,tp,eg,ep,ev,re,r,rp) aux.RGCheckAdditional=c99426088.gcheck local rmg=rmg1:Filter(Card.IsCanBeRitualMaterial,tc,tc) if rmg2 then rmg:Merge(rmg2) end - if tc.mat_filter then - rmg=rmg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + rmg=rmg:Filter(tc.ritual_mat_filter,tc,tp) else rmg:RemoveCard(tc) end diff --git a/procedure.lua b/procedure.lua index ae36eb6300..4337aa0997 100644 --- a/procedure.lua +++ b/procedure.lua @@ -1776,8 +1776,8 @@ function Auxiliary.RitualUltimateFilter(c,filter,e,tp,m1,m2,level_function,great if m2 then mg:Merge(m2) end - if c.mat_filter then - mg=mg:Filter(c.mat_filter,c,tp) + if c.ritual_mat_filter then + mg=mg:Filter(c.ritual_mat_filter,c,tp) else mg:RemoveCard(c) end @@ -1828,8 +1828,8 @@ function Auxiliary.RitualUltimateOperation(filter,level_function,greater_or_equa if exg then mg:Merge(exg) end - if tc.mat_filter then - mg=mg:Filter(tc.mat_filter,tc,tp) + if tc.ritual_mat_filter then + mg=mg:Filter(tc.ritual_mat_filter,tc,tp) else mg:RemoveCard(tc) end From 05de8d491a06b88a84c25b4815708184654e8366 Mon Sep 17 00:00:00 2001 From: mercury233 Date: Mon, 12 Jan 2026 09:25:27 +0800 Subject: [PATCH 2/2] rename c.mat_group_check to c.ritual_mat_group_check --- c21105106.lua | 6 +++--- c22398665.lua | 2 +- c24166324.lua | 2 +- c51124303.lua | 2 +- procedure.lua | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/c21105106.lua b/c21105106.lua index 0fbeb045df..22b0b6c435 100644 --- a/c21105106.lua +++ b/c21105106.lua @@ -34,6 +34,9 @@ end function c21105106.ritual_mat_filter(c,tp) return c:IsLocation(LOCATION_MZONE) and c:IsControler(tp) end +function c21105106.ritual_mat_group_check(g,tp) + return #g==3 and g:GetClassCount(Card.GetRace)==3 +end function c21105106.discon(e,tp,eg,ep,ev,re,r,rp) return Duel.GetCurrentPhase()==PHASE_MAIN1 end @@ -90,6 +93,3 @@ function c21105106.rmop(e,tp,eg,ep,ev,re,r,rp) local g=Duel.GetMatchingGroup(Card.IsAbleToRemove,tp,LOCATION_ONFIELD+LOCATION_GRAVE,LOCATION_ONFIELD+LOCATION_GRAVE,aux.ExceptThisCard(e)) Duel.Remove(g,POS_FACEUP,REASON_EFFECT) end -function c21105106.mat_group_check(g) - return #g==3 and g:GetClassCount(Card.GetRace)==3 -end diff --git a/c22398665.lua b/c22398665.lua index 0d0362f92d..039470a32f 100644 --- a/c22398665.lua +++ b/c22398665.lua @@ -89,7 +89,7 @@ function c22398665.RitualCheckEqual(g,c,atk) return g:CheckWithSumEqual(aux.GetCappedAttack,atk,#g,#g) end function c22398665.RitualCheck(g,tp,c,atk,greater_or_equal) - return c22398665["RitualCheck"..greater_or_equal](g,c,atk) and Duel.GetMZoneCount(tp,g,tp)>0 and (not c.mat_group_check or c.mat_group_check(g,tp)) + return c22398665["RitualCheck"..greater_or_equal](g,c,atk) and Duel.GetMZoneCount(tp,g,tp)>0 and (not c.ritual_mat_group_check or c.ritual_mat_group_check(g,tp)) and (not aux.RCheckAdditional or aux.RCheckAdditional(tp,g,c)) end function c22398665.RitualCheckAdditional(c,atk,greater_or_equal) diff --git a/c24166324.lua b/c24166324.lua index f2434cf004..579e71d384 100644 --- a/c24166324.lua +++ b/c24166324.lua @@ -120,7 +120,7 @@ function s.RitualCheckEqual(g,c,atk) return g:CheckWithSumEqual(aux.GetCappedAttack,atk,#g,#g) end function s.RitualCheck(g,tp,c,atk,greater_or_equal) - return s["RitualCheck"..greater_or_equal](g,c,atk) and Duel.GetMZoneCount(tp,g,tp)>0 and (not c.mat_group_check or c.mat_group_check(g,tp)) + return s["RitualCheck"..greater_or_equal](g,c,atk) and Duel.GetMZoneCount(tp,g,tp)>0 and (not c.ritual_mat_group_check or c.ritual_mat_group_check(g,tp)) and (not aux.RCheckAdditional or aux.RCheckAdditional(tp,g,c)) end function s.RitualCheckAdditional(c,atk,greater_or_equal) diff --git a/c51124303.lua b/c51124303.lua index c0e2ac671e..b86ad6c816 100644 --- a/c51124303.lua +++ b/c51124303.lua @@ -22,7 +22,7 @@ function c51124303.initial_effect(c) end function c51124303.spfilter(c,e,tp,mc) local mg=Group.FromCards(mc) - return c:IsSetCard(0xb4) and bit.band(c:GetType(),0x81)==0x81 and (not c.ritual_mat_filter or c.ritual_mat_filter(mc,tp)) and (not c.mat_group_check or c.mat_group_check(mg,tp)) + return c:IsSetCard(0xb4) and bit.band(c:GetType(),0x81)==0x81 and (not c.ritual_mat_filter or c.ritual_mat_filter(mc,tp)) and (not c.ritual_mat_group_check or c.ritual_mat_group_check(mg,tp)) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_RITUAL,tp,false,true) and mc:IsCanBeRitualMaterial(c) end diff --git a/procedure.lua b/procedure.lua index 4337aa0997..50915ccd1c 100644 --- a/procedure.lua +++ b/procedure.lua @@ -1742,7 +1742,7 @@ function Auxiliary.RitualCheck(g,tp,c,lv,greater_or_equal) return false end end - return Auxiliary["RitualCheck"..greater_or_equal](g,c,lv) and (not c.mat_group_check or c.mat_group_check(g,tp)) + return Auxiliary["RitualCheck"..greater_or_equal](g,c,lv) and (not c.ritual_mat_group_check or c.ritual_mat_group_check(g,tp)) and (not Auxiliary.RCheckAdditional or Auxiliary.RCheckAdditional(tp,g,c)) end function Auxiliary.RitualCheckAdditionalLevel(c,rc)