Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro-THC-cards
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
0
Merge Requests
0
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
八宫一月
ygopro-THC-cards
Commits
d9b3253c
Commit
d9b3253c
authored
May 23, 2022
by
wyykak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix 24137
Signed-off-by:
wyykak
<
wyy_1414@126.com
>
parent
075a0204
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
5 deletions
+9
-5
script/c24137.lua
script/c24137.lua
+9
-5
No files found.
script/c24137.lua
View file @
d9b3253c
...
@@ -60,6 +60,7 @@ function c24137.activate(e,tp,eg,ep,ev,re,r,rp)
...
@@ -60,6 +60,7 @@ function c24137.activate(e,tp,eg,ep,ev,re,r,rp)
sg2
=
Duel
.
GetMatchingGroup
(
c24137
.
filter2
,
tp
,
LOCATION_EXTRA
,
0
,
nil
,
e
,
tp
,
mg2
,
mf
,
chkf
)
sg2
=
Duel
.
GetMatchingGroup
(
c24137
.
filter2
,
tp
,
LOCATION_EXTRA
,
0
,
nil
,
e
,
tp
,
mg2
,
mf
,
chkf
)
end
end
if
sg1
:
GetCount
()
>
0
or
(
sg2
~=
nil
and
sg2
:
GetCount
()
>
0
)
then
if
sg1
:
GetCount
()
>
0
or
(
sg2
~=
nil
and
sg2
:
GetCount
()
>
0
)
then
local
canDraw
=
true
local
sg
=
sg1
:
Clone
()
local
sg
=
sg1
:
Clone
()
if
sg2
then
sg
:
Merge
(
sg2
)
end
if
sg2
then
sg
:
Merge
(
sg2
)
end
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_SPSUMMON
)
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_SPSUMMON
)
...
@@ -68,20 +69,23 @@ function c24137.activate(e,tp,eg,ep,ev,re,r,rp)
...
@@ -68,20 +69,23 @@ function c24137.activate(e,tp,eg,ep,ev,re,r,rp)
if
sg1
:
IsContains
(
tc
)
and
(
sg2
==
nil
or
not
sg2
:
IsContains
(
tc
)
or
not
Duel
.
SelectYesNo
(
tp
,
ce
:
GetDescription
()))
then
if
sg1
:
IsContains
(
tc
)
and
(
sg2
==
nil
or
not
sg2
:
IsContains
(
tc
)
or
not
Duel
.
SelectYesNo
(
tp
,
ce
:
GetDescription
()))
then
local
mat1
=
Duel
.
SelectFusionMaterial
(
tp
,
tc
,
mg1
,
nil
,
chkf
)
local
mat1
=
Duel
.
SelectFusionMaterial
(
tp
,
tc
,
mg1
,
nil
,
chkf
)
tc
:
SetMaterial
(
mat1
)
tc
:
SetMaterial
(
mat1
)
canDraw
=
canDraw
and
mat1
:
GetCount
()
==
mat1
:
FilterCount
(
Card
.
IsAttribute
,
nil
,
ATTRIBUTE_FIRE
)
Duel
.
SendtoGrave
(
mat1
,
REASON_EFFECT
+
REASON_MATERIAL
+
REASON_FUSION
)
Duel
.
SendtoGrave
(
mat1
,
REASON_EFFECT
+
REASON_MATERIAL
+
REASON_FUSION
)
Duel
.
BreakEffect
()
Duel
.
BreakEffect
()
Duel
.
SpecialSummon
(
tc
,
SUMMON_TYPE_FUSION
,
tp
,
tp
,
false
,
false
,
POS_FACEUP
)
Duel
.
SpecialSummon
(
tc
,
SUMMON_TYPE_FUSION
,
tp
,
tp
,
false
,
false
,
POS_FACEUP
)
if
mat1
:
GetCount
()
==
mat1
:
FilterCount
(
Card
.
IsAttribute
,
nil
,
ATTRIBUTE_FIRE
)
and
tc
:
IsAttribute
(
ATTRIBUTE_FIRE
)
then
if
Duel
.
Draw
(
tp
,
3
,
REASON_EFFECT
)
>
2
then
Duel
.
DiscardHand
(
tp
,
nil
,
2
,
2
,
REASON_EFFECT
+
REASON_DISCARD
)
end
end
else
else
local
mat2
=
Duel
.
SelectFusionMaterial
(
tp
,
tc
,
mg2
,
nil
,
chkf
)
local
mat2
=
Duel
.
SelectFusionMaterial
(
tp
,
tc
,
mg2
,
nil
,
chkf
)
canDraw
=
canDraw
and
mat2
:
GetCount
()
==
mat2
:
FilterCount
(
Card
.
IsAttribute
,
nil
,
ATTRIBUTE_FIRE
)
local
fop
=
ce
:
GetOperation
()
local
fop
=
ce
:
GetOperation
()
fop
(
ce
,
e
,
tp
,
tc
,
mat2
)
fop
(
ce
,
e
,
tp
,
tc
,
mat2
)
end
end
tc
:
CompleteProcedure
()
tc
:
CompleteProcedure
()
canDraw
=
canDraw
and
tc
:
IsAttribute
(
ATTRIBUTE_FIRE
)
if
canDraw
then
if
Duel
.
Draw
(
tp
,
3
,
REASON_EFFECT
)
>
2
then
Duel
.
DiscardHand
(
tp
,
nil
,
2
,
2
,
REASON_EFFECT
+
REASON_DISCARD
)
end
end
end
end
end
end
function
c24137
.
thcon
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
function
c24137
.
thcon
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
...
...
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