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
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
MyCard
ygopro-core
Commits
a9b5fb8d
Commit
a9b5fb8d
authored
Apr 17, 2020
by
DailyShana
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix reset control in turn end when controller has changed
parent
dae92637
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
8 deletions
+2
-8
processor.cpp
processor.cpp
+2
-8
No files found.
processor.cpp
View file @
a9b5fb8d
...
@@ -1036,8 +1036,7 @@ int32 field::process_phase_event(int16 step, int32 phase) {
...
@@ -1036,8 +1036,7 @@ int32 field::process_phase_event(int16 step, int32 phase) {
cn_count
++
;
cn_count
++
;
}
}
//all effects taking control non-permanently are only until End Phase, not until Turn end
//all effects taking control non-permanently are only until End Phase, not until Turn end
for(auto eit = effects.pheff.begin(); eit != effects.pheff.end();) {
for
(
auto
*
peffect
:
effects
.
pheff
)
{
effect* peffect = *eit++;
if
(
peffect
->
code
!=
EFFECT_SET_CONTROL
)
if
(
peffect
->
code
!=
EFFECT_SET_CONTROL
)
continue
;
continue
;
if
(
!
(
peffect
->
reset_flag
&
phase
))
if
(
!
(
peffect
->
reset_flag
&
phase
))
...
@@ -1051,13 +1050,8 @@ int32 field::process_phase_event(int16 step, int32 phase) {
...
@@ -1051,13 +1050,8 @@ int32 field::process_phase_event(int16 step, int32 phase) {
if
(
peffect
->
reset_count
!=
1
)
if
(
peffect
->
reset_count
!=
1
)
continue
;
continue
;
card
*
phandler
=
peffect
->
get_handler
();
card
*
phandler
=
peffect
->
get_handler
();
if(pid != phandler->current.controler) {
if
(
peffect
->
value
!=
phandler
->
current
.
controler
)
if(peffect->is_flag(EFFECT_FLAG_FIELD_ONLY))
remove_effect(peffect);
else
peffect->handler->remove_effect(peffect);
continue
;
continue
;
}
newchain
.
triggering_effect
=
peffect
;
newchain
.
triggering_effect
=
peffect
;
core
.
select_chains
.
push_back
(
newchain
);
core
.
select_chains
.
push_back
(
newchain
);
cn_count
++
;
cn_count
++
;
...
...
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