Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro-scripts-888
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
ygopro-scripts-888
Commits
8462fec1
Commit
8462fec1
authored
Dec 04, 2024
by
salix5
Committed by
GitHub
Dec 04, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix "card with X effect" (#2763)
* remove Auxiliary.MonsterEffectCategoryFilter * use aux.EffectPropertyFilter
parent
5d8736f4
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
9 deletions
+23
-9
c11819473.lua
c11819473.lua
+1
-1
c47292920.lua
c47292920.lua
+2
-2
c76728962.lua
c76728962.lua
+1
-1
c93078761.lua
c93078761.lua
+1
-1
constant.lua
constant.lua
+3
-0
utility.lua
utility.lua
+15
-4
No files found.
c11819473.lua
View file @
8462fec1
...
@@ -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
.
Effect
CategoryFilter
(
CATEGORY
_COIN
))
and
c
:
IsAbleToHand
()
return
not
c
:
IsCode
(
11819473
)
and
c
:
IsEffectProperty
(
aux
.
Effect
PropertyFilter
(
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
)
...
...
c47292920.lua
View file @
8462fec1
...
@@ -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
.
Effect
CategoryFilter
(
CATEGORY
_DICE
))
return
c
:
IsFaceup
()
and
c
:
IsEffectProperty
(
aux
.
Effect
PropertyFilter
(
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
.
MonsterEffect
CategoryFilter
(
CATEGORY
_DICE
))
return
c
:
IsType
(
TYPE_MONSTER
)
and
c
:
IsEffectProperty
(
aux
.
MonsterEffect
PropertyFilter
(
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
)
...
...
c76728962.lua
View file @
8462fec1
...
@@ -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
.
Effect
CategoryFilter
(
CATEGORY
_COIN
))
and
c
:
IsType
(
TYPE_MONSTER
)
and
c
:
IsLevelBelow
(
7
)
and
c
:
IsAbleToHand
()
return
c
:
IsEffectProperty
(
aux
.
Effect
PropertyFilter
(
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
...
...
c93078761.lua
View file @
8462fec1
...
@@ -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
.
Effect
CategoryFilter
(
CATEGORY
_DICE
))
and
c
:
IsAbleToHand
()
return
c
:
IsEffectProperty
(
aux
.
Effect
PropertyFilter
(
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
...
...
constant.lua
View file @
8462fec1
...
@@ -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以外发动(邪恶的仪式的特殊处理)
...
...
utility.lua
View file @
8462fec1
...
@@ -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
.
MonsterEffect
CategoryFilter
(
category
)
function
Auxiliary
.
MonsterEffect
PropertyFilter
(
flag
)
---@param e Effect
---@param e Effect
return
function
(
e
)
return
function
(
e
)
return
e
:
IsHas
Category
(
category
)
and
not
e
:
IsHasRange
(
LOCATION_PZONE
)
return
e
:
IsHas
Property
(
flag
)
and
not
e
:
IsHasRange
(
LOCATION_PZONE
)
end
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment