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
98e816b4
Commit
98e816b4
authored
Nov 21, 2020
by
mercury233
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://github.com/Fluorohydride/ygopro-core
parents
6e3877dc
c4bee07e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
common.h
common.h
+1
-1
operations.cpp
operations.cpp
+2
-2
No files found.
common.h
View file @
98e816b4
...
@@ -155,7 +155,7 @@ struct card_sort {
...
@@ -155,7 +155,7 @@ struct card_sort {
#define REASON_REPLACE 0x1000000 //
#define REASON_REPLACE 0x1000000 //
#define REASON_DRAW 0x2000000 //
#define REASON_DRAW 0x2000000 //
#define REASON_REDIRECT 0x4000000 //
#define REASON_REDIRECT 0x4000000 //
//#define REASON_REVEAL
0x8000000 //
#define REASON_LOST_OVERLAY
0x8000000 //
#define REASON_LINK 0x10000000 //
#define REASON_LINK 0x10000000 //
//Status
//Status
...
...
operations.cpp
View file @
98e816b4
...
@@ -4270,7 +4270,7 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
...
@@ -4270,7 +4270,7 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
if(equipings.size())
if(equipings.size())
destroy(&equipings, 0, REASON_RULE + REASON_LOST_TARGET, PLAYER_NONE);
destroy(&equipings, 0, REASON_RULE + REASON_LOST_TARGET, PLAYER_NONE);
if(overlays.size())
if(overlays.size())
send_to
(
&
overlays
,
0
,
REASON_RULE
+
REASON_LOST_
TARGET
,
PLAYER_NONE
,
PLAYER_NONE
,
LOCATION_GRAVE
,
0
,
POS_FACEUP
);
send_to(&overlays, 0, REASON_RULE + REASON_LOST_
OVERLAY
, PLAYER_NONE, PLAYER_NONE, LOCATION_GRAVE, 0, POS_FACEUP);
adjust_instant();
adjust_instant();
return FALSE;
return FALSE;
}
}
...
@@ -4580,7 +4580,7 @@ int32 field::move_to_field(uint16 step, card* target, uint32 enable, uint32 ret,
...
@@ -4580,7 +4580,7 @@ int32 field::move_to_field(uint16 step, card* target, uint32 enable, uint32 ret,
if(target->xyz_materials.size()) {
if(target->xyz_materials.size()) {
card_set overlays;
card_set overlays;
overlays.insert(target->xyz_materials.begin(), target->xyz_materials.end());
overlays.insert(target->xyz_materials.begin(), target->xyz_materials.end());
send_to
(
&
overlays
,
0
,
REASON_LOST_
TARGET
+
REASON_RULE
,
PLAYER_NONE
,
PLAYER_NONE
,
LOCATION_GRAVE
,
0
,
POS_FACEUP
);
send_to(&overlays, 0, REASON_LOST_
OVERLAY
+ REASON_RULE, PLAYER_NONE, PLAYER_NONE, LOCATION_GRAVE, 0, POS_FACEUP);
}
}
}
}
if((target->previous.location == LOCATION_SZONE) && target->equiping_target)
if((target->previous.location == LOCATION_SZONE) && target->equiping_target)
...
...
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