Merge branch 'master' into another

.gitignore

@@ -80,6 +80,7 @@
 .vscode
 core*
 /bak/
+/.vs
 /bug.txt
 /output
 /temp
@@ -90,3 +91,6 @@ core*
 /*.bat
 /*.sh
 /*.sql
+/patch.exe.manifest
+/patch.exe
+/diff.exe

gframe/drawing.cpp

@@ -984,7 +984,7 @@ void Game::DrawSpec() {
 			break;
 		}
 		}
-		if (auto_watch_mode && showcardcode < 8 && showcardcode > 0) {
+		if (auto_watch_mode && showcardp < 8 && showcardp > 0 && showcardcode > 100) {
 			mainGame->ShowCardInfo(showcardcode);
 		}
 	}

gframe/duelclient.cpp

@@ -3075,7 +3075,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 		}
 		if (auto_watch_mode) {
 			int code = mainGame->dField.chains[ct - 1].chain_card->code;
-			if (code > 0)
 			mainGame->ShowCardInfo(code);
 		}
 		mainGame->dField.last_chain = false;
@@ -3148,7 +3147,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 			int s = BufferIO::ReadInt8(pbuf);
 			/*int ss = */BufferIO::ReadInt8(pbuf);
 			ClientCard* pcard = mainGame->dField.GetCard(c, l, s);
-			if (auto_watch_mode && i == 0 && pcard->code > 0 ) {
+			if (auto_watch_mode && i == 0) {
 				mainGame->ShowCardInfo(pcard->code);
 			}
 			pcard->is_highlighting = true;

gframe/game.cpp

@@ -116,7 +116,7 @@ bool Game::Initialize() {
 	SetWindowsIcon();
 	//main menu
 	wchar_t strbuf[256];
-	myswprintf(strbuf, L"KoishiPro Another %X.0%X.%X Nemesis", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
+	myswprintf(strbuf, L"KoishiPro Another %X.0%X.%X Sakura", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
 	wMainMenu = env->addWindow(rect<s32>(370, 200, 650, 415), false, strbuf);
 	wMainMenu->getCloseButton()->setVisible(false);
 	btnLanMode = env->addButton(rect<s32>(10, 30, 270, 60), wMainMenu, BUTTON_LAN_MODE, dataManager.GetSysString(1200));

gframe/replay_mode.cpp

@@ -238,7 +238,13 @@ void ReplayMode::EndDuel() {
 			mainGame->HideElement(mainGame->wCardSelect);
 		mainGame->PopupElement(mainGame->wMessage);
 		mainGame->gMutex.unlock();
+		if(auto_watch_mode) {
+			mainGame->actionSignal.Wait(2000);
+			mainGame->device->closeDevice();
+		}
+		else {
 			mainGame->actionSignal.Wait();
+		}
 		mainGame->gMutex.lock();
 		mainGame->dInfo.isStarted = false;
 		mainGame->dInfo.isFinished = true;
@@ -315,7 +321,13 @@ bool ReplayMode::ReplayAnalyze(char* msg, unsigned int len) {
 			mainGame->PopupElement(mainGame->wMessage);
 			mainGame->gMutex.unlock();
 			mainGame->actionSignal.Reset();
+			if (auto_watch_mode){
+				mainGame->actionSignal.Wait(2000);
+				mainGame->device->closeDevice();
+			}
+			else{
 				mainGame->actionSignal.Wait();
+			}
 			return false;
 		}
 		case MSG_HINT: {

ocgcore @ 565f2fa9

-Subproject commit da0cd22bbb58d6a871a3f8517eaf91b0bd4fbff5
+Subproject commit 565f2fa94dd4caead3345b3257e1bcaacd760e72

premake/gframe/ygopro.rc

@@ -16,8 +16,8 @@ VALUE "InternalName", "KoishiPro Another"
 VALUE "LegalCopyright", "Copyright (C) 2019 Nanahira"
 VALUE "OriginalFilename", "ygopro_another.exe"
 VALUE "ProductName", "KoishiPro Another"
-VALUE "FileVersion", "Nemesis"
-VALUE "ProductVersion", "Nemesis"
+VALUE "FileVersion", "Sakura"
+VALUE "ProductVersion", "Sakura"
 END
 END
 BLOCK "VarFileInfo"

script @ 256df5d2

-Subproject commit feb9ce79cb5d52ae6ec047d467befec49329d601
+Subproject commit 256df5d276033dd6a8b796ae6c53c136aac965be

strings.conf

@@ -992,7 +992,8 @@
 !setname 0x120 调皮宝贝	プランキッズ
 !setname 0x121 魔妖
 !setname 0x122 女武神	ワルキューレ
-!setname 0x123 蔷薇龙	ローズ・ドラゴン
+!setname 0x123 蔷薇	ローズ
+!setname 0x1123 蔷薇龙	ローズ・ドラゴン
 !setname 0x124 机械天使	機械天使
 !setname 0x125 笑容	スマイル
 !setname 0x126 时间潜行者	クロノダイバー
@@ -1011,3 +1012,7 @@
 !setname 0x132 斩机	斬機
 !setname 0x133 半龙女仆	ドラゴンメイド
 !setname 0x134 王战	ジェネレイド
+!setname 0x135 @火灵天星	@イグニスター
+!setname 0x136 “艾”	Ai（アイ）
+!setname 0x137 战华	戦華
+!setname 0x138 巨石遗物	メガリス