Merge https://github.com/Fluorohydride/ygopro

.gitmodules

+[submodule "ocgcore"]
+	path = ocgcore
+	url = git@github.com:Fluorohydride/ygopro-core.git
+[submodule "script"]
+	path = script
+	url = git@github.com:Fluorohydride/ygopro-scripts.git

README.md

+## ygopro
+A script engine for "yu-gi-oh!" and sample gui
+
+[中文说明](https://github.com/Fluorohydride/ygopro/wiki/%E4%B8%AD%E6%96%87%E8%AF%B4%E6%98%8E)
+
+###Keys:
+* ESC: Minimize the window.
+* A: Holding down this button will let the system stop at every timing.
+* S: Holding down this button will let the system skip every timing.
+* R: Fix the font error.
+* F1~F4: Show the cards in your grave, banished zone, extra deck, xyz materials.
+* F5~F8: Show the cards in your opponent's grave, banished zone, extra deck, xyz materials.
+
+###Color in card list:
+####Background: 
+* White = your card, Grey = your opponent's card  
+
+####Text: 
+Cards in extra deck or removed: 
+* Black = face-up, Blue = face-down
+
+Xyz materials:
+* Black = default, Blue = the owner of the xyz material is different from its controller
+
+###Sequence:
+* Monster Zone: 1~5, starting from the left hand side.
+* Spell & Trap Zone: 1~5, starting from the left hand side.
+* Field Zone: 6
+* Pendulum Zone: 7~8, starting from the left hand side.
+* The others: 1~n, starting from the bottom.
+
+###Deck edit page:
+* All numeric textboxs: They support >, =, <, >=, <= signs.
+* Card name: Search card names and texts by default, $foo will only search foo in card names, and @foo will search cards of "foo" archetype(due to translation, card name contains "foo" does not mean that card is "foo" card).
+
+### Command-line options:
+* -j: Join the host in system.conf file.
+* -d: Enter the deck edit page.
+* -r: Enter the replay mode page.
+* -s: Enter the single mode page.
+* -efoo: Load foo as the extra database.
+
+### Directories:
+* pics: .jpg card images(177*254).
+* pics\thumbnail: .jpg thumbnail images(44*64).
+* script: .lua script files.
+* textures: Other image files.
+* deck: .ydk deck files.
+* replay: .yrp replay files.
+* expansions: *.cdb will be loaded as extra databases.

gframe/bufferio.h

@@ -60,6 +60,7 @@ public:
 		*pstr = 0;
 		return l;
 	}
+	// UCS-2 to UTF-8
 	static int EncodeUTF8(const wchar_t * wsrc, char * str) {
 		char* pstr = str;
 		while(*wsrc != 0) {
@@ -81,6 +82,7 @@ public:
 		*str = 0;
 		return str - pstr;
 	}
+	// UTF-8 to UCS-2
 	static int DecodeUTF8(const char * src, wchar_t * wstr) {
 		const char* p = src;
 		wchar_t* wp = wstr;
@@ -89,13 +91,13 @@ public:
 				*wp = *p;
 				p++;
 			} else if((*p & 0xe0) == 0xc0) {
-				*wp = (((int)p[0] & 0x1f) << 6) | ((int)p[1] & 0x3f);
+				*wp = (((unsigned)p[0] & 0x1f) << 6) | ((unsigned)p[1] & 0x3f);
 				p += 2;
 			} else if((*p & 0xf0) == 0xe0) {
-				*wp = (((int)p[0] & 0xf) << 12) | (((int)p[1] & 0x3f) << 6) | ((int)p[2] & 0x3f);
+				*wp = (((unsigned)p[0] & 0xf) << 12) | (((unsigned)p[1] & 0x3f) << 6) | ((unsigned)p[2] & 0x3f);
 				p += 3;
 			} else if((*p & 0xf8) == 0xf0) {
-				*wp = (((int)p[0] & 0x7) << 18) | (((int)p[1] & 0x3f) << 12) | (((int)p[2] & 0x3f) << 6) | ((int)p[3] & 0x3f);
+				*wp = (((unsigned)p[0] & 0x7) << 18) | (((unsigned)p[1] & 0x3f) << 12) | (((unsigned)p[2] & 0x3f) << 6) | ((unsigned)p[3] & 0x3f);
 				p += 4;
 			} else
 				p++;

gframe/client_card.cpp

 #include "client_card.h"
 #include "client_field.h"
+#include "data_manager.h"
 #include "game.h"
 
 namespace ygo {
@@ -18,8 +19,11 @@ ClientCard::ClientCard() {
 	is_highlighting = false;
 	is_disabled = false;
 	is_reversed = false;
+	is_conti = false;
 	cmdFlag = 0;
 	code = 0;
+	chain_code = 0;
+	location = 0;
 	type = 0;
 	alias = 0;
 	level = 0;
@@ -27,14 +31,18 @@ ClientCard::ClientCard() {
 	race = 0;
 	attribute = 0;
 	attack = 0;
-	defence = 0;
+	defense = 0;
 	base_attack = 0;
-	base_defence = 0;
+	base_defense = 0;
+	lscale = 0;
+	rscale = 0;
 	cHint = 0;
 	chValue = 0;
 	atkstring[0] = 0;
 	defstring[0] = 0;
 	lvstring[0] = 0;
+	rscstring[0] = 0;
+	lscstring[0] = 0;
 	overlayTarget = 0;
 	equipTarget = 0;
 }
@@ -68,7 +76,7 @@ void ClientCard::UpdateInfo(char* buf) {
 		type = BufferIO::ReadInt32(buf);
 	if(flag & QUERY_LEVEL) {
 		pdata = BufferIO::ReadInt32(buf);
-		if(pdata && level != (unsigned int)pdata) {
+		if(level != (unsigned int)pdata) {
 			level = pdata;
 			myswprintf(lvstring, L"L%d", level);
 		}
@@ -92,18 +100,18 @@ void ClientCard::UpdateInfo(char* buf) {
 		} else
 			myswprintf(atkstring, L"%d", attack);
 	}
-	if(flag & QUERY_DEFENCE) {
-		defence = BufferIO::ReadInt32(buf);
-		if(defence < 0) {
+	if(flag & QUERY_DEFENSE) {
+		defense = BufferIO::ReadInt32(buf);
+		if(defense < 0) {
 			defstring[0] = '?';
 			defstring[1] = 0;
 		} else
-			myswprintf(defstring, L"%d", defence);
+			myswprintf(defstring, L"%d", defense);
 	}
 	if(flag & QUERY_BASE_ATTACK)
 		base_attack = BufferIO::ReadInt32(buf);
-	if(flag & QUERY_BASE_DEFENCE)
-		base_defence = BufferIO::ReadInt32(buf);
+	if(flag & QUERY_BASE_DEFENSE)
+		base_defense = BufferIO::ReadInt32(buf);
 	if(flag & QUERY_REASON)
 		reason = BufferIO::ReadInt32(buf);
 	if(flag & QUERY_EQUIP_CARD) {
@@ -147,6 +155,20 @@ void ClientCard::UpdateInfo(char* buf) {
 		is_disabled = BufferIO::ReadInt32(buf);
 	if(flag & QUERY_IS_PUBLIC)
 		is_public = BufferIO::ReadInt32(buf);
+	if(flag & QUERY_LSCALE) {
+		pdata = BufferIO::ReadInt32(buf);
+		if(pdata && lscale != (unsigned int)pdata) {
+			lscale = pdata;
+			myswprintf(lscstring, L"%d", lscale);
+		}
+	}
+	if(flag & QUERY_RSCALE) {
+		pdata = BufferIO::ReadInt32(buf);
+		if(pdata && rscale != (unsigned int)pdata) {
+			rscale = pdata;
+			myswprintf(rscstring, L"%d", rscale);
+		}
+	}
 }
 void ClientCard::ClearTarget() {
 	for(auto cit = cardTarget.begin(); cit != cardTarget.end(); ++cit) {
@@ -192,12 +214,60 @@ bool ClientCard::deck_sort_lv(code_pointer p1, code_pointer p2) {
 			return p1->second.level > p2->second.level;
 		if(p1->second.attack != p2->second.attack)
 			return p1->second.attack > p2->second.attack;
-		if(p1->second.defence != p2->second.defence)
-			return p1->second.defence > p2->second.defence;
-		else return p1->first < p2->first;
+		if(p1->second.defense != p2->second.defense)
+			return p1->second.defense > p2->second.defense;
+		return p1->first < p2->first;
+	}
+	if((p1->second.type & 0xfffffff8) != (p2->second.type & 0xfffffff8))
+		return (p1->second.type & 0xfffffff8) < (p2->second.type & 0xfffffff8);
+	return p1->first < p2->first;
+}
+bool ClientCard::deck_sort_atk(code_pointer p1, code_pointer p2) {
+	if((p1->second.type & 0x7) != (p2->second.type & 0x7))
+		return (p1->second.type & 0x7) < (p2->second.type & 0x7);
+	if((p1->second.type & 0x7) == 1) {
+		if(p1->second.attack != p2->second.attack)
+			return p1->second.attack > p2->second.attack;
+		if(p1->second.defense != p2->second.defense)
+			return p1->second.defense > p2->second.defense;
+		if(p1->second.level != p2->second.level)
+			return p1->second.level > p2->second.level;
+		int type1 = (p1->second.type & 0x8020c0) ? (p1->second.type & 0x8020c1) : (p1->second.type & 0x31);
+		int type2 = (p2->second.type & 0x8020c0) ? (p2->second.type & 0x8020c1) : (p2->second.type & 0x31);
+		if(type1 != type2)
+			return type1 < type2;
+		return p1->first < p2->first;
+	}
+	if((p1->second.type & 0xfffffff8) != (p2->second.type & 0xfffffff8))
+		return (p1->second.type & 0xfffffff8) < (p2->second.type & 0xfffffff8);
+	return p1->first < p2->first;
+}
+bool ClientCard::deck_sort_def(code_pointer p1, code_pointer p2) {
+	if((p1->second.type & 0x7) != (p2->second.type & 0x7))
+		return (p1->second.type & 0x7) < (p2->second.type & 0x7);
+	if((p1->second.type & 0x7) == 1) {
+		if(p1->second.defense != p2->second.defense)
+			return p1->second.defense > p2->second.defense;
+		if(p1->second.attack != p2->second.attack)
+			return p1->second.attack > p2->second.attack;
+		if(p1->second.level != p2->second.level)
+			return p1->second.level > p2->second.level;
+		int type1 = (p1->second.type & 0x8020c0) ? (p1->second.type & 0x8020c1) : (p1->second.type & 0x31);
+		int type2 = (p2->second.type & 0x8020c0) ? (p2->second.type & 0x8020c1) : (p2->second.type & 0x31);
+		if(type1 != type2)
+			return type1 < type2;
+		return p1->first < p2->first;
 	}
 	if((p1->second.type & 0xfffffff8) != (p2->second.type & 0xfffffff8))
 		return (p1->second.type & 0xfffffff8) < (p2->second.type & 0xfffffff8);
 	return p1->first < p2->first;
 }
+bool ClientCard::deck_sort_name(code_pointer p1, code_pointer p2) {
+	const wchar_t* name1 = dataManager.GetName(p1->first);
+	const wchar_t* name2 = dataManager.GetName(p2->first);
+	int res = wcscmp(name1, name2);
+	if(res != 0)
+		return res < 0;
+	return p1->first < p2->first;
+}
 }

gframe/client_card.h

@@ -17,7 +17,9 @@ struct CardData {
 	unsigned int attribute;
 	unsigned int race;
 	int attack;
-	int defence;
+	int defense;
+	unsigned int lscale;
+	unsigned int rscale;
 };
 struct CardDataC {
 	unsigned int code;
@@ -28,7 +30,9 @@ struct CardDataC {
 	unsigned int attribute;
 	unsigned int race;
 	int attack;
-	int defence;
+	int defense;
+	unsigned int lscale;
+	unsigned int rscale;
 	unsigned int ot;
 	unsigned int category;
 };
@@ -37,7 +41,7 @@ struct CardString {
 	wchar_t* text;
 	wchar_t* desc[16];
 };
-typedef std::unordered_map<unsigned int, CardDataC>::iterator code_pointer;
+typedef std::unordered_map<unsigned int, CardDataC>::const_iterator code_pointer;
 
 class ClientCard {
 public:
@@ -59,7 +63,9 @@ public:
 	bool is_showtarget;
 	bool is_highlighting;
 	bool is_reversed;
+	bool is_conti;
 	u32 code;
+	u32 chain_code;
 	u32 alias;
 	u32 type;
 	u32 level;
@@ -67,9 +73,11 @@ public:
 	u32 attribute;
 	u32 race;
 	s32 attack;
-	s32 defence;
+	s32 defense;
 	s32 base_attack;
-	s32 base_defence;
+	s32 base_defense;
+	u32 lscale;
+	u32 rscale;
 	u32 reason;
 	u32 select_seq;
 	u8 owner;
@@ -95,6 +103,8 @@ public:
 	wchar_t atkstring[16];
 	wchar_t defstring[16];
 	wchar_t lvstring[16];
+	wchar_t lscstring[16];
+	wchar_t rscstring[16];
 
 	ClientCard();
 	void SetCode(int code);
@@ -102,6 +112,9 @@ public:
 	void ClearTarget();
 	static bool client_card_sort(ClientCard* c1, ClientCard* c2);
 	static bool deck_sort_lv(code_pointer l1, code_pointer l2);
+	static bool deck_sort_atk(code_pointer l1, code_pointer l2);
+	static bool deck_sort_def(code_pointer l1, code_pointer l2);
+	static bool deck_sort_name(code_pointer l1, code_pointer l2);
 };
 
 }

gframe/client_field.h

@@ -36,34 +36,43 @@ public:
 	std::vector<ClientCard*> reposable_cards;
 	std::vector<ClientCard*> activatable_cards;
 	std::vector<ClientCard*> attackable_cards;
+	std::vector<ClientCard*> conti_cards;
 	std::vector<int> activatable_descs;
+	std::set<int> reset_descs;
 	std::vector<int> select_options;
 	std::vector<ChainInfo> chains;
+	int extra_p_count[2];
 	
 	size_t selected_option;
 	ClientCard* attacker;
 	ClientCard* attack_target;
-	int disabled_field;
-	int selectable_field;
-	int selected_field;
+	unsigned int disabled_field;
+	unsigned int selectable_field;
+	unsigned int selected_field;
 	int select_min;
 	int select_max;
+	int must_select_count;
 	int select_sumval;
 	int select_cancelable;
 	int select_mode;
 	bool select_ready;
 	int announce_count;
+	int declarable_type;
 	int select_counter_count;
 	int select_counter_type;
 	std::vector<ClientCard*> selectable_cards;
 	std::vector<ClientCard*> selected_cards;
 	std::set<ClientCard*> selectsum_cards;
 	std::vector<ClientCard*> selectsum_all;
+	std::vector<ClientCard*> display_cards;
 	std::vector<int> sort_list;
+	std::map<int, int> player_desc_hints[2];
 	bool grave_act;
 	bool remove_act;
 	bool deck_act;
 	bool extra_act;
+	bool pzone_act[2];
+	bool conti_act;
 	bool chain_forced;
 	ChainInfo current_chain;
 	bool last_chain;
@@ -80,7 +89,9 @@ public:
 	void ClearCommandFlag();
 	void ClearSelect();
 	void ClearChainSelect();
-	void ShowSelectCard(bool buttonok = false);
+	void ShowSelectCard(bool buttonok = false, bool chain = false);
+	void ShowChainCard();
+	void ShowLocationCard();
 	void ReplaySwap();
 	void RefreshAllCards();
 	
@@ -88,12 +99,15 @@ public:
 	void GetCardLocation(ClientCard* pcard, irr::core::vector3df* t, irr::core::vector3df* r, bool setTrans = false);
 	void MoveCard(ClientCard* pcard, int frame);
 	void FadeCard(ClientCard* pcard, int alpha, int frame);
+	bool ShowSelectSum(bool panelmode);
 	bool CheckSelectSum();
 	bool check_min(std::set<ClientCard*>& left, std::set<ClientCard*>::iterator index, int min, int max);
-	bool check_sel_sum_s(std::set<ClientCard*>& left, int index, int acc);
-	void check_sel_sum_t(std::set<ClientCard*>& left, int acc);
-	bool check_sum(std::set<ClientCard*>& testlist, std::set<ClientCard*>::iterator index, int acc, int count);
+	bool check_sel_sum_s(const std::set<ClientCard*>& left, int index, int acc);
+	void check_sel_sum_t(const std::set<ClientCard*>& left, int acc);
+	bool check_sum(std::set<ClientCard*>::const_iterator index, std::set<ClientCard*>::const_iterator end, int acc, int count);
 	
+	void UpdateDeclarableCode(bool enter);
+
 	irr::gui::IGUIElement* panel;
 	std::vector<int> ancard;
 	int hovered_controler;
@@ -103,17 +117,23 @@ public:
 	int command_location;
 	size_t command_sequence;
 	ClientCard* hovered_card;
+	int hovered_player;
 	ClientCard* clicked_card;
 	ClientCard* command_card;
 	ClientCard* highlighting_card;
 	int list_command;
-	wchar_t formatBuffer[2048];
 
 	virtual bool OnEvent(const irr::SEvent& event);
 	void GetHoverField(int x, int y);
 	void ShowMenu(int flag, int x, int y);
+	void UpdateChainButtons();
+	void SetResponseSelectedCards() const;
 };
 
 }
 
+//special cards
+#define CARD_MARINE_DOLPHIN	78734254
+#define CARD_TWINKLE_MOSS	13857930
+
 #endif //CLIENT_FIELD_H

gframe/data_manager.cpp

@@ -4,7 +4,7 @@
 namespace ygo {
 
 const wchar_t* DataManager::unknown_string = L"???";
-wchar_t DataManager::strBuffer[2048];
+wchar_t DataManager::strBuffer[4096];
 DataManager dataManager;
 
 bool DataManager::LoadDB(const char* file) {
@@ -30,8 +30,11 @@ bool DataManager::LoadDB(const char* file) {
 			cd.setcode = sqlite3_column_int64(pStmt, 3);
 			cd.type = sqlite3_column_int(pStmt, 4);
 			cd.attack = sqlite3_column_int(pStmt, 5);
-			cd.defence = sqlite3_column_int(pStmt, 6);
-			cd.level = sqlite3_column_int(pStmt, 7);
+			cd.defense = sqlite3_column_int(pStmt, 6);
+			unsigned int level = sqlite3_column_int(pStmt, 7);
+			cd.level = level & 0xff;
+			cd.lscale = (level >> 24) & 0xff;
+			cd.rscale = (level >> 16) & 0xff;
 			cd.race = sqlite3_column_int(pStmt, 8);
 			cd.attribute = sqlite3_column_int(pStmt, 9);
 			cd.category = sqlite3_column_int(pStmt, 10);
@@ -67,8 +70,6 @@ bool DataManager::LoadStrings(const char* file) {
 	FILE* fp = fopen(file, "r");
 	if(!fp)
 		return false;
-	for(int i = 0; i < 2048; ++i)
-		_sysStrings[i] = 0;
 	char linebuf[256];
 	char strbuf[256];
 	int value;
@@ -82,23 +83,29 @@ bool DataManager::LoadStrings(const char* file) {
 			continue;
 		sscanf(linebuf, "!%s", strbuf);
 		if(!strcmp(strbuf, "system")) {
-			sscanf(&linebuf[7], "%d %s", &value, strbuf);
+			sscanf(&linebuf[7], "%d %240[^\n]", &value, strbuf);
 			int len = BufferIO::DecodeUTF8(strbuf, strBuffer);
 			wchar_t* pbuf = new wchar_t[len + 1];
 			wcscpy(pbuf, strBuffer);
 			_sysStrings[value] = pbuf;
 		} else if(!strcmp(strbuf, "victory")) {
-			sscanf(&linebuf[8], "%x %s", &value, strbuf);
+			sscanf(&linebuf[8], "%x %240[^\n]", &value, strbuf);
 			int len = BufferIO::DecodeUTF8(strbuf, strBuffer);
 			wchar_t* pbuf = new wchar_t[len + 1];
 			wcscpy(pbuf, strBuffer);
 			_victoryStrings[value] = pbuf;
 		} else if(!strcmp(strbuf, "counter")) {
-			sscanf(&linebuf[8], "%x %s", &value, strbuf);
+			sscanf(&linebuf[8], "%x %240[^\n]", &value, strbuf);
 			int len = BufferIO::DecodeUTF8(strbuf, strBuffer);
 			wchar_t* pbuf = new wchar_t[len + 1];
 			wcscpy(pbuf, strBuffer);
 			_counterStrings[value] = pbuf;
+		} else if(!strcmp(strbuf, "setname")) {
+			sscanf(&linebuf[8], "%x %240[^\t\n]", &value, strbuf);//using tab for comment
+			int len = BufferIO::DecodeUTF8(strbuf, strBuffer);
+			wchar_t* pbuf = new wchar_t[len + 1];
+			wcscpy(pbuf, strBuffer);
+			_setnameStrings[value] = pbuf;
 		}
 	}
 	fclose(fp);
@@ -179,15 +186,41 @@ const wchar_t* DataManager::GetCounterName(int code) {
 		return unknown_string;
 	return csit->second;
 }
-const wchar_t* DataManager::GetNumString(int num) {
-	return numStrings[num];
+const wchar_t* DataManager::GetSetName(int code) {
+	auto csit = _setnameStrings.find(code);
+	if(csit == _setnameStrings.end())
+		return NULL;
+	return csit->second;
 }
-const wchar_t* DataManager::FormatLocation(int location) {
-	int filter = 1, i = 1000;
-	while(filter != location) {
-		filter <<= 1;
-		i++;
+unsigned int DataManager::GetSetCode(const wchar_t* setname) {
+	for(auto csit = _setnameStrings.begin(); csit != _setnameStrings.end(); ++csit)
+		if(wcscmp(csit->second, setname) == 0)
+			return csit->first;
+	return 0;
+}
+const wchar_t* DataManager::GetNumString(int num, bool bracket) {
+	if(!bracket)
+		return numStrings[num];
+	wchar_t* p = numBuffer;
+	*p++ = L'(';
+	BufferIO::CopyWStrRef(numStrings[num], p, 4);
+	*p = L')';
+	*++p = 0;
+	return numBuffer;
+}
+const wchar_t* DataManager::FormatLocation(int location, int sequence) {
+	if(location == 0x8) {
+		if(sequence < 5)
+			return GetSysString(1003);
+		else if(sequence == 5)
+			return GetSysString(1008);
+		else
+			return GetSysString(1009);
 	}
+	unsigned filter = 1;
+	int i = 1000;
+	for(; filter != 0x100 && filter != location; filter <<= 1)
+		++i;
 	if(filter == location)
 		return GetSysString(i);
 	else
@@ -195,7 +228,8 @@ const wchar_t* DataManager::FormatLocation(int location) {
 }
 const wchar_t* DataManager::FormatAttribute(int attribute) {
 	wchar_t* p = attBuffer;
-	int filter = 1, i = 1010;
+	unsigned filter = 1;
+	int i = 1010;
 	for(; filter != 0x80; filter <<= 1, ++i) {
 		if(attribute & filter) {
 			BufferIO::CopyWStrRef(GetSysString(i), p, 16);
@@ -211,8 +245,9 @@ const wchar_t* DataManager::FormatAttribute(int attribute) {
 }
 const wchar_t* DataManager::FormatRace(int race) {
 	wchar_t* p = racBuffer;
-	int filter = 1, i = 1020;
-	for(; filter != 0x800000; filter <<= 1, ++i) {
+	unsigned filter = 1;
+	int i = 1020;
+	for(; filter != 0x1000000; filter <<= 1, ++i) {
 		if(race & filter) {
 			BufferIO::CopyWStrRef(GetSysString(i), p, 16);
 			*p = L'|';
@@ -227,8 +262,9 @@ const wchar_t* DataManager::FormatRace(int race) {
 }
 const wchar_t* DataManager::FormatType(int type) {
 	wchar_t* p = tpBuffer;
-	int filter = 1, i = 1050;
-	for(; filter != 0x1000000; filter <<= 1, ++i) {
+	unsigned filter = 1;
+	int i = 1050;
+	for(; filter != 0x2000000; filter <<= 1, ++i) {
 		if(type & filter) {
 			BufferIO::CopyWStrRef(GetSysString(i), p, 16);
 			*p = L'|';
@@ -241,6 +277,22 @@ const wchar_t* DataManager::FormatType(int type) {
 		return unknown_string;
 	return tpBuffer;
 }
+const wchar_t* DataManager::FormatSetName(unsigned long long setcode) {
+	wchar_t* p = scBuffer;
+	for(int i = 0; i < 4; ++i) {
+		const wchar_t* setname = GetSetName((setcode >> i * 16) & 0xffff);
+		if(setname) {
+			BufferIO::CopyWStrRef(setname, p, 16);
+			*p = L'|';
+			*++p = 0;
+		}
+	}
+	if(p != scBuffer)
+		*(p - 1) = 0;
+	else
+		return unknown_string;
+	return scBuffer;
+}
 int DataManager::CardReader(int code, void* pData) {
 	if(!dataManager.GetData(code, (CardData*)pData))
 		memset(pData, 0, sizeof(CardData));

gframe/data_manager.h

@@ -23,24 +23,30 @@ public:
 	const wchar_t* GetSysString(int code);
 	const wchar_t* GetVictoryString(int code);
 	const wchar_t* GetCounterName(int code);
-	const wchar_t* GetNumString(int num);
-	const wchar_t* FormatLocation(int location);
+	const wchar_t* GetSetName(int code);
+	unsigned int GetSetCode(const wchar_t* setname);
+	const wchar_t* GetNumString(int num, bool bracket = false);
+	const wchar_t* FormatLocation(int location, int sequence);
 	const wchar_t* FormatAttribute(int attribute);
 	const wchar_t* FormatRace(int race);
 	const wchar_t* FormatType(int type);
+	const wchar_t* FormatSetName(unsigned long long setcode);
 
 	std::unordered_map<unsigned int, CardDataC> _datas;
 	std::unordered_map<unsigned int, CardString> _strings;
 	std::unordered_map<unsigned int, wchar_t*> _counterStrings;
 	std::unordered_map<unsigned int, wchar_t*> _victoryStrings;
+	std::unordered_map<unsigned int, wchar_t*> _setnameStrings;
 
 	wchar_t* _sysStrings[2048];
 	wchar_t numStrings[256][4];
+	wchar_t numBuffer[6];
 	wchar_t attBuffer[128];
 	wchar_t racBuffer[128];
 	wchar_t tpBuffer[128];
+	wchar_t scBuffer[128];
 
-	static wchar_t strBuffer[2048];
+	static wchar_t strBuffer[4096];
 	static const wchar_t* unknown_string;
 	static int CardReader(int, void*);
 	

gframe/deck_con.h

@@ -12,7 +12,10 @@ class DeckBuilder: public irr::IEventReceiver {
 public:
 	virtual bool OnEvent(const irr::SEvent& event);
 	void FilterCards();
-	
+	void ClearFilter();
+	void ClearSearch();
+	void SortList();
+
 	long long filter_effect;
 	unsigned int filter_type;
 	unsigned int filter_type2;
@@ -24,6 +27,8 @@ public:
 	int filter_def;
 	unsigned int filter_lvtype;
 	unsigned int filter_lv;
+	unsigned int filter_scltype;
+	unsigned int filter_scl;
 	int filter_lm;
 	int hovered_code;
 	int hovered_pos;
@@ -36,6 +41,8 @@ public:
 	size_t pre_extrac;
 	size_t pre_sidec;
 	code_pointer draging_pointer;
+	bool is_deleting;
+	bool is_clearing;
 	
 	std::unordered_map<int, int>* filterList;
 	std::vector<code_pointer> results;

gframe/deck_manager.cpp

@@ -128,7 +128,7 @@ void DeckManager::LoadDeck(Deck& deck, int* dbuf, int mainc, int sidec) {
 		if(cd.type & TYPE_TOKEN)
 			continue;
 		else if(cd.type & 0x802040 && deck.extra.size() < 15) {
-			deck.extra.push_back(dataManager.GetCodePointer(code));
+			deck.extra.push_back(dataManager.GetCodePointer(code));	//verified by GetData()
 		} else if(deck.main.size() < 60) {
 			deck.main.push_back(dataManager.GetCodePointer(code));
 		}
@@ -140,7 +140,7 @@ void DeckManager::LoadDeck(Deck& deck, int* dbuf, int mainc, int sidec) {
 		if(cd.type & TYPE_TOKEN)
 			continue;
 		if(deck.side.size() < 15)
-			deck.side.push_back(dataManager.GetCodePointer(code));
+			deck.side.push_back(dataManager.GetCodePointer(code));	//verified by GetData()
 	}
 }
 bool DeckManager::LoadSide(Deck& deck, int* dbuf, int mainc, int sidec) {
@@ -232,4 +232,17 @@ bool DeckManager::SaveDeck(Deck& deck, const wchar_t* name) {
 	fclose(fp);
 	return true;
 }
+bool DeckManager::DeleteDeck(Deck& deck, const wchar_t* name) {
+	wchar_t file[64];
+	myswprintf(file, L"./deck/%ls.ydk", name);
+#ifdef WIN32
+	BOOL result = DeleteFileW(file);
+	return !!result;
+#else
+	char filefn[256];
+	BufferIO::EncodeUTF8(file, filefn);
+	int result = unlink(filefn);
+	return result == 0;
+#endif
+}
 }

gframe/deck_manager.h

@@ -42,6 +42,7 @@ public:
 	bool LoadSide(Deck& deck, int* dbuf, int mainc, int sidec);
 	bool LoadDeck(const wchar_t* file);
 	bool SaveDeck(Deck& deck, const wchar_t* name);
+	bool DeleteDeck(Deck& deck, const wchar_t* name);
 };
 
 extern DeckManager deckManager;

gframe/event_handler.h

@@ -5,23 +5,4 @@
 #include "game.h"
 #include "client_card.h"
 
-namespace ygo {
-
-class EventHandler : public irr::IEventReceiver {
-public:
-	virtual bool OnEvent(const irr::SEvent& event);
-	void GetHoverField(int x, int y);
-	void ShowMenu(int flag, int x, int y);
-	
-	irr::gui::IGUIElement* panel;
-	int hovered_controler;
-	int hovered_location;
-	int hovered_sequence;
-	ClientCard* hovered_card;
-	ClientCard* clicked_card;
-	wchar_t formatBuffer[256];
-};
-
-}
-
 #endif //EVENT_HANDLER_H

gframe/gframe.cpp

@@ -27,16 +27,22 @@ int main(int argc, char* argv[]) {
 		 * -d: deck edit
 		 * -r: replay */
 		if(argv[i][0] == '-' && argv[i][1] == 'e') {
+#ifdef _WIN32
+			wchar_t fname[260];
+			MultiByteToWideChar(CP_ACP, 0, &argv[i][2], -1, fname, 260);
+			char fname2[260];
+			BufferIO::EncodeUTF8(fname, fname2);
+			ygo::dataManager.LoadDB(fname2);
+#else
 			ygo::dataManager.LoadDB(&argv[i][2]);
+#endif
 		} else if(!strcmp(argv[i], "-j") || !strcmp(argv[i], "-d") || !strcmp(argv[i], "-r") || !strcmp(argv[i], "-s")) {
 			exit_on_return = true;
 			irr::SEvent event;
 			event.EventType = irr::EET_GUI_EVENT;
 			event.GUIEvent.EventType = irr::gui::EGET_BUTTON_CLICKED;
 			if(!strcmp(argv[i], "-j")) {
-				event.GUIEvent.Caller = ygo::mainGame->btnLanMode;
-				ygo::mainGame->device->postEventFromUser(event);
-				//TODO: wait for wLanWindow show. if network connection faster than wLanWindow, wLanWindow will still show on duel scene.
+				ygo::mainGame->HideElement(ygo::mainGame->wMainMenu);
 				event.GUIEvent.Caller = ygo::mainGame->btnJoinHost;
 				ygo::mainGame->device->postEventFromUser(event);
 			} else if(!strcmp(argv[i], "-d")) {

gframe/materials.h

@@ -16,8 +16,11 @@ public:
 	S3DVertex vChainNum[4];
 	S3DVertex vActivate[4];
 	S3DVertex vField[4];
+	S3DVertex vFieldSpell[4];
+	S3DVertex vFieldSpell1[4];
+	S3DVertex vFieldSpell2[4];
 	S3DVertex vBackLine[76];
-	S3DVertex vFields[128];
+	S3DVertex vFields[140];
 	S3DVertex vArrow[40];
 	SColor c2d[4];
 	u16 iRectangle[6];

ocgcore @ 886141f3

+Subproject commit 886141f3960660a10d1ecd99ccbc745b61a16b51

script @ 87063a01

+Subproject commit 87063a011d7bc19e6535347d5c9f0956d5f0e25a