Merge branch 'fh' into link

gframe/duelclient.cpp

@@ -1154,9 +1154,16 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 			pcard->is_highlighting = true;
 			mainGame->dField.highlighting_card = pcard;
 		}
-		wchar_t ynbuf[256];
-		myswprintf(ynbuf, dataManager.GetSysString(200), dataManager.FormatLocation(l, s), dataManager.GetName(code));
-		myswprintf(textBuffer, L"%ls\n%ls", event_string, ynbuf);
+		int desc = BufferIO::ReadInt32(pbuf);
+		if(desc == 0) {
+			wchar_t ynbuf[256];
+			myswprintf(ynbuf, dataManager.GetSysString(200), dataManager.FormatLocation(l, s), dataManager.GetName(code));
+			myswprintf(textBuffer, L"%ls\n%ls", event_string, ynbuf);
+		} else if(desc < 2048) {
+			myswprintf(textBuffer, dataManager.GetSysString(desc), dataManager.GetName(code));
+		} else {
+			myswprintf(textBuffer, dataManager.GetDesc(desc), dataManager.GetName(code));
+		}
 		mainGame->gMutex.Lock();
 		mainGame->SetStaticText(mainGame->stQMessage, 310, mainGame->textFont, textBuffer);
 		mainGame->PopupElement(mainGame->wQuery);

gframe/replay_mode.cpp

@@ -380,7 +380,7 @@ bool ReplayMode::ReplayAnalyze(char* msg, unsigned int len) {
 		}
 		case MSG_SELECT_EFFECTYN: {
 			player = BufferIO::ReadInt8(pbuf);
-			pbuf += 8;
+			pbuf += 12;
 			return ReadReplayResponse();
 		}
 		case MSG_SELECT_YESNO: {

gframe/single_duel.cpp

@@ -652,7 +652,7 @@ int SingleDuel::Analyze(char* msgbuffer, unsigned int len) {
 		}
 		case MSG_SELECT_EFFECTYN: {
 			player = BufferIO::ReadInt8(pbuf);
-			pbuf += 8;
+			pbuf += 12;
 			WaitforResponse(player);
 			NetServer::SendBufferToPlayer(players[player], STOC_GAME_MSG, offset, pbuf - offset);
 			return 1;

gframe/single_mode.cpp

@@ -189,7 +189,7 @@ bool SingleMode::SinglePlayAnalyze(char* msg, unsigned int len) {
 		}
 		case MSG_SELECT_EFFECTYN: {
 			player = BufferIO::ReadInt8(pbuf);
-			pbuf += 8;
+			pbuf += 12;
 			DuelClient::ClientAnalyze(offset, pbuf - offset);
 			if(!DuelClient::ClientAnalyze(offset, pbuf - offset)) {
 				mainGame->singleSignal.Reset();

gframe/tag_duel.cpp

@@ -584,7 +584,7 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) {
 		}
 		case MSG_SELECT_EFFECTYN: {
 			player = BufferIO::ReadInt8(pbuf);
-			pbuf += 8;
+			pbuf += 12;
 			WaitforResponse(player);
 			NetServer::SendBufferToPlayer(cur_player[player], STOC_GAME_MSG, offset, pbuf - offset);
 			return 1;

strings.conf

@@ -46,6 +46,9 @@
 !system 92 是否要解放对方怪兽进行上级召唤？
 !system 93 是否要继续选择素材？
 !system 94 是否现在使用这张卡的效果？
+!system 95 是否使用[%ls]的效果？
+!system 96 是否使用[%ls]的效果代替破坏？
+!system 97 是否把[%ls]在魔法与陷阱区域放置？
 !system 100 先攻
 !system 101 后攻
 !system 200 是否在[%ls]发动[%ls]的效果？
@@ -838,3 +841,7 @@
 !setname 0xff 幻透翼	クリアウィング
 !setname 0x100 化学结合	ボンディング
 !setname 0x101 码语者	コード・トーカー
+!setname 0x102 弹丸	ヴァレット
+!setname 0x103 幻变骚灵	オルターガイスト
+!setname 0x104 机怪虫	クローラー
+!setname 0x105 玄化	メタファイズ