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
9d4ac1d3
Commit
9d4ac1d3
authored
Dec 19, 2016
by
DailyShana
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update Card.IsCanBeFusionMaterial
parent
28156c4f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
8 deletions
+3
-8
card.cpp
card.cpp
+1
-3
card.h
card.h
+1
-1
libcard.cpp
libcard.cpp
+1
-4
No files found.
card.cpp
View file @
9d4ac1d3
...
@@ -2944,9 +2944,7 @@ int32 card::is_capable_be_effect_target(effect* peffect, uint8 playerid) {
...
@@ -2944,9 +2944,7 @@ int32 card::is_capable_be_effect_target(effect* peffect, uint8 playerid) {
}
}
return
TRUE
;
return
TRUE
;
}
}
int32
card
::
is_can_be_fusion_material
(
card
*
fcard
,
uint8
ignore_mon
)
{
int32
card
::
is_can_be_fusion_material
(
card
*
fcard
)
{
if
(
!
ignore_mon
&&
!
(
get_type
()
&
TYPE_MONSTER
))
return
FALSE
;
if
(
is_status
(
STATUS_FORBIDDEN
))
if
(
is_status
(
STATUS_FORBIDDEN
))
return
FALSE
;
return
FALSE
;
effect_set
eset
;
effect_set
eset
;
...
...
card.h
View file @
9d4ac1d3
...
@@ -283,7 +283,7 @@ public:
...
@@ -283,7 +283,7 @@ public:
int32
is_control_can_be_changed
();
int32
is_control_can_be_changed
();
int32
is_capable_be_battle_target
(
card
*
pcard
);
int32
is_capable_be_battle_target
(
card
*
pcard
);
int32
is_capable_be_effect_target
(
effect
*
peffect
,
uint8
playerid
);
int32
is_capable_be_effect_target
(
effect
*
peffect
,
uint8
playerid
);
int32
is_can_be_fusion_material
(
card
*
fcard
,
uint8
ignore_mon
=
FALSE
);
int32
is_can_be_fusion_material
(
card
*
fcard
);
int32
is_can_be_synchro_material
(
card
*
scard
,
card
*
tuner
=
0
);
int32
is_can_be_synchro_material
(
card
*
scard
,
card
*
tuner
=
0
);
int32
is_can_be_ritual_material
(
card
*
scard
);
int32
is_can_be_ritual_material
(
card
*
scard
);
int32
is_can_be_xyz_material
(
card
*
scard
);
int32
is_can_be_xyz_material
(
card
*
scard
);
...
...
libcard.cpp
View file @
9d4ac1d3
...
@@ -2000,14 +2000,11 @@ int32 scriptlib::card_is_can_be_fusion_material(lua_State *L) {
...
@@ -2000,14 +2000,11 @@ int32 scriptlib::card_is_can_be_fusion_material(lua_State *L) {
check_param
(
L
,
PARAM_TYPE_CARD
,
1
);
check_param
(
L
,
PARAM_TYPE_CARD
,
1
);
card
*
pcard
=
*
(
card
**
)
lua_touserdata
(
L
,
1
);
card
*
pcard
=
*
(
card
**
)
lua_touserdata
(
L
,
1
);
card
*
fcard
=
0
;
card
*
fcard
=
0
;
uint32
ign
=
FALSE
;
if
(
lua_gettop
(
L
)
>=
2
&&
!
lua_isnil
(
L
,
2
))
{
if
(
lua_gettop
(
L
)
>=
2
&&
!
lua_isnil
(
L
,
2
))
{
check_param
(
L
,
PARAM_TYPE_CARD
,
2
);
check_param
(
L
,
PARAM_TYPE_CARD
,
2
);
fcard
=
*
(
card
**
)
lua_touserdata
(
L
,
2
);
fcard
=
*
(
card
**
)
lua_touserdata
(
L
,
2
);
}
}
if
(
lua_gettop
(
L
)
>=
3
)
lua_pushboolean
(
L
,
pcard
->
is_can_be_fusion_material
(
fcard
));
ign
=
lua_toboolean
(
L
,
3
);
lua_pushboolean
(
L
,
pcard
->
is_can_be_fusion_material
(
fcard
,
ign
));
return
1
;
return
1
;
}
}
int32
scriptlib
::
card_is_can_be_synchro_material
(
lua_State
*
L
)
{
int32
scriptlib
::
card_is_can_be_synchro_material
(
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