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
e25878de
Commit
e25878de
authored
Sep 13, 2015
by
salix5
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
field::move_to_field()
parent
93ccb0ce
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
1 deletion
+4
-1
ocgcore/card.cpp
ocgcore/card.cpp
+1
-0
ocgcore/field.cpp
ocgcore/field.cpp
+1
-0
ocgcore/operations.cpp
ocgcore/operations.cpp
+1
-1
ocgcore/processor.cpp
ocgcore/processor.cpp
+1
-0
No files found.
ocgcore/card.cpp
View file @
e25878de
...
@@ -1190,6 +1190,7 @@ int32 card::copy_effect(uint32 code, uint32 reset, uint32 count) {
...
@@ -1190,6 +1190,7 @@ int32 card::copy_effect(uint32 code, uint32 reset, uint32 count) {
pduel
->
uncopy
.
clear
();
pduel
->
uncopy
.
clear
();
return
pduel
->
game_field
->
infos
.
copy_id
-
1
;
return
pduel
->
game_field
->
infos
.
copy_id
-
1
;
}
}
// add EFFECT_SET_CONTROL
void
card
::
reset
(
uint32
id
,
uint32
reset_type
)
{
void
card
::
reset
(
uint32
id
,
uint32
reset_type
)
{
effect
*
peffect
;
effect
*
peffect
;
if
(
reset_type
!=
RESET_EVENT
&&
reset_type
!=
RESET_PHASE
&&
reset_type
!=
RESET_CODE
&&
reset_type
!=
RESET_COPY
&&
reset_type
!=
RESET_CARD
)
if
(
reset_type
!=
RESET_EVENT
&&
reset_type
!=
RESET_PHASE
&&
reset_type
!=
RESET_CODE
&&
reset_type
!=
RESET_COPY
&&
reset_type
!=
RESET_CARD
)
...
...
ocgcore/field.cpp
View file @
e25878de
...
@@ -376,6 +376,7 @@ void field::move_card(uint8 playerid, card* pcard, uint8 location, uint8 sequenc
...
@@ -376,6 +376,7 @@ void field::move_card(uint8 playerid, card* pcard, uint8 location, uint8 sequenc
}
}
add_card
(
playerid
,
pcard
,
location
,
sequence
);
add_card
(
playerid
,
pcard
,
location
,
sequence
);
}
}
// add EFFECT_SET_CONTROL
void
field
::
set_control
(
card
*
pcard
,
uint8
playerid
,
uint16
reset_phase
,
uint8
reset_count
)
{
void
field
::
set_control
(
card
*
pcard
,
uint8
playerid
,
uint16
reset_phase
,
uint8
reset_count
)
{
if
((
core
.
remove_brainwashing
&&
pcard
->
is_affected_by_effect
(
EFFECT_REMOVE_BRAINWASHING
))
||
pcard
->
refresh_control_status
()
==
playerid
)
if
((
core
.
remove_brainwashing
&&
pcard
->
is_affected_by_effect
(
EFFECT_REMOVE_BRAINWASHING
))
||
pcard
->
refresh_control_status
()
==
playerid
)
return
;
return
;
...
...
ocgcore/operations.cpp
View file @
e25878de
...
@@ -3727,7 +3727,7 @@ int32 field::move_to_field(uint16 step, card * target, uint32 enable, uint32 ret
...
@@ -3727,7 +3727,7 @@ int32 field::move_to_field(uint16 step, card * target, uint32 enable, uint32 ret
target
->
unequip
();
target
->
unequip
();
if
(
enable
||
((
ret
==
1
)
&&
target
->
is_position
(
POS_FACEUP
)))
if
(
enable
||
((
ret
==
1
)
&&
target
->
is_position
(
POS_FACEUP
)))
target
->
enable_field_effect
(
TRUE
);
target
->
enable_field_effect
(
TRUE
);
adjust_
instan
t
();
adjust_
disable_check_lis
t
();
return
FALSE
;
return
FALSE
;
}
}
case
3
:
{
case
3
:
{
...
...
ocgcore/processor.cpp
View file @
e25878de
...
@@ -5103,6 +5103,7 @@ int32 field::adjust_step(uint16 step) {
...
@@ -5103,6 +5103,7 @@ int32 field::adjust_step(uint16 step) {
for
(
uint8
p
=
0
;
p
<
2
;
++
p
)
{
for
(
uint8
p
=
0
;
p
<
2
;
++
p
)
{
for
(
uint8
i
=
0
;
i
<
5
;
++
i
)
{
for
(
uint8
i
=
0
;
i
<
5
;
++
i
)
{
pcard
=
player
[
p
].
list_mzone
[
i
];
pcard
=
player
[
p
].
list_mzone
[
i
];
// remove EFFECT_SET_CONTROL
if
(
pcard
&&
pcard
->
is_affected_by_effect
(
EFFECT_REMOVE_BRAINWASHING
))
if
(
pcard
&&
pcard
->
is_affected_by_effect
(
EFFECT_REMOVE_BRAINWASHING
))
pcard
->
reset
(
EFFECT_SET_CONTROL
,
RESET_CODE
);
pcard
->
reset
(
EFFECT_SET_CONTROL
,
RESET_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