Merge branch 'server' of https://github.com/purerosefallen/ygopro

.gitignore

@@ -79,6 +79,7 @@
 .vscode
 core*
 /bak/
+/.vs
 /bug.txt
 /output
 /temp
@@ -89,3 +90,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

@@ -253,6 +253,9 @@ int DuelClient::ClientThread() {
 void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
 	char* pdata = data;
 	unsigned char pktType = BufferIO::ReadUInt8(pdata);
+#ifdef YGOPRO_MESSAGE_DEBUG
+	printf("STOC: %d Length: %d\n", pktType, len);
+#endif
 	switch(pktType) {
 	case STOC_GAME_MSG: {
 		ClientAnalyze(pdata, len - 1);
@@ -960,6 +963,9 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 	char* pbuf = msg;
 	wchar_t textBuffer[256];
 	mainGame->dInfo.curMsg = BufferIO::ReadUInt8(pbuf);
+#ifdef YGOPRO_MESSAGE_DEBUG
+	printf("MSG: %d Length: %d\n", mainGame->dInfo.curMsg, len);
+#endif
 	if(mainGame->dInfo.curMsg != MSG_RETRY) {
 		memcpy(last_successful_msg, msg, len);
 		last_successful_msg_length = len;
@@ -3027,8 +3033,7 @@ 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->ShowCardInfo(code);
 		}
 		mainGame->dField.last_chain = false;
 		return true;
@@ -3100,7 +3105,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/duelclient.h

@@ -59,6 +59,9 @@ public:
 		char* p = duel_client_write;
 		BufferIO::WriteInt16(p, 1);
 		BufferIO::WriteInt8(p, proto);
+#ifdef YGOPRO_MESSAGE_DEBUG
+		printf("CTOS: %d\n", proto);
+#endif
 		bufferevent_write(client_bev, duel_client_write, 3);
 	}
 	template<typename ST>
@@ -67,6 +70,9 @@ public:
 		BufferIO::WriteInt16(p, 1 + sizeof(ST));
 		BufferIO::WriteInt8(p, proto);
 		memcpy(p, &st, sizeof(ST));
+#ifdef YGOPRO_MESSAGE_DEBUG
+		printf("CTOS: %d Length: %d\n", proto, sizeof(ST));
+#endif
 		bufferevent_write(client_bev, duel_client_write, sizeof(ST) + 3);
 	}
 	static void SendBufferToServer(unsigned char proto, void* buffer, size_t len) {
@@ -74,6 +80,9 @@ public:
 		BufferIO::WriteInt16(p, 1 + len);
 		BufferIO::WriteInt8(p, proto);
 		memcpy(p, buffer, len);
+#ifdef YGOPRO_MESSAGE_DEBUG
+		printf("CTOS: %d Length: %d\n", proto, len);
+#endif
 		bufferevent_write(client_bev, duel_client_write, len + 3);
 	}
 	

gframe/game.cpp

@@ -149,7 +149,7 @@ bool Game::Initialize() {
 	SetWindowsIcon();
 	//main menu
 	wchar_t strbuf[256];
-	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Scarlet", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
+	myswprintf(strbuf, L"KoishiPro %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();
-		mainGame->actionSignal.Wait();
+		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();
-			mainGame->actionSignal.Wait();
+			if (auto_watch_mode){
+				mainGame->actionSignal.Wait(2000);
+				mainGame->device->closeDevice();
+			}
+			else{
+				mainGame->actionSignal.Wait();
+			}
 			return false;
 		}
 		case MSG_HINT: {

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 巨石遗物	メガリス