Merge branch 'master' into server

.ci/assets-locale.sh

@@ -4,7 +4,7 @@ set -o errexit
 source .ci/asset-branch
 # ygopro-database
 apt update && apt -y install wget git libarchive-tools sqlite3
-git clone --depth=1 -b "$ASSET_BRANCH_NAME" https://code.moenext.com/mycard/ygopro-database
+git clone --depth=1 -b master https://code.moenext.com/nanahira/ygopro-database
 cp -rf ./ygopro-database/locales/$TARGET_LOCALE/strings.conf .
 cp -rf ./ygopro-database/locales/$TARGET_LOCALE/servers.conf .
 rm -f cards.cdb

gframe/replay_mode.cpp

@@ -183,9 +183,9 @@ bool ReplayMode::StartDuel() {
 		BufferIO::EncodeUTF8(cur_replay.players[i].c_str(), player_name_buf_u);
 		std::snprintf(player_key_buf, sizeof(player_key_buf), "player_name_%d", i);
 		set_registry_value(pduel, player_key_buf, player_name_buf_u);
-		std::snprintf(player_key_buf, sizeof(player_key_buf), "player_type_%d", i);
-		set_registry_value(pduel, player_key_buf, std::to_string(i).c_str());
 	}
+	set_registry_value(pduel, "player_type_0", "0");
+	set_registry_value(pduel, "player_type_1", "1");
 	mainGame->dInfo.duel_rule = cur_replay.params.duel_flag >> 16;
 	set_player_info(pduel, 0, cur_replay.params.start_lp, cur_replay.params.start_hand, cur_replay.params.draw_count);
 	set_player_info(pduel, 1, cur_replay.params.start_lp, cur_replay.params.start_hand, cur_replay.params.draw_count);

gframe/single_duel.cpp

@@ -612,9 +612,9 @@ void SingleDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
 		BufferIO::EncodeUTF8(player_name_buf, player_name_buf_u);
 		std::snprintf(player_key_buf, sizeof(player_key_buf), "player_name_%d", i);
 		set_registry_value(pduel, player_key_buf, player_name_buf_u);
-		std::snprintf(player_key_buf, sizeof(player_key_buf), "player_type_%d", i);
-		set_registry_value(pduel, player_key_buf, std::to_string(players[i]->type).c_str());
 	}
+	set_registry_value(pduel, "player_type_0", swapped ? "1" : "0");
+	set_registry_value(pduel, "player_type_1", swapped ? "0" : "1");
 	set_player_info(pduel, 0, host_info.start_lp, host_info.start_hand, host_info.draw_count);
 	set_player_info(pduel, 1, host_info.start_lp, host_info.start_hand, host_info.draw_count);
 	preload_script(pduel, "./script/special.lua");

gframe/single_mode.cpp

@@ -53,6 +53,12 @@ int SingleMode::SinglePlayThread() {
 	set_message_handler(SingleMode::MessageHandler);
 	pduel = create_duel_v2(duel_seed);
 	mainGame->InjectEnvToRegistry(pduel);
+	set_registry_value(pduel, "duel_mode", "puzzle");
+	set_registry_value(pduel, "start_lp", std::to_string(start_lp).c_str());
+	set_registry_value(pduel, "start_hand", std::to_string(start_hand).c_str());
+	set_registry_value(pduel, "draw_count", std::to_string(draw_count).c_str());
+	set_registry_value(pduel, "player_type_0", swapped ? "1" : "0");
+	set_registry_value(pduel, "player_type_1", swapped ? "0" : "1");
 	set_player_info(pduel, 0, start_lp, start_hand, draw_count);
 	set_player_info(pduel, 1, start_lp, start_hand, draw_count);
 	preload_script(pduel, "./script/special.lua");

gframe/tag_duel.cpp

@@ -583,14 +583,14 @@ void TagDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
 	wchar_t player_name_buf[40];
 	char player_name_buf_u[40];
 	char player_key_buf[23];
-	for(int i = 0; i < 2; ++i) {
+	for(int i = 0; i < 4; ++i) {
 		BufferIO::CopyCharArray(players[i]->name, player_name_buf);
 		BufferIO::EncodeUTF8(player_name_buf, player_name_buf_u);
 		std::snprintf(player_key_buf, sizeof(player_key_buf), "player_name_%d", i);
 		set_registry_value(pduel, player_key_buf, player_name_buf_u);
-		std::snprintf(player_key_buf, sizeof(player_key_buf), "player_type_%d", i);
-		set_registry_value(pduel, player_key_buf, std::to_string(players[i]->type).c_str());
 	}
+	set_registry_value(pduel, "player_type_0", swapped ? "1" : "0");
+	set_registry_value(pduel, "player_type_1", swapped ? "0" : "1");
 	set_player_info(pduel, 0, host_info.start_lp, host_info.start_hand, host_info.draw_count);
 	set_player_info(pduel, 1, host_info.start_lp, host_info.start_hand, host_info.draw_count);
 	preload_script(pduel, "./script/special.lua");

system.conf

@@ -4,7 +4,7 @@ use_d3d = 0
 use_image_scale = 1
 use_image_scale_multi_thread = 1
 use_image_load_background_thread = 0
-pro_version = 4961
+pro_version = 4962
 freever = 1
 antialias = 2
 errorlog = 3