Merge branch 'master' into another

gframe/duelclient.cpp

@@ -390,6 +390,7 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
 		mainGame->wDeckEdit->setVisible(false);
 		mainGame->wFilter->setVisible(false);
 		mainGame->wSort->setVisible(false);
+		mainGame->stTip->setVisible(false);
 		mainGame->btnSideOK->setVisible(true);
 		mainGame->btnSideShuffle->setVisible(true);
 		mainGame->btnSideSort->setVisible(true);
@@ -1600,6 +1601,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 		ClientCard* pcard;
 		bool panelmode = false;
 		bool conti_exist = false;
+		bool select_trigger = (specount == 0x7f);
 		mainGame->dField.chain_forced = (forced != 0);
 		mainGame->dField.activatable_cards.clear();
 		mainGame->dField.activatable_descs.clear();
@@ -1640,7 +1642,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 					panelmode = true;
 			}
 		}
-		if(!forced && (mainGame->ignore_chain || ((count == 0 || specount == 0) && !mainGame->always_chain)) && (count == 0 || !mainGame->chain_when_avail)) {
+		if(!select_trigger && !forced && (mainGame->ignore_chain || ((count == 0 || specount == 0) && !mainGame->always_chain)) && (count == 0 || !mainGame->chain_when_avail)) {
 			SetResponseI(-1);
 			mainGame->dField.ClearChainSelect();
 			if(mainGame->chkWaitChain->isChecked() && !mainGame->ignore_chain) {

ocgcore @ 1b8b3c99

-Subproject commit 0df217c8e5ff2d33bb651c550712e186c53d227a
+Subproject commit 1b8b3c99eff96d05ef3d5be6daadbb2dfd5a8d42

script @ a75989b0

-Subproject commit fa9a0e7ba5c6eb54a0c330bf90f83e90a6d187b0
+Subproject commit a75989b0a4fe1a98dbfb34ef8fb89aec3d1789f8

strings.conf

@@ -925,3 +925,4 @@
 !setname 0x11f 奈芙提斯	ネフティス
 !setname 0x120 调皮宝贝	プランキッズ
 !setname 0x121 魔妖
+!setname 0x122 女武神