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
xiaoye
ygopro-core
Commits
6439e4fa
Commit
6439e4fa
authored
Apr 12, 2017
by
VanillaSalt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
da0db24f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
2 deletions
+26
-2
field.cpp
field.cpp
+15
-1
operations.cpp
operations.cpp
+11
-1
No files found.
field.cpp
View file @
6439e4fa
...
@@ -2414,7 +2414,7 @@ int32 field::check_tuner_material(card* pcard, card* tuner, int32 findex1, int32
...
@@ -2414,7 +2414,7 @@ int32 field::check_tuner_material(card* pcard, card* tuner, int32 findex1, int32
return
FALSE
;
return
FALSE
;
}
}
int32
playerid
=
pcard
->
current
.
controler
;
int32
playerid
=
pcard
->
current
.
controler
;
int32
ct
=
get_
useable_count
(
pcard
,
playerid
,
LOCATION_MZONE
,
playerid
,
LOCATION_REASON_TOFIELD
);
int32
ct
=
get_
spsummonable_count
(
pcard
,
playerid
,
playerid
);
card_set
linked_cards
;
card_set
linked_cards
;
if
(
ct
<=
0
)
{
if
(
ct
<=
0
)
{
uint32
linked_zone
=
core
.
duel_rule
>=
4
?
get_linked_zone
(
playerid
)
|
(
1u
<<
5
)
|
(
1u
<<
6
)
:
0x1f
;
uint32
linked_zone
=
core
.
duel_rule
>=
4
?
get_linked_zone
(
playerid
)
|
(
1u
<<
5
)
|
(
1u
<<
6
)
:
0x1f
;
...
@@ -2436,6 +2436,20 @@ int32 field::check_tuner_material(card* pcard, card* tuner, int32 findex1, int32
...
@@ -2436,6 +2436,20 @@ int32 field::check_tuner_material(card* pcard, card* tuner, int32 findex1, int32
return
FALSE
;
return
FALSE
;
}
}
}
}
int32
mzone_limit
=
get_mzone_limit
(
playerid
,
playerid
,
LOCATION_REASON_TOFIELD
);
if
(
mzone_limit
<
0
)
{
if
(
location
==
LOCATION_HAND
)
{
pduel
->
restore_assumes
();
return
FALSE
;
}
int32
ft
=
-
mzone_limit
;
if
(
ft
>
min
)
min
=
ft
;
if
(
min
>
max
)
{
pduel
->
restore_assumes
();
return
FALSE
;
}
}
int32
lv
=
pcard
->
get_level
();
int32
lv
=
pcard
->
get_level
();
card_vector
nsyn
;
card_vector
nsyn
;
int32
mcount
=
1
;
int32
mcount
=
1
;
...
...
operations.cpp
View file @
6439e4fa
...
@@ -4592,6 +4592,13 @@ int32 field::select_synchro_material(int16 step, uint8 playerid, card* pcard, in
...
@@ -4592,6 +4592,13 @@ int32 field::select_synchro_material(int16 step, uint8 playerid, card* pcard, in
max = ptuner->o_range;
max = ptuner->o_range;
core.units.begin()->arg2 = min + (max << 16);
core.units.begin()->arg2 = min + (max << 16);
}
}
int32 mzone_limit = get_mzone_limit(playerid, playerid, LOCATION_REASON_TOFIELD);
if(mzone_limit < 0) {
int32 ft = -mzone_limit;
if(ft > min)
min = ft;
core.units.begin()->arg2 = min + (max << 16);
}
if(!smat)
if(!smat)
return FALSE;
return FALSE;
min--;
min--;
...
@@ -4678,7 +4685,7 @@ int32 field::select_synchro_material(int16 step, uint8 playerid, card* pcard, in
...
@@ -4678,7 +4685,7 @@ int32 field::select_synchro_material(int16 step, uint8 playerid, card* pcard, in
}
}
}
}
int32 playerid = pcard->current.controler;
int32 playerid = pcard->current.controler;
int32
ct
=
get_
useable_count
(
pcard
,
playerid
,
LOCATION_MZONE
,
playerid
,
LOCATION_REASON_TOFIELD
);
int32 ct = get_
spsummonable_count(pcard, playerid, playerid
);
if(ct <= 0) {
if(ct <= 0) {
card_set linked_cards;
card_set linked_cards;
uint32 linked_zone = core.duel_rule >= 4 ? get_linked_zone(playerid) | (1u << 5) | (1u << 6) : 0x1f;
uint32 linked_zone = core.duel_rule >= 4 ? get_linked_zone(playerid) | (1u << 5) | (1u << 6) : 0x1f;
...
@@ -4739,6 +4746,9 @@ int32 field::select_synchro_material(int16 step, uint8 playerid, card* pcard, in
...
@@ -4739,6 +4746,9 @@ int32 field::select_synchro_material(int16 step, uint8 playerid, card* pcard, in
must_select_cards->swap(core.must_select_cards);
must_select_cards->swap(core.must_select_cards);
delete select_cards;
delete select_cards;
delete must_select_cards;
delete must_select_cards;
min--;
max--;
core.units.begin()->arg2 = min + (max << 16);
return FALSE;
return FALSE;
}
}
case 7: {
case 7: {
...
...
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