Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro-scripts
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
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
Commits
66ceeebd
Commit
66ceeebd
authored
Oct 25, 2015
by
独孤朲
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #55 from DailyShana/fusion_chk
fix
parents
c4dda6c7
a91364e2
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
106 additions
and
75 deletions
+106
-75
c22638495.lua
c22638495.lua
+8
-8
c27346636.lua
c27346636.lua
+1
-1
c48156348.lua
c48156348.lua
+1
-1
c72378329.lua
c72378329.lua
+8
-8
c79229522.lua
c79229522.lua
+1
-1
c80532587.lua
c80532587.lua
+7
-7
c90957527.lua
c90957527.lua
+1
-1
utility.lua
utility.lua
+79
-48
No files found.
c22638495.lua
View file @
66ceeebd
...
@@ -48,22 +48,22 @@ end
...
@@ -48,22 +48,22 @@ end
function
c22638495
.
splimit
(
e
,
se
,
sp
,
st
)
function
c22638495
.
splimit
(
e
,
se
,
sp
,
st
)
return
e
:
GetHandler
():
GetLocation
()
~=
LOCATION_EXTRA
return
e
:
GetHandler
():
GetLocation
()
~=
LOCATION_EXTRA
end
end
function
c22638495
.
spfilter1
(
c
,
tp
)
function
c22638495
.
spfilter1
(
c
,
tp
,
fc
)
return
c
:
IsSetCard
(
0xc7
)
and
c
:
IsType
(
TYPE_PENDULUM
)
and
c
:
IsCanBeFusionMaterial
()
return
c
:
IsSetCard
(
0xc7
)
and
c
:
IsType
(
TYPE_PENDULUM
)
and
c
:
IsCanBeFusionMaterial
(
fc
)
and
Duel
.
CheckReleaseGroup
(
tp
,
c22638495
.
spfilter2
,
1
,
c
)
and
Duel
.
CheckReleaseGroup
(
tp
,
c22638495
.
spfilter2
,
1
,
c
,
fc
)
end
end
function
c22638495
.
spfilter2
(
c
)
function
c22638495
.
spfilter2
(
c
,
fc
)
return
c
:
IsType
(
TYPE_PENDULUM
)
and
c
:
IsCanBeFusionMaterial
()
return
c
:
IsType
(
TYPE_PENDULUM
)
and
c
:
IsCanBeFusionMaterial
(
fc
)
end
end
function
c22638495
.
spcon
(
e
,
c
)
function
c22638495
.
spcon
(
e
,
c
)
if
c
==
nil
then
return
true
end
if
c
==
nil
then
return
true
end
local
tp
=
c
:
GetControler
()
local
tp
=
c
:
GetControler
()
return
Duel
.
GetLocationCount
(
tp
,
LOCATION_MZONE
)
>-
2
return
Duel
.
GetLocationCount
(
tp
,
LOCATION_MZONE
)
>-
2
and
Duel
.
CheckReleaseGroup
(
tp
,
c22638495
.
spfilter1
,
1
,
nil
,
tp
)
and
Duel
.
CheckReleaseGroup
(
tp
,
c22638495
.
spfilter1
,
1
,
nil
,
tp
,
c
)
end
end
function
c22638495
.
spop
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
c
)
function
c22638495
.
spop
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
c
)
local
g1
=
Duel
.
SelectReleaseGroup
(
tp
,
c22638495
.
spfilter1
,
1
,
1
,
nil
,
tp
)
local
g1
=
Duel
.
SelectReleaseGroup
(
tp
,
c22638495
.
spfilter1
,
1
,
1
,
nil
,
tp
,
c
)
local
g2
=
Duel
.
SelectReleaseGroup
(
tp
,
c22638495
.
spfilter2
,
1
,
1
,
g1
:
GetFirst
())
local
g2
=
Duel
.
SelectReleaseGroup
(
tp
,
c22638495
.
spfilter2
,
1
,
1
,
g1
:
GetFirst
()
,
c
)
g1
:
Merge
(
g2
)
g1
:
Merge
(
g2
)
c
:
SetMaterial
(
g1
)
c
:
SetMaterial
(
g1
)
Duel
.
Release
(
g1
,
REASON_COST
+
REASON_FUSION
+
REASON_MATERIAL
)
Duel
.
Release
(
g1
,
REASON_COST
+
REASON_FUSION
+
REASON_MATERIAL
)
...
...
c27346636.lua
View file @
66ceeebd
...
@@ -38,7 +38,7 @@ function c27346636.splimit(e,se,sp,st)
...
@@ -38,7 +38,7 @@ function c27346636.splimit(e,se,sp,st)
return
e
:
GetHandler
():
GetLocation
()
~=
LOCATION_EXTRA
return
e
:
GetHandler
():
GetLocation
()
~=
LOCATION_EXTRA
end
end
function
c27346636
.
spfilter1
(
c
,
tp
)
function
c27346636
.
spfilter1
(
c
,
tp
)
return
c
:
IsCode
(
78868776
)
and
c
:
IsAbleToDeckOrExtraAsCost
()
and
c
:
IsCanBeFusionMaterial
(
true
)
return
c
:
IsCode
(
78868776
)
and
c
:
IsAbleToDeckOrExtraAsCost
()
and
c
:
IsCanBeFusionMaterial
(
nil
,
true
)
and
Duel
.
IsExistingMatchingCard
(
c27346636
.
spfilter2
,
tp
,
LOCATION_MZONE
,
0
,
2
,
c
)
and
Duel
.
IsExistingMatchingCard
(
c27346636
.
spfilter2
,
tp
,
LOCATION_MZONE
,
0
,
2
,
c
)
end
end
function
c27346636
.
spfilter2
(
c
)
function
c27346636
.
spfilter2
(
c
)
...
...
c48156348.lua
View file @
66ceeebd
...
@@ -46,7 +46,7 @@ function c48156348.splimit(e,se,sp,st)
...
@@ -46,7 +46,7 @@ function c48156348.splimit(e,se,sp,st)
return
e
:
GetHandler
():
GetLocation
()
~=
LOCATION_EXTRA
return
e
:
GetHandler
():
GetLocation
()
~=
LOCATION_EXTRA
end
end
function
c48156348
.
spfilter1
(
c
,
tp
)
function
c48156348
.
spfilter1
(
c
,
tp
)
return
c
:
IsCode
(
41470137
)
and
c
:
IsAbleToDeckOrExtraAsCost
()
and
c
:
IsCanBeFusionMaterial
(
true
)
return
c
:
IsCode
(
41470137
)
and
c
:
IsAbleToDeckOrExtraAsCost
()
and
c
:
IsCanBeFusionMaterial
(
nil
,
true
)
and
Duel
.
IsExistingMatchingCard
(
c48156348
.
spfilter2
,
tp
,
LOCATION_MZONE
,
0
,
1
,
c
)
and
Duel
.
IsExistingMatchingCard
(
c48156348
.
spfilter2
,
tp
,
LOCATION_MZONE
,
0
,
1
,
c
)
end
end
function
c48156348
.
spfilter2
(
c
)
function
c48156348
.
spfilter2
(
c
)
...
...
c72378329.lua
View file @
66ceeebd
...
@@ -42,22 +42,22 @@ end
...
@@ -42,22 +42,22 @@ end
function
c72378329
.
splimit
(
e
,
se
,
sp
,
st
)
function
c72378329
.
splimit
(
e
,
se
,
sp
,
st
)
return
bit
.
band
(
st
,
SUMMON_TYPE_FUSION
)
==
SUMMON_TYPE_FUSION
return
bit
.
band
(
st
,
SUMMON_TYPE_FUSION
)
==
SUMMON_TYPE_FUSION
end
end
function
c72378329
.
spfilter1
(
c
,
tp
)
function
c72378329
.
spfilter1
(
c
,
tp
,
fc
)
return
c
:
IsRace
(
RACE_DRAGON
)
and
c
:
IsAttribute
(
ATTRIBUTE_DARK
)
and
c
:
IsCanBeFusionMaterial
()
return
c
:
IsRace
(
RACE_DRAGON
)
and
c
:
IsAttribute
(
ATTRIBUTE_DARK
)
and
c
:
IsCanBeFusionMaterial
(
fc
)
and
Duel
.
CheckReleaseGroup
(
tp
,
c72378329
.
spfilter2
,
1
,
c
)
and
Duel
.
CheckReleaseGroup
(
tp
,
c72378329
.
spfilter2
,
1
,
c
,
fc
)
end
end
function
c72378329
.
spfilter2
(
c
)
function
c72378329
.
spfilter2
(
c
,
fc
)
return
c
:
IsRace
(
RACE_BEAST
)
and
c
:
IsCanBeFusionMaterial
()
return
c
:
IsRace
(
RACE_BEAST
)
and
c
:
IsCanBeFusionMaterial
(
fc
)
end
end
function
c72378329
.
spcon
(
e
,
c
)
function
c72378329
.
spcon
(
e
,
c
)
if
c
==
nil
then
return
true
end
if
c
==
nil
then
return
true
end
local
tp
=
c
:
GetControler
()
local
tp
=
c
:
GetControler
()
return
Duel
.
GetLocationCount
(
tp
,
LOCATION_MZONE
)
>-
2
return
Duel
.
GetLocationCount
(
tp
,
LOCATION_MZONE
)
>-
2
and
Duel
.
CheckReleaseGroup
(
tp
,
c72378329
.
spfilter1
,
1
,
nil
,
tp
)
and
Duel
.
CheckReleaseGroup
(
tp
,
c72378329
.
spfilter1
,
1
,
nil
,
tp
,
c
)
end
end
function
c72378329
.
spop
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
c
)
function
c72378329
.
spop
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
c
)
local
g1
=
Duel
.
SelectReleaseGroup
(
tp
,
c72378329
.
spfilter1
,
1
,
1
,
nil
,
tp
)
local
g1
=
Duel
.
SelectReleaseGroup
(
tp
,
c72378329
.
spfilter1
,
1
,
1
,
nil
,
tp
,
c
)
local
g2
=
Duel
.
SelectReleaseGroup
(
tp
,
c72378329
.
spfilter2
,
1
,
1
,
g1
:
GetFirst
())
local
g2
=
Duel
.
SelectReleaseGroup
(
tp
,
c72378329
.
spfilter2
,
1
,
1
,
g1
:
GetFirst
()
,
c
)
g1
:
Merge
(
g2
)
g1
:
Merge
(
g2
)
c
:
SetMaterial
(
g1
)
c
:
SetMaterial
(
g1
)
Duel
.
Release
(
g1
,
REASON_COST
+
REASON_FUSION
+
REASON_MATERIAL
)
Duel
.
Release
(
g1
,
REASON_COST
+
REASON_FUSION
+
REASON_MATERIAL
)
...
...
c79229522.lua
View file @
66ceeebd
...
@@ -31,7 +31,7 @@ function c79229522.splimit(e,se,sp,st)
...
@@ -31,7 +31,7 @@ function c79229522.splimit(e,se,sp,st)
return
e
:
GetHandler
():
GetLocation
()
~=
LOCATION_EXTRA
return
e
:
GetHandler
():
GetLocation
()
~=
LOCATION_EXTRA
end
end
function
c79229522
.
spfilter1
(
c
,
tp
,
ft
)
function
c79229522
.
spfilter1
(
c
,
tp
,
ft
)
if
c
:
IsCode
(
70095154
)
and
c
:
IsAbleToGraveAsCost
()
and
c
:
IsCanBeFusionMaterial
(
true
)
and
(
c
:
IsControler
(
tp
)
or
c
:
IsFaceup
())
then
if
c
:
IsCode
(
70095154
)
and
c
:
IsAbleToGraveAsCost
()
and
c
:
IsCanBeFusionMaterial
(
nil
,
true
)
and
(
c
:
IsControler
(
tp
)
or
c
:
IsFaceup
())
then
if
ft
>
0
or
(
c
:
IsControler
(
tp
)
and
c
:
IsLocation
(
LOCATION_MZONE
))
then
if
ft
>
0
or
(
c
:
IsControler
(
tp
)
and
c
:
IsLocation
(
LOCATION_MZONE
))
then
return
Duel
.
IsExistingMatchingCard
(
c79229522
.
spfilter2
,
tp
,
LOCATION_MZONE
,
LOCATION_MZONE
,
1
,
c
,
tp
)
return
Duel
.
IsExistingMatchingCard
(
c79229522
.
spfilter2
,
tp
,
LOCATION_MZONE
,
LOCATION_MZONE
,
1
,
c
,
tp
)
else
else
...
...
c80532587.lua
View file @
66ceeebd
...
@@ -40,24 +40,24 @@ function c80532587.initial_effect(c)
...
@@ -40,24 +40,24 @@ function c80532587.initial_effect(c)
e4
:
SetOperation
(
c80532587
.
desop
)
e4
:
SetOperation
(
c80532587
.
desop
)
c
:
RegisterEffect
(
e4
)
c
:
RegisterEffect
(
e4
)
end
end
function
c80532587
.
sprfilter1
(
c
,
tp
)
function
c80532587
.
sprfilter1
(
c
,
tp
,
fc
)
return
c
:
IsType
(
TYPE_SYNCHRO
)
and
c
:
IsAbleToGraveAsCost
()
and
c
:
IsCanBeFusionMaterial
()
return
c
:
IsType
(
TYPE_SYNCHRO
)
and
c
:
IsAbleToGraveAsCost
()
and
c
:
IsCanBeFusionMaterial
(
fc
)
and
Duel
.
IsExistingMatchingCard
(
c80532587
.
sprfilter2
,
tp
,
LOCATION_MZONE
,
0
,
1
,
c
)
and
Duel
.
IsExistingMatchingCard
(
c80532587
.
sprfilter2
,
tp
,
LOCATION_MZONE
,
0
,
1
,
c
)
end
end
function
c80532587
.
sprfilter2
(
c
)
function
c80532587
.
sprfilter2
(
c
,
fc
)
return
c
:
IsType
(
TYPE_XYZ
)
and
c
:
IsAbleToGraveAsCost
()
and
c
:
IsCanBeFusionMaterial
()
return
c
:
IsType
(
TYPE_XYZ
)
and
c
:
IsAbleToGraveAsCost
()
and
c
:
IsCanBeFusionMaterial
(
fc
)
end
end
function
c80532587
.
sprcon
(
e
,
c
)
function
c80532587
.
sprcon
(
e
,
c
)
if
c
==
nil
then
return
true
end
if
c
==
nil
then
return
true
end
local
tp
=
c
:
GetControler
()
local
tp
=
c
:
GetControler
()
return
Duel
.
GetLocationCount
(
tp
,
LOCATION_MZONE
)
>-
2
return
Duel
.
GetLocationCount
(
tp
,
LOCATION_MZONE
)
>-
2
and
Duel
.
IsExistingMatchingCard
(
c80532587
.
sprfilter1
,
tp
,
LOCATION_MZONE
,
0
,
1
,
nil
,
tp
)
and
Duel
.
IsExistingMatchingCard
(
c80532587
.
sprfilter1
,
tp
,
LOCATION_MZONE
,
0
,
1
,
nil
,
tp
,
c
)
end
end
function
c80532587
.
sprop
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
c
)
function
c80532587
.
sprop
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
c
)
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_TOGRAVE
)
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_TOGRAVE
)
local
g1
=
Duel
.
SelectMatchingCard
(
tp
,
c80532587
.
sprfilter1
,
tp
,
LOCATION_MZONE
,
0
,
1
,
1
,
nil
,
tp
)
local
g1
=
Duel
.
SelectMatchingCard
(
tp
,
c80532587
.
sprfilter1
,
tp
,
LOCATION_MZONE
,
0
,
1
,
1
,
nil
,
tp
,
c
)
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_TOGRAVE
)
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_TOGRAVE
)
local
g2
=
Duel
.
SelectMatchingCard
(
tp
,
c80532587
.
sprfilter2
,
tp
,
LOCATION_MZONE
,
0
,
1
,
1
,
g1
:
GetFirst
())
local
g2
=
Duel
.
SelectMatchingCard
(
tp
,
c80532587
.
sprfilter2
,
tp
,
LOCATION_MZONE
,
0
,
1
,
1
,
g1
:
GetFirst
()
,
c
)
g1
:
Merge
(
g2
)
g1
:
Merge
(
g2
)
c
:
SetMaterial
(
g1
)
c
:
SetMaterial
(
g1
)
Duel
.
SendtoGrave
(
g1
,
REASON_COST
)
Duel
.
SendtoGrave
(
g1
,
REASON_COST
)
...
...
c90957527.lua
View file @
66ceeebd
...
@@ -47,7 +47,7 @@ function c90957527.splimit(e,se,sp,st)
...
@@ -47,7 +47,7 @@ function c90957527.splimit(e,se,sp,st)
return
e
:
GetHandler
():
GetLocation
()
~=
LOCATION_EXTRA
return
e
:
GetHandler
():
GetLocation
()
~=
LOCATION_EXTRA
end
end
function
c90957527
.
spfilter1
(
c
,
tp
)
function
c90957527
.
spfilter1
(
c
,
tp
)
return
c
:
IsCode
(
79580323
)
and
c
:
IsAbleToDeckOrExtraAsCost
()
and
c
:
IsCanBeFusionMaterial
(
true
)
return
c
:
IsCode
(
79580323
)
and
c
:
IsAbleToDeckOrExtraAsCost
()
and
c
:
IsCanBeFusionMaterial
(
nil
,
true
)
and
Duel
.
IsExistingMatchingCard
(
c90957527
.
spfilter2
,
tp
,
LOCATION_MZONE
,
0
,
1
,
c
)
and
Duel
.
IsExistingMatchingCard
(
c90957527
.
spfilter2
,
tp
,
LOCATION_MZONE
,
0
,
1
,
c
)
end
end
function
c90957527
.
spfilter2
(
c
)
function
c90957527
.
spfilter2
(
c
)
...
...
utility.lua
View file @
66ceeebd
This diff is collapsed.
Click to expand it.
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