Merge branch 'master' into server

gframe/duelclient.cpp

@@ -1425,10 +1425,14 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 				mainGame->dField.conti_act = true;
 			} else {
 				pcard->cmdFlag |= COMMAND_ACTIVATE;
-				if (pcard->location == LOCATION_GRAVE)
-					mainGame->dField.grave_act = true;
-				else if (pcard->location == LOCATION_REMOVED)
-					mainGame->dField.remove_act = true;
+				if(pcard->controler == 0) {
+					if(pcard->location == LOCATION_GRAVE)
+						mainGame->dField.grave_act = true;
+					else if(pcard->location == LOCATION_REMOVED)
+						mainGame->dField.remove_act = true;
+					else if(pcard->location == LOCATION_EXTRA)
+						mainGame->dField.extra_act = true;
+				}
 			}
 		}
 		mainGame->dField.attackable_cards.clear();
@@ -1555,10 +1559,14 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 				mainGame->dField.conti_act = true;
 			} else {
 				pcard->cmdFlag |= COMMAND_ACTIVATE;
-				if (pcard->location == LOCATION_GRAVE)
-					mainGame->dField.grave_act = true;
-				else if (pcard->location == LOCATION_REMOVED)
-					mainGame->dField.remove_act = true;
+				if(pcard->controler == 0) {
+					if(pcard->location == LOCATION_GRAVE)
+						mainGame->dField.grave_act = true;
+					else if(pcard->location == LOCATION_REMOVED)
+						mainGame->dField.remove_act = true;
+					else if(pcard->location == LOCATION_EXTRA)
+						mainGame->dField.extra_act = true;
+				}
 			}
 		}
 		if(BufferIO::ReadInt8(pbuf)) {

gframe/game.cpp

@@ -153,6 +153,9 @@ bool Game::Initialize() {
 			L"C:/Windows/Fonts/msyh.ttc",
 			L"C:/Windows/Fonts/msyh.ttf",
 			L"C:/Windows/Fonts/simsun.ttc",
+			L"C:/Windows/Fonts/YuGothM.ttc",
+			L"C:/Windows/Fonts/meiryo.ttc",
+			L"C:/Windows/Fonts/msgothic.ttc",
 			L"/usr/share/fonts/truetype/DroidSansFallbackFull.ttf",
 			L"/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc",
 			L"/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc",
@@ -208,7 +211,7 @@ bool Game::Initialize() {
 	SetWindowsIcon();
 	//main menu
 	wchar_t strbuf[256];
-	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Hoshirin", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
+	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Blover", 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));

ocgcore @ a982b748

-Subproject commit 9235e8e2593711838ec7ac4ee78a90f31194f0f4
+Subproject commit a982b74894aa484724aa783144483ada0e5c175a

script @ 3a75e12c

-Subproject commit 95dd7c80a00549265f7f6891705484cb37fc0871
+Subproject commit 3a75e12cda3ae09e6ff1272029c00b3bfb0db3e4

strings.conf

@@ -834,7 +834,8 @@
 !setname 0x81 炎王
 !setname 0x1081 炎王兽	炎王獣
 !setname 0x82 怒怒怒	ドドド
-!setname 0x83 机关傀儡	ギミック・パペット
+!setname 0x83 人偶	パペット
+!setname 0x1083 机关傀儡	ギミック・パペット
 !setname 0x84 燃烧拳击手	BK（バーニングナックラー）
 !setname 0x85 超级防卫机器人	SDロボ
 !setname 0x86 光天使
@@ -1131,3 +1132,7 @@
 !setname 0x172 救祓少女	エクソシスター
 !setname 0x173 恐啡肽狂龙	ダイノルフィア
 !setname 0x174 恶魔娘	悪魔嬢
+!setname 0x175 七皇	セブンス
+!setname 0x176 异晶人的	バリアンズ
+!setname 0x177 海龙神	リバイアサン
+!setname 0x178 潜海	シー・ステルス