Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro-2pick
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-2pick
Commits
1309f59f
Commit
1309f59f
authored
Oct 19, 2012
by
Fluorohydride
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #302 from VanillaSalt/patch32
fix
parents
4abbfc46
b97903f8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
7 deletions
+10
-7
ocgcore/libcard.cpp
ocgcore/libcard.cpp
+4
-1
script/utility.lua
script/utility.lua
+6
-6
No files found.
ocgcore/libcard.cpp
View file @
1309f59f
...
...
@@ -24,7 +24,10 @@ int32 scriptlib::card_get_origin_code(lua_State *L) {
check_param_count
(
L
,
1
);
check_param
(
L
,
PARAM_TYPE_CARD
,
1
);
card
*
pcard
=
*
(
card
**
)
lua_touserdata
(
L
,
1
);
if
(
pcard
->
data
.
alias
)
{
int32
neglect_alias
=
false
;
if
(
lua_gettop
(
L
)
>=
2
)
neglect_alias
=
lua_toboolean
(
L
,
2
);
if
(
!
neglect_alias
&&
pcard
->
data
.
alias
)
{
int32
dif
=
pcard
->
data
.
code
-
pcard
->
data
.
alias
;
if
(
dif
>
-
10
&&
dif
<
10
)
lua_pushinteger
(
L
,
pcard
->
data
.
alias
);
...
...
script/utility.lua
View file @
1309f59f
...
...
@@ -159,7 +159,7 @@ function Auxiliary.AddSynchroProcedure2(c,f1,f2)
end
function
Auxiliary
.
AddXyzProcedure
(
c
,
f
,
ct
,
alterf
,
desc
,
maxct
)
if
c
.
xyz_filter
==
nil
then
local
code
=
c
:
GetOriginalCode
()
local
code
=
c
:
GetOriginalCode
(
true
)
local
mt
=
_G
[
"c"
..
code
]
mt
.
xyz_filter
=
f
mt
.
xyz_count
=
ct
...
...
@@ -257,7 +257,7 @@ function Auxiliary.FConditionCheckF(c,chkf)
end
function
Auxiliary
.
AddFusionProcCode2
(
c
,
code1
,
code2
,
sub
,
insf
)
if
c
.
material_count
==
nil
then
local
code
=
c
:
GetOriginalCode
()
local
code
=
c
:
GetOriginalCode
(
true
)
local
mt
=
_G
[
"c"
..
code
]
mt
.
material_count
=
2
mt
.
material
=
{
code1
,
code2
}
...
...
@@ -329,7 +329,7 @@ function Auxiliary.FOperationCode2(code1,code2,sub,insf)
end
function
Auxiliary
.
AddFusionProcCode3
(
c
,
code1
,
code2
,
code3
,
sub
,
insf
)
if
c
.
material_count
==
nil
then
local
code
=
c
:
GetOriginalCode
()
local
code
=
c
:
GetOriginalCode
(
true
)
local
mt
=
_G
[
"c"
..
code
]
mt
.
material_count
=
3
mt
.
material
=
{
code1
,
code2
,
code2
}
...
...
@@ -424,7 +424,7 @@ function Auxiliary.FOperationCode3(code1,code2,code3,sub,insf)
end
function
Auxiliary
.
AddFusionProcCode4
(
c
,
code1
,
code2
,
code3
,
code4
,
sub
,
insf
)
if
c
.
material_count
==
nil
then
local
code
=
c
:
GetOriginalCode
()
local
code
=
c
:
GetOriginalCode
(
true
)
local
mt
=
_G
[
"c"
..
code
]
mt
.
material_count
=
4
mt
.
material
=
{
code1
,
code2
,
code3
,
code4
}
...
...
@@ -532,7 +532,7 @@ function Auxiliary.FOperationCode4(code1,code2,code3,code4,sub,insf)
end
function
Auxiliary
.
AddFusionProcCodeFun
(
c
,
code
,
f
,
cc
,
sub
,
insf
)
if
c
.
material_count
==
nil
then
local
code
=
c
:
GetOriginalCode
()
local
code
=
c
:
GetOriginalCode
(
true
)
local
mt
=
_G
[
"c"
..
code
]
mt
.
material_count
=
1
mt
.
material
=
{
code
}
...
...
@@ -687,7 +687,7 @@ function Auxiliary.FOperationFun2(f1,f2,insf)
end
function
Auxiliary
.
AddFusionProcCodeRep
(
c
,
code
,
cc
,
sub
,
insf
)
if
c
.
material_count
==
nil
then
local
code
=
c
:
GetOriginalCode
()
local
code
=
c
:
GetOriginalCode
(
true
)
local
mt
=
_G
[
"c"
..
code
]
mt
.
material_count
=
1
mt
.
material
=
{
code
}
...
...
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