Commit 9d4ac1d3 authored by DailyShana's avatar DailyShana

update Card.IsCanBeFusionMaterial

parent 28156c4f
...@@ -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;
......
...@@ -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);
......
...@@ -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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment