Merge branch 'master' of https://github.com/Fluorohydride/ygopro-core

card.cpp

@@ -1676,7 +1676,7 @@ int32 card::add_effect(effect* peffect) {
 		if((peffect->code == EFFECT_SET_ATTACK || peffect->code == EFFECT_SET_BASE_ATTACK) && !peffect->is_flag(EFFECT_FLAG_SINGLE_RANGE)) {
 			for(auto it = single_effect.begin(); it != single_effect.end();) {
 				auto rm = it++;
-				if((rm->second->code == EFFECT_SET_ATTACK || rm->second->code == EFFECT_SET_ATTACK_FINAL)
+				if((rm->second->code == EFFECT_SET_ATTACK || rm->second->code == EFFECT_SET_ATTACK_FINAL || rm->second->code == EFFECT_SET_BASE_ATTACK)
 				        && !rm->second->is_flag(EFFECT_FLAG_SINGLE_RANGE))
 					remove_effect(rm->second);
 			}
@@ -1692,7 +1692,7 @@ int32 card::add_effect(effect* peffect) {
 		if((peffect->code == EFFECT_SET_DEFENSE || peffect->code == EFFECT_SET_BASE_DEFENSE) && !peffect->is_flag(EFFECT_FLAG_SINGLE_RANGE)) {
 			for(auto it = single_effect.begin(); it != single_effect.end();) {
 				auto rm = it++;
-				if((rm->second->code == EFFECT_SET_DEFENSE || rm->second->code == EFFECT_SET_DEFENSE_FINAL)
+				if((rm->second->code == EFFECT_SET_DEFENSE || rm->second->code == EFFECT_SET_DEFENSE_FINAL || rm->second->code == EFFECT_SET_BASE_DEFENSE)
 				        && !rm->second->is_flag(EFFECT_FLAG_SINGLE_RANGE))
 					remove_effect(rm->second);
 			}

field.cpp

@@ -2864,9 +2864,9 @@ int32 field::is_player_can_discard_hand(uint8 playerid, card * pcard, effect * p
 	}
 	return TRUE;
 }
-int32 field::is_player_can_summon(uint8 playerid) {
+int32 field::is_player_can_action(uint8 playerid, uint32 actionlimit) {
 	effect_set eset;
-	filter_player_effect(playerid, EFFECT_CANNOT_SUMMON, &eset);
+	filter_player_effect(playerid, actionlimit, &eset);
 	for(int32 i = 0; i < eset.size(); ++i) {
 		if(!eset[i]->target)
 			return FALSE;

field.h

@@ -447,7 +447,7 @@ public:
 	int32 is_player_can_discard_deck(uint8 playerid, int32 count);
 	int32 is_player_can_discard_deck_as_cost(uint8 playerid, int32 count);
 	int32 is_player_can_discard_hand(uint8 playerid, card* pcard, effect* peffect, uint32 reason);
-	int32 is_player_can_summon(uint8 playerid);
+	int32 is_player_can_action(uint8 playerid, uint32 actionlimit);
 	int32 is_player_can_summon(uint32 sumtype, uint8 playerid, card* pcard, uint8 toplayer);
 	int32 is_player_can_mset(uint32 sumtype, uint8 playerid, card* pcard, uint8 toplayer);
 	int32 is_player_can_sset(uint8 playerid, card* pcard);

libcard.cpp

@@ -158,40 +158,90 @@ int32 scriptlib::card_is_set_card(lua_State *L) {
 	check_param_count(L, 2);
 	check_param(L, PARAM_TYPE_CARD, 1);
 	card* pcard = *(card**) lua_touserdata(L, 1);
-	uint32 set_code = lua_tointeger(L, 2);
-	lua_pushboolean(L, pcard->is_set_card(set_code));
+	uint32 count = lua_gettop(L) - 1;
+	uint32 result = FALSE;
+	for(uint32 i = 0; i < count; ++i) {
+		if(lua_isnil(L, i + 2))
+			continue;
+		uint32 set_code = lua_tointeger(L, i + 2);
+		if(pcard->is_set_card(set_code)) {
+			result = TRUE;
+			break;
+		}
+	}
+	lua_pushboolean(L, result);
 	return 1;
 }
 int32 scriptlib::card_is_origin_set_card(lua_State *L) {
 	check_param_count(L, 2);
 	check_param(L, PARAM_TYPE_CARD, 1);
 	card* pcard = *(card**) lua_touserdata(L, 1);
-	uint32 set_code = lua_tointeger(L, 2);
-	lua_pushboolean(L, pcard->is_origin_set_card(set_code));
+	uint32 count = lua_gettop(L) - 1;
+	uint32 result = FALSE;
+	for(uint32 i = 0; i < count; ++i) {
+		if(lua_isnil(L, i + 2))
+			continue;
+		uint32 set_code = lua_tointeger(L, i + 2);
+		if(pcard->is_origin_set_card(set_code)) {
+			result = TRUE;
+			break;
+		}
+	}
+	lua_pushboolean(L, result);
 	return 1;
 }
 int32 scriptlib::card_is_pre_set_card(lua_State *L) {
 	check_param_count(L, 2);
 	check_param(L, PARAM_TYPE_CARD, 1);
 	card* pcard = *(card**) lua_touserdata(L, 1);
-	uint32 set_code = lua_tointeger(L, 2);
-	lua_pushboolean(L, pcard->is_pre_set_card(set_code));
+	uint32 count = lua_gettop(L) - 1;
+	uint32 result = FALSE;
+	for(uint32 i = 0; i < count; ++i) {
+		if(lua_isnil(L, i + 2))
+			continue;
+		uint32 set_code = lua_tointeger(L, i + 2);
+		if(pcard->is_pre_set_card(set_code)) {
+			result = TRUE;
+			break;
+		}
+	}
+	lua_pushboolean(L, result);
 	return 1;
 }
 int32 scriptlib::card_is_fusion_set_card(lua_State *L) {
 	check_param_count(L, 2);
 	check_param(L, PARAM_TYPE_CARD, 1);
 	card* pcard = *(card**) lua_touserdata(L, 1);
-	uint32 set_code = lua_tointeger(L, 2);
-	lua_pushboolean(L, pcard->is_fusion_set_card(set_code));
+	uint32 count = lua_gettop(L) - 1;
+	uint32 result = FALSE;
+	for(uint32 i = 0; i < count; ++i) {
+		if(lua_isnil(L, i + 2))
+			continue;
+		uint32 set_code = lua_tointeger(L, i + 2);
+		if(pcard->is_fusion_set_card(set_code)) {
+			result = TRUE;
+			break;
+		}
+	}
+	lua_pushboolean(L, result);
 	return 1;
 }
 int32 scriptlib::card_is_link_set_card(lua_State *L) {
 	check_param_count(L, 2);
 	check_param(L, PARAM_TYPE_CARD, 1);
 	card* pcard = *(card**) lua_touserdata(L, 1);
-	uint32 set_code = lua_tointeger(L, 2);
-	lua_pushboolean(L, pcard->is_link_set_card(set_code));
+	uint32 count = lua_gettop(L) - 1;
+	uint32 result = FALSE;
+	for(uint32 i = 0; i < count; ++i) {
+		if(lua_isnil(L, i + 2))
+			continue;
+		uint32 set_code = lua_tointeger(L, i + 2);
+		if(pcard->is_link_set_card(set_code)) {
+			result = TRUE;
+			break;
+		}
+	}
+	lua_pushboolean(L, result);
 	return 1;
 }
 int32 scriptlib::card_get_type(lua_State *L) {

libduel.cpp

@@ -561,18 +561,23 @@ int32 scriptlib::duel_get_operated_group(lua_State *L) {
 	return 1;
 }
 int32 scriptlib::duel_is_can_add_counter(lua_State *L) {
-	check_param_count(L, 4);
+	check_param_count(L, 1);
 	int32 playerid = lua_tointeger(L, 1);
-	int32 countertype = lua_tointeger(L, 2);
-	int32 count = lua_tointeger(L, 3);
-	check_param(L, PARAM_TYPE_CARD, 4);
-	card* pcard = *(card**)lua_touserdata(L, 4);
 	if(playerid != 0 && playerid != 1) {
 		lua_pushboolean(L, 0);
 		return 1;
 	}
 	duel* pduel = interpreter::get_duel_info(L);
-	lua_pushboolean(L, pduel->game_field->is_player_can_place_counter(playerid, pcard, countertype, count));
+	if(lua_gettop(L) == 1)
+		lua_pushboolean(L, pduel->game_field->is_player_can_action(playerid, EFFECT_CANNOT_PLACE_COUNTER));
+	else {
+		check_param_count(L, 4);
+		int32 countertype = lua_tointeger(L, 2);
+		int32 count = lua_tointeger(L, 3);
+		check_param(L, PARAM_TYPE_CARD, 4);
+		card* pcard = *(card**) lua_touserdata(L, 4);
+		lua_pushboolean(L, pduel->game_field->is_player_can_place_counter(playerid, pcard, countertype, count));
+	}
 	return 1;
 }
 int32 scriptlib::duel_remove_counter(lua_State *L) {
@@ -3497,7 +3502,7 @@ int32 scriptlib::duel_is_player_can_summon(lua_State * L) {
 	}
 	duel* pduel = interpreter::get_duel_info(L);
 	if(lua_gettop(L) == 1)
-		lua_pushboolean(L, pduel->game_field->is_player_can_summon(playerid));
+		lua_pushboolean(L, pduel->game_field->is_player_can_action(playerid, EFFECT_CANNOT_SUMMON));
 	else {
 		check_param_count(L, 3);
 		check_param(L, PARAM_TYPE_CARD, 3);
@@ -3529,16 +3534,21 @@ int32 scriptlib::duel_is_player_can_spsummon(lua_State * L) {
 	return 1;
 }
 int32 scriptlib::duel_is_player_can_flipsummon(lua_State * L) {
-	check_param_count(L, 2);
+	check_param_count(L, 1);
 	int32 playerid = lua_tointeger(L, 1);
-	check_param(L, PARAM_TYPE_CARD, 2);
-	card* pcard = *(card**) lua_touserdata(L, 2);
 	if(playerid != 0 && playerid != 1) {
 		lua_pushboolean(L, 0);
 		return 1;
 	}
 	duel* pduel = interpreter::get_duel_info(L);
-	lua_pushboolean(L, pduel->game_field->is_player_can_flipsummon(playerid, pcard));
+	if(lua_gettop(L) == 1)
+		lua_pushboolean(L, pduel->game_field->is_player_can_action(playerid, EFFECT_CANNOT_FLIP_SUMMON));
+	else {
+		check_param_count(L, 2);
+		check_param(L, PARAM_TYPE_CARD, 2);
+		card* pcard = *(card**) lua_touserdata(L, 2);
+		lua_pushboolean(L, pduel->game_field->is_player_can_flipsummon(playerid, pcard));
+	}
 	return 1;
 }
 int32 scriptlib::duel_is_player_can_spsummon_monster(lua_State * L) {
@@ -3593,68 +3603,93 @@ int32 scriptlib::duel_is_player_can_spsummon_count(lua_State * L) {
 	return 1;
 }
 int32 scriptlib::duel_is_player_can_release(lua_State * L) {
-	check_param_count(L, 2);
+	check_param_count(L, 1);
 	int32 playerid = lua_tointeger(L, 1);
-	check_param(L, PARAM_TYPE_CARD, 2);
-	card* pcard = *(card**) lua_touserdata(L, 2);
 	if(playerid != 0 && playerid != 1) {
 		lua_pushboolean(L, 0);
 		return 1;
 	}
 	duel* pduel = interpreter::get_duel_info(L);
-	lua_pushboolean(L, pduel->game_field->is_player_can_release(playerid, pcard));
+	if(lua_gettop(L) == 1)
+		lua_pushboolean(L, pduel->game_field->is_player_can_action(playerid, EFFECT_CANNOT_RELEASE));
+	else {
+		check_param_count(L, 2);
+		check_param(L, PARAM_TYPE_CARD, 2);
+		card* pcard = *(card**) lua_touserdata(L, 2);
+		lua_pushboolean(L, pduel->game_field->is_player_can_release(playerid, pcard));
+	}
 	return 1;
 }
 int32 scriptlib::duel_is_player_can_remove(lua_State * L) {
-	check_param_count(L, 2);
+	check_param_count(L, 1);
 	int32 playerid = lua_tointeger(L, 1);
-	check_param(L, PARAM_TYPE_CARD, 2);
-	card* pcard = *(card**) lua_touserdata(L, 2);
 	if(playerid != 0 && playerid != 1) {
 		lua_pushboolean(L, 0);
 		return 1;
 	}
 	duel* pduel = interpreter::get_duel_info(L);
-	lua_pushboolean(L, pduel->game_field->is_player_can_remove(playerid, pcard));
+	if(lua_gettop(L) == 1)
+		lua_pushboolean(L, pduel->game_field->is_player_can_action(playerid, EFFECT_CANNOT_REMOVE));
+	else {
+		check_param_count(L, 2);
+		check_param(L, PARAM_TYPE_CARD, 2);
+		card* pcard = *(card**) lua_touserdata(L, 2);
+		lua_pushboolean(L, pduel->game_field->is_player_can_remove(playerid, pcard));
+	}
 	return 1;
 }
 int32 scriptlib::duel_is_player_can_send_to_hand(lua_State * L) {
-	check_param_count(L, 2);
+	check_param_count(L, 1);
 	int32 playerid = lua_tointeger(L, 1);
-	check_param(L, PARAM_TYPE_CARD, 2);
-	card* pcard = *(card**) lua_touserdata(L, 2);
 	if(playerid != 0 && playerid != 1) {
 		lua_pushboolean(L, 0);
 		return 1;
 	}
 	duel* pduel = interpreter::get_duel_info(L);
-	lua_pushboolean(L, pduel->game_field->is_player_can_send_to_hand(playerid, pcard));
+	if(lua_gettop(L) == 1)
+		lua_pushboolean(L, pduel->game_field->is_player_can_action(playerid, EFFECT_CANNOT_TO_HAND));
+	else {
+		check_param_count(L, 2);
+		check_param(L, PARAM_TYPE_CARD, 2);
+		card* pcard = *(card**) lua_touserdata(L, 2);
+		lua_pushboolean(L, pduel->game_field->is_player_can_send_to_hand(playerid, pcard));
+	}
 	return 1;
 }
 int32 scriptlib::duel_is_player_can_send_to_grave(lua_State * L) {
-	check_param_count(L, 2);
+	check_param_count(L, 1);
 	int32 playerid = lua_tointeger(L, 1);
-	check_param(L, PARAM_TYPE_CARD, 2);
-	card* pcard = *(card**) lua_touserdata(L, 2);
 	if(playerid != 0 && playerid != 1) {
 		lua_pushboolean(L, 0);
 		return 1;
 	}
 	duel* pduel = interpreter::get_duel_info(L);
-	lua_pushboolean(L, pduel->game_field->is_player_can_send_to_grave(playerid, pcard));
+	if(lua_gettop(L) == 1)
+		lua_pushboolean(L, pduel->game_field->is_player_can_action(playerid, EFFECT_CANNOT_TO_GRAVE));
+	else {
+		check_param_count(L, 2);
+		check_param(L, PARAM_TYPE_CARD, 2);
+		card* pcard = *(card**) lua_touserdata(L, 2);
+		lua_pushboolean(L, pduel->game_field->is_player_can_send_to_grave(playerid, pcard));
+	}
 	return 1;
 }
 int32 scriptlib::duel_is_player_can_send_to_deck(lua_State * L) {
-	check_param_count(L, 2);
+	check_param_count(L, 1);
 	int32 playerid = lua_tointeger(L, 1);
-	check_param(L, PARAM_TYPE_CARD, 2);
-	card* pcard = *(card**) lua_touserdata(L, 2);
 	if(playerid != 0 && playerid != 1) {
 		lua_pushboolean(L, 0);
 		return 1;
 	}
 	duel* pduel = interpreter::get_duel_info(L);
-	lua_pushboolean(L, pduel->game_field->is_player_can_send_to_deck(playerid, pcard));
+	if(lua_gettop(L) == 1)
+		lua_pushboolean(L, pduel->game_field->is_player_can_action(playerid, EFFECT_CANNOT_TO_DECK));
+	else {
+		check_param_count(L, 2);
+		check_param(L, PARAM_TYPE_CARD, 2);
+		card* pcard = *(card**) lua_touserdata(L, 2);
+		lua_pushboolean(L, pduel->game_field->is_player_can_send_to_deck(playerid, pcard));
+	}
 	return 1;
 }
 int32 scriptlib::duel_is_player_can_additional_summon(lua_State * L) {

operations.cpp

@@ -4257,6 +4257,10 @@ int32 field::move_to_field(uint16 step, card* target, uint32 enable, uint32 ret,
 					}
 				}
 			}
+			if(ret == 2) {
+				returns.bvalue[2] = target->previous.sequence;
+				return FALSE;
+			}
 			if(move_player == playerid) {
 				if(location == LOCATION_SZONE)
 					flag = ((flag & 0xff) << 8) | 0xffff00ff;