Merge branch 'fh' into resize

gframe/client_card.cpp

@@ -38,6 +38,7 @@ ClientCard::ClientCard() {
 	lscale = 0;
 	rscale = 0;
 	link_marker = 0;
+	position = 0;
 	cHint = 0;
 	chValue = 0;
 	atkstring[0] = 0;
@@ -70,8 +71,12 @@ void ClientCard::UpdateInfo(char* buf) {
 			code = pdata;
 	}
 	if(flag & QUERY_POSITION) {
-		pdata = BufferIO::ReadInt32(buf);
-		position = (pdata >> 24) & 0xff;
+		pdata = (BufferIO::ReadInt32(buf) >> 24) & 0xff;
+		if((location & (LOCATION_EXTRA | LOCATION_REMOVED)) && (u8)pdata != position) {
+			position = pdata;
+			mainGame->dField.MoveCard(this, 1);
+		} else
+			position = pdata;
 	}
 	if(flag & QUERY_ALIAS)
 		alias = BufferIO::ReadInt32(buf);

gframe/game.cpp

@@ -20,7 +20,7 @@
 #include <io.h>
 #endif
 
-const unsigned short PRO_VERSION = 0x1344;
+const unsigned short PRO_VERSION = 0x1345;
 
 namespace ygo {
 

gframe/replay_mode.cpp

@@ -64,11 +64,11 @@ int ReplayMode::ReplayThread(void* param) {
 	mainGame->dInfo.tag_player[0] = false;
 	mainGame->dInfo.tag_player[1] = false;
 	if(mainGame->dInfo.isSingleMode) {
-		set_script_reader((script_reader)SingleMode::ScriptReader);
+		set_script_reader((script_reader)SingleMode::ScriptReaderEx);
 		set_card_reader((card_reader)DataManager::CardReader);
 		set_message_handler((message_handler)MessageHandler);
 	} else {
-		set_script_reader(default_script_reader);
+		set_script_reader((script_reader)ScriptReaderEx);
 		set_card_reader((card_reader)DataManager::CardReader);
 		set_message_handler((message_handler)MessageHandler);
 	}
@@ -935,6 +935,15 @@ void ReplayMode::ReplayReload() {
 	/*len = */query_field_card(pduel, 1, LOCATION_REMOVED, flag, queryBuffer, 0);
 	mainGame->dField.UpdateFieldCard(mainGame->LocalPlayer(1), LOCATION_REMOVED, (char*)queryBuffer);
 }
+byte* ReplayMode::ScriptReaderEx(const char* script_name, int* slen) {
+	char sname[256] = "./expansions";
+	strcat(sname, script_name + 1);//default script name: ./script/c%d.lua
+	byte* buffer = default_script_reader(sname, slen);
+	if(buffer)
+		return buffer;
+	else
+		return default_script_reader(script_name, slen);
+}
 int ReplayMode::MessageHandler(long fduel, int type) {
 	if(!enable_log)
 		return 0;

gframe/replay_mode.h

@@ -47,6 +47,7 @@ public:
 	static void ReplayRefreshSingle(int player, int location, int sequence, int flag = 0xf81fff);
 	static void ReplayReload();
 
+	static byte* ScriptReaderEx(const char* script_name, int* slen);
 	static int MessageHandler(long fduel, int type);
 };
 

gframe/single_duel.cpp

@@ -406,7 +406,7 @@ void SingleDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
 	}
 	time_limit[0] = host_info.time_limit;
 	time_limit[1] = host_info.time_limit;
-	set_script_reader(default_script_reader);
+	set_script_reader((script_reader)ScriptReaderEx);
 	set_card_reader((card_reader)DataManager::CardReader);
 	set_message_handler((message_handler)SingleDuel::MessageHandler);
 	rnd.reset(seed);
@@ -1545,6 +1545,15 @@ void SingleDuel::RefreshSingle(int player, int location, int sequence, int flag)
 			NetServer::ReSendToPlayer(*pit);
 	}
 }
+byte* SingleDuel::ScriptReaderEx(const char* script_name, int* slen) {
+	char sname[256] = "./expansions";
+	strcat(sname, script_name + 1);//default script name: ./script/c%d.lua
+	byte* buffer = default_script_reader(sname, slen);
+	if(buffer)
+		return buffer;
+	else
+		return default_script_reader(script_name, slen);
+}
 int SingleDuel::MessageHandler(long fduel, int type) {
 	if(!enable_log)
 		return 0;

gframe/single_duel.h

@@ -37,7 +37,8 @@ public:
 	void RefreshGrave(int player, int flag = 0x81fff, int use_cache = 1);
 	void RefreshExtra(int player, int flag = 0x81fff, int use_cache = 1);
 	void RefreshSingle(int player, int location, int sequence, int flag = 0xf81fff);
-	
+
+	static byte* ScriptReaderEx(const char* script_name, int* slen);
 	static int MessageHandler(long fduel, int type);
 	static void SingleTimer(evutil_socket_t fd, short events, void* arg);
 	

gframe/single_mode.cpp

@@ -38,7 +38,7 @@ int SingleMode::SinglePlayThread(void* param) {
 	mtrandom rnd;
 	time_t seed = time(0);
 	rnd.reset(seed);
-	set_script_reader((script_reader)ScriptReader);
+	set_script_reader((script_reader)ScriptReaderEx);
 	set_card_reader((card_reader)DataManager::CardReader);
 	set_message_handler((message_handler)MessageHandler);
 	pduel = create_duel(rnd.rand());
@@ -849,6 +849,14 @@ void SingleMode::SinglePlayReload() {
 	/*len = */query_field_card(pduel, 1, LOCATION_REMOVED, flag, queryBuffer, 0);
 	mainGame->dField.UpdateFieldCard(mainGame->LocalPlayer(1), LOCATION_REMOVED, (char*)queryBuffer);
 }
+byte* SingleMode::ScriptReaderEx(const char* script_name, int* slen) {
+	char sname[256] = "./expansions";
+	strcat(sname, script_name + 1);//default script name: ./script/c%d.lua
+	if(ScriptReader(sname, slen))
+		return buffer;
+	else
+		return ScriptReader(script_name, slen);
+}
 byte* SingleMode::ScriptReader(const char* script_name, int* slen) {
 	FILE *fp;
 #ifdef _WIN32

gframe/single_mode.h

@@ -26,6 +26,7 @@ public:
 	static void SinglePlayRefreshSingle(int player, int location, int sequence, int flag = 0xf81fff);
 	static void SinglePlayReload();
 
+	static byte* ScriptReaderEx(const char* script_name, int* slen);
 	static byte* ScriptReader(const char* script_name, int* slen);
 	static int MessageHandler(long fduel, int type);
 

gframe/tag_duel.cpp

@@ -381,7 +381,7 @@ void TagDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
 	}
 	time_limit[0] = host_info.time_limit;
 	time_limit[1] = host_info.time_limit;
-	set_script_reader(default_script_reader);
+	set_script_reader((script_reader)ScriptReaderEx);
 	set_card_reader((card_reader)DataManager::CardReader);
 	set_message_handler((message_handler)TagDuel::MessageHandler);
 	rnd.reset(seed);
@@ -1662,6 +1662,15 @@ void TagDuel::RefreshSingle(int player, int location, int sequence, int flag) {
 		}
 	}
 }
+byte* TagDuel::ScriptReaderEx(const char* script_name, int* slen) {
+	char sname[256] = "./expansions";
+	strcat(sname, script_name + 1);//default script name: ./script/c%d.lua
+	byte* buffer = default_script_reader(sname, slen);
+	if(buffer)
+		return buffer;
+	else
+		return default_script_reader(script_name, slen);
+}
 int TagDuel::MessageHandler(long fduel, int type) {
 	if(!enable_log)
 		return 0;

gframe/tag_duel.h

@@ -37,7 +37,8 @@ public:
 	void RefreshGrave(int player, int flag = 0x81fff, int use_cache = 1);
 	void RefreshExtra(int player, int flag = 0x81fff, int use_cache = 1);
 	void RefreshSingle(int player, int location, int sequence, int flag = 0xf81fff);
-	
+
+	static byte* ScriptReaderEx(const char* script_name, int* slen);
 	static int MessageHandler(long fduel, int type);
 	static void TagTimer(evutil_socket_t fd, short events, void* arg);
 	

ocgcore @ b5f28bc4

-Subproject commit df9a103a856a1f7cc425feb9e50eb92ef2c343ed
+Subproject commit b5f28bc46173c98b20a83ddada5442d5c5ce99f2

script @ fa9a0e7b

-Subproject commit a7ac36907a08e612671914681a808af971290bc9
+Subproject commit fa9a0e7ba5c6eb54a0c330bf90f83e90a6d187b0

strings.conf

@@ -243,6 +243,9 @@
 !system 1164 同调召唤
 !system 1165 超量召唤
 !system 1166 连接召唤
+!system 1190 加入手卡
+!system 1191 送去墓地
+!system 1192 除外
 #menu
 !system 1200 联机模式
 !system 1201 单人模式
@@ -912,3 +915,7 @@
 !setname 0x11b 自奏圣乐	オルフェゴール
 !setname 0x11c 雷龙	サンダー·ドラゴン
 !setname 0x11d 禁忌的	禁じられた
+!setname 0x11e 危险！	Danger!
+!setname 0x11f 奈芙提斯	ネフティス
+!setname 0x120 调皮宝贝	プランキッズ
+!setname 0x121 魔妖