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
fdb86c96
Commit
fdb86c96
authored
Apr 24, 2020
by
DailyShana
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update REASON_RETURN and remove EVENT_RETURN_TO_GRAVE
parent
45ecd97f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
10 deletions
+4
-10
effect.h
effect.h
+0
-1
operations.cpp
operations.cpp
+4
-9
No files found.
effect.h
View file @
fdb86c96
...
...
@@ -516,7 +516,6 @@ inline effect_flag operator|(effect_flag flag1, effect_flag flag2)
#define EVENT_LEVEL_UP 1200
#define EVENT_PAY_LPCOST 1201
#define EVENT_DETACH_MATERIAL 1202
#define EVENT_RETURN_TO_GRAVE 1203
#define EVENT_TURN_END 1210
#define EVENT_PHASE 0x1000
#define EVENT_PHASE_START 0x2000
...
...
operations.cpp
View file @
fdb86c96
...
...
@@ -268,6 +268,8 @@ void field::send_to(card_set* targets, effect* reason_effect, uint32 reason, uin
p
=
reason_player
;
if
(
destination
&
(
LOCATION_GRAVE
|
LOCATION_REMOVED
)
||
p
==
PLAYER_NONE
)
p
=
pcard
->
owner
;
if
(
destination
==
LOCATION_GRAVE
&&
pcard
->
current
.
location
==
LOCATION_REMOVED
)
pcard
->
current
.
reason
|=
REASON_RETURN
;
uint32
pos
=
position
;
if
(
destination
!=
LOCATION_REMOVED
)
pos
=
POS_FACEUP
;
...
...
@@ -4126,7 +4128,7 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
core
.
units
.
begin
()
->
ptarget
=
param
->
targets
;
targets
=
param
->
targets
;
delete
param
;
card_set tohand, todeck, tograve, remove, discard, released, destroyed
, retgrave
;
card_set
tohand
,
todeck
,
tograve
,
remove
,
discard
,
released
,
destroyed
;
card_set
equipings
,
overlays
;
for
(
auto
&
pcard
:
targets
->
container
)
{
uint8
nloc
=
pcard
->
current
.
location
;
...
...
@@ -4159,15 +4161,10 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
todeck
.
insert
(
pcard
);
raise_single_event
(
pcard
,
0
,
EVENT_TO_DECK
,
pcard
->
current
.
reason_effect
,
pcard
->
current
.
reason
,
pcard
->
current
.
reason_player
,
0
,
0
);
}
if(nloc == LOCATION_GRAVE) {
if(pcard->current.reason & REASON_RETURN) {
retgrave.insert(pcard);
raise_single_event(pcard, 0, EVENT_RETURN_TO_GRAVE, pcard->current.reason_effect, pcard->current.reason, pcard->current.reason_player, 0, 0);
} else {
if
(
nloc
==
LOCATION_GRAVE
&&
!
(
pcard
->
current
.
reason
&
REASON_RETURN
))
{
tograve
.
insert
(
pcard
);
raise_single_event
(
pcard
,
0
,
EVENT_TO_GRAVE
,
pcard
->
current
.
reason_effect
,
pcard
->
current
.
reason
,
pcard
->
current
.
reason_player
,
0
,
0
);
}
}
if
(
nloc
==
LOCATION_REMOVED
||
((
pcard
->
data
.
type
&
TYPE_TOKEN
)
&&
pcard
->
sendto_param
.
location
==
LOCATION_REMOVED
))
{
remove
.
insert
(
pcard
);
raise_single_event
(
pcard
,
0
,
EVENT_REMOVE
,
pcard
->
current
.
reason_effect
,
pcard
->
current
.
reason
,
pcard
->
current
.
reason_player
,
0
,
0
);
...
...
@@ -4205,8 +4202,6 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
raise_event
(
&
released
,
EVENT_RELEASE
,
reason_effect
,
reason
,
reason_player
,
0
,
0
);
if
(
destroyed
.
size
())
raise_event
(
&
destroyed
,
EVENT_DESTROYED
,
reason_effect
,
reason
,
reason_player
,
0
,
0
);
if(retgrave.size())
raise_event(&retgrave, EVENT_RETURN_TO_GRAVE, reason_effect, reason, reason_player, 0, 0);
raise_event
(
&
targets
->
container
,
EVENT_MOVE
,
reason_effect
,
reason
,
reason_player
,
0
,
0
);
process_single_event
();
process_instant_event
();
...
...
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