Merge branch 'master' into server

gframe/event_handler.cpp

@@ -2425,14 +2425,18 @@ void ClientField::SetShowMark(ClientCard* pcard, bool enable) {
 }
 void ClientField::ShowCardInfoInList(ClientCard* pcard, irr::gui::IGUIElement* element, irr::gui::IGUIElement* parent) {
 	std::wstring str(L"");
+	wchar_t formatBuffer[2048];
 	if(pcard->code) {
 		str.append(dataManager.GetName(pcard->code));
 	}
+	if(pcard->overlayTarget) {
+		myswprintf(formatBuffer, dataManager.GetSysString(225), dataManager.GetName(pcard->overlayTarget->code), pcard->overlayTarget->sequence + 1);
+		str.append(L"\n").append(formatBuffer);
+	}
 	if((pcard->status & STATUS_PROC_COMPLETE)
 		&& (pcard->type & (TYPE_RITUAL | TYPE_FUSION | TYPE_SYNCHRO | TYPE_XYZ | TYPE_LINK | TYPE_SPSUMMON)))
 		str.append(L"\n").append(dataManager.GetSysString(224));
 	for(size_t i = 0; i < chains.size(); ++i) {
-		wchar_t formatBuffer[2048];
 		auto chit = chains[i];
 		if(pcard == chit.chain_card) {
 			myswprintf(formatBuffer, dataManager.GetSysString(216), i + 1);

ocgcore @ c3e93a53

-Subproject commit 7bc471386b9a7b6103ceb0bf0d2caead3994a63a
+Subproject commit c3e93a5374fd0f8f5cf1e84b138203fef3d31f06

script @ 767bd43b

-Subproject commit 18f01535e03cbdb4cd2c005214bc628e9cf03a1d
+Subproject commit 767bd43bc0ae599df9b7a9ac4774beb17c1fe32c

strings.conf

@@ -80,6 +80,7 @@
 !system 222 是否要发动诱发效果？
 !system 223 稍后将询问其他可以发动的效果。
 !system 224 已用正规方法特殊召唤
+!system 225 叠放于[%ls](%d)下
 !system 500 请选择要解放的卡
 !system 501 请选择要丢弃的手卡
 !system 502 请选择要破坏的卡