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
c2aa4457
Commit
c2aa4457
authored
Feb 09, 2021
by
mercury233
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://github.com/Fluorohydride/ygopro-core
parents
df62f4f6
f05ea027
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
effect.cpp
effect.cpp
+3
-1
libcard.cpp
libcard.cpp
+1
-0
No files found.
effect.cpp
View file @
c2aa4457
...
...
@@ -261,6 +261,8 @@ int32 effect::is_activateable(uint8 playerid, const tevent& e, int32 neglect_con
card
*
phandler
=
get_handler
();
if
(
!
(
phandler
->
get_type
()
&
TYPE_MONSTER
)
&&
(
get_active_type
()
&
TYPE_MONSTER
))
return
FALSE
;
if
((
phandler
->
get_type
()
&
TYPE_CONTINUOUS
)
&&
(
phandler
->
get_type
()
&
TYPE_EQUIP
))
return
FALSE
;
if
(
!
neglect_faceup
&&
(
phandler
->
current
.
location
&
(
LOCATION_ONFIELD
|
LOCATION_REMOVED
)))
{
if
(
!
phandler
->
is_position
(
POS_FACEUP
)
&&
!
is_flag
(
EFFECT_FLAG_SET_AVAILABLE
))
return
FALSE
;
...
...
@@ -580,7 +582,7 @@ int32 effect::reset(uint32 reset_level, uint32 reset_type) {
case
RESET_PHASE
:
{
if
(
!
(
reset_flag
&
RESET_PHASE
))
return
FALSE
;
uint8
pid
=
get_
handl
er_player
();
uint8
pid
=
get_
own
er_player
();
uint8
tp
=
handler
->
pduel
->
game_field
->
infos
.
turn_player
;
if
((((
reset_flag
&
RESET_SELF_TURN
)
&&
pid
==
tp
)
||
((
reset_flag
&
RESET_OPPO_TURN
)
&&
pid
!=
tp
))
&&
(
reset_level
&
0x3ff
&
reset_flag
))
...
...
libcard.cpp
View file @
c2aa4457
...
...
@@ -1745,6 +1745,7 @@ int32 scriptlib::card_register_flag_effect(lua_State *L) {
reset
|=
(
RESET_SELF_TURN
|
RESET_OPPO_TURN
);
duel
*
pduel
=
pcard
->
pduel
;
effect
*
peffect
=
pduel
->
new_effect
();
peffect
->
effect_owner
=
pduel
->
game_field
->
core
.
reason_player
;
peffect
->
owner
=
pcard
;
peffect
->
handler
=
0
;
peffect
->
type
=
EFFECT_TYPE_SINGLE
;
...
...
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