Merge pull request #10 from DailyShana/patch-1

fix

card.cpp

@@ -2481,13 +2481,16 @@ int32 card::is_capable_be_effect_target(effect* peffect, uint8 playerid) {
 	}
 	return TRUE;
 }
-int32 card::is_can_be_fusion_material(uint8 ignore_mon) {
+int32 card::is_can_be_fusion_material(card* fcard, uint8 ignore_mon) {
 	if(!ignore_mon && !(get_type() & TYPE_MONSTER))
 		return FALSE;
 	if(is_affected_by_effect(EFFECT_FORBIDDEN))
 		return FALSE;
-	if(is_affected_by_effect(EFFECT_CANNOT_BE_FUSION_MATERIAL))
-		return FALSE;
+	effect_set eset;
+	filter_effect(EFFECT_CANNOT_BE_FUSION_MATERIAL, &eset);
+	for(int32 i = 0; i < eset.size(); ++i)
+		if(eset[i]->get_value(fcard))
+			return FALSE;
 	return TRUE;
 }
 int32 card::is_can_be_synchro_material(card* scard, card* tuner) {

card.h

@@ -254,7 +254,7 @@ public:
 	int32 is_control_can_be_changed();
 	int32 is_capable_be_battle_target(card* pcard);
 	int32 is_capable_be_effect_target(effect* peffect, uint8 playerid);
-	int32 is_can_be_fusion_material(uint8 ignore_mon = FALSE);
+	int32 is_can_be_fusion_material(card* fcard, uint8 ignore_mon = FALSE);
 	int32 is_can_be_synchro_material(card* scard, card* tuner = 0);
 	int32 is_can_be_ritual_material(card* scard);
 	int32 is_can_be_xyz_material(card* scard);

libcard.cpp

@@ -1857,10 +1857,15 @@ int32 scriptlib::card_is_can_be_fusion_material(lua_State *L) {
 	check_param_count(L, 1);
 	check_param(L, PARAM_TYPE_CARD, 1);
 	card* pcard = *(card**) lua_touserdata(L, 1);
+	card* fcard = 0;
 	uint32 ign = FALSE;
-	if(lua_gettop(L) >= 2)
-		ign = lua_toboolean(L, 2);
-	lua_pushboolean(L, pcard->is_can_be_fusion_material(ign));
+	if(lua_gettop(L) >= 2) {
+		check_param(L, PARAM_TYPE_CARD, 2);
+		fcard = *(card**)lua_touserdata(L, 2);
+	}
+	if(lua_gettop(L) >= 3)
+		ign = lua_toboolean(L, 3);
+	lua_pushboolean(L, pcard->is_can_be_fusion_material(fcard, ign));
 	return 1;
 }
 int32 scriptlib::card_is_can_be_synchro_material(lua_State *L) {