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
9ecae394
Commit
9ecae394
authored
Aug 28, 2017
by
edo9300
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added temp parameter to card::is_can_add_counter
parent
181ccafe
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
5 deletions
+9
-5
card.cpp
card.cpp
+3
-3
card.h
card.h
+1
-1
libcard.cpp
libcard.cpp
+5
-1
No files found.
card.cpp
View file @
9ecae394
...
@@ -2124,7 +2124,7 @@ int32 card::destination_redirect(uint8 destination, uint32 reason) {
...
@@ -2124,7 +2124,7 @@ int32 card::destination_redirect(uint8 destination, uint32 reason) {
// cmit->second[0]: permanent
// cmit->second[0]: permanent
// cmit->second[1]: reset while negated
// cmit->second[1]: reset while negated
int32
card
::
add_counter
(
uint8
playerid
,
uint16
countertype
,
uint16
count
,
uint8
singly
)
{
int32
card
::
add_counter
(
uint8
playerid
,
uint16
countertype
,
uint16
count
,
uint8
singly
)
{
if
(
!
is_can_add_counter
(
playerid
,
countertype
,
count
,
singly
))
if
(
!
is_can_add_counter
(
playerid
,
countertype
,
count
,
singly
,
FALSE
))
return
FALSE
;
return
FALSE
;
uint16
cttype
=
countertype
&
~
COUNTER_NEED_ENABLE
;
uint16
cttype
=
countertype
&
~
COUNTER_NEED_ENABLE
;
auto
pr
=
counters
.
insert
(
std
::
make_pair
(
cttype
,
counter_map
::
mapped_type
()));
auto
pr
=
counters
.
insert
(
std
::
make_pair
(
cttype
,
counter_map
::
mapped_type
()));
...
@@ -2182,11 +2182,11 @@ int32 card::remove_counter(uint16 countertype, uint16 count) {
...
@@ -2182,11 +2182,11 @@ int32 card::remove_counter(uint16 countertype, uint16 count) {
pduel
->
write_buffer16
(
count
);
pduel
->
write_buffer16
(
count
);
return
TRUE
;
return
TRUE
;
}
}
int32
card
::
is_can_add_counter
(
uint8
playerid
,
uint16
countertype
,
uint16
count
,
uint8
singly
)
{
int32
card
::
is_can_add_counter
(
uint8
playerid
,
uint16
countertype
,
uint16
count
,
uint8
singly
,
uint8
temp
)
{
effect_set
eset
;
effect_set
eset
;
if
(
!
pduel
->
game_field
->
is_player_can_place_counter
(
playerid
,
this
,
countertype
,
count
))
if
(
!
pduel
->
game_field
->
is_player_can_place_counter
(
playerid
,
this
,
countertype
,
count
))
return
FALSE
;
return
FALSE
;
if
(
!
(
current
.
location
&
LOCATION_ONFIELD
)
||
!
is_position
(
POS_FACEUP
)
)
if
(
(
!
(
current
.
location
&
LOCATION_ONFIELD
)
||
!
is_position
(
POS_FACEUP
))
&&
!
temp
)
return
FALSE
;
return
FALSE
;
if
((
countertype
&
COUNTER_NEED_ENABLE
)
&&
is_status
(
STATUS_DISABLED
))
if
((
countertype
&
COUNTER_NEED_ENABLE
)
&&
is_status
(
STATUS_DISABLED
))
return
FALSE
;
return
FALSE
;
...
...
card.h
View file @
9ecae394
...
@@ -265,7 +265,7 @@ public:
...
@@ -265,7 +265,7 @@ public:
int32
destination_redirect
(
uint8
destination
,
uint32
reason
);
int32
destination_redirect
(
uint8
destination
,
uint32
reason
);
int32
add_counter
(
uint8
playerid
,
uint16
countertype
,
uint16
count
,
uint8
singly
);
int32
add_counter
(
uint8
playerid
,
uint16
countertype
,
uint16
count
,
uint8
singly
);
int32
remove_counter
(
uint16
countertype
,
uint16
count
);
int32
remove_counter
(
uint16
countertype
,
uint16
count
);
int32
is_can_add_counter
(
uint8
playerid
,
uint16
countertype
,
uint16
count
,
uint8
singly
);
int32
is_can_add_counter
(
uint8
playerid
,
uint16
countertype
,
uint16
count
,
uint8
singly
,
uint8
temp
);
int32
get_counter
(
uint16
countertype
);
int32
get_counter
(
uint16
countertype
);
void
set_material
(
card_set
*
materials
);
void
set_material
(
card_set
*
materials
);
void
add_card_target
(
card
*
pcard
);
void
add_card_target
(
card
*
pcard
);
...
...
libcard.cpp
View file @
9ecae394
...
@@ -2173,6 +2173,7 @@ int32 scriptlib::card_enable_counter_permit(lua_State *L) {
...
@@ -2173,6 +2173,7 @@ int32 scriptlib::card_enable_counter_permit(lua_State *L) {
prange
=
LOCATION_MZONE
;
prange
=
LOCATION_MZONE
;
else
else
prange
=
LOCATION_SZONE
|
LOCATION_FZONE
;
prange
=
LOCATION_SZONE
|
LOCATION_FZONE
;
prange
|=
LOCATION_GRAVE
+
LOCATION_REMOVED
+
LOCATION_EXTRA
+
LOCATION_OVERLAY
+
LOCATION_HAND
+
LOCATION_DECK
;
effect
*
peffect
=
pcard
->
pduel
->
new_effect
();
effect
*
peffect
=
pcard
->
pduel
->
new_effect
();
peffect
->
owner
=
pcard
;
peffect
->
owner
=
pcard
;
peffect
->
type
=
EFFECT_TYPE_SINGLE
;
peffect
->
type
=
EFFECT_TYPE_SINGLE
;
...
@@ -2218,7 +2219,10 @@ int32 scriptlib::card_is_can_add_counter(lua_State *L) {
...
@@ -2218,7 +2219,10 @@ int32 scriptlib::card_is_can_add_counter(lua_State *L) {
uint8
singly
=
FALSE
;
uint8
singly
=
FALSE
;
if
(
lua_gettop
(
L
)
>
3
)
if
(
lua_gettop
(
L
)
>
3
)
singly
=
lua_toboolean
(
L
,
4
);
singly
=
lua_toboolean
(
L
,
4
);
lua_pushboolean
(
L
,
pcard
->
is_can_add_counter
(
pcard
->
pduel
->
game_field
->
core
.
reason_player
,
countertype
,
count
,
singly
));
uint8
temp
=
FALSE
;
if
(
lua_gettop
(
L
)
>
4
)
temp
=
lua_toboolean
(
L
,
5
);
lua_pushboolean
(
L
,
pcard
->
is_can_add_counter
(
pcard
->
pduel
->
game_field
->
core
.
reason_player
,
countertype
,
count
,
singly
,
temp
));
return
1
;
return
1
;
}
}
int32
scriptlib
::
card_is_can_remove_counter
(
lua_State
*
L
)
{
int32
scriptlib
::
card_is_can_remove_counter
(
lua_State
*
L
)
{
...
...
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