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
4
Merge Requests
4
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
e6477839
Commit
e6477839
authored
Oct 29, 2023
by
Chen Bill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix redefined local in aux.AddFusionProcMix()
parent
8bedea7e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
12 deletions
+11
-12
procedure.lua
procedure.lua
+11
-12
No files found.
procedure.lua
View file @
e6477839
...
@@ -809,21 +809,21 @@ end
...
@@ -809,21 +809,21 @@ end
--Fusion Summon
--Fusion Summon
--material: names in material list
--material: names in material list
--Fusion monster, mixed materials
--Fusion monster, mixed materials
function
Auxiliary
.
AddFusionProcMix
(
c
,
sub
,
insf
,
...
)
function
Auxiliary
.
AddFusionProcMix
(
fcard
,
sub
,
insf
,
...
)
if
c
:
IsStatus
(
STATUS_COPYING_EFFECT
)
then
return
end
if
fcard
:
IsStatus
(
STATUS_COPYING_EFFECT
)
then
return
end
local
val
=
{
...
}
local
val
=
{
...
}
local
fun
=
{}
local
fun
=
{}
local
mat
=
{}
local
mat
=
{}
for
i
=
1
,
#
val
do
for
i
=
1
,
#
val
do
if
type
(
val
[
i
])
==
'function'
then
if
type
(
val
[
i
])
==
'function'
then
fun
[
i
]
=
function
(
c
,
fc
,
sub
,
mg
,
sg
)
return
val
[
i
](
c
,
fc
,
sub
,
mg
,
sg
)
and
not
c
:
IsHasEffect
(
6205579
)
end
fun
[
i
]
=
function
(
c
,
fc
,
sub
m
,
mg
,
sg
)
return
val
[
i
](
c
,
fc
,
subm
,
mg
,
sg
)
and
not
c
:
IsHasEffect
(
6205579
)
end
elseif
type
(
val
[
i
])
==
'table'
then
elseif
type
(
val
[
i
])
==
'table'
then
fun
[
i
]
=
function
(
c
,
fc
,
sub
,
mg
,
sg
)
fun
[
i
]
=
function
(
c
,
fc
,
sub
m
,
mg
,
sg
)
for
_
,
fcode
in
ipairs
(
val
[
i
])
do
for
_
,
fcode
in
ipairs
(
val
[
i
])
do
if
type
(
fcode
)
==
'function'
then
if
type
(
fcode
)
==
'function'
then
if
fcode
(
c
,
fc
,
sub
,
mg
,
sg
)
and
not
c
:
IsHasEffect
(
6205579
)
then
return
true
end
if
fcode
(
c
,
fc
,
sub
m
,
mg
,
sg
)
and
not
c
:
IsHasEffect
(
6205579
)
then
return
true
end
else
else
if
c
:
IsFusionCode
(
fcode
)
or
(
sub
and
c
:
CheckFusionSubstitute
(
fc
))
then
return
true
end
if
c
:
IsFusionCode
(
fcode
)
or
(
sub
m
and
c
:
CheckFusionSubstitute
(
fc
))
then
return
true
end
end
end
end
end
return
false
return
false
...
@@ -832,11 +832,11 @@ function Auxiliary.AddFusionProcMix(c,sub,insf,...)
...
@@ -832,11 +832,11 @@ function Auxiliary.AddFusionProcMix(c,sub,insf,...)
if
type
(
fcode
)
~=
'function'
then
mat
[
fcode
]
=
true
end
if
type
(
fcode
)
~=
'function'
then
mat
[
fcode
]
=
true
end
end
end
else
else
fun
[
i
]
=
function
(
c
,
fc
,
sub
)
return
c
:
IsFusionCode
(
val
[
i
])
or
(
sub
and
c
:
CheckFusionSubstitute
(
fc
))
end
fun
[
i
]
=
function
(
c
,
fc
,
sub
m
)
return
c
:
IsFusionCode
(
val
[
i
])
or
(
subm
and
c
:
CheckFusionSubstitute
(
fc
))
end
mat
[
val
[
i
]]
=
true
mat
[
val
[
i
]]
=
true
end
end
end
end
local
mt
=
getmetatable
(
c
)
local
mt
=
getmetatable
(
fcard
)
if
mt
.
material
==
nil
then
if
mt
.
material
==
nil
then
mt
.
material
=
mat
mt
.
material
=
mat
end
end
...
@@ -844,15 +844,15 @@ function Auxiliary.AddFusionProcMix(c,sub,insf,...)
...
@@ -844,15 +844,15 @@ function Auxiliary.AddFusionProcMix(c,sub,insf,...)
mt
.
material_count
=
{
#
fun
,
#
fun
}
mt
.
material_count
=
{
#
fun
,
#
fun
}
end
end
for
index
,
_
in
pairs
(
mat
)
do
for
index
,
_
in
pairs
(
mat
)
do
Auxiliary
.
AddCodeList
(
c
,
index
)
Auxiliary
.
AddCodeList
(
fcard
,
index
)
end
end
local
e1
=
Effect
.
CreateEffect
(
c
)
local
e1
=
Effect
.
CreateEffect
(
fcard
)
e1
:
SetType
(
EFFECT_TYPE_SINGLE
)
e1
:
SetType
(
EFFECT_TYPE_SINGLE
)
e1
:
SetProperty
(
EFFECT_FLAG_CANNOT_DISABLE
+
EFFECT_FLAG_UNCOPYABLE
)
e1
:
SetProperty
(
EFFECT_FLAG_CANNOT_DISABLE
+
EFFECT_FLAG_UNCOPYABLE
)
e1
:
SetCode
(
EFFECT_FUSION_MATERIAL
)
e1
:
SetCode
(
EFFECT_FUSION_MATERIAL
)
e1
:
SetCondition
(
Auxiliary
.
FConditionMix
(
insf
,
sub
,
table.unpack
(
fun
)))
e1
:
SetCondition
(
Auxiliary
.
FConditionMix
(
insf
,
sub
,
table.unpack
(
fun
)))
e1
:
SetOperation
(
Auxiliary
.
FOperationMix
(
insf
,
sub
,
table.unpack
(
fun
)))
e1
:
SetOperation
(
Auxiliary
.
FOperationMix
(
insf
,
sub
,
table.unpack
(
fun
)))
c
:
RegisterEffect
(
e1
)
fcard
:
RegisterEffect
(
e1
)
end
end
function
Auxiliary
.
FConditionMix
(
insf
,
sub
,
...
)
function
Auxiliary
.
FConditionMix
(
insf
,
sub
,
...
)
--g:Material group(nil for Instant Fusion)
--g:Material group(nil for Instant Fusion)
...
@@ -880,7 +880,6 @@ function Auxiliary.FOperationMix(insf,sub,...)
...
@@ -880,7 +880,6 @@ function Auxiliary.FOperationMix(insf,sub,...)
local
funs
=
{
...
}
local
funs
=
{
...
}
return
function
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
gc
,
chkfnf
)
return
function
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
gc
,
chkfnf
)
local
c
=
e
:
GetHandler
()
local
c
=
e
:
GetHandler
()
local
tp
=
c
:
GetControler
()
local
notfusion
=
chkfnf
&
0x100
>
0
local
notfusion
=
chkfnf
&
0x100
>
0
local
concat_fusion
=
chkfnf
&
0x200
>
0
local
concat_fusion
=
chkfnf
&
0x200
>
0
local
sub2
=
(
sub
or
notfusion
)
and
not
concat_fusion
local
sub2
=
(
sub
or
notfusion
)
and
not
concat_fusion
...
...
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