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
0e2eef1f
Commit
0e2eef1f
authored
Nov 02, 2025
by
wind2009
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'vuryleo/revise-fusion-material' into develop
parents
cfd4e832
aa0f5c05
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
0 deletions
+12
-0
field.cpp
field.cpp
+12
-0
No files found.
field.cpp
View file @
0e2eef1f
...
@@ -1918,14 +1918,26 @@ void field::get_fusion_material(uint8_t playerid, card_set* material_all, card_s
...
@@ -1918,14 +1918,26 @@ void field::get_fusion_material(uint8_t playerid, card_set* material_all, card_s
material_base
->
insert
(
pcard
);
material_base
->
insert
(
pcard
);
}
}
}
}
// Fullmetalfoes Alkahest etc
for
(
auto
&
pcard
:
player
[
playerid
].
list_szone
)
{
for
(
auto
&
pcard
:
player
[
playerid
].
list_szone
)
{
if
(
pcard
&&
pcard
->
is_affected_by_effect
(
EFFECT_EXTRA_FUSION_MATERIAL
))
if
(
pcard
&&
pcard
->
is_affected_by_effect
(
EFFECT_EXTRA_FUSION_MATERIAL
))
material_all
->
insert
(
pcard
);
material_all
->
insert
(
pcard
);
}
}
// Lunalight Masquerade etc
for
(
auto
&
pcard
:
player
[
playerid
].
list_grave
)
{
for
(
auto
&
pcard
:
player
[
playerid
].
list_grave
)
{
if
(
pcard
->
is_affected_by_effect
(
EFFECT_EXTRA_FUSION_MATERIAL
))
if
(
pcard
->
is_affected_by_effect
(
EFFECT_EXTRA_FUSION_MATERIAL
))
material_all
->
insert
(
pcard
);
material_all
->
insert
(
pcard
);
}
}
// Curse of the Shadow Prison
for
(
auto
&
pcard
:
player
[
1
-
playerid
].
list_mzone
)
{
if
(
pcard
&&
pcard
->
is_affected_by_effect
(
EFFECT_EXTRA_FUSION_MATERIAL
))
material_all
->
insert
(
pcard
);
}
// Amazoness Secret Arts
for
(
auto
&
pcard
:
player
[
playerid
].
list_extra
)
{
if
(
pcard
->
is_affected_by_effect
(
EFFECT_EXTRA_FUSION_MATERIAL
))
material_all
->
insert
(
pcard
);
}
material_all
->
insert
(
material_base
->
begin
(),
material_base
->
end
());
material_all
->
insert
(
material_base
->
begin
(),
material_base
->
end
());
}
}
void
field
::
ritual_release
(
const
card_set
&
material
)
{
void
field
::
ritual_release
(
const
card_set
&
material
)
{
...
...
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