Merge branch 'master' of https://github.com/Fluorohydride/ygopro into server

gframe/duelclient.cpp

@@ -1251,10 +1251,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();
@@ -1380,10 +1384,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)) {

strings.conf

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