Commit 8462fec1 authored by Chen Bill's avatar Chen Bill Committed by GitHub

fix "card with X effect" (#2763)

* remove Auxiliary.MonsterEffectCategoryFilter

* use aux.EffectPropertyFilter
parent 5d8736f4
...@@ -25,7 +25,7 @@ function c11819473.initial_effect(c) ...@@ -25,7 +25,7 @@ function c11819473.initial_effect(c)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
function c11819473.thfilter1(c) function c11819473.thfilter1(c)
return not c:IsCode(11819473) and c:IsEffectProperty(aux.EffectCategoryFilter(CATEGORY_COIN)) and c:IsAbleToHand() return not c:IsCode(11819473) and c:IsEffectProperty(aux.EffectPropertyFilter(EFFECT_FLAG_COIN)) and c:IsAbleToHand()
end end
function c11819473.thfilter2(c,p) function c11819473.thfilter2(c,p)
return c:IsAbleToHand(p) return c:IsAbleToHand(p)
......
...@@ -13,7 +13,7 @@ function c47292920.initial_effect(c) ...@@ -13,7 +13,7 @@ function c47292920.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function c47292920.cfilter(c) function c47292920.cfilter(c)
return c:IsFaceup() and c:IsEffectProperty(aux.EffectCategoryFilter(CATEGORY_DICE)) return c:IsFaceup() and c:IsEffectProperty(aux.EffectPropertyFilter(EFFECT_FLAG_DICE))
end end
function c47292920.spcon(e,tp,eg,ep,ev,re,r,rp) function c47292920.spcon(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsExistingMatchingCard(c47292920.cfilter,tp,LOCATION_ONFIELD,0,1,nil) return Duel.IsExistingMatchingCard(c47292920.cfilter,tp,LOCATION_ONFIELD,0,1,nil)
...@@ -28,7 +28,7 @@ function c47292920.cost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -28,7 +28,7 @@ function c47292920.cost(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.Release(g,REASON_COST) Duel.Release(g,REASON_COST)
end end
function c47292920.spfilter(c,e,tp) function c47292920.spfilter(c,e,tp)
return c:IsType(TYPE_MONSTER) and c:IsEffectProperty(aux.MonsterEffectCategoryFilter(CATEGORY_DICE)) return c:IsType(TYPE_MONSTER) and c:IsEffectProperty(aux.MonsterEffectPropertyFilter(EFFECT_FLAG_DICE))
and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end end
function c47292920.target(e,tp,eg,ep,ev,re,r,rp,chk) function c47292920.target(e,tp,eg,ep,ev,re,r,rp,chk)
......
...@@ -88,7 +88,7 @@ function c76728962.desop(e,tp,eg,ep,ev,re,r,rp) ...@@ -88,7 +88,7 @@ function c76728962.desop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c76728962.thfilter(c) function c76728962.thfilter(c)
return c:IsEffectProperty(aux.EffectCategoryFilter(CATEGORY_COIN)) and c:IsType(TYPE_MONSTER) and c:IsLevelBelow(7) and c:IsAbleToHand() return c:IsEffectProperty(aux.EffectPropertyFilter(EFFECT_FLAG_COIN)) and c:IsType(TYPE_MONSTER) and c:IsLevelBelow(7) and c:IsAbleToHand()
end end
function c76728962.thtg(e,tp,eg,ep,ev,re,r,rp,chk) function c76728962.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c76728962.thfilter,tp,LOCATION_DECK,0,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(c76728962.thfilter,tp,LOCATION_DECK,0,1,nil) end
......
...@@ -12,7 +12,7 @@ function c93078761.initial_effect(c) ...@@ -12,7 +12,7 @@ function c93078761.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function c93078761.filter(c) function c93078761.filter(c)
return c:IsEffectProperty(aux.EffectCategoryFilter(CATEGORY_DICE)) and c:IsAbleToHand() return c:IsEffectProperty(aux.EffectPropertyFilter(EFFECT_FLAG_DICE)) and c:IsAbleToHand()
end end
function c93078761.target(e,tp,eg,ep,ev,re,r,rp,chk) function c93078761.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c93078761.filter,tp,LOCATION_DECK,0,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(c93078761.filter,tp,LOCATION_DECK,0,1,nil) end
......
...@@ -336,6 +336,9 @@ EFFECT_FLAG_LIMIT_ZONE =0x10000000 --限制魔法·陷阱卡发动时可以放 ...@@ -336,6 +336,9 @@ EFFECT_FLAG_LIMIT_ZONE =0x10000000 --限制魔法·陷阱卡发动时可以放
EFFECT_FLAG_ACTIVATE_CONDITION =0x20000000 --诱发效果即将发动时检查条件(手卡诱发之外的无此标记的诱发效果为触发事件时检查) EFFECT_FLAG_ACTIVATE_CONDITION =0x20000000 --诱发效果即将发动时检查条件(手卡诱发之外的无此标记的诱发效果为触发事件时检查)
EFFECT_FLAG_CVAL_CHECK =0x40000000 --N/A EFFECT_FLAG_CVAL_CHECK =0x40000000 --N/A
EFFECT_FLAG_IMMEDIATELY_APPLY =0x80000000 --卡在发动时效果就立即适用 EFFECT_FLAG_IMMEDIATELY_APPLY =0x80000000 --卡在发动时效果就立即适用
EFFECT_FLAG_COIN =0x100000000 --
EFFECT_FLAG_DICE =0x200000000 --
EFFECT_FLAG_FUSION_SUMMON =0x400000000 --
EFFECT_FLAG2_REPEAT_UPDATE =0x0001 --最后计算的攻击力上升 EFFECT_FLAG2_REPEAT_UPDATE =0x0001 --最后计算的攻击力上升
EFFECT_FLAG2_COF =0x0002 --通常魔法卡在MP1以外发动(邪恶的仪式的特殊处理) EFFECT_FLAG2_COF =0x0002 --通常魔法卡在MP1以外发动(邪恶的仪式的特殊处理)
......
...@@ -1835,13 +1835,24 @@ end ...@@ -1835,13 +1835,24 @@ end
---@param category integer ---@param category integer
---@return function ---@return function
function Auxiliary.EffectCategoryFilter(category) function Auxiliary.EffectCategoryFilter(category)
return aux.FilterBoolFunction(Effect.IsHasCategory,category) ---@param e Effect
return function (e)
return e:IsHasCategory(category)
end
end end
---@param category integer ---@param flag integer
---@return function
function Auxiliary.EffectPropertyFilter(flag)
---@param e Effect
return function (e)
return e:IsHasProperty(flag)
end
end
---@param flag integer
---@return function ---@return function
function Auxiliary.MonsterEffectCategoryFilter(category) function Auxiliary.MonsterEffectPropertyFilter(flag)
---@param e Effect ---@param e Effect
return function (e) return function (e)
return e:IsHasCategory(category) and not e:IsHasRange(LOCATION_PZONE) return e:IsHasProperty(flag) and not e:IsHasRange(LOCATION_PZONE)
end end
end end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment