Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro-core
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
nanahira
ygopro-core
Commits
9906c04b
Commit
9906c04b
authored
Jan 05, 2024
by
Chen Bill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
get_fusion_material: exclude STATUS_SUMMONING
parent
e65b5424
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
field.cpp
field.cpp
+3
-3
No files found.
field.cpp
View file @
9906c04b
...
@@ -533,10 +533,10 @@ card* field::get_field_card(uint32 playerid, uint32 location, uint32 sequence) {
...
@@ -533,10 +533,10 @@ card* field::get_field_card(uint32 playerid, uint32 location, uint32 sequence) {
case
LOCATION_PZONE
:
{
case
LOCATION_PZONE
:
{
if
(
sequence
==
0
)
{
if
(
sequence
==
0
)
{
card
*
pcard
=
player
[
playerid
].
list_szone
[
core
.
duel_rule
>=
4
?
0
:
6
];
card
*
pcard
=
player
[
playerid
].
list_szone
[
core
.
duel_rule
>=
4
?
0
:
6
];
return
pcard
&&
pcard
->
current
.
pzone
?
pcard
:
0
;
return
(
pcard
&&
pcard
->
current
.
pzone
)
?
pcard
:
0
;
}
else
if
(
sequence
==
1
)
{
}
else
if
(
sequence
==
1
)
{
card
*
pcard
=
player
[
playerid
].
list_szone
[
core
.
duel_rule
>=
4
?
4
:
7
];
card
*
pcard
=
player
[
playerid
].
list_szone
[
core
.
duel_rule
>=
4
?
4
:
7
];
return
pcard
&&
pcard
->
current
.
pzone
?
pcard
:
0
;
return
(
pcard
&&
pcard
->
current
.
pzone
)
?
pcard
:
0
;
}
else
}
else
return
nullptr
;
return
nullptr
;
break
;
break
;
...
@@ -1894,7 +1894,7 @@ void field::get_ritual_material(uint8 playerid, effect* peffect, card_set* mater
...
@@ -1894,7 +1894,7 @@ void field::get_ritual_material(uint8 playerid, effect* peffect, card_set* mater
void
field
::
get_fusion_material
(
uint8
playerid
,
card_set
*
material_all
,
card_set
*
material_base
,
uint32
location
)
{
void
field
::
get_fusion_material
(
uint8
playerid
,
card_set
*
material_all
,
card_set
*
material_base
,
uint32
location
)
{
if
(
location
&
LOCATION_MZONE
)
{
if
(
location
&
LOCATION_MZONE
)
{
for
(
auto
&
pcard
:
player
[
playerid
].
list_mzone
)
{
for
(
auto
&
pcard
:
player
[
playerid
].
list_mzone
)
{
if
(
pcard
)
if
(
pcard
&&
!
pcard
->
is_status
(
STATUS_SUMMONING
)
)
material_base
->
insert
(
pcard
);
material_base
->
insert
(
pcard
);
}
}
}
}
...
...
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