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

card.cpp

@@ -2949,13 +2949,14 @@ int32 card::is_spsummonable(effect* peffect) {
 		}
 		if(pduel->lua->check_condition(peffect->condition, param_count))
 			result = TRUE;
-	} else if(pduel->game_field->core.limit_link) {
+	} else if(pduel->game_field->core.limit_link || pduel->game_field->core.limit_link_card) {
 		pduel->lua->add_param(pduel->game_field->core.limit_link, PARAM_TYPE_GROUP);
-		uint32 param_count = 3;
+		pduel->lua->add_param(pduel->game_field->core.limit_link_card, PARAM_TYPE_CARD);
+		uint32 param_count = 4;
 		if(pduel->game_field->core.limit_link_minc) {
 			pduel->lua->add_param(pduel->game_field->core.limit_link_minc, PARAM_TYPE_INT);
 			pduel->lua->add_param(pduel->game_field->core.limit_link_maxc, PARAM_TYPE_INT);
-			param_count = 5;
+			param_count = 6;
 		}
 		if(pduel->lua->check_condition(peffect->condition, param_count))
 			result = TRUE;
@@ -3137,6 +3138,7 @@ int32 card::is_special_summonable(uint8 playerid, uint32 summon_type) {
 	pduel->game_field->core.limit_xyz_minc = 0;
 	pduel->game_field->core.limit_xyz_maxc = 0;
 	pduel->game_field->core.limit_link = 0;
+	pduel->game_field->core.limit_link_card = 0;
 	pduel->game_field->core.limit_link_minc = 0;
 	pduel->game_field->core.limit_link_maxc = 0;
 	pduel->game_field->restore_lp_cost();

field.cpp

@@ -99,6 +99,7 @@ field::field(duel* pduel) {
 	core.limit_xyz_minc = 0;
 	core.limit_xyz_maxc = 0;
 	core.limit_link = 0;
+	core.limit_link_card = 0;
 	core.limit_link_minc = 0;
 	core.limit_link_maxc = 0;
 	core.last_control_changed_id = 0;

field.h

@@ -270,6 +270,7 @@ struct processor {
 	int32 limit_xyz_minc;
 	int32 limit_xyz_maxc;
 	group* limit_link;
+	card* limit_link_card;
 	int32 limit_link_minc;
 	int32 limit_link_maxc;
 	uint8 attack_cancelable;

libcard.cpp

@@ -1347,7 +1347,7 @@ int32 scriptlib::card_remove_overlay_card(lua_State *L) {
 	pduel->game_field->remove_overlay_card(reason, pcard, playerid, 0, 0, min, max);
 	return lua_yieldk(L, 0, (lua_KContext)pduel, [](lua_State *L, int32 status, lua_KContext ctx) {
 		duel* pduel = (duel*)ctx;
-		lua_pushboolean(L, pduel->game_field->returns.ivalue[0]);
+		lua_pushinteger(L, pduel->game_field->returns.ivalue[0]);
 		return 1;
 	});
 }
@@ -2032,18 +2032,26 @@ int32 scriptlib::card_is_link_summonable(lua_State *L) {
 	if(!(pcard->data.type & TYPE_LINK))
 		return 0;
 	group* materials = 0;
+	card* lcard = 0;
 	if(!lua_isnil(L, 2)) {
 		check_param(L, PARAM_TYPE_GROUP, 2);
 		materials = *(group**)lua_touserdata(L, 2);
 	}
+	if(lua_gettop(L) >= 3) {
+		if(!lua_isnil(L, 3)) {
+			check_param(L, PARAM_TYPE_CARD, 3);
+			lcard = *(card**)lua_touserdata(L, 3);
+		}
+	}
 	int32 minc = 0;
-	if(lua_gettop(L) >= 3)
-		minc = lua_tointeger(L, 3);
-	int32 maxc = 0;
 	if(lua_gettop(L) >= 4)
-		maxc = lua_tointeger(L, 4);
+		minc = lua_tointeger(L, 4);
+	int32 maxc = 0;
+	if(lua_gettop(L) >= 5)
+		maxc = lua_tointeger(L, 5);
 	uint32 p = pcard->pduel->game_field->core.reason_player;
 	pcard->pduel->game_field->core.limit_link = materials;
+	pcard->pduel->game_field->core.limit_link_card = lcard;
 	pcard->pduel->game_field->core.limit_link_minc = minc;
 	pcard->pduel->game_field->core.limit_link_maxc = maxc;
 	lua_pushboolean(L, pcard->is_special_summonable(p, SUMMON_TYPE_LINK));

libduel.cpp

@@ -368,18 +368,26 @@ int32 scriptlib::duel_link_summon(lua_State *L) {
 		return 0;
 	card* pcard = *(card**)lua_touserdata(L, 2);
 	group* materials = 0;
+	card* lcard = 0;
 	if(!lua_isnil(L, 3)) {
 		check_param(L, PARAM_TYPE_GROUP, 3);
 		materials = *(group**)lua_touserdata(L, 3);
 	}
+	if(lua_gettop(L) >= 4) {
+		if(!lua_isnil(L, 4)) {
+			check_param(L, PARAM_TYPE_CARD, 4);
+			lcard = *(card**)lua_touserdata(L, 4);
+		}
+	}
 	int32 minc = 0;
-	if(lua_gettop(L) >= 4)
-		minc = lua_tointeger(L, 4);
-	int32 maxc = 0;
 	if(lua_gettop(L) >= 5)
-		maxc = lua_tointeger(L, 5);
+		minc = lua_tointeger(L, 5);
+	int32 maxc = 0;
+	if(lua_gettop(L) >= 6)
+		maxc = lua_tointeger(L, 6);
 	duel* pduel = pcard->pduel;
 	pduel->game_field->core.limit_link = materials;
+	pduel->game_field->core.limit_link_card = lcard;
 	pduel->game_field->core.limit_link_minc = minc;
 	pduel->game_field->core.limit_link_maxc = maxc;
 	pduel->game_field->core.summon_cancelable = FALSE;
@@ -3314,7 +3322,7 @@ int32 scriptlib::duel_remove_overlay_card(lua_State *L) {
 	pduel->game_field->remove_overlay_card(reason, 0, playerid, s, o, min, max);
 	return lua_yieldk(L, 0, (lua_KContext)pduel, [](lua_State *L, int32 status, lua_KContext ctx) {
 		duel* pduel = (duel*)ctx;
-		lua_pushboolean(L, pduel->game_field->returns.ivalue[0]);
+		lua_pushinteger(L, pduel->game_field->returns.ivalue[0]);
 		return 1;
 	});
 }

operations.cpp

@@ -765,8 +765,7 @@ int32 field::remove_overlay_card(uint16 step, uint32 reason, card* pcard, uint8
 		return FALSE;
 	}
 	case 1: {
-		effect* peffect = core.select_effects[returns.ivalue[0]];
-		if(peffect) {
+		if(effect* peffect = core.select_effects[returns.ivalue[0]]) {
 			tevent e;
 			e.event_cards = 0;
 			e.event_player = rplayer;
@@ -775,8 +774,23 @@ int32 field::remove_overlay_card(uint16 step, uint32 reason, card* pcard, uint8
 			e.reason_effect = core.reason_effect;
 			e.reason_player = rplayer;
 			solve_continuous(rplayer, peffect, e);
-			core.units.begin()->step = 3;
-			return FALSE;
+			core.units.begin()->peffect = peffect;
+		}
+		return FALSE;
+	}
+	case 2: {
+		uint16 cancelable = FALSE;
+		if(core.units.begin()->peffect) {
+			int32 replace_count = returns.ivalue[0];
+			if(replace_count >= max)
+				return TRUE;
+			min -= replace_count;
+			max -= replace_count;
+			if(min <= 0) {
+				cancelable = TRUE;
+				min = 0;
+			}
+			core.units.begin()->arg4 = replace_count;
 		}
 		core.select_cards.clear();
 		if(pcard) {
@@ -792,21 +806,18 @@ int32 field::remove_overlay_card(uint16 step, uint32 reason, card* pcard, uint8
 		pduel->write_buffer8(HINT_SELECTMSG);
 		pduel->write_buffer8(rplayer);
 		pduel->write_buffer32(519);
-		add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, rplayer, min + (max << 16));
+		add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, rplayer + (cancelable << 16), min + (max << 16));
 		return FALSE;
 	}
-	case 2: {
+	case 3: {
 		card_set cset;
 		for(int32 i = 0; i < returns.bvalue[0]; ++i)
 			cset.insert(core.select_cards[returns.bvalue[i + 1]]);
 		send_to(&cset, core.reason_effect, reason, rplayer, PLAYER_NONE, LOCATION_GRAVE, 0, POS_FACEUP);
 		return FALSE;
 	}
-	case 3: {
-		return FALSE;
-	}
 	case 4: {
-		returns.ivalue[0] = 1;
+		returns.ivalue[0] += core.units.begin()->arg4;
 		return TRUE;
 	}
 	}
@@ -2522,6 +2533,7 @@ int32 field::special_summon_rule(uint16 step, uint8 sumplayer, card* target, uin
 		int32 xminc = core.limit_xyz_minc;
 		int32 xmaxc = core.limit_xyz_maxc;
 		group* lmaterials = core.limit_link;
+		card* lcard = core.limit_link_card;
 		int32 lminc = core.limit_link_minc;
 		int32 lmaxc = core.limit_link_maxc;
 		target->filter_spsummon_procedure(sumplayer, &eset, summon_type);
@@ -2534,6 +2546,7 @@ int32 field::special_summon_rule(uint16 step, uint8 sumplayer, card* target, uin
 		core.limit_xyz_minc = xminc;
 		core.limit_xyz_maxc = xmaxc;
 		core.limit_link = lmaterials;
+		core.limit_link_card = lcard;
 		core.limit_link_minc = lminc;
 		core.limit_link_maxc = lmaxc;
 		if(!eset.size())
@@ -2573,8 +2586,9 @@ int32 field::special_summon_rule(uint16 step, uint8 sumplayer, card* target, uin
 					pduel->lua->add_param(core.limit_xyz_minc, PARAM_TYPE_INT);
 					pduel->lua->add_param(core.limit_xyz_maxc, PARAM_TYPE_INT);
 				}
-			} else if(core.limit_link) {
+			} else if(core.limit_link || core.limit_link_card) {
 				pduel->lua->add_param(core.limit_link, PARAM_TYPE_GROUP);
+				pduel->lua->add_param(core.limit_link_card, PARAM_TYPE_CARD);
 				if(core.limit_link_minc) {
 					pduel->lua->add_param(core.limit_link_minc, PARAM_TYPE_INT);
 					pduel->lua->add_param(core.limit_link_maxc, PARAM_TYPE_INT);
@@ -2625,9 +2639,11 @@ int32 field::special_summon_rule(uint16 step, uint8 sumplayer, card* target, uin
 					core.limit_xyz_maxc = 0;
 				}
 			}
-			if(core.limit_link) {
+			if(core.limit_link || core.limit_link_card) {
 				pduel->lua->add_param(core.limit_link, PARAM_TYPE_GROUP);
+				pduel->lua->add_param(core.limit_link_card, PARAM_TYPE_CARD);
 				core.limit_link = 0;
+				core.limit_link_card = 0;
 				if(core.limit_link_minc) {
 					pduel->lua->add_param(core.limit_link_minc, PARAM_TYPE_INT);
 					pduel->lua->add_param(core.limit_link_maxc, PARAM_TYPE_INT);