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
a582a45f
Commit
a582a45f
authored
Apr 29, 2024
by
wind2009
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'upstream/master' into develop
parents
9ee4ea52
6b6d7ea0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
duel.cpp
duel.cpp
+1
-1
operations.cpp
operations.cpp
+2
-1
No files found.
duel.cpp
View file @
a582a45f
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
#include "group.h"
#include "group.h"
#include "ocgapi.h"
#include "ocgapi.h"
inline
void
write_buffer_vector
(
std
::
vector
<
byte
>&
buffer
,
const
void
*
&
data
,
int
size
)
{
inline
void
write_buffer_vector
(
std
::
vector
<
byte
>&
buffer
,
const
void
*
data
,
int
size
)
{
if
(
size
>
0
)
{
if
(
size
>
0
)
{
const
auto
len
=
buffer
.
size
();
const
auto
len
=
buffer
.
size
();
buffer
.
resize
(
len
+
size
);
buffer
.
resize
(
len
+
size
);
...
...
operations.cpp
View file @
a582a45f
...
@@ -3906,7 +3906,7 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
...
@@ -3906,7 +3906,7 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
uint8
dest
=
pcard
->
sendto_param
.
location
;
uint8
dest
=
pcard
->
sendto_param
.
location
;
if
(
!
(
reason
&
REASON_RULE
)
&&
if
(
!
(
reason
&
REASON_RULE
)
&&
(
pcard
->
get_status
(
STATUS_SUMMONING
|
STATUS_SPSUMMON_STEP
)
(
pcard
->
get_status
(
STATUS_SUMMONING
|
STATUS_SPSUMMON_STEP
)
||
(
!
(
pcard
->
current
.
reason
&
(
REASON_COST
|
REASON_SUMMON
|
REASONS_PROCEDURE
)
)
&&
!
pcard
->
is_affect_by_effect
(
pcard
->
current
.
reason_effect
))
||
(
(
pcard
->
current
.
reason
&
REASON_EFFECT
)
&&
!
pcard
->
is_affect_by_effect
(
pcard
->
current
.
reason_effect
))
||
(
dest
==
LOCATION_HAND
&&
!
pcard
->
is_capable_send_to_hand
(
core
.
reason_player
))
||
(
dest
==
LOCATION_HAND
&&
!
pcard
->
is_capable_send_to_hand
(
core
.
reason_player
))
||
(
dest
==
LOCATION_DECK
&&
!
pcard
->
is_capable_send_to_deck
(
core
.
reason_player
,
send_activating
))
||
(
dest
==
LOCATION_DECK
&&
!
pcard
->
is_capable_send_to_deck
(
core
.
reason_player
,
send_activating
))
||
(
dest
==
LOCATION_REMOVED
&&
!
pcard
->
is_removeable
(
core
.
reason_player
,
pcard
->
sendto_param
.
position
,
reason
))
||
(
dest
==
LOCATION_REMOVED
&&
!
pcard
->
is_removeable
(
core
.
reason_player
,
pcard
->
sendto_param
.
position
,
reason
))
...
@@ -3926,6 +3926,7 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
...
@@ -3926,6 +3926,7 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
return
FALSE
;
return
FALSE
;
}
}
case
1
:
{
case
1
:
{
// the entrance of release, destroy
for
(
auto
&
pcard
:
targets
->
container
)
{
for
(
auto
&
pcard
:
targets
->
container
)
{
add_process
(
PROCESSOR_SENDTO_REPLACE
,
0
,
nullptr
,
targets
,
0
,
0
,
0
,
0
,
pcard
);
add_process
(
PROCESSOR_SENDTO_REPLACE
,
0
,
nullptr
,
targets
,
0
,
0
,
0
,
0
,
pcard
);
}
}
...
...
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