Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro
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-520DIY
ygopro
Commits
47530d68
Commit
47530d68
authored
Apr 23, 2014
by
VanillaSalt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
73f8d03d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
2 deletions
+5
-2
ocgcore/field.cpp
ocgcore/field.cpp
+1
-1
ocgcore/operations.cpp
ocgcore/operations.cpp
+2
-0
script/c77783947.lua
script/c77783947.lua
+1
-1
strings.conf
strings.conf
+1
-0
No files found.
ocgcore/field.cpp
View file @
47530d68
...
@@ -1616,7 +1616,7 @@ int32 field::check_tuner_material(card* pcard, card* tuner, int32 findex1, int32
...
@@ -1616,7 +1616,7 @@ int32 field::check_tuner_material(card* pcard, card* tuner, int32 findex1, int32
if
(
smat
)
{
if
(
smat
)
{
if
(
pcheck
)
if
(
pcheck
)
pcheck
->
get_value
(
smat
);
pcheck
->
get_value
(
smat
);
if
(
!
pduel
->
lua
->
check_matching
(
smat
,
findex2
,
0
))
{
if
(
!
smat
->
is_position
(
POS_FACEUP
)
||
!
smat
->
is_can_be_synchro_material
(
pcard
,
tuner
)
||
!
pduel
->
lua
->
check_matching
(
smat
,
findex2
,
0
))
{
pduel
->
restore_assumes
();
pduel
->
restore_assumes
();
return
FALSE
;
return
FALSE
;
}
}
...
...
ocgcore/operations.cpp
View file @
47530d68
...
@@ -3873,6 +3873,8 @@ int32 field::select_synchro_material(int16 step, uint8 playerid, card* pcard, in
...
@@ -3873,6 +3873,8 @@ int32 field::select_synchro_material(int16 step, uint8 playerid, card* pcard, in
int32
lv
=
pcard
->
get_level
();
int32
lv
=
pcard
->
get_level
();
lv
-=
l1
;
lv
-=
l1
;
if
(
smat
)
{
if
(
smat
)
{
if
(
pcheck
)
pcheck
->
get_value
(
smat
);
l
=
smat
->
get_synchro_level
(
pcard
);
l
=
smat
->
get_synchro_level
(
pcard
);
l1
=
l
&
0xffff
;
l1
=
l
&
0xffff
;
lv
-=
l1
;
lv
-=
l1
;
...
...
script/c77783947.lua
View file @
47530d68
...
@@ -39,7 +39,7 @@ function c77783947.sccon(e,tp,eg,ep,ev,re,r,rp)
...
@@ -39,7 +39,7 @@ function c77783947.sccon(e,tp,eg,ep,ev,re,r,rp)
return
ph
==
PHASE_MAIN1
or
ph
==
PHASE_BATTLE
or
ph
==
PHASE_MAIN2
return
ph
==
PHASE_MAIN1
or
ph
==
PHASE_BATTLE
or
ph
==
PHASE_MAIN2
end
end
function
c77783947
.
mfilter
(
c
)
function
c77783947
.
mfilter
(
c
)
return
c
:
Is
Faceup
()
and
c
:
Is
SetCard
(
0x9e
)
return
c
:
IsSetCard
(
0x9e
)
end
end
function
c77783947
.
cfilter
(
c
,
syn
)
function
c77783947
.
cfilter
(
c
,
syn
)
return
syn
:
IsSynchroSummonable
(
c
)
return
syn
:
IsSynchroSummonable
(
c
)
...
...
strings.conf
View file @
47530d68
...
@@ -427,3 +427,4 @@
...
@@ -427,3 +427,4 @@
!
counter
0
x2d
指示物(踢火)
!
counter
0
x2d
指示物(踢火)
!
counter
0
x2e
鲨指示物
!
counter
0
x2e
鲨指示物
!
counter
0
x2f
南瓜指示物
!
counter
0
x2f
南瓜指示物
!
counter
0
x30
???指示物
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