Merge branch 'patch-sort-deck' of https://github.com/Fluorohydride/ygopro-core into 888

libduel.cpp

@@ -1465,14 +1465,14 @@ int32_t scriptlib::duel_confirm_cards(lua_State *L) {
 int32_t scriptlib::duel_sort_decktop(lua_State *L) {
 	check_action_permission(L);
 	check_param_count(L, 3);
-	uint32_t sort_player = (uint32_t)lua_tointeger(L, 1);
-	uint32_t target_player = (uint32_t)lua_tointeger(L, 2);
-	uint32_t count = (uint32_t)lua_tointeger(L, 3);
-	if(sort_player != 0 && sort_player != 1)
+	int32_t sort_player = (int32_t)lua_tointeger(L, 1);
+	int32_t target_player = (int32_t)lua_tointeger(L, 2);
+	int32_t count = (int32_t)lua_tointeger(L, 3);
+	if (!check_playerid(sort_player))
 		return 0;
-	if(target_player != 0 && target_player != 1)
+	if (!check_playerid(target_player))
 		return 0;
-	if(count < 1 || count > 16)
+	if (count < 1)
 		return 0;
 	duel* pduel = interpreter::get_duel_info(L);
 	pduel->game_field->add_process(PROCESSOR_SORT_DECK, 0, 0, 0, sort_player + (target_player << 16), count);

libgroup.cpp

@@ -368,12 +368,12 @@ int32_t scriptlib::group_random_select(lua_State *L) {
 	check_param(L, PARAM_TYPE_GROUP, 1);
 	group* pgroup = *(group**) lua_touserdata(L, 1);
 	int32_t playerid = (int32_t)lua_tointeger(L, 2);
-	uint32_t count = (uint32_t)lua_tointeger(L, 3);
+	int32_t count = (int32_t)lua_tointeger(L, 3);
 	int32_t no_hint = lua_toboolean(L, 4);
 	duel* pduel = pgroup->pduel;
 	group* newgroup = pduel->new_group();
-	if(count > pgroup->container.size())
-		count = (uint32_t)pgroup->container.size();
+	if (count > (int32_t)pgroup->container.size())
+		count = (int32_t)pgroup->container.size();
 	if(count == 0) {
 		interpreter::group2value(L, newgroup);
 		return 1;
@@ -381,12 +381,13 @@ int32_t scriptlib::group_random_select(lua_State *L) {
 	if(count == pgroup->container.size())
 		newgroup->container = pgroup->container;
 	else {
-		while(newgroup->container.size() < count) {
-			int32_t i = pduel->get_next_integer(0, (int32_t)pgroup->container.size() - 1);
-			auto cit = pgroup->container.begin();
-			std::advance(cit, i);
-			newgroup->container.insert(*cit);
+		card_vector cv(pgroup->container.begin(), pgroup->container.end());
+		int32_t back = (int32_t)cv.size() - 1;
+		for (int32_t i = 0; i < count; ++i) {
+			int32_t r = pduel->get_next_integer(i, back);
+			std::swap(cv[i], cv[r]);
 		}
+		newgroup->container.insert(cv.begin(), cv.begin() + count);
 	}
 	if(no_hint) {
 		interpreter::group2value(L, newgroup);

processor.cpp

@@ -675,15 +675,15 @@ uint32_t field::process() {
 			++it->step;
 		} else {
 			if(returns.bvalue[0] != 0xff) {
-				card* tc[16];
+				card* tc[256];
 				for(i = 0; i < count; ++i)
 					player[target_player].list_main.pop_back();
 				for(i = 0; i < count; ++i)
 					tc[returns.bvalue[i]] = core.select_cards[i];
 				for(i = 0; i < count; ++i) {
-					player[target_player].list_main.push_back(tc[count - i - 1]);
-					tc[count - i - 1]->current.sequence = (uint8_t)player[target_player].list_main.size() - 1;
+					player[target_player].list_main.push_back(tc[count - 1 - i]);
 				}
+				reset_sequence(target_player, LOCATION_DECK);
 				auto clit = player[target_player].list_main.rbegin();
 				for(i = 0; i < count; ++i, ++clit) {
 					card* pcard = *clit;