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
aaad6820
Commit
aaad6820
authored
Jan 19, 2020
by
DailyShana
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix delayed activate effect
triggered by event raised during adding chains should activate after chain end
parent
56b6f83e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
field.h
field.h
+1
-0
processor.cpp
processor.cpp
+3
-1
No files found.
field.h
View file @
aaad6820
...
@@ -185,6 +185,7 @@ struct processor {
...
@@ -185,6 +185,7 @@ struct processor {
event_list
point_event
;
event_list
point_event
;
event_list
instant_event
;
event_list
instant_event
;
event_list
queue_event
;
event_list
queue_event
;
event_list
delayed_activate_event
;
event_list
full_event
;
event_list
full_event
;
event_list
used_event
;
event_list
used_event
;
event_list
single_event
;
event_list
single_event
;
...
...
processor.cpp
View file @
aaad6820
...
@@ -1262,6 +1262,7 @@ int32 field::process_phase_event(int16 step, int32 phase) {
...
@@ -1262,6 +1262,7 @@ int32 field::process_phase_event(int16 step, int32 phase) {
core
.
quick_f_chain
.
clear
();
core
.
quick_f_chain
.
clear
();
core
.
instant_event
.
clear
();
core
.
instant_event
.
clear
();
core
.
point_event
.
clear
();
core
.
point_event
.
clear
();
core
.
delayed_activate_event
.
clear
();
core
.
full_event
.
clear
();
core
.
full_event
.
clear
();
return
TRUE
;
return
TRUE
;
}
}
...
@@ -1273,6 +1274,7 @@ int32 field::process_point_event(int16 step, int32 skip_trigger, int32 skip_free
...
@@ -1273,6 +1274,7 @@ int32 field::process_point_event(int16 step, int32 skip_trigger, int32 skip_free
case
0
:
{
case
0
:
{
core
.
select_chains
.
clear
();
core
.
select_chains
.
clear
();
core
.
point_event
.
splice
(
core
.
point_event
.
end
(),
core
.
instant_event
);
core
.
point_event
.
splice
(
core
.
point_event
.
end
(),
core
.
instant_event
);
core
.
full_event
.
splice
(
core
.
full_event
.
end
(),
core
.
delayed_activate_event
);
if
(
skip_trigger
)
{
if
(
skip_trigger
)
{
core
.
units
.
begin
()
->
step
=
7
;
core
.
units
.
begin
()
->
step
=
7
;
return
FALSE
;
return
FALSE
;
...
@@ -1879,7 +1881,7 @@ int32 field::process_instant_event() {
...
@@ -1879,7 +1881,7 @@ int32 field::process_instant_event() {
}
}
}
}
// delayed activate effect
// delayed activate effect
core
.
full
_event
.
push_back
(
ev
);
core
.
delayed_activate
_event
.
push_back
(
ev
);
// delayed quick effect
// delayed quick effect
pr
=
effects
.
quick_o_effect
.
equal_range
(
ev
.
event_code
);
pr
=
effects
.
quick_o_effect
.
equal_range
(
ev
.
event_code
);
for
(
auto
eit
=
pr
.
first
;
eit
!=
pr
.
second
;)
{
for
(
auto
eit
=
pr
.
first
;
eit
!=
pr
.
second
;)
{
...
...
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